ui - display all domains that reference current user (#2789)

* ui - display all domains that reference current user Signed-off-by: aporss <[email protected]> * prettier formatting changes Signed-off-by: aporss <[email protected]> --------- Signed-off-by: aporss <[email protected]> Signed-off-by: Artjoms Porss <[email protected]>
AthenZ · Nov 20, 2024 · ef2a5b0 · ef2a5b0
1 parent 96b789c
commit ef2a5b0
Show file tree

Hide file tree

Showing 33 changed files with 170 additions and 124 deletions.
diff --git a/ui/src/__tests__/api.test.js b/ui/src/__tests__/api.test.js
@@ -27,7 +27,7 @@ describe('Fetchr Client API Test', () => {
     describe('listUserDomains test', () => {
         it('listUserDomains test success', async () => {
             myDataService = {
-                name: 'domain-list',
+                name: 'domain-role-member',
                 read: function (req, resource, params, config, callback) {
                     callback(null, DATA);
                 },
@@ -39,7 +39,7 @@ describe('Fetchr Client API Test', () => {
         });
         it('listUserDomains test error', async () => {
             myDataServiceErr = {
-                name: 'domain-list',
+                name: 'domain-role-member',
                 read: function (req, resource, params, config, callback) {
                     callback({}, null);
                 },

diff --git a/ui/src/__tests__/pages/domain/[domain]/domain-settings.test.js b/ui/src/__tests__/pages/domain/[domain]/domain-settings.test.js
@@ -21,16 +21,14 @@ import {
 } from '../../../../tests_utils/ComponentsTestUtils';
 import MockApi from '../../../../mock/MockApi';
 import { waitFor } from '@testing-library/react';
+import { listUserDomains_response } from '../../../../mock/MockData';
 
 afterEach(() => {
     MockApi.cleanMockApi();
 });
 
 describe('DomainSettingsPage', () => {
     it('should render', async () => {
-        let domains = [];
-        domains.push({ name: 'athens' });
-        domains.push({ name: 'athens.ci' });
         let query = {
             domain: 'dom',
         };
@@ -63,7 +61,7 @@ describe('DomainSettingsPage', () => {
             ),
             listUserDomains: jest.fn().mockReturnValue(
                 new Promise((resolve, reject) => {
-                    resolve(domains);
+                    resolve(listUserDomains_response);
                 })
             ),
         };

diff --git a/ui/src/__tests__/pages/domain/[domain]/group.test.js b/ui/src/__tests__/pages/domain/[domain]/group.test.js
@@ -21,6 +21,7 @@ import {
     mockAllDomainDataApiCalls,
     renderWithRedux,
 } from '../../../../tests_utils/ComponentsTestUtils';
+import { listUserDomains_response } from '../../../../mock/MockData';
 
 afterEach(() => {
     MockApi.cleanMockApi();
@@ -34,9 +35,6 @@ describe('GroupPage', () => {
     });
     afterEach(() => MockApi.cleanMockApi());
     it('should render', async () => {
-        let domains = [];
-        domains.push({ name: 'athens' });
-        domains.push({ name: 'athens.ci' });
         let query = {
             domain: 'dom',
         };
@@ -69,7 +67,7 @@ describe('GroupPage', () => {
             ),
             listUserDomains: jest.fn().mockReturnValue(
                 new Promise((resolve, reject) => {
-                    resolve(domains);
+                    resolve(listUserDomains_response);
                 })
             ),
             getGroups: jest.fn().mockReturnValue(

diff --git a/ui/src/__tests__/pages/domain/[domain]/group/[group]/members.test.js b/ui/src/__tests__/pages/domain/[domain]/group/[group]/members.test.js
@@ -21,16 +21,14 @@ import {
     renderWithRedux,
 } from '../../../../../../tests_utils/ComponentsTestUtils';
 import MockApi from '../../../../../../mock/MockApi';
+import { listUserDomains_response } from '../../../../../../mock/MockData';
 
 afterEach(() => {
     MockApi.cleanMockApi();
 });
 
 describe('GroupMemberPage', () => {
     it('should render', async () => {
-        let domains = [];
-        domains.push({ name: 'athens' });
-        domains.push({ name: 'athens.ci' });
         let query = {
             domain: 'dom',
         };
@@ -67,7 +65,7 @@ describe('GroupMemberPage', () => {
             ),
             listUserDomains: jest.fn().mockReturnValue(
                 new Promise((resolve, reject) => {
-                    resolve(domains);
+                    resolve(listUserDomains_response);
                 })
             ),
             getDomainRoleMembers: jest

diff --git a/ui/src/__tests__/pages/domain/[domain]/group/[group]/review.test.js b/ui/src/__tests__/pages/domain/[domain]/group/[group]/review.test.js
@@ -21,6 +21,7 @@ import {
     renderWithRedux,
 } from '../../../../../../tests_utils/ComponentsTestUtils';
 import MockApi from '../../../../../../mock/MockApi';
+import { listUserDomains_response } from '../../../../../../mock/MockData';
 
 describe('GroupReviewPage', () => {
     beforeEach(() => {
@@ -30,9 +31,6 @@ describe('GroupReviewPage', () => {
     });
     afterEach(() => MockApi.cleanMockApi());
     it('should render', async () => {
-        let domains = [];
-        domains.push({ name: 'athens' });
-        domains.push({ name: 'athens.ci' });
         let query = {
             domain: 'dom',
         };
@@ -69,7 +67,7 @@ describe('GroupReviewPage', () => {
             ),
             listUserDomains: jest.fn().mockReturnValue(
                 new Promise((resolve, reject) => {
-                    resolve(domains);
+                    resolve(listUserDomains_response);
                 })
             ),
             getGroup: jest.fn().mockReturnValue(

diff --git a/ui/src/__tests__/pages/domain/[domain]/group/[group]/roles.test.js b/ui/src/__tests__/pages/domain/[domain]/group/[group]/roles.test.js
@@ -21,16 +21,14 @@ import {
     mockAllDomainDataApiCalls,
     renderWithRedux,
 } from '../../../../../../tests_utils/ComponentsTestUtils';
+import { listUserDomains_response } from '../../../../../../mock/MockData';
 
 afterEach(() => {
     MockApi.cleanMockApi();
 });
 
 describe('GroupRolesPage', () => {
     it('should render', async () => {
-        let domains = [];
-        domains.push({ name: 'athens' });
-        domains.push({ name: 'athens.ci' });
         let query = {
             domain: 'dom',
         };
@@ -66,7 +64,7 @@ describe('GroupRolesPage', () => {
             ),
             listUserDomains: jest.fn().mockReturnValue(
                 new Promise((resolve, reject) => {
-                    resolve(domains);
+                    resolve(listUserDomains_response);
                 })
             ),
             getGroup: jest.fn().mockReturnValue(

diff --git a/ui/src/__tests__/pages/domain/[domain]/group/[group]/settings.test.js b/ui/src/__tests__/pages/domain/[domain]/group/[group]/settings.test.js
@@ -21,6 +21,7 @@ import {
     mockAllDomainDataApiCalls,
     renderWithRedux,
 } from '../../../../../../tests_utils/ComponentsTestUtils';
+import { listUserDomains_response } from '../../../../../../mock/MockData';
 
 afterEach(() => {
     MockApi.cleanMockApi();
@@ -29,9 +30,6 @@ afterEach(() => {
 describe('GroupSettingPage', () => {
     it('should render', async () => {
         let group = 'groupName';
-        let domains = [];
-        domains.push({ name: 'athens' });
-        domains.push({ name: 'athens.ci' });
         let query = {
             domain: 'dom',
         };
@@ -70,7 +68,7 @@ describe('GroupSettingPage', () => {
             ),
             listUserDomains: jest.fn().mockReturnValue(
                 new Promise((resolve, reject) => {
-                    resolve(domains);
+                    resolve(listUserDomains_response);
                 })
             ),
             getGroup: jest.fn().mockReturnValue(

diff --git a/ui/src/__tests__/pages/domain/[domain]/group/[group]/tags.test.js b/ui/src/__tests__/pages/domain/[domain]/group/[group]/tags.test.js
@@ -25,6 +25,7 @@ import {
     configApiGroups,
     singleApiGroup,
 } from '../../../../../redux/config/group.test';
+import { listUserDomains_response } from '../../../../../../mock/MockData';
 
 describe('Groups Tag Page', () => {
     afterEach(() => {
@@ -34,9 +35,6 @@ describe('Groups Tag Page', () => {
         const query = {
             domain: 'dom',
         };
-        let domains = [];
-        domains.push({ name: 'athens' });
-        domains.push({ name: 'athens.ci' });
         const userId = 'test';
         const domain = 'home.test';
         const domainDetails = {
@@ -77,7 +75,7 @@ describe('Groups Tag Page', () => {
             ),
             listUserDomains: jest.fn().mockReturnValue(
                 new Promise((resolve, reject) => {
-                    resolve(domains);
+                    resolve(listUserDomains_response);
                 })
             ),
             getGroup: jest.fn().mockReturnValue(

diff --git a/ui/src/__tests__/pages/domain/[domain]/microsegmentation.test.js b/ui/src/__tests__/pages/domain/[domain]/microsegmentation.test.js
@@ -22,16 +22,14 @@ import {
     renderWithRedux,
 } from '../../../../tests_utils/ComponentsTestUtils';
 import MockApi from '../../../../mock/MockApi';
+import { listUserDomains_response } from '../../../../mock/MockData';
 
 afterEach(() => {
     MockApi.cleanMockApi();
 });
 
 describe('MicrosegmentationPage', () => {
     it('should render', async () => {
-        let domains = [];
-        domains.push({ name: 'athens' });
-        domains.push({ name: 'athens.ci' });
         let query = {
             domain: 'dom',
         };
@@ -65,7 +63,7 @@ describe('MicrosegmentationPage', () => {
             ),
             listUserDomains: jest.fn().mockReturnValue(
                 new Promise((resolve, reject) => {
-                    resolve(domains);
+                    resolve(listUserDomains_response);
                 })
             ),
             getPolicies: jest.fn().mockReturnValue(

diff --git a/ui/src/__tests__/pages/domain/[domain]/policy.test.js b/ui/src/__tests__/pages/domain/[domain]/policy.test.js
@@ -22,6 +22,7 @@ import {
     renderWithRedux,
 } from '../../../../tests_utils/ComponentsTestUtils';
 import MockApi from '../../../../mock/MockApi';
+import { listUserDomains_response } from '../../../../mock/MockData';
 
 afterEach(() => {
     MockApi.cleanMockApi();
@@ -38,9 +39,6 @@ describe('PolicyPage', () => {
         const query = {
             domain: 'dom',
         };
-        let domains = [];
-        domains.push({ name: 'athens' });
-        domains.push({ name: 'athens.ci' });
         const userId = 'pgote';
         const domain = 'home.pgote';
         const domainDetails = {
@@ -74,7 +72,7 @@ describe('PolicyPage', () => {
             ),
             listUserDomains: jest.fn().mockReturnValue(
                 new Promise((resolve, reject) => {
-                    resolve(domains);
+                    resolve(listUserDomains_response);
                 })
             ),
             getPolicies: jest.fn().mockReturnValue(

diff --git a/ui/src/__tests__/pages/domain/[domain]/policy/[policy]/tags.test.js b/ui/src/__tests__/pages/domain/[domain]/policy/[policy]/tags.test.js
@@ -27,15 +27,13 @@ import {
     singleStorePolicy,
 } from '../../../../../redux/config/policy.test';
 import { storeDomainData } from '../../../../../redux/config/domainData.test';
+import { listUserDomains_response } from '../../../../../../mock/MockData';
 
 describe('Policies Tag Page', () => {
     afterEach(() => {
         MockApi.cleanMockApi();
     });
     it('should render', async () => {
-        let domains = [];
-        domains.push({ name: 'athens' });
-        domains.push({ name: 'athens.ci' });
         const userId = 'test';
         const domainDetails = {
             description: 'test',
@@ -73,7 +71,7 @@ describe('Policies Tag Page', () => {
                 .mockReturnValue(Promise.resolve(apiPolicies)),
             listUserDomains: jest
                 .fn()
-                .mockReturnValue(Promise.resolve(domains)),
+                .mockReturnValue(Promise.resolve(listUserDomains_response)),
             getReviewGroups: jest.fn().mockReturnValue([]),
             getReviewRoles: jest.fn().mockReturnValue([]),
             getPageFeatureFlag: jest.fn().mockResolvedValue({}),

diff --git a/ui/src/__tests__/pages/domain/[domain]/role.test.js b/ui/src/__tests__/pages/domain/[domain]/role.test.js
@@ -22,16 +22,14 @@ import {
     renderWithRedux,
 } from '../../../../tests_utils/ComponentsTestUtils';
 import MockApi from '../../../../mock/MockApi';
+import { listUserDomains_response } from '../../../../mock/MockData';
 
 afterEach(() => {
     MockApi.cleanMockApi();
 });
 
 describe('RolePage', () => {
     it('should render', async () => {
-        let domains = [];
-        domains.push({ name: 'athens' });
-        domains.push({ name: 'athens.ci' });
         let query = {
             domain: 'dom',
         };
@@ -70,7 +68,7 @@ describe('RolePage', () => {
             ),
             listUserDomains: jest.fn().mockReturnValue(
                 new Promise((resolve, reject) => {
-                    resolve(domains);
+                    resolve(listUserDomains_response);
                 })
             ),
             getReviewGroups: jest.fn().mockReturnValue([]),

diff --git a/ui/src/__tests__/pages/domain/[domain]/role/[role]/members.test.js b/ui/src/__tests__/pages/domain/[domain]/role/[role]/members.test.js
@@ -22,12 +22,10 @@ import {
     renderWithRedux,
 } from '../../../../../../tests_utils/ComponentsTestUtils';
 import MockApi from '../../../../../../mock/MockApi';
+import { listUserDomains_response } from '../../../../../../mock/MockData';
 
 describe('MemberPage', () => {
     it('should render', async () => {
-        let domains = [];
-        domains.push({ name: 'athens' });
-        domains.push({ name: 'athens.ci' });
         let query = {
             domain: 'dom',
         };
@@ -67,7 +65,7 @@ describe('MemberPage', () => {
             ...mockRolesApiCalls(),
             listUserDomains: jest.fn().mockReturnValue(
                 new Promise((resolve, reject) => {
-                    resolve(domains);
+                    resolve(listUserDomains_response);
                 })
             ),
             getDomain: jest.fn().mockReturnValue(

diff --git a/ui/src/__tests__/pages/domain/[domain]/role/[role]/policy.test.js b/ui/src/__tests__/pages/domain/[domain]/role/[role]/policy.test.js
@@ -22,15 +22,13 @@ import {
     renderWithRedux,
 } from '../../../../../../tests_utils/ComponentsTestUtils';
 import MockApi from '../../../../../../mock/MockApi';
+import { listUserDomains_response } from '../../../../../../mock/MockData';
 
 describe('RolePolicyPage', () => {
     afterEach(() => {
         MockApi.cleanMockApi();
     });
     it('should render', async () => {
-        let domains = [];
-        domains.push({ name: 'athens' });
-        domains.push({ name: 'athens.ci' });
         let query = {
             domain: 'dom',
         };
@@ -68,7 +66,7 @@ describe('RolePolicyPage', () => {
             getRole: jest.fn().mockReturnValue(Promise.resolve(roleDetails)),
             listUserDomains: jest
                 .fn()
-                .mockReturnValue(Promise.resolve(domains)),
+                .mockReturnValue(Promise.resolve(listUserDomains_response)),
             getReviewGroups: jest.fn().mockReturnValue([]),
             getReviewRoles: jest.fn().mockReturnValue([]),
             getPageFeatureFlag: jest.fn().mockResolvedValue({}),

diff --git a/ui/src/__tests__/pages/domain/[domain]/role/[role]/review.test.js b/ui/src/__tests__/pages/domain/[domain]/role/[role]/review.test.js
@@ -22,15 +22,13 @@ import {
     renderWithRedux,
 } from '../../../../../../tests_utils/ComponentsTestUtils';
 import MockApi from '../../../../../../mock/MockApi';
+import { listUserDomains_response } from '../../../../../../mock/MockData';
 
 describe('ReviewPage', () => {
     afterEach(() => {
         MockApi.cleanMockApi();
     });
     it('should render', async () => {
-        let domains = [];
-        domains.push({ name: 'athens' });
-        domains.push({ name: 'athens.ci' });
         let query = {
             domain: 'dom',
         };
@@ -68,7 +66,7 @@ describe('ReviewPage', () => {
             getRole: jest.fn().mockReturnValue(Promise.resolve(roleDetails)),
             listUserDomains: jest
                 .fn()
-                .mockReturnValue(Promise.resolve(domains)),
+                .mockReturnValue(Promise.resolve(listUserDomains_response)),
             getReviewGroups: jest.fn().mockReturnValue([]),
             getReviewRoles: jest.fn().mockReturnValue([]),
             getPageFeatureFlag: jest.fn().mockResolvedValue({}),