Skip to content

Commit 3085483

Browse files
committed
fix(web-hosting): admin password regex for import
ref: #PUWEBPT-123456 Signed-off-by: stif59100 <steeve.vanderstocken@ovhcloud.com>
1 parent 390f97a commit 3085483

3 files changed

Lines changed: 12 additions & 13 deletions

File tree

packages/manager/apps/web-hosting/src/pages/managedWordpress/ManagedWordpressResource/import/importForm/ImportForm.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export default function ImportForm() {
5454
adminURL: '',
5555
},
5656
mode: 'onTouched',
57-
resolver: zodResolver(zForm(t).ADD_SITE_FORM_SCHEMA),
57+
resolver: zodResolver(zForm(t).IMPORT_SITE_FORM_SCHEMA),
5858
});
5959

6060
const { data, refetch } = useManagedWordpressWebsiteDetails(serviceName, websiteId);

packages/manager/apps/web-hosting/src/utils/formSchemas.utils.ts

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable max-lines-per-function */
21
import { z } from 'zod';
32

43
import { NAMESPACES } from '@ovh-ux/manager-common-translations';
@@ -10,23 +9,16 @@ import { AssociationType } from '@/data/types/product/website';
109
import { PASSWORD_REGEX } from './form';
1110

1211
export const zForm = (t: (key: string, params?: Record<string, unknown>) => string) => {
13-
const ADD_SITE_FORM_SCHEMA = z.object({
12+
const IMPORT_SITE_FORM_SCHEMA = z.object({
1413
adminLogin: z
1514
.string()
1615
.min(1, t(`${NAMESPACES.FORM}:min_chars`, { value: 1 }))
1716
.max(60, t(`${NAMESPACES.FORM}:max_chars`, { value: 60 }))
1817
.regex(/^[\w.@\-\s]{1,60}$/, t(`${NAMESPACES.FORM}:error_email`)),
1918
adminPassword: z
2019
.string()
21-
.regex(
22-
PASSWORD_REGEX,
23-
t(`${NAMESPACES.FORM}:error_between_min_max_chars`, {
24-
min: 8,
25-
max: 50,
26-
}),
27-
)
28-
.min(8, t(`${NAMESPACES.FORM}:min_chars`, { value: 8 }))
29-
.max(50, t(`${NAMESPACES.FORM}:max_chars`, { value: 50 })),
20+
.min(8, t(`${NAMESPACES.FORM}:min_chars`, { value: 1 }))
21+
.max(50, t(`${NAMESPACES.FORM}:max_chars`, { value: 500 })),
3022

3123
adminURL: z.string().url(t(`${NAMESPACES.FORM}:error_pattern`)),
3224
});
@@ -62,7 +54,7 @@ export const zForm = (t: (key: string, params?: Record<string, unknown>) => stri
6254
branch: z.string().min(1, t(`${NAMESPACES.FORM}:min_chars`, { value: 1 })),
6355
});
6456
return {
65-
ADD_SITE_FORM_SCHEMA,
57+
IMPORT_SITE_FORM_SCHEMA,
6658
CREATE_SITE_FORM_SCHEMA,
6759
GIT_ASSOCIATION_FORM_SCHEMA,
6860
};

packages/manager/apps/web-hosting/src/utils/test.setup.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,3 +473,10 @@ vi.mock('@/data/hooks/videoCenter/useVideoCenter', async (importActual) => {
473473
})),
474474
};
475475
});
476+
477+
if (typeof window.CSS === 'undefined') {
478+
Object.defineProperty(window, 'CSS', { value: {}, writable: true, configurable: true });
479+
}
480+
if (typeof window.CSS.supports !== 'function') {
481+
window.CSS.supports = () => false;
482+
}

0 commit comments

Comments
 (0)