fix: put support admin behind feature flag

Author: ludtkemorgan

api/prisma/seed-staging.ts

@@ -63,6 +63,7 @@ export const stagingSeed = async (
         FeatureFlagEnum.enablePartnerSettings,
         FeatureFlagEnum.enableSection8Question,
         FeatureFlagEnum.enableSingleUseCode,
+        FeatureFlagEnum.enableSupportAdmin,
         FeatureFlagEnum.enableUtilitiesIncluded,
         FeatureFlagEnum.enableWaitlistLottery,
         FeatureFlagEnum.enableWhatToExpectAdditionalField,

shared-helpers/src/auth/AuthContext.ts

@@ -404,12 +404,12 @@ export const AuthProvider: FunctionComponent<React.PropsWithChildren> = ({ child
       // Return true only if all jurisdictions have the flag turned on
       if (onlyIfAllJurisdictionsHaveItEnabled) {
         return jurisdictions.every(
-          (j) => j.featureFlags.find((flag) => flag.name === featureFlag)?.active || false
+          (j) => j.featureFlags?.find((flag) => flag.name === featureFlag)?.active || false
         )
       }
       // Otherwise return true if at least one jurisdiction has the flag turned on
       return jurisdictions.some(
-        (j) => j.featureFlags.find((flag) => flag.name === featureFlag)?.active || false
+        (j) => j.featureFlags?.find((flag) => flag.name === featureFlag)?.active || false
       )
     },
     getJurisdictionLanguages: (jurisdictionId: string) => {

sites/partners/__tests__/components/users/FormUserManage.test.tsx

@@ -439,6 +439,103 @@ describe("<FormUserManage>", () => {
         ).not.toBeInTheDocument()
       })
     })
+
+    describe("enableSupportAdmin", () => {
+      it("should not show support admin role when feature flag not enabled", async () => {
+        const adminUserWithJurisdictionsAndAllDisabled = {
+          ...adminUser,
+          jurisdictions: [
+            {
+              id: "jurisdiction1",
+              name: "jurisdictionWithoutSupportAdmin",
+            },
+            {
+              id: "jurisdiction2",
+              name: "jurisdictionWithoutSupportAdmin2",
+            },
+          ],
+        }
+        server.use(
+          rest.get("http://localhost/api/adapter/user", (_req, res, ctx) => {
+            return res(ctx.json(adminUserWithJurisdictionsAndAllDisabled))
+          }),
+          rest.post("http://localhost/api/adapter/user/invite", (_req, res, ctx) => {
+            return res(ctx.json({ success: true }))
+          })
+        )
+        const onCancel = jest.fn()
+        const onDrawerClose = jest.fn()
+        document.cookie = "access-token-available=True"
+
+        render(
+          <FormUserManage
+            isOpen={true}
+            title={t("users.addUser")}
+            mode={"add"}
+            listings={[]}
+            onCancel={onCancel}
+            onDrawerClose={onDrawerClose}
+          />
+        )
+
+        await waitFor(() => screen.getByText("Administrator"))
+        expect(screen.getByText("Add user")).toBeInTheDocument()
+        expect(screen.getByText("User details")).toBeInTheDocument()
+        // "Role" select should not have Support Admin
+        expect(screen.getByRole("combobox", { name: "Role" })).toBeInTheDocument()
+        expect(screen.getByRole("option", { name: "Administrator" })).toBeInTheDocument()
+        expect(screen.getByRole("option", { name: "Partner" })).toBeInTheDocument()
+        expect(screen.queryByRole("option", { name: "Admin (support)" })).not.toBeInTheDocument()
+      })
+
+      it("should show support admin role when feature flag enabled", async () => {
+        const adminUserWithJurisdictionsAndOneEnabled = {
+          ...adminUser,
+          jurisdictions: [
+            {
+              id: "jurisdiction1",
+              name: "jurisdictionWithSupportAdmin",
+            },
+            {
+              id: "jurisdiction2",
+              name: "jurisdictionWithSupportAdmin2",
+              featureFlags: [{ name: FeatureFlagEnum.enableSupportAdmin, active: true }],
+            },
+          ],
+        }
+        server.use(
+          rest.get("http://localhost/api/adapter/user", (_req, res, ctx) => {
+            return res(ctx.json(adminUserWithJurisdictionsAndOneEnabled))
+          }),
+          rest.post("http://localhost/api/adapter/user/invite", (_req, res, ctx) => {
+            return res(ctx.json({ success: true }))
+          })
+        )
+        const onCancel = jest.fn()
+        const onDrawerClose = jest.fn()
+        document.cookie = "access-token-available=True"
+
+        render(
+          <FormUserManage
+            isOpen={true}
+            title={t("users.addUser")}
+            mode={"add"}
+            listings={[]}
+            onCancel={onCancel}
+            onDrawerClose={onDrawerClose}
+          />
+        )
+
+        await waitFor(() => screen.getByText("Administrator"))
+        expect(screen.getByText("Add user")).toBeInTheDocument()
+        expect(screen.getByText("User details")).toBeInTheDocument()
+        // "Role" select should not Support Admin
+        expect(screen.getByRole("combobox", { name: "Role" })).toBeInTheDocument()
+        expect(screen.queryByRole("option", { name: "Admin (support)" })).toBeInTheDocument()
+        expect(screen.getByRole("option", { name: "Administrator" })).toBeInTheDocument()
+        expect(screen.getByRole("option", { name: "Partner" })).toBeInTheDocument()
+      })
+    })
   })
 
   describe("Edit User", () => {

sites/partners/src/components/applications/PaperApplicationDetails/sections/DetailsMultiselectQuestions.tsx

@@ -59,7 +59,7 @@ const DetailsMultiselectQuestions = ({
       <Grid.Row columns={2}>
         {listingQuestions?.map((listingQuestion) => {
           return (
-            <Grid.Cell>
+            <Grid.Cell key={listingQuestion?.multiselectQuestions.text}>
               <FieldValue
                 key={listingQuestion?.multiselectQuestions.text}
                 label={listingQuestion?.multiselectQuestions.text}

sites/partners/src/components/users/FormUserManage.tsx

@@ -70,7 +70,11 @@ const FormUserManage = ({
   }
   if (profile?.userRoles?.isAdmin) {
     possibleUserRoles.push(RoleOption.Administrator)
-    possibleUserRoles.push(RoleOption.AdminSupport)
+    // If any jurisdiction has enableSupportAdmin than admins can add an "Admin (support)" user
+    // This means that there can be a scenario where jurisdictions get access to this role when they don't have it enabled
+    if (doJurisdictionsHaveFeatureFlagOn(FeatureFlagEnum.enableSupportAdmin)) {
+      possibleUserRoles.push(RoleOption.AdminSupport)
+    }
   }
 
   let defaultValues: FormUserManageValues = {}