save

scality · Aug 20, 2024 · 2a2fb5b · 2a2fb5b
1 parent a3581dd
commit 2a2fb5b
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 7 deletions.
diff --git a/src/react/queries.ts b/src/react/queries.ts
@@ -72,9 +72,9 @@ export const workflowListQuery = (
   accountId: string,
   instanceId: string,
   rolePathName: string,
+  getToken: () => Promise<string | null>,
   onStart?: () => void,
   filters?: string[],
-  getToken: Promise<string | null>,
 ) => {
   return {
     queryKey: ['workflowList', accountId, instanceId, rolePathName, filters],

diff --git a/src/react/workflow/ConfigurationTab.tsx b/src/react/workflow/ConfigurationTab.tsx
@@ -121,6 +121,7 @@ function useReplicationMutations({
           accountId,
           instanceId,
           rolePathName,
+          getToken,
         ).queryKey,
       );
     },
@@ -173,6 +174,7 @@ function useReplicationMutations({
             accountId,
             instanceId,
             rolePathName,
+            getToken,
           ).queryKey,
         );
       },
@@ -228,6 +230,7 @@ function useExpirationMutations({
           accountId,
           instanceId,
           rolePathName,
+          getToken,
         ).queryKey,
       );
     },
@@ -274,6 +277,7 @@ function useExpirationMutations({
             accountId,
             instanceId,
             rolePathName,
+            getToken,
           ).queryKey,
         );
       },
@@ -335,6 +339,7 @@ function useTransitionMutations(
           accountId,
           instanceId,
           rolePathName,
+          getToken,
         ).queryKey,
       );
     },
@@ -381,6 +386,7 @@ function useTransitionMutations(
             accountId,
             instanceId,
             rolePathName,
+            getToken,
           ).queryKey,
         );
       },

diff --git a/src/react/workflow/CreateWorkflow.tsx b/src/react/workflow/CreateWorkflow.tsx
@@ -40,7 +40,7 @@ import {
 } from '../next-architecture/domain/business/buckets';
 import { useLocationAndStorageInfos } from '../next-architecture/domain/business/locations';
 import { useAccountsLocationsEndpointsAdapter } from '../next-architecture/ui/AccountsLocationsEndpointsAdapterProvider';
-import { useInstanceId } from '../next-architecture/ui/AuthProvider';
+import { useAuth, useInstanceId } from '../next-architecture/ui/AuthProvider';
 import { workflowListQuery } from '../queries';
 import { useQueryParams, useRolePathName } from '../utils/hooks';
 import {
@@ -94,6 +94,7 @@ const CreateWorkflow = () => {
   const mgnt = useManagementClient();
   const queryClient = useQueryClient();
   const instanceId = useInstanceId();
+  const { getToken } = useAuth();
 
   const { versionning } = useBucketVersionning({ bucketName });
   const isBucketVersioningEnabled =
@@ -111,6 +112,7 @@ const CreateWorkflow = () => {
       accountId,
       instanceId,
       rolePathName,
+      getToken,
     ),
     select: (workflows) =>
       workflows.filter((w) => w.replication).map((w) => w.replication),
@@ -210,6 +212,7 @@ const CreateWorkflow = () => {
             notFalsyTypeGuard(accountId),
             notFalsyTypeGuard(instanceId),
             rolePathName,
+            getToken,
           ).queryKey,
         );
         if (bucketName !== '') {
@@ -258,6 +261,7 @@ const CreateWorkflow = () => {
             notFalsyTypeGuard(accountId),
             notFalsyTypeGuard(instanceId),
             rolePathName,
+            getToken,
           ).queryKey,
         );
         if (bucketName !== '') {
@@ -305,6 +309,7 @@ const CreateWorkflow = () => {
             notFalsyTypeGuard(accountId),
             notFalsyTypeGuard(instanceId),
             rolePathName,
+            getToken,
           ).queryKey,
         );
         if (bucketName !== '') {

diff --git a/src/react/workflow/ReplicationForm.tsx b/src/react/workflow/ReplicationForm.tsx
@@ -54,7 +54,7 @@ import {
   flattenFormTouchedFields,
   renderDestination,
 } from './utils';
-import { useInstanceId } from '../next-architecture/ui/AuthProvider';
+import { useAuth, useInstanceId } from '../next-architecture/ui/AuthProvider';
 
 type Props = {
   isCreateMode?: boolean;
@@ -160,12 +160,14 @@ const useReplicationStreams = (account?: Account) => {
   const accountId = account?.id;
   const rolePathName = useRolePathName();
   const mgnt = useManagementClient();
+  const { getToken } = useAuth();
   const replicationsQuery = useQuery({
     ...workflowListQuery(
       notFalsyTypeGuard(mgnt),
-      accountId!,
-      instanceId!,
+      accountId,
+      instanceId,
       rolePathName,
+      getToken,
     ),
     select: (workflows) =>
       workflows.filter((w) => w.replication).map((w) => w.replication),

diff --git a/src/react/workflow/Workflows.tsx b/src/react/workflow/Workflows.tsx
@@ -28,7 +28,7 @@ import {
   networkStart,
 } from '../actions';
 import { useListBucketsForCurrentAccount } from '../next-architecture/domain/business/buckets';
-import { useInstanceId } from '../next-architecture/ui/AuthProvider';
+import { useAuth, useInstanceId } from '../next-architecture/ui/AuthProvider';
 import { useMetricsAdapter } from '../next-architecture/ui/MetricsAdapterProvider';
 import { makeWorkflows, workflowListQuery } from '../queries';
 import { Breadcrumb } from '../ui-elements/Breadcrumb';
@@ -53,13 +53,15 @@ export function useWorkflowsWithSelect<T>(
   const accountId = account?.id;
   const rolePathName = useRolePathName();
   const dispatch = useDispatch();
+  const { getToken } = useAuth();
 
   const workflowsQuery = useQuery({
     ...workflowListQuery(
       notFalsyTypeGuard(mgnt),
       accountId,
       instanceId,
       rolePathName,
+      getToken,
       () => {
         dispatch(networkStart('Loading workflows...'));
       },

diff --git a/src/react/workflow/useDeleteWorkflow.ts b/src/react/workflow/useDeleteWorkflow.ts
@@ -8,7 +8,7 @@ import { notFalsyTypeGuard } from '../../types/typeGuards';
 import { useCurrentAccount } from '../DataServiceRoleProvider';
 import { useManagementClient } from '../ManagementProvider';
 import { networkEnd, networkStart } from '../actions';
-import { useInstanceId } from '../next-architecture/ui/AuthProvider';
+import { useAuth, useInstanceId } from '../next-architecture/ui/AuthProvider';
 import { workflowListQuery } from '../queries';
 import { errorParser } from '../utils';
 import { useRolePathName } from '../utils/hooks';
@@ -23,6 +23,7 @@ export const useDeleteWorkflow = (
   workflowRuleType: WorkflowRule,
   closeModal?: (isClose: boolean) => void,
 ) => {
+  const { getToken } = useAuth();
   const dispatch = useDispatch();
   const queryClient = useQueryClient();
   const managementClient = useManagementClient();
@@ -120,6 +121,7 @@ export const useDeleteWorkflow = (
           accountId,
           instanceId,
           rolePathName,
+          getToken,
         ).queryKey,
       );
       showToast({