Merge branch 'bugfix/ZKUI-187' into q/1.4

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zenko-ui",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "description": "",
   "main": "index.js",
   "scripts": {

src/react/account/__tests__/Accounts.test.tsx

@@ -206,6 +206,44 @@ describe('Accounts', () => {
     }
   });
 
+  it('should not redirect the user to buckets when storage manager and no roles can be assumed', async () => {
+    try {
+      //S
+      const mockedHistory = createMemoryHistory();
+      mockedHistory.replace = jest.fn();
+      jest.spyOn(router, 'useHistory').mockReturnValue(mockedHistory);
+      server.use(
+        rest.post(`${TEST_API_BASE_URL}/`, (req, res, ctx) =>
+          res(
+            ctx.json({
+              IsTruncated: false,
+              Accounts: [],
+            }),
+          ),
+        ),
+      );
+
+      //E
+      reduxRender(<Accounts />, {
+        uiErrors: initialErrorsUIState,
+        networkActivity: {
+          counter: 0,
+          messages: List.of(),
+        },
+        oidc: { user: { access_token: 'token', profile: {groups: 'StorageManager'} } },
+        auth: { config: { iamEndpoint: TEST_API_BASE_URL } },
+      });
+      //V
+      expect(mockedHistory.replace).not.toHaveBeenCalled();
+    } catch (e) {
+      console.log(
+        'should list accounts display an error when retrieval of accounts failed',
+        e,
+      );
+      throw e;
+    }
+  });
+
   it('should display Create Account Button for Storage Manager', async () => {
     try {
       //E

src/react/utils/hooks.ts

@@ -168,6 +168,9 @@ export const useAccounts = () => {
   const dispatch = useDispatch();
   const history = useHistory();
   const location = useLocation();
+  const userGroups = useSelector(
+    (state: AppState) => state.oidc.user?.profile?.groups || [],
+  );
 
   const { data } = useAwsPaginatedEntities<WebIdentityRoles, Account, ApiError>(
     {
@@ -195,7 +198,8 @@ export const useAccounts = () => {
           if (
             !canAssumeAdminAccountRolesOnAnyAccount &&
             !location.pathname.includes('bucket') &&
-            !location.pathname.includes('workflows')
+            !location.pathname.includes('workflows') &&
+            !userGroups.includes('StorageManager')
           ) {
             history.replace('/buckets');
           }