Maps Update: Cards and Modals for Maps Components #1314

juanjoseguva · 2024-07-18T18:26:19Z

Description

Updating Maps page to display as cards with modals, matching the other pages.

UPDATE:

This PR has been updated to also migrate over to RTKQuery for data fetching, and slices, for state management.
Fixes: convert admin maps page to modals #1197, Migrate Maps to RTK #1145, blank map if opened as default graphic type with one map #667 ,non-displayable maps visible after admin logout #1192, Disabled RTK dev-mode checks #1146 immutability check and serializable checks are both enabled

Type of change

Note merging this changes the database configuration.
This change requires a documentation update

Checklist

I have followed the OED pull request ideas
I have removed text in ( ) from the issue request
You acknowledge that every person contributing to this work has signed the OED Contributing License Agreement and each author is listed in the Description section.

Limitations

Saving functionality should be moved into the modals, and the save changes button under the cards should be deleted.

UPDATE: The migration maintains much of the prior functionality but, for simplicity, some of the maps logging was temporarily omitted. Logging as a whole should be carefully planned and implemented in a future PR for the omitted logs from maps, but fort he application as a whole.

src/client/app/components/maps/MapViewComponent.tsx

huss

Thanks to @juanjoseguva for doing this work. I've made some comments that will require non-trivial changes. Please let me know if anything is not clear or I can help.

src/client/app/components/maps/MapViewComponent.tsx

huss · 2024-07-20T21:22:00Z

src/client/app/components/maps/EditMapModalComponent.tsx

+					</FormGroup>
+				</Form>
+				<div>
+					<Label><FormattedMessage id="map.filename" /></Label>


Please see conversion edit for how uneditable items should look.

From what I see this still does not look the way the mentioned page works. Am I missing something?

src/client/app/components/maps/EditMapModalComponent.tsx

src/client/app/components/maps/MapViewComponent.tsx

…atus as they are no longer relevant in the new modals

…ackage

hazeltonbw · 2024-08-01T09:07:47Z

All comments have been addressed and this PR is ready for review @huss.

hazeltonbw · 2024-08-01T09:12:31Z

This PR includes some migrations of map components/containers to RTK as requested in issue #1145, however more components such as the calibration components need updated still.

huss · 2024-08-07T15:27:29Z

This is a good start toward moving maps to cards and some newer Redux usage. However, there are remaining comments to address and more work to be done. Since the team working on this is done (please let me know if it is otherwise), it will need to be continued/completed by others. Given this, I am converting it to draft state so future work can utilize this work.

ChrisMart21 · 2024-08-07T17:10:46Z

I'd like to continue the work of this PR if that's alright.

huss · 2024-08-07T17:25:41Z

I'd like to continue the work of this PR if that's alright.

Thanks to @ChrisMart21 as knowing someone is pushing this forward would be great. Let me know if I can help in any way.

- maps no longer a state property, - old State type deleted, only use RootState now - admin pages untested, graph seems okay. - needs testing.

ChrisMart21 · 2024-08-13T00:58:22Z

@huss
Some updates have been made including.

legacy 'maps' property has been removed from RootState and is longer reliant on older State/Actions.
Maps Data Fetching now using RTK-Query.
Removed Image from redux state, instead process image metaData upon data fetch, and utilize mapSource where possible.
DevModeCheck : 'immutabilityCheck' seems safe to re-enable.

Have yet to test, so its likely revisions are needed.

- Legacy Actions/Creators deleted, - unused actions deleted - unused types deleted - maps files purged. - comments.

Outdated review

- queryTimeIntervalString - rangeSliderIntervalString - barDuration - mapsBarDuration - compareTimeIntervalString - Re-Enable DevModeChecks

Juan Gutierrez added 4 commits July 18, 2024 11:02

Changing maps page to cards with modals

6f3ee9f

Adding messagesfor map modal

17d26a0

Adding licence header

823b161

Removing unused line

09b333a

huss reviewed Jul 20, 2024

View reviewed changes

src/client/app/components/maps/MapViewComponent.tsx Outdated Show resolved Hide resolved

huss requested changes Jul 20, 2024

View reviewed changes

juanjoseguva changed the title ~~Maps update~~ Maps Update: Cards and Modals for Maps Components Jul 22, 2024

Nireves333 and others added 21 commits July 24, 2024 18:45

Fix to allow saves in map modal

8ff0ebe

Create and utilize new maps selector

dc87b56

Class Component to Redux function component update

c799c95

Adding ": " to map card descriptors for formatting

0a941da

Removing unnecessary button

af01ec7

Adding missing : on a map descriptor

b55b672

Removing item name from descriptor (so no map)

2b3885d

Limiting map note to 30 characters.

a7e6ddf

Treating circle size as a positive number

6397225

Changing the order of descriptors on card to match the modal.

0fb3b45

Removing unused variable

76ddde9

Changing the name of the button to upload a new map image file.

815f998

Resolving syntax and jsdoc declaration requirements

b427cbf

Resolving syntax and jsdoc declaration requirements

b687569

use useAppDispatch for type safety

d57da8c

Remove container props, utilize dispatch for redux actions

bc49a65

Use the new component instead of old container

105395d

Remove props used for container, removed isEdited and isSubmitting st…

0d0a421

…atus as they are no longer relevant in the new modals

Delete unused types and only import necessary functions from moment p…

75c5609

…ackage

Delete unused props & functions, add new memoized selector

8430932

Treating map file name as an uneditable item

6db61de

Initial RTKQ Maps

21de916

huss marked this pull request as draft August 7, 2024 15:27

ChrisMart21 added 4 commits August 11, 2024 09:50

Remove Maps from RootState

45d0db6

- maps no longer a state property, - old State type deleted, only use RootState now - admin pages untested, graph seems okay. - needs testing.

Comments

17c851e

More Maps Changes

5c8dbc1

ReEnable Immutable check

b7a3e56

ChrisMart21 and others added 8 commits August 12, 2024 20:37

Bug Fix Revert Change.

ae28cda

Hot Fix Changes.

67d578c

Fix Imports

66ea48d

MapChartSelect Crash Fix

095def8

Login Invalidation updated.

8a53505

Cleanup Legacy Redux where applicable

b71527a

- Legacy Actions/Creators deleted, - unused actions deleted - unused types deleted - maps files purged. - comments.

Merge branch 'development' into Maps-Update

90db2c6

Fix Merge Issues / Missing MPL headers

18b8b6e

ChrisMart21 marked this pull request as ready for review August 13, 2024 20:09

This was linked to issues Aug 13, 2024

Migrate Maps to RTK #1145

Open

Disabled RTK dev-mode checks #1146

Open

ChrisMart21 self-assigned this Aug 13, 2024

ChrisMart21 added the p-high-priority This issue should be the focus of design and developement effort. label Aug 13, 2024

This was linked to issues Aug 13, 2024

blank map if opened as default graphic type with one map #667

Open

non-displayable maps visible after admin logout #1192

Open

UI crashes after deleting a selected map #625

Open

ChrisMart21 added 2 commits August 13, 2024 18:28

Update Root Reducer, Sanitize Devtools

a8237ba

Address Unserializable Values In State/Actions.

04ba6a5

- queryTimeIntervalString - rangeSliderIntervalString - barDuration - mapsBarDuration - compareTimeIntervalString - Re-Enable DevModeChecks

Rakesh-Ranga-Buram mentioned this pull request Sep 21, 2024

maps handling negative values better #1205

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Maps Update: Cards and Modals for Maps Components #1314

Maps Update: Cards and Modals for Maps Components #1314

juanjoseguva commented Jul 18, 2024 •

edited by ChrisMart21

Loading

huss left a comment

huss Jul 20, 2024

huss Aug 1, 2024

hazeltonbw commented Aug 1, 2024

hazeltonbw commented Aug 1, 2024

huss commented Aug 7, 2024

ChrisMart21 commented Aug 7, 2024

huss commented Aug 7, 2024

ChrisMart21 commented Aug 13, 2024 •

edited

Loading

Maps Update: Cards and Modals for Maps Components #1314

Are you sure you want to change the base?

Maps Update: Cards and Modals for Maps Components #1314

Conversation

juanjoseguva commented Jul 18, 2024 • edited by ChrisMart21 Loading

Description

Type of change

Checklist

Limitations

huss left a comment

Choose a reason for hiding this comment

huss Jul 20, 2024

Choose a reason for hiding this comment

huss Aug 1, 2024

Choose a reason for hiding this comment

hazeltonbw commented Aug 1, 2024

hazeltonbw commented Aug 1, 2024

huss commented Aug 7, 2024

ChrisMart21 commented Aug 7, 2024

huss commented Aug 7, 2024

ChrisMart21 commented Aug 13, 2024 • edited Loading

juanjoseguva commented Jul 18, 2024 •

edited by ChrisMart21

Loading

ChrisMart21 commented Aug 13, 2024 •

edited

Loading