CCM-11148 Refactor

Author: nicki-nhs

README.md

@@ -16,11 +16,11 @@
 - Then you need to install the following plugins:
 
 ```shell
-  asdf plugin-add nodejs
-  asdf plugin-add direnv
-  asdf plugin-add terraform
-  asdf plugin-add gitleaks
-  asdf plugin-add pre-commit
+  asdf plugin add nodejs
+  asdf plugin add direnv
+  asdf plugin add terraform
+  asdf plugin add gitleaks
+  asdf plugin add pre-commit
 ```
 
 - Now you can install the tools, and they will be runnable from within the `nhs-notify-web-template-management` directory:

frontend/src/__tests__/app/internal/features/route.test.ts

@@ -28,8 +28,8 @@ beforeEach(() => {
   mockUseAuthStatus.mockImplementation((status) => status ?? 'configuring');
   mockServerIsFeatureEnabled.mockResolvedValue(false); // default for most tests
   mockUseFeatureFlags.mockReturnValue({
-    featureFlags: { proofing: false, routing: false },
-    loaded: true,
+    proofing: false,
+    routing: false,
   });
 });
 
@@ -39,8 +39,8 @@ describe('NhsNotifyHeader', () => {
       mockGetSessionServer.mockResolvedValue({});
       mockGetIdTokenClaims.mockReturnValue({});
       mockUseFeatureFlags.mockReturnValue({
-        featureFlags: { proofing: false, routing: false },
-        loaded: true,
+        proofing: false,
+        routing: false,
       });
     });
 
@@ -110,8 +110,8 @@ describe('NhsNotifyHeader', () => {
       });
 
       mockUseFeatureFlags.mockReturnValue({
-        featureFlags: { proofing: false, routing: false },
-        loaded: true,
+        proofing: false,
+        routing: false,
       });
     });
 
@@ -183,8 +183,8 @@ describe('NhsNotifyHeader', () => {
     describe(`with 'routing' flag enabled`, () => {
       beforeEach(() => {
         mockUseFeatureFlags.mockReturnValue({
-          featureFlags: { proofing: false, routing: true },
-          loaded: true,
+          proofing: false,
+          routing: true,
         });
       });
 
@@ -207,31 +207,13 @@ describe('NhsNotifyHeader', () => {
           '/templates-and-message-plans/message-plans'
         );
       });
-
-      it('does not render navigation links when feature flags are not yet loaded', async () => {
-        mockUseFeatureFlags.mockReturnValue({
-          featureFlags: {
-            proofing: true,
-            routing: true,
-          },
-          loaded: false,
-        });
-
-        const header = await NhsNotifyHeader();
-
-        render(header);
-
-        expect(
-          screen.queryByTestId('navigation-links')
-        ).not.toBeInTheDocument();
-      });
     });
 
     describe(`with 'routing' flag disabled`, () => {
       beforeEach(() => {
         mockUseFeatureFlags.mockReturnValue({
-          featureFlags: { proofing: false, routing: false },
-          loaded: true,
+          proofing: false,
+          routing: false,
         });
       });
 

frontend/src/__tests__/components/molecules/Header.test.tsx

@@ -0,0 +1,73 @@
+import { getSessionServer } from '@utils/amplify-utils';
+import { fetchClient } from '@utils/server-features';
+import { initialFeatureFlags } from '@utils/features';
+import FeatureFlagProviderServer from '@providers/features-provider-server';
+
+jest.mock('@utils/amplify-utils');
+jest.mock('@utils/server-features');
+
+const mockGetSessionServer = jest.mocked(getSessionServer);
+const mockFetchClient = jest.mocked(fetchClient);
+
+describe('FeatureFlagProviderServer', () => {
+  describe('when unauthenticated', () => {
+    beforeEach(() => {
+      mockGetSessionServer.mockResolvedValueOnce({});
+    });
+
+    it('returns initial flags when unauthenticated', async () => {
+      const child = await FeatureFlagProviderServer({ children: <div /> });
+
+      expect(child.props.featureFlags).toEqual(initialFeatureFlags);
+    });
+
+    it('should not fetch client', async () => {
+      await FeatureFlagProviderServer({ children: <div /> });
+
+      expect(mockFetchClient).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('when authenticated', () => {
+    beforeEach(() => {
+      mockGetSessionServer.mockResolvedValueOnce({ accessToken: 'mocktoken' });
+    });
+
+    it('returns flags when authenticated', async () => {
+      mockFetchClient.mockResolvedValueOnce({
+        data: { features: { proofing: true, routing: true } },
+      });
+
+      const child = await FeatureFlagProviderServer({ children: <div /> });
+
+      expect(child.props.featureFlags).toEqual({
+        proofing: true,
+        routing: true,
+      });
+    });
+
+    it('should fall back to default flags on fetch error', async () => {
+      mockFetchClient.mockRejectedValueOnce({});
+
+      const child = await FeatureFlagProviderServer({ children: <div /> });
+
+      expect(child.props.featureFlags).toEqual(initialFeatureFlags);
+    });
+
+    it('should fall back to default flag when feature flag is missing', async () => {
+      mockFetchClient.mockResolvedValue({
+        data: {
+          features: {
+            proofing: true,
+          },
+        },
+      });
+      const child = await FeatureFlagProviderServer({ children: <div /> });
+
+      expect(child.props.featureFlags).toEqual({
+        proofing: true,
+        routing: false,
+      });
+    });
+  });
+});