Skip to content

[MDS-6858] Update Active Permit Wording #3886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alazar-aot merged 7 commits into from
Apr 13, 2026
+15 −4
Merged

[MDS-6858] Update Active Permit Wording #3886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d83efbf
Updated wording of displayed active permits, added count of how many …
alazar-aot Apr 13, 2026
6daddb6
Snaps updated
alazar-aot Apr 13, 2026
bb23b86
Updated platform for postgres service
alazar-aot Apr 13, 2026
b3ef24f
snaps updated
alazar-aot Apr 13, 2026
bb02dc9
Manually fixing snap that shouldn't be changing
alazar-aot Apr 13, 2026
aba2e8d
Updated wording when active permits can't be found/fetched, snaps als…
alazar-aot Apr 13, 2026
2505026
Manually fixing snap
alazar-aot Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docker-compose.M1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ services:
build:
context: services/postgres
dockerfile: Dockerfile
platform: linux/amd64
environment:
- POSTGRES_USER=mds
- POSTGRES_PASSWORD=test
Expand Down
18 changes: 14 additions & 4 deletions services/minespace-web/src/components/dashboard/mine/overview/Overview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ 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";
import { useAppSelector } from "@mds/common/redux/rootState";

const propTypes = {
partyRelationships: PropTypes.arrayOf(CustomPropTypes.partyRelationship).isRequired,
Expand Down Expand Up @@ -48,6 +50,7 @@ const getMineManager = (partyRelationships) => {

export const Overview = (props) => {
const { mine } = useContext(SidebarContext);
const stats = useAppSelector(getMineReportStatsByMineGuid(mine.mine_guid));
return (
<>
<Row>
Expand Down Expand Up @@ -95,10 +98,17 @@ export const Overview = (props) => {
.join(", ")
: Strings.UNKNOWN}
</Descriptions.Item>
<Descriptions.Item span={2} label="Active Permits">
{mine.mine_permit_numbers && mine.mine_permit_numbers.length > 0
? mine.mine_permit_numbers.join(", ")
: Strings.NONE}
<Descriptions.Item span={2} label="Mines Act Permits (All)">
{mine.mine_permit_numbers && mine.mine_permit_numbers.length > 0 ? (
<div>
{mine.mine_permit_numbers.join(", ")}
<p>
<i>Active: {stats?.active_permits ?? Strings.NONE}</i>
</p>
</div>
) : (
Strings.NONE
)}
</Descriptions.Item>
</Descriptions>
<div className="padding-md--top padding-md--bottom">
Expand Down
Loading