Merge branch 'feature/ZKUI-288/support-preferred-read-location-transi…

…ent-bucket' into q/1.6
scality · Nov 25, 2022 · f32e5c2 · f32e5c2
2 parents 0b5bb20 + cf0c6c4
commit f32e5c2
Show file tree

Hide file tree

Showing 9 changed files with 209 additions and 99 deletions.
diff --git a/src/react/backend/location/LocationDetails/storageOptions.ts b/src/react/backend/location/LocationDetails/storageOptions.ts
@@ -193,7 +193,6 @@ export const storageOptions: Record<LocationTypeKey, StorageOptionValues> = {
     supportsReplicationSource: true,
     hasIcon: false,
     checkCapability: 'locationTypeSproxyd',
-    hidden: true,
   },
   'location-wasabi-v1': {
     name: 'Wasabi',

diff --git a/src/react/backend/location/LocationOptions.tsx b/src/react/backend/location/LocationOptions.tsx
@@ -39,8 +39,9 @@ function LocationOptions(props: Props) {
               <Checkbox
                 id="isTransientCheckbox"
                 checked={isTransient}
-                label='Delete objects after successful replication when checked'
+                label="Delete objects after successful replication when checked"
                 onChange={props.onChange}
+                name="isTransient"
               />
             }
           />

diff --git a/src/react/workflow/ConfigurationTab.tsx b/src/react/workflow/ConfigurationTab.tsx
@@ -655,7 +655,7 @@ function EditForm({
             </Stack>
           }
         >
-          <FormSection forceLabelWidth={convertRemToPixels(10)}>
+          <FormSection forceLabelWidth={convertRemToPixels(12)}>
             <FormGroup
               required
               label="Rule Type"
@@ -681,7 +681,7 @@ function EditForm({
             />
           </FormSection>
           <FormSection
-            forceLabelWidth={convertRemToPixels(10)}
+            forceLabelWidth={convertRemToPixels(12)}
             title={{ name: 'General' }}
           >
             {/* The required prop is a little hacky to remove the "optional" label of FormSection */}

diff --git a/src/react/workflow/CreateWorkflow.tsx b/src/react/workflow/CreateWorkflow.tsx
@@ -12,6 +12,7 @@ import { useHistory } from 'react-router';
 import ReplicationForm, {
   disallowedPrefixes,
   GeneralReplicationGroup,
+  isTransientLocation,
   replicationSchema,
 } from './ReplicationForm';
 import { useMutation, useQuery, useQueryClient } from 'react-query';
@@ -135,6 +136,7 @@ const CreateWorkflow = () => {
               unallowedBucketName,
               disPrefixes,
               prefixMandatory,
+              isTransientLocation(bucketList, locations, bucketName),
             ),
           ),
           otherwise: Joi.valid(),
@@ -342,7 +344,7 @@ const CreateWorkflow = () => {
       >
         <FormSection
           title={{ name: 'General' }}
-          forceLabelWidth={convertRemToPixels(10)}
+          forceLabelWidth={convertRemToPixels(12)}
         >
           <FormGroup
             required

diff --git a/src/react/workflow/ExpirationForm.tsx b/src/react/workflow/ExpirationForm.tsx
@@ -124,7 +124,7 @@ export function GeneralExpirationGroup({
 }
 
 export function ExpirationForm({ bucketList, locations, prefix = '' }: Props) {
-  const forceLabelWidth = convertRemToPixels(10);
+  const forceLabelWidth = convertRemToPixels(12);
   const methods = useFormContext();
   const { register, control, watch, getValues, setValue, trigger } = methods;
   const { errors: formErrors } = methods.formState;