[MDS-5656] Add Report Details - CRR #2851

isuru-aot · 2023-12-13T17:12:30Z

Objective

The dependency files associated with the change are moved to the common location
Added the existing vide from the modal.
Added new fields according to the UI (some with dummy data)
The file submission should be covered in the final step which is to be covered in MDS-5660.

matbusby-fw · 2023-12-13T22:29:09Z

services/common/src/components/common/FileUpload.js

+  onAfterResponse: () => {},
+};
+
+class FileUpload extends React.Component {


Interesting. I really like the idea of having the fileUpload component moved to the common package, but I don't think they behave in exactly the same way.

We don't need to remove this, but we'll need to consider rendering the differences seperately for each FE if we want to use this in Core.

matbusby-fw · 2023-12-13T22:34:05Z

services/common/src/components/common/RenderAutoComplete.js

@@ -0,0 +1,76 @@
+import React from "react";


Hmmm, this might get a bit sticky. Tara has spent a bunch of time moving all of the form components into the common package and converting them to .tsx. Going to have to coordinate merging these I think.

Removed unnecessary props.

matbusby-fw · 2023-12-13T23:05:24Z

services/common/src/components/common/utils/actionlessNetworkCalls.js

@@ -0,0 +1,137 @@
+import { ENVIRONMENT } from "@mds/common";


This file already exists at: services/common/src/redux/utils/actionlessNetworkCalls.js

We can just use that one 😁

matbusby-fw · 2023-12-13T23:07:06Z

services/common/src/components/modalContent/config.js

@@ -0,0 +1,45 @@
+// import AddReportModal from "@/components/modalContent/reports/AddReportModal";
+import EditReportModal from "@mds/common/components/modalContent/reports/EditReportModal";
+// import AddVarianceModal from "@/components/modalContent/variances/AddVarianceModal";


I like having a shared config for this, but I think we just delete everything not being used, and add them back in as needed. (Honestly would rather get rid of the config altogether, but I don't think that's happening right away)

Removed as these became unnecessary after addressing all the comments.

matbusby-fw · 2023-12-13T23:12:11Z

services/common/src/components/reports/AddReportDetails.tsx

+
+interface AddReportDetailsProps {
+  mineGuid: string;
+  updateMineReportSubmissions: any;


For anything coming from the mapDispatchToProps we can add a type like this:

updateMineReportSubmissions: ActionCreator<typeof updateMineReportSubmissions>;

This will give you all the correct typing when working with it throughout the file and make it easier to maintain.

matbusby-fw · 2023-12-13T23:17:38Z

services/common/src/components/reports/AddReportDetails.tsx

+
+const AddReportDetails: FC<AddReportDetailsProps> = (props) => {
+  const { mineGuid, dropdownMineReportCategoryOptions } = props;
+  const [state, setState] = useState({


Is this just an artifact of coming from a class based component at one point in time?

I think it's much cleaner to seperate all states into their own useStates as you've done lower down. Makes it more consistent and readable. And pretty. It also makes it pretty.

matbusby-fw · 2023-12-13T23:34:33Z

services/common/src/components/common/utils/helpers.ts

@@ -0,0 +1,602 @@
+import {


This also exists in

services/common/src/redux/utils/helpers.ts 💃🏻 🕺🏻

matbusby-fw · 2023-12-13T23:42:35Z

services/common/src/components/reports/AddReportDetails.tsx

+
+        <Col span={24}>
+          <Form layout="vertical">
+            <ReportsTable


🤔 I think this might not be the correct table. I think the designs are just asking for a table of the documents, not the other reports.

I see you brought over the editReport modal and a few other things that are related to this table, so it would probably mean that we can leave those back where they were.

As discussed added a new component.

matbusby-fw

Lots of awesome work here! I made a few comments, but the big one I think will need to be dealt with is the table at the bottom of your new page should just be a document table instead of the reports table.

Once that is swapped out, I think you'll find that a fair amount of the stuff moved to common doesn't need to be there (I think the reports table itself is fairly Minespace specific)

taraepp · 2023-12-18T16:13:28Z

services/common/src/assets/images/edit-pencil.svg

Noooooo we don't need more copies of this file.
Use the antd one for actions menu.

I might be wrong but it doesn't seem like you are using this image in your changes? Might be able to just remove this file.

taraepp · 2023-12-18T16:14:13Z

services/common/src/components/common/FileUpload.js

@@ -0,0 +1,280 @@
+/* eslint-disable */
+import React from "react";


now that I merged my PR, I think it's just the Callout and LinkButton that aren't already in common. This one's called RenderFileUpload now.

This is updated accordingly

taraepp · 2023-12-18T16:17:23Z

services/common/src/customPropTypes/common.js

@@ -0,0 +1,19 @@
+import { PropTypes, shape, arrayOf, oneOfType } from "prop-types";


I'm not sure about bringing in customPropTypes to common when we're phasing it out. What can we do to remove it instead?

This is removed.

taraepp · 2023-12-18T16:23:52Z

Generally looks good, but I do want to avoid pulling a bunch of stuff into common that's already slated for deletion, most notably customPropTypes which we use interfaces for now instead.
I guess, when I ran into that recently, when it was too much work to convert too many files to TS, I just commented out the customPropTypes and replaced it with "any", so that you're still able to see what the object should look like when it comes time to convert it.

taraepp · 2023-12-18T16:25:32Z

services/common/src/constants/forms.js

@@ -0,0 +1,20 @@
+// Redux Forms
+export const ADD_REPORT = "ADD_REPORT";


I think I also remade forms.js as a forms enum. Still works pretty much the same way but it only has one entry so far and doesn't trigger duplicate named import warnings/errors.

matbusby-fw

Nice! Thanks for all the hard work on this one. Sorry the scope got a little out of control!

isuru-aot and others added 4 commits December 11, 2023 12:47

in progress code with ReportsTable issue

e5c5754

cleaned up common package files and imports

7007eb8

addgin dependencies + 5656 feature

1a639de

cleaning up imports

9bcfa07

isuru-aot marked this pull request as ready for review December 13, 2023 19:17

isuru-aot requested review from matbusby-fw, simensma-fresh, henryoforeh-dev, taraepp and asinn134 December 13, 2023 19:24

matbusby-fw reviewed Dec 13, 2023

View reviewed changes

matbusby-fw requested changes Dec 13, 2023

View reviewed changes

isuru-aot added 2 commits December 14, 2023 17:34

removing unnecessary files + updating useState

b2f9cbe

addressgin pr comments

02d6d5a

taraepp reviewed Dec 18, 2023

View reviewed changes

isuru-aot added 4 commits December 18, 2023 11:31

resovling merge conflicts

7f5ad08

formatting

6fde401

cleaning up

6b434f5

removing js

5013e32

fixing ts issues and cleanup

14e24bf

isuru-aot requested review from matbusby-fw and taraepp December 19, 2023 23:55

cleaning unnecessary files

58a3bb0

asinn134 approved these changes Dec 20, 2023

View reviewed changes

matbusby-fw approved these changes Dec 20, 2023

View reviewed changes

isuru-aot merged commit a5c4f4c into develop Dec 20, 2023
9 checks passed

isuru-aot deleted the mds-5656-add-report-crr branch December 20, 2023 19:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MDS-5656] Add Report Details - CRR #2851

[MDS-5656] Add Report Details - CRR #2851

isuru-aot commented Dec 13, 2023 •

edited

Loading

matbusby-fw Dec 13, 2023

matbusby-fw Dec 13, 2023

isuru-aot Dec 15, 2023

matbusby-fw Dec 13, 2023

isuru-aot Dec 15, 2023

matbusby-fw Dec 13, 2023

isuru-aot Dec 15, 2023

matbusby-fw Dec 13, 2023

isuru-aot Dec 15, 2023

matbusby-fw Dec 13, 2023

isuru-aot Dec 15, 2023

matbusby-fw Dec 13, 2023

isuru-aot Dec 15, 2023

matbusby-fw Dec 13, 2023

isuru-aot Dec 15, 2023

matbusby-fw left a comment

taraepp Dec 18, 2023

asinn134 Dec 20, 2023

taraepp Dec 18, 2023 •

edited

Loading

isuru-aot Dec 19, 2023

taraepp Dec 18, 2023

isuru-aot Dec 19, 2023

taraepp commented Dec 18, 2023

taraepp Dec 18, 2023

matbusby-fw left a comment

		@@ -0,0 +1,280 @@
		/* eslint-disable */
		import React from "react";

		@@ -0,0 +1,19 @@
		import { PropTypes, shape, arrayOf, oneOfType } from "prop-types";

		@@ -0,0 +1,20 @@
		// Redux Forms
		export const ADD_REPORT = "ADD_REPORT";

[MDS-5656] Add Report Details - CRR #2851

[MDS-5656] Add Report Details - CRR #2851

Conversation

isuru-aot commented Dec 13, 2023 • edited Loading

Objective

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

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

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

taraepp Dec 18, 2023 • 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

taraepp commented Dec 18, 2023

Choose a reason for hiding this comment

matbusby-fw left a comment

Choose a reason for hiding this comment

isuru-aot commented Dec 13, 2023 •

edited

Loading

taraepp Dec 18, 2023 •

edited

Loading