Merge branch 'bugfix/ZKUI-359' into tmp/octopus/w/2.0/bugfix/ZKUI-359

scality · Jun 5, 2023 · 55452f0 · 55452f0
2 parents 6d2815d + e13cb7a
commit 55452f0
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 5 deletions.
diff --git a/src/react/next-architecture/adapters/accounts-locations/MockedAccountsLocationsAdapter.ts b/src/react/next-architecture/adapters/accounts-locations/MockedAccountsLocationsAdapter.ts
@@ -62,6 +62,12 @@ export class MockedAccountsLocationsAdapter
           canonicalId: 'canonical-id-renard-with-out-location',
           creationDate: DEFAULT_METRICS_MESURED_ON,
         },
+        {
+          id: 'account-with-own-metrics',
+          name: 'Souris',
+          canonicalId: 'canonical-id-souris-diff-metrics',
+          creationDate: DEFAULT_METRICS_MESURED_ON,
+        },
       ];
     });
 }
diff --git a/src/react/next-architecture/adapters/metrics/MockedMetricsAdapter.ts b/src/react/next-architecture/adapters/metrics/MockedMetricsAdapter.ts
@@ -17,6 +17,15 @@ export const DEFAULT_METRICS: LatestUsedCapacity = {
   measuredOn: DEFAULT_METRICS_MESURED_ON,
 };
 
+export const ACCOUNT_OWN_METRICS: LatestUsedCapacity = {
+  measuredOn: DEFAULT_METRICS_MESURED_ON,
+  type: 'hasMetrics',
+  usedCapacity: {
+    current: 135000,
+    nonCurrent: 0,
+  },
+};
+
 export class MockedMetricsAdapter implements IMetricsAdapter {
   listBucketsLatestUsedCapacity = jest.fn();
 
@@ -49,6 +58,13 @@ export class MockedMetricsAdapter implements IMetricsAdapter {
         'orphan-location': DEFAULT_METRICS,
       };
     }
+
+    if (accountCanonicalId === 'canonical-id-souris-diff-metrics') {
+      return {
+        'artesca-s3-location': ACCOUNT_OWN_METRICS,
+      };
+    }
+
     return {};
   }
 

diff --git a/src/react/next-architecture/domain/business/locations.test.tsx b/src/react/next-architecture/domain/business/locations.test.tsx
@@ -1,6 +1,7 @@
 import { renderHook } from '@testing-library/react-hooks';
 import { MockedAccountsLocationsAdapter } from '../../adapters/accounts-locations/MockedAccountsLocationsAdapter';
 import {
+  ACCOUNT_OWN_METRICS,
   DEFAULT_METRICS,
   DEFAULT_METRICS_MESURED_ON,
   MockedMetricsAdapter,
@@ -17,6 +18,7 @@ import { QueryClient, QueryClientProvider } from 'react-query';
 import { PropsWithChildren } from 'react';
 import * as DSRProvider from '../../../DataServiceRoleProvider';
 import { LocationTypeKey } from '../../../../types/config';
+import { UsedCapacity } from '../../ui/metrics/LatestUsedCapacity';
 
 const defaultUsedCapacity = {
   status: 'success' as const,
@@ -252,6 +254,15 @@ describe('useListLocationsForCurrentAccount', () => {
   });
 
   it('should return only location for current account', async () => {
+    jest.spyOn(DSRProvider, 'useCurrentAccount').mockReturnValue({
+      account: {
+        id: 'account-with-own-metrics',
+        Name: 'Souris',
+        Roles: [],
+        CreationDate: DEFAULT_METRICS_MESURED_ON,
+      },
+    });
+
     // S
     const { result, waitFor } = setupAndRenderHook();
 
@@ -275,7 +286,10 @@ describe('useListLocationsForCurrentAccount', () => {
               endpoint: 'https://s3.scality.com',
               region: 'us-east-1',
             },
-            defaultUsedCapacity,
+            {
+              status: 'success',
+              value: ACCOUNT_OWN_METRICS,
+            },
           ),
         },
       },

diff --git a/src/react/next-architecture/domain/business/locations.ts b/src/react/next-architecture/domain/business/locations.ts
@@ -240,9 +240,18 @@ export const useListLocationsForCurrentAccount = ({
   const allLocationsValue = Object.values(allLocations.locations.value);
   const locations: Record<string, Location> = {};
   accountLocationsKey.forEach((locationId) => {
-    const accountLocation = allLocationsValue.find((l) => l.id === locationId);
-    if (accountLocation) {
-      locations[locationId] = accountLocation;
+    const locationDefinition = allLocationsValue.find(
+      (l) => l.id === locationId,
+    );
+
+    if (locationDefinition) {
+      locations[locationId] = {
+        ...locationDefinition,
+        usedCapacity: {
+          status: 'success',
+          value: accountLocationData[locationId],
+        },
+      };
     }
   });
 

diff --git a/src/react/workflow/Workflows.tsx b/src/react/workflow/Workflows.tsx
@@ -51,7 +51,6 @@ export function useWorkflowsWithSelect<T>(
   const rolePathName = useRolePathName();
   const dispatch = useDispatch();
 
-  console.log('acccount', account);
   const workflowsQuery = useQuery({
     ...workflowListQuery(
       notFalsyTypeGuard(mgnt),