chore: Validate type

RocketChat · Dec 24, 2024 · ff50cfa · ff50cfa
1 parent ae789d3
commit ff50cfa
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 27 deletions.
diff --git a/packages/onboarding-ui/src/flows/SelfHostedRegistration/mocks.ts b/packages/onboarding-ui/src/flows/SelfHostedRegistration/mocks.ts
@@ -1,6 +1,5 @@
 import { action } from '@storybook/addon-actions';
 import { countries } from 'countries-list';
-import type { Validate } from 'react-hook-form';
 
 export const logSubmit =
   <T extends (...args: any[]) => any>(onSubmit: T) =>
@@ -40,7 +39,7 @@ export const validateEmail = fetchMock('/email/validate', (email: string) => {
   return true;
 });
 
-export const validatePassword: Validate<string> = (password: string) => {
+export const validatePassword = (password: string) => {
   if (password.length < 6) {
     return `Password is too short`;
   }

diff --git a/packages/onboarding-ui/src/forms/AdminInfoForm/AdminInfoForm.tsx b/packages/onboarding-ui/src/forms/AdminInfoForm/AdminInfoForm.tsx
@@ -35,9 +35,9 @@ type AdminInfoFormProps = {
   passwordRulesHint: string;
   keepPosted?: boolean;
   initialValues?: Omit<AdminInfoPayload, 'password'>;
-  validateUsername: Validate<string>;
-  validateEmail: Validate<string>;
-  validatePassword: Validate<string>;
+  validateUsername: Validate<string, AdminInfoPayload>;
+  validateEmail: Validate<string, AdminInfoPayload>;
+  validatePassword: Validate<string, AdminInfoPayload>;
   onSubmit: SubmitHandler<AdminInfoPayload>;
 };
 

diff --git a/packages/onboarding-ui/src/forms/CreateCloudWorkspaceForm/CreateCloudWorkspaceForm.tsx b/packages/onboarding-ui/src/forms/CreateCloudWorkspaceForm/CreateCloudWorkspaceForm.tsx
@@ -42,8 +42,8 @@ type CreateCloudWorkspaceFormProps = {
   languageOptions: SelectOption[];
   domain: string;
   onBackButtonClick?: () => void;
-  validateUrl: Validate<string>;
-  validateEmail: Validate<string>;
+  validateUrl: Validate<string, CreateCloudWorkspaceFormPayload>;
+  validateEmail: Validate<string, CreateCloudWorkspaceFormPayload>;
 };
 
 const CreateCloudWorkspaceForm = ({

diff --git a/packages/onboarding-ui/src/forms/CreateFirstMemberForm/CreateFirstMemberForm.tsx b/packages/onboarding-ui/src/forms/CreateFirstMemberForm/CreateFirstMemberForm.tsx
@@ -29,8 +29,8 @@ type CreateFirstMemberFormProps = {
   organizationName: string;
   onSubmit: SubmitHandler<CreateFirstMemberFormPayload>;
   onBackButtonClick: () => void;
-  validateUsername: Validate<string>;
-  validatePassword: Validate<string>;
+  validateUsername: Validate<string, CreateFirstMemberFormPayload>;
+  validatePassword: Validate<string, CreateFirstMemberFormPayload>;
 };
 
 const CreateFirstMemberForm = ({

diff --git a/packages/onboarding-ui/src/forms/CreateNewPassword/CreateNewPassword.tsx b/packages/onboarding-ui/src/forms/CreateNewPassword/CreateNewPassword.tsx
@@ -21,8 +21,8 @@ export type CreateNewPasswordPayload = {
 
 type CreateNewPasswordProps = {
   initialValues?: CreateNewPasswordPayload;
-  validatePassword: Validate<string>;
-  validatePasswordConfirmation: Validate<string>;
+  validatePassword: Validate<string, CreateNewPasswordPayload>;
+  validatePasswordConfirmation: Validate<string, CreateNewPasswordPayload>;
   onSubmit: SubmitHandler<CreateNewPasswordPayload>;
 };
 

diff --git a/packages/onboarding-ui/src/forms/NewAccountForm/NewAccountForm.tsx b/packages/onboarding-ui/src/forms/NewAccountForm/NewAccountForm.tsx
@@ -29,9 +29,9 @@ export type NewAccountPayload = {
 
 type NewAccountFormProps = {
   initialValues?: Omit<NewAccountPayload, 'password'>;
-  validateEmail: Validate<string>;
-  validatePassword: Validate<string>;
-  validateConfirmationPassword: Validate<string>;
+  validateEmail: Validate<string, NewAccountPayload>;
+  validatePassword: Validate<string, NewAccountPayload>;
+  validateConfirmationPassword: Validate<string, NewAccountPayload>;
   onSubmit: SubmitHandler<NewAccountPayload>;
 };
 

diff --git a/packages/onboarding-ui/src/forms/RegisterServerForm/RegisterServerForm.tsx b/packages/onboarding-ui/src/forms/RegisterServerForm/RegisterServerForm.tsx
@@ -29,7 +29,7 @@ type RegisterServerFormProps = {
   currentStep: number;
   stepCount: number;
   initialValues?: Partial<RegisterServerPayload>;
-  validateEmail?: Validate<string>;
+  validateEmail?: Validate<string, RegisterServerPayload>;
   onSubmit: SubmitHandler<RegisterServerPayload>;
   onClickRegisterOffline: () => void;
   termsHref?: string;

diff --git a/packages/onboarding-ui/src/forms/RequestTrialForm/RequestTrialForm.tsx b/packages/onboarding-ui/src/forms/RequestTrialForm/RequestTrialForm.tsx
@@ -35,7 +35,7 @@ type RequestTrialFormProps = {
   countryOptions: SelectOption[];
   onSubmit: SubmitHandler<RequestTrialPayload>;
   onManageWorkspaceClick: () => void;
-  validateEmail: Validate<string>;
+  validateEmail: Validate<string, RequestTrialPayload>;
   termsHref?: string;
   policyHref?: string;
 };

diff --git a/packages/onboarding-ui/src/forms/ResetPasswordForm/ResetPasswordForm.tsx b/packages/onboarding-ui/src/forms/ResetPasswordForm/ResetPasswordForm.tsx
@@ -21,7 +21,7 @@ export type ResetPasswordFormPayload = {
 
 type ResetPasswordFormProps = {
   initialValues?: ResetPasswordFormPayload;
-  validateEmail: Validate<string>;
+  validateEmail: Validate<string, ResetPasswordFormPayload>;
   onSubmit: SubmitHandler<ResetPasswordFormPayload>;
 };
 

diff --git a/packages/onboarding-ui/src/pages/AdminInfoPage/AdminInfoPage.tsx b/packages/onboarding-ui/src/pages/AdminInfoPage/AdminInfoPage.tsx
@@ -15,9 +15,9 @@ type AdminInfoPageProps = {
   passwordRulesHint: string;
   keepPosted?: boolean;
   initialValues?: Omit<AdminInfoPayload, 'password'>;
-  validateUsername: Validate<string>;
-  validateEmail: Validate<string>;
-  validatePassword: Validate<string>;
+  validateUsername: Validate<string, AdminInfoPayload>;
+  validateEmail: Validate<string, AdminInfoPayload>;
+  validatePassword: Validate<string, AdminInfoPayload>;
   onSubmit: SubmitHandler<AdminInfoPayload>;
 };
 

diff --git a/packages/onboarding-ui/src/pages/CreateNewAccountPage/CreateNewAccountPage.tsx b/packages/onboarding-ui/src/pages/CreateNewAccountPage/CreateNewAccountPage.tsx
@@ -14,9 +14,9 @@ import type { NewAccountPayload } from '../../forms/NewAccountForm/NewAccountFor
 
 type CreateNewAccountPageProps = {
   initialValues?: Omit<NewAccountPayload, 'password'>;
-  validateEmail: Validate<string>;
-  validatePassword: Validate<string>;
-  validateConfirmationPassword: Validate<string>;
+  validateEmail: Validate<string, NewAccountPayload>;
+  validatePassword: Validate<string, NewAccountPayload>;
+  validateConfirmationPassword: Validate<string, NewAccountPayload>;
   onSubmit: SubmitHandler<NewAccountPayload>;
   onLogin: () => void;
 };

diff --git a/packages/onboarding-ui/src/pages/CreateNewPasswordPage/CreateNewPasswordPage.tsx b/packages/onboarding-ui/src/pages/CreateNewPasswordPage/CreateNewPasswordPage.tsx
@@ -11,8 +11,8 @@ import type { CreateNewPasswordPayload } from '../../forms/CreateNewPassword/Cre
 
 type CreateNewPasswordPageProps = {
   initialValues?: CreateNewPasswordPayload;
-  validatePassword: Validate<string>;
-  validatePasswordConfirmation: Validate<string>;
+  validatePassword: Validate<string, CreateNewPasswordPayload>;
+  validatePasswordConfirmation: Validate<string, CreateNewPasswordPayload>;
   onSubmit: SubmitHandler<CreateNewPasswordPayload>;
   onLogin: () => void;
 };

diff --git a/packages/onboarding-ui/src/pages/RegisterServerPage/RegisterServerPage.tsx b/packages/onboarding-ui/src/pages/RegisterServerPage/RegisterServerPage.tsx
@@ -14,7 +14,7 @@ type RegisterServerPageProps = {
   onSubmit: SubmitHandler<RegisterServerPayload>;
   onClickRegisterOffline: () => void;
   offline?: boolean;
-  validateEmail?: Validate<string>;
+  validateEmail?: Validate<string, RegisterServerPayload>;
   termsHref?: string;
   policyHref?: string;
 };

diff --git a/packages/onboarding-ui/src/pages/ResetPasswordPage/ResetPasswordPage.tsx b/packages/onboarding-ui/src/pages/ResetPasswordPage/ResetPasswordPage.tsx
@@ -11,7 +11,7 @@ import type { ResetPasswordFormPayload } from '../../forms/ResetPasswordForm/Res
 
 type ResetPasswordPageProps = {
   initialValues?: ResetPasswordFormPayload;
-  validateEmail: Validate<string>;
+  validateEmail: Validate<string, ResetPasswordFormPayload>;
   onSubmit: SubmitHandler<ResetPasswordFormPayload>;
   onLogin: () => void;
 };