Merge branch 'golden-eagle' into feat/CE-236-Standardization-of-Offic…

…er-Name-Fields
bcgov · Jul 5, 2024 · 3efe188 · 3efe188
2 parents dc71d45 + 9bafebb
commit 3efe188
Show file tree

Hide file tree

Showing 21 changed files with 180 additions and 141 deletions.
diff --git a/backend/db/migrations/R__reset-complaint-templates.sql b/backend/db/migrations/R__reset-complaint-templates.sql
@@ -1,15 +1,3 @@
 --
--- Reset the CDOGS template hashes every time the database scripts run 
--- this is to make sure that the most up to date template is used
---
-UPDATE "configuration"
-SET
-  configuration_value = ''
-WHERE
-  configuration_code = 'HWCTMPLATE';
-
-UPDATE "configuration"
-SET
-  configuration_value = ''
-WHERE
-  configuration_code = 'ERSTMPLATE';
+-- Not Required
+--
diff --git a/backend/db/migrations/V0.22.1__CE-787.sql b/backend/db/migrations/V0.22.1__CE-787.sql
@@ -0,0 +1,5 @@
+UPDATE "configuration"
+SET
+  configuration_value = ''
+WHERE
+  configuration_code = 'ERSTMPLATE';
diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -64,6 +64,7 @@
     "date-fns": "^3.6.0",
     "date-fns-tz": "^3.1.3",
     "dotenv": "^16.0.1",
+    "escape-html": "^1.0.3",
     "form-data": "^4.0.0",
     "geojson": "^0.5.0",
     "jest-mock": "^29.6.1",

diff --git a/backend/src/middleware/maps/automapper-entity-to-dto-maps.ts b/backend/src/middleware/maps/automapper-entity-to-dto-maps.ts
@@ -891,7 +891,12 @@ export const mapWildlifeReport = (mapper: Mapper, tz: string = "America/Vancouve
     ),
     forMember(
       (destination) => destination.reportedOn,
-      mapFrom((source) => source.complaint_identifier.incident_reported_utc_timestmp),
+      mapFrom((source) => {
+        const {
+          complaint_identifier: { incident_reported_utc_timestmp: reported },
+        } = source;
+        return reported || "";
+      }),
     ),
     forMember(
       (destination) => destination.updatedOn,
@@ -1162,7 +1167,12 @@ export const mapAllegationReport = (mapper: Mapper, tz: string = "America/Vancou
     ),
     forMember(
       (destination) => destination.reportedOn,
-      mapFrom((source) => source.complaint_identifier.incident_reported_utc_timestmp),
+      mapFrom((source) => {
+        const {
+          complaint_identifier: { incident_reported_utc_timestmp: reported },
+        } = source;
+        return reported || "";
+      }),
     ),
     forMember(
       (destination) => destination.updatedOn,

diff --git a/backend/src/v1/complaint/complaint.service.ts b/backend/src/v1/complaint/complaint.service.ts
@@ -132,6 +132,8 @@ export class ComplaintService {
       case "violation_code":
       case "in_progress_ind":
         return "allegation";
+      case "area_name":
+        return "cos_organization";
       case "complaint_identifier":
       default:
         return "complaint";
@@ -1439,7 +1441,10 @@ export class ComplaintService {
 
       data.reportedOn = _applyTimezone(data.reportedOn, tz, "datetime");
       data.updatedOn = _applyTimezone(data.updatedOn, tz, "datetime");
-      if (data?.incidentDateTime) {
+
+      //-- incidentDateTime may not be set, if there's no date
+      //-- don't try and apply the incident date
+      if (data.incidentDateTime) {
         data.incidentDateTime = _applyTimezone(data.incidentDateTime, tz, "datetime");
       }
 

diff --git a/backend/src/v1/document/document.controller.ts b/backend/src/v1/document/document.controller.ts
@@ -8,6 +8,7 @@ import { Roles } from "../../auth/decorators/roles.decorator";
 import { Token } from "../../auth/decorators/token.decorator";
 import { COMPLAINT_TYPE } from "../../types/models/complaints/complaint-type";
 import { format } from "date-fns";
+import { escape } from "escape-html";
 
 @UseGuards(JwtRoleGuard)
 @ApiTags("document")
@@ -27,8 +28,6 @@ export class DocumentController {
     @Res() res: Response,
   ): Promise<void> {
     try {
-      this.logger.debug("TIMEZONE: ", tz);
-
       const fileName = `Complaint-${id}-${type}-${format(new Date(), "yyyy-MM-dd")}.pdf`;
       const response = await this.service.exportComplaint(id, type, fileName, tz);
 
@@ -47,7 +46,7 @@ export class DocumentController {
       res.end(buffer);
     } catch (error) {
       this.logger.error(`exception: unable to export document for complaint: ${id} - error: ${error}`);
-      res.status(500).send(`exception: unable to export document for complaint: ${id} - error: ${error}`);
+      res.status(500).send(`exception: unable to export document for complaint: ${escape(id)}`);
     }
   }
 }
diff --git a/backend/templates/complaint/CDOGS-ERS-COMPLAINT-TEMPLATE-v1.docx b/backend/templates/complaint/CDOGS-ERS-COMPLAINT-TEMPLATE-v1.docx
diff --git a/frontend/cypress/e2e/allegation-details-edit.cy.ts b/frontend/cypress/e2e/allegation-details-edit.cy.ts
@@ -470,7 +470,7 @@ describe("Complaint Edit Page spec - Edit Allegation View", () => {
 
     // Reffered by / Complaint Agency
     cy.get("#reported-pair-id label").should(($label) => {
-      expect($label).to.contain.text("Reporting Organization");
+      expect($label).to.contain.text("Organization Reporting the Complaint");
     });
     cy.get("#reported-pair-id input").should("exist");
 

diff --git a/frontend/cypress/e2e/hwcr-details-edit.cy.ts b/frontend/cypress/e2e/hwcr-details-edit.cy.ts
@@ -423,7 +423,7 @@ describe("Complaint Edit Page spec - Edit View", () => {
 
     // Reffered by / Complaint Agency
     cy.get("#reported-pair-id label").should(($label) => {
-      expect($label).to.contain.text("Reporting Organization");
+      expect($label).to.contain.text("Organization Reporting the Complaint");
     });
     cy.get("#reported-pair-id input").should("exist");
   });

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/src/app/components/common/comp-select.tsx b/frontend/src/app/components/common/comp-select.tsx
@@ -15,6 +15,7 @@ type Props = {
   value?: Option | null;
   onChange?: (selectedOption: Option | null) => void;
   isDisabled?: boolean;
+  isClearable?: boolean;
 };
 
 export const CompSelect: FC<Props> = ({
@@ -30,6 +31,7 @@ export const CompSelect: FC<Props> = ({
   classNamePrefix,
   errorMessage,
   isDisabled,
+  isClearable,
 }) => {
   let styles: StylesConfig = {};
 
@@ -46,6 +48,27 @@ export const CompSelect: FC<Props> = ({
       ...provided,
       color: state.label === "None" || state.label === "Unassigned" ? "#a1a1a1" : "black",
     }),
+    //custom style for clear btn to match with DatePicker's clear btn
+    clearIndicator: (defaultStyles: any) => {
+      return {
+        ...defaultStyles,
+        background: "#216ba5",
+        borderRadius: "50%",
+        color: "#fff",
+        cursor: "pointer",
+        maxHeight: "20px",
+        maxWidth: "20px",
+        padding: "2px",
+        marginRight: "6px",
+        svg: {
+          width: "12px",
+          height: "12px",
+        },
+        "&:hover": {
+          color: "#fff",
+        },
+      };
+    },
   };
 
   //-- pass through the onChange event
@@ -71,6 +94,7 @@ export const CompSelect: FC<Props> = ({
         isDisabled={isDisabled}
         menuPlacement="auto"
         menuPosition="fixed"
+        isClearable={isClearable ?? false}
       />
       {enableValidation && <div className="error-message">{errorMessage}</div>}
     </div>