Skip to content

Commit c21b713

Browse files
erazafimovhstif59100
authored andcommitted
feat(web-hosting): muk adaptation
ref: #PUWEBPT-86 Signed-off-by: Emilien Razafimampiandra <[email protected]>
1 parent c601a92 commit c21b713

File tree

24 files changed

+420
-554
lines changed

24 files changed

+420
-554
lines changed

package.json

Lines changed: 1 addition & 215 deletions
Original file line numberDiff line numberDiff line change
@@ -5,221 +5,7 @@
55
"description": "OVH Control Panel also known as Manager",
66
"license": "BSD-3-Clause",
77
"workspaces": {
8-
"packages": [
9-
"docs",
10-
"packages/manager-ui-kit",
11-
"packages/manager-wiki",
12-
"packages/manager/apps/account",
13-
"packages/manager/apps/account-creation",
14-
"packages/manager/apps/billing",
15-
"packages/manager/apps/carbon-calculator",
16-
"packages/manager/apps/carrier-sip",
17-
"packages/manager/apps/catalog",
18-
"packages/manager/apps/cda",
19-
"packages/manager/apps/cloud-connect",
20-
"packages/manager/apps/cloud-shell",
21-
"packages/manager/apps/communication",
22-
"packages/manager/apps/container",
23-
"packages/manager/apps/dbaas-logs",
24-
"packages/manager/apps/dedicated",
25-
"packages/manager/apps/dedicated-servers",
26-
"packages/manager/apps/email-domain",
27-
"packages/manager/apps/email-pro",
28-
"packages/manager/apps/exchange",
29-
"packages/manager/apps/freefax",
30-
"packages/manager/apps/hpc-vmware-public-vcf-aas",
31-
"packages/manager/apps/hpc-vmware-vsphere",
32-
"packages/manager/apps/hub",
33-
"packages/manager/apps/hycu",
34-
"packages/manager/apps/iam",
35-
"packages/manager/apps/identity-access-management",
36-
"packages/manager/apps/iplb",
37-
"packages/manager/apps/metrics",
38-
"packages/manager/apps/nasha",
39-
"packages/manager/apps/netapp",
40-
"packages/manager/apps/nutanix",
41-
"packages/manager/apps/okms",
42-
"packages/manager/apps/order-tracking",
43-
"packages/manager/apps/overthebox",
44-
"packages/manager/apps/pci",
45-
"packages/manager/apps/pci-ai-endpoints",
46-
"packages/manager/apps/pci-ai-tools",
47-
"packages/manager/apps/pci-billing",
48-
"packages/manager/apps/pci-cold-archive",
49-
"packages/manager/apps/pci-databases-analytics",
50-
"packages/manager/apps/pci-dataplatform",
51-
"packages/manager/apps/pci-gateway",
52-
"packages/manager/apps/pci-kubernetes",
53-
"packages/manager/apps/pci-load-balancer",
54-
"packages/manager/apps/pci-object-storage",
55-
"packages/manager/apps/pci-private-network",
56-
"packages/manager/apps/pci-private-registry",
57-
"packages/manager/apps/pci-public-ip",
58-
"packages/manager/apps/pci-quota",
59-
"packages/manager/apps/pci-rancher",
60-
"packages/manager/apps/pci-savings-plan",
61-
"packages/manager/apps/pci-ssh-keys",
62-
"packages/manager/apps/pci-users",
63-
"packages/manager/apps/pci-volume-backup",
64-
"packages/manager/apps/pci-volume-snapshot",
65-
"packages/manager/apps/pci-vouchers",
66-
"packages/manager/apps/pci-workflow",
67-
"packages/manager/apps/procedures",
68-
"packages/manager/apps/public-cloud",
69-
"packages/manager/apps/restricted",
70-
"packages/manager/apps/sap-features-hub",
71-
"packages/manager/apps/sign-up",
72-
"packages/manager/apps/sms",
73-
"packages/manager/apps/support",
74-
"packages/manager/apps/telecom",
75-
"packages/manager/apps/telecom-dashboard",
76-
"packages/manager/apps/telecom-task",
77-
"packages/manager/apps/veeam-backup",
78-
"packages/manager/apps/veeam-enterprise",
79-
"packages/manager/apps/vps",
80-
"packages/manager/apps/vrack",
81-
"packages/manager/apps/vrack-services",
82-
"packages/manager/apps/web",
83-
"packages/manager/apps/web-domains",
84-
"packages/manager/apps/web-ongoing-operations",
85-
"packages/manager/core/api",
86-
"packages/manager/core/application",
87-
"packages/manager/core/ovh-product-icons",
88-
"packages/manager/core/request-tagger",
89-
"packages/manager/core/sso",
90-
"packages/manager/core/url-builder",
91-
"packages/manager/core/utils",
92-
"packages/manager/modules/account",
93-
"packages/manager/modules/account-migration",
94-
"packages/manager/modules/advices",
95-
"packages/manager/modules/at-internet-configuration",
96-
"packages/manager/modules/banner",
97-
"packages/manager/modules/beta-preference",
98-
"packages/manager/modules/billing",
99-
"packages/manager/modules/billing-components",
100-
"packages/manager/modules/billing-informations",
101-
"packages/manager/modules/bm-server-components",
102-
"packages/manager/modules/carbon-calculator",
103-
"packages/manager/modules/carrier-sip",
104-
"packages/manager/modules/catalog-price",
105-
"packages/manager/modules/cda",
106-
"packages/manager/modules/cloud-connect",
107-
"packages/manager/modules/cloud-styles",
108-
"packages/manager/modules/cloud-universe-components",
109-
"packages/manager/modules/common-api",
110-
"packages/manager/modules/common-translations",
111-
"packages/manager/modules/config",
112-
"packages/manager/modules/cookie-policy",
113-
"packages/manager/modules/core",
114-
"packages/manager/modules/dbaas-logs",
115-
"packages/manager/modules/email-domain",
116-
"packages/manager/modules/emailpro",
117-
"packages/manager/modules/error-page",
118-
"packages/manager/modules/exchange",
119-
"packages/manager/modules/filters",
120-
"packages/manager/modules/freefax",
121-
"packages/manager/modules/gcj",
122-
"packages/manager/modules/iam",
123-
"packages/manager/modules/iplb",
124-
"packages/manager/modules/log-to-customer",
125-
"packages/manager/modules/logs-to-customer",
126-
"packages/manager/modules/manager-components",
127-
"packages/manager/modules/manager-pci-common",
128-
"packages/manager/modules/metrics",
129-
"packages/manager/modules/mfa-enrollment",
130-
"packages/manager/modules/models",
131-
"packages/manager/modules/nasha",
132-
"packages/manager/modules/netapp",
133-
"packages/manager/modules/network-common",
134-
"packages/manager/modules/ng-apiv2-helper",
135-
"packages/manager/modules/ng-layout-helpers",
136-
"packages/manager/modules/ng-ovh-order-tracking",
137-
"packages/manager/modules/nutanix",
138-
"packages/manager/modules/order",
139-
"packages/manager/modules/overthebox",
140-
"packages/manager/modules/pci",
141-
"packages/manager/modules/pci-universe-components",
142-
"packages/manager/modules/phone-prefix",
143-
"packages/manager/modules/product-offers",
144-
"packages/manager/modules/request-tagger",
145-
"packages/manager/modules/resource-tagging",
146-
"packages/manager/modules/sign-up",
147-
"packages/manager/modules/sms",
148-
"packages/manager/modules/support",
149-
"packages/manager/modules/telecom-dashboard",
150-
"packages/manager/modules/telecom-styles",
151-
"packages/manager/modules/telecom-task",
152-
"packages/manager/modules/telecom-universe-components",
153-
"packages/manager/modules/trusted-nic",
154-
"packages/manager/modules/vcd-api",
155-
"packages/manager/modules/veeam-enterprise",
156-
"packages/manager/modules/vps",
157-
"packages/manager/modules/vrack",
158-
"packages/manager/modules/web-universe-components",
159-
"packages/manager-tools/manager-cli",
160-
"packages/manager-tools/manager-forge-cli",
161-
"packages/manager-tools/manager-legacy-tools/codename-generator",
162-
"packages/manager-tools/manager-legacy-tools/component-rollup-config",
163-
"packages/manager-tools/manager-legacy-tools/dev-server",
164-
"packages/manager-tools/manager-legacy-tools/dev-server-config",
165-
"packages/manager-tools/manager-legacy-tools/test-utils",
166-
"packages/manager-tools/manager-legacy-tools/webpack-config",
167-
"packages/manager-tools/manager-legacy-tools/webpack-dev-server",
168-
"packages/manager-tools/manager-muk-cli",
169-
"packages/manager-tools/manager-pm",
170-
"packages/manager-tools/manager-static-analysis-kit",
171-
"packages/manager-tools/manager-tailwind-config",
172-
"packages/manager-tools/manager-tests-setup",
173-
"packages/manager-tools/manager-vite-config",
174-
"packages/components/ng-at-internet",
175-
"packages/components/ng-at-internet-ui-router-plugin",
176-
"packages/components/ng-log-live-tail",
177-
"packages/components/ng-ovh-actions-menu",
178-
"packages/components/ng-ovh-browser-alert",
179-
"packages/components/ng-ovh-chart",
180-
"packages/components/ng-ovh-checkbox-table",
181-
"packages/components/ng-ovh-contact",
182-
"packages/components/ng-ovh-contacts",
183-
"packages/components/ng-ovh-contracts",
184-
"packages/components/ng-ovh-doc-url",
185-
"packages/components/ng-ovh-export-csv",
186-
"packages/components/ng-ovh-feature-flipping",
187-
"packages/components/ng-ovh-http",
188-
"packages/components/ng-ovh-jquery-ui-draggable",
189-
"packages/components/ng-ovh-line-diagnostics",
190-
"packages/components/ng-ovh-mondial-relay",
191-
"packages/components/ng-ovh-otrs",
192-
"packages/components/ng-ovh-payment-method",
193-
"packages/components/ng-ovh-proxy-request",
194-
"packages/components/ng-ovh-responsive-popover",
195-
"packages/components/ng-ovh-sidebar-menu",
196-
"packages/components/ng-ovh-simple-country-list",
197-
"packages/components/ng-ovh-sso-auth",
198-
"packages/components/ng-ovh-swimming-poll",
199-
"packages/components/ng-ovh-timeline",
200-
"packages/components/ng-ovh-toaster",
201-
"packages/components/ng-ovh-ui-confirm-modal",
202-
"packages/components/ng-ovh-user-pref",
203-
"packages/components/ng-ovh-utils",
204-
"packages/components/ng-pagination-front",
205-
"packages/components/ng-q-allsettled",
206-
"packages/components/ng-shell-tracking",
207-
"packages/components/ng-tail-logs",
208-
"packages/components/ng-translate-async-loader",
209-
"packages/components/ng-ui-router-breadcrumb",
210-
"packages/components/ng-ui-router-layout",
211-
"packages/components/ng-ui-router-title",
212-
"packages/components/ovh-at-internet",
213-
"packages/components/ovh-payment-method",
214-
"packages/components/ovh-reket",
215-
"packages/components/ovh-shell",
216-
"packages/manager/apps/web-office",
217-
"packages/manager/apps/zimbra",
218-
"packages/manager/apps/pci-contacts",
219-
"packages/manager/apps/pci-instances",
220-
"packages/manager/apps/web-hosting",
221-
"packages/manager/apps/pci-block-storage"
222-
]
8+
"packages": []
2239
},
22410
"scripts": {
22511
"build": "yarn pm:build:ci",

packages/manager/apps/web-hosting/src/components/badgeStatus/BadgeStatus.component.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,14 @@ export const getStatusColor = (status: Status) => {
3131
case GitStatus.DEPLOYING:
3232
case DnsStatus.EXTERNAL:
3333
return BADGE_COLOR.warning;
34-
case GitStatus.DISABLED:
34+
case GitStatus.INITIALERROR:
3535
case GitStatus.ERROR:
3636
case ResourceStatus.ERROR:
3737
case ResourceStatus.SUSPENDED:
38-
case ServiceStatus.NONE:
3938
return BADGE_COLOR.critical;
4039
case DnsStatus.NOT_CONFIGURED:
40+
case GitStatus.DISABLED:
41+
case ServiceStatus.NONE:
4142
return BADGE_COLOR.neutral;
4243
default:
4344
return BADGE_COLOR.information;

packages/manager/apps/web-hosting/src/components/badgeStatus/BadgeStatus.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ describe('BadgeStatus component', () => {
2626
{ status: GitStatus.DELETING, color: BADGE_COLOR.warning },
2727
{ status: GitStatus.ERROR, color: BADGE_COLOR.critical },
2828
{ status: ServiceStatus.ACTIVE, color: BADGE_COLOR.success },
29-
{ status: ServiceStatus.NONE, color: BADGE_COLOR.critical },
29+
{ status: ServiceStatus.NONE, color: BADGE_COLOR.neutral },
3030
];
3131

3232
testCases.forEach(({ status, color }) => {

packages/manager/apps/web-hosting/src/data/types/product/managedWordpress/cms.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ export enum CmsType {
33
JOOMLA = 'JOOMLA',
44
PRESTASHOP = 'PRESTASHOP',
55
DRUPAL = 'DRUPAL',
6+
NONE = 'NONE',
67
}
78

89
export type CmsLanguage = {

packages/manager/apps/web-hosting/src/pages/dashboard/OrderDomain.page.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,10 @@ export default function OrderDomainModal() {
7979
aria-checked={ACTIONS.ATTACH === selectedOption}
8080
onChange={() => setSelectedOption(ACTIONS.ATTACH)}
8181
/>
82-
<label>
82+
<RadioControl />
83+
<RadioLabel>
8384
<Text preset="span">{t('hosting_dashboard_add_or_order_step1_attach')}</Text>
84-
</label>
85+
</RadioLabel>
8586
</RadioGroup>
8687
</div>
8788
</div>

packages/manager/apps/web-hosting/src/pages/dashboard/local-seo/LocalSeo.page.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ export default function LocalSeo() {
3232
version: 'v6',
3333
route: `/hosting/web/${serviceName}/localSeo/location`,
3434
cacheKey: ['hosting', 'web', serviceName, 'localSeo', 'location'],
35+
enabled: !!serviceName,
36+
iceberg: true,
3537
});
3638

3739
return (
@@ -64,7 +66,9 @@ export default function LocalSeo() {
6466
columns={flattenData?.length ? columns : []}
6567
data={flattenData || []}
6668
hasNextPage={hasNextPage && !isLoading}
67-
onFetchNextPage={void fetchNextPage}
69+
onFetchNextPage={(): void => {
70+
void fetchNextPage();
71+
}}
6872
isLoading={isLoading}
6973
/>
7074
</React.Suspense>

packages/manager/apps/web-hosting/src/pages/dashboard/multisite/cdn/ActivateCdn.modal.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ export default function ActivateCdnModal() {
3131
},
3232
(error: ApiError) => {
3333
addError(error?.response?.data?.message || t('multisite:multisite_cdn_activate_error'), true);
34+
navigate(-1);
3435
},
3536
);
3637

0 commit comments

Comments
 (0)