@scality/data-browser-library 1.0.8 → 1.0.9

package/dist/components/buckets/__tests__/BucketVersioning.test.js

@@ -16,23 +16,22 @@ const mockUseGetBucketVersioning = jest.mocked(useGetBucketVersioning);
 const mockUseGetBucketObjectLockConfiguration = jest.mocked(useGetBucketObjectLockConfiguration);
 const mockUseISVBucketStatus = jest.mocked(useISVBucketStatus);
 const mockUseSetBucketVersioning = jest.mocked(useSetBucketVersioning);
-const renderBucketVersioning = (props = {})=>{
-    const mockMutate = jest.fn();
+const renderBucketVersioning = (props = {}, { simulateSuccess = false } = {})=>{
+    const mockMutate = jest.fn().mockImplementation((_params, options)=>{
+        if (simulateSuccess && options?.onSuccess) options.onSuccess();
+    });
     mockUseSetBucketVersioning.mockReturnValue(createMockMutationResult(mockMutate));
     const Wrapper = createTestWrapper();
-    return {
-        ...render(/*#__PURE__*/ jsx(Wrapper, {
-            children: /*#__PURE__*/ jsx(BucketOverviewContext.Provider, {
-                value: {
-                    bucketName: 'test-bucket'
-                },
-                children: /*#__PURE__*/ jsx(BucketVersioning, {
-                    ...props
-                })
+    return render(/*#__PURE__*/ jsx(Wrapper, {
+        children: /*#__PURE__*/ jsx(BucketOverviewContext.Provider, {
+            value: {
+                bucketName: 'test-bucket'
+            },
+            children: /*#__PURE__*/ jsx(BucketVersioning, {
+                ...props
             })
-        })),
-        mutate: mockMutate
-    };
+        })
+    }));
 };
 const mockHookDefaults = ()=>{
     mockUseGetBucketVersioning.mockReturnValue({
@@ -86,10 +85,10 @@ describe('BucketVersioning', ()=>{
         expect(toggle).not.toBeChecked();
     });
     it('calls mutation with Suspended status when disabling versioning', ()=>{
-        const { mutate } = renderBucketVersioning();
+        renderBucketVersioning();
         const toggle = findToggleByLabel('Active');
         fireEvent.click(toggle);
-        expect(mutate).toHaveBeenCalledWith({
+        expect(mockUseSetBucketVersioning().mutate).toHaveBeenCalledWith({
             Bucket: 'test-bucket',
             VersioningConfiguration: {
                 Status: 'Suspended'
@@ -104,10 +103,10 @@ describe('BucketVersioning', ()=>{
             status: 'success',
             error: null
         });
-        const { mutate } = renderBucketVersioning();
+        renderBucketVersioning();
         const toggle = findToggleByLabel('Inactive');
         fireEvent.click(toggle);
-        expect(mutate).toHaveBeenCalledWith({
+        expect(mockUseSetBucketVersioning().mutate).toHaveBeenCalledWith({
             Bucket: 'test-bucket',
             VersioningConfiguration: {
                 Status: 'Enabled'
@@ -135,16 +134,35 @@ describe('BucketVersioning', ()=>{
         });
         renderBucketVersioning();
         expect(screen.getByText('Enabled')).toBeInTheDocument();
-        expect(screen.getByText(/Versioning cannot be suspended because Object-lock is enabled/i)).toBeInTheDocument();
+        expect(screen.getByText(/Versioning cannot be disabled because Object-lock is enabled/i)).toBeInTheDocument();
         expect(screen.queryByRole('checkbox')).not.toBeInTheDocument();
     });
-    it('disables toggle when bucket is managed by Veeam', ()=>{
-        mockUseISVBucketStatus.mockReturnValue({
+    it.each([
+        {
+            isvApplication: 'Veeam',
             isVeeamBucket: true,
             isCommvaultBucket: false,
-            isKastenBucket: false,
+            isKastenBucket: false
+        },
+        {
+            isvApplication: 'Commvault',
+            isVeeamBucket: false,
+            isCommvaultBucket: true,
+            isKastenBucket: false
+        },
+        {
+            isvApplication: 'Kasten',
+            isVeeamBucket: false,
+            isCommvaultBucket: false,
+            isKastenBucket: true
+        }
+    ])('disables toggle when bucket is managed by $isvApplication', ({ isvApplication, isVeeamBucket, isCommvaultBucket, isKastenBucket })=>{
+        mockUseISVBucketStatus.mockReturnValue({
+            isVeeamBucket,
+            isCommvaultBucket,
+            isKastenBucket,
             isISVManaged: true,
-            isvApplication: 'Veeam',
+            isvApplication,
             isLoading: false,
             bucketTagsStatus: 'success'
         });
@@ -152,6 +170,41 @@ describe('BucketVersioning', ()=>{
         const toggle = screen.getByRole('checkbox');
         expect(toggle).toHaveAttribute('aria-disabled', 'true');
     });
+    it('shows toast with correct message when disabling versioning', ()=>{
+        jest.useFakeTimers();
+        renderBucketVersioning({}, {
+            simulateSuccess: true
+        });
+        const toggle = findToggleByLabel('Active');
+        fireEvent.click(toggle);
+        jest.advanceTimersByTime(500);
+        expect(mockShowToast).toHaveBeenCalledWith(expect.objectContaining({
+            message: 'Bucket versioning disabled',
+            status: 'success'
+        }));
+        jest.useRealTimers();
+    });
+    it('shows toast with correct message when enabling versioning', ()=>{
+        jest.useFakeTimers();
+        mockUseGetBucketVersioning.mockReturnValue({
+            data: {
+                Status: 'Suspended'
+            },
+            status: 'success',
+            error: null
+        });
+        renderBucketVersioning({}, {
+            simulateSuccess: true
+        });
+        const toggle = findToggleByLabel('Inactive');
+        fireEvent.click(toggle);
+        jest.advanceTimersByTime(500);
+        expect(mockShowToast).toHaveBeenCalledWith(expect.objectContaining({
+            message: 'Bucket versioning enabled',
+            status: 'success'
+        }));
+        jest.useRealTimers();
+    });
     it('disables toggle when versioning query errors', ()=>{
         mockUseGetBucketVersioning.mockReturnValue({
             data: void 0,

package/dist/components/buckets/notifications/BucketNotificationFormPage.js

@@ -1,4 +1,4 @@
-import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { jsx, jsxs } from "react/jsx-runtime";
 import { joiResolver } from "@hookform/resolvers/joi";
 import { Form, FormGroup, FormSection, Icon, Loader, Stack, Text, spacing, useToast } from "@scality/core-ui";
 import { convertRemToPixels } from "@scality/core-ui/dist/components/tablev2/TableUtils";
@@ -9,6 +9,7 @@ import { FormProvider, useForm } from "react-hook-form";
 import { useParams } from "react-router";
 import { useGetBucketNotification, useSetBucketNotification } from "../../../hooks/index.js";
 import { useDataBrowserNavigate } from "../../../hooks/useDataBrowserNavigate.js";
+import { useSupportedNotificationEvents } from "../../../hooks/useSupportedNotificationEvents.js";
 import { EventsSection } from "./EventsSection.js";
 const baseSchema = joi.object({
     ruleName: joi.string().required().messages({
@@ -29,6 +30,7 @@ function BucketNotificationFormPage() {
     const navigate = useDataBrowserNavigate();
     const { showToast } = useToast();
     const isEditMode = !!ruleId;
+    const supportedEvents = useSupportedNotificationEvents();
     const { data: existingNotificationData, status: notificationStatus, error: notificationError } = useGetBucketNotification({
         Bucket: bucketName
     });
@@ -70,10 +72,15 @@ function BucketNotificationFormPage() {
         if (isEditMode && existingRule) {
             const prefixRule = existingRule.Filter?.Key?.FilterRules?.find((r)=>'prefix' === r.Name);
             const suffixRule = existingRule.Filter?.Key?.FilterRules?.find((r)=>'suffix' === r.Name);
+            let events = existingRule.Events || [];
+            if (supportedEvents?.length) {
+                const supported = new Set(supportedEvents);
+                events = events.filter((event)=>supported.has(event));
+            }
             reset({
                 ruleName: existingRule.Id || '',
                 queueArn: existingRule.QueueArn || '',
-                events: existingRule.Events || [],
+                events,
                 prefix: prefixRule?.Value || '',
                 suffix: suffixRule?.Value || ''
             });
@@ -81,7 +88,8 @@ function BucketNotificationFormPage() {
     }, [
         isEditMode,
         existingRule,
-        reset
+        reset,
+        supportedEvents
     ]);
     const handleCancel = useCallback(()=>{
         navigate(`/buckets/${bucketName}?tab=notification`);
@@ -248,7 +256,7 @@ function BucketNotificationFormPage() {
                         direction: "horizontal",
                         error: errors?.ruleName?.message,
                         helpErrorPosition: "bottom",
-                        labelHelpTooltip: /*#__PURE__*/ jsx(Fragment, {}),
+                        labelHelpTooltip: "Must be unique across all notification rules in this bucket. Cannot be changed after creation.",
                         required: true,
                         content: isEditMode ? /*#__PURE__*/ jsx(Text, {
                             children: existingRule?.Id
@@ -267,7 +275,7 @@ function BucketNotificationFormPage() {
                         direction: "horizontal",
                         error: errors?.queueArn?.message,
                         helpErrorPosition: "bottom",
-                        labelHelpTooltip: /*#__PURE__*/ jsx(Fragment, {}),
+                        labelHelpTooltip: "Expected format: arn:aws:sqs:region:account-id:queue-name",
                         required: true,
                         content: /*#__PURE__*/ jsx(Input, {
                             id: "queueArn",

package/dist/components/objects/ObjectDetails/__tests__/ObjectDetails.test.js

@@ -5,7 +5,7 @@ import { cleanup, render, screen } from "@testing-library/react";
 import { MemoryRouter, Route, Routes } from "react-router";
 import { DataBrowserUICustomizationProvider } from "../../../../contexts/DataBrowserUICustomizationContext.js";
 var __webpack_modules__ = {
-    "../index" (module) {
+    ".." (module) {
         module.exports = __rspack_external__index_js_95fdb65a;
     }
 };
@@ -19,7 +19,7 @@ function __webpack_require__(moduleId) {
     __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
     return module.exports;
 }
-var external_index_js_ = __webpack_require__("../index");
+var external_index_js_ = __webpack_require__("..");
 jest.mock('../ObjectSummary', ()=>({
         ObjectSummary: ()=>/*#__PURE__*/ jsx("div", {
                 "data-testid": "object-summary",
@@ -398,7 +398,7 @@ describe('ObjectDetails', ()=>{
             expect(screen.getByTestId('object-summary')).toBeInTheDocument();
         });
         it('should throw error when useObjectDetailsContext is used outside provider', ()=>{
-            const { useObjectDetailsContext } = __webpack_require__("../index");
+            const { useObjectDetailsContext } = __webpack_require__("..");
             const TestComponent = ()=>{
                 useObjectDetailsContext();
                 return null;

package/dist/components/objects/ObjectList.js

@@ -5,7 +5,7 @@ import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from "rea
 import { useLocation, useNavigate } from "react-router";
 import styled_components from "styled-components";
 import { useDataBrowserUICustomization } from "../../contexts/DataBrowserUICustomizationContext.js";
-import { useSearchObjects, useSearchObjectsVersions } from "../../hooks/index.js";
+import { useListObjectVersions, useListObjects, useSearchObjects, useSearchObjectsVersions } from "../../hooks/index.js";
 import { useGetPresignedDownload } from "../../hooks/presignedOperations.js";
 import { useBatchObjectLegalHold } from "../../hooks/useBatchObjectLegalHold.js";
 import { useFeatures } from "../../hooks/useFeatures.js";
@@ -370,28 +370,8 @@ const ObjectList = ({ bucketName, prefix, onObjectSelect, onPrefixChange, onSele
         getPresignedDownload,
         showToast
     ]);
-    const searchParams = useMemo(()=>{
-        const baseParams = {
-            Bucket: bucketName,
-            Prefix: prefix,
-            MaxKeys: DEFAULT_PAGE_SIZE,
-            Delimiter: '/'
-        };
-        if (isMetadataSearchEnabled && metadataSearchQuery) return {
-            ...baseParams,
-            Search: metadataSearchQuery
-        };
-        return baseParams;
-    }, [
-        bucketName,
-        prefix,
-        isMetadataSearchEnabled,
-        metadataSearchQuery
-    ]);
-    const listObjectsQuery = useSearchObjects(searchParams, {
-        enabled: Boolean(bucketName)
-    });
-    const versionSearchParams = useMemo(()=>({
+    const isSearchActive = isMetadataSearchEnabled && Boolean(metadataSearchQuery);
+    const baseParams = useMemo(()=>({
             Bucket: bucketName,
             Prefix: prefix,
             MaxKeys: DEFAULT_PAGE_SIZE,
@@ -400,9 +380,26 @@ const ObjectList = ({ bucketName, prefix, onObjectSelect, onPrefixChange, onSele
         bucketName,
         prefix
     ]);
-    const listVersionsQuery = useSearchObjectsVersions(versionSearchParams, {
-        enabled: showVersions && Boolean(bucketName)
+    const regularListQuery = useListObjects(baseParams, {
+        enabled: Boolean(bucketName) && !isSearchActive
+    });
+    const searchListQuery = useSearchObjects({
+        ...baseParams,
+        Query: metadataSearchQuery || ''
+    }, {
+        enabled: Boolean(bucketName) && isSearchActive
+    });
+    const listObjectsQuery = isSearchActive ? searchListQuery : regularListQuery;
+    const regularVersionsQuery = useListObjectVersions(baseParams, {
+        enabled: showVersions && Boolean(bucketName) && !isSearchActive
+    });
+    const searchVersionsQuery = useSearchObjectsVersions({
+        ...baseParams,
+        Query: metadataSearchQuery || ''
+    }, {
+        enabled: showVersions && Boolean(bucketName) && isSearchActive
     });
+    const listVersionsQuery = isSearchActive ? searchVersionsQuery : regularVersionsQuery;
     useEffect(()=>{
         setSelectedObjects([]);
         onObjectSelectRef.current(null);

package/dist/components/objects/ObjectLock/EditRetentionButton.js

@@ -5,8 +5,8 @@ import { useISVBucketStatus } from "../../../hooks/index.js";
 import { useDataBrowserNavigate } from "../../../hooks/useDataBrowserNavigate.js";
 const EditRetentionButton = ({ bucketName })=>{
     const navigate = useDataBrowserNavigate();
-    const { isVeeamBucket, isCommvaultBucket, isISVManaged, isLoading } = useISVBucketStatus(bucketName);
-    const tooltipOverlay = isCommvaultBucket ? 'Edition is disabled as it is managed by Commvault.' : isVeeamBucket ? 'Edition is disabled as it is managed by Veeam.' : void 0;
+    const { isISVManaged, isvApplication, isLoading } = useISVBucketStatus(bucketName);
+    const tooltipOverlay = isISVManaged ? `Edition is disabled as it is managed by ${isvApplication}.` : void 0;
     return /*#__PURE__*/ jsx(Button, {
         id: "edit-retention-btn",
         variant: "outline",

package/dist/hooks/factories/useCreateS3InfiniteQueryHook.js

@@ -46,6 +46,7 @@ function getPaginationParams(operationName, pageParam) {
                 ContinuationToken: pageParam
             };
         case 'ListObjectVersions':
+        case 'SearchObjectsVersions':
             if (pageParam.includes('|')) {
                 const [keyMarker, versionIdMarker] = pageParam.split('|');
                 return {
@@ -71,6 +72,7 @@ function getNextPageToken(operationName, lastPage) {
         case 'ListObjects':
             return lastPage.IsTruncated ? lastPage.NextContinuationToken : void 0;
         case 'ListObjectVersions':
+        case 'SearchObjectsVersions':
             return lastPage.IsTruncated && (lastPage.NextKeyMarker || lastPage.NextVersionIdMarker) ? `${lastPage.NextKeyMarker || ''}|${lastPage.NextVersionIdMarker || ''}` : void 0;
         default:
             return lastPage.IsTruncated ? lastPage.NextContinuationToken : void 0;

package/dist/hooks/index.d.ts

@@ -6,7 +6,7 @@ export { useCopyObject, useCreateFolder, useDeleteObject, useDeleteObjects, useD
 export { useGetPresignedDownload, useGetPresignedPost, useGetPresignedUpload, } from './presignedOperations';
 export { getAccessibleBucketsStorageKey, getLimitedAccessFlagKey, setLimitedAccessFlag, useAccessibleBuckets, } from './useAccessibleBuckets';
 export { useBatchObjectLegalHold } from './useBatchObjectLegalHold';
-export { type BucketConfigEditorConfig, type BucketConfigEditorResult, useBucketConfigEditor, } from './useBucketConfigEditor';
+export { type BucketConfigEditorConfig, type BucketConfigEditorResult, useBucketConfigEditor } from './useBucketConfigEditor';
 export { useBucketLocations } from './useBucketLocations';
 export { useDeleteBucketConfigRule } from './useDeleteBucketConfigRule';
 export { useEmptyBucket } from './useEmptyBucket';

package/dist/hooks/objectOperations.d.ts

@@ -6,7 +6,7 @@
  * configurations like retention and legal hold.
  */
 import { type CopyObjectCommandInput, type CopyObjectCommandOutput, type DeleteObjectCommandInput, type DeleteObjectCommandOutput, type DeleteObjectsCommandInput, type DeleteObjectsCommandOutput, type DeleteObjectTaggingCommandInput, type DeleteObjectTaggingCommandOutput, type GetObjectAclCommandInput, type GetObjectAclCommandOutput, type GetObjectAttributesCommandInput, type GetObjectAttributesCommandOutput, type GetObjectCommandInput, type GetObjectCommandOutput, type GetObjectLegalHoldCommandInput, type GetObjectLegalHoldCommandOutput, type GetObjectRetentionCommandInput, type GetObjectRetentionCommandOutput, type GetObjectTaggingCommandInput, type GetObjectTaggingCommandOutput, type GetObjectTorrentCommandInput, type GetObjectTorrentCommandOutput, type HeadObjectCommandInput, type HeadObjectCommandOutput, type ListMultipartUploadsCommandInput, type ListMultipartUploadsCommandOutput, type ListObjectsV2CommandInput, type ListObjectVersionsCommandInput, type PutObjectAclCommandInput, type PutObjectAclCommandOutput, type PutObjectCommandInput, type PutObjectCommandOutput, type PutObjectLegalHoldCommandInput, type PutObjectLegalHoldCommandOutput, type PutObjectRetentionCommandInput, type PutObjectRetentionCommandOutput, type PutObjectTaggingCommandInput, type PutObjectTaggingCommandOutput, type RestoreObjectCommandInput, type RestoreObjectCommandOutput, type SelectObjectContentCommandInput, type SelectObjectContentCommandOutput } from '@aws-sdk/client-s3';
-import { type SearchObjectsV2CommandInput, type SearchObjectsVersionCommandInput } from '@scality/zenkoclient';
+import { type ListObjectsV2ExtendedInput, type ListObjectVersionsExtendedInput } from '@scality/cloudserverclient';
 /**
  * Hook for listing S3 objects with infinite scroll support
  *
@@ -27,14 +27,14 @@ export declare const useListObjectVersions: (params: ListObjectVersionsCommandIn
  * Provides paginated search of objects in an S3 bucket using SQL-like query syntax.
  * Supports advanced filtering and pattern matching on object keys and metadata.
  */
-export declare const useSearchObjects: (params: SearchObjectsV2CommandInput, options?: Partial<import("@tanstack/react-query").UseInfiniteQueryOptions<any, import("..").EnhancedS3Error, any, (string | SearchObjectsV2CommandInput)[], string | undefined>> | undefined) => import("@tanstack/react-query").UseInfiniteQueryResult<any, import("..").EnhancedS3Error>;
+export declare const useSearchObjects: (params: ListObjectsV2ExtendedInput, options?: Partial<import("@tanstack/react-query").UseInfiniteQueryOptions<any, import("..").EnhancedS3Error, any, (string | ListObjectsV2ExtendedInput)[], string | undefined>> | undefined) => import("@tanstack/react-query").UseInfiniteQueryResult<any, import("..").EnhancedS3Error>;
 /**
  * Hook for searching S3 object versions with infinite scroll support
  *
  * Provides paginated search of object versions in an S3 bucket using SQL-like query syntax.
  * Supports advanced filtering and pattern matching on object keys and metadata across all versions.
  */
-export declare const useSearchObjectsVersions: (params: SearchObjectsVersionCommandInput, options?: Partial<import("@tanstack/react-query").UseInfiniteQueryOptions<any, import("..").EnhancedS3Error, any, (string | SearchObjectsVersionCommandInput)[], string | undefined>> | undefined) => import("@tanstack/react-query").UseInfiniteQueryResult<any, import("..").EnhancedS3Error>;
+export declare const useSearchObjectsVersions: (params: ListObjectVersionsExtendedInput, options?: Partial<import("@tanstack/react-query").UseInfiniteQueryOptions<any, import("..").EnhancedS3Error, any, (string | ListObjectVersionsExtendedInput)[], string | undefined>> | undefined) => import("@tanstack/react-query").UseInfiniteQueryResult<any, import("..").EnhancedS3Error>;
 /**
  * Hook for retrieving S3 object metadata
  *

package/dist/hooks/objectOperations.js

@@ -1,12 +1,12 @@
 import { CopyObjectCommand, DeleteObjectCommand, DeleteObjectTaggingCommand, DeleteObjectsCommand, GetObjectAclCommand, GetObjectAttributesCommand, GetObjectCommand, GetObjectLegalHoldCommand, GetObjectRetentionCommand, GetObjectTaggingCommand, GetObjectTorrentCommand, HeadObjectCommand, ListMultipartUploadsCommand, ListObjectVersionsCommand, ListObjectsV2Command, PutObjectAclCommand, PutObjectCommand, PutObjectLegalHoldCommand, PutObjectRetentionCommand, PutObjectTaggingCommand, RestoreObjectCommand, SelectObjectContentCommand } from "@aws-sdk/client-s3";
-import { SearchObjectsV2Command, SearchObjectsVersionCommand } from "@scality/zenkoclient";
+import { ListObjectVersionsExtendedCommand, ListObjectsV2ExtendedCommand } from "@scality/cloudserverclient";
 import { useCreateS3InfiniteQueryHook } from "./factories/useCreateS3InfiniteQueryHook.js";
 import { useCreateS3MutationHook } from "./factories/useCreateS3MutationHook.js";
 import { useCreateS3QueryHook } from "./factories/useCreateS3QueryHook.js";
 const useListObjects = useCreateS3InfiniteQueryHook(ListObjectsV2Command, 'ListObjects');
 const useListObjectVersions = useCreateS3InfiniteQueryHook(ListObjectVersionsCommand, 'ListObjectVersions');
-const useSearchObjects = useCreateS3InfiniteQueryHook(SearchObjectsV2Command, 'SearchObjects');
-const useSearchObjectsVersions = useCreateS3InfiniteQueryHook(SearchObjectsVersionCommand, 'SearchObjectsVersions');
+const useSearchObjects = useCreateS3InfiniteQueryHook(ListObjectsV2ExtendedCommand, 'SearchObjects');
+const useSearchObjectsVersions = useCreateS3InfiniteQueryHook(ListObjectVersionsExtendedCommand, 'SearchObjectsVersions');
 const useObjectMetadata = useCreateS3QueryHook(HeadObjectCommand, 'HeadObject');
 const useGetObject = useCreateS3QueryHook(GetObjectCommand, 'GetObject');
 const usePutObject = useCreateS3MutationHook(PutObjectCommand, 'PutObject', [

package/dist/hooks/useBucketConfigEditor.d.ts

@@ -1,4 +1,4 @@
-import type { BeforeMount } from '@monaco-editor/react';
+import type { JSONSchema7 } from 'json-schema';
 import { useForm } from 'react-hook-form';
 type FormValues = {
     content: string;
@@ -13,10 +13,9 @@ export type BucketConfigEditorConfig = {
     initialContent: string | undefined;
     defaultTemplate: string;
     isLoading: boolean;
-    notFoundErrorNames: string[];
     errorInstance: Error | null;
     validate: (content: string) => ValidationResult;
-    monacoSchema?: unknown;
+    jsonSchema?: JSONSchema7;
 };
 export type BucketConfigEditorResult = {
     bucketName: string;
@@ -24,8 +23,9 @@ export type BucketConfigEditorResult = {
     content: string;
     isCreateMode: boolean;
     isValidFormat: boolean;
-    handleBeforeMount: BeforeMount;
+    jsonSchema?: JSONSchema7;
     navigateToBucket: () => void;
+    loadTemplate: () => void;
 };
 export declare const useBucketConfigEditor: (config: BucketConfigEditorConfig) => BucketConfigEditorResult;
 export {};

package/dist/hooks/useBucketConfigEditor.js

@@ -1,5 +1,6 @@
 import { useCallback, useEffect, useMemo } from "react";
 import { useForm } from "react-hook-form";
+import { isNotFoundError } from "../utils/errorHandling.js";
 import { useDataBrowserNavigate } from "./useDataBrowserNavigate.js";
 const useBucketConfigEditor = (config)=>{
     const navigate = useDataBrowserNavigate();
@@ -12,12 +13,8 @@ const useBucketConfigEditor = (config)=>{
     });
     const { watch, reset } = form;
     const content = watch('content');
-    const isCreateMode = useMemo(()=>{
-        if (!config.errorInstance) return false;
-        return config.notFoundErrorNames.some((name)=>config.errorInstance?.name === name);
-    }, [
-        config.errorInstance,
-        config.notFoundErrorNames
+    const isCreateMode = useMemo(()=>isNotFoundError(config.errorInstance), [
+        config.errorInstance
     ]);
     const initialValue = useMemo(()=>{
         if (config.initialContent) try {
@@ -26,10 +23,9 @@ const useBucketConfigEditor = (config)=>{
         } catch  {
             return config.initialContent;
         }
-        return config.defaultTemplate;
+        return '';
     }, [
-        config.initialContent,
-        config.defaultTemplate
+        config.initialContent
     ]);
     useEffect(()=>{
         reset({
@@ -43,40 +39,29 @@ const useBucketConfigEditor = (config)=>{
         content,
         config.validate
     ]);
-    const handleBeforeMount = useCallback((monaco)=>{
-        const jsonLanguage = monaco.languages.json;
-        if (jsonLanguage?.jsonDefaults) if (config.monacoSchema) jsonLanguage.jsonDefaults.setDiagnosticsOptions({
-            validate: true,
-            schemas: [
-                {
-                    uri: 'http://myserver/schema.json',
-                    fileMatch: [
-                        '*'
-                    ],
-                    schema: config.monacoSchema
-                }
-            ]
-        });
-        else jsonLanguage.jsonDefaults.setDiagnosticsOptions({
-            validate: true
-        });
-    }, [
-        config.monacoSchema
-    ]);
     const navigateToBucket = useCallback(()=>{
         navigate(`/buckets/${bucketName}`);
     }, [
         navigate,
         bucketName
     ]);
+    const loadTemplate = useCallback(()=>{
+        form.setValue('content', config.defaultTemplate, {
+            shouldDirty: true
+        });
+    }, [
+        form,
+        config.defaultTemplate
+    ]);
     return {
         bucketName,
         form,
         content,
         isCreateMode,
         isValidFormat,
-        handleBeforeMount,
-        navigateToBucket
+        jsonSchema: config.jsonSchema,
+        navigateToBucket,
+        loadTemplate
     };
 };
 export { useBucketConfigEditor };

package/dist/test/mocks/esmOnlyModules.js

@@ -0,0 +1,4 @@
+module.exports = {
+    createHighlighterCore: ()=>Promise.resolve({}),
+    fromHighlighter: ()=>()=>{}
+};

package/dist/types/index.d.ts

@@ -2,7 +2,6 @@ import type { S3ClientConfig } from '@aws-sdk/client-s3';
 import type { AwsCredentialIdentity } from '@aws-sdk/types';
 import type { ProxyConfiguration, S3EventType } from '../config/types';
 export type { _Object, Bucket, BucketCannedACL, BucketLocationConstraint, CopyObjectCommandInput, CopyObjectCommandOutput, CreateBucketCommandInput, CreateBucketCommandOutput, DeleteBucketCommandInput, DeleteBucketCommandOutput, DeleteBucketCorsCommandOutput, DeleteBucketLifecycleCommandOutput, DeleteBucketPolicyCommandOutput, DeleteBucketReplicationCommandOutput, DeleteBucketTaggingCommandOutput, DeleteMarkerEntry, DeleteObjectCommandInput, DeleteObjectCommandOutput, DeleteObjectsCommandInput, DeleteObjectsCommandOutput, DeleteObjectTaggingCommandOutput, GetBucketAclCommandOutput, GetBucketCorsCommandOutput, GetBucketEncryptionCommandOutput, GetBucketLifecycleConfigurationCommandOutput, GetBucketLocationCommandInput, GetBucketLocationCommandOutput, GetBucketNotificationConfigurationCommandOutput, GetBucketPolicyCommandOutput, GetBucketReplicationCommandOutput, GetBucketTaggingCommandOutput, GetBucketVersioningCommandOutput, GetObjectAclCommandOutput, GetObjectAttributesCommandInput, GetObjectAttributesCommandOutput, GetObjectCommandInput, GetObjectCommandOutput, GetObjectLegalHoldCommandOutput, GetObjectLockConfigurationCommandOutput, GetObjectRetentionCommandOutput, GetObjectTaggingCommandOutput, GetObjectTorrentCommandOutput, HeadObjectCommandInput, HeadObjectCommandOutput, ListBucketsCommandOutput, ListMultipartUploadsCommandInput, ListMultipartUploadsCommandOutput, ListObjectsV2CommandInput, ListObjectsV2CommandOutput, ListObjectVersionsCommandInput, ListObjectVersionsCommandOutput, ObjectCannedACL, ObjectVersion, Owner, PutBucketAclCommandInput, PutBucketCorsCommandInput, PutBucketEncryptionCommandInput, PutBucketLifecycleConfigurationCommandInput, PutBucketNotificationConfigurationCommandInput, PutBucketPolicyCommandInput, PutBucketReplicationCommandInput, PutBucketTaggingCommandInput, PutBucketTaggingCommandOutput, PutBucketVersioningCommandInput, PutObjectAclCommandInput, PutObjectCommandInput, PutObjectCommandOutput, PutObjectLegalHoldCommandInput, PutObjectLockConfigurationCommandInput, PutObjectRetentionCommandInput, PutObjectTaggingCommandInput, RestoreObjectCommandInput, RestoreObjectCommandOutput, SelectObjectContentCommandInput, SelectObjectContentCommandOutput, Tag, } from '@aws-sdk/client-s3';
-export type { MonacoJsonDefaults, MonacoLanguagesJson } from './monaco';
 /**
  * S3 backend capabilities configuration.
  */

package/dist/utils/__tests__/proxyMiddleware.test.js

@@ -333,12 +333,45 @@ describe('createProxyMiddleware', ()=>{
             expect(mockRequest.protocol).toBe('http:');
             expect(mockRequest.path).toBe('/api/s3/bucket/key');
             expect(mockRequest.headers.host).toBe('localhost:3000');
+            expect(mockRequest.headers['x-s3-target-endpoint']).toBe('https://s3.amazonaws.com');
             expect(mockRequest.query).toEqual({
                 param: 'value'
             });
             expect(mockRequest.headers.authorization).toBe('AWS4-HMAC-SHA256 Credential=...');
             expect(mockNext).toHaveBeenCalledTimes(1);
         });
+        it('should set X-S3-Target-Endpoint header with custom port', async ()=>{
+            const mockNext = jest.fn().mockResolvedValue({
+                output: {}
+            });
+            const mockStack = {
+                add: jest.fn((middleware, config)=>{
+                    if ('finalizeRequest' === config.step) mockStack.postSigningMiddleware = middleware;
+                }),
+                postSigningMiddleware: null
+            };
+            const middleware = createProxyMiddleware({
+                enabled: true,
+                endpoint: 'http://localhost:3000/api/s3',
+                target: 'http://s3.local:9000'
+            });
+            middleware.applyToStack(mockStack);
+            const postSigningMiddleware = mockStack.postSigningMiddleware(mockNext);
+            const mockRequest = new HttpRequest({
+                hostname: 's3.local',
+                port: 9000,
+                path: '/bucket/key',
+                protocol: 'http:',
+                headers: {
+                    host: 's3.local:9000'
+                }
+            });
+            await postSigningMiddleware({
+                request: mockRequest,
+                input: {}
+            });
+            expect(mockRequest.headers['x-s3-target-endpoint']).toBe('http://s3.local:9000');
+        });
         it('should preserve authorization header when routing through proxy', async ()=>{
             const mockNext = jest.fn().mockResolvedValue({
                 output: {}
@@ -574,6 +607,7 @@ describe('createProxyMiddleware', ()=>{
             expect(mockRequest.hostname).toBe(originalHostname);
             expect(mockRequest.path).toBe(originalPath);
             expect(mockRequest.port).toBe(originalPort);
+            expect(mockRequest.headers['x-s3-target-endpoint']).toBeUndefined();
         });
     });
 });

package/dist/utils/proxyMiddleware.js

@@ -52,6 +52,7 @@ const createProxyMiddleware = (config)=>{
     const resolvedProxyEndpoint = resolveProxyEndpoint(config.endpoint);
     const target = parseEndpoint(config.target);
     const proxy = parseEndpoint(resolvedProxyEndpoint);
+    const targetEndpointUrl = `${target.protocol}//${target.hostname}${80 !== target.port && 443 !== target.port ? `:${target.port}` : ''}`;
     return {
         applyToStack: (clientStack)=>{
             const preSigningMiddleware = (next)=>async (args)=>{
@@ -90,6 +91,7 @@ const createProxyMiddleware = (config)=>{
                         request.protocol = proxy.protocol;
                         request.path = '' === proxy.pathname || '/' === proxy.pathname ? request.path : proxy.pathname + request.path;
                         request.headers.host = proxy.port && 80 !== proxy.port && 443 !== proxy.port ? `${proxy.hostname}:${proxy.port}` : proxy.hostname;
+                        request.headers['x-s3-target-endpoint'] = targetEndpointUrl;
                         request.query = queryParams;
                     }
                     return next(args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scality/data-browser-library",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "A modular React component library for browsing S3 buckets and objects",
   "type": "module",
   "types": "./dist/index.d.ts",
@@ -30,8 +30,7 @@
     "@aws-sdk/s3-presigned-post": "^3.983.0",
     "@aws-sdk/s3-request-presigner": "^3.983.0",
     "@hookform/resolvers": "^5.2.2",
-    "@monaco-editor/react": "^4.7.0",
-    "@scality/zenkoclient": "^2.0.0-preview.1",
+    "@scality/cloudserverclient": "^1.0.4",
     "@tanstack/react-query": "^5.8.0",
     "@tanstack/react-query-devtools": "^5.8.0",
     "@testing-library/user-event": "^14.6.1",
@@ -40,7 +39,7 @@
     "react-hook-form": "^7.48.0"
   },
   "peerDependencies": {
-    "@scality/core-ui": ">=0.198.0",
+    "@scality/core-ui": ">=0.202.0",
     "react": ">=18.0.0",
     "react-dom": ">=18.0.0",
     "react-router": ">=7.1.3",
@@ -54,6 +53,7 @@
     "@testing-library/react": "^15.0.6",
     "@testing-library/user-event": "^14.6.1",
     "@types/jest": "^30.0.0",
+    "@types/json-schema": "^7.0.15",
     "@types/react": "^18.2.0",
     "@types/react-dom": "^18.2.0",
     "@types/styled-components": "^5.1.34",

package/dist/components/Editor.d.ts

@@ -1,12 +0,0 @@
-import { type BeforeMount, type EditorProps } from '@monaco-editor/react';
-interface EditorComponentProps {
-    value: string;
-    onChange: (value: string | undefined) => void;
-    readOnly?: boolean;
-    language?: string;
-    height?: string;
-    width?: string;
-    beforeMount?: BeforeMount;
-}
-export declare const Editor: React.FC<EditorComponentProps & EditorProps>;
-export {};