MDS-5350_Fix-type-errors

bcgov · Oct 20, 2023 · b23e9c4 · b23e9c4
1 parent 3b892b4
commit b23e9c4
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/services/common/src/interfaces/explosivesPermitMagazine.interface.ts b/services/common/src/interfaces/explosivesPermitMagazine.interface.ts
@@ -1,3 +1,5 @@
+import { IMineDocument } from "./mineDocument.interface";
+
 export interface IExplosivesPermitMagazine {
   explosives_permit_magazine_id: number;
   explosives_permit_id: number;
@@ -16,10 +18,9 @@ export interface IExplosivesPermitMagazine {
   detonator_type: string;
 }
 
-export interface IExplosivesPermitDocument {
+export interface IExplosivesPermitDocument extends IMineDocument {
   explosives_permit_id: number;
   explosives_permit_document_type_code: string;
-  document_manager_guid: string;
 }
 
 export interface IExplosivesPermit {

diff --git a/services/core-web/common/components/explosivesPermits/ExplosivesPermitDiffModal.tsx b/services/core-web/common/components/explosivesPermits/ExplosivesPermitDiffModal.tsx
@@ -28,7 +28,12 @@ const ExplosivesPermitDiffModal: FC<ExplosivesPermitDiffModalProps> = ({
   const [differences, setDifferences] = useState<IPermitDifferencesByAmendment>({});
 
   const getPermitDifferences = (permit: IExplosivesPermit): IPermitDifferencesByAmendment => {
-    const permitVersions = [permit, ...permit.explosives_permit_amendments].sort(
+    const comparablePermit = {
+      explosives_permit_amendment_id: undefined,
+      ...permit,
+    };
+
+    const permitVersions = [comparablePermit, ...permit.explosives_permit_amendments].sort(
       (a, b) => a.explosives_permit_amendment_id - b.explosives_permit_amendment_id
     );
 

diff --git a/services/core-web/src/components/modalContent/ExplosivesPermitViewModal.tsx b/services/core-web/src/components/modalContent/ExplosivesPermitViewModal.tsx
@@ -1,7 +1,7 @@
 import "@ant-design/compatible/assets/index.css";
 
 import { Alert, Button, Col, Row, Table, Typography } from "antd";
-import { IExplosivesPermit, IMine } from "@mds/common";
+import { IExplosivesPermit, IExplosivesPermitAmendment, IMine } from "@mds/common";
 import React, { FC, useEffect, useState } from "react";
 import { connect } from "react-redux";
 import ExplosivesPermitMap from "@/components/maps/ExplosivesPermitMap";
@@ -75,6 +75,12 @@ interface ExplosivesPermitViewModalProps {
   openDocument: (document_manager_guid: string, mine_document_guid: string) => void;
 }
 
+const permitAmendmentLike = (permit: IExplosivesPermit): IExplosivesPermitAmendment => ({
+  explosives_permit_amendment_id: undefined,
+  explosives_permit_amendment_guid: undefined,
+  ...permit,
+});
+
 export const ExplosivesPermitViewModal: FC<ExplosivesPermitViewModalProps> = (props) => {
   const { explosivesPermit, parentPermit, mine, title } = props;
   const amendmentsCount = parentPermit?.explosives_permit_amendments?.length || 0;
@@ -114,9 +120,12 @@ export const ExplosivesPermitViewModal: FC<ExplosivesPermitViewModalProps> = (pr
       key: "action",
       render: (text, record) => {
         const recordGuid = record.explosives_permit_guid || record.explosives_permit_amendment_guid;
+
+        const currentPermitAsAmendment = permitAmendmentLike(currentPermit);
+
         if (
-          recordGuid === currentPermit?.explosives_permit_guid ||
-          recordGuid === currentPermit?.explosives_permit_amendment_guid
+          recordGuid === currentPermitAsAmendment?.explosives_permit_guid ||
+          recordGuid === currentPermitAsAmendment?.explosives_permit_amendment_guid
         )
           return null;
         return (
@@ -147,7 +156,7 @@ export const ExplosivesPermitViewModal: FC<ExplosivesPermitViewModalProps> = (pr
       };
     });
     permitHistory.unshift({
-      ...parentPermit,
+      ...permitAmendmentLike(parentPermit),
       issue_date: parentPermit.issue_date,
       expiry_date: parentPermit.expiry_date,
       is_closed: parentPermit.is_closed ? "Closed" : "Open",

diff --git a/services/minespace-web/common/components/explosivesPermits/ExplosivesPermitDiffModal.tsx b/services/minespace-web/common/components/explosivesPermits/ExplosivesPermitDiffModal.tsx
@@ -28,7 +28,12 @@ const ExplosivesPermitDiffModal: FC<ExplosivesPermitDiffModalProps> = ({
   const [differences, setDifferences] = useState<IPermitDifferencesByAmendment>({});
 
   const getPermitDifferences = (permit: IExplosivesPermit): IPermitDifferencesByAmendment => {
-    const permitVersions = [permit, ...permit.explosives_permit_amendments].sort(
+    const comparablePermit = {
+      explosives_permit_amendment_id: undefined,
+      ...permit,
+    };
+
+    const permitVersions = [comparablePermit, ...permit.explosives_permit_amendments].sort(
       (a, b) => a.explosives_permit_amendment_id - b.explosives_permit_amendment_id
     );