diff --git a/services/core-web/src/components/mine/Permit/MinePermitTable.tsx b/services/core-web/src/components/mine/Permit/MinePermitTable.tsx index 18bbbe88dc..ae2a3a388c 100644 --- a/services/core-web/src/components/mine/Permit/MinePermitTable.tsx +++ b/services/core-web/src/components/mine/Permit/MinePermitTable.tsx @@ -1,7 +1,12 @@ import React from "react"; import { Button, Dropdown, Menu, Popconfirm } from "antd"; import { Link, useHistory, useParams } from "react-router-dom"; -import { PlusOutlined, ReadOutlined, SafetyCertificateOutlined } from "@ant-design/icons"; +import { + PlusOutlined, + ReadOutlined, + SafetyCertificateOutlined, + EyeOutlined, +} from "@ant-design/icons"; import { useSelector } from "react-redux"; import { Feature } from "@mds/common/index"; import { useFeatureFlag } from "@mds/common/providers/featureFlags/useFeatureFlag"; @@ -340,8 +345,23 @@ export const MinePermitTable: React.FC = ({ ? record.permit.permit_guid : record.permit?.permit_amendment_guid; const items = [ - { + isFeatureEnabled(Feature.DIGITIZED_PERMITS) && { key: "0", + label: ( + + ), + }, + { + key: "1", label: ( - - ), - }, ].filter(Boolean); const menu = ; diff --git a/services/core-web/src/components/mine/Permit/ViewPermit.tsx b/services/core-web/src/components/mine/Permit/ViewPermit.tsx index 510f080830..3a6d01df13 100644 --- a/services/core-web/src/components/mine/Permit/ViewPermit.tsx +++ b/services/core-web/src/components/mine/Permit/ViewPermit.tsx @@ -1,16 +1,12 @@ import React, { useEffect } from "react"; -import { Col, Row, Tabs, Typography } from "antd"; +import { Col, Row, Tabs, Typography, Tag } from "antd"; import { Link, useParams } from "react-router-dom"; import { useDispatch, useSelector } from "react-redux"; import { getPermitByGuid } from "@mds/common/redux/selectors/permitSelectors"; import { IMine, IPermit } from "@mds/common"; -import { faLocationDot } from "@fortawesome/pro-light-svg-icons"; -import CoreTag from "@mds/common/components/common/CoreTag"; -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import CompanyIcon from "@mds/common/assets/icons/CompanyIcon"; import ViewPermitOverview from "@/components/mine/Permit/ViewPermitOverview"; import ViewPermitConditions from "@/components/mine/Permit/ViewPermitConditions"; -import ViewPermitReports from "@/components/mine/Permit/ViewPermitReports"; + import { fetchPermits } from "@mds/common/redux/actionCreators/permitActionCreator"; import { getMineById } from "@mds/common/redux/selectors/mineSelectors"; import * as routes from "@/constants/routes"; @@ -48,11 +44,6 @@ const ViewPermit = () => { label: "Permit Conditions", children: , }, - { - key: "3", - label: "Reports", - children: , - }, ]; return ( @@ -72,10 +63,10 @@ const ViewPermit = () => { - } text={mine?.mine_name} /> + {mine?.mine_name} - } text={permit?.current_permittee} /> + {permit?.current_permittee} diff --git a/services/core-web/src/components/mine/Permit/ViewPermitOverview.tsx b/services/core-web/src/components/mine/Permit/ViewPermitOverview.tsx index d6d5f08dc4..4959527e41 100644 --- a/services/core-web/src/components/mine/Permit/ViewPermitOverview.tsx +++ b/services/core-web/src/components/mine/Permit/ViewPermitOverview.tsx @@ -154,7 +154,7 @@ const ViewPermitOverview = () => { Fee Exemption Note - {permit.exemption_fee_status_note ?? "-"} + {permit.exemption_fee_status_note ?? ""} @@ -174,14 +174,14 @@ const ViewPermitOverview = () => { {latestAmendment.security_received_date ? formatDate(latestAmendment.security_received_date) - : "-"} + : ""} Assessed Liability Adjustment - ${latestAmendment.liability_adjustment ?? "-"} + ${latestAmendment.liability_adjustment ?? ""} @@ -233,7 +233,7 @@ const ViewPermitOverview = () => { Remaining Outstanding Liability Amount (if any) - {permit.remaining_static_liability ?? "-"} + {permit.remaining_static_liability ?? ""} diff --git a/services/core-web/src/styles/components/ViewPermit.scss b/services/core-web/src/styles/components/ViewPermit.scss index 59ada1b355..442e92c1fc 100644 --- a/services/core-web/src/styles/components/ViewPermit.scss +++ b/services/core-web/src/styles/components/ViewPermit.scss @@ -11,16 +11,20 @@ .view-permits-content { background-color: #f9f9f9; + margin-top: 16px; + margin-bottom: 16px; margin-left: -20px; margin-right: -20px; - padding: 0 20px; + padding: 0 20px 16px; p { margin: 0; } .ant-row:nth-child(2) { + padding-top: 16px; + padding-bottom: 16px; background-color: #fff; > .ant-col:nth-child(1) { - border-right: 1px solid $non-textual-grey; + border-right: 1px solid $light-grey; } .ant-row { padding: 0; diff --git a/services/core-web/src/tests/components/mine/Permit/MinePermitTable.spec.tsx b/services/core-web/src/tests/components/mine/Permit/MinePermitTable.spec.tsx index dcfecc7c6a..83b98594f0 100644 --- a/services/core-web/src/tests/components/mine/Permit/MinePermitTable.spec.tsx +++ b/services/core-web/src/tests/components/mine/Permit/MinePermitTable.spec.tsx @@ -1,11 +1,9 @@ import React from "react"; -import { shallow } from "enzyme"; import { MinePermitTable } from "@/components/mine/Permit/MinePermitTable"; import * as MOCK from "@/tests/mocks/dataMocks"; import { render } from "@testing-library/react"; import { ReduxWrapper } from "@mds/common/tests/utils/ReduxWrapper"; import { BrowserRouter } from "react-router-dom"; -import ViewPermit from "@/components/mine/Permit/ViewPermit"; const dispatchProps: any = {}; const props: any = {}; diff --git a/services/core-web/src/tests/components/mine/Permit/__snapshots__/ViewPermit.spec.tsx.snap b/services/core-web/src/tests/components/mine/Permit/__snapshots__/ViewPermit.spec.tsx.snap index 864a4a25ec..4c29b6d9c5 100644 --- a/services/core-web/src/tests/components/mine/Permit/__snapshots__/ViewPermit.spec.tsx.snap +++ b/services/core-web/src/tests/components/mine/Permit/__snapshots__/ViewPermit.spec.tsx.snap @@ -43,173 +43,19 @@ exports[`ViewPermit renders properly 1`] = ` class="ant-col" style="padding-left: 8px; padding-right: 8px;" > -
- - - mine3 - -
+ mine3 +
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
+
-
- -
@@ -541,7 +372,7 @@ exports[`ViewPermit renders properly 1`] = `
- - +
@@ -602,7 +433,7 @@ exports[`ViewPermit renders properly 1`] = `
- - +
@@ -716,7 +547,7 @@ exports[`ViewPermit renders properly 1`] = `
- - +
diff --git a/services/core-web/src/tests/components/mine/Permit/__snapshots__/ViewPermitOverview.spec.tsx.snap b/services/core-web/src/tests/components/mine/Permit/__snapshots__/ViewPermitOverview.spec.tsx.snap index 3d9af8702a..6ad60955f9 100644 --- a/services/core-web/src/tests/components/mine/Permit/__snapshots__/ViewPermitOverview.spec.tsx.snap +++ b/services/core-web/src/tests/components/mine/Permit/__snapshots__/ViewPermitOverview.spec.tsx.snap @@ -216,7 +216,7 @@ exports[`MinePermitInfo renders properly 1`] = `
- - +
@@ -277,7 +277,7 @@ exports[`MinePermitInfo renders properly 1`] = `
- - +
@@ -391,7 +391,7 @@ exports[`MinePermitInfo renders properly 1`] = `
- - +