Fixes

Recidiviz · Feb 12, 2025 · 056fa26 · 056fa26
1 parent 5418e26
commit 056fa26
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 25 deletions.
diff --git a/publisher/src/components/AdminPanel/AdminPanel.test.tsx b/publisher/src/components/AdminPanel/AdminPanel.test.tsx
@@ -60,7 +60,6 @@ beforeEach(() => {
   adminPanelStore.loading = false;
   adminPanelStore.userAgenciesLoading = false;
   adminPanelStore.teamMemberListLoading = false;
-  adminPanelStore.reportingAgencyMetadataLoading = false;
 });
 
 test("AdminPanel renders with the expected elements in the default User Provisioning view", async () => {
@@ -695,7 +694,6 @@ test("Clicking on an existing agency card opens the edit agency modal", async ()
 
   await waitFor(() => {
     adminPanelStore.teamMemberListLoading = false;
-    adminPanelStore.reportingAgencyMetadataLoading = false;
   });
 
   const editAgencyModalTitle = screen.getByText("Edit Agency Information");
@@ -771,7 +769,6 @@ test("Team members tab renders with add/remove buttons and users who are connect
 
   await waitFor(() => {
     adminPanelStore.teamMemberListLoading = false;
-    adminPanelStore.reportingAgencyMetadataLoading = false;
   });
 
   const teamMemberRolesTab = screen.getByText("Team Members & Roles");
@@ -808,7 +805,6 @@ test("Adding a user adds a card to the list of team members", async () => {
 
   await waitFor(() => {
     adminPanelStore.teamMemberListLoading = false;
-    adminPanelStore.reportingAgencyMetadataLoading = false;
   });
 
   const teamMemberRolesTab = screen.getByText("Team Members & Roles");
@@ -858,7 +854,6 @@ test("Deleting a user deletes a card to the list of team members", async () => {
 
   await waitFor(() => {
     adminPanelStore.teamMemberListLoading = false;
-    adminPanelStore.reportingAgencyMetadataLoading = false;
   });
 
   const teamMemberRolesTab = screen.getByText("Team Members & Roles");
@@ -915,7 +910,6 @@ test("Loading spinner works properly in Agency Provisioning", async () => {
 
   await waitFor(() => {
     adminPanelStore.teamMemberListLoading = false;
-    adminPanelStore.reportingAgencyMetadataLoading = false;
   });
 
   const teamMemberRolesTab = screen.getByText("Team Members & Roles");

diff --git a/publisher/src/components/AdminPanel/AgencyProvisioningOverview.tsx b/publisher/src/components/AdminPanel/AgencyProvisioningOverview.tsx
@@ -34,7 +34,6 @@ import {
   AgencyKey,
   AgencyProvisioning,
   AgencyWithTeamByID,
-  Environment,
   Setting,
   SettingType,
   UserProvisioning,
@@ -43,7 +42,7 @@ import * as Styled from "./AdminPanel.styles";
 import { VendorManagementModal } from "./VendorManagementModal";
 
 export const AgencyProvisioningOverview = observer(() => {
-  const { adminPanelStore, api } = useStore();
+  const { adminPanelStore } = useStore();
   const {
     loading,
     agencies,
@@ -299,13 +298,11 @@ export const AgencyProvisioningOverview = observer(() => {
 
         <Styled.ButtonWrapper>
           {/* Manage Vendors Button */}
-          {api.environment !== Environment.PRODUCTION && (
-            <Button
-              label="Manage Vendors"
-              onClick={() => setIsVendorsModalOpen(true)}
-              buttonColor="blue"
-            />
-          )}
+          <Button
+            label="Manage Vendors"
+            onClick={() => setIsVendorsModalOpen(true)}
+            buttonColor="blue"
+          />
           {/* Create Agency Button */}
           <Button
             label="Create Agency"

diff --git a/publisher/src/components/AdminPanel/MetricsReportingAgency.tsx b/publisher/src/components/AdminPanel/MetricsReportingAgency.tsx
@@ -66,7 +66,7 @@ export const MetricsReportingAgency: React.FC<MetricsReportingAgencyProps> =
                   const updatedReportingAgency = reportingAgenciesUpdates.find(
                     (agency) => agency.metric_key === metric.key
                   );
-                  const selecteReportingdAgency =
+                  const selectedReportingAgency =
                     updatedReportingAgency || initialReportingAgency;
 
                   const dropdownOptions = [
@@ -81,7 +81,7 @@ export const MetricsReportingAgency: React.FC<MetricsReportingAgencyProps> =
                           true
                         ),
                       highlight:
-                        selecteReportingdAgency?.reporting_agency_id ===
+                        selectedReportingAgency?.reporting_agency_id ===
                         Number(selectedIDToEdit),
                     },
                     ...reportingAgencyMetadata.reporting_agency_options.map(
@@ -96,7 +96,7 @@ export const MetricsReportingAgency: React.FC<MetricsReportingAgencyProps> =
                             false
                           ),
                         highlight:
-                          selecteReportingdAgency?.reporting_agency_id ===
+                          selectedReportingAgency?.reporting_agency_id ===
                           option.reporting_agency_id,
                       })
                     ),
@@ -106,19 +106,19 @@ export const MetricsReportingAgency: React.FC<MetricsReportingAgencyProps> =
                       onClick: () =>
                         updateReportingAgencies(metric.key, null, null, null),
                       highlight:
-                        selecteReportingdAgency?.reporting_agency_id === null,
+                        selectedReportingAgency?.reporting_agency_id === null,
                     },
                   ];
 
                   const hasReportingAgency = Boolean(
-                    selecteReportingdAgency?.reporting_agency_id
+                    selectedReportingAgency?.reporting_agency_id
                   );
 
                   const reportingAgencyName =
                     hasReportingAgency &&
-                    selecteReportingdAgency?.is_self_reported
+                    selectedReportingAgency?.is_self_reported
                       ? "Current Agency"
-                      : selecteReportingdAgency?.reporting_agency_name;
+                      : selectedReportingAgency?.reporting_agency_name;
 
                   return (
                     <Styled.ReportingAgencyMetricWrapper key={metric.key}>
@@ -128,7 +128,7 @@ export const MetricsReportingAgency: React.FC<MetricsReportingAgencyProps> =
                       <Styled.ReportingAgencyDropdownWrapper>
                         <DropdownContainer>
                           <Dropdown
-                            label={reportingAgencyName ?? "Please select..."}
+                            label={reportingAgencyName ?? "None"}
                             options={dropdownOptions}
                             hover="background"
                             caretPosition="right"

diff --git a/publisher/src/stores/AdminPanelStore.ts b/publisher/src/stores/AdminPanelStore.ts
@@ -381,8 +381,6 @@ class AdminPanelStore {
 
   async fetchReportingAgency(agencyID: string) {
     try {
-      this.reportingAgencyMetadataLoading = true;
-
       const response = (await this.api.request({
         path: `admin/agency/${agencyID}/reporting-agency`,
         method: "GET",
@@ -394,10 +392,14 @@ class AdminPanelStore {
       }
 
       runInAction(() => {
+        this.reportingAgencyMetadataLoading = true;
         this.reportingAgencyMetadata = data;
         this.reportingAgencyMetadataLoading = false;
       });
     } catch (error) {
+      runInAction(() => {
+        this.reportingAgencyMetadata = undefined;
+      });
       if (error instanceof Error) return new Error(error.message);
     }
   }