Merge pull request #485 from visualize-admin/feat/compliance

feat/compliance

Author: ptbrowne

src/components/sunshine-selectors/base.tsx

@@ -51,8 +51,6 @@ export const SunshineSelectorsBase = ({
   getPeerGroupLabel = (id) => id,
   saidiSaifiType,
   setSaidiSaifiType,
-  complianceType,
-  complianceTypes,
   setComplianceType,
   saidiSaifiTypes,
   indicator,
@@ -91,8 +89,18 @@ export const SunshineSelectorsBase = ({
       <Combobox
         id="indicator"
         label={t({ id: "selector.indicator", message: "Indicator" })}
-        items={indicatorOptions}
-        getItemLabel={getItemLabel}
+        items={indicatorOptions.filter((x) => {
+          return x !== "outageInfo" && x !== "daysInAdvanceOutageNotification";
+        })}
+        getItemLabel={(id) => {
+          // The client has decided for franc-rule to be directly in the indicator selector
+          // instead of compliance, so we map it here. It should be changed if in the future,
+          // we show more "compliance" types on the map.
+          if (id === "compliance") {
+            return getItemLabel("franc-rule");
+          }
+          return getItemLabel(id);
+        }}
         selectedItem={indicator}
         setSelectedItem={setIndicator}
         infoDialogSlug="help-indicator"
@@ -108,17 +116,6 @@ export const SunshineSelectorsBase = ({
           infoDialogSlug="help-saidi-saifi-type"
         />
       ) : null}
-      {indicator === "compliance" ? (
-        <Combobox<QueryStateSunshineComplianceType>
-          id="typology"
-          label={t({ id: "selector.compliance-type", message: "Typology" })}
-          items={complianceTypes}
-          getItemLabel={getItemLabel}
-          selectedItem={complianceType}
-          setSelectedItem={setComplianceType}
-          infoDialogSlug="help-compliance"
-        />
-      ) : null}
 
       {indicator === "networkCosts" ? (
         <Combobox<NetworkLevelId>

src/e2e/map.spec.ts

@@ -209,22 +209,10 @@ test.describe("Map Details Table Information", () => {
         notExpectedFields: ["Network level", "Category"],
       },
       {
-        indicatorName: "Compliance",
-        indicatorPattern: /Compliance/i,
-        expectedFields: ["Year", "Typology"],
-        notExpectedFields: ["Network level", "Category"],
-      },
-      {
-        indicatorName: "Outage information",
-        indicatorPattern: /Outage information/i,
+        indicatorName: "Franc Rule",
+        indicatorPattern: /Franc Rule/i,
         expectedFields: ["Year"],
-        notExpectedFields: ["Network level", "Category", "Typology"],
-      },
-      {
-        indicatorName: "Days in advance",
-        indicatorPattern: /Days in advance outage notification/i,
-        expectedFields: ["Year"],
-        notExpectedFields: ["Network level", "Category", "Typology"],
+        notExpectedFields: ["Network level", "Category"],
       },
     ];