From e018b072c1d530014414a3e7f17d304275ca219d Mon Sep 17 00:00:00 2001 From: Tara Epp <102187683+taraepp@users.noreply.github.com> Date: Wed, 18 Dec 2024 19:41:32 +0000 Subject: [PATCH 1/5] adjust allowed actions, and tweak document table to have things line up nicely --- .../components/documents/DocumentTable.tsx | 18 +- .../ProjectDocumentsTab.spec.tsx.snap | 200 ++++------- .../ProjectDocumentsTabSection.spec.tsx.snap | 58 ++-- .../document/documentTableProps.interface.ts | 2 + .../MajorMineApplicationForm.tsx | 13 +- .../MajorMineApplicationReviewSubmit.tsx | 7 +- .../DocumentTableWithExpandedRows.scss | 6 + ...rMineApplicationReviewSubmit.spec.tsx.snap | 324 +++++++----------- 8 files changed, 250 insertions(+), 378 deletions(-) diff --git a/services/common/src/components/documents/DocumentTable.tsx b/services/common/src/components/documents/DocumentTable.tsx index cc72fed5de..b0e60f9d6c 100644 --- a/services/common/src/components/documents/DocumentTable.tsx +++ b/services/common/src/components/documents/DocumentTable.tsx @@ -15,7 +15,7 @@ import { some } from "lodash"; import { closeModal, openModal } from "@mds/common/redux/actions/modalActions"; import DocumentCompression from "@mds/common/components/documents/DocumentCompression"; import { archiveMineDocuments } from "@mds/common/redux/actionCreators/mineActionCreator"; -import { useDispatch, useSelector } from "react-redux"; +import { useDispatch } from "react-redux"; import { Feature } from "@mds/common/utils/featureFlag"; import { SizeType } from "antd/lib/config-provider/SizeContext"; import { ColumnsType } from "antd/es/table"; @@ -23,13 +23,11 @@ import { FileOperations, MineDocument } from "@mds/common/models/documents/docum import DeleteOutlined from "@ant-design/icons/DeleteOutlined"; import DownloadOutlined from "@ant-design/icons/DownloadOutlined"; -import DownOutlined from "@ant-design/icons/DownOutlined"; import FileOutlined from "@ant-design/icons/FileOutlined"; import InboxOutlined from "@ant-design/icons/InboxOutlined"; import SyncOutlined from "@ant-design/icons/SyncOutlined"; import { openDocument } from "@mds/common/components/syncfusion/DocumentViewer"; -import { getUserAccessData } from "@mds/common/redux/selectors/authenticationSelectors"; -import { Button, Dropdown, MenuProps } from "antd"; +import { Button, Col, Row } from "antd"; import { useFeatureFlag } from "@mds/common/providers/featureFlags/useFeatureFlag"; import DocumentTableProps from "@mds/common/interfaces/document/documentTableProps.interface"; import ArchiveDocumentModal from "./ArchiveDocumentModal"; @@ -58,7 +56,6 @@ export const DocumentTable: FC = ({ }: DocumentTableProps) => { // differences from bringing over from CORE (vs the MS version): this file has doc compression & bulk actions const dispatch = useDispatch(); - const userRoles = useSelector(getUserAccessData); const handleCloseModal = () => { dispatch(closeModal()); @@ -89,11 +86,11 @@ export const DocumentTable: FC = ({ return docs.map((doc) => new MineDocument(doc)); } }; - + const [documents, setDocuments] = useState(parseDocuments(props.documents ?? [])); useEffect(() => { - const isBulkArchive = documents.every((doc) => + const isBulkArchive = canArchiveDocuments && documents.every((doc) => doc.allowed_actions.find((a) => a === FileOperations.Archive) ); @@ -306,7 +303,12 @@ export const DocumentTable: FC = ({ ); } - return enableBulkActions &&
{element}
; + const hasHeader = Boolean(props.header); + + return (enableBulkActions || hasHeader) && + {hasHeader && {props.header}} + {enableBulkActions && {element}} + ; }; const handleRowSelectionChange = (value) => { diff --git a/services/common/src/components/projects/__snapshots__/ProjectDocumentsTab.spec.tsx.snap b/services/common/src/components/projects/__snapshots__/ProjectDocumentsTab.spec.tsx.snap index 2466e91148..2c41ca3cf7 100644 --- a/services/common/src/components/projects/__snapshots__/ProjectDocumentsTab.spec.tsx.snap +++ b/services/common/src/components/projects/__snapshots__/ProjectDocumentsTab.spec.tsx.snap @@ -325,37 +325,21 @@ exports[`ProjectDocumentsTab renders properly 1`] = `
- +
+ Download +
+ +
- +
+ Download +
+ +
- +
+ Download +
+ +
- +
+ Download +
+ +
- +
+ Download +
+ +
- + + + +
{ additionalColumnProps?: { key: string; colProps: any }[]; @@ -24,6 +25,7 @@ export interface GenericDocTableProps { showVersionHistory?: boolean; userRoles?: string[]; view?: "standard" | "minimal"; + header?: string | ReactNode; } interface DocumentTableProps extends GenericDocTableProps { diff --git a/services/minespace-web/src/components/Forms/projects/majorMineApplication/MajorMineApplicationForm.tsx b/services/minespace-web/src/components/Forms/projects/majorMineApplication/MajorMineApplicationForm.tsx index 70ef283c68..9c7f6af5ff 100644 --- a/services/minespace-web/src/components/Forms/projects/majorMineApplication/MajorMineApplicationForm.tsx +++ b/services/minespace-web/src/components/Forms/projects/majorMineApplication/MajorMineApplicationForm.tsx @@ -14,6 +14,7 @@ import { MODERN_EXCEL, SPATIAL, SPATIAL_DATA_STANDARDS_URL, + SystemFlagEnum, } from "@mds/common"; import * as routes from "@/constants/routes"; import MajorMineApplicationFileUpload from "@/components/Forms/projects/majorMineApplication/MajorMineApplicationFileUpload"; @@ -27,6 +28,7 @@ import DocumentTable from "@mds/common/components/documents/DocumentTable"; import RenderField from "@mds/common/components/forms/RenderField"; import ArchivedDocumentsSection from "@mds/common/components/projects/ArchivedDocumentsSection"; import { required } from "@mds/common/redux/utils/Validate"; +import { areDocumentFieldsDisabled } from "@mds/common/components/projects/projectUtils"; interface MajorMineApplicationFormProps { project: IProject; @@ -41,6 +43,11 @@ const MajorMineApplicationForm: React.FC = ({ const { primary_documents, spatial_documents, supporting_documents } = useSelector(getFormValues(FORM.ADD_MINE_MAJOR_APPLICATION)) || {}; + const canModifyMmaDocs = areDocumentFieldsDisabled( + SystemFlagEnum.ms, + project?.major_mine_application?.status_code + ); + const mineDocuments = useSelector(getMineDocuments); const [uploadedFiles, setUploadedFiles] = useState([]); @@ -219,7 +226,8 @@ const MajorMineApplicationForm: React.FC = ({ = ({
Application Files - Primary Document Primary Document} documents={primary_documents} documentParent="Major Mine Application" canArchiveDocuments={false} @@ -110,16 +110,17 @@ export const MajorMineApplicationReviewSubmit: FC - Spatial Components Spatial Components} documents={spatial_documents} documentParent="Major Mine Application" canArchiveDocuments={false} + canReplaceDocuments={false} showVersionHistory={true} enableBulkActions={true} /> - Supporting Documents Supporting Documents} documents={supporting_documents} documentParent="Major Mine Application" canArchiveDocuments={false} diff --git a/services/minespace-web/src/styles/components/DocumentTableWithExpandedRows.scss b/services/minespace-web/src/styles/components/DocumentTableWithExpandedRows.scss index 40c9a9cb2e..38618073b4 100644 --- a/services/minespace-web/src/styles/components/DocumentTableWithExpandedRows.scss +++ b/services/minespace-web/src/styles/components/DocumentTableWithExpandedRows.scss @@ -91,4 +91,10 @@ &--grey { background-color: $gov-grey; } +} + +.document-table-header { + .document-table-actions { + padding-bottom: 8px; + } } \ No newline at end of file diff --git a/services/minespace-web/src/tests/components/Forms/projects/majorMineApplication/__snapshots__/MajorMineApplicationReviewSubmit.spec.tsx.snap b/services/minespace-web/src/tests/components/Forms/projects/majorMineApplication/__snapshots__/MajorMineApplicationReviewSubmit.spec.tsx.snap index f2bfa5ad17..a34a70d9a5 100644 --- a/services/minespace-web/src/tests/components/Forms/projects/majorMineApplication/__snapshots__/MajorMineApplicationReviewSubmit.spec.tsx.snap +++ b/services/minespace-web/src/tests/components/Forms/projects/majorMineApplication/__snapshots__/MajorMineApplicationReviewSubmit.spec.tsx.snap @@ -145,45 +145,33 @@ exports[`MajorMineApplicationReviewSubmit renders properly as on MajorMineApplic > Application Files -

- Primary Document -

- + Primary Document + +
+
+ +
-

- Spatial Components -

- + Spatial Components + +
+
+ +
-

- Supporting Documents -

- + Supporting Documents + +
+
+ +
Application Files -

- Primary Document -

- + Primary Document + +
+
+ +
-

- Spatial Components -

- + Spatial Components + +
+
+ +
-

- Supporting Documents -

- + Supporting Documents + +
+
+ +
Date: Wed, 18 Dec 2024 20:29:52 +0000 Subject: [PATCH 2/5] fix inverted boolean --- .../projects/ProjectDocumentsTab.tsx | 4 +- .../ProjectDocumentsTab.spec.tsx.snap | 84 ++++++++++++++++--- .../MajorMineApplicationForm.tsx | 2 +- 3 files changed, 75 insertions(+), 15 deletions(-) diff --git a/services/common/src/components/projects/ProjectDocumentsTab.tsx b/services/common/src/components/projects/ProjectDocumentsTab.tsx index 1338869dc7..b5c8becc93 100644 --- a/services/common/src/components/projects/ProjectDocumentsTab.tsx +++ b/services/common/src/components/projects/ProjectDocumentsTab.tsx @@ -83,8 +83,8 @@ const ProjectDocumentsTab: FC = ({ project }) => { .toLowerCase(); }; - const canModifySummaryDocs = areDocumentFieldsDisabled(systemFlag, project?.project_summary?.status_code); - const canModifyMmaDocs = areDocumentFieldsDisabled(systemFlag, project?.major_mine_application?.status_code); + const canModifySummaryDocs = !areDocumentFieldsDisabled(systemFlag, project?.project_summary?.status_code); + const canModifyMmaDocs = !areDocumentFieldsDisabled(systemFlag, project?.major_mine_application?.status_code); const projectSummaryDocs = project?.project_summary?.documents?.map( diff --git a/services/common/src/components/projects/__snapshots__/ProjectDocumentsTab.spec.tsx.snap b/services/common/src/components/projects/__snapshots__/ProjectDocumentsTab.spec.tsx.snap index 2c41ca3cf7..2f070e6f2e 100644 --- a/services/common/src/components/projects/__snapshots__/ProjectDocumentsTab.spec.tsx.snap +++ b/services/common/src/components/projects/__snapshots__/ProjectDocumentsTab.spec.tsx.snap @@ -1415,13 +1415,33 @@ exports[`ProjectDocumentsTab renders properly 1`] = ` class="ant-col document-table-actions" >
@@ -2904,13 +2924,33 @@ exports[`ProjectDocumentsTab renders properly 1`] = ` class="ant-col document-table-actions" >
@@ -3868,13 +3908,33 @@ exports[`ProjectDocumentsTab renders properly 1`] = ` class="ant-col document-table-actions" >
diff --git a/services/minespace-web/src/components/Forms/projects/majorMineApplication/MajorMineApplicationForm.tsx b/services/minespace-web/src/components/Forms/projects/majorMineApplication/MajorMineApplicationForm.tsx index 9c7f6af5ff..83d4f17a53 100644 --- a/services/minespace-web/src/components/Forms/projects/majorMineApplication/MajorMineApplicationForm.tsx +++ b/services/minespace-web/src/components/Forms/projects/majorMineApplication/MajorMineApplicationForm.tsx @@ -43,7 +43,7 @@ const MajorMineApplicationForm: React.FC = ({ const { primary_documents, spatial_documents, supporting_documents } = useSelector(getFormValues(FORM.ADD_MINE_MAJOR_APPLICATION)) || {}; - const canModifyMmaDocs = areDocumentFieldsDisabled( + const canModifyMmaDocs = !areDocumentFieldsDisabled( SystemFlagEnum.ms, project?.major_mine_application?.status_code ); From 47e83e72d60fae8c015516230916e7b731db5b65 Mon Sep 17 00:00:00 2001 From: Tara Epp <102187683+taraepp@users.noreply.github.com> Date: Wed, 18 Dec 2024 22:52:45 +0000 Subject: [PATCH 3/5] issue with spatial docs + major mine app document xref, also, a small ask from Denise --- .../major_mine_application_document_xref.py | 29 ++----------------- .../core-api/app/api/utils/models_mixins.py | 27 +++++++++++++++++ .../styles/components/PermitConditions.scss | 2 +- 3 files changed, 31 insertions(+), 27 deletions(-) diff --git a/services/core-api/app/api/projects/major_mine_application/models/major_mine_application_document_xref.py b/services/core-api/app/api/projects/major_mine_application/models/major_mine_application_document_xref.py index 10a3fa1ac6..529f0e65e6 100644 --- a/services/core-api/app/api/projects/major_mine_application/models/major_mine_application_document_xref.py +++ b/services/core-api/app/api/projects/major_mine_application/models/major_mine_application_document_xref.py @@ -1,22 +1,14 @@ from sqlalchemy.dialects.postgresql import UUID from sqlalchemy.schema import FetchedValue -from sqlalchemy.ext.associationproxy import association_proxy -from app.api.utils.models_mixins import Base -from app.api.mines.documents.models.mine_document import MineDocument +from app.api.utils.models_mixins import Base, DocumentXrefMixin from app.extensions import db - -class MajorMineApplicationDocumentXref(Base): +class MajorMineApplicationDocumentXref(Base, DocumentXrefMixin): __tablename__ = 'major_mine_application_document_xref' major_mine_application_document_xref_guid = db.Column( UUID(as_uuid=True), primary_key=True, server_default=FetchedValue()) - mine_document_guid = db.Column( - UUID(as_uuid=True), - db.ForeignKey('mine_document.mine_document_guid'), - nullable=False, - unique=True) major_mine_application_id = db.Column( db.Integer, db.ForeignKey('major_mine_application.major_mine_application_id'), @@ -27,20 +19,5 @@ class MajorMineApplicationDocumentXref(Base): 'major_mine_application_document_type.major_mine_application_document_type_code'), nullable=False) - mine_document = db.relationship('MineDocument', lazy='select', overlaps='major_mine_application_document_xref') - mine_guid = association_proxy('mine_document', 'mine_guid') - document_manager_guid = association_proxy('mine_document', 'document_manager_guid') - document_name = association_proxy('mine_document', 'document_name') - upload_date = association_proxy('mine_document', 'upload_date') - create_user = association_proxy('mine_document', 'create_user') - versions = association_proxy('mine_document', 'versions') - update_timestamp = association_proxy('mine_document', 'update_timestamp') - mine_document_bundle_id = association_proxy('mine_document', 'mine_document_bundle_id') - def __repr__(self): - return f'{self.__class__.__name__} {self.major_mine_application_document_xref_guid}' - - @classmethod - def find_by_mine_document_guid(cls, mine_document_guid): - return cls.query.filter_by(mine_document_guid=mine_document_guid).filter( - MineDocument.deleted_ind == False).one_or_none() + return f'{self.__class__.__name__} {self.major_mine_application_document_xref_guid}' \ No newline at end of file diff --git a/services/core-api/app/api/utils/models_mixins.py b/services/core-api/app/api/utils/models_mixins.py index cf4607a192..8d6f32cfe3 100644 --- a/services/core-api/app/api/utils/models_mixins.py +++ b/services/core-api/app/api/utils/models_mixins.py @@ -478,6 +478,33 @@ class AuditMixin(object): update_timestamp = db.Column( db.DateTime, nullable=False, default=datetime.utcnow, onupdate=datetime.utcnow) +class DocumentXrefMixin(object): + @declared_attr + def mine_document(cls): + return db.relationship('MineDocument', lazy='select') + + @declared_attr + def mine_document_guid(cls): + return db.Column( + UUID(as_uuid=True), + db.ForeignKey('mine_document.mine_document_guid'), + nullable=False, + unique=True) + + mine_guid = association_proxy('mine_document', 'mine_guid') + document_manager_guid = association_proxy('mine_document', 'document_manager_guid') + document_name = association_proxy('mine_document', 'document_name') + upload_date = association_proxy('mine_document', 'upload_date') + create_user = association_proxy('mine_document', 'create_user') + versions = association_proxy('mine_document', 'versions') + update_timestamp = association_proxy('mine_document', 'update_timestamp') + mine_document_bundle_id = association_proxy('mine_document', 'mine_document_bundle_id') + deleted_ind = association_proxy('mine_document', 'deleted_ind') + + @classmethod + def find_by_mine_document_guid(cls, mine_document_guid): + return cls.query.filter_by(mine_document_guid=mine_document_guid).filter( # type: ignore + cls.deleted_ind == False).one_or_none() class SoftDeleteMixin(object): deleted_ind = db.Column(db.Boolean, nullable=False, server_default=FetchedValue()) diff --git a/services/core-web/src/styles/components/PermitConditions.scss b/services/core-web/src/styles/components/PermitConditions.scss index 68f8e73974..bcb1c2cca7 100644 --- a/services/core-web/src/styles/components/PermitConditions.scss +++ b/services/core-web/src/styles/components/PermitConditions.scss @@ -8,7 +8,7 @@ div.condition-layer { .condition-content { &.editable:hover { cursor: pointer; - background-color: lightgrey; + background-color: #F4F0F0; } .view-item { From adc80363ac303c8890813e95a9db14a9ccb63151 Mon Sep 17 00:00:00 2001 From: Tara Epp <102187683+taraepp@users.noreply.github.com> Date: Thu, 19 Dec 2024 13:47:24 +0000 Subject: [PATCH 4/5] fix bundling->viewing spatial docs in major mine application --- .../documents/models/mine_document_bundle.py | 9 ++++ .../models/major_mine_application.py | 46 +++++++++---------- 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/services/core-api/app/api/mines/documents/models/mine_document_bundle.py b/services/core-api/app/api/mines/documents/models/mine_document_bundle.py index a5bd662201..1522c4a8a2 100644 --- a/services/core-api/app/api/mines/documents/models/mine_document_bundle.py +++ b/services/core-api/app/api/mines/documents/models/mine_document_bundle.py @@ -32,6 +32,15 @@ def find_by_bundle_id(cls, bundle_id): @classmethod def find_by_docman_bundle_guid(cls, docman_bundle_guid): return cls.query.filter_by(docman_bundle_guid=docman_bundle_guid).first() + + @staticmethod + def parse_and_update_spatial_documents(documents): + spatial_docs = [doc for doc in documents if doc.get('docman_bundle_guid') is not None] + updated_spatial_docs = MineDocumentBundle.update_spatial_mine_document_with_bundle_id(spatial_docs) + + all_documents = [doc for doc in documents if doc.get('docman_bundle_guid') is None] + all_documents.extend(updated_spatial_docs) + return all_documents @staticmethod def update_spatial_mine_document_with_bundle_id(spatial_docs): diff --git a/services/core-api/app/api/projects/major_mine_application/models/major_mine_application.py b/services/core-api/app/api/projects/major_mine_application/models/major_mine_application.py index 1a88912a07..dfba513927 100644 --- a/services/core-api/app/api/projects/major_mine_application/models/major_mine_application.py +++ b/services/core-api/app/api/projects/major_mine_application/models/major_mine_application.py @@ -126,12 +126,7 @@ def create(cls, major_mine_application.save(commit=False) if documents: - spatial_docs = [doc for doc in documents if doc['major_mine_application_document_type_code'] == 'SPT'] - updated_spatial_docs = MineDocumentBundle.update_spatial_mine_document_with_bundle_id(spatial_docs) - - # update the original documents array with the updated spatial documents - documents = [doc for doc in documents if doc['major_mine_application_document_type_code'] != 'SPT'] - documents.extend(updated_spatial_docs) + documents = MineDocumentBundle.parse_and_update_spatial_documents(documents) for doc in documents: mine_doc = MineDocument( @@ -159,24 +154,27 @@ def update(self, add_to_session=True): self.status_code = status_code - for doc in documents: - mine_document_guid = doc.get('mine_document_guid') - if mine_document_guid: - major_mine_application_doc = MajorMineApplicationDocumentXref.find_by_mine_document_guid(mine_document_guid) - major_mine_application_doc.major_mine_application_document_type_code = doc.get( - 'major_mine_application_document_type_code') - else: - mine_doc = MineDocument( - mine_guid=project.mine_guid, - document_name=doc.get('document_name'), - document_manager_guid=doc.get('document_manager_guid')) - major_mine_application_doc = MajorMineApplicationDocumentXref( - mine_document_guid=mine_doc.mine_document_guid, - major_mine_application_id=self.major_mine_application_id, - major_mine_application_document_type_code=doc.get( - 'major_mine_application_document_type_code')) - major_mine_application_doc.mine_document = mine_doc - self.documents.append(major_mine_application_doc) + if documents: + documents = MineDocumentBundle.parse_and_update_spatial_documents(documents) + for doc in documents: + mine_document_guid = doc.get('mine_document_guid') + if mine_document_guid: + major_mine_application_doc = MajorMineApplicationDocumentXref.find_by_mine_document_guid(mine_document_guid) + major_mine_application_doc.major_mine_application_document_type_code = doc.get( + 'major_mine_application_document_type_code') + else: + mine_doc = MineDocument( + mine_guid=project.mine_guid, + document_name=doc.get('document_name'), + document_manager_guid=doc.get('document_manager_guid'), + mine_document_bundle_id=doc.get('mine_document_bundle_id')) + major_mine_application_doc = MajorMineApplicationDocumentXref( + mine_document_guid=mine_doc.mine_document_guid, + major_mine_application_id=self.major_mine_application_id, + major_mine_application_document_type_code=doc.get( + 'major_mine_application_document_type_code')) + major_mine_application_doc.mine_document = mine_doc + self.documents.append(major_mine_application_doc) if add_to_session: self.save(commit=False) From e6a115d98e41188f1370800bed2f67d91aa91b94 Mon Sep 17 00:00:00 2001 From: Tara Epp <102187683+taraepp@users.noreply.github.com> Date: Thu, 19 Dec 2024 13:55:21 +0000 Subject: [PATCH 5/5] use spatial table on review/submit --- .../MajorMineApplicationReviewSubmit.tsx | 12 +- ...rMineApplicationReviewSubmit.spec.tsx.snap | 3356 ++++++----------- 2 files changed, 1230 insertions(+), 2138 deletions(-) diff --git a/services/minespace-web/src/components/Forms/projects/majorMineApplication/MajorMineApplicationReviewSubmit.tsx b/services/minespace-web/src/components/Forms/projects/majorMineApplication/MajorMineApplicationReviewSubmit.tsx index b6b34d3868..7414c7a621 100644 --- a/services/minespace-web/src/components/Forms/projects/majorMineApplication/MajorMineApplicationReviewSubmit.tsx +++ b/services/minespace-web/src/components/Forms/projects/majorMineApplication/MajorMineApplicationReviewSubmit.tsx @@ -14,6 +14,7 @@ import { getFormattedProjectApplication } from "@mds/common/redux/selectors/proj import ProjectCallout from "@mds/common/components/projects/ProjectCallout"; import { areDocumentFieldsDisabled } from "@mds/common/components/projects/projectUtils"; import { SystemFlagEnum } from "@mds/common"; +import SpatialDocumentTable from "@mds/common/components/documents/spatial/SpatialDocumentTable"; const inputStyle = { width: "100%" }; @@ -110,15 +111,8 @@ export const MajorMineApplicationReviewSubmit: FC - Spatial Components} - documents={spatial_documents} - documentParent="Major Mine Application" - canArchiveDocuments={false} - canReplaceDocuments={false} - showVersionHistory={true} - enableBulkActions={true} - /> + Spatial Components + Supporting Documents} documents={supporting_documents} diff --git a/services/minespace-web/src/tests/components/Forms/projects/majorMineApplication/__snapshots__/MajorMineApplicationReviewSubmit.spec.tsx.snap b/services/minespace-web/src/tests/components/Forms/projects/majorMineApplication/__snapshots__/MajorMineApplicationReviewSubmit.spec.tsx.snap index a34a70d9a5..fb12a9829a 100644 --- a/services/minespace-web/src/tests/components/Forms/projects/majorMineApplication/__snapshots__/MajorMineApplicationReviewSubmit.spec.tsx.snap +++ b/services/minespace-web/src/tests/components/Forms/projects/majorMineApplication/__snapshots__/MajorMineApplicationReviewSubmit.spec.tsx.snap @@ -603,34 +603,15 @@ exports[`MajorMineApplicationReviewSubmit renders properly as on MajorMineApplic
-
+

+ Spatial Components +

+
-
-
-

- Spatial Components -

-
-
- -
-
@@ -652,41 +633,13 @@ exports[`MajorMineApplicationReviewSubmit renders properly as on MajorMineApplic - - - + - - - - - - - - - -
-
- -
- 		@@ -696,11 +649,7 @@ exports[`MajorMineApplicationReviewSubmit renders properly as on MajorMineApplic - - File Name - + File Name -
- - File Type - - - - - - - - - - - -
-
- -
- - - - -
@@ -972,31 +841,72 @@ exports[`MajorMineApplicationReviewSubmit renders properly as on MajorMineApplic class="ant-table-row-indent indent-level-0" style="padding-left: 0px;" /> + + + + +
- - shape.dbf - - + shape +
+
+ > + + + + 4 + + +
-
- .dbf -
-
- - @@ -1083,30 +974,18 @@ exports[`MajorMineApplicationReviewSubmit renders properly as on MajorMineApplic style="padding-left: 0px;" />
- - shape.prj - - +
+ testfile.kml +
-
- .prj -
-
- - - -
- - shape.shp - - -
- 		-
- .shp -
- 		+
+
+
+
+
+
+
+ +
+
+
+
+

+ Supporting Documents +

+
+
+ +
+
+
+
+
+
+
+
+ + + + + + + - - - - + + + + + + + + + + +
- Jul 19 2024 +
- - 		+
- test@bceid -
- - 		-
- +
-
+ - - - - -
- - shape.shx - -
- 		-
+ + + + + + + + + +
+ + 		+
+ + Last Modified + + + + + + + + + + + +
+ 		+
+ + Created By + + + + + + + + + + + +
+ 		+
+ + + +
+ + pdf1.pdf + + +
+ 		+
- .shx + .pdf
- Jul 19 2024 + Sep 04 2024
- testfile.kml + pdf3 2.pdf - .kml + .pdf - Jul 19 2024 + Sep 03 2024 -
-
-
+

- -
- -
-

+ + + +  Archived Documents +
+ These files are not reviewed as part of the submission. +
+
+
- - - - - - - + + - - + - + - + - - - - - - - - - - - - - - - + -
- test@bceid -
- - - - -
-
+
- - - -
- - - File Name + style="margin-left: 38px;" + > + File Name + - - - - - - + + - - + + - -
- 		-
+
- - File Type - - + Category + + - - - - + + + + + - - - -
+
- - Last Modified - - + File Type + + - - - - + + - - + + - - - -
+
- - Created By - - + Last Modified + + - - - - + + - - + + - - - -
- - - - - - - - -
- - pdf1.pdf - - -
- 		-
- .pdf -
- 		-
- Sep 04 2024 -
- 		-
- test@bceid -
- 		-
- -
-
- - - + + -
- - pdf3 2.pdf - - -
- - 		-
- .pdf -
- 		-
- Sep 03 2024 -
- 		+ +
-
- -
-
+ No Data Yet +
+
@@ -2069,1048 +2017,191 @@ exports[`MajorMineApplicationReviewSubmit renders properly as on MajorMineApplic
+
+ + +`; + +exports[`MajorMineApplicationReviewSubmit renders properly as on ProjectPage 1`] = ` +
+
+
+

+ Major Mines Application +

+
+
-

- - - -  Archived Documents -

+ Change Requested +

+

+ This project requires changes by the mine. MineSpace users can update text fields and update documents. + Note: Navigate to the submit section of the form to resubmit your application after making any changes to have them resubmitted to the ministry. +

+
+
+
+
+
+

+ Basic Information +

+
+
+
+
+
- These files are not reviewed as part of the submission. + + + + + + + + + +
+
+ + Primary Contact + +
+
+
+ + + +
+
-
-
-
-
-
+
+
+
+
+ + + -
-
-
- - - - - - - - - - - - - - - -
-
- - - File Name - - - - - - - - - - - - -
- 		-
- - Category - - - - - - - - - - - -
- 		-
- - File Type - - - - - - - - - - - -
- 		-
- - Last Modified - - - - - - - - - - - -
- 		-
- - Created By - - - - - - - - - - - -
- 		-
- No Data Yet -
-
-
-
-
-
-
-
-
-
-
-
-`; - -exports[`MajorMineApplicationReviewSubmit renders properly as on ProjectPage 1`] = ` -
-
-
-

- Major Mines Application -

-
-
-
-

- Change Requested -

-

- This project requires changes by the mine. MineSpace users can update text fields and update documents. - Note: Navigate to the submit section of the form to resubmit your application after making any changes to have them resubmitted to the ministry. -

-
-
-
-
-
-

- Basic Information -

-
-
-
-
-
-
- - - - - - - - - -
-
- - Primary Contact - -
-
-
- - - -
-
-
-
-
-
-
-
- - - - - - - - - -
-
- - Mine Name - -
-
-
- - - -
-
-
-
-
-
-
-

- Application Files -

-
-
-
-
-

- Primary Document -

-
-
- -
-
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - -
-
- -
- 		-
- - - File Name - - - - - - - - - - - - -
- 		-
- - File Type - - - - - - - - - - - -
- 		-
- - Last Modified - - - - - - - - - - - -
- 		-
- - Created By - - - - - - - - - - - -
- 		-
- - - -
- - pdf1.pdf - - -
- 		-
- .pdf -
- 		-
- Sep 03 2024 -
- 		-
- test@bceid -
- 		-
- -
-
+ Mine Name + +
+ + + + +
+ + +
-
-
-
-
+ + + +
+
+
+
+

+ Application Files +

- Spatial Components + Primary Document
- Jul 19 2024 + Sep 03 2024
- - + +
+
+
+
+
+ + +

+ Spatial Components +

+
+
+
+
+
+
+
+
+ + + + + - - + + + + - - - - - - - - - - -
- - - - -
- - shape.prj - -
- 		-
- .prj + class="ant-table-column-sorter ant-table-column-sorter-full" + > + + + + + + + + +
- 		+
- Jul 19 2024 + + Last Modified + + + + + + + + + + +
- - 		+
- test@bceid -
- - 		-
- +
-
- - @@ -3700,141 +2898,72 @@ exports[`MajorMineApplicationReviewSubmit renders properly as on ProjectPage 1`] class="ant-table-row-indent indent-level-0" style="padding-left: 0px;" /> -
- - shape.shp - -
- 		-
- .shp -
- 		-
- Jul 19 2024 -
- 		+ aria-label="plus-square" + class="anticon anticon-plus-square icon-lg--lightgrey" + role="img" + > + + +
- test@bceid -
- 		-
-
+
- - Actions - + + 4 + - -
-
- - - -
- - shape.shx - - +
-
- .shx -
-
-
- - @@ -3921,30 +3031,18 @@ exports[`MajorMineApplicationReviewSubmit renders properly as on ProjectPage 1`] style="padding-left: 0px;" />
- +
testfile.kml - - +
-
- .kml -
-