SC-180 Added Drawing Button #474

collins-self · 2024-08-09T16:56:57Z

Added the button to look for a location's drawings within the Asset Connection page.
Was already on the NMW.

elwills · 2024-08-09T17:33:41Z

I don't see it on the Asset Connections page in NMW. Also placement of the button is no good. Also this doesn't work if the Asset has more than one Substation.

Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Asset/AssetConnection.tsx

...ications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Meter/PropertyUI/LocationDrawings.tsx

...Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/NewMeterWizard/ConnectionPage.tsx

Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Asset/AssetConnection.tsx

...ns/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/LocationDrawingsButton.tsx

...pplications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Location/LocationDrawingsTable.tsx

Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Asset/AssetConnection.tsx

gcsantos-gpa · 2025-01-17T16:05:10Z

...ns/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/LocationDrawingsButton.tsx

+    const isValid = (location: OpenXDA.Types.Location, drawingData) => {
+        let e = "";
+
+        if (!location


Suggested change

if (!location

if (location != null

We should be explicit about our null checks

I think that should be if (location != null

Ah good catch, suggestion fixed

...ns/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/LocationDrawingsButton.tsx

...ons/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/LocationDrawingsModal.tsx

...Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Location/AddEditDrawingsModal.tsx

Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Location/LocationDrawings.tsx

clackner-gpa

Not all comments above are adressed

Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Asset/AssetConnection.tsx

...ns/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/LocationDrawingsButton.tsx

gcsantos-gpa

New files/removed files also aren't reflected in the project file. Can you perform the necessary changes to the project file?

...ns/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/LocationDrawingsButton.tsx

...pplications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Location/LocationDrawingsTable.tsx

Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/NewMeterWizard/AssetPage.tsx

…tton

…tate management

…e management

gcsantos-gpa

Rebase threw away some changes made by other PR's

Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Asset/AssetConnection.tsx

clackner-gpa · 2025-02-16T18:33:39Z

Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Asset/AssetConnection.tsx

-
    function handleSelect(item) {
-        history.push({ pathname: homePath + 'index.cshtml', search: '?name=Asset&AssetID=' + item.row.AssetID})
+        history.push({ pathname: homePath + 'index.cshtml', search: '?name=Asset&AssetID=' + item.row.AssetID })


@gcsantos-gpa I bet this conflicts with #606 ?

It would yes

...s/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Meter/PropertyUI/MeterLocationProperties.tsx

Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/NewMeterWizard/AssetPage.tsx

...Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/NewMeterWizard/NewMeterWizard.tsx

clackner-gpa · 2025-02-18T01:18:05Z

@gcsantos-gpa Do not merge please.
I want to give this a shot in a rewrite to simplify significantly.

collins-self force-pushed the SC-180-Drawing-Button branch from f3d0900 to 309bfda Compare August 9, 2024 16:57

collins-self changed the title ~~SC-181 Added Drawing Button~~ SC-180 Added Drawing Button Aug 9, 2024

collins-self force-pushed the SC-180-Drawing-Button branch 2 times, most recently from 3c968f6 to ab53990 Compare August 19, 2024 18:11

clackner-gpa force-pushed the SC-180-Drawing-Button branch from ab53990 to ebf210d Compare October 2, 2024 19:05

collins-self force-pushed the SC-180-Drawing-Button branch 2 times, most recently from 5f590e8 to c037861 Compare October 7, 2024 18:14

clackner-gpa force-pushed the SC-180-Drawing-Button branch from c037861 to 52f0c10 Compare October 8, 2024 16:13

clackner-gpa requested changes Oct 8, 2024

View reviewed changes

collins-self force-pushed the SC-180-Drawing-Button branch from a8bcd7b to dcd5ad4 Compare October 9, 2024 18:35

collins-self force-pushed the SC-180-Drawing-Button branch from 183a6ab to 0c8ec5e Compare October 21, 2024 17:48

collins-self force-pushed the SC-180-Drawing-Button branch 2 times, most recently from 94d3b84 to 2e5d085 Compare November 4, 2024 20:39

clackner-gpa self-requested a review January 7, 2025 14:02

collins-self force-pushed the SC-180-Drawing-Button branch 2 times, most recently from 24e3ef6 to e9f2a13 Compare January 14, 2025 12:09

clackner-gpa requested changes Jan 15, 2025

View reviewed changes

collins-self force-pushed the SC-180-Drawing-Button branch from c73153e to c777394 Compare January 17, 2025 14:26

collins-self requested review from clackner-gpa and gcsantos-gpa January 17, 2025 14:43

gcsantos-gpa requested changes Jan 17, 2025

View reviewed changes

clackner-gpa requested changes Jan 24, 2025

View reviewed changes

collins-self force-pushed the SC-180-Drawing-Button branch from 38aaa44 to 552ccf8 Compare January 24, 2025 15:34

gcsantos-gpa requested changes Jan 24, 2025

View reviewed changes

collins-self force-pushed the SC-180-Drawing-Button branch from 82505cc to 2a4628c Compare January 27, 2025 13:51

gcsantos-gpa requested changes Jan 27, 2025

View reviewed changes

collins-self force-pushed the SC-180-Drawing-Button branch from 667daa8 to 8d96db0 Compare January 31, 2025 16:51

collins-self requested a review from gcsantos-gpa February 3, 2025 14:04

collins-self force-pushed the SC-180-Drawing-Button branch from 8d96db0 to 3ea2dc6 Compare February 5, 2025 16:07

collins-self added 15 commits February 10, 2025 08:07

optimize multipleLocations and error management in LocationDrawingsBu…

4fc731a

…tton

improve error handling and cleanup in LocationDrawingsButton

f93c3ae

enhance LocationDrawingsButton with dropdown options and error handling

7c45f36

update LocationDrawingsModal and LocationDrawingsTable for improved s…

27a4819

…tate management

Removed unintended (whitespace) changes: ConnectionPage, AssetPage, NMW

9a7eae7

update LocationDrawingsButton and related components for loading stat…

7d97c4f

…e management

Made prop optional

ab95603

updated LocationDrawingsButton props with memoized location arrays

c537b31

fixed error handling and DBSearch, organized AssetConnection changes

2c5c685

adjust table column styles and csproj

4c66fcb

Updated style of component

90f86c6

rename modal handler and improve tooltip error display

34faba6

updated props and imports

6581c96

removed redundant button fixed tooltip

3b96c34

added missing imports

09bd2c7

collins-self force-pushed the SC-180-Drawing-Button branch from 7122008 to 09bd2c7 Compare February 10, 2025 13:08

gcsantos-gpa requested changes Feb 11, 2025

View reviewed changes

cleaned up NMW/AssetPage

ff331c0

collins-self requested a review from gcsantos-gpa February 13, 2025 14:43

clackner-gpa requested changes Feb 16, 2025

View reviewed changes

collins-self added 2 commits February 17, 2025 09:02

quick fixes

1f8a16c

removed fieldset

fac8a0f

GridProtectionAlliance deleted a comment from collins-self Feb 18, 2025

clackner-gpa approved these changes Feb 18, 2025

View reviewed changes

SC-180 Added Drawing Button #474

Are you sure you want to change the base?

SC-180 Added Drawing Button #474

Uh oh!

Conversation

collins-self commented Aug 9, 2024

Uh oh!

elwills commented Aug 9, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gcsantos-gpa Jan 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

clackner-gpa Jan 24, 2025

Choose a reason for hiding this comment

Uh oh!

gcsantos-gpa Jan 24, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

clackner-gpa left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gcsantos-gpa left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gcsantos-gpa left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

clackner-gpa Feb 16, 2025

Choose a reason for hiding this comment

Uh oh!

gcsantos-gpa Feb 19, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

clackner-gpa commented Feb 18, 2025

Uh oh!

Reviewers

Assignees

gcsantos-gpa Jan 17, 2025 •

edited

Loading