chore: improve optional label handling

bcgov · Aug 8, 2022 · b39a204 · b39a204
1 parent 60eefd6
commit b39a204
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/app/data/jsonSchemaForm/projectEmissionIntensitySchema.ts b/app/data/jsonSchemaForm/projectEmissionIntensitySchema.ts
@@ -95,6 +95,7 @@ export const emissionIntensityReportUiSchema = {
   calculatedGHGEmissionIntensityPerformance: {
     "ui:widget": "ReadOnlyCalculatedValueWidget",
     isPercent: true,
+    hideOptional: true,
   },
   adjustedGHGEmissionIntensityPerformance: {
     "ui:widget": "AdjustableCalculatedValueWidget",

diff --git a/app/lib/theme/FieldTemplate.tsx b/app/lib/theme/FieldTemplate.tsx
@@ -12,11 +12,17 @@ const FieldTemplate: React.FC<FieldTemplateProps> = ({
   displayLabel,
   required,
   id,
+  uiSchema,
 }) => {
   return (
     <div>
       {displayLabel && (
-        <FieldLabel label={label} required={required} htmlFor={id} />
+        <FieldLabel
+          label={label}
+          required={required}
+          htmlFor={id}
+          uiSchema={uiSchema}
+        />
       )}
       {help}
       {children}

diff --git a/app/lib/theme/widgets/FieldLabel.tsx b/app/lib/theme/widgets/FieldLabel.tsx
@@ -3,22 +3,23 @@ interface Props {
   required: boolean;
   htmlFor: string;
   tagName?: "label" | "dt";
+  uiSchema?: any;
 }
 
 const FieldLabel: React.FC<Props> = ({
   label,
   required,
   htmlFor,
   tagName = "label",
+  uiSchema,
 }) => {
   if (!label) {
     return null;
   }
 
-  const displayedLabel =
-    label === "GHG Emission Intensity Performance"
-      ? "GHG Emission Intensity Performance"
-      : label + (required ? "" : " (optional)") + " ";
+  const displayedLabel = uiSchema?.hideOptional
+    ? label
+    : label + (required ? "" : " (optional)") + " ";
 
   if (tagName === "label")
     return <label htmlFor={htmlFor}>{displayedLabel}</label>;