[MDS-6014] Spatial File FE #3181

taraepp · 2024-07-10T20:55:03Z

Objective

show spatial files in a table
upload spatial files in a modal
- validate on FE
show the geomark on the map in a view modal

Misc. changes:

change to map component to show geojson features
- there were some issues with the timing of the call to fitBounds and with no minimum height set in the component, issues rendering without a container (see in action: look at the legal land owner page on the form on test, and delete the other elements in the same row. With no sibling elements, it will disappear)
modal wrapper/add party component form: upgraded to tsx and props tidied up (there were unused props)
- extracted the main modal logic to a common component, used to wrap around separate CORE/MS implementations
RenderFileUpload: dealt with an extension having the potential for multiple MIME-types. Cleared up variable ambiguity (lots of eslint warnings about reusing names). Destructured props, deleted unused, and attached the prop type to the component. Fixed bug where uppercase extensions weren't interpreted as valid. Disallowed empty files (everywhere that the common component is used). But a major takeaway here is that RenderFileUpload will now yell at you if you give it bad props
I initially considered using the DocumentTable. That didn't go very well, but I did take out the bit where DocumentTable took DocumentTable as a prop.

MDS-6014

Why are you making this change? Provide a short explanation and/or screenshots

…Make DocumentCompression hooksy and make props names more clear- update refcerences.

…styles

services/common/src/redux/createAppSlice.ts

simensma-fresh · 2024-07-12T16:09:45Z

services/document-manager/backend/Dockerfile

@@ -17,4 +17,6 @@ EXPOSE 5001

 RUN mkdir -p /tmp/celery

+RUN mkdir -p /tmp/spatial


I see that this doesn't match exactly the folder the assets are downloaded to. We should probably add the missing / to the docman paths

I was working with this in my PR too, but from what I can tell the folder doesn't get persisted to the resulting container after this command (/tmp/celery also doesn't exist if you exec into the container after creation)

In my PR I added the creation in the init file for docman.

I just took this stuff out from both Dockerfiles. 👍

simensma-fresh

Loving all the cleanup! 🧹

Two small comments, but looks great!
(and a merge conflict)

matbusby-fw · 2024-07-12T16:30:40Z

services/common/src/components/documents/spatial/AddSpatialDocumentsModal.tsx

+    <FormWrapper
+      isModal
+      name={modalFormName}
+      onSubmit={async (values) => {


Not a huge deal, but I this function is getting a bit large to live inline. Might be nice as it's own function.

Agreed. Extracted a function!

matbusby-fw · 2024-07-12T16:38:11Z

services/common/src/components/forms/RenderFileUpload.tsx

  addFileStart?: () => void;
 }

-const defaultProps = {


matbusby-fw · 2024-07-12T16:39:13Z

services/common/src/components/forms/RenderFileUpload.tsx

-  );
-
-export default withFeatureFlag(connect(null, mapDispatchToProps)(FileUpload));
+export default FileUpload;


Nice solution on this file as a whole! Happy to see some of the clean up too!

matbusby-fw

Looks great. A couple thoughts/suggestions, but it's looking nice and clean!

sonarqubecloud · 2024-07-12T20:21:05Z

Quality Gate failed for 'bcgov-sonarcloud_mds_common'

Failed conditions
55.0% Coverage on New Code (required ≥ 80%)
5.8% Duplication on New Code (required ≤ 3%)

See analysis details on SonarCloud

sonarqubecloud · 2024-07-12T20:21:13Z

Quality Gate passed for 'bcgov-sonarcloud_mds_minespace-web'

Issues
0 New issues
1 Accepted issue

Measures
0 Security Hotspots
85.7% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

sonarqubecloud · 2024-07-12T20:25:16Z

Quality Gate failed for 'bcgov-sonarcloud_mds_core-web'

Failed conditions
77.6% Coverage on New Code (required ≥ 80%)
33.6% Duplication on New Code (required ≤ 3%)

See analysis details on SonarCloud

asinn134 · 2024-07-12T21:41:42Z

services/common/src/components/documents/DocumentCompression.tsx

@@ -13,18 +11,23 @@ import DocumentCompressionWarningModal from "./DocumentCompressionWarningModal";
 import DocumentCompressedDownloadModal from "./DocumentCompressedDownloadModal";

 interface DocumentCompressionProps {
-  documentType: string;


Thanks for cleaning up this file.

taraepp added 15 commits June 19, 2024 21:01

fix types in IncidentsTable on MS

ba895d2

create generic tagged column method, tweak other one and references. …

5645774

…Make DocumentCompression hooksy and make props names more clear- update refcerences.

create spatial components and add them to DocumentUpload page

0e73742

fix props, make documents optional, create validation method, adjust …

769710a

…styles

most fixes

eb0bd99

fixing some console errors, test updates

ff6d7a1

upstream changes

fe96f13

starting integration with BE, getting error

3f06605

treat an async func like an async func

fb687e9

move interfaces

9fac39e

fix issues with render file upload, add some tests

6b96438

remove console log

3cf92e3

appease sonarcloud

c242563

should fix cypress test

bfd5de3

create spatial directory

aee73cd

taraepp requested review from asinn134, matbusby-fw and simensma-fresh July 10, 2024 21:56

simensma-fresh reviewed Jul 12, 2024

View reviewed changes

services/common/src/redux/createAppSlice.ts Show resolved Hide resolved

simensma-fresh reviewed Jul 12, 2024

View reviewed changes

simensma-fresh previously approved these changes Jul 12, 2024

View reviewed changes

matbusby-fw reviewed Jul 12, 2024

View reviewed changes

services/common/src/components/forms/RenderFileUpload.tsx

addFileStart?: () => void;

}

const defaultProps = {

Copy link

Collaborator

matbusby-fw Jul 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🙌🏻

matbusby-fw reviewed Jul 12, 2024

View reviewed changes

matbusby-fw previously approved these changes Jul 12, 2024

View reviewed changes

resolve conflicts

41831a8

taraepp dismissed stale reviews from matbusby-fw and simensma-fresh via 41831a8 July 12, 2024 20:08

taraepp added 2 commits July 12, 2024 20:11

cleanup

6d9b390

missed removal of a line

68304d0

matbusby-fw approved these changes Jul 12, 2024

View reviewed changes

asinn134 reviewed Jul 12, 2024

View reviewed changes

simensma-fresh approved these changes Jul 12, 2024

View reviewed changes

taraepp merged commit be32ca1 into develop Jul 12, 2024
13 of 15 checks passed

taraepp deleted the mds-6014-spatial-file-fe branch July 12, 2024 22:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MDS-6014] Spatial File FE #3181

[MDS-6014] Spatial File FE #3181

taraepp commented Jul 10, 2024

simensma-fresh Jul 12, 2024

matbusby-fw Jul 12, 2024

matbusby-fw Jul 12, 2024

taraepp Jul 12, 2024

simensma-fresh left a comment •

edited

Loading

matbusby-fw Jul 12, 2024

taraepp Jul 12, 2024

matbusby-fw Jul 12, 2024

matbusby-fw Jul 12, 2024

matbusby-fw left a comment

sonarqubecloud bot commented Jul 12, 2024

sonarqubecloud bot commented Jul 12, 2024

sonarqubecloud bot commented Jul 12, 2024

asinn134 Jul 12, 2024

		@@ -17,4 +17,6 @@ EXPOSE 5001

		RUN mkdir -p /tmp/celery

		RUN mkdir -p /tmp/spatial

[MDS-6014] Spatial File FE #3181

[MDS-6014] Spatial File FE #3181

Conversation

taraepp commented Jul 10, 2024

Objective

Misc. changes:

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

simensma-fresh left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

matbusby-fw left a comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Jul 12, 2024

Quality Gate failed for 'bcgov-sonarcloud_mds_common'

sonarqubecloud bot commented Jul 12, 2024

Quality Gate passed for 'bcgov-sonarcloud_mds_minespace-web'

sonarqubecloud bot commented Jul 12, 2024

Quality Gate failed for 'bcgov-sonarcloud_mds_core-web'

Choose a reason for hiding this comment

simensma-fresh left a comment •

edited

Loading