company name can be 255 characters on all pages (oncokb#1106)

jfkonecn · Apr 11, 2024 · 9a2dba3 · 9a2dba3
1 parent 5a3d9d2
commit 9a2dba3
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 14 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+12.16.1
diff --git a/src/main/webapp/app/components/newAccountForm/NewAccountForm.tsx b/src/main/webapp/app/components/newAccountForm/NewAccountForm.tsx
@@ -43,6 +43,7 @@ import {
   LONG_TEXT_VAL,
   SHORT_TEXT_VAL,
   TEXT_VAL,
+  OPTIONAL_TEXT_VAL,
 } from 'app/shared/utils/FormValidationUtils';
 import { NOT_USED_IN_AI_MODELS } from 'app/config/constants/terms';
 
@@ -463,6 +464,9 @@ export class NewAccountForm extends React.Component<INewAccountForm> {
                       ACCOUNT_TITLES.POSITION,
                       this.selectedLicense
                     )}
+                    validate={{
+                      ...OPTIONAL_TEXT_VAL,
+                    }}
                   />
                   <AvField
                     name="email"
@@ -610,7 +614,7 @@ export class NewAccountForm extends React.Component<INewAccountForm> {
                             errorMessage:
                               'Please let us know where you located.',
                           },
-                          ...SHORT_TEXT_VAL,
+                          ...TEXT_VAL,
                         }}
                       />
                       <AvField
@@ -625,7 +629,7 @@ export class NewAccountForm extends React.Component<INewAccountForm> {
                             errorMessage:
                               'Please let us know where you located.',
                           },
-                          ...SHORT_TEXT_VAL,
+                          ...TEXT_VAL,
                         }}
                       />
                       <AvField

diff --git a/src/main/webapp/app/components/newCompanyForm/NewCompanyForm.tsx b/src/main/webapp/app/components/newCompanyForm/NewCompanyForm.tsx
@@ -8,6 +8,12 @@ import { getSectionClassName } from 'app/pages/account/AccountUtils';
 import { FormTextAreaField } from '../../shared/textarea/FormTextAreaField';
 import { FormSelectWithLabelField } from '../../shared/select/FormSelectWithLabelField';
 import { AvField, AvForm } from 'availity-reactstrap-validation';
+import {
+  LONG_TEXT_VAL,
+  SHORT_TEXT_VAL,
+  TEXT_VAL,
+  OPTIONAL_TEXT_VAL,
+} from 'app/shared/utils/FormValidationUtils';
 import {
   LicenseType,
   LICENSE_TITLES,
@@ -137,7 +143,7 @@ export class NewCompanyForm extends React.Component<INewCompanyFormProps> {
               label="Name"
               validate={{
                 ...fieldRequiredValidation('company name'),
-                ...textValidation(1, 100),
+                ...TEXT_VAL,
                 async: debouncedCompanyNameValidator,
               }}
             />
@@ -160,12 +166,12 @@ export class NewCompanyForm extends React.Component<INewCompanyFormProps> {
             <AvField
               name="businessContact"
               label="Business Contact"
-              validate={{ ...textValidation(0, 255) }}
+              validate={{ ...OPTIONAL_TEXT_VAL }}
             />
             <AvField
               name="legalContact"
               label="Legal Contact"
-              validate={{ ...textValidation(0, 255) }}
+              validate={{ ...OPTIONAL_TEXT_VAL }}
             />
             <FormListField
               list={this.companyDomains}

diff --git a/src/main/webapp/app/pages/companyPage/CompanyPage.tsx b/src/main/webapp/app/pages/companyPage/CompanyPage.tsx
@@ -41,6 +41,7 @@ import {
   debouncedCompanyNameValidator,
   fieldRequiredValidation,
   textValidation,
+  OPTIONAL_TEXT_VAL,
 } from 'app/shared/utils/FormValidationUtils';
 import { Link } from 'react-router-dom';
 import { QuickToolButton } from '../userPage/QuickToolButton';
@@ -69,6 +70,11 @@ import UsageText from 'app/shared/texts/UsageText';
 import { DateSelector } from 'app/components/dateSelector/DateSelector';
 import { DownloadButton } from 'app/components/downloadButton/DownloadButton';
 import { RouterStore } from 'mobx-react-router';
+import {
+  LONG_TEXT_VAL,
+  SHORT_TEXT_VAL,
+  TEXT_VAL,
+} from 'app/shared/utils/FormValidationUtils';
 
 interface MatchParams {
   id: string;
@@ -563,7 +569,7 @@ export default class CompanyPage extends React.Component<ICompanyPage> {
                             }
                             validate={{
                               ...fieldRequiredValidation('company name'),
-                              ...textValidation(1, 100),
+                              ...TEXT_VAL,
                               async: (
                                 value: string,
                                 ctx: any,
@@ -618,7 +624,7 @@ export default class CompanyPage extends React.Component<ICompanyPage> {
                                 Business Contact
                               </span>
                             }
-                            validate={{ ...textValidation(0, 255) }}
+                            validate={{ ...OPTIONAL_TEXT_VAL }}
                           />
                           <AvField
                             name="legalContact"
@@ -628,7 +634,7 @@ export default class CompanyPage extends React.Component<ICompanyPage> {
                                 Legal Contact
                               </span>
                             }
-                            validate={{ ...textValidation(0, 255) }}
+                            validate={{ ...OPTIONAL_TEXT_VAL }}
                           />
                           <div className="form-group">
                             <div className={'font-weight-bold'}>

diff --git a/src/main/webapp/app/pages/userPage/UserPage.tsx b/src/main/webapp/app/pages/userPage/UserPage.tsx
@@ -73,6 +73,7 @@ import {
   LONG_TEXT_VAL,
   SHORT_TEXT_VAL,
   TEXT_VAL,
+  OPTIONAL_TEXT_VAL,
 } from 'app/shared/utils/FormValidationUtils';
 import AuthenticationStore from 'app/store/AuthenticationStore';
 import ButtonWithTooltip from 'app/shared/button/ButtonWithTooltip';
@@ -83,7 +84,7 @@ import {
 import UserUsageDetailsTable from 'app/pages/usageAnalysisPage/UserUsageDetailsTable';
 import { DateSelector } from 'app/components/dateSelector/DateSelector';
 import { KeyInputGroups } from 'app/pages/userPage/KeyInputGroups';
-import { Input, Label } from 'reactstrap';
+import { Label } from 'reactstrap';
 import {
   getAccountActivationLink,
   getPasswordResetLink,
@@ -873,7 +874,7 @@ export default class UserPage extends React.Component<IUserPage> {
                                 licenseType={this.selectedLicense}
                               />
                             }
-                            validate={SHORT_TEXT_VAL}
+                            validate={OPTIONAL_TEXT_VAL}
                             value={this.user.jobTitle}
                           />
                           <AvField
@@ -893,7 +894,7 @@ export default class UserPage extends React.Component<IUserPage> {
                                 ) : null}
                               </>
                             }
-                            validate={SHORT_TEXT_VAL}
+                            validate={TEXT_VAL}
                             value={
                               this.user.company
                                 ? this.user.company.name
@@ -925,7 +926,7 @@ export default class UserPage extends React.Component<IUserPage> {
                               />
                             }
                             value={this.user.city}
-                            validate={SHORT_TEXT_VAL}
+                            validate={TEXT_VAL}
                           />
                           <AvField
                             name="country"
@@ -936,7 +937,7 @@ export default class UserPage extends React.Component<IUserPage> {
                               />
                             }
                             value={this.user.country}
-                            validate={SHORT_TEXT_VAL}
+                            validate={TEXT_VAL}
                           />
                           <div className={'mb-2 font-weight-bold'}>
                             Account Type

diff --git a/src/main/webapp/app/shared/utils/FormValidationUtils.tsx b/src/main/webapp/app/shared/utils/FormValidationUtils.tsx
@@ -73,6 +73,8 @@ export const textValidation = (minLength?: number, maxLength?: number) => {
   return validation;
 };
 
+export const OPTIONAL_TEXT_VAL = textValidation(0, 255);
+
 export const TEXT_VAL = textValidation(2, 255);
 
 export const SHORT_TEXT_VAL = textValidation(2, 50);
@@ -89,7 +91,7 @@ export const EMAIL_VAL = {
     errorMessage: 'Your email is required to be at least 5 characters.',
   },
   maxLength: {
-    value: 254,
+    value: 50,
     errorMessage: 'Your email cannot be longer than 50 characters.',
   },
 };