ZKUI-397: Change the usecase tag to X-Scality-Usecase

scality · Nov 9, 2023 · ac73c46 · ac73c46
1 parent 28a7f9e
commit ac73c46
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/src/react/databrowser/buckets/details/Overview.tsx b/src/react/databrowser/buckets/details/Overview.tsx
@@ -30,9 +30,10 @@ import { useWorkflows } from '../../../workflow/Workflows';
 import { useEffect, useState } from 'react';
 import { Button } from '@scality/core-ui/dist/next';
 import {
+  BUCKET_TAG_USECASE,
   VEEAMVERSION11,
   VEEAMVERSION12,
-} from '../../../ui-elements/Veeam/VeeamConfiguration';
+} from '../../../ui-elements/Veeam/VeeamConstants';
 
 function capitalize(string: string) {
   return string.toLowerCase().replace(/^\w/, (c) => {
@@ -97,15 +98,16 @@ function Overview({ bucket, ingestionStates }: Props) {
   const [isErrorModalOpen, setIsErrorModalOpen] = useState(false);
 
   const { tags } = useBucketTagging({ bucketName: bucket.name });
-  console.log('fff', features.includes('Veeam'));
-  console.log('tags', tags);
+  const VEEAM_FEATURE_FLAG_ENABLED = features.includes('Veeam');
   const isVeeamBucket =
     tags.status === 'success' &&
-    (tags.value?.Usecase === VEEAMVERSION11 ||
-      tags.value?.Usecase === VEEAMVERSION12) &&
-    features.includes('Veeam');
-  const isVeeam12 = isVeeamBucket && tags.value.Usecase === VEEAMVERSION12;
-  console.log({ isVeeamBucket });
+    (tags.value?.[BUCKET_TAG_USECASE] === VEEAMVERSION11 ||
+      tags.value?.[BUCKET_TAG_USECASE] === VEEAMVERSION12) &&
+    VEEAM_FEATURE_FLAG_ENABLED;
+
+  const isVeeam12 =
+    isVeeamBucket && tags.value?.[BUCKET_TAG_USECASE] === VEEAMVERSION12;
+
   useEffect(() => {
     dispatch(getBucketInfo(bucket.name));
   }, [dispatch, bucket.name]);
@@ -252,7 +254,7 @@ function Overview({ bucket, ingestionStates }: Props) {
               <T.GroupName> Use-case </T.GroupName>
               <T.Row>
                 <T.Key> Use-case </T.Key>
-                <T.Value> Backup - {tags.value.Usecase}</T.Value>
+                <T.Value> Backup - {tags.value?.[BUCKET_TAG_USECASE]}</T.Value>
               </T.Row>
               {isVeeam12 && (
                 <T.Row>
@@ -281,11 +283,7 @@ function Overview({ bucket, ingestionStates }: Props) {
                 <T.Row>
                   <T.Key> Default Object-lock Retention </T.Key>
                   <T.GroupValues>
-                    {isVeeamBucket ? (
-                      <>Managed by Veeam</>
-                    ) : (
-                      <div>{getDefaultBucketRetention(bucketInfo)}</div>
-                    )}
+                    <div>{getDefaultBucketRetention(bucketInfo)}</div>
                     <Button
                       id="edit-retention-btn"
                       variant="outline"
@@ -297,6 +295,10 @@ function Overview({ bucket, ingestionStates }: Props) {
                         );
                       }}
                       disabled={isVeeamBucket}
+                      tooltip={{
+                        overlay:
+                          'Edition is disabled as it is managed by Veeam.',
+                      }}
                     />
                   </T.GroupValues>
                 </T.Row>

diff --git a/src/react/next-architecture/domain/business/buckets.ts b/src/react/next-architecture/domain/business/buckets.ts
@@ -92,12 +92,9 @@ export const queries = {
     enabled: !!buckets.length,
     ...noRefetchOptions,
   }),
-  getBucketTagging: (s3Client: S3, bucketName?: string) => ({
+  getBucketTagging: (s3Client: S3, bucketName: string) => ({
     queryKey: ['bucketTagging', getS3ClientHash(s3Client), bucketName],
-    queryFn: () =>
-      s3Client
-        .getBucketTagging({ Bucket: notFalsyTypeGuard(bucketName) })
-        .promise(),
+    queryFn: () => s3Client.getBucketTagging({ Bucket: bucketName }).promise(),
     enabled: !!bucketName && !!s3Client.config.credentials?.accessKeyId,
     ...noRefetchOptions,
   }),

diff --git a/src/react/ui-elements/Veeam/VeeamConfiguration.tsx b/src/react/ui-elements/Veeam/VeeamConfiguration.tsx
@@ -5,9 +5,7 @@ import { Button, Input, Select } from '@scality/core-ui/dist/next';
 import { useRef, useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 import VeeamTable from './VeeamTable';
-
-export const VEEAMVERSION11 = 'Veeam 11';
-export const VEEAMVERSION12 = 'Veeam 12';
+import { VEEAMVERSION11, VEEAMVERSION12 } from './VeeamConstants';
 
 const schema = Joi.object({
   name: Joi.string().required(),

diff --git a/src/react/ui-elements/Veeam/VeeamConstants.ts b/src/react/ui-elements/Veeam/VeeamConstants.ts
@@ -0,0 +1,3 @@
+export const BUCKET_TAG_USECASE = 'X-Scality-Usecase';
+export const VEEAMVERSION11 = 'Veeam 11';
+export const VEEAMVERSION12 = 'Veeam 12';