Skip to content

Commit 87575e1

Browse files
committed
fixup! feat(backup-agent): move baremetal logics in backup-agent module
Signed-off-by: Thibault Barske <[email protected]>
1 parent 4f6932a commit 87575e1

File tree

33 files changed

+73
-81
lines changed

33 files changed

+73
-81
lines changed

packages/manager/apps/bmc-backup-agent-baremetal/src/pages/first-order/_components/__tests__/FirstOrderForm.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { vi } from 'vitest';
77

88
import { NAMESPACES } from '@ovh-ux/manager-common-translations';
99

10-
import { BAREMETAL_MOCK } from '@ovh-ux/backup-agent';
10+
import { BAREMETAL_MOCK } from '@ovh-ux/backup-agent/mocks/baremetals/baremetals.mocks';
1111

1212
import { FirstOrderFormComponent } from '../first-order-form/FirstOrderForm.component';
1313

packages/manager/apps/bmc-backup-agent-baremetal/src/pages/first-order/_components/first-order-form/FirstOrderForm.component.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ import { useTranslation } from 'react-i18next';
33

44
import { OdsButton } from '@ovhcloud/ods-components/react';
55

6-
import { BaremetalOption, RhfField, useBaremetalsList } from '@ovh-ux/backup-agent';
6+
import { useBaremetalsList } from '@ovh-ux/backup-agent/data/hooks/baremetal/useBaremetalsList';
7+
import { RhfField } from "@ovh-ux/backup-agent/components/Fields/RhfField/RhfField.component"
8+
import { BaremetalOption } from "@ovh-ux/backup-agent/components/CommonFields/BaremetalOption/BaremetalOption.component"
79
import { NAMESPACES } from '@ovh-ux/manager-common-translations';
810

911
type Inputs = {
@@ -28,7 +30,7 @@ export const FirstOrderFormComponent = () => {
2830
noValidate
2931
onSubmit={handleSubmit(onSubmit)}
3032
>
31-
<RhfField<any, any>
33+
<RhfField
3234
control={control}
3335
controllerParams={register('baremetal', { required: true })}
3436
helperMessage={t(`${NAMESPACES.FORM}:required_field`)}

packages/manager/apps/bmc-backup-agent-baremetal/src/pages/onboarding/Onboarding.page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useMemo } from 'react';
22

33
import { useTranslation } from 'react-i18next';
44

5-
import { useBaremetalsList } from '@ovh-ux/backup-agent';
5+
import { useBaremetalsList } from '@ovh-ux/backup-agent/data/hooks/baremetal/useBaremetalsList';
66
import { NAMESPACES } from '@ovh-ux/manager-common-translations';
77
import { Card } from '@ovh-ux/manager-react-components';
88

packages/manager/apps/bmc-backup-agent-baremetal/src/pages/onboarding/Onboarding.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ReactNode } from 'react';
33
import { render, screen, waitFor } from '@testing-library/react';
44
import { vi } from 'vitest';
55

6-
import { BAREMETAL_MOCK } from '@ovh-ux/backup-agent';
6+
import { BAREMETAL_MOCK } from '@ovh-ux/backup-agent/mocks/baremetals/baremetals.mocks';
77

88
import OnboardingPage from './Onboarding.page';
99

packages/manager/apps/bmc-backup-agent-baremetal/src/utils/tests/setupMsw.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { SetupServer } from 'msw/node';
22

33
import { getAuthenticationMocks, toMswHandlers } from '@ovh-ux/manager-core-test-utils';
44

5-
import { TBaremetalsMockParams, getBaremetalsMocks } from '@ovh-ux/backup-agent';
5+
import { TBaremetalsMockParams, getBaremetalsMocks } from '@ovh-ux/backup-agent/mocks/baremetals/baremetals.handler';
66

77
export type MockParams = TBaremetalsMockParams;
88

packages/manager/apps/bmc-backup-agent-baremetal/tailwind.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const baseTailwindConfig = [
1313
...(baseConfig.content ?? []),
1414
'./src/**/*.{js,jsx,ts,tsx}',
1515
toGlob(reactComponentsDir),
16-
toGlob(backupAgentModuleDir)
16+
`${toGlob(backupAgentModuleDir)}src/`
1717
];
1818

1919
/** @type {import('tailwindcss').Config} */

packages/manager/modules/backup-agent/package.json

Lines changed: 53 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,59 @@
66
"license": "BSD-3-Clause",
77
"author": "OVH SAS",
88
"sideEffects": false,
9-
"main": "dist/src/lib.js",
10-
"types": "dist/types/src/lib.d.ts",
9+
"exports": {
10+
".": {
11+
"import": "./dist/src/lib",
12+
"require": "./dist/src/lib.js",
13+
"types": "./dist/types/src/lib.d.ts"
14+
},
15+
"./package.json": {
16+
"import": "./package.json",
17+
"require": "./package.json"
18+
},
19+
"./data/hooks/baremetal/useBaremetalsList": {
20+
"import": "./dist/src/data/hooks/baremetal/useBaremetalsList",
21+
"require": "./dist/src/data/hooks/baremetal/useBaremetalsList.js",
22+
"types": "./dist/types/src/data/hooks/baremetal/useBaremetalsList.d.ts"
23+
},
24+
"./mocks/baremetals/baremetals.mocks": {
25+
"import": "./dist/src/mocks/baremetals/baremetals.mocks",
26+
"require": "./dist/src/mocks/baremetals/baremetals.mocks.js",
27+
"types": "./dist/types/src/mocks/baremetals/baremetals.mocks.d.ts"
28+
},
29+
"./mocks/baremetals/baremetals.handler": {
30+
"import": "./dist/src/mocks/baremetals/baremetals.handler",
31+
"require": "./dist/src/mocks/baremetals/baremetals.handler.js",
32+
"types": "./dist/types/src/mocks/baremetals/baremetals.handler.d.ts"
33+
},
34+
"./components/Fields/RhfField/RhfField.component": {
35+
"import": "./dist/src/components/Fields/RhfField.component",
36+
"require": "./dist/src/components/Fields/RhfField.component.js",
37+
"types": "./dist/types/src/components/Fields/RhfField.component.d.ts"
38+
},
39+
"./components/Fields/RhfInput": {
40+
"import": "./dist/src/components/Fields/RhfInput",
41+
"require": "./dist/src/components/Fields/RhfInput.js",
42+
"types": "./dist/types/src/components/Fields/RhfInput.d.ts"
43+
},
44+
"./components/Fields/RhfQuantity": {
45+
"import": "./dist/src/components/Fields/RhfQuantity",
46+
"require": "./dist/src/components/Fields/RhfQuantity.js",
47+
"types": "./dist/types/src/components/Fields/RhfQuantity.d.ts"
48+
},
49+
"./components/Fields/RhfCombobox": {
50+
"import": "./dist/src/components/Fields/RhfCombobox",
51+
"require": "./dist/src/components/Fields/RhfCombobox.js",
52+
"types": "./dist/types/src/components/Fields/RhfCombobox.d.ts"
53+
},
54+
"./components/CommonFields/BaremetalOption/BaremetalOption.component": {
55+
"import": "./dist/src/components/CommonFields/BaremetalOption/BaremetalOption.component",
56+
"require": "./dist/src/components/CommonFields/BaremetalOption/BaremetalOption.component.js",
57+
"types": "./dist/types/src/components/CommonFields/BaremetalOption/BaremetalOption.component.d.ts"
58+
}
59+
},
60+
"main": "./dist/src/lib.js",
61+
"types": "./dist/types/src/lib.d.ts",
1162
"scripts": {
1263
"build": "tsc && tsc-alias",
1364
"dev": "tsc && tsc-alias",

packages/manager/modules/backup-agent/src/components/CommonFields/BaremetalOption/BaremetalOption.component.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { OdsText } from '@ovhcloud/ods-components/react';
22

3-
import { RhfField } from '@/components/Fields';
4-
import { Baremetal } from '@/types';
3+
import { RhfField } from '@/components/Fields/RhfField.component';
4+
import { Baremetal } from '@/types/Baremetal.type';
55

66
type BaremetalOptionProps = Pick<Baremetal, 'name' | 'ip'> & Pick<Baremetal['iam'], 'displayName'>;
77

8-
const BaremetalOption = (baremetalService: BaremetalOptionProps) => {
8+
export const BaremetalOption = (baremetalService: BaremetalOptionProps) => {
99
return (
1010
<RhfField.ComboboxItem
1111
key={baremetalService.name}

packages/manager/modules/backup-agent/src/components/CommonFields/BaremetalOption/index.ts

Lines changed: 0 additions & 3 deletions
This file was deleted.

packages/manager/modules/backup-agent/src/components/CommonFields/index.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)