Skip to content

Commit 2b39b33

Browse files
feat(muk): delete import of ods 18
ref: #MANAGER-20065 Signed-off-by: Alex Boungnaseng <[email protected]>
1 parent 8576aa4 commit 2b39b33

File tree

8 files changed

+23
-35
lines changed

8 files changed

+23
-35
lines changed

packages/manager-ui-kit/package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
"@ovh-ux/manager-vite-config": "^0.13.3",
6060
"@ovh-ux/manager-static-analysis-kit": "*",
6161
"@ovh-ux/manager-tests-setup": "^0.2.0",
62-
"@ovhcloud/ods-components": "^18.6.2",
6362
"@ovhcloud/ods-react": "^19.0.1",
6463
"@ovhcloud/ods-themes": "^19.0.1",
6564
"@types/lodash.isdate": "^4.0.9",
@@ -106,7 +105,6 @@
106105
"@ovh-ux/manager-core-api": "^0.10.0",
107106
"@ovh-ux/manager-core-utils": "*",
108107
"@ovh-ux/manager-react-shell-client": "^0.9.1",
109-
"@ovhcloud/ods-components": "^18.6.2",
110108
"@ovhcloud/ods-react": "^19.1.0",
111109
"@ovhcloud/ods-themes": "^19.0.1",
112110
"date-fns": "~4.1.0",

packages/manager-ui-kit/src/components/onboarding-layout/__tests__/OnboardingLayout.spec.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { vi, vitest } from 'vitest';
2-
import { OdsText } from '@ovhcloud/ods-components/react';
32
import { fireEvent, screen, act } from '@testing-library/react';
43
import { render } from '@/setupTest';
4+
import { Text } from '../../text';
55
import { OnboardingLayout } from '../index';
66
import placeholderSrc from '../../../../public/assets/placeholder.png';
77
import { useAuthorizationIam } from '../../../hooks/iam';
@@ -38,9 +38,9 @@ describe('specs:onboarding', () => {
3838
<OnboardingLayout
3939
title={customTitle}
4040
description={
41-
<OdsText preset="paragraph" className="text-center">
41+
<Text preset="paragraph" className="text-center">
4242
{descriptionText}
43-
</OdsText>
43+
</Text>
4444
}
4545
/>,
4646
);

packages/manager-ui-kit/src/components/onboarding-layout/onboarding-layout-button/OnboardingLayoutButton.component.tsx

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import { FC } from 'react';
2-
import { ODS_BUTTON_SIZE, ODS_BUTTON_VARIANT } from '@ovhcloud/ods-components';
3-
import { Icon, ICON_NAME } from '@ovhcloud/ods-react';
2+
import {
3+
Icon,
4+
ICON_NAME,
5+
BUTTON_SIZE,
6+
BUTTON_VARIANT,
7+
} from '@ovhcloud/ods-react';
48
import { Button } from '../../button';
59
import { OnboardingLayoutButtonProps } from './OnboardingLayoutButton.type';
610

@@ -24,7 +28,7 @@ const OnboardingLayoutButton: FC<OnboardingLayoutButtonProps> = ({
2428
{orderButtonLabel && (onOrderButtonClick || orderHref) && (
2529
<Button
2630
className="[&::part(button)]:w-full sm:w-auto"
27-
size={ODS_BUTTON_SIZE.md}
31+
size={BUTTON_SIZE.md}
2832
onClick={() => {
2933
onOrderButtonClick?.();
3034
if (orderHref) {
@@ -40,8 +44,8 @@ const OnboardingLayoutButton: FC<OnboardingLayoutButtonProps> = ({
4044
{moreInfoButtonLabel && moreInfoHref && (
4145
<Button
4246
className="[&::part(button)]:w-full sm:w-auto"
43-
size={ODS_BUTTON_SIZE.md}
44-
variant={ODS_BUTTON_VARIANT.outline}
47+
size={BUTTON_SIZE.md}
48+
variant={BUTTON_VARIANT.outline}
4549
onClick={() => {
4650
if (!isMoreInfoButtonDisabled) {
4751
if (moreInfoHref) {

packages/manager-ui-kit/src/components/onboarding-layout/onboarding-layout-button/OnboardingLayoutButton.type.ts

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

33
export type OnboardingLayoutButtonProps = {
44
orderButtonLabel?: string;
@@ -11,7 +11,7 @@ export type OnboardingLayoutButtonProps = {
1111
displayTooltip?: boolean;
1212
};
1313
moreInfoHref?: string;
14-
moreInfoButtonIcon?: ODS_ICON_NAME;
14+
moreInfoButtonIcon?: ICON_NAME;
1515
moreInfoButtonLabel?: string;
1616
isMoreInfoButtonDisabled?: boolean;
1717
};

packages/manager-ui-kit/src/components/order/order-summary/OrderSummary.component.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useEffect, FC } from 'react';
22
import { Trans, useTranslation } from 'react-i18next';
3-
import { ODS_TEXT_PRESET } from '@ovhcloud/ods-components';
3+
import { TEXT_PRESET } from '@ovhcloud/ods-react';
44
import { useOrderContext } from '../Order.context';
55
import { Link, LinkType } from '../../Link';
66
import { Button } from '../../button';
@@ -31,10 +31,10 @@ export const OrderSummary: FC<OrderSummaryProps> = ({
3131

3232
return (
3333
<section className="flex flex-col gap-4">
34-
<Text preset={ODS_TEXT_PRESET.heading2} data-testid="order-summary-title">
34+
<Text preset={TEXT_PRESET.heading2} data-testid="order-summary-title">
3535
{t('order_summary_order_initiated_title', { product })}
3636
</Text>
37-
<Text preset={ODS_TEXT_PRESET.paragraph}>
37+
<Text preset={TEXT_PRESET.paragraph}>
3838
<Trans
3939
t={t}
4040
i18nKey="order_summary_order_initiated_subtitle"
@@ -51,7 +51,7 @@ export const OrderSummary: FC<OrderSummaryProps> = ({
5151
}}
5252
/>
5353
</Text>
54-
<Text preset={ODS_TEXT_PRESET.paragraph}>
54+
<Text preset={TEXT_PRESET.paragraph}>
5555
{t('order_summary_order_initiated_info', { product })}
5656
</Text>
5757
<Button

packages/manager-ui-kit/src/components/tiles-input/TilesInput.component.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useCallback, useEffect, useState } from 'react';
2-
import { OdsCard } from '@ovhcloud/ods-components/react';
2+
import { Card } from '@ovhcloud/ods-react';
33
import { clsx } from 'clsx';
44
import isEqual from 'lodash.isequal';
55
import { hashCode } from '../../utils';
@@ -107,7 +107,7 @@ export const TilesInputComponent = <T, S>({
107107

108108
return (
109109
<li className="w-full px-1" key={hashCode(key)}>
110-
<OdsCard
110+
<Card
111111
onClick={() =>
112112
is.stack.singleton(key)
113113
? set.value(stackItem[0] as T)
@@ -122,13 +122,13 @@ export const TilesInputComponent = <T, S>({
122122
{is.stack.singleton(key)
123123
? label(stackItem[0] as T)
124124
: key !== undefined && stack?.label(key, stackItem)}
125-
</OdsCard>
125+
</Card>
126126
</li>
127127
);
128128
})
129129
: items.map((item: T) => (
130130
<li className="w-full px-1" key={hashCode(item)}>
131-
<OdsCard
131+
<Card
132132
onClick={() => set.value(item)}
133133
className={`${clsx(
134134
isEqual(value, item)
@@ -137,7 +137,7 @@ export const TilesInputComponent = <T, S>({
137137
)} w-full px-[24px] py-[16px]`}
138138
>
139139
{label(item)}
140-
</OdsCard>
140+
</Card>
141141
</li>
142142
))}
143143
</ul>

packages/manager-ui-kit/vite.config.mts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ export default defineConfig({
6666
'zustand',
6767
'@ovhcloud/ods-common-core',
6868
'@ovhcloud/ods-common-theming',
69-
'@ovhcloud/ods-components',
70-
'@ovhcloud/ods-components/react',
7169
'@ovhcloud/ods-theme-blue-jeans',
7270
'@ovhcloud/ods-react',
7371
],

yarn.lock

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10419,13 +10419,6 @@
1041910419
dependencies:
1042010420
"@tanstack/virtual-core" "3.2.0"
1042110421

10422-
"@tanstack/react-virtual@^3.10.0":
10423-
version "3.13.12"
10424-
resolved "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.13.12.tgz#d372dc2783739cc04ec1a728ca8203937687a819"
10425-
integrity sha512-Gd13QdxPSukP8ZrkbgS2RwoZseTTbQPLnQEn7HY/rqtM+8Zt95f7xKC7N0EsKs7aoz0WzZ+fditZux+F8EzYxA==
10426-
dependencies:
10427-
"@tanstack/virtual-core" "3.13.12"
10428-
1042910422
"@tanstack/react-virtual@^3.10.9":
1043010423
version "3.10.9"
1043110424
resolved "https://registry.yarnpkg.com/@tanstack/react-virtual/-/react-virtual-3.10.9.tgz#40606b6dd8aba8e977f576d8f7df07f69ca63eea"
@@ -10453,11 +10446,6 @@
1045310446
resolved "https://registry.yarnpkg.com/@tanstack/virtual-core/-/virtual-core-3.10.9.tgz#55710c92b311fdaa8d8c66682a0dbdd684bc77c4"
1045410447
integrity sha512-kBknKOKzmeR7lN+vSadaKWXaLS0SZZG+oqpQ/k80Q6g9REn6zRHS/ZYdrIzHnpHgy/eWs00SujveUN/GJT2qTw==
1045510448

10456-
"@tanstack/[email protected]":
10457-
version "3.13.12"
10458-
resolved "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.13.12.tgz#1dff176df9cc8f93c78c5e46bcea11079b397578"
10459-
integrity sha512-1YBOJfRHV4sXUmWsFSf5rQor4Ss82G8dQWLRbnk3GA4jeP8hQt1hxXh0tmflpC0dz3VgEv/1+qwPyLeWkQuPFA==
10460-
1046110449
"@tanstack/[email protected]":
1046210450
version "3.2.0"
1046310451
resolved "https://registry.yarnpkg.com/@tanstack/virtual-core/-/virtual-core-3.2.0.tgz#874d36135e4badce2719e7bdc556ce240cbaff14"

0 commit comments

Comments
 (0)