From d83efbf931ed7438b04cdc239ddb2de268fc2893 Mon Sep 17 00:00:00 2001 From: Aidan Lazar Date: Mon, 13 Apr 2026 09:01:32 -0700 Subject: [PATCH 1/7] Updated wording of displayed active permits, added count of how many of those permits are active --- .../dashboard/mine/overview/Overview.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/services/minespace-web/src/components/dashboard/mine/overview/Overview.js b/services/minespace-web/src/components/dashboard/mine/overview/Overview.js index f92eba280e..de93fdca46 100644 --- a/services/minespace-web/src/components/dashboard/mine/overview/Overview.js +++ b/services/minespace-web/src/components/dashboard/mine/overview/Overview.js @@ -1,5 +1,5 @@ import React, { useContext } from "react"; -import { connect } from "react-redux"; +import { connect, useSelector } from "react-redux"; import moment from "moment"; import PropTypes from "prop-types"; import { Row, Col, Card, Descriptions, Typography } from "antd"; @@ -21,6 +21,7 @@ import * as Strings from "@/constants/strings"; import Map from "@/components/common/Map"; import MineWorkInformation from "./MineWorkInformation"; import { SidebarContext } from "@mds/common/components/common/SidebarWrapper"; +import { getMineReportStatsByMineGuid } from "@mds/common/redux/slices/mineReportStatsSlice"; const propTypes = { partyRelationships: PropTypes.arrayOf(CustomPropTypes.partyRelationship).isRequired, @@ -48,6 +49,7 @@ const getMineManager = (partyRelationships) => { export const Overview = (props) => { const { mine } = useContext(SidebarContext); + const stats = useSelector(getMineReportStatsByMineGuid(mine.mine_guid)); return ( <> @@ -95,10 +97,17 @@ export const Overview = (props) => { .join(", ") : Strings.UNKNOWN} - - {mine.mine_permit_numbers && mine.mine_permit_numbers.length > 0 - ? mine.mine_permit_numbers.join(", ") - : Strings.NONE} + + {mine.mine_permit_numbers && mine.mine_permit_numbers.length > 0 ? ( +
+ {mine.mine_permit_numbers.join(", ")} +

+ Active: {stats?.active_permits ?? Strings.UNKNOWN} +

+
+ ) : ( + Strings.NONE + )}
From 6daddb675cd4624f4f3b6ae0f4d8ad032595453c Mon Sep 17 00:00:00 2001 From: Aidan Lazar Date: Mon, 13 Apr 2026 14:30:54 -0700 Subject: [PATCH 2/7] Snaps updated --- .../pages/__snapshots__/MinespaceAccessRequest.spec.tsx.snap | 2 +- .../InformationRequirementsTablePage.spec.tsx.snap | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/services/minespace-web/src/tests/components/pages/__snapshots__/MinespaceAccessRequest.spec.tsx.snap b/services/minespace-web/src/tests/components/pages/__snapshots__/MinespaceAccessRequest.spec.tsx.snap index 064f2c4cd3..547f515d86 100644 --- a/services/minespace-web/src/tests/components/pages/__snapshots__/MinespaceAccessRequest.spec.tsx.snap +++ b/services/minespace-web/src/tests/components/pages/__snapshots__/MinespaceAccessRequest.spec.tsx.snap @@ -1448,7 +1448,7 @@ exports[`MinespaceAccessRequest renders properly with existing access request 1` > Submitted on: - 1/15/2026, 10:00:00 AM + 1/15/2026, 2:00:00 AM
diff --git a/services/minespace-web/src/tests/components/project/informationRequirementsTablePage/__snapshots__/InformationRequirementsTablePage.spec.tsx.snap b/services/minespace-web/src/tests/components/project/informationRequirementsTablePage/__snapshots__/InformationRequirementsTablePage.spec.tsx.snap index 66eedb9f10..4f8657877f 100644 --- a/services/minespace-web/src/tests/components/project/informationRequirementsTablePage/__snapshots__/InformationRequirementsTablePage.spec.tsx.snap +++ b/services/minespace-web/src/tests/components/project/informationRequirementsTablePage/__snapshots__/InformationRequirementsTablePage.spec.tsx.snap @@ -353,6 +353,7 @@ exports[`InformationRequirementsTablePage renders properly 1`] = `
From bb23b86ee85faec4e4a30c037123982d756f8680 Mon Sep 17 00:00:00 2001 From: Aidan Lazar Date: Mon, 13 Apr 2026 14:45:31 -0700 Subject: [PATCH 3/7] Updated platform for postgres service --- docker-compose.M1.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.M1.yaml b/docker-compose.M1.yaml index 716f610aba..5b7c4f2332 100644 --- a/docker-compose.M1.yaml +++ b/docker-compose.M1.yaml @@ -56,6 +56,7 @@ services: build: context: services/postgres dockerfile: Dockerfile + platform: linux/amd64 environment: - POSTGRES_USER=mds - POSTGRES_PASSWORD=test From b3ef24f9d42c2cf509dd4b2c171692af31aaccaa Mon Sep 17 00:00:00 2001 From: Aidan Lazar Date: Mon, 13 Apr 2026 14:53:55 -0700 Subject: [PATCH 4/7] snaps updated --- .../pages/__snapshots__/MinespaceAccessRequest.spec.tsx.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/minespace-web/src/tests/components/pages/__snapshots__/MinespaceAccessRequest.spec.tsx.snap b/services/minespace-web/src/tests/components/pages/__snapshots__/MinespaceAccessRequest.spec.tsx.snap index 547f515d86..064f2c4cd3 100644 --- a/services/minespace-web/src/tests/components/pages/__snapshots__/MinespaceAccessRequest.spec.tsx.snap +++ b/services/minespace-web/src/tests/components/pages/__snapshots__/MinespaceAccessRequest.spec.tsx.snap @@ -1448,7 +1448,7 @@ exports[`MinespaceAccessRequest renders properly with existing access request 1` > Submitted on: - 1/15/2026, 2:00:00 AM + 1/15/2026, 10:00:00 AM From bb02dc948f2874aba6c142cde9b77f82bd3a0bc5 Mon Sep 17 00:00:00 2001 From: Aidan Lazar Date: Mon, 13 Apr 2026 15:03:35 -0700 Subject: [PATCH 5/7] Manually fixing snap that shouldn't be changing --- .../__snapshots__/InformationRequirementsTablePage.spec.tsx.snap | 1 - 1 file changed, 1 deletion(-) diff --git a/services/minespace-web/src/tests/components/project/informationRequirementsTablePage/__snapshots__/InformationRequirementsTablePage.spec.tsx.snap b/services/minespace-web/src/tests/components/project/informationRequirementsTablePage/__snapshots__/InformationRequirementsTablePage.spec.tsx.snap index 4f8657877f..66eedb9f10 100644 --- a/services/minespace-web/src/tests/components/project/informationRequirementsTablePage/__snapshots__/InformationRequirementsTablePage.spec.tsx.snap +++ b/services/minespace-web/src/tests/components/project/informationRequirementsTablePage/__snapshots__/InformationRequirementsTablePage.spec.tsx.snap @@ -353,7 +353,6 @@ exports[`InformationRequirementsTablePage renders properly 1`] = `
From aba2e8dfc117d7300525d6e1dc441aacf25055bb Mon Sep 17 00:00:00 2001 From: Aidan Lazar Date: Mon, 13 Apr 2026 15:16:33 -0700 Subject: [PATCH 6/7] Updated wording when active permits can't be found/fetched, snaps also updated --- .../src/components/dashboard/mine/overview/Overview.js | 7 ++++--- .../InformationRequirementsTablePage.spec.tsx.snap | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/services/minespace-web/src/components/dashboard/mine/overview/Overview.js b/services/minespace-web/src/components/dashboard/mine/overview/Overview.js index de93fdca46..b3e550f608 100644 --- a/services/minespace-web/src/components/dashboard/mine/overview/Overview.js +++ b/services/minespace-web/src/components/dashboard/mine/overview/Overview.js @@ -1,5 +1,5 @@ import React, { useContext } from "react"; -import { connect, useSelector } from "react-redux"; +import { connect } from "react-redux"; import moment from "moment"; import PropTypes from "prop-types"; import { Row, Col, Card, Descriptions, Typography } from "antd"; @@ -22,6 +22,7 @@ import Map from "@/components/common/Map"; import MineWorkInformation from "./MineWorkInformation"; import { SidebarContext } from "@mds/common/components/common/SidebarWrapper"; import { getMineReportStatsByMineGuid } from "@mds/common/redux/slices/mineReportStatsSlice"; +import { useAppSelector } from "@mds/common/redux/rootState"; const propTypes = { partyRelationships: PropTypes.arrayOf(CustomPropTypes.partyRelationship).isRequired, @@ -49,7 +50,7 @@ const getMineManager = (partyRelationships) => { export const Overview = (props) => { const { mine } = useContext(SidebarContext); - const stats = useSelector(getMineReportStatsByMineGuid(mine.mine_guid)); + const stats = useAppSelector(getMineReportStatsByMineGuid(mine.mine_guid)); return ( <> @@ -102,7 +103,7 @@ export const Overview = (props) => {
{mine.mine_permit_numbers.join(", ")}

- Active: {stats?.active_permits ?? Strings.UNKNOWN} + Active: {stats?.active_permits ?? Strings.NONE}

) : ( diff --git a/services/minespace-web/src/tests/components/project/informationRequirementsTablePage/__snapshots__/InformationRequirementsTablePage.spec.tsx.snap b/services/minespace-web/src/tests/components/project/informationRequirementsTablePage/__snapshots__/InformationRequirementsTablePage.spec.tsx.snap index 66eedb9f10..4f8657877f 100644 --- a/services/minespace-web/src/tests/components/project/informationRequirementsTablePage/__snapshots__/InformationRequirementsTablePage.spec.tsx.snap +++ b/services/minespace-web/src/tests/components/project/informationRequirementsTablePage/__snapshots__/InformationRequirementsTablePage.spec.tsx.snap @@ -353,6 +353,7 @@ exports[`InformationRequirementsTablePage renders properly 1`] = `
From 250502662c5cd7bd9dd24b53c92b4e31d864a3c6 Mon Sep 17 00:00:00 2001 From: Aidan Lazar Date: Mon, 13 Apr 2026 15:21:34 -0700 Subject: [PATCH 7/7] Manually fixing snap --- .../__snapshots__/InformationRequirementsTablePage.spec.tsx.snap | 1 - 1 file changed, 1 deletion(-) diff --git a/services/minespace-web/src/tests/components/project/informationRequirementsTablePage/__snapshots__/InformationRequirementsTablePage.spec.tsx.snap b/services/minespace-web/src/tests/components/project/informationRequirementsTablePage/__snapshots__/InformationRequirementsTablePage.spec.tsx.snap index 4f8657877f..66eedb9f10 100644 --- a/services/minespace-web/src/tests/components/project/informationRequirementsTablePage/__snapshots__/InformationRequirementsTablePage.spec.tsx.snap +++ b/services/minespace-web/src/tests/components/project/informationRequirementsTablePage/__snapshots__/InformationRequirementsTablePage.spec.tsx.snap @@ -353,7 +353,6 @@ exports[`InformationRequirementsTablePage renders properly 1`] = `