✨ Allow to store custom map themes (authenticathed users) #813

wlorenzetti · 2024-04-16T15:25:24Z

Closes: #812

CRUD actions

Create/Update

POST `/qdjango/api/prjtheme/<project_id>/<theme_name>/`

Body request application/json content example:

{
    "layerstree": [
        {
            "name": "Geographical group",
            "checked": true,
            "expanded": true,
            "mutually-exclusive": false,
            "nodes": [
                {
                    "id": "points_b0a9c189_3dcf_48e8_a74e_42ed6d945e91",
                    "name": "points",
                    "visible": true,
                    "expanded": true
                },
                {
                    "id": "roads_ea006d6f_bd87_4635_aae0_4e9e7842b3f4",
                    "name": "roads",
                    "visible": true,
                    "expanded": true
                },
                {
                    "id": "buildings_2f43dc1d_6725_42d2_a09b_dd446220104a",
                    "name": "buildings: wfs( a :////// z )",
                    "visible": true,
                    "expanded": false
                },
                {
                    "id": "maintenance_works_f8cbe34a_eebe_4cd1_9c78_5d420ab0af63",
                    "name": "Maintenance works",
                    "visible": false,
                    "expanded": true
                },
                {
                    "id": "point_reprojected_7b238fe4_8fa3_4016_b98e_b65939ffafe0",
                    "name": "point_reprojected",
                    "visible": true,
                    "expanded": true
                },
                {
                    "id": "work_areas_f0ecbe28_cbd1_4a38_8a57_ab6da91473fe",
                    "name": "Work areas",
                    "visible": true,
                    "expanded": true
                },
                {
                    "name": "B",
                    "checked": false,
                    "expanded": false,
                    "mutually-exclusive": true,
                    "nodes": []
                },
                {
                    "name": "C",
                    "checked": false,
                    "expanded": false,
                    "mutually-exclusive": true,
                    "nodes": []
                },
                {
                    "id": "buildings_07994322_5660_4d3c_b6b0_b579dfc5aeb9",
                    "name": "buildings",
                    "visible": false,
                    "expanded": true
                },
                {
                    "id": "type_subtype_caec4a0b_e7c4_4542_b59c_769f2033d6b1",
                    "name": "Type - Subtype",
                    "visible": false,
                    "expanded": true
                }
            ]
        },
        {
            "name": "1:N referencing tables",
            "checked": true,
            "expanded": true,
            "mutually-exclusive": false,
            "nodes": [
                {
                    "id": "buildings_rating_3d535fae_fd04_4df6_b6ff_8cbd13df078f",
                    "name": "Buildings rating",
                    "visible": true,
                    "expanded": true
                }
            ]
        }
    ],
    "styles": {
        "points_b0a9c189_3dcf_48e8_a74e_42ed6d945e91": "predefinito",
        "roads_ea006d6f_bd87_4635_aae0_4e9e7842b3f4": "default",
        "buildings_2f43dc1d_6725_42d2_a09b_dd446220104a": "cambio",
        "maintenance_works_f8cbe34a_eebe_4cd1_9c78_5d420ab0af63": "default",
        "point_reprojected_7b238fe4_8fa3_4016_b98e_b65939ffafe0": "default",
        "work_areas_f0ecbe28_cbd1_4a38_8a57_ab6da91473fe": "default",
        "buildings_07994322_5660_4d3c_b6b0_b579dfc5aeb9": "default",
        "type_subtype_caec4a0b_e7c4_4542_b59c_769f2033d6b1": "default",
        "buildings_rating_3d535fae_fd04_4df6_b6ff_8cbd13df078f": "default"
    }
}

Response:

{
    "result": true
}

Delete

DELETE `/qdjango/api/prjtheme/<project_id>/<theme_name>/`

Response:

{
    "result": true
}

Project Config `map_themes` structure:

Refactoring of the /config/api/<group_id>/<project_type>/<project_id> API REST result map_themes property:
I.e.:

{
   "project": [
                 {
                "theme": "Deafult",
                "styles": {
                    "cities10000eu_3857_728999c2_0883_4627_8df2_25224f71e3ea": "style_red_square",
                    "countries_3857_4f885888_b0df_4f87_88ed_17c907315fad": "default"
                }
                }
   ],
   "custom": [
                {
                "theme": "Custom theme 1",
                "styles": {
                    "cities10000eu_3857_728999c2_0883_4627_8df2_25224f71e3ea": "style_red_square",
                    "countries_3857_4f885888_b0df_4f87_88ed_17c907315fad": "other_style"
                }
                }
   ]
}

g3w-suite/g3w-client@0e226b2

g3w-suite/g3w-client@37adf60

Raruto · 2024-04-18T08:28:07Z

KO: layer categories are not stored within custom theme

create a style as follows:

switch from Base map to administrative
all the categories are enabled

Raruto · 2024-04-18T13:08:22Z

KO: no error message shown to anonymous user

Nothing happens when you try to create a new theme via an anonymous user:

Request:

POST http://localhost:8000/qdjango/api/prjtheme/3/foo/

{
  "layerstree": [
    {
      "name": "Geographical group",
      "checked": true,
      "expanded": true,
      "mutually-exclusive": false,
      "nodes": [
        {
          "id": "buildings_2f43dc1d_6725_42d2_a09b_dd446220104a",
          "name": "buildings",
          "visible": true,
          "expanded": true
        },
        {
          "id": "roads_ea006d6f_bd87_4635_aae0_4e9e7842b3f4",
          "name": "roads",
          "visible": true,
          "expanded": true
        },
        {
          "id": "work_areas_f0ecbe28_cbd1_4a38_8a57_ab6da91473fe",
          "name": "Work areas",
          "visible": true,
          "expanded": true
        },
        {
          "id": "type_subtype_caec4a0b_e7c4_4542_b59c_769f2033d6b1",
          "name": "Type - Subtype",
          "visible": true,
          "expanded": true
        }
      ]
    },
    {
      "name": "1:N referencing tables",
      "checked": true,
      "expanded": true,
      "mutually-exclusive": false,
      "nodes": [
        {
          "id": "maintenance_works_f8cbe34a_eebe_4cd1_9c78_5d420ab0af63",
          "name": "Maintenance works",
          "visible": true,
          "expanded": true
        },
        {
          "id": "buildings_rating_3d535fae_fd04_4df6_b6ff_8cbd13df078f",
          "name": "Buildings rating",
          "visible": true,
          "expanded": true
        }
      ]
    }
  ],
  "styles": {
    "buildings_2f43dc1d_6725_42d2_a09b_dd446220104a": "Categorized",
    "roads_ea006d6f_bd87_4635_aae0_4e9e7842b3f4": "default",
    "work_areas_f0ecbe28_cbd1_4a38_8a57_ab6da91473fe": "default",
    "type_subtype_caec4a0b_e7c4_4542_b59c_769f2033d6b1": "default",
    "maintenance_works_f8cbe34a_eebe_4cd1_9c78_5d420ab0af63": "default",
    "buildings_rating_3d535fae_fd04_4df6_b6ff_8cbd13df078f": "default"
  }
}

Response:

{
    "result": false,
    "error": "Field 'id' expected a number but got <django.contrib.auth.models.AnonymousUser object at 0x7f4826a353c0>."
}

wlorenzetti · 2024-04-18T14:20:43Z

KO: no error message shown to anonymous user

Nothing happens when you try to create a new theme via an anonymous user:

Request:

POST http://localhost:8000/qdjango/api/prjtheme/3/foo/

{
  "layerstree": [
    {
      "name": "Geographical group",
      "checked": true,
      "expanded": true,
      "mutually-exclusive": false,
      "nodes": [
        {
          "id": "buildings_2f43dc1d_6725_42d2_a09b_dd446220104a",
          "name": "buildings",
          "visible": true,
          "expanded": true
        },
        {
          "id": "roads_ea006d6f_bd87_4635_aae0_4e9e7842b3f4",
          "name": "roads",
          "visible": true,
          "expanded": true
        },
        {
          "id": "work_areas_f0ecbe28_cbd1_4a38_8a57_ab6da91473fe",
          "name": "Work areas",
          "visible": true,
          "expanded": true
        },
        {
          "id": "type_subtype_caec4a0b_e7c4_4542_b59c_769f2033d6b1",
          "name": "Type - Subtype",
          "visible": true,
          "expanded": true
        }
      ]
    },
    {
      "name": "1:N referencing tables",
      "checked": true,
      "expanded": true,
      "mutually-exclusive": false,
      "nodes": [
        {
          "id": "maintenance_works_f8cbe34a_eebe_4cd1_9c78_5d420ab0af63",
          "name": "Maintenance works",
          "visible": true,
          "expanded": true
        },
        {
          "id": "buildings_rating_3d535fae_fd04_4df6_b6ff_8cbd13df078f",
          "name": "Buildings rating",
          "visible": true,
          "expanded": true
        }
      ]
    }
  ],
  "styles": {
    "buildings_2f43dc1d_6725_42d2_a09b_dd446220104a": "Categorized",
    "roads_ea006d6f_bd87_4635_aae0_4e9e7842b3f4": "default",
    "work_areas_f0ecbe28_cbd1_4a38_8a57_ab6da91473fe": "default",
    "type_subtype_caec4a0b_e7c4_4542_b59c_769f2033d6b1": "default",
    "maintenance_works_f8cbe34a_eebe_4cd1_9c78_5d420ab0af63": "default",
    "buildings_rating_3d535fae_fd04_4df6_b6ff_8cbd13df078f": "default"
  }
}

Response:

{
    "result": false,
    "error": "Field 'id' expected a number but got <django.contrib.auth.models.AnonymousUser object at 0x7f4826a353c0>."
}

The save of theme by anonymous user it is not allowed and makes no sense, no?

save map theme

Update custom map theme: g3w-suite/g3w-client@9a4d2fc

…8bfcae750ef7dc6e0b

… into customer_theme

Raruto · 2024-04-22T10:30:23Z

@wlorenzetti what am I doing wrong?

[g3wsdk.info]

g3w-admin: 3.8.customer_theme-20240422102126
g3w-client: 3.10.0-issue_539
- editing: 3.8.0-fix_vector_relations
- qplotly: 3.7.0
- openrouteservice: 3.7.0
- qtimeseries: 3.7.0
browser: Firefox 124.0
operating system: Windows 10 64-bit

Raruto · 2024-04-22T12:07:49Z

#813 (comment)

pip3 install -r /code/requirements.txt

Ref: 3449515

…984d2d2ed831a5ebd3096c3e4484

g3w-suite/g3w-client-plugin-editing@9a8c530

g3w-suite/g3w-client@7aca3d0

g3w-suite/g3w-client@41d0987

g3w-suite/g3w-client-plugin-editing@f91d0ff

Fix print atlas: g3w-suite/g3w-client@55352b9

Missing icon custom base layer: g3w-suite/g3w-client@5620947

* Create model for customer themes. * Implemented CRUD custom theme. * Add constraint. * Typo * Add invalidation of project cache. * Fix test. * Remove CSFR check. * ✨ Client g3w-suite/g3w-client@0e226b2 * 🐛 Client g3w-suite/g3w-client@37adf60 * Add pydantic validation data structure. --------- Co-authored-by: wlorenzetti <lorenzett@gis3w.it> Co-authored-by: volterra79 <boccacci.francesco@gmail.com> Co-authored-by: Raruto <Raruto@users.noreply.github.com>

* Add 'other_info' (userdata) to user form. * ✨ Allow to store custom map themes (authenticathed users) (#813) * Create model for customer themes. * Implemented CRUD custom theme. * Add constraint. * Typo * Add invalidation of project cache. * Fix test. * Remove CSFR check. * ✨ Client g3w-suite/g3w-client@0e226b2 * 🐛 Client g3w-suite/g3w-client@37adf60 * Add pydantic validation data structure. --------- Co-authored-by: wlorenzetti <lorenzett@gis3w.it> Co-authored-by: volterra79 <boccacci.francesco@gmail.com> Co-authored-by: Raruto <Raruto@users.noreply.github.com> * 🐛 Fix `SameSite` cookie property. (#793) * Fix `SameSite` cookie property. * Fix samesite value. * Add secure=True for samesite=None --------- Co-authored-by: wlorenzetti <lorenzett@gis3w.it> Co-authored-by: Raruto <Raruto@users.noreply.github.com> * ✨ Client g3w-suite/g3w-client@19c1d71 * ⚡ Client g3w-suite/g3w-client@dc02f92 * Fix issue #838 --------- Co-authored-by: wlorenzetti <lorenzett@gis3w.it> Co-authored-by: Raruto <Raruto@users.noreply.github.com> Co-authored-by: volterra79 <boccacci.francesco@gmail.com>

wlorenzetti added 4 commits April 16, 2024 09:58

Create model for customer themes.

c512947

Implemented CRUD custom theme.

e811d59

Add constraint.

659bbf3

Typo

911341e

wlorenzetti added the feature New feature or request label Apr 16, 2024

wlorenzetti added this to the v3.8 milestone Apr 16, 2024

wlorenzetti self-assigned this Apr 16, 2024

wlorenzetti added 2 commits April 16, 2024 17:44

Add invalidation of project cache.

f556e50

Fix test.

83c2e08

wlorenzetti requested a review from volterra79 April 17, 2024 06:30

volterra79 mentioned this pull request Apr 17, 2024

Allow to store custom map themes (authenticathed users) g3w-suite/g3w-client#540

Merged

wlorenzetti and others added 3 commits April 17, 2024 10:10

Remove CSFR check.

c442d6f

✨ Client

37c030f

g3w-suite/g3w-client@0e226b2

🐛 Client

c29a092

g3w-suite/g3w-client@37adf60

Raruto changed the title ~~Customer theme CRUD~~ Allow fronted users to store custom map themes within project config Apr 18, 2024

Raruto changed the title ~~Allow fronted users to store custom map themes within project config~~ Allow to store custom map themes Apr 18, 2024

Raruto changed the title ~~Allow to store custom map themes~~ Allow to store custom map themes (authenticathed users) Apr 18, 2024

Merge branch 'dev' into customer_theme

5a8156e

Raruto changed the title ~~Allow to store custom map themes (authenticathed users)~~ ✨ Allow to store custom map themes (authenticathed users) Apr 18, 2024

Raruto marked this pull request as ready for review April 18, 2024 13:17

wlorenzetti and others added 7 commits April 22, 2024 08:47

Add pydantic validation data structure.

3449515

Merge branch 'dev' into customer_theme

fd2e08b

✨ Client

a4e2749

save map theme

✨ Client

d7eb632

Update custom map theme: g3w-suite/g3w-client@9a4d2fc

Merge branch 'dev' into customer_theme

bdd51ee

https://github.com/g3w-suite/g3w-client/commit/9a4d2fc6f22b33230adc83…

d7c5e92

…8bfcae750ef7dc6e0b

Merge branch 'customer_theme' of https://github.com/g3w-suite/g3w-admin…

11f7fc6

… into customer_theme

Raruto and others added 7 commits April 22, 2024 15:23

https://github.com/g3w-suite/g3w-client/pull/540/commits/f788cce5797b…

6c512fc

…984d2d2ed831a5ebd3096c3e4484

🐛 Client

2c8d1fc

g3w-suite/g3w-client-plugin-editing@9a8c530

🐛 Client

5db6ede

g3w-suite/g3w-client@7aca3d0

🐛 Client

c7fffd8

g3w-suite/g3w-client@41d0987

🐛 Client

f531754

g3w-suite/g3w-client-plugin-editing@f91d0ff

🐛 Client

258a724

Fix print atlas: g3w-suite/g3w-client@55352b9

🐛 Client

bad956c

Missing icon custom base layer: g3w-suite/g3w-client@5620947

volterra79 approved these changes Apr 29, 2024

View reviewed changes

wlorenzetti merged commit 4b50d5f into dev Apr 29, 2024
4 checks passed

wlorenzetti deleted the customer_theme branch April 29, 2024 09:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

✨ Allow to store custom map themes (authenticathed users) #813

✨ Allow to store custom map themes (authenticathed users) #813

wlorenzetti commented Apr 16, 2024 •

edited by Raruto

Loading

Raruto commented Apr 18, 2024 •

edited

Loading

Raruto commented Apr 18, 2024

wlorenzetti commented Apr 18, 2024

KO: no error message shown to anonymous user

Raruto commented Apr 22, 2024

Raruto commented Apr 22, 2024

✨ Allow to store custom map themes (authenticathed users) #813

✨ Allow to store custom map themes (authenticathed users) #813

Conversation

wlorenzetti commented Apr 16, 2024 • edited by Raruto Loading

CRUD actions

Create/Update

POST /qdjango/api/prjtheme/<project_id>/<theme_name>/

Delete

DELETE /qdjango/api/prjtheme/<project_id>/<theme_name>/

Project Config map_themes structure:

Raruto commented Apr 18, 2024 • edited Loading

KO: layer categories are not stored within custom theme

Raruto commented Apr 18, 2024

KO: no error message shown to anonymous user

wlorenzetti commented Apr 18, 2024

KO: no error message shown to anonymous user

Raruto commented Apr 22, 2024

Raruto commented Apr 22, 2024

wlorenzetti commented Apr 16, 2024 •

edited by Raruto

Loading

POST `/qdjango/api/prjtheme/<project_id>/<theme_name>/`

DELETE `/qdjango/api/prjtheme/<project_id>/<theme_name>/`

Project Config `map_themes` structure:

Raruto commented Apr 18, 2024 •

edited

Loading