update metric settings badges to reflect custom reporting frequency

Recidiviz · Nov 21, 2022 · f646fe0 · f646fe0
1 parent f8dda20
commit f646fe0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/publisher/src/components/MetricConfiguration/MetricBox.tsx b/publisher/src/components/MetricConfiguration/MetricBox.tsx
@@ -32,6 +32,7 @@ type MetricBoxProps = {
   metricKey: string;
   displayName: string;
   frequency: ReportFrequency;
+  customFrequency: ReportFrequency;
   description: string;
   enabled?: boolean;
 };
@@ -41,12 +42,15 @@ export const MetricBox: React.FC<MetricBoxProps> = observer(
     metricKey,
     displayName,
     frequency,
+    customFrequency,
     description,
     enabled,
   }): JSX.Element => {
     const { metricConfigStore } = useStore();
     const { updateActiveMetricKey } = metricConfigStore;
-
+    const displayFrequency = customFrequency
+      ? customFrequency.toLowerCase()
+      : frequency.toLowerCase();
     return (
       <MetricBoxContainer
         onClick={() => updateActiveMetricKey(metricKey)}
@@ -60,7 +64,7 @@ export const MetricBox: React.FC<MetricBoxProps> = observer(
             disabled={!enabled}
             noMargin
           >
-            {!enabled ? "Inactive" : frequency.toLowerCase()}
+            {!enabled ? "Inactive" : displayFrequency}
           </Badge>
         </MetricNameBadgeWrapper>
       </MetricBoxContainer>

diff --git a/publisher/src/components/MetricConfiguration/MetricConfiguration.tsx b/publisher/src/components/MetricConfiguration/MetricConfiguration.tsx
@@ -149,6 +149,7 @@ export const MetricConfiguration: React.FC = observer(() => {
                     key={key}
                     metricKey={key}
                     displayName={metric.label as string}
+                    customFrequency={metric.customFrequency as ReportFrequency}
                     frequency={metric.frequency as ReportFrequency}
                     description={metric.description as string}
                     enabled={metric.enabled}
@@ -179,7 +180,11 @@ export const MetricConfiguration: React.FC = observer(() => {
                     {metrics[systemMetricKey]?.label}
                   </MetricName>
                   <Badge color="GREEN" noMargin>
-                    {metrics[systemMetricKey]?.frequency?.toLowerCase()}
+                    {metrics[systemMetricKey]?.customFrequency
+                      ? metrics[
+                          systemMetricKey
+                        ]?.customFrequency?.toLocaleLowerCase()
+                      : metrics[systemMetricKey]?.frequency?.toLowerCase()}
                   </Badge>
                   <RightArrowIcon />
                 </Metric>

diff --git a/publisher/src/stores/MetricConfigStore.tsx b/publisher/src/stores/MetricConfigStore.tsx
@@ -56,6 +56,7 @@ class MetricConfigStore {
       label?: string;
       description?: Metric["description"];
       frequency?: Metric["frequency"];
+      customFrequency?: Metric["custom_frequency"];
     };
   };
 
@@ -177,6 +178,7 @@ class MetricConfigStore {
             label?: string;
             description?: Metric["description"];
             frequency?: Metric["frequency"];
+            customFrequency?: Metric["custom_frequency"];
           };
         }[]
       );
@@ -254,6 +256,7 @@ class MetricConfigStore {
               label: metric.label,
               description: metric.description,
               frequency: metric.frequency || "",
+              customFrequency: metric.custom_frequency || "",
             }
           );
 
@@ -358,6 +361,8 @@ class MetricConfigStore {
       this.metrics[systemMetricKey].description = metadata.description;
       this.metrics[systemMetricKey].frequency =
         metadata.frequency as ReportFrequency;
+      this.metrics[systemMetricKey].customFrequency =
+        metadata.customFrequency as ReportFrequency;
     }
 
     /** Update value */