Added table of content to open layer details in map view. #1661

ahmdthr · 2024-01-25T08:14:35Z

Resolves #1660
Resolves #1616

A new button to view layer details is added on the map view.

…#1660.

ridoo · 2024-01-25T10:40:05Z

@ahmdthr the PR still is marked as draft .. if this is intended, though, please ignore my comment

ridoo · 2024-03-07T09:58:37Z

@ahmdthr this one would have to be aligned to the latest changes of linked resources

ridoo · 2024-03-19T10:28:37Z

Thanks @ahmdthr

@giohappy the PR is now ready for review on your side

giohappy · 2024-05-06T12:40:31Z

@ridoo @ahmdthr we're taking a look right now

dsuren1 · 2024-05-07T13:35:56Z

@ahmdthr Kindly resolve the conflicts and align the code changes with the latest changes in master. Thanks!

gannebamm · 2024-05-17T10:47:56Z

@giohappy Sorry @ahmdthr was busy with other tasks and we need some additional days to sort out our ressources. Are we to late for lending a helping hand? @dsuren1 already did some changes and requested a review.

giohappy · 2024-05-17T14:37:55Z

I've tested the PR locally. The idea is good and it's really useful, but I have a few concerns:

every time a layer is selected in the TOC a new API request is sent to obtain the required information to enable (or not) the info button for the layer
the information that has been retrieved is not saved, so the same request is sent again every time a layer is selected

I think this could be improved if the following is implemented:

The response can be stored, somehow, inside the state of the component. This avoids making the same request for the same layer multiple times
But, the real point is: are these calls really needed? We already query both the map and the datasets endpoint when the map is loaded. Much information about datasets is retrieved at that time. Isn't this enough? If more attributes are required we can add them to the response of those requests, instead of making additional calls.

@gannebamm @ahmdthr if you agree I would consider these improvements before merging it. In that case the PR should be marked as Draft for the time being.

giohappy

see #1661 (comment)

ahmdthr · 2024-08-22T07:56:00Z

I've tested the PR locally. The idea is good and it's really useful, but I have a few concerns:

every time a layer is selected in the TOC a new API request is sent to obtain the required information to enable (or not) the info button for the layer

the information that has been retrieved is not saved, so the same request is sent again every time a layer is selected

I think this could be improved if the following is implemented:

The response can be stored, somehow, inside the state of the component. This avoids making the same request for the same layer multiple times

But, the real point is: are these calls really needed? We already query both the map and the datasets endpoint when the map is loaded. Much information about datasets is retrieved at that time. Isn't this enough? If more attributes are required we can add them to the response of those requests, instead of making additional calls.

@gannebamm @ahmdthr if you agree I would consider these improvements before merging it. In that case the PR should be marked as Draft for the time being.

@giohappy Thank you very much for your comments. The only reason a new request was being made was because the linked resources were not included in the batch request. Now with recent changes, it is no longer necessary to sent a request to fetch linked resources. I am currently working on it and expect the final version of the PR shortly.

…er of requests for info button on maps page.

…resources for info button on TOC.

ahmdthr · 2024-11-07T09:43:14Z

The info button for layers on the maps page now fetches all data including linked resources with a single call. Additionally, the linked resources are stored in state such that re-fetching is not necessary when re selecting one layer again.

…ready included for 'viewer_common' api_preset.

giohappy · 2024-11-25T14:11:26Z

@dsuren1 please do a new review.

dsuren1 · 2024-11-26T06:00:57Z

geonode_mapstore_client/client/js/epics/index.js

+            const state = getState() || {};
+            const layer = getSelectedLayer(state);
+            const layerResourceId = layer?.extendedParams?.pk;
+            const layerResourceDataset = state.gnresource.data.maplayers.find(mapLayer => mapLayer.dataset.pk === parseInt(layerResourceId, 10)).dataset;


Suggested change

const layerResourceDataset = state.gnresource.data.maplayers.find(mapLayer => mapLayer.dataset.pk === parseInt(layerResourceId, 10)).dataset;

const layerResourceDataset = get(state, 'gnresource.data.maplayers', []).find(mapLayer => get(mapLayer, 'dataset.pk', '') === parseInt(layerResourceId, 10))?.dataset

Error when state.gnresource.data is empty. Happens probably when selecting a layer while it is still loading. Kindly check all it's references in the code

I see there are cases when dataset in the mapLayers is empty causing another failure even when state.gnresource.data.maplayers is not empty (ex: /map/44)

dsuren1

@ahmdthr

It seems in some cases, an error is being generated in gnFetchMissingLayerData when selecting a layer, which is impacting further testing and review of this PR.
Could you also please check if there is a race condition in loading the plugin? At times, the button doesn't appear on the TOC toolbar even when the required data is present.

Kindly check these comments and provide an update to the PR. Thank you!

…dataset.

ahmdthr · 2024-11-29T05:51:02Z

@dsuren1 Thank you very much for your review. All the problems stemmed from non-existent referencing of properties, and I have fixed it in the latest commit. Please have a look at it again and let me know. Thank you.

dsuren1

@ahmdthr
Overall the changes looks good. But I see some minor issues as mentioned below. Kindly check it out

Layer detail doesn't always reflect correct layer name on the detail panel

layer_detail_sync.mp4

dsuren1 · 2024-12-03T08:31:42Z

geonode_mapstore_client/static/mapstore/configs/localConfig.json

@@ -2330,6 +2330,150 @@
                "cfg": {
                    "wrap": true
                }
+            },
+            {
+                "name": "LayerDetailViewer",


Suggested change

"name": "LayerDetailViewer",

"mandatory": true,

"name": "LayerDetailViewer",

In order to make the plugin available by default add mandatory: true, or add it to pluginsConfig under TOC as children, so the user can select the plugin when adding viewer to map.

Currently, the plugin is not available on map with viewer existing already.

…tails panel.

ahmdthr · 2024-12-03T14:44:18Z

@ahmdthr Overall the changes looks good. But I see some minor issues as mentioned below. Kindly check it out
Layer detail doesn't always reflect correct layer name on the detail panel
layer_detail_sync.mp4

This bug where the title of the dataset on the detail layer was not being changed was due to the fact that the "EditTtile" component was using its own state for the title, thus changing the "resource" did not update the title if the "DetailsPanel" was already inflated. It is fixed now.

ridoo · 2024-12-04T11:51:16Z

@dsuren1 great to see you approved the PR .. any chance to see this PR backported to 4.4.x?

* Added table of content to open layer details in map view. Fixes issue#1660. * Updated to the newer version. * Code refactor * Fixed instability issues for info button on TOC. * Fixed linked resources for info button on TOC and code cleanup. * Avoided repeating calls to get layer dataset fields including linked resources for info button on TOC. * Fixed localConfig json file for the info button. * Reverted api changes to include linked resources, because they are already included for 'viewer_common' api_preset. * Fixed getDatasetByPk definition. * Fixed linting issues. * Fixed bug where info button was misbehaving when any maplayer had no dataset. * Fixed a bug where the title of the dataset was not changing on the details panel. --------- Co-authored-by: Suren <[email protected]> (cherry picked from commit 9b1dcb4)

) * Added table of content to open layer details in map view. Fixes issue#1660. * Updated to the newer version. * Code refactor * Fixed instability issues for info button on TOC. * Fixed linked resources for info button on TOC and code cleanup. * Avoided repeating calls to get layer dataset fields including linked resources for info button on TOC. * Fixed localConfig json file for the info button. * Reverted api changes to include linked resources, because they are already included for 'viewer_common' api_preset. * Fixed getDatasetByPk definition. * Fixed linting issues. * Fixed bug where info button was misbehaving when any maplayer had no dataset. * Fixed a bug where the title of the dataset was not changing on the details panel. --------- Co-authored-by: Suren <[email protected]> (cherry picked from commit 9b1dcb4) Co-authored-by: ahmdthr <[email protected]>

…) (GeoNode#1917) * Added table of content to open layer details in map view. Fixes issue#1660. * Updated to the newer version. * Code refactor * Fixed instability issues for info button on TOC. * Fixed linked resources for info button on TOC and code cleanup. * Avoided repeating calls to get layer dataset fields including linked resources for info button on TOC. * Fixed localConfig json file for the info button. * Reverted api changes to include linked resources, because they are already included for 'viewer_common' api_preset. * Fixed getDatasetByPk definition. * Fixed linting issues. * Fixed bug where info button was misbehaving when any maplayer had no dataset. * Fixed a bug where the title of the dataset was not changing on the details panel. --------- Co-authored-by: Suren <[email protected]> (cherry picked from commit 9b1dcb4) Co-authored-by: ahmdthr <[email protected]>

…) (GeoNode#1917)

Added table of content to open layer details in map view. Fixes issue…

694b64b

…#1660.

ridoo mentioned this pull request Jan 25, 2024

Feature Branch Status Thuenen-GeoNode-Development/thuenen_atlas#8

Open

30 tasks

ahmdthr marked this pull request as ready for review January 30, 2024 05:27

Updated to the newer version.

9d6b871

ridoo added the enhancement New feature or request label Mar 19, 2024

giohappy requested a review from dsuren1 May 6, 2024 12:36

giohappy added the geonode-ui label May 6, 2024

dsuren1 added 2 commits May 17, 2024 12:30

Merge branch '#3362_catalogue' into issue#1660

3993b74

Code refactor

0403460

dsuren1 requested a review from giohappy May 17, 2024 10:28

giohappy requested changes May 29, 2024

View reviewed changes

gannebamm marked this pull request as draft July 25, 2024 13:13

ahmdthr and others added 8 commits September 17, 2024 14:41

Using include[]=linked_resources query paramter for reducing the numb…

1e3f54a

…er of requests for info button on maps page.

Merge branch 'GeoNode:master' into issue#1660

f25231e

Fixed instability issues for info button on TOC.

6963521

Merge branch 'master' into issue#1660

0097d31

Fixed linked resources for info button on TOC and code cleanup.

e75d4f4

Avoided repeating calls to get layer dataset fields including linked …

7630e0f

…resources for info button on TOC.

Fixed localConfig json file for the info button.

2efe12e

Merge branch 'master' into issue#1660

ff519eb

ahmdthr marked this pull request as ready for review November 7, 2024 09:40

ahmdthr added 3 commits November 11, 2024 15:30

Reverted api changes to include linked resources, because they are al…

3d1b3cf

…ready included for 'viewer_common' api_preset.

Fixed getDatasetByPk definition.

2336874

Fixed linting issues.

df91b75

giohappy self-requested a review November 25, 2024 14:10

dsuren1 reviewed Nov 26, 2024

View reviewed changes

dsuren1 requested changes Nov 26, 2024

View reviewed changes

Fixed bug where info button was misbehaving when any maplayer had no …

facfef6

…dataset.

dsuren1 requested changes Dec 3, 2024

View reviewed changes

Fixed a bug where the title of the dataset was not changing on the de…

a30332e

…tails panel.

ahmdthr requested a review from dsuren1 December 3, 2024 14:45

dsuren1 approved these changes Dec 4, 2024

View reviewed changes

giohappy approved these changes Dec 4, 2024

View reviewed changes

giohappy added the backport 4.4.x label Dec 4, 2024

giohappy merged commit 9b1dcb4 into GeoNode:master Dec 4, 2024
2 checks passed

github-actions bot mentioned this pull request Dec 4, 2024

[Backport 4.4.x] Added table of content to open layer details in map view. #1917

Merged

ridoo added a commit to Thuenen-GeoNode-Development/geonode-mapstore-client that referenced this pull request Dec 4, 2024

Added table of content to open layer details in map view. (GeoNode#1661…

af976c3

…) (GeoNode#1917)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added table of content to open layer details in map view. #1661

Added table of content to open layer details in map view. #1661

ahmdthr commented Jan 25, 2024 •

edited by ridoo

Loading

ridoo commented Jan 25, 2024

ridoo commented Mar 7, 2024

ridoo commented Mar 19, 2024

giohappy commented May 6, 2024

dsuren1 commented May 7, 2024

gannebamm commented May 17, 2024

giohappy commented May 17, 2024

giohappy left a comment

ahmdthr commented Aug 22, 2024

ahmdthr commented Nov 7, 2024

giohappy commented Nov 25, 2024

dsuren1 Nov 26, 2024 •

edited

Loading

dsuren1 left a comment •

edited

Loading

ahmdthr commented Nov 29, 2024

dsuren1 left a comment

dsuren1 Dec 3, 2024

ahmdthr commented Dec 3, 2024

ridoo commented Dec 4, 2024

	const layerResourceDataset = state.gnresource.data.maplayers.find(mapLayer => mapLayer.dataset.pk === parseInt(layerResourceId, 10)).dataset;
	const layerResourceDataset = get(state, 'gnresource.data.maplayers', []).find(mapLayer => get(mapLayer, 'dataset.pk', '') === parseInt(layerResourceId, 10))?.dataset

	"name": "LayerDetailViewer",
	"mandatory": true,
	"name": "LayerDetailViewer",

Added table of content to open layer details in map view. #1661

Added table of content to open layer details in map view. #1661

Conversation

ahmdthr commented Jan 25, 2024 • edited by ridoo Loading

ridoo commented Jan 25, 2024

ridoo commented Mar 7, 2024

ridoo commented Mar 19, 2024

giohappy commented May 6, 2024

dsuren1 commented May 7, 2024

gannebamm commented May 17, 2024

giohappy commented May 17, 2024

giohappy left a comment

Choose a reason for hiding this comment

ahmdthr commented Aug 22, 2024

ahmdthr commented Nov 7, 2024

giohappy commented Nov 25, 2024

dsuren1 Nov 26, 2024 • edited Loading

Choose a reason for hiding this comment

dsuren1 left a comment • edited Loading

Choose a reason for hiding this comment

ahmdthr commented Nov 29, 2024

dsuren1 left a comment

Choose a reason for hiding this comment

dsuren1 Dec 3, 2024

Choose a reason for hiding this comment

ahmdthr commented Dec 3, 2024

ridoo commented Dec 4, 2024

ahmdthr commented Jan 25, 2024 •

edited by ridoo

Loading

dsuren1 Nov 26, 2024 •

edited

Loading

dsuren1 left a comment •

edited

Loading