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 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..b3e550f608 100644 --- a/services/minespace-web/src/components/dashboard/mine/overview/Overview.js +++ b/services/minespace-web/src/components/dashboard/mine/overview/Overview.js @@ -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, @@ -48,6 +50,7 @@ const getMineManager = (partyRelationships) => { export const Overview = (props) => { const { mine } = useContext(SidebarContext); + const stats = useAppSelector(getMineReportStatsByMineGuid(mine.mine_guid)); return ( <> @@ -95,10 +98,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.NONE} +

+
+ ) : ( + Strings.NONE + )}