chore: implement review suggestions

bcgov · Jul 21, 2023 · 728f1fc · 728f1fc
1 parent d3e164d
commit 728f1fc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/app/data/jsonSchemaForm/emissionIntensityUiSchema.ts b/app/data/jsonSchemaForm/emissionIntensityUiSchema.ts
@@ -59,7 +59,6 @@ export const emissionIntensityReportingRequirementUiSchema = {
     "ui:tooltip": {
       text: emissionsIntentityTooltips.adjustedEmissionsIntensityPerformance,
     },
-    "ui:classNames": "adjustable-calculated-value-widget",
   },
   calculatedEiPerformance: {
     isPercentage: true,

diff --git a/app/data/jsonSchemaForm/projectMilestoneUiSchema.ts b/app/data/jsonSchemaForm/projectMilestoneUiSchema.ts
@@ -90,7 +90,6 @@ const projectMilestoneUiSchema = {
     isMoney: true,
     hideOptional: true,
     calculatedValueFormContextProperty: "calculatedGrossAmount",
-    "ui:classNames": "adjustable-calculated-value-widget",
   },
   adjustedNetAmount: {
     "ui:widget": "AdjustableCalculatedValueWidget",
@@ -100,7 +99,6 @@ const projectMilestoneUiSchema = {
     isMoney: true,
     hideOptional: true,
     calculatedValueFormContextProperty: "calculatedNetAmount",
-    "ui:classNames": "adjustable-calculated-value-widget",
   },
   adjustedHoldbackAmount: {
     "ui:widget": "AdjustableCalculatedValueWidget",
@@ -110,7 +108,6 @@ const projectMilestoneUiSchema = {
     isMoney: true,
     hideOptional: true,
     calculatedValueFormContextProperty: "calculatedHoldbackAmount",
-    "ui:classNames": "adjustable-calculated-value-widget",
   },
   dateSentToCsnr: {
     "ui:widget": "DateWidget",

diff --git a/app/lib/theme/ReadOnlyFieldTemplate.tsx b/app/lib/theme/ReadOnlyFieldTemplate.tsx
@@ -15,7 +15,13 @@ const FieldTemplate: React.FC<FieldTemplateProps> = ({
 }) => {
   return (
     <div>
-      <div className={`${uiSchema["ui:classNames"] ?? "definition-container"}`}>
+      <div
+        className={
+          uiSchema.calculatedValueFormContextProperty
+            ? "adjustable-calculated-value-widget"
+            : "definition-container"
+        }
+      >
         {displayLabel && (
           <FieldLabel
             label={label}

diff --git a/app/lib/theme/widgets/ReadOnlyAdjustableCalculatedValueWidget.tsx b/app/lib/theme/widgets/ReadOnlyAdjustableCalculatedValueWidget.tsx
@@ -47,6 +47,9 @@ const ReadOnlyAdjustableCalculatedValueWidget: React.FC<WidgetProps> = (
             dt {
               margin: 0 1em 0 0;
             }
+            dd {
+              margin-bottom: 0; // Override default margin-bottom for styling consistency
+            }
           `}</style>
         </div>
       )}