+
-
+
);
}
diff --git a/src/react/ui-elements/Veeam/useMockData.ts b/src/react/ui-elements/Veeam/useMockData.ts
index cdecf30e1..a826581d4 100644
--- a/src/react/ui-elements/Veeam/useMockData.ts
+++ b/src/react/ui-elements/Veeam/useMockData.ts
@@ -27,7 +27,7 @@ const mockTableData = [
status: undefined,
},
{
- action: 'Store Veeam use case',
+ action: 'Tag bucket as Veeam Bucket',
status: undefined,
},
{
@@ -35,7 +35,7 @@ const mockTableData = [
status: undefined,
},
{
- action: 'See Smart Object Storage capacity',
+ action: 'Set Smart Object Storage capacity',
status: undefined,
},
];
From f1ea658c12b9b216fdacc496706d8ea9955661c1 Mon Sep 17 00:00:00 2001
From: YanJin
Date: Mon, 13 Nov 2023 17:12:11 +0100
Subject: [PATCH 2/4] ZKUI-396: Bump core-ui to 0.102.0
Attached the Stepper context to the window to make sure we reuse the same context even though the bundle load again
---
package-lock.json | 14 ++++++--------
package.json | 2 +-
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index d17486c2d..deedac675 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
"@hookform/resolvers": "^2.8.8",
"@js-temporal/polyfill": "^0.4.3",
"@monaco-editor/react": "^4.4.5",
- "@scality/core-ui": "github:scality/core-ui#0.101.0",
+ "@scality/core-ui": "github:scality/core-ui#0.102.0",
"@scality/module-federation": "github:scality/module-federation#1.1.0",
"@types/react-table": "^7.7.10",
"@types/react-virtualized": "^9.21.20",
@@ -3098,9 +3098,8 @@
"dev": true
},
"node_modules/@scality/core-ui": {
- "version": "0.101.0",
- "resolved": "git+ssh://git@github.com/scality/core-ui.git#d0702213c372854325e14314ab187c2b9b80ea6d",
- "integrity": "sha512-QM56MZmBGakRQdoUhKbZxy9ffjAKCTQaLw5SGoyqRFsMguJ9Gu7YSrRRuSRSk7ot8iqCIRYMccfuOG8Zg2pHAw==",
+ "version": "0.102.0",
+ "resolved": "git+ssh://git@github.com/scality/core-ui.git#7143a03048cbeeafd91689700071fcaaa5b4f468",
"license": "SEE LICENSE IN LICENSE",
"dependencies": {
"@floating-ui/dom": "^0.1.10",
@@ -3113,7 +3112,7 @@
"@fortawesome/free-regular-svg-icons": "^5.15.3",
"@fortawesome/free-solid-svg-icons": "^5.15.3",
"@fortawesome/react-fontawesome": "^0.1.14",
- "@js-temporal/polyfill": "^0.4.3",
+ "@js-temporal/polyfill": "^0.4.4",
"polished": "3.4.1",
"pretty-bytes": "^5.6.0",
"react": "^17.0.2",
@@ -23589,9 +23588,8 @@
"dev": true
},
"@scality/core-ui": {
- "version": "git+ssh://git@github.com/scality/core-ui.git#d0702213c372854325e14314ab187c2b9b80ea6d",
- "integrity": "sha512-QM56MZmBGakRQdoUhKbZxy9ffjAKCTQaLw5SGoyqRFsMguJ9Gu7YSrRRuSRSk7ot8iqCIRYMccfuOG8Zg2pHAw==",
- "from": "@scality/core-ui@github:scality/core-ui#0.101.0",
+ "version": "git+ssh://git@github.com/scality/core-ui.git#7143a03048cbeeafd91689700071fcaaa5b4f468",
+ "from": "@scality/core-ui@github:scality/core-ui#0.102.0",
"requires": {
"@floating-ui/dom": "^0.1.10",
"@storybook/preview-api": "^7.5.1",
diff --git a/package.json b/package.json
index c60f84d1e..98dda1454 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
"@hookform/resolvers": "^2.8.8",
"@js-temporal/polyfill": "^0.4.3",
"@monaco-editor/react": "^4.4.5",
- "@scality/core-ui": "github:scality/core-ui#0.101.0",
+ "@scality/core-ui": "github:scality/core-ui#0.102.0",
"@scality/module-federation": "github:scality/module-federation#1.1.0",
"@types/react-table": "^7.7.10",
"@types/react-virtualized": "^9.21.20",
From af6bb53a422222f3fcf5bcb3b57c9cd82bfef07a Mon Sep 17 00:00:00 2001
From: YanJin
Date: Mon, 13 Nov 2023 17:29:30 +0100
Subject: [PATCH 3/4] ZKUI-396: Add the Stepper in the test
---
.../ui-elements/Veeam/VeeamConfiguration.test.tsx | 15 ++++++++++++---
src/react/ui-elements/Veeam/VeeamTable.test.tsx | 10 +++++++++-
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/react/ui-elements/Veeam/VeeamConfiguration.test.tsx b/src/react/ui-elements/Veeam/VeeamConfiguration.test.tsx
index 25e6bd796..7b18e1200 100644
--- a/src/react/ui-elements/Veeam/VeeamConfiguration.test.tsx
+++ b/src/react/ui-elements/Veeam/VeeamConfiguration.test.tsx
@@ -1,21 +1,30 @@
import { render, screen, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
-import Configuration from './VeeamConfiguration';
import { QueryClient, QueryClientProvider } from 'react-query';
+import Configuration from './VeeamConfiguration';
+import { Stepper } from '@scality/core-ui';
describe('Veeam Configuration UI', () => {
const selectors = {
- repositoryInput: () => screen.getByLabelText(/Repository name/i),
+ repositoryInput: () => screen.getByLabelText(/bucket name/i),
continueButton: () => screen.getByRole('button', { name: /Continue/i }),
skipButton: () =>
screen.getByRole('button', { name: /Skip Use case configuration/i }),
title: () => screen.getByText(/Prepare ARTESCA for Veeam/i),
};
+
it('should be able to set the Veeam configuration', async () => {
//S
render(
-
+
,
);
//V
diff --git a/src/react/ui-elements/Veeam/VeeamTable.test.tsx b/src/react/ui-elements/Veeam/VeeamTable.test.tsx
index 543fee6d6..928221f56 100644
--- a/src/react/ui-elements/Veeam/VeeamTable.test.tsx
+++ b/src/react/ui-elements/Veeam/VeeamTable.test.tsx
@@ -2,6 +2,7 @@ import { render, screen, waitFor } from '@testing-library/react';
import VeeamTable from './VeeamTable';
import { QueryClient, QueryClientProvider } from 'react-query';
import { mockOffsetSize } from '../../utils/testUtil';
+import { Stepper } from '@scality/core-ui';
beforeAll(() => {
mockOffsetSize(500, 500);
@@ -16,7 +17,14 @@ describe('VeeamTable', () => {
it('should render the Veeam table', async () => {
render(
-
+
,
);
From 664a0d0bc6b5a5975b80f301c01f1ec85a2150be Mon Sep 17 00:00:00 2001
From: YanJin
Date: Mon, 13 Nov 2023 17:37:56 +0100
Subject: [PATCH 4/4] ZKUI-396: Improve the layout of the Veeam Stepper
---
src/react/ui-elements/Veeam/VeeamSteps.tsx | 6 +-----
src/react/ui-elements/Veeam/VeeamSummary.tsx | 1 +
src/react/ui-elements/Veeam/VeeamTable.tsx | 1 +
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/react/ui-elements/Veeam/VeeamSteps.tsx b/src/react/ui-elements/Veeam/VeeamSteps.tsx
index bcc77f055..8a3d034c9 100644
--- a/src/react/ui-elements/Veeam/VeeamSteps.tsx
+++ b/src/react/ui-elements/Veeam/VeeamSteps.tsx
@@ -25,9 +25,5 @@ export enum VeeamStepsIndexes {
}
export default function VeeamSteppers() {
- return (
-
-
-
- );
+ return ;
}
diff --git a/src/react/ui-elements/Veeam/VeeamSummary.tsx b/src/react/ui-elements/Veeam/VeeamSummary.tsx
index 409bab071..717a2f9b0 100644
--- a/src/react/ui-elements/Veeam/VeeamSummary.tsx
+++ b/src/react/ui-elements/Veeam/VeeamSummary.tsx
@@ -19,6 +19,7 @@ export const VeeamSummary = (_: VeeamSummaryProps) => {
title: 'Veeam Repository preparation summary',
kind: 'page',
}}
+ requireMode="all"
rightActions={
diff --git a/src/react/ui-elements/Veeam/VeeamTable.tsx b/src/react/ui-elements/Veeam/VeeamTable.tsx
index 6c2e6fddc..7fac5b3eb 100644
--- a/src/react/ui-elements/Veeam/VeeamTable.tsx
+++ b/src/react/ui-elements/Veeam/VeeamTable.tsx
@@ -111,6 +111,7 @@ export default function VeeamTable(_: VeeamTableProps) {
title: 'Configure ARTESCA for Veeam',
kind: 'page',
}}
+ requireMode="all"
rightActions={