Merge branch 'fix/package-manager-html-rendering-types' of github.com…

…:nrkno/sofie-core into fix/pm-types-html-template # Conflicts: # meteor/lib/collections/ExpectedPackages.ts # packages/shared-lib/src/package-manager/package.ts
nrkno · Aug 23, 2024 · d90c220 · d90c220
2 parents fb1014a + 45c25b9
commit d90c220
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/meteor/client/ui/Settings/Studio/PackageManager.tsx b/meteor/client/ui/Settings/Studio/PackageManager.tsx
@@ -488,6 +488,36 @@ export const StudioPackageManagerSettings = withTranslation()(
 														{t('Base url to the resource (example: http://myserver/folder)')}
 													</span>
 												</label>
+												<label className="field">
+													<LabelActual label={t('Is Immutable')} />
+													<EditAttribute
+														modifiedClassName="bghl"
+														attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.isImmutable`}
+														obj={this.props.studio}
+														type="checkbox"
+														collection={Studios}
+														className="input text-input input-l"
+													></EditAttribute>
+													<span className="text-s dimmed field-hint">
+														{t('When set, resources are considered immutable, ie they will not change')}
+													</span>
+												</label>
+												<label className="field">
+													<LabelActual label={t('Supports HEAD requests')} />
+													<EditAttribute
+														modifiedClassName="bghl"
+														attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.supportHEAD`}
+														obj={this.props.studio}
+														type="checkbox"
+														collection={Studios}
+														className="input text-input input-l"
+													></EditAttribute>
+													<span className="text-s dimmed field-hint">
+														{t(
+															'Set to true if the HTTP server supports HEAD requests. (otherwise GET requests will be used to check availability)'
+														)}
+													</span>
+												</label>
 
 												<label className="field">
 													<LabelActual label={t('Network Id')} />

diff --git a/meteor/client/ui/Status/package-status/PackageStatus.tsx b/meteor/client/ui/Status/package-status/PackageStatus.tsx
@@ -35,7 +35,9 @@ export const PackageStatus: React.FC<{
 			return p2.content.path || unprotectString(props.package._id)
 		} else {
 			assertNever(p2)
-			return unprotectString(props.package._id)
+
+			const anyContent = (p2 as any).content
+			return anyContent.path || anyContent.filePath || anyContent.title || unprotectString(props.package._id)
 		}
 	}, [props.package])