[MDS-6374] Change addressing duplicate report on extraction #3423

asinn134 · 2025-02-19T17:03:45Z

Objective

Change to check report name to address duplicate report on permit extraction
Change to address blank page showing when clicking a report
Change to address report name sometimes not showing up
I noticed when doing a permit amalgamation using the same document as the original permit extraction sometimes the previous report doesn't show in the comparison modal. Included a change for this.

asinn134 · 2025-02-19T17:05:21Z

services/core-web/src/components/mine/Permit/ComparePermitConditionHistoryModal.tsx

@@ -31,7 +31,7 @@ const ComparePermitConditionHistoryModal: FC<ComparePermitConditionHistoryModalP
        getMineReportPermitRequirementsByAmendment(props.permitGuid, props.previousAmendment?.permit_amendment_guid)
    );

-    const oldReports = getConditionsWithRequirements([props.currentAmendmentCondition], previousMineReportPermitRequirements);
+    const oldReports = getConditionsWithRequirements([props.previousAmendmentCondition], previousMineReportPermitRequirements);


This is mainly the change for the previous report not showing in the comparison modal when amalgamating with same document

Good catch! Looking at it, this seems obvious. 😂

taraepp · 2025-02-19T17:09:12Z

services/core-api/app/api/mines/reports/models/mine_report_permit_requirement.py

+    @classmethod
+    def find_by_permit_condition_id(cls, _id) -> "MineReportPermitRequirement":
+        try:
+            return cls.query.filter_by(permit_condition_id=_id, deleted_ind=False).first()


minor convention thing- what's with the underscore in _id?

I think I just saw other functions doing that in this file and followed along. The underscore has been removed now.

taraepp · 2025-02-19T17:10:23Z

services/core-web/src/components/mine/Permit/PermitConditionReportRequirements.tsx

-                    />
-                </Collapse.Panel>
-            ))}
+            {conditionsWithRequirements.map((cond, index) => {


is the condition no longer IPermitCondition? Wondering why typing was removed. Does it make sense to add optional property mineReportPermitRequirement to the interface?

I ran into an issue here with the getConditionsWithRequirements function, in it's if condition where requirements && condition?.permit_condition_id the code there would return an object of type IMineReportPermitRequirement. So sometimes the function would return a type of IMineReportPermitRequirement[] and sometimes a type of IPermitCondition[].

I think the way I tried to handled it initially in my PR isn't the best, I adjusted it now so getConditionsWithRequirements function will always return IPermitCondition[]