Merge branches 'w/3.0/bugfix/fix-federated-export-of-select-account-i…

…am-role' and 'q/757/2.2/bugfix/fix-federated-export-of-select-account-iam-role' into tmp/octopus/q/3.0
scality · Jul 2, 2024 · 06b1abe · 06b1abe
3 parents 9ea34a5 + 0eb20eb + 1c4afa9
commit 06b1abe
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/react/ui-elements/SelectAccountIAMRole.tsx b/src/react/ui-elements/SelectAccountIAMRole.tsx
@@ -21,6 +21,8 @@ import {
 import { AccountsLocationsEndpointsAdapterProvider } from '../next-architecture/ui/AccountsLocationsEndpointsAdapterProvider';
 import { getListRolesQuery } from '../queries';
 import { regexArn } from '../utils/hooks';
+import { AuthProvider } from '../next-architecture/ui/AuthProvider';
+import { ConfigProvider } from '../next-architecture/ui/ConfigProvider';
 
 class NoOpMetricsAdapter implements IMetricsAdapter {
   async listBucketsLatestUsedCapacity(
@@ -289,10 +291,22 @@ export const _SelectAccountIAMRole = (props: SelectAccountIAMRoleProps) => {
   }
 };
 
-export const SelectAccountIAMRole = (props: SelectAccountIAMRoleProps) => {
+export const SelectAccountIAMRoleInternal = (
+  props: SelectAccountIAMRoleProps,
+) => {
   return (
     <InternalProvider defaultValue={props.defaultValue}>
       <_SelectAccountIAMRole {...props} />
     </InternalProvider>
   );
 };
+
+export default function SelectAccountIAMRole(props: SelectAccountIAMRoleProps) {
+  return (
+    <ConfigProvider>
+      <AuthProvider>
+        <SelectAccountIAMRoleInternal {...props} />
+      </AuthProvider>
+    </ConfigProvider>
+  );
+}
diff --git a/src/react/ui-elements/__tests__/SelectAccountIAMRole.test.tsx b/src/react/ui-elements/__tests__/SelectAccountIAMRole.test.tsx
@@ -4,7 +4,7 @@ import { setupServer } from 'msw/node';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import { TEST_API_BASE_URL } from '../../../react/utils/testUtil';
 import {
-  SelectAccountIAMRole,
+  SelectAccountIAMRoleInternal as SelectAccountIAMRole,
   extractAccountIdFromARN,
 } from '../SelectAccountIAMRole';
 

diff --git a/src/react/workflow/__tests__/ReplicationForm.test.tsx b/src/react/workflow/__tests__/ReplicationForm.test.tsx
@@ -202,6 +202,6 @@ describe('ReplicationForm', () => {
     //V
     await waitFor(()=>{
       expect(screen.queryByRole('status')).not.toBeInTheDocument();
-    }, {timeout: 2000})
+    }, {timeout: 8000})
   }); 
 });