Merge branch 'main' into feat/gold_test

cberg-aot · web-flow · commit 86f88b75bf32 · 2025-07-09T15:59:46.000-07:00
diff --git a/frontend/src/common/components/banners/BcGovAlertBanner.scss b/frontend/src/common/components/banners/BcGovAlertBanner.scss
@@ -15,6 +15,11 @@
     background-color: orbcStyles.$bc-messages-red-text;
     color: orbcStyles.$white;
   }
+ 
+  &#{&}--error-alt {
+    background-color: orbcStyles.$bc-messages-red-background;
+    color: orbcStyles.$bc-messages-red-text;
+  }
 
   &#{&}--info {
     background-color: orbcStyles.$bc-messages-blue-background;
@@ -65,4 +70,4 @@
   & &__additional-info {
     margin-top: 0.5rem;
   }
-}
+}
diff --git a/frontend/src/common/components/banners/BcGovAlertBanner.tsx b/frontend/src/common/components/banners/BcGovAlertBanner.tsx
@@ -26,7 +26,7 @@ export const BcGovAlertBanner = ({
   className,
 }: {
   msg: string | JSX.Element;
-  additionalInfo?: JSX.Element;
+  additionalInfo?: string | JSX.Element;
   bannerType: AlertBannerType;
   className?: string;
 }) => {
@@ -39,6 +39,7 @@ export const BcGovAlertBanner = ({
       case ALERT_BANNER_TYPES.WARNING:
         return faExclamationTriangle;
       case ALERT_BANNER_TYPES.ERROR:
+      case ALERT_BANNER_TYPES.ERROR_ALT:
       default:
         return faExclamationCircle;
     }
diff --git a/frontend/src/common/components/banners/ErrorAltBcGovBanner.tsx b/frontend/src/common/components/banners/ErrorAltBcGovBanner.tsx
@@ -0,0 +1,19 @@
+import { BcGovAlertBanner } from "./BcGovAlertBanner";
+import { ALERT_BANNER_TYPES } from "./types/AlertBannerType";
+
+export const ErrorAltBcGovBanner = ({
+  msg,
+  additionalInfo,
+  className,
+}: {
+  msg: string | JSX.Element;
+  additionalInfo?: string | JSX.Element;
+  className?: string;
+}) => (
+  <BcGovAlertBanner
+    msg={msg}
+    additionalInfo={additionalInfo}
+    bannerType={ALERT_BANNER_TYPES.ERROR_ALT}
+    className={className}
+  />
+);
diff --git a/frontend/src/common/components/banners/types/AlertBannerType.ts b/frontend/src/common/components/banners/types/AlertBannerType.ts
@@ -3,6 +3,7 @@ export const ALERT_BANNER_TYPES = {
   SUCCESS: "success",
   WARNING: "warning",
   ERROR: "error",
+  ERROR_ALT: "error-alt",
 } as const;
 
 export type AlertBannerType =
diff --git a/frontend/src/common/constants/constants.ts b/frontend/src/common/constants/constants.ts
@@ -31,3 +31,6 @@ export const DEFAULT_EMPTY_SELECT_OPTION = {
 export const DEFAULT_SELECT_OPTIONS = [DEFAULT_EMPTY_SELECT_OPTION];
 
 export const EMPTY_VEHICLE_UNIT_NUMBER = DEFAULT_EMPTY_SELECT_VALUE;
+
+//Inventory GVW
+export const GVW_LIMIT = 63500;
diff --git a/frontend/src/common/constants/validation_messages.json b/frontend/src/common/constants/validation_messages.json
@@ -87,6 +87,13 @@
     },
     "invalid": "You must enter a valid address."
   },
+  "clientName": {
+    "defaultMessage": "Invalid Client Name format",
+    "length": {
+      "messageTemplate": "Client Name length must be between :min-:max characters",
+      "placeholders": [":min", ":max"]
+    }
+  },
   "dba": {
     "defaultMessage": "Invalid DBA format",
     "length": {
@@ -174,4 +181,4 @@
       "placeholders": [":max"]
     }
   }
-}
+}
diff --git a/frontend/src/common/helpers/validationMessages.ts b/frontend/src/common/helpers/validationMessages.ts
@@ -69,7 +69,8 @@ export const invalidPhoneLength = (min: number, max: number) => {
   return replacePlaceholders(messageTemplate, placeholders, min, max);
 };
 
-export const invalidExtension = () => validationMessages.extension.defaultMessage;
+export const invalidExtension = () =>
+  validationMessages.extension.defaultMessage;
 
 export const invalidExtensionLength = (max: number) => {
   const { messageTemplate, placeholders } = validationMessages.extension.length;
@@ -125,6 +126,12 @@ export const licensedGVWExceeded = (max: number, localizeNumber?: boolean) => {
   );
 };
 
+export const invalidClientNameLength = (min: number, max: number) => {
+  const { messageTemplate, placeholders } =
+    validationMessages.clientName.length;
+  return replacePlaceholders(messageTemplate, placeholders, min, max);
+};
+
 export const invalidDBALength = (min: number, max: number) => {
   const { messageTemplate, placeholders } = validationMessages.dba.length;
   return replacePlaceholders(messageTemplate, placeholders, min, max);
@@ -154,9 +161,9 @@ export const requiredHighway = () => validationMessages.highway.missing;
 export const requiredPowerUnit = () => validationMessages.powerUnit.required;
 
 export const provinceVehicleDoesNotRequirePermit = (province: string) => {
-  const { messageTemplate, placeholders }
-    = validationMessages.province.provinceVehicleDoesNotRequirePermit;
-  
+  const { messageTemplate, placeholders } =
+    validationMessages.province.provinceVehicleDoesNotRequirePermit;
+
   return replacePlaceholders(messageTemplate, placeholders, province);
 };
 
diff --git a/frontend/src/features/manageProfile/components/forms/companyInfo/CompanyInfoForm.tsx b/frontend/src/features/manageProfile/components/forms/companyInfo/CompanyInfoForm.tsx
@@ -24,10 +24,13 @@ import {
 } from "../../../../../common/helpers/util";
 
 import {
+  invalidClientNameLength,
   invalidDBALength,
   isValidOptionalString,
+  requiredMessage,
 } from "../../../../../common/helpers/validationMessages";
 import { ORBC_FORM_FEATURES } from "../../../../../common/types/common";
+import { WarningBcGovBanner } from "../../../../../common/components/banners/WarningBcGovBanner";
 
 /**
  * The Company Information Form contains multiple subs forms including
@@ -147,6 +150,30 @@ export const CompanyInfoForm = memo(
     return (
       <div className="company-info-form">
         <FormProvider {...formMethods}>
+          <Typography variant="h2" gutterBottom>
+            Client Name
+          </Typography>
+          <WarningBcGovBanner
+            msg={BANNER_MESSAGES.CLIENT_NAME_MUST_BE_REGISTERED_OWNER}
+          />
+          <CustomFormComponent
+            type="input"
+            feature={FEATURE}
+            options={{
+              name: "legalName",
+              rules: {
+                required: { value: true, message: requiredMessage() },
+                validate: {
+                  validateLegalName: (legalName: string) =>
+                    isValidOptionalString(legalName, {
+                      maxLength: 150,
+                    }) || invalidClientNameLength(1, 150),
+                },
+              },
+              label: "Client Name",
+            }}
+          />
+
           <Typography variant="h2" gutterBottom>
             Doing Business As (DBA)
           </Typography>
diff --git a/frontend/src/features/manageProfile/components/forms/companyInfo/CompanyInfoForms.scss b/frontend/src/features/manageProfile/components/forms/companyInfo/CompanyInfoForms.scss
@@ -1,13 +1,14 @@
 .company-info-form {
   width: 100%;
-  max-width: 528px;
+  max-width: 1056px;
   display: flex;
   flex-direction: column;
   margin-top: 1em;
 
   .bc-gov-alertbanner {
     margin-top: 1.5rem;
     margin-bottom: 1.5rem;
+    width: auto;
   }
 
   &__submission {
diff --git a/frontend/src/features/manageProfile/pages/CompanyInfo.tsx b/frontend/src/features/manageProfile/pages/CompanyInfo.tsx
@@ -28,11 +28,13 @@ export const CompanyInfo = ({
 
   return (
     <div className="company-info-page">
-      {isEditing ? <Header /> : null}
-      <CompanyBanner
-        companyName={companyInfoData?.legalName}
-        clientNumber={companyInfoData?.clientNumber}
-      />
+      {isEditing && <Header />}
+      {!isEditing && (
+        <CompanyBanner
+          companyName={companyInfoData?.legalName}
+          clientNumber={companyInfoData?.clientNumber}
+        />
+      )}
       {isEditing ? (
         <CompanyInfoForm
           companyInfo={companyInfoData}
diff --git a/frontend/src/features/manageVehicles/components/form/PowerUnitForm.tsx b/frontend/src/features/manageVehicles/components/form/PowerUnitForm.tsx
@@ -25,9 +25,11 @@ import {
   invalidPlateLength,
   invalidVINLength,
   invalidYearMin,
+  licensedGVWExceeded,
   requiredMessage,
 } from "../../../../common/helpers/validationMessages";
 import { ORBC_FORM_FEATURES } from "../../../../common/types/common";
+import { GVW_LIMIT } from "../../../../common/constants/constants";
 
 const FEATURE = ORBC_FORM_FEATURES.POWER_UNIT;
 
@@ -258,6 +260,9 @@ export const PowerUnitForm = ({
                 required: { value: true, message: requiredMessage() },
                 validate: {
                   isNumber: (v) => !isNaN(v) || invalidNumber(),
+                  lessThanMax: (v) =>
+                    Number(v) <= GVW_LIMIT ||
+                    licensedGVWExceeded(GVW_LIMIT, true),
                 },
               },
               inputType: "number",
diff --git a/frontend/src/features/manageVehicles/components/form/tests/helpers/prepare.tsx b/frontend/src/features/manageVehicles/components/form/tests/helpers/prepare.tsx
@@ -159,7 +159,7 @@ const commonVehicleDetails = {
 
 export const powerUnitDetails = {
   ...commonVehicleDetails,
-  newGvw: 85000,
+  newGvw: 63500,
   newTireSize: "300",
   newSubtype: defaultPowerUnitSubtypes[0].type,
 };
diff --git a/frontend/src/features/permits/context/ApplicationFormContext.ts b/frontend/src/features/permits/context/ApplicationFormContext.ts
@@ -17,6 +17,7 @@ import {
   PAST_START_DATE_STATUSES,
   PastStartDateStatus,
 } from "../../../common/components/form/subFormComponents/CustomDatePicker";
+import { ApplicationRejectionHistory } from "../types/ApplicationRejectionHistory";
 
 interface ApplicationFormContextType {
   initialFormData: ApplicationFormData;
@@ -45,6 +46,7 @@ interface ApplicationFormContextType {
     revisionDateTime: string;
     comment: string;
   }[];
+  rejectionHistory?: Nullable<ApplicationRejectionHistory[]>;
   policyViolations: Record<string, string>;
   clearViolation: (fieldReference: string) => void;
   triggerPolicyValidation: () => Promise<Record<string, string>>;
@@ -74,6 +76,7 @@ export const ApplicationFormContext = createContext<ApplicationFormContextType>(
     pastStartDateStatus: PAST_START_DATE_STATUSES.ALLOWED,
     companyLOAs: [],
     revisionHistory: [],
+    rejectionHistory: [],
     policyViolations: {},
     clearViolation: () => undefined,
     triggerPolicyValidation: async () => ({}),
diff --git a/frontend/src/features/permits/hooks/form/useApplicationFormContext.ts b/frontend/src/features/permits/hooks/form/useApplicationFormContext.ts
diff --git a/frontend/src/features/permits/pages/Amend/components/AmendPermitForm.tsx b/frontend/src/features/permits/pages/Amend/components/AmendPermitForm.tsx
diff --git a/frontend/src/features/permits/pages/Amend/components/form/AmendReason.scss b/frontend/src/features/permits/pages/Amend/components/form/AmendReason.scss
diff --git a/frontend/src/features/permits/pages/Application/ApplicationForm.tsx b/frontend/src/features/permits/pages/Application/ApplicationForm.tsx
diff --git a/frontend/src/features/permits/pages/Application/components/form/PermitForm.scss b/frontend/src/features/permits/pages/Application/components/form/PermitForm.scss
diff --git a/frontend/src/features/permits/pages/Application/components/form/PermitForm.tsx b/frontend/src/features/permits/pages/Application/components/form/PermitForm.tsx
