From 0e0be3d91d99168470bd7036b53a3d0585ac460d Mon Sep 17 00:00:00 2001
From: SanjalKatiyar <sanjaldhir@gmail.com>
Date: Mon, 14 Oct 2024 14:17:05 +0530
Subject: [PATCH] Cleanup + Bug fixes

---
 locales/en/plugin__odf-console.json           |  2 +
 .../object-service.tsx                        | 10 ++-
 .../components/resource-pages/list-page.tsx   |  4 +-
 .../s3-browser/bucket-overview/PageTitle.tsx  | 48 +++++++++++-
 .../buckets-list-page/bucketPagination.tsx    | 23 +++++-
 .../s3-browser/objects-list/ObjectsList.tsx   | 12 +++
 .../objects-list/table-components.tsx         | 12 ++-
 .../s3-browser/pagination-helper.tsx          | 78 ++++++++++++++++---
 packages/odf/constants/s3-browser.ts          |  3 +-
 packages/shared/src/s3/commands.ts            | 18 ++---
 packages/shared/src/s3/types.ts               | 26 +++----
 plugins/odf/console-extensions.json           |  6 ++
 12 files changed, 195 insertions(+), 47 deletions(-)

diff --git a/locales/en/plugin__odf-console.json b/locales/en/plugin__odf-console.json
index e9bb991cf..895aca955 100644
--- a/locales/en/plugin__odf-console.json
+++ b/locales/en/plugin__odf-console.json
@@ -1154,6 +1154,8 @@
   "Share with presigned URL": "Share with presigned URL",
   "No objects found": "No objects found",
   "You do not have any objects in the bucket": "You do not have any objects in the bucket",
+  "many": "many",
+  "{{ fromCount }} - {{ toCount }} of {{ totalCount }}": "{{ fromCount }} - {{ toCount }} of {{ totalCount }}",
   "<0>The amount of storage allocated to the client cluster for usage.</0><1>Due to simultaneous usage by multiple client clusters, actual available storage may vary affecting your allocated storage quota.</1>": "<0>The amount of storage allocated to the client cluster for usage.</0><1>Due to simultaneous usage by multiple client clusters, actual available storage may vary affecting your allocated storage quota.</1>",
   "No storage clients found.": "No storage clients found.",
   "You do not have any storage clients connected to this Data Foundation provider cluster.": "You do not have any storage clients connected to this Data Foundation provider cluster.",
diff --git a/packages/odf/components/object-service-nav-item/object-service.tsx b/packages/odf/components/object-service-nav-item/object-service.tsx
index c06d40475..f8dfbec8f 100644
--- a/packages/odf/components/object-service-nav-item/object-service.tsx
+++ b/packages/odf/components/object-service-nav-item/object-service.tsx
@@ -16,6 +16,7 @@ import Tabs, { TabPage } from '@odf/shared/utils/Tabs';
 import {
   useResolvedExtensions,
   NamespaceBar,
+  useFlag,
 } from '@openshift-console/dynamic-plugin-sdk';
 import {
   Extension,
@@ -28,6 +29,8 @@ import {
   useLocation,
   useNavigate,
 } from 'react-router-dom-v5-compat';
+import { BUCKETS_BASE_ROUTE } from '../../constants';
+import { MCG_STANDALONE } from '../../features';
 
 const OBJECT_SERVICE_CONTEXT = 'odf-object-service';
 const NAMESPACE_BAR_PATHS = [referenceForModel(NooBaaObjectBucketClaimModel)];
@@ -39,6 +42,8 @@ const ObjectServicePage: React.FC = () => {
   const { t } = useCustomTranslation();
   const title = t('Object Storage');
 
+  const isMCGStandalone = useFlag(MCG_STANDALONE);
+
   const [extensions, isLoaded, error] = useResolvedExtensions<HorizontalNavTab>(
     isObjectServiceTab as ExtensionTypeGuard<HorizontalNavTab>
   );
@@ -60,12 +65,13 @@ const ObjectServicePage: React.FC = () => {
   React.useEffect(() => {
     if (
       (location.pathname.endsWith('/odf/object-storage') ||
-        location.pathname.endsWith('/odf/object-storage/')) &&
+        location.pathname.endsWith('/odf/object-storage/') ||
+        (!isMCGStandalone && location.pathname.includes(BUCKETS_BASE_ROUTE))) &&
       !_.isEmpty(sortedPages)
     ) {
       navigate('/odf/object-storage/' + sortedPages[0].href, { replace: true });
     }
-  }, [location.pathname, navigate, sortedPages]);
+  }, [location.pathname, navigate, sortedPages, isMCGStandalone]);
 
   const showNamespaceBar = NAMESPACE_BAR_PATHS.some((path) =>
     location.pathname.includes(path)
diff --git a/packages/odf/components/resource-pages/list-page.tsx b/packages/odf/components/resource-pages/list-page.tsx
index eb0806df8..dd55df248 100644
--- a/packages/odf/components/resource-pages/list-page.tsx
+++ b/packages/odf/components/resource-pages/list-page.tsx
@@ -211,8 +211,8 @@ const GenericListPage: React.FC<GenericListPageProps> = ({
           hideColumnManagement={true}
         />
         <ResourceTable
-          data={filteredData}
-          unfilteredData={data}
+          data={filteredData || []}
+          unfilteredData={data || []}
           loaded={loaded && isODFNsLoaded}
           loadError={loadError || odfNsLoadError}
           rowData={{ resourceModel, kebabActions }}
diff --git a/packages/odf/components/s3-browser/bucket-overview/PageTitle.tsx b/packages/odf/components/s3-browser/bucket-overview/PageTitle.tsx
index 1f2b39169..0826a710f 100644
--- a/packages/odf/components/s3-browser/bucket-overview/PageTitle.tsx
+++ b/packages/odf/components/s3-browser/bucket-overview/PageTitle.tsx
@@ -1,11 +1,19 @@
 import * as React from 'react';
+import { useUserSettingsLocalStorage } from '@odf/shared/hooks/useUserSettingsLocalStorage';
 import { resourceStatus as getResourceStatus } from '@odf/shared/status/Resource';
 import { K8sResourceKind } from '@odf/shared/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { ResourceStatus } from '@openshift-console/dynamic-plugin-sdk';
 import Status from '@openshift-console/dynamic-plugin-sdk/lib/app/components/status/Status';
-import { Label, Button, ButtonVariant } from '@patternfly/react-core';
-import { CopyIcon } from '@patternfly/react-icons';
+import {
+  Label,
+  Button,
+  ButtonVariant,
+  ButtonType,
+} from '@patternfly/react-core';
+import { CopyIcon, StarIcon } from '@patternfly/react-icons';
+import { global_warning_color_100 as warningColor } from '@patternfly/react-tokens';
+import { BUCKET_BOOKMARKS_USER_SETTINGS_KEY } from '../../../constants';
 import { getPath } from '../../../utils';
 import './bucket-overview.scss';
 
@@ -17,7 +25,11 @@ type TitleProps = {
   noobaaObjectBucket: K8sResourceKind;
 };
 
-const BucketResourceStatus: React.FC<{ resourceStatus: string }> = ({
+type BucketResourceStatusProps = { resourceStatus: string };
+
+type FavoriteProps = { bucketName: string };
+
+const BucketResourceStatus: React.FC<BucketResourceStatusProps> = ({
   resourceStatus,
 }) => (
   <ResourceStatus additionalClassNames="bucket-label--margin-top">
@@ -25,6 +37,33 @@ const BucketResourceStatus: React.FC<{ resourceStatus: string }> = ({
   </ResourceStatus>
 );
 
+const Favorite: React.FC<FavoriteProps> = ({ bucketName }) => {
+  const [favorites, setFavorites] = useUserSettingsLocalStorage<string[]>(
+    BUCKET_BOOKMARKS_USER_SETTINGS_KEY,
+    true,
+    []
+  );
+  const isFavorite = favorites?.find((bucket) => bucket === bucketName);
+
+  const onClick = () => {
+    if (isFavorite)
+      setFavorites((oldFavorites) =>
+        oldFavorites.filter((bucket) => bucket === bucketName)
+      );
+    else setFavorites((oldFavorites) => [...oldFavorites, bucketName]);
+  };
+
+  return (
+    <Button
+      variant={ButtonVariant.plain}
+      type={ButtonType.button}
+      onClick={onClick}
+    >
+      <StarIcon color={isFavorite && warningColor.value} />
+    </Button>
+  );
+};
+
 export const PageTitle: React.FC<TitleProps> = ({
   bucketName,
   foldersPath,
@@ -47,10 +86,11 @@ export const PageTitle: React.FC<TitleProps> = ({
         {!foldersPath ? bucketName : currentFolder}
         {!foldersPath && (
           <>
+            <Favorite bucketName={bucketName} />
             {/* ToDo: Currently we only support MCG, make is configurable once RGW is supported as well */}
             <Label
               color="gold"
-              className="pf-v5-u-ml-sm pf-v5-u-mt-sm bucket-label--height"
+              className="pf-v5-u-mt-sm bucket-label--height"
               isCompact
             >
               {t('MCG')}
diff --git a/packages/odf/components/s3-browser/buckets-list-page/bucketPagination.tsx b/packages/odf/components/s3-browser/buckets-list-page/bucketPagination.tsx
index 13e8c6d21..f9a591636 100644
--- a/packages/odf/components/s3-browser/buckets-list-page/bucketPagination.tsx
+++ b/packages/odf/components/s3-browser/buckets-list-page/bucketPagination.tsx
@@ -9,6 +9,7 @@ import {
   ContinuationTokens,
   continuationTokensRefresher,
   fetchS3Resources,
+  getPaginationCount,
   Pagination,
 } from '../pagination-helper';
 
@@ -39,7 +40,12 @@ export const BucketPagination: React.FC<BucketPaginationProps> = ({
 
   // initial fetch on first mount
   React.useEffect(() => {
-    continuationTokensRefresher(setContinuationTokens, trigger);
+    continuationTokensRefresher(
+      setContinuationTokens,
+      trigger,
+      undefined,
+      false
+    );
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
@@ -49,7 +55,9 @@ export const BucketPagination: React.FC<BucketPaginationProps> = ({
         setContinuationTokens,
         trigger,
         true,
-        continuationTokens.next
+        continuationTokens.next,
+        undefined,
+        false
       );
   };
 
@@ -61,17 +69,26 @@ export const BucketPagination: React.FC<BucketPaginationProps> = ({
         setContinuationTokens,
         trigger,
         false,
-        paginationToken
+        paginationToken,
+        undefined,
+        false
       );
     }
   };
 
+  const [paginationToCount, paginationFromCount] = getPaginationCount(
+    continuationTokens,
+    data?.Buckets?.length || 0,
+    MAX_BUCKETS
+  );
   return (
     <Pagination
       disableNext={!continuationTokens.next || !loadedWOError}
       disablePrevious={!continuationTokens.current || !loadedWOError}
       onNext={onNextClick}
       onPrevious={onPreviousClick}
+      fromCount={paginationFromCount}
+      toCount={paginationToCount}
     />
   );
 };
diff --git a/packages/odf/components/s3-browser/objects-list/ObjectsList.tsx b/packages/odf/components/s3-browser/objects-list/ObjectsList.tsx
index 469fc7691..738bc2d3f 100644
--- a/packages/odf/components/s3-browser/objects-list/ObjectsList.tsx
+++ b/packages/odf/components/s3-browser/objects-list/ObjectsList.tsx
@@ -59,6 +59,7 @@ import {
 } from '../../../utils';
 import { NoobaaS3Context } from '../noobaa-context';
 import {
+  getPaginationCount,
   Pagination,
   PaginationProps,
   ContinuationTokens,
@@ -190,6 +191,8 @@ const TableActions: React.FC<PaginationProps & TableActionsProps> = ({
   refreshTokens,
   searchInput,
   setSearchInput,
+  fromCount: paginationFromCount,
+  toCount: paginationToCount,
 }) => {
   const { t } = useCustomTranslation();
 
@@ -243,6 +246,8 @@ const TableActions: React.FC<PaginationProps & TableActionsProps> = ({
           onPrevious={onPrevious}
           disableNext={disableNext}
           disablePrevious={disablePrevious}
+          fromCount={paginationFromCount}
+          toCount={paginationToCount}
         />
       </LevelItem>
     </Level>
@@ -425,6 +430,11 @@ export const ObjectsList: React.FC<{}> = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [foldersPath, searchQuery]);
 
+  const [paginationToCount, paginationFromCount] = getPaginationCount(
+    continuationTokens,
+    (data?.Contents?.length || 0) + (data?.CommonPrefixes?.length || 0),
+    MAX_KEYS
+  );
   return (
     <div className="pf-v5-u-m-lg">
       <p className="pf-v5-u-mb-sm">
@@ -473,6 +483,8 @@ export const ObjectsList: React.FC<{}> = () => {
         refreshTokens={refreshTokens}
         searchInput={searchInput}
         setSearchInput={setSearchInput}
+        fromCount={paginationFromCount}
+        toCount={paginationToCount}
       />
       <SelectableTable
         className="pf-v5-u-mt-lg"
diff --git a/packages/odf/components/s3-browser/objects-list/table-components.tsx b/packages/odf/components/s3-browser/objects-list/table-components.tsx
index 439fe215b..38f2c5dba 100644
--- a/packages/odf/components/s3-browser/objects-list/table-components.tsx
+++ b/packages/odf/components/s3-browser/objects-list/table-components.tsx
@@ -14,7 +14,7 @@ import {
   EmptyStateHeader,
   EmptyStateFooter,
 } from '@patternfly/react-core';
-import { CubesIcon } from '@patternfly/react-icons';
+import { CubesIcon, FileIcon, FolderIcon } from '@patternfly/react-icons';
 import { ActionsColumn, Td, IAction } from '@patternfly/react-table';
 import { BUCKETS_BASE_ROUTE, PREFIX } from '../../../constants';
 import { SetObjectsDeleteResponse } from '../../../modals/s3-browser/delete-objects/DeleteObjectsModal';
@@ -147,10 +147,16 @@ export const TableRow: React.FC<RowComponentType<ObjectCrFormat>> = ({
       <Td translate={null} dataLabel={columnNames[0]}>
         {isFolder ? (
           <Link to={`${BUCKETS_BASE_ROUTE}/${bucketName}?${PREFIX}=${prefix}`}>
-            {name}
+            <span>
+              <FolderIcon className="pf-v5-u-mr-xs" />
+              {name}
+            </span>
           </Link>
         ) : (
-          name
+          <span>
+            <FileIcon className="pf-v5-u-mr-xs" />
+            {name}
+          </span>
         )}
       </Td>
       <Td translate={null} dataLabel={columnNames[1]}>
diff --git a/packages/odf/components/s3-browser/pagination-helper.tsx b/packages/odf/components/s3-browser/pagination-helper.tsx
index c5c77f9ca..510eb2d81 100644
--- a/packages/odf/components/s3-browser/pagination-helper.tsx
+++ b/packages/odf/components/s3-browser/pagination-helper.tsx
@@ -1,5 +1,10 @@
 import * as React from 'react';
+import {
+  ListObjectsV2CommandOutput,
+  ListBucketsCommandOutput,
+} from '@aws-sdk/client-s3';
 import { ListCommandOutput } from '@odf/shared/s3';
+import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { K8sResourceCommon } from '@openshift-console/dynamic-plugin-sdk';
 import * as _ from 'lodash-es';
 import { TriggerWithOptionsArgs } from 'swr/dist/mutation';
@@ -17,14 +22,19 @@ export type PaginationProps = {
   onPrevious: () => void;
   disableNext: boolean;
   disablePrevious: boolean;
+  fromCount: number;
+  toCount: number;
 };
 
 type Trigger<T> = TriggerWithOptionsArgs<T, any, string, string>;
 
-const getNextContinuationToken = (response: ListCommandOutput) =>
-  'NextContinuationToken' in response
-    ? response.NextContinuationToken
-    : response.ContinuationToken;
+const getNextContinuationToken = (
+  response: ListCommandOutput,
+  containsNextContinuation = true
+): string =>
+  containsNextContinuation
+    ? (response as ListObjectsV2CommandOutput).NextContinuationToken
+    : (response as ListBucketsCommandOutput).ContinuationToken;
 
 export const continuationTokensSetter = <T extends ListCommandOutput>(
   setContinuationTokens: React.Dispatch<
@@ -32,7 +42,8 @@ export const continuationTokensSetter = <T extends ListCommandOutput>(
   >,
   response: T,
   isNext: boolean,
-  setSelectedRows?: React.Dispatch<React.SetStateAction<K8sResourceCommon[]>>
+  setSelectedRows?: React.Dispatch<React.SetStateAction<K8sResourceCommon[]>>,
+  containsNextContinuation?: boolean
 ) => {
   setContinuationTokens((oldTokens) => {
     const newTokens = _.cloneDeep(oldTokens);
@@ -43,7 +54,10 @@ export const continuationTokensSetter = <T extends ListCommandOutput>(
       newTokens.current = newTokens.previous.pop();
     }
 
-    newTokens.next = getNextContinuationToken(response);
+    newTokens.next = getNextContinuationToken(
+      response,
+      containsNextContinuation
+    );
 
     return newTokens;
   });
@@ -57,7 +71,8 @@ export const fetchS3Resources = async <T extends ListCommandOutput>(
   trigger: Trigger<T>,
   isNext: boolean,
   paginationToken = '',
-  setSelectedRows?: React.Dispatch<React.SetStateAction<K8sResourceCommon[]>>
+  setSelectedRows?: React.Dispatch<React.SetStateAction<K8sResourceCommon[]>>,
+  containsNextContinuation?: boolean
 ) => {
   try {
     const response: T = await trigger(paginationToken);
@@ -65,7 +80,8 @@ export const fetchS3Resources = async <T extends ListCommandOutput>(
       setContinuationTokens,
       response,
       isNext,
-      setSelectedRows
+      setSelectedRows,
+      containsNextContinuation
     );
   } catch (err) {
     // no need to handle any error here, use "error" object directly from the "useSWRMutation" hook
@@ -80,14 +96,15 @@ export const continuationTokensRefresher = async <T extends ListCommandOutput>(
     React.SetStateAction<ContinuationTokens>
   >,
   trigger: Trigger<T>,
-  setSelectedRows?: React.Dispatch<React.SetStateAction<K8sResourceCommon[]>>
+  setSelectedRows?: React.Dispatch<React.SetStateAction<K8sResourceCommon[]>>,
+  containsNextContinuation?: boolean
 ) => {
   try {
     const response: T = await trigger();
     setContinuationTokens({
       previous: [''],
       current: '',
-      next: getNextContinuationToken(response),
+      next: getNextContinuationToken(response, containsNextContinuation),
     });
     !!setSelectedRows && setSelectedRows([]);
   } catch (err) {
@@ -97,14 +114,55 @@ export const continuationTokensRefresher = async <T extends ListCommandOutput>(
   }
 };
 
+const getFromCount = (
+  continuationTokens: ContinuationTokens,
+  currentPageCount: number,
+  maxResponses: number
+): number => {
+  if (currentPageCount === 0) return 0;
+  const prevLen = continuationTokens.previous?.length || 0;
+  return prevLen === 0 ? prevLen : (prevLen - 1) * maxResponses + 1;
+};
+
+const getToCount = (fromCount: number, currentPageCount: number): number => {
+  const count = fromCount - 1 + currentPageCount;
+  return count <= 0 ? 0 : count;
+};
+
+export const getPaginationCount = (
+  continuationTokens: ContinuationTokens,
+  currentPageCount: number,
+  maxResponses: number
+) => {
+  const fromCount = getFromCount(
+    continuationTokens,
+    currentPageCount,
+    maxResponses
+  );
+  const toCount = getToCount(fromCount, currentPageCount);
+  return [toCount, fromCount];
+};
+
 export const Pagination: React.FC<PaginationProps> = ({
   onNext,
   onPrevious,
   disableNext,
   disablePrevious,
+  fromCount,
+  toCount,
 }) => {
+  const { t } = useCustomTranslation();
+
+  const totalCount = disableNext ? toCount : t('many');
   return (
     <div className="pf-v5-u-display-flex pf-v5-u-flex-direction-row">
+      <b className="pf-v5-u-mt-xs">
+        {t('{{ fromCount }} - {{ toCount }} of {{ totalCount }}', {
+          fromCount,
+          toCount,
+          totalCount,
+        })}
+      </b>
       <Button
         variant={ButtonVariant.plain}
         className="pf-v5-u-mr-xs"
diff --git a/packages/odf/constants/s3-browser.ts b/packages/odf/constants/s3-browser.ts
index a5bb939cb..0c71c0bcf 100644
--- a/packages/odf/constants/s3-browser.ts
+++ b/packages/odf/constants/s3-browser.ts
@@ -20,4 +20,5 @@ export const LIST_BUCKET = 'LIST_BUCKET_CACHE_KEY';
 export const LIST_OBJECTS = 'LIST_OBJECTS_CACHE_KEY';
 
 // Bookmarking / favorites
-export const BUCKET_BOOKMARKS_USER_SETTINGS_KEY = 'bucket-bookmarks';
+export const BUCKET_BOOKMARKS_USER_SETTINGS_KEY =
+  'odf-console-bucket-bookmarks';
diff --git a/packages/shared/src/s3/commands.ts b/packages/shared/src/s3/commands.ts
index 9d0330393..9144e012c 100644
--- a/packages/shared/src/s3/commands.ts
+++ b/packages/shared/src/s3/commands.ts
@@ -34,7 +34,7 @@ export class S3Commands {
     });
   }
 
-  // Bucket command members
+  // Bucket command members (alphabetical order)
   createBucket: CreateBucket = (input) =>
     this.s3Client.send(new CreateBucketCommand(input));
 
@@ -44,16 +44,16 @@ export class S3Commands {
   putBucketTags: PutBucketTags = (input) =>
     this.s3Client.send(new PutBucketTaggingCommand(input));
 
-  // Object command members
-  listObjects: ListObjectsV2 = (input) =>
-    this.s3Client.send(new ListObjectsV2Command(input));
-
-  getSignedUrl: GetSignedUrl = (input, expiresIn) =>
-    getSignedUrl(this.s3Client, new GetObjectCommand(input), { expiresIn });
+  // Object command members (alphabetical order)
+  deleteObjects: DeleteObjects = (input) =>
+    this.s3Client.send(new DeleteObjectsCommand(input));
 
   getObject: GetObject = (input) =>
     this.s3Client.send(new GetObjectCommand(input));
 
-  deleteObjects: DeleteObjects = (input) =>
-    this.s3Client.send(new DeleteObjectsCommand(input));
+  getSignedUrl: GetSignedUrl = (input, expiresIn) =>
+    getSignedUrl(this.s3Client, new GetObjectCommand(input), { expiresIn });
+
+  listObjects: ListObjectsV2 = (input) =>
+    this.s3Client.send(new ListObjectsV2Command(input));
 }
diff --git a/packages/shared/src/s3/types.ts b/packages/shared/src/s3/types.ts
index bebe9c3e5..77e3c4e2d 100644
--- a/packages/shared/src/s3/types.ts
+++ b/packages/shared/src/s3/types.ts
@@ -13,7 +13,7 @@ import {
   DeleteObjectsCommandOutput,
 } from '@aws-sdk/client-s3';
 
-// Bucket command types
+// Bucket command types (alphabetical order)
 export type CreateBucket = (
   input?: CreateBucketCommandInput
 ) => Promise<CreateBucketCommandOutput>;
@@ -26,24 +26,24 @@ export type PutBucketTags = (
   input?: PutBucketTaggingCommandInput
 ) => Promise<PutBucketTaggingCommandOutput>;
 
-// Object command types
-export type ListObjectsV2 = (
-  input: ListObjectsV2CommandInput
-) => Promise<ListObjectsV2CommandOutput>;
-
-export type GetSignedUrl = (
-  input: GetObjectCommandInput,
-  expiresIn: number
-) => Promise<string>;
+// Object command types (alphabetical order)
+export type DeleteObjects = (
+  input: DeleteObjectsCommandInput
+) => Promise<DeleteObjectsCommandOutput>;
 
 export type GetObject = (
   input: GetObjectCommandInput
 ) => Promise<GetObjectCommandOutput>;
 
-export type DeleteObjects = (
-  input: DeleteObjectsCommandInput
-) => Promise<DeleteObjectsCommandOutput>;
+export type GetSignedUrl = (
+  input: GetObjectCommandInput,
+  expiresIn: number
+) => Promise<string>;
 
 export type ListCommandOutput =
   | ListObjectsV2CommandOutput
   | ListBucketsCommandOutput;
+
+export type ListObjectsV2 = (
+  input: ListObjectsV2CommandInput
+) => Promise<ListObjectsV2CommandOutput>;
diff --git a/plugins/odf/console-extensions.json b/plugins/odf/console-extensions.json
index cf76c0585..b02670da9 100644
--- a/plugins/odf/console-extensions.json
+++ b/plugins/odf/console-extensions.json
@@ -135,6 +135,9 @@
       "path": ["/odf/object-storage/create-bucket"],
       "exact": true,
       "component": { "$codeRef": "createBucket.default" }
+    },
+    "flags": {
+      "required": ["MCG_STANDALONE"]
     }
   },
   {
@@ -742,6 +745,9 @@
       "component": {
         "$codeRef": "s3BucketOverview.default"
       }
+    },
+    "flags": {
+      "required": ["MCG_STANDALONE"]
     }
   }
 ]