New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#1741: Update master with changes from mapviewer #1743

Merged

allyoucanmap merged 53 commits into GeoNode:master from dsuren1:#1741_mapviewer_master

May 6, 2024

dsuren1 commented May 6, 2024

Description

This PR update master with changes from mapviewer

Issue

Merge mapviewer branch into master #1741

allyoucanmap and others added 30 commits

January 18, 2024 18:06


          update mapstore submodule to latest master

591fc14


          add mapviewer resource type

28972c2


          add context creator for map viewer

31cfe93


          add initial connection betweem mapviewer and map resources

3c5cdbc


          review plugins available in the map viewer resource

dca69e6


          Mapviewer resource are made unadvertized by default (GeoNode#1668)

ae1a867

* GeoNode#1657 - Add unadvertised identifier to the resource

* Update VERSION

(cherry picked from commit 1eaecca)

* Enable group facets (GeoNode#1662)

(cherry picked from commit 74030de)

* [Fixes GeoNode#1665] Django upgrade to 4.2 LTS (GeoNode#1664)

* Upgrade Django version

* Upgrade Django version

* Upgrade Django version

* Upgrade to django 4.2

---------

Co-authored-by: mattiagiupponi <mattia.giupponi@gmail.com>
(cherry picked from commit 7a8ef7c)

* Bump to 4.4.x dev

(cherry picked from commit 16559ab)

* Mapviewer resource are made unadvertized by default

(cherry picked from commit 0b328c3)

---------

Co-authored-by: Giovanni Allegri <giovanni.allegri@gmail.com>
Co-authored-by: mattiagiupponi <51856725+mattiagiupponi@users.noreply.github.com>


          User extension plugin invocation improvement (GeoNode#1671)

0800aa4

* User extension plugin invocation improvement

* style updated


          Implement delete workflow for mapviewer resource (GeoNode#1669)

23ce936


          Enhance the action navbar menu items (GeoNode#1672)

bdddb2b


          Upgrade to Django 4 (GeoNode#1673)

0dddb4a

* Upgrade Django version

* Upgrade Django version

* Upgrade Django version

* Upgrade to django 4.2

---------

Co-authored-by: mattiagiupponi <mattia.giupponi@gmail.com>


          Builds for mapviewer branch

83395ac


          build pr on right branch

7eba26e


          [create-pull-request] automated change (GeoNode#1674)

b4f9906

Co-authored-by: giohappy <giohappy@users.noreply.github.com>


          Fix - Duplicated API requests on viewer resource load (GeoNode#1676)

87f1ac9


          Enhance link system between map and mapviewers (GeoNode#1677)

23c0ffc


          Configuration update for the plugins available inside the context cre…

9f842a0

…ator (GeoNode#1675)


          Merge upstream (GeoNode#1681)

49c2b35

* Fix - Duplicated API requests on viewer resource load (GeoNode#1676)

* Enhance link system between map and mapviewers (GeoNode#1677)

* Configuration update for the plugins available inside the context creator (GeoNode#1675)

---------

Co-authored-by: Suren <dsuren1@gmail.com>


          [create-pull-request] automated change (GeoNode#1682)

Co-authored-by: giohappy <giohappy@users.noreply.github.com>


          GeoNode#1683: Enable the 3D plugin in the default GeoNode map configu…

173f420

…ration (GeoNode#1684)


          GeoNode#1685 - Fix: Mapviewer doesn't show configure plugin steps (Ge…

a8ea649

…oNode#1686)

* GeoNode#1685 - Fix: Mapviewer doesn't show configure plugin steps

* Refresh map on unlink viewer resource


          Merge branch 'mapviewer-resource-built' into mapviewer-resource

b849994


          Merge GeoNode#1685 (GeoNode#1687)

902c94c

* Fix - Duplicated API requests on viewer resource load (GeoNode#1676)

* Enhance link system between map and mapviewers (GeoNode#1677)

* Configuration update for the plugins available inside the context creator (GeoNode#1675)

* GeoNode#1683: Enable the 3D plugin in the default GeoNode map configuration (GeoNode#1684)

* GeoNode#1685 - Fix: Mapviewer doesn't show configure plugin steps (GeoNode#1686)

* GeoNode#1685 - Fix: Mapviewer doesn't show configure plugin steps

* Refresh map on unlink viewer resource

---------

Co-authored-by: Suren <dsuren1@gmail.com>


          [create-pull-request] automated change (GeoNode#1688)

05fa301

Co-authored-by: giohappy <giohappy@users.noreply.github.com>


          GeoNode#1689: Add a warning when closing an unsaved map viewer (GeoNo…

a6102ff

…de#1690)


          Merge branch 'mapviewer-resource-built' into mapviewer-resource

cc524c2


          Revert "Merge branch 'mapviewer-resource-built' into mapviewer-resource"

60d963a

This reverts commit cc524c2, reversing
changes made to a6102ff.


          [create-pull-request] automated change (GeoNode#1694)

fef5ab4

Co-authored-by: giohappy <giohappy@users.noreply.github.com>


          GeoNode#1695 - Remove selection of LongitudinalProfileTool plugin fro…

a9fdc6e

…m map viewer (GeoNode#1696)


          GeoNode#1695 - Remove selection of LongitudinalProfileTool plugin fro…

4e50ce3

…m map viewer (GeoNode#1696) (GeoNode#1698)

Co-authored-by: Suren <dsuren1@gmail.com>


          GeoNode#1699: Add mapviewers to filter panel (GeoNode#1700)

c8737d9

geosolutions-pr-generator bot and others added 19 commits

March 28, 2024 10:38


          [create-pull-request] automated change (GeoNode#1706)

Co-authored-by: giohappy <giohappy@users.noreply.github.com>


          update mapstore submodule to branch 2024.01.xx

4cbbf97


          [create-pull-request] automated change (GeoNode#1713)

58c8e34

Co-authored-by: allyoucanmap <allyoucanmap@users.noreply.github.com>


          fix ifc lib location

963c47b


          [create-pull-request] automated change (GeoNode#1714)

0d45111

Co-authored-by: allyoucanmap <allyoucanmap@users.noreply.github.com>


          Update mapstore submodule to branch 2024.01.xx (GeoNode#1712)

9b81f3f

* update mapstore submodule to branch 2024.01.xx

* fix ifc lib location


          [Backport] GeoNode#1710 - Update calls with catalog_list preset (GeoN…

eb49593

…ode#1711) (GeoNode#1716)

* GeoNode#1657 - Add unadvertised identifier to the resource (GeoNode#1658)

* GeoNode#1657 - Add unadvertised identifier to the resource

* Code refactor

* [create-pull-request] automated change (GeoNode#1659)

Co-authored-by: giohappy <giohappy@users.noreply.github.com>

* Update VERSION

* Enable group facets (GeoNode#1662)

* [create-pull-request] automated change (GeoNode#1663)

Co-authored-by: dsuren1 <dsuren1@users.noreply.github.com>

* [Fixes GeoNode#1665] Django upgrade to 4.2 LTS (GeoNode#1664)

* Upgrade Django version

* Upgrade Django version

* Upgrade Django version

* Upgrade to django 4.2

---------

Co-authored-by: mattiagiupponi <mattia.giupponi@gmail.com>

* Bump to 4.4.x dev

* GeoNode#1678: Enable react-player for audio file resources (GeoNode#1679)

* [create-pull-request] automated change (GeoNode#1680)

Co-authored-by: giohappy <giohappy@users.noreply.github.com>

* configure REST API preset for catalog listing (GeoNode#1709)

* GeoNode#1710 - Update calls with catalog_list preset (GeoNode#1711)

* GeoNode#1710 - Update calls with catalog_list preset

* Update presets and api calls

* Add param serializer

---------

Co-authored-by: geosolutions-pr-generator[bot] <87376048+geosolutions-pr-generator[bot]@users.noreply.github.com>
Co-authored-by: giohappy <giohappy@users.noreply.github.com>
Co-authored-by: Giovanni Allegri <giovanni.allegri@gmail.com>
Co-authored-by: mattiagiupponi <51856725+mattiagiupponi@users.noreply.github.com>
Co-authored-by: dsuren1 <dsuren1@users.noreply.github.com>
Co-authored-by: mattiagiupponi <mattia.giupponi@gmail.com>


          Merge updates (GeoNode#1717)

b9af3d3

* Update mapstore submodule to branch 2024.01.xx (GeoNode#1712)

* update mapstore submodule to branch 2024.01.xx

* fix ifc lib location

* [Backport] GeoNode#1710 - Update calls with catalog_list preset (GeoNode#1711) (GeoNode#1716)

* GeoNode#1657 - Add unadvertised identifier to the resource (GeoNode#1658)

* GeoNode#1657 - Add unadvertised identifier to the resource

* Code refactor

* [create-pull-request] automated change (GeoNode#1659)

Co-authored-by: giohappy <giohappy@users.noreply.github.com>

* Update VERSION

* Enable group facets (GeoNode#1662)

* [create-pull-request] automated change (GeoNode#1663)

Co-authored-by: dsuren1 <dsuren1@users.noreply.github.com>

* [Fixes GeoNode#1665] Django upgrade to 4.2 LTS (GeoNode#1664)

* Upgrade Django version

* Upgrade Django version

* Upgrade Django version

* Upgrade to django 4.2

---------

Co-authored-by: mattiagiupponi <mattia.giupponi@gmail.com>

* Bump to 4.4.x dev

* GeoNode#1678: Enable react-player for audio file resources (GeoNode#1679)

* [create-pull-request] automated change (GeoNode#1680)

Co-authored-by: giohappy <giohappy@users.noreply.github.com>

* configure REST API preset for catalog listing (GeoNode#1709)

* GeoNode#1710 - Update calls with catalog_list preset (GeoNode#1711)

* GeoNode#1710 - Update calls with catalog_list preset

* Update presets and api calls

* Add param serializer

---------

Co-authored-by: geosolutions-pr-generator[bot] <87376048+geosolutions-pr-generator[bot]@users.noreply.github.com>
Co-authored-by: giohappy <giohappy@users.noreply.github.com>
Co-authored-by: Giovanni Allegri <giovanni.allegri@gmail.com>
Co-authored-by: mattiagiupponi <51856725+mattiagiupponi@users.noreply.github.com>
Co-authored-by: dsuren1 <dsuren1@users.noreply.github.com>
Co-authored-by: mattiagiupponi <mattia.giupponi@gmail.com>

---------

Co-authored-by: stefano bovio <stefano.bovio@geosolutionsgroup.com>
Co-authored-by: Suren <dsuren1@gmail.com>
Co-authored-by: geosolutions-pr-generator[bot] <87376048+geosolutions-pr-generator[bot]@users.noreply.github.com>
Co-authored-by: giohappy <giohappy@users.noreply.github.com>
Co-authored-by: mattiagiupponi <51856725+mattiagiupponi@users.noreply.github.com>
Co-authored-by: dsuren1 <dsuren1@users.noreply.github.com>
Co-authored-by: mattiagiupponi <mattia.giupponi@gmail.com>


          [create-pull-request] automated change (GeoNode#1718)

45baeb3

Co-authored-by: giohappy <giohappy@users.noreply.github.com>


          GeoNode#1720: Improve layer setting visualisation (GeoNode#1721)

c885618

* GeoNode#1720: Improve layer setting visualisation

* pluginsconfig updated


          GeoNode#1722: Fix - LayerSettings select dropdown are covered by titl…

90578be

…es (GeoNode#1723)


          Mapviewer resource (GeoNode#1724)

7d3f646

* Update mapstore submodule to branch 2024.01.xx (GeoNode#1712)

* update mapstore submodule to branch 2024.01.xx

* fix ifc lib location

* [Backport] GeoNode#1710 - Update calls with catalog_list preset (GeoNode#1711) (GeoNode#1716)

* GeoNode#1657 - Add unadvertised identifier to the resource (GeoNode#1658)

* GeoNode#1657 - Add unadvertised identifier to the resource

* Code refactor

* [create-pull-request] automated change (GeoNode#1659)

Co-authored-by: giohappy <giohappy@users.noreply.github.com>

* Update VERSION

* Enable group facets (GeoNode#1662)

* [create-pull-request] automated change (GeoNode#1663)

Co-authored-by: dsuren1 <dsuren1@users.noreply.github.com>

* [Fixes GeoNode#1665] Django upgrade to 4.2 LTS (GeoNode#1664)

* Upgrade Django version

* Upgrade Django version

* Upgrade Django version

* Upgrade to django 4.2

---------

Co-authored-by: mattiagiupponi <mattia.giupponi@gmail.com>

* Bump to 4.4.x dev

* GeoNode#1678: Enable react-player for audio file resources (GeoNode#1679)

* [create-pull-request] automated change (GeoNode#1680)

Co-authored-by: giohappy <giohappy@users.noreply.github.com>

* configure REST API preset for catalog listing (GeoNode#1709)

* GeoNode#1710 - Update calls with catalog_list preset (GeoNode#1711)

* GeoNode#1710 - Update calls with catalog_list preset

* Update presets and api calls

* Add param serializer

---------

Co-authored-by: geosolutions-pr-generator[bot] <87376048+geosolutions-pr-generator[bot]@users.noreply.github.com>
Co-authored-by: giohappy <giohappy@users.noreply.github.com>
Co-authored-by: Giovanni Allegri <giovanni.allegri@gmail.com>
Co-authored-by: mattiagiupponi <51856725+mattiagiupponi@users.noreply.github.com>
Co-authored-by: dsuren1 <dsuren1@users.noreply.github.com>
Co-authored-by: mattiagiupponi <mattia.giupponi@gmail.com>

* GeoNode#1720: Improve layer setting visualisation (GeoNode#1721)

* GeoNode#1720: Improve layer setting visualisation

* pluginsconfig updated

* GeoNode#1722: Fix - LayerSettings select dropdown are covered by titles (GeoNode#1723)

---------

Co-authored-by: stefano bovio <stefano.bovio@geosolutionsgroup.com>
Co-authored-by: Suren <dsuren1@gmail.com>
Co-authored-by: geosolutions-pr-generator[bot] <87376048+geosolutions-pr-generator[bot]@users.noreply.github.com>
Co-authored-by: giohappy <giohappy@users.noreply.github.com>
Co-authored-by: mattiagiupponi <51856725+mattiagiupponi@users.noreply.github.com>
Co-authored-by: dsuren1 <dsuren1@users.noreply.github.com>
Co-authored-by: mattiagiupponi <mattia.giupponi@gmail.com>


          GeoNode#1726: Fix - Tile format select input not shown (GeoNode#1727)

cca247a


          GeoNode#1732: Fix - Chart widget header style (GeoNode#1733)

22ca1df


          Merge branch 'mapviewer-resource-built' into mapviewer-resource

4f80dac


          GeoNode#1735: Fix - Map and other resources are loading indefinitely (G…

1ddecd8

…eoNode#1736)


          GeoNode#1728: Fix - Missing scrollbar for legend in datasets (GeoNode…

3e39cfa

…#1729)


          GeoNode#1730: Fix - Incorrect positioning of panels (GeoNode#1731)

e74e922

* GeoNode#1730: Fix - Incorrect positioning of panels

* Unit test


          GeoNode#1741: Merge mapviewer branch into master

72014ed

dsuren1 added the geonode-ui label

dsuren1 requested review from giohappy and allyoucanmap

May 6, 2024 13:12

dsuren1 self-assigned this

dsuren1 linked an issue

that may be closed by this pull request

Merge mapviewer branch into master #1741

Closed

allyoucanmap approved these changes

View reviewed changes

allyoucanmap requested changes

View reviewed changes

Collaborator

allyoucanmap left a comment •

edited

Loading

~~@dsuren1 please clean up static folder, this should not be in the diff:~~

allyoucanmap approved these changes

View reviewed changes

Collaborator

allyoucanmap commented May 6, 2024

the issue with diff it's probably due to the merge

allyoucanmap merged commit 1993c1d into GeoNode:master

1 check passed

giohappy added this to the 4.3.0 milestone

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels