Fix common package dependencies, ignore whitespace changes

bcgov · Dec 17, 2024 · 93bc9cd · 93bc9cd
1 parent 11bf13c
commit 93bc9cd
Show file tree

Hide file tree

Showing 10 changed files with 256 additions and 259 deletions.
diff --git a/.github/workflows/pr.checks.compare.common.folders.yaml b/.github/workflows/pr.checks.compare.common.folders.yaml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v1
       - name: compare-folders
         run: |
-          diff -r -C 5 services/core-web/common services/minespace-web/common
+          diff -b -r -C 5 services/core-web/common services/minespace-web/common
           if [ $? != 0 ]
             then 
             echo "'/services/core-web/common' does not match '/services/minespace-web/common'"

diff --git a/services/core-web/common/components/PartyAppointmentTable.js b/services/core-web/common/components/PartyAppointmentTable.js
@@ -8,10 +8,13 @@ import {
   updatePartyRelationship,
   fetchPartyRelationships,
 } from "@mds/common/redux/actionCreators/partiesActionCreator";
-import { MINISTRY_ACKNOWLEDGED_STATUS, PARTY_APPOINTMENT_STATUS } from "@mds/common/constants/strings";
 import TailingsContext from "./tailings/TailingsContext";
 import DocumentLink from "@/components/common/DocumentLink";
 import CoreTable from "@mds/common/components/common/CoreTable";
+import {
+  MINISTRY_ACKNOWLEDGED_STATUS,
+  PARTY_APPOINTMENT_STATUS,
+} from "@mds/common/constants/strings";
 
 const propTypes = {
   columns: PropTypes.arrayOf(PropTypes.string),
@@ -33,9 +36,9 @@ const PartyAppointmentTable = (props) => {
 
   const [loadingField, setLoadingField] = useState({});
 
-  const ministryAcknowledgedColumns = Object.entries(
-    MINISTRY_ACKNOWLEDGED_STATUS
-  ).map(([value, label]) => ({ value, label }));
+  const ministryAcknowledgedColumns = Object.entries(MINISTRY_ACKNOWLEDGED_STATUS).map(
+    ([value, label]) => ({ value, label })
+  );
   const statusColumns = Object.entries(PARTY_APPOINTMENT_STATUS).map(([value, label]) => ({
     value,
     label,

diff --git a/services/core-web/common/components/documents/ArchiveDocumentModal.tsx b/services/core-web/common/components/documents/ArchiveDocumentModal.tsx
@@ -2,8 +2,8 @@ import React, { FC } from "react";
 
 import DocumentTable from "@mds/common/components/documents/DocumentTable";
 import { Alert, Button, Form, Typography } from "antd";
-import { MineDocument } from "@mds/common/models/documents/document";
 import { IMineDocument } from "@mds/common/interfaces";
+import { MineDocument } from "@mds/common/models/documents/document";
 
 interface ArchiveDocumentModalProps {
   documents: IMineDocument[];

diff --git a/services/core-web/common/components/tailings/EngineerOfRecord.tsx b/services/core-web/common/components/tailings/EngineerOfRecord.tsx
@@ -180,9 +180,7 @@ export const EngineerOfRecord: FC<EngineerOfRecordProps> = (props) => {
 
   const daysToEORExpiry =
     currentEor?.end_date &&
-    moment(currentEor.end_date)
-      .startOf("day")
-      .diff(moment().startOf("day"), "days");
+    moment(currentEor.end_date).startOf("day").diff(moment().startOf("day"), "days");
 
   // Enable editing of the EoR when a new EoR party has been selected (party_guid is set),
   // but it has yet to be assigned to the TSF (mine_party_appt_guid is not set).