@scality/data-browser-library 1.0.8 → 1.1.0

package/dist/components/buckets/BucketReplicationFormPage.js

@@ -5,13 +5,14 @@ import { convertRemToPixels } from "@scality/core-ui/dist/components/tablev2/Tab
 import { Box, Button, Input, Select } from "@scality/core-ui/dist/next";
 import joi from "joi";
 import { useCallback, useEffect, useMemo, useRef } from "react";
-import { Controller, FormProvider, useFieldArray, useForm } from "react-hook-form";
+import { Controller, FormProvider, useFieldArray, useForm, useFormContext } from "react-hook-form";
 import { useParams } from "react-router";
 import { useDataBrowserUICustomization } from "../../contexts/DataBrowserUICustomizationContext.js";
 import { useGetBucketReplication, useSetBucketReplication } from "../../hooks/bucketConfiguration.js";
 import { useBuckets } from "../../hooks/bucketOperations.js";
-import { useISVBucketStatus } from "../../hooks/useISVBucketDetection.js";
 import { useDataBrowserNavigate } from "../../hooks/useDataBrowserNavigate.js";
+import { useFeatures } from "../../hooks/useFeatures.js";
+import { useISVBucketStatus } from "../../hooks/useISVBucketDetection.js";
 import { AWS_RULE_LIMITS, STATUS_OPTIONS, buildS3Filter } from "../../utils/s3RuleUtils.js";
 import { FilterFormSection, createFilterValidationSchema } from "../ui/FilterFormSection.js";
 const storageClassOptions = [
@@ -44,7 +45,7 @@ const storageClassOptions = [
         label: 'Glacier Instant Retrieval'
     }
 ];
-const createSchema = (hasExistingRules)=>joi.object({
+const createSchema = (hasExistingRules, hasCustomDestination)=>joi.object({
         role: hasExistingRules ? joi.string().optional() : joi.string().required().messages({
             'string.empty': 'Role ARN is required for first replication rule'
         }),
@@ -61,10 +62,10 @@ const createSchema = (hasExistingRules)=>joi.object({
         includeEncryptedObjects: joi.boolean(),
         replicaModifications: joi.boolean(),
         sameAccount: joi.boolean(),
-        targetBucket: joi.string().required().messages({
+        targetBucket: hasCustomDestination ? joi.string().allow('').optional() : joi.string().required().messages({
             'string.empty': 'Target bucket is required'
         }),
-        targetAccountId: joi.when('sameAccount', {
+        targetAccountId: hasCustomDestination ? joi.string().allow('').optional() : joi.when('sameAccount', {
             is: false,
             then: joi.string().required().messages({
                 'string.empty': 'Target account ID is required for cross-account replication'
@@ -185,8 +186,10 @@ const ToggleFormField = ({ name, label, id, control, labelHelpTooltip })=>/*#__P
                 })
         })
     });
-const buildDestination = (data)=>({
-        Bucket: `arn:aws:s3:::${data.targetBucket}`,
+const buildDestination = (data, sourceBucketName)=>{
+    const bucketName = data.targetBucket || sourceBucketName;
+    return {
+        Bucket: `arn:aws:s3:::${bucketName}`,
         ...!data.sameAccount && data.targetAccountId && '' !== data.targetAccountId.trim() && {
             Account: data.targetAccountId
         },
@@ -219,7 +222,8 @@ const buildDestination = (data)=>({
                 Owner: 'Destination'
             }
         }
-    });
+    };
+};
 const buildSourceSelectionCriteria = (data)=>{
     if (data.includeEncryptedObjects || data.replicaModifications) return {
         ...data.includeEncryptedObjects && {
@@ -234,12 +238,12 @@ const buildSourceSelectionCriteria = (data)=>{
         }
     };
 };
-const buildReplicationRule = (data)=>{
+const buildReplicationRule = (data, sourceBucketName)=>{
     const rule = {
         ID: data.ruleId,
         Status: data.status,
         Priority: data.priority ?? 0,
-        Destination: buildDestination(data)
+        Destination: buildDestination(data, sourceBucketName)
     };
     const filter = buildS3Filter(data);
     if (filter) rule.Filter = filter;
@@ -250,18 +254,95 @@ const buildReplicationRule = (data)=>{
     };
     return rule;
 };
+function DefaultReplicationDestinationFields() {
+    const { watch, register, control, formState: { errors } } = useFormContext();
+    const { bucketName } = useParams();
+    const { data: bucketsData } = useBuckets();
+    const availableBuckets = bucketsData?.Buckets || [];
+    const sameAccount = watch('sameAccount');
+    const showAdvancedReplication = useFeatures('replicationAdvanced');
+    return /*#__PURE__*/ jsxs(Fragment, {
+        children: [
+            /*#__PURE__*/ jsx(FormGroup, {
+                label: "Destination",
+                id: "sameAccount",
+                direction: "horizontal",
+                labelHelpTooltip: "Toggle between same-account and cross-account replication destination",
+                content: /*#__PURE__*/ jsx(Controller, {
+                    name: "sameAccount",
+                    control: control,
+                    render: ({ field })=>/*#__PURE__*/ jsx(Toggle, {
+                            toggle: field.value,
+                            onChange: field.onChange,
+                            label: field.value ? 'Same account destination' : 'Not same account destination'
+                        })
+                })
+            }),
+            sameAccount ? /*#__PURE__*/ jsx(Fragment, {}) : /*#__PURE__*/ jsx("div", {
+                style: {
+                    paddingLeft: spacing.r24
+                },
+                children: /*#__PURE__*/ jsx(FormGroup, {
+                    label: "Target account ID",
+                    id: "targetAccountId",
+                    direction: "horizontal",
+                    error: errors?.targetAccountId?.message,
+                    helpErrorPosition: "bottom",
+                    required: true,
+                    content: /*#__PURE__*/ jsx(Input, {
+                        id: "targetAccountId",
+                        placeholder: "Account ID",
+                        ...register('targetAccountId')
+                    })
+                })
+            }),
+            /*#__PURE__*/ jsx(FormGroup, {
+                label: "Target Bucket",
+                id: "targetBucket",
+                direction: "horizontal",
+                error: errors?.targetBucket?.message,
+                helpErrorPosition: "bottom",
+                required: true,
+                content: sameAccount ? /*#__PURE__*/ jsx(Controller, {
+                    name: "targetBucket",
+                    control: control,
+                    render: ({ field })=>/*#__PURE__*/ jsx(Select, {
+                            id: "targetBucket",
+                            value: field.value,
+                            onChange: field.onChange,
+                            placeholder: "Select a bucket",
+                            children: availableBuckets.filter((bucket)=>bucket.Name !== bucketName).map((bucket)=>/*#__PURE__*/ jsx(Select.Option, {
+                                    value: bucket.Name || '',
+                                    children: bucket.Name
+                                }, bucket.Name))
+                        })
+                }) : /*#__PURE__*/ jsx(Input, {
+                    id: "targetBucket",
+                    placeholder: "Bucket name",
+                    ...register('targetBucket')
+                })
+            }),
+            showAdvancedReplication && !sameAccount ? /*#__PURE__*/ jsx(ToggleFormField, {
+                name: "switchObjectOwnership",
+                label: "Switch Object ownership",
+                id: "switchObjectOwnership",
+                control: control,
+                labelHelpTooltip: "Change replica ownership to destination bucket owner (AccessControlTranslation)"
+            }) : /*#__PURE__*/ jsx(Fragment, {})
+        ]
+    });
+}
 function BucketReplicationFormPage() {
-    const { storageClassSelector: StorageClassSelector, storageClassLabel } = useDataBrowserUICustomization();
+    const { storageClassSelector: StorageClassSelector, storageClassLabel, replicationRoleDefault, replicationDestinationFields: CustomDestinationFields } = useDataBrowserUICustomization();
     const { bucketName, ruleId } = useParams();
     const navigate = useDataBrowserNavigate();
     const { showToast } = useToast();
     const isEditMode = !!ruleId;
+    const showAdvancedReplication = useFeatures('replicationAdvanced');
     const { isISVManaged, isvApplication, isLoading: isISVLoading } = useISVBucketStatus(bucketName);
     const { data: replicationData, status: replicationStatus } = useGetBucketReplication({
         Bucket: bucketName
     });
-    const { data: bucketsData } = useBuckets();
-    const availableBuckets = bucketsData?.Buckets || [];
     const existingRole = replicationData?.ReplicationConfiguration?.Role || '';
     const hasExistingRules = (replicationData?.ReplicationConfiguration?.Rules || []).length > 0;
     const existingRule = useMemo(()=>{
@@ -286,20 +367,21 @@ function BucketReplicationFormPage() {
     }, [
         replicationData
     ]);
-    const dynamicSchema = useMemo(()=>createSchema(hasExistingRules).keys({
+    const dynamicSchema = useMemo(()=>createSchema(hasExistingRules, !!CustomDestinationFields).keys({
             ruleId: joi.string().required().invalid(...existingRuleIds).messages({
                 'string.empty': 'Rule ID is required',
                 'any.invalid': 'A rule with this ID already exists'
             })
         }), [
         existingRuleIds,
-        hasExistingRules
+        hasExistingRules,
+        CustomDestinationFields
     ]);
     const methods = useForm({
         resolver: joiResolver(dynamicSchema),
         mode: 'onChange',
         defaultValues: {
-            role: '',
+            role: replicationRoleDefault || '',
             ruleId: '',
             status: 'Enabled',
             priority: null,
@@ -327,11 +409,35 @@ function BucketReplicationFormPage() {
         name: 'tags'
     });
     const filterType = watch('filterType');
-    const sameAccount = watch('sameAccount');
     const encryptReplicatedObjects = watch('encryptReplicatedObjects');
     const includeEncryptedObjects = watch('includeEncryptedObjects');
     const deleteMarkerReplication = watch('deleteMarkerReplication');
     const enforceRTC = watch('enforceRTC');
+    const storageClassField = /*#__PURE__*/ jsx(FormGroup, {
+        label: storageClassLabel || 'Storage Class',
+        id: "storageClass",
+        direction: "horizontal",
+        error: errors?.storageClass?.message,
+        helpErrorPosition: "bottom",
+        labelHelpTooltip: StorageClassSelector ? void 0 : 'Storage class for replicated objects in destination bucket',
+        content: /*#__PURE__*/ jsx(Controller, {
+            name: "storageClass",
+            control: control,
+            render: ({ field })=>StorageClassSelector ? /*#__PURE__*/ jsx(StorageClassSelector, {
+                    value: field.value,
+                    onChange: field.onChange,
+                    context: "replication"
+                }) : /*#__PURE__*/ jsx(Select, {
+                    id: "storageClass",
+                    value: field.value,
+                    onChange: field.onChange,
+                    children: storageClassOptions.map((option)=>/*#__PURE__*/ jsx(Select.Option, {
+                            value: option.value,
+                            children: option.label
+                        }, option.value))
+                })
+        })
+    });
     const { mutate: setReplication, isPending: isSaving } = useSetBucketReplication();
     const loadedRuleIdRef = useRef(null);
     useEffect(()=>{
@@ -344,7 +450,7 @@ function BucketReplicationFormPage() {
         } else if (!isEditMode && !isDirty) {
             reset((prev)=>({
                     ...prev,
-                    role: existingRole,
+                    role: existingRole || replicationRoleDefault || '',
                     priority: nextAvailablePriority
                 }));
             loadedRuleIdRef.current = null;
@@ -353,6 +459,7 @@ function BucketReplicationFormPage() {
         isEditMode,
         existingRule,
         existingRole,
+        replicationRoleDefault,
         nextAvailablePriority,
         isDirty,
         reset
@@ -425,7 +532,7 @@ function BucketReplicationFormPage() {
     ]);
     const onSubmit = useCallback((data)=>{
         if (!bucketName) return;
-        const rule = buildReplicationRule(data);
+        const rule = buildReplicationRule(data, bucketName);
         const existingRules = replicationData?.ReplicationConfiguration?.Rules || [];
         const updatedRules = isEditMode ? existingRules.map((r)=>r.ID === existingRule?.ID ? rule : r) : [
             ...existingRules,
@@ -553,7 +660,7 @@ function BucketReplicationFormPage() {
                         direction: "horizontal",
                         error: errors?.role?.message,
                         helpErrorPosition: "bottom",
-                        required: !hasExistingRules,
+                        required: true,
                         content: hasExistingRules ? /*#__PURE__*/ jsxs(Stack, {
                             direction: "vertical",
                             gap: "r8",
@@ -562,6 +669,7 @@ function BucketReplicationFormPage() {
                                     children: existingRole || 'Not set'
                                 }),
                                 /*#__PURE__*/ jsx(Text, {
+                                    variant: "Small",
                                     color: "textSecondary",
                                     children: "To change the Role, edit it through bucket configuration or delete all rules first"
                                 })
@@ -603,14 +711,10 @@ function BucketReplicationFormPage() {
                             content: /*#__PURE__*/ jsx(Controller, {
                                 name: "status",
                                 control: control,
-                                render: ({ field })=>/*#__PURE__*/ jsx(Select, {
-                                        id: "status",
-                                        value: field.value,
-                                        onChange: field.onChange,
-                                        children: STATUS_OPTIONS.map((option)=>/*#__PURE__*/ jsx(Select.Option, {
-                                                value: option.value,
-                                                children: option.label
-                                            }, option.value))
+                                render: ({ field })=>/*#__PURE__*/ jsx(Toggle, {
+                                        toggle: 'Enabled' === field.value,
+                                        onChange: (e)=>field.onChange(e.target.checked ? 'Enabled' : 'Disabled'),
+                                        label: 'Enabled' === field.value ? 'Enabled' : 'Disabled'
                                     })
                             })
                         }),
@@ -652,98 +756,22 @@ function BucketReplicationFormPage() {
                     removeTag: removeTag,
                     errors: errors
                 }),
-                /*#__PURE__*/ jsxs(FormSection, {
+                /*#__PURE__*/ jsx(FormSection, {
                     title: {
                         name: 'Destination'
                     },
                     forceLabelWidth: convertRemToPixels(15),
-                    children: [
-                        /*#__PURE__*/ jsx(FormGroup, {
-                            label: "Destination",
-                            id: "sameAccount",
-                            direction: "horizontal",
-                            content: /*#__PURE__*/ jsx(Controller, {
-                                name: "sameAccount",
-                                control: control,
-                                render: ({ field })=>/*#__PURE__*/ jsx(Toggle, {
-                                        toggle: field.value,
-                                        onChange: field.onChange,
-                                        label: field.value ? 'Same account destination' : 'Not same account destination'
-                                    })
-                            })
-                        }),
-                        sameAccount ? /*#__PURE__*/ jsx(Fragment, {}) : /*#__PURE__*/ jsx(FormGroup, {
-                            label: "Target account ID",
-                            id: "targetAccountId",
-                            direction: "horizontal",
-                            error: errors?.targetAccountId?.message,
-                            helpErrorPosition: "bottom",
-                            required: true,
-                            content: /*#__PURE__*/ jsx(Input, {
-                                id: "targetAccountId",
-                                placeholder: "Account ID",
-                                ...register('targetAccountId')
-                            })
-                        }),
-                        /*#__PURE__*/ jsx(FormGroup, {
-                            label: "Target Bucket",
-                            id: "targetBucket",
-                            direction: "horizontal",
-                            error: errors?.targetBucket?.message,
-                            helpErrorPosition: "bottom",
-                            required: true,
-                            content: sameAccount ? /*#__PURE__*/ jsx(Controller, {
-                                name: "targetBucket",
-                                control: control,
-                                render: ({ field })=>/*#__PURE__*/ jsx(Select, {
-                                        id: "targetBucket",
-                                        value: field.value,
-                                        onChange: field.onChange,
-                                        placeholder: "Select a bucket",
-                                        children: availableBuckets.filter((bucket)=>bucket.Name !== bucketName).map((bucket)=>/*#__PURE__*/ jsx(Select.Option, {
-                                                value: bucket.Name || '',
-                                                children: bucket.Name
-                                            }, bucket.Name))
-                                    })
-                            }) : /*#__PURE__*/ jsx(Input, {
-                                id: "targetBucket",
-                                placeholder: "Bucket name",
-                                ...register('targetBucket')
-                            })
-                        }),
-                        /*#__PURE__*/ jsx(FormGroup, {
-                            label: storageClassLabel || 'Storage Class',
-                            id: "storageClass",
-                            direction: "horizontal",
-                            error: errors?.storageClass?.message,
-                            helpErrorPosition: "bottom",
-                            labelHelpTooltip: StorageClassSelector ? void 0 : 'Storage class for replicated objects in destination bucket',
-                            content: /*#__PURE__*/ jsx(Controller, {
-                                name: "storageClass",
-                                control: control,
-                                render: ({ field })=>StorageClassSelector ? /*#__PURE__*/ jsx(StorageClassSelector, {
-                                        value: field.value,
-                                        onChange: field.onChange,
-                                        context: "replication"
-                                    }) : /*#__PURE__*/ jsx(Select, {
-                                        id: "storageClass",
-                                        value: field.value,
-                                        onChange: field.onChange,
-                                        children: storageClassOptions.map((option)=>/*#__PURE__*/ jsx(Select.Option, {
-                                                value: option.value,
-                                                children: option.label
-                                            }, option.value))
-                                    })
-                            })
-                        }),
-                        sameAccount ? /*#__PURE__*/ jsx(Fragment, {}) : /*#__PURE__*/ jsx(ToggleFormField, {
-                            name: "switchObjectOwnership",
-                            label: "Switch Object ownership",
-                            id: "switchObjectOwnership",
-                            control: control,
-                            labelHelpTooltip: "Change replica ownership to destination bucket owner (AccessControlTranslation)"
-                        })
-                    ]
+                    children: CustomDestinationFields ? /*#__PURE__*/ jsxs(Fragment, {
+                        children: [
+                            storageClassField,
+                            /*#__PURE__*/ jsx(CustomDestinationFields, {})
+                        ]
+                    }) : /*#__PURE__*/ jsxs(Fragment, {
+                        children: [
+                            /*#__PURE__*/ jsx(DefaultReplicationDestinationFields, {}),
+                            storageClassField
+                        ]
+                    })
                 }),
                 /*#__PURE__*/ jsxs(FormSection, {
                     title: {
@@ -781,29 +809,35 @@ function BucketReplicationFormPage() {
                                             })
                                     }),
                                     includeEncryptedObjects && /*#__PURE__*/ jsx(Text, {
+                                        variant: "Small",
                                         color: "textSecondary",
                                         children: "Encryption is required when replicating encrypted objects"
                                     })
                                 ]
                             })
                         }),
-                        encryptReplicatedObjects ? /*#__PURE__*/ jsx(FormGroup, {
-                            label: "Replica KMS Key ID",
-                            id: "replicaKmsKeyId",
-                            direction: "horizontal",
-                            error: errors?.replicaKmsKeyId?.message,
-                            helpErrorPosition: "bottom",
-                            labelHelpTooltip: "KMS key ID or ARN to use for encrypting replicated objects",
-                            required: true,
-                            content: /*#__PURE__*/ jsx(Input, {
+                        encryptReplicatedObjects ? /*#__PURE__*/ jsx("div", {
+                            style: {
+                                paddingLeft: spacing.r24
+                            },
+                            children: /*#__PURE__*/ jsx(FormGroup, {
+                                label: "Replica KMS Key ID",
                                 id: "replicaKmsKeyId",
-                                placeholder: "KMS Key ID or ARN",
-                                ...register('replicaKmsKeyId')
+                                direction: "horizontal",
+                                error: errors?.replicaKmsKeyId?.message,
+                                helpErrorPosition: "bottom",
+                                labelHelpTooltip: "KMS key ID or ARN to use for encrypting replicated objects",
+                                required: true,
+                                content: /*#__PURE__*/ jsx(Input, {
+                                    id: "replicaKmsKeyId",
+                                    placeholder: "KMS Key ID or ARN",
+                                    ...register('replicaKmsKeyId')
+                                })
                             })
                         }) : /*#__PURE__*/ jsx(Fragment, {})
                     ]
                 }),
-                /*#__PURE__*/ jsxs(FormSection, {
+                showAdvancedReplication && /*#__PURE__*/ jsxs(FormSection, {
                     title: {
                         name: 'Additional Options'
                     },
@@ -837,6 +871,7 @@ function BucketReplicationFormPage() {
                                             })
                                     }),
                                     enforceRTC && /*#__PURE__*/ jsx(Text, {
+                                        variant: "Small",
                                         color: "textSecondary",
                                         children: "Metrics must be enabled when RTC is enabled"
                                     })
@@ -872,6 +907,7 @@ function BucketReplicationFormPage() {
                                             })
                                     }),
                                     ('tags' === filterType || 'and' === filterType) && /*#__PURE__*/ jsx(Text, {
+                                        variant: "Small",
                                         color: "textSecondary",
                                         children: "Delete marker replication is not supported for tag-based filters"
                                     })
@@ -884,4 +920,4 @@ function BucketReplicationFormPage() {
         })
     });
 }
-export { BucketReplicationFormPage };
+export { BucketReplicationFormPage, DefaultReplicationDestinationFields };

package/dist/components/buckets/BucketVersioning.js

@@ -11,7 +11,7 @@ function BucketVersioning({ tooltipOverlay }) {
     const { data: objectLockData, status: objectLockStatus } = useGetBucketObjectLockConfiguration({
         Bucket: bucketName
     });
-    const { isVeeamBucket } = useISVBucketStatus(bucketName);
+    const { isISVManaged, isvApplication } = useISVBucketStatus(bucketName);
     const { mutate: changeBucketVersioning } = useSetBucketVersioning();
     const { showToast } = useToast();
     const isObjectLockEnabled = objectLockData?.ObjectLockConfiguration?.ObjectLockEnabled === 'Enabled';
@@ -24,11 +24,13 @@ function BucketVersioning({ tooltipOverlay }) {
             }
         }, {
             onSuccess: ()=>{
-                showToast({
-                    open: true,
-                    message: isVersioning ? 'Bucket versioning enabled' : 'Bucket versioning suspended',
-                    status: 'success'
-                });
+                setTimeout(()=>{
+                    showToast({
+                        open: true,
+                        message: isVersioning ? 'Bucket versioning enabled' : 'Bucket versioning disabled',
+                        status: 'success'
+                    });
+                }, 500);
             },
             onError: (error)=>{
                 showToast({
@@ -48,13 +50,17 @@ function BucketVersioning({ tooltipOverlay }) {
             "Enabled",
             /*#__PURE__*/ jsx("br", {}),
             /*#__PURE__*/ jsx(SmallerText, {
-                children: "Versioning cannot be suspended because Object-lock is enabled for this bucket."
+                children: "Versioning cannot be disabled because Object-lock is enabled for this bucket."
             })
         ]
     });
     return /*#__PURE__*/ jsx(Tooltip, {
-        overlay: tooltipOverlay ? tooltipOverlay : isVeeamBucket ? /*#__PURE__*/ jsx(Fragment, {
-            children: "Enabling versioning is not possible due to the bucket being managed by Veeam."
+        overlay: tooltipOverlay ? tooltipOverlay : isISVManaged ? /*#__PURE__*/ jsxs(Fragment, {
+            children: [
+                "Enabling versioning is not possible due to the bucket being managed by ",
+                isvApplication,
+                "."
+            ]
         }) : 'error' === versioningStatus ? /*#__PURE__*/ jsx(Fragment, {
             children: versioningError?.message
         }) : null,
@@ -63,7 +69,7 @@ function BucketVersioning({ tooltipOverlay }) {
         },
         children: /*#__PURE__*/ jsx(Toggle, {
             id: "versioningToggle",
-            disabled: 'pending' === versioningStatus || 'pending' === objectLockStatus || 'error' === versioningStatus || isVeeamBucket,
+            disabled: 'pending' === versioningStatus || 'pending' === objectLockStatus || 'error' === versioningStatus || isISVManaged,
             toggle: isVersioningEnabled,
             label: isVersioningEnabled ? 'Active' : 'Inactive',
             onChange: ()=>{