R2-2825 - Fix account page

app/javascript/components/pages/account/container.jsx

@@ -123,7 +123,10 @@ const Container = ({ mode }) => {
     identityOptions,
     onClickChangePassword,
     true,
-    { userGroups: currentUser.get("userGroups", fromJS([])), webPushConfig }
+    {
+      userGroups: currentUser.get("userGroups", fromJS([])),
+      webPushConfigEnabled: webPushConfig?.get("enabled", false)
+    }
   );
 
   // eslint-disable-next-line react/no-multi-comp

app/javascript/components/pages/account/container.unit.test.js

@@ -10,6 +10,9 @@ import Account from "./container";
 describe("<Account />", () => {
   let component;
 
+  const getVisibleFields = allFields =>
+    allFields.filter(field => Object.is(field.visible, null) || field.visible).map(field => field.toJS());
+
   beforeEach(() => {
     const initialState = fromJS({
       user: {
@@ -45,4 +48,62 @@ describe("<Account />", () => {
   it("renders ChangePassword component", () => {
     expect(component.find(ChangePassword)).to.have.length(1);
   });
+
+  describe("when WEBPUSH is enabled", () => {
+    const state = fromJS({
+      user: {
+        loading: false,
+        errors: false,
+        serverErrors: [],
+        locale: "en",
+        id: 1,
+        full_name: "Test user",
+        disabled: false,
+        email: "[email protected]",
+        time_zone: "UTC",
+        user_name: "primero"
+      },
+      application: {
+        agencies: [{ id: 1, unique_id: "agency-unicef", name: "UNICEF" }],
+        webpush: {
+          enabled: true
+        }
+      }
+    });
+
+    const { component: newComponent } = setupMountedComponent(Account, { mode: "'edit'" }, state, ["/account"]);
+
+    it("renders 25 fields", () => {
+      expect(getVisibleFields(newComponent.find("FormSection").props().formSection.fields)).to.have.lengthOf(25);
+    });
+  });
+
+  describe("when WEBPUSH is disabled", () => {
+    const state = fromJS({
+      user: {
+        loading: false,
+        errors: false,
+        serverErrors: [],
+        locale: "en",
+        id: 1,
+        full_name: "Test user",
+        disabled: false,
+        email: "[email protected]",
+        time_zone: "UTC",
+        user_name: "primero"
+      },
+      application: {
+        agencies: [{ id: 1, unique_id: "agency-unicef", name: "UNICEF" }],
+        webpush: {
+          enabled: false
+        }
+      }
+    });
+
+    const { component: newComponent } = setupMountedComponent(Account, { mode: "'edit'" }, state, ["/account"]);
+
+    it("renders 20 fields", () => {
+      expect(getVisibleFields(newComponent.find("FormSection").props().formSection.fields)).to.have.lengthOf(20);
+    });
+  });
 });