Add the exclusive keyword #45

mattiagiupponi · 2024-11-19T13:58:08Z

gannebamm · 2024-11-21T14:23:16Z

Thanks for the fast work @mattiagiupponi !
We have deployed the changes and it is starting properly. @vineetasharma105 is currently reviewing its functionality.

vineetasharma105 · 2024-11-21T14:40:44Z

The keyword - 'Subsite_exclusive' is working for documents, maps, datasets!!

mattiagiupponi · 2024-11-22T14:05:12Z

The keyword - 'Subsite_exclusive' is working for documents, maps, datasets!!

great!

Thanks for the fast work @mattiagiupponi ! We have deployed the changes and it is starting properly. @vineetasharma105 is currently reviewing its functionality.

@gannebamm please let me know when your tests are done so I can merge the PR

vineetasharma105 · 2024-11-22T14:40:06Z

Hi,
I am facing a question when dealing with subsite exclusive contents.
Question : Why the subsite exclusive contents , redirected via the linked resources click, still points towards and redirects to the homepage of geonode and the user is not anymore on the subsite page?
Enhancement/Requirement : as a user and as an admin also, the linked resources should not redirect to the homepage and rather stay on the subsite page, as the contents are 'subsite specific'.

As can be seen in the screen shot, the map (subsite_exclusive_test_map) and its related data set (subsite_exclusive_test_data)
are part of Holisoils subsite and the keyword and the group is set up accordingly. Still , the linked resources links points to the homepage.
Map : https://geonode-demo.thuenen.de/holisoils/catalogue/uuid/20e4d7c5-09fd-46ab-843b-f1bbb4bfee8d
dataset : https://geonode-demo.thuenen.de/catalogue/uuid/ac3361f8-8299-43de-a4f7-20d51a6c7c01
Subsitelink: https://geonode-demo.thuenen.de/holisoils/#/

mattiagiupponi · 2024-11-25T11:27:28Z

Hi @gannebamm @vineetasharma105
With the new push the resources in the linked resource are now pointing to the subsite instead of the main catalogue page.
NOTE: it might be redundant to say, but the resource in the map MUST be part of the subsite in order to be saw via the linked_resource link

gannebamm · 2024-11-25T13:26:11Z

I just deployed the changes and they do not work as intended, yet.

See: https://geonode-demo.thuenen.de/holisoils/catalogue/uuid/6e60d107-3643-4ce5-9482-e098ad4e9305

The map is subsite exlusive, belongs to the holisoils group and uses only subsite ressources. It seems all ressources which are subsite_exclusive currently fail with: [ "Subsite not found" ] for a request like https://geonode-demo.thuenen.de/de-de/api/v2/datasets/22?api_preset=viewer_common&api_preset=dataset_viewer

We used these subsite specific variables:

# SUBSITE SPECIFIC CONFIGURATION
ENABLE_SUBSITE_CUSTOM_THEMES = True
ENABLE_CATALOG_HOME_REDIRECTS_TO = False
SUBSITE_READ_ONLY = False # return download_resourcebase and view resourcebase as permissions
SUBSITE_HIDE_EXCLUSIVE_FROM_SPECIFIC_API = True # If TRUE will hide the `subsite_exclusive` resources also from the detailed endpoint `/documents`, `/maps`, `/datasets`, '/geoapps`

The code is using 270c349

Did we misconfigure something?

mattiagiupponi · 2024-11-25T13:33:05Z

Can you try by set SUBSITE_HIDE_EXCLUSIVE_FROM_SPECIFIC_API = False ?

gannebamm · 2024-11-25T13:42:45Z

redeployed.

Can you try by set SUBSITE_HIDE_EXCLUSIVE_FROM_SPECIFIC_API = False ?

This will fix the [ "Subsite not found" ] issue but the links still point to the main portal.

https://geonode-demo.thuenen.de/holisoils/catalogue/#/maps?d=57%3Bmap

mattiagiupponi · 2024-11-26T09:51:26Z

uhm is working fine on my test environment with or without that variable, i'll give another check soon

gannebamm · 2024-11-26T11:07:28Z

Just as additional info:
We use this deployment https://github.com/Thuenen-GeoNode-Development/thuenen_atlas/tree/subsite_exclusive_test
Which is based on the docker blueprint plus some of our contrib apps. It will use the subsite dev branch as listed here: Thuenen-GeoNode-Development/thuenen_atlas@4183280

mattiagiupponi · 2024-11-27T11:02:01Z

Hi @gannebamm
I made some local test using the project you linked and as you mentioned, the linked resources still point the main catalogue:

But the API v2 is returning the linked resources as expected by adding the subsite:

While on my local instance using geonode-master and mapstore-client-master is working as expected:

I notice that the mapstore-client used by the project, is a fork of the 52north mapstore client fork which is about 20 commits behind the production one for GeoNode 4.3.x which also includes improvement for the linked resources (GeoNode/geonode-mapstore-client@c7f6d10)

Can you please evaluate to upgrade the mapstore client and align it to the GeoNode one? So we can have the same environment.

mattiagiupponi · 2024-11-27T11:11:18Z

As counterproof, i run a geonode 433 on my local instance and the subsite is correctly used for the linked resources:

gannebamm · 2024-11-27T11:16:12Z

@mattiagiupponi Thank you very much for the in-depth look! Yes, we will upgrade soon. See: Thuenen-GeoNode-Development/thuenen_atlas#58 (comment)

gannebamm · 2024-11-28T12:59:25Z

We have deployed a new version and most parts of the feature do work well but ressources with subsite_exclusive keyword will fail with the known [ "Subsite not found" ] error. See:

https://geonode-demo.thuenen.de/holisoils/catalogue/#/?d=36%3Bdataset%3Bvector

If SUBSITE_HIDE_EXCLUSIVE_FROM_SPECIFIC_API = False they will render. Can you please take a look again @mattiagiupponi

additional info: We have updated to 4.4.x and use this (https://github.com/Thuenen-GeoNode-Development/thuenen_atlas) branch for deployment

ridoo · 2024-11-28T19:38:02Z

@mattiagiupponi A quick test turns out that there are different URLs in the Add Resource drop down depending on either opening subsite root http://172.18.0.1:8001/holisoils/ or the catalogue http://172.18.0.1:8001/holisoils/catalogue/. The subsite root point to http://172.18.0.1:8001/holisoils/catalogue/#/map/new and the subsite's catalogue points to http://172.18.0.1:8001/catalogue/#/map/new instead.

Also, what I can see from the Django Logs (not sure if this is related):

WARNING Forbidden: /api/v2/executionrequest
WARNING Forbidden: /api/v2/executionrequest
WARNING "GET /api/v2/executionrequest?filter%7Baction%7D=import&filter%7Bsource%7D=upload&page=1&page_size=99999 HTTP/1.1" 403 103
WARNING "GET /api/v2/executionrequest?filter%7Baction%7D=import&filter%7Bsource%7D=upload&page=1&page_size=99999 HTTP/1.1" 403 103

However, creating a map starting from subsite's catalogue will create a map but redirect (http://172.18.0.1:8001/holisoils/api/v2/maps/9/?api_preset=viewer_common&api_preset=map_viewer) fails with 404. Maps are available from the main portal.

@gannebamm I did not spot errors like [ "Subsite not found" ]. Which component is logging such errors?

These were my testing config:

ENABLE_SUBSITE_CUSTOM_THEMES = True
ENABLE_CATALOG_HOME_REDIRECTS_TO = False
SUBSITE_READ_ONLY = False
SUBSITE_HIDE_EXCLUSIVE_FROM_SPECIFIC_API = False  # tried also True with no different in the described behaviour

gannebamm · 2024-11-29T06:36:35Z

@ridoo We are currently working on the subsite_exclusive feature. This has currently no effect on creating new ressources on the subsite. In our workflow ressources are added by main portals staff via the main portal (atlas in our case). They will be tagged with the keyword subsite_exclusive to only show on the subsite, if they are project specific and not data created by ourselves. For that we need them to not show up in the main catalogue (works) but show up in the subsite catalogue (works) and showing correct links on the subsite for linked ressources (also works). But they still show up on the main portals API if SUBSITE_HIDE_EXCLUSIVE_FROM_SPECIFIC_API = False. If we change this to SUBSITE_HIDE_EXCLUSIVE_FROM_SPECIFIC_API = True they will not show up in the main portals API, but the rendering of ressource panels is broken.

I did not spot errors like [ "Subsite not found" ]. Which component is logging such errors?

It is a mapstore call to fetch info for the ressource info panel. See this:

https://geonode-demo.thuenen.de/holisoils/catalogue/#/?d=36%3Bdataset%3Bvector
will try to fetch info via https://geonode-demo.thuenen.de/de-de/api/v2/datasets/36?api_preset=viewer_common&api_preset=dataset_viewer
which will result in this JSON answer {"success":false,"errors":["Subsite not found"],"code":"not_found"}

If you do the same request for a dataset on the subsite which is not tagged as subsite_exclusive it will render properly. See:

https://geonode-demo.thuenen.de/holisoils/catalogue/#/?d=33%3Bdataset%3Braster
will trigger https://geonode-demo.thuenen.de/api/v2/datasets/33?api_preset=viewer_common&api_preset=dataset_viewer
which will answer JSON

{
    "dataset": {
        "uuid": "0ea54778-63a2-4bf9-b684-51d41e29f1a9",
        "default_style": {
            "pk": 14,
            "name": "ph_30_100",
            "workspace": "geonode",
            "sld_title": "ph_30_100",
            "sld_url": "https://geonode-demo.thuenen.de/geoserver/rest/workspaces/geonode/styles/ph_30_100.sld"
        }
        // [... whole API v2 response ...]
    }
}

the main portals API will properly hide subsite exclusive datasets:
https://geonode-demo.thuenen.de/api/v2/datasets/

while the subsite will show those:
https://geonode-demo.thuenen.de/holisoils/api/v2/datasets/

mattiagiupponi · 2024-11-29T08:32:50Z

Hi @gannebamm @ridoo
Sorry but i was submerged with other tasks, today I'll take a look on your questions.

If SUBSITE_HIDE_EXCLUSIVE_FROM_SPECIFIC_API = False they will render. Can you please take a look again @mattiagiupponi

I'm going to take a look now.

mattiagiupponi · 2024-11-29T11:25:19Z

Hi @gannebamm
The last push should fix the issue related to the visualization of the resources inside a subsite. Even with SUBSITE_HIDE_EXCLUSIVE_FROM_SPECIFIC_API = True it should be rendered correctly now
Can you please verify?

soon i'll check the add resource issue pointed out by @ridoo

gannebamm · 2024-11-29T11:35:34Z

The last push should fix the issue related to the visualization of the resources inside a subsite. Even with SUBSITE_HIDE_EXCLUSIVE_FROM_SPECIFIC_API = True it should be rendered correctly now
Can you please verify?

We are currently starting the review. First look is promising and the issue with subsite exclusive ressources like

https://geonode-demo.thuenen.de/holisoils/catalogue/#/?d=36%3Bdataset%3Bvector

seems to be solved

gannebamm · 2024-11-29T15:42:29Z

@mattiagiupponi can you please double check if this is related: Thuenen-GeoNode-Development/thuenen_atlas#58 (comment)

mattiagiupponi · 2024-11-29T16:18:04Z

@mattiagiupponi can you please double check if this is related: Thuenen-GeoNode-Development/thuenen_atlas#58 (comment)

i'll check and i'll let you know soon

mattiagiupponi · 2024-11-29T16:33:58Z

@mattiagiupponi can you please double check if this is related: Thuenen-GeoNode-Development/thuenen_atlas#58 (comment)

there was a missing slash in the beginning of the URL, so for the remote service was appending the embed url to the main one instead of recreating one. now should be fixed. please try again

mattiagiupponi · 2024-11-29T16:59:38Z

@mattiagiupponi A quick test turns out that there are different URLs in the Add Resource drop down depending on either opening subsite root http://172.18.0.1:8001/holisoils/ or the catalogue http://172.18.0.1:8001/holisoils/catalogue/. The subsite root point to http://172.18.0.1:8001/holisoils/catalogue/#/map/new and the subsite's catalogue points to http://172.18.0.1:8001/catalogue/#/map/new instead.

I'm trying to replicate this, but it looks like is working as expected, only the remote-services are pointing to the main site root. as an instance:

Could be this issue related to my previous comment? #45 (comment) Can you please try with an updated version of GeoNode?
Anyway i'm going to check and fix the remote service that points to the main site.

Im also going to verify this:

Also, what I can see from the Django Logs (not sure if this is related):

The upload from the subsite works fine to me, no 403 are returned. It could always be related to the GeoNode version (i guess)

Can you confirm @ridoo ?

ridoo · 2024-12-03T13:39:12Z

Hey @mattiagiupponi

Could be this issue related to my previous comment? #45 (comment) Can you please try with an updated version of GeoNode?

The version we use should be up to date (more or less) with v4.4.x. Of course, we made customizations.

I tested again and seems that your local overrides did not have any effect. We also provide an overrideLocalConfig in a _geonode_config.html and we should make sure to not only let the last one take precedence. It would be good to provide a recursive handling of all overrideLocalConfigs. I made it work via this configuration:

{% extends 'geonode-mapstore-client/_geonode_config.html' %}
{% block override_local_config %}

{% comment %} Keep the overrides from other apps {% endcomment %}
{{ block.super }}

<script>
const { overrideLocalConfig } = window.__GEONODE_CONFIG__;
window.__GEONODE_CONFIG__.overrideLocalConfig = function(localConfig, _) {

    if (overrideLocalConfig) {
        overrideLocalConfig(localConfig, _)
    }


    // do actual override

    return localConfig;

}

</script>
{% endblock %}

If you think, this make sense, I can create a pull request for geonode-mapstore-client.

mattiagiupponi · 2024-12-04T17:05:13Z

Hi @ridoo sorry but today i was busy since yesterday i was OOO.
I'll tag @allyoucanmap and @dsuren1 just to make them provide their opinion on this.

ridoo · 2024-12-05T12:02:36Z

@mattiagiupponi no problem, I hope you enjoyed your free time :)

I referenced my suggestion in another issue. So if @gannebamm tested successfully this one could be merged IMO (did not find any issues, though, I tested this one not thoroughly).

mattiagiupponi · 2024-12-05T13:42:38Z

@mattiagiupponi no problem, I hope you enjoyed your free time :)

I referenced my suggestion in another issue. So if @gannebamm tested successfully this one could be merged IMO (did not find any issues, though, I tested this one not thoroughly).

I agree, is better to keep this kind of improvment for later, when it can be well tested in case.
If for @gannebamm everything looks fine, we can merge this PR

gannebamm · 2024-12-06T05:11:58Z

@vineetasharma105 Did you encounter any issues with our latest build? For me it is working well and I would give it a go for merging.

gannebamm · 2024-12-06T13:42:04Z

Hi @mattiagiupponi,
we can assure that the feature is working fine for master. I just tested it locally. For 4.4.x everything works except uploading a dataset from the subsite. You demo in comment #45 (comment) is using the master branch (you can spot it on the uploaded page with the new css applied). For 4.4.x the route https://geonode-demo.thuenen.de/holisoils/api/v2/uploads is not working.

For our use case it is not important, since we will upload ressources from the maint page and not via the subsite. In terms of code quality it maybe should get fixed. On the other hand, it is working fine on master 🤷

mattiagiupponi · 2024-12-06T14:21:36Z

Hi @mattiagiupponi, we can assure that the feature is working fine for master. I just tested it locally. For 4.4.x everything works except uploading a dataset from the subsite. You demo in comment #45 (comment) is using the master branch (you can spot it on the uploaded page with the new css applied). For 4.4.x the route https://geonode-demo.thuenen.de/holisoils/api/v2/uploads is not working.

For our use case it is not important, since we will upload ressources from the maint page and not via the subsite. In terms of code quality it maybe should get fixed. On the other hand, it is working fine on master 🤷

Thanks for spotting it.
With the last commit e2abe20 now the "Add resource" in the subsite works as expected in 44x.
If there are no more bugs and if you give the green line i'll merge the PR :) (feel free to approve it too!)

gannebamm · 2024-12-09T09:56:39Z

Just for the record: We successfully tested the PR 👍

Add the exclusive keyword

f7e2d49

mattiagiupponi requested a review from giohappy November 19, 2024 13:58

mattiagiupponi self-assigned this Nov 19, 2024

mattiagiupponi linked an issue Nov 19, 2024 that may be closed by this pull request

Exclusive keyword #44

Closed

mattiagiupponi added 3 commits November 19, 2024 15:14

fix typo on mixin name definition

3c86a70

Fix cache initialization

9125c96

Fix specific api per resource

ac0ecfc

Fix detail_url for linked_resources to match the subsite

270c349

gannebamm mentioned this pull request Nov 27, 2024

Upgrade to 4.4.x Thuenen-GeoNode-Development/thuenen_atlas#58

Open

Fix wrong redirect for resource embed for subsites

853725f

Add resources url override and fix serializer typo

1b2a11e

Partially override of geonode subsite for remote services

e035700

ridoo mentioned this pull request Dec 4, 2024

Override ResourceGrid config via overrideLocalConfig has only effect for non-paged views GeoNode/geonode-mapstore-client#1916

Open

Fix localconfig for subsite

2b00901

Fix localconfig for subsite

8493a60

Add url override for upload in subsite

e2abe20

mattiagiupponi merged commit f1fcd4f into main Dec 9, 2024

mattiagiupponi deleted the subsite_exclusive branch December 9, 2024 10:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add the exclusive keyword #45

Add the exclusive keyword #45

mattiagiupponi commented Nov 19, 2024

gannebamm commented Nov 21, 2024

vineetasharma105 commented Nov 21, 2024

mattiagiupponi commented Nov 22, 2024

vineetasharma105 commented Nov 22, 2024

mattiagiupponi commented Nov 25, 2024

gannebamm commented Nov 25, 2024

mattiagiupponi commented Nov 25, 2024

gannebamm commented Nov 25, 2024 •

edited

Loading

mattiagiupponi commented Nov 26, 2024

gannebamm commented Nov 26, 2024

mattiagiupponi commented Nov 27, 2024 •

edited

Loading

mattiagiupponi commented Nov 27, 2024

gannebamm commented Nov 27, 2024

gannebamm commented Nov 28, 2024 •

edited

Loading

ridoo commented Nov 28, 2024 •

edited

Loading

gannebamm commented Nov 29, 2024 •

edited

Loading

mattiagiupponi commented Nov 29, 2024

mattiagiupponi commented Nov 29, 2024 •

edited

Loading

gannebamm commented Nov 29, 2024

gannebamm commented Nov 29, 2024

mattiagiupponi commented Nov 29, 2024

mattiagiupponi commented Nov 29, 2024

mattiagiupponi commented Nov 29, 2024

ridoo commented Dec 3, 2024 •

edited

Loading

mattiagiupponi commented Dec 4, 2024

ridoo commented Dec 5, 2024

mattiagiupponi commented Dec 5, 2024

gannebamm commented Dec 6, 2024

gannebamm commented Dec 6, 2024

mattiagiupponi commented Dec 6, 2024

gannebamm commented Dec 9, 2024

Add the exclusive keyword #45

Add the exclusive keyword #45

Conversation

mattiagiupponi commented Nov 19, 2024

gannebamm commented Nov 21, 2024

vineetasharma105 commented Nov 21, 2024

mattiagiupponi commented Nov 22, 2024

vineetasharma105 commented Nov 22, 2024

mattiagiupponi commented Nov 25, 2024

gannebamm commented Nov 25, 2024

mattiagiupponi commented Nov 25, 2024

gannebamm commented Nov 25, 2024 • edited Loading

mattiagiupponi commented Nov 26, 2024

gannebamm commented Nov 26, 2024

mattiagiupponi commented Nov 27, 2024 • edited Loading

mattiagiupponi commented Nov 27, 2024

gannebamm commented Nov 27, 2024

gannebamm commented Nov 28, 2024 • edited Loading

ridoo commented Nov 28, 2024 • edited Loading

gannebamm commented Nov 29, 2024 • edited Loading

mattiagiupponi commented Nov 29, 2024

mattiagiupponi commented Nov 29, 2024 • edited Loading

gannebamm commented Nov 29, 2024

gannebamm commented Nov 29, 2024

mattiagiupponi commented Nov 29, 2024

mattiagiupponi commented Nov 29, 2024

mattiagiupponi commented Nov 29, 2024

ridoo commented Dec 3, 2024 • edited Loading

mattiagiupponi commented Dec 4, 2024

ridoo commented Dec 5, 2024

mattiagiupponi commented Dec 5, 2024

gannebamm commented Dec 6, 2024

gannebamm commented Dec 6, 2024

mattiagiupponi commented Dec 6, 2024

gannebamm commented Dec 9, 2024

gannebamm commented Nov 25, 2024 •

edited

Loading

mattiagiupponi commented Nov 27, 2024 •

edited

Loading

gannebamm commented Nov 28, 2024 •

edited

Loading

ridoo commented Nov 28, 2024 •

edited

Loading

gannebamm commented Nov 29, 2024 •

edited

Loading

mattiagiupponi commented Nov 29, 2024 •

edited

Loading

ridoo commented Dec 3, 2024 •

edited

Loading