c2cgeoportal-admin 2.8.1.181__py3-none-any.whl → 2.9rc2__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (49) hide show
  1. c2cgeoportal_admin/__init__.py +14 -6
  2. c2cgeoportal_admin/lib/{lingua_extractor.py → lingva_extractor.py} +6 -6
  3. c2cgeoportal_admin/lib/ogcserver_synchronizer.py +6 -5
  4. c2cgeoportal_admin/routes.py +12 -3
  5. c2cgeoportal_admin/schemas/dimensions.py +4 -2
  6. c2cgeoportal_admin/schemas/functionalities.py +9 -12
  7. c2cgeoportal_admin/schemas/interfaces.py +7 -3
  8. c2cgeoportal_admin/schemas/metadata.py +13 -13
  9. c2cgeoportal_admin/schemas/restriction_areas.py +5 -3
  10. c2cgeoportal_admin/schemas/roles.py +7 -3
  11. c2cgeoportal_admin/schemas/treegroup.py +14 -10
  12. c2cgeoportal_admin/schemas/treeitem.py +2 -2
  13. c2cgeoportal_admin/static/theme.css +3 -0
  14. c2cgeoportal_admin/views/dimension_layers.py +11 -7
  15. c2cgeoportal_admin/views/functionalities.py +25 -18
  16. c2cgeoportal_admin/views/interfaces.py +22 -15
  17. c2cgeoportal_admin/views/layer_groups.py +33 -20
  18. c2cgeoportal_admin/views/layers.py +12 -9
  19. c2cgeoportal_admin/views/layers_cog.py +135 -0
  20. c2cgeoportal_admin/views/layers_vectortiles.py +42 -27
  21. c2cgeoportal_admin/views/layers_wms.py +47 -32
  22. c2cgeoportal_admin/views/layers_wmts.py +46 -32
  23. c2cgeoportal_admin/views/layertree.py +9 -8
  24. c2cgeoportal_admin/views/logged_views.py +15 -12
  25. c2cgeoportal_admin/views/logs.py +9 -8
  26. c2cgeoportal_admin/views/oauth2_clients.py +26 -22
  27. c2cgeoportal_admin/views/ogc_servers.py +48 -34
  28. c2cgeoportal_admin/views/restriction_areas.py +29 -19
  29. c2cgeoportal_admin/views/roles.py +29 -19
  30. c2cgeoportal_admin/views/themes.py +35 -24
  31. c2cgeoportal_admin/views/themes_ordering.py +11 -11
  32. c2cgeoportal_admin/views/treeitems.py +13 -11
  33. c2cgeoportal_admin/views/users.py +37 -22
  34. c2cgeoportal_admin/widgets.py +3 -3
  35. {c2cgeoportal_admin-2.8.1.181.dist-info → c2cgeoportal_admin-2.9rc2.dist-info}/METADATA +3 -12
  36. {c2cgeoportal_admin-2.8.1.181.dist-info → c2cgeoportal_admin-2.9rc2.dist-info}/RECORD +48 -46
  37. {c2cgeoportal_admin-2.8.1.181.dist-info → c2cgeoportal_admin-2.9rc2.dist-info}/WHEEL +1 -1
  38. c2cgeoportal_admin-2.9rc2.dist-info/entry_points.txt +5 -0
  39. tests/__init__.py +13 -8
  40. tests/conftest.py +20 -10
  41. tests/test_layers_cog.py +243 -0
  42. tests/test_layers_vectortiles.py +2 -7
  43. tests/{test_lingua_extractor_config.py → test_lingva_extractor_config.py} +3 -3
  44. tests/test_logs.py +3 -4
  45. tests/test_oauth2_clients.py +3 -2
  46. tests/test_role.py +3 -2
  47. tests/test_user.py +8 -2
  48. c2cgeoportal_admin-2.8.1.181.dist-info/entry_points.txt +0 -6
  49. {c2cgeoportal_admin-2.8.1.181.dist-info → c2cgeoportal_admin-2.9rc2.dist-info}/top_level.txt +0 -0
@@ -1,4 +1,4 @@
1
- # Copyright (c) 2017-2023, Camptocamp SA
1
+ # Copyright (c) 2017-2024, Camptocamp SA
2
2
  # All rights reserved.
3
3
 
4
4
  # Redistribution and use in source and binary forms, with or without
@@ -27,12 +27,19 @@
27
27
 
28
28
 
29
29
  from functools import partial
30
- from typing import Any, Dict
30
+ from typing import Any
31
31
 
32
32
  import colander
33
33
  import pyramid.request
34
34
  from c2cgeoform.schema import GeoFormSchemaNode
35
- from c2cgeoform.views.abstract_views import ListField
35
+ from c2cgeoform.views.abstract_views import (
36
+ DeleteResponse,
37
+ GridResponse,
38
+ IndexResponse,
39
+ ListField,
40
+ ObjectResponse,
41
+ SaveResponse,
42
+ )
36
43
  from deform.widget import FormWidget
37
44
  from pyramid.view import view_config, view_defaults
38
45
 
@@ -44,8 +51,8 @@ _list_field = partial(ListField, Functionality)
44
51
 
45
52
 
46
53
  def _translate_available_functionality(
47
- available_functionality: Dict[str, Any], request: pyramid.request.Request
48
- ) -> Dict[str, Any]:
54
+ available_functionality: dict[str, Any], request: pyramid.request.Request
55
+ ) -> dict[str, Any]:
49
56
  result = {}
50
57
  result.update(available_functionality)
51
58
  result["description"] = request.localizer.translate(
@@ -67,7 +74,7 @@ base_schema = GeoFormSchemaNode(
67
74
 
68
75
 
69
76
  @view_defaults(match_param="table=functionalities")
70
- class FunctionalityViews(LoggedViews):
77
+ class FunctionalityViews(LoggedViews[Functionality]):
71
78
  """The functionality administration view."""
72
79
 
73
80
  _list_fields = [_list_field("id"), _list_field("name"), _list_field("description"), _list_field("value")]
@@ -75,28 +82,28 @@ class FunctionalityViews(LoggedViews):
75
82
  _model = Functionality
76
83
  _base_schema = base_schema
77
84
 
78
- @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")
79
- def index(self):
85
+ @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2") # type: ignore[misc]
86
+ def index(self) -> IndexResponse:
80
87
  return super().index()
81
88
 
82
- @view_config(route_name="c2cgeoform_grid", renderer="fast_json")
83
- def grid(self):
89
+ @view_config(route_name="c2cgeoform_grid", renderer="fast_json") # type: ignore[misc]
90
+ def grid(self) -> GridResponse:
84
91
  return super().grid()
85
92
 
86
- @view_config(route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2")
87
- def view(self):
93
+ @view_config(route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2") # type: ignore[misc]
94
+ def view(self) -> ObjectResponse:
88
95
  return super().edit()
89
96
 
90
- @view_config(route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2")
91
- def save(self):
97
+ @view_config(route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2") # type: ignore[misc]
98
+ def save(self) -> SaveResponse:
92
99
  return super().save()
93
100
 
94
- @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")
95
- def delete(self):
101
+ @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json") # type: ignore[misc]
102
+ def delete(self) -> DeleteResponse:
96
103
  return super().delete()
97
104
 
98
105
  @view_config(
99
- route_name="c2cgeoform_item_duplicate", request_method="GET", renderer="../templates/edit.jinja2"
106
+ route_name="c2cgeoform_item_duplicate", request_method="GET", renderer="../templates/edit.jinja2" # type: ignore[misc]
100
107
  )
101
- def duplicate(self):
108
+ def duplicate(self) -> ObjectResponse:
102
109
  return super().duplicate()
@@ -1,4 +1,4 @@
1
- # Copyright (c) 2017-2023, Camptocamp SA
1
+ # Copyright (c) 2017-2024, Camptocamp SA
2
2
  # All rights reserved.
3
3
 
4
4
  # Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,14 @@
29
29
  from functools import partial
30
30
 
31
31
  from c2cgeoform.schema import GeoFormSchemaNode
32
- from c2cgeoform.views.abstract_views import ListField
32
+ from c2cgeoform.views.abstract_views import (
33
+ DeleteResponse,
34
+ GridResponse,
35
+ IndexResponse,
36
+ ListField,
37
+ ObjectResponse,
38
+ SaveResponse,
39
+ )
33
40
  from pyramid.view import view_config, view_defaults
34
41
 
35
42
  from c2cgeoportal_admin.views.logged_views import LoggedViews
@@ -41,7 +48,7 @@ base_schema = GeoFormSchemaNode(Interface)
41
48
 
42
49
 
43
50
  @view_defaults(match_param="table=interfaces")
44
- class InterfacesViews(LoggedViews):
51
+ class InterfacesViews(LoggedViews[Interface]):
45
52
  """The interface administration view."""
46
53
 
47
54
  _list_fields = [
@@ -60,28 +67,28 @@ class InterfacesViews(LoggedViews):
60
67
  _model = Interface
61
68
  _base_schema = base_schema
62
69
 
63
- @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")
64
- def index(self):
70
+ @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2") # type: ignore[misc]
71
+ def index(self) -> IndexResponse:
65
72
  return super().index()
66
73
 
67
- @view_config(route_name="c2cgeoform_grid", renderer="fast_json")
68
- def grid(self):
74
+ @view_config(route_name="c2cgeoform_grid", renderer="fast_json") # type: ignore[misc]
75
+ def grid(self) -> GridResponse:
69
76
  return super().grid()
70
77
 
71
- @view_config(route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2")
72
- def view(self):
78
+ @view_config(route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2") # type: ignore[misc]
79
+ def view(self) -> ObjectResponse:
73
80
  return super().edit()
74
81
 
75
- @view_config(route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2")
76
- def save(self):
82
+ @view_config(route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2") # type: ignore[misc]
83
+ def save(self) -> SaveResponse:
77
84
  return super().save()
78
85
 
79
- @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")
80
- def delete(self):
86
+ @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json") # type: ignore[misc]
87
+ def delete(self) -> DeleteResponse:
81
88
  return super().delete()
82
89
 
83
- @view_config(
90
+ @view_config( # type: ignore[misc]
84
91
  route_name="c2cgeoform_item_duplicate", request_method="GET", renderer="../templates/edit.jinja2"
85
92
  )
86
- def duplicate(self):
93
+ def duplicate(self) -> ObjectResponse:
87
94
  return super().duplicate()
@@ -1,4 +1,4 @@
1
- # Copyright (c) 2017-2023, Camptocamp SA
1
+ # Copyright (c) 2017-2024, Camptocamp SA
2
2
  # All rights reserved.
3
3
 
4
4
  # Redistribution and use in source and binary forms, with or without
@@ -27,11 +27,18 @@
27
27
 
28
28
 
29
29
  from functools import partial
30
- from typing import Optional
31
30
 
32
31
  import sqlalchemy
32
+ import sqlalchemy.orm.query
33
33
  from c2cgeoform.schema import GeoFormSchemaNode
34
- from c2cgeoform.views.abstract_views import ListField
34
+ from c2cgeoform.views.abstract_views import (
35
+ DeleteResponse,
36
+ GridResponse,
37
+ IndexResponse,
38
+ ListField,
39
+ ObjectResponse,
40
+ SaveResponse,
41
+ )
35
42
  from deform.widget import FormWidget
36
43
  from pyramid.view import view_config, view_defaults
37
44
 
@@ -47,44 +54,50 @@ base_schema = GeoFormSchemaNode(LayerGroup, widget=FormWidget(fields_template="l
47
54
  base_schema.add(children_schema_node())
48
55
  base_schema.add(metadata_schema_node(LayerGroup.metadatas, LayerGroup))
49
56
  base_schema.add_unique_validator(LayerGroup.name, LayerGroup.id)
50
- base_schema.add(parent_id_node(TreeGroup)) # type: ignore
57
+ base_schema.add(parent_id_node(TreeGroup))
51
58
 
52
59
 
53
60
  @view_defaults(match_param="table=layer_groups")
54
- class LayerGroupsViews(TreeItemViews):
61
+ class LayerGroupsViews(TreeItemViews[LayerGroup]):
55
62
  """The layer group administration view."""
56
63
 
57
- _list_fields = TreeItemViews._list_fields + TreeItemViews._extra_list_fields
64
+ _list_fields = TreeItemViews._list_fields + TreeItemViews._extra_list_fields # type: ignore[misc] # pylint: disable=protected-access
58
65
 
59
66
  _id_field = "id"
60
67
  _model = LayerGroup
61
68
  _base_schema = base_schema
62
69
 
63
- def _base_query(self, query: Optional[sqlalchemy.orm.query.Query] = None) -> sqlalchemy.orm.query.Query:
64
- return super()._base_query(self._request.dbsession.query(LayerGroup).distinct())
70
+ def _base_query(self) -> sqlalchemy.orm.query.Query[LayerGroup]:
71
+ return super()._sub_query(self._request.dbsession.query(LayerGroup).distinct())
65
72
 
66
- @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")
67
- def index(self):
73
+ def _sub_query(
74
+ self, query: sqlalchemy.orm.query.Query[LayerGroup]
75
+ ) -> sqlalchemy.orm.query.Query[LayerGroup]:
76
+ del query
77
+ return self._base_query()
78
+
79
+ @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2") # type: ignore[misc]
80
+ def index(self) -> IndexResponse:
68
81
  return super().index()
69
82
 
70
- @view_config(route_name="c2cgeoform_grid", renderer="fast_json")
71
- def grid(self):
83
+ @view_config(route_name="c2cgeoform_grid", renderer="fast_json") # type: ignore[misc]
84
+ def grid(self) -> GridResponse:
72
85
  return super().grid()
73
86
 
74
- @view_config(route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2")
75
- def view(self):
87
+ @view_config(route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2") # type: ignore[misc]
88
+ def view(self) -> ObjectResponse:
76
89
  return super().edit()
77
90
 
78
- @view_config(route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2")
79
- def save(self):
91
+ @view_config(route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2") # type: ignore[misc]
92
+ def save(self) -> SaveResponse:
80
93
  return super().save()
81
94
 
82
- @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")
83
- def delete(self):
95
+ @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json") # type: ignore[misc]
96
+ def delete(self) -> DeleteResponse:
84
97
  return super().delete()
85
98
 
86
- @view_config(
99
+ @view_config( # type: ignore[misc]
87
100
  route_name="c2cgeoform_item_duplicate", request_method="GET", renderer="../templates/edit.jinja2"
88
101
  )
89
- def duplicate(self):
102
+ def duplicate(self) -> ObjectResponse:
90
103
  return super().duplicate()
@@ -1,4 +1,4 @@
1
- # Copyright (c) 2017-2021, Camptocamp SA
1
+ # Copyright (c) 2017-2024, Camptocamp SA
2
2
  # All rights reserved.
3
3
 
4
4
  # Redistribution and use in source and binary forms, with or without
@@ -27,9 +27,10 @@
27
27
 
28
28
 
29
29
  from functools import partial
30
- from typing import cast
30
+ from typing import Generic, TypeVar, cast
31
31
 
32
32
  import sqlalchemy
33
+ import sqlalchemy.orm.query
33
34
  from c2cgeoform.views.abstract_views import ListField
34
35
  from sqlalchemy.orm import subqueryload
35
36
 
@@ -38,11 +39,13 @@ from c2cgeoportal_commons.models.main import Interface, Layer
38
39
 
39
40
  _list_field = partial(ListField, Layer)
40
41
 
42
+ _T = TypeVar("_T", bound=Layer)
41
43
 
42
- class LayerViews(TreeItemViews):
44
+
45
+ class LayerViews(TreeItemViews[_T], Generic[_T]):
43
46
  """The layer administration view."""
44
47
 
45
- _list_fields = TreeItemViews._list_fields + [
48
+ _list_fields = TreeItemViews._list_fields + [ # type: ignore[misc] # pylint: disable=protected-access
46
49
  _list_field("public"),
47
50
  _list_field("geo_table"),
48
51
  _list_field("exclude_properties"),
@@ -63,11 +66,11 @@ class LayerViews(TreeItemViews):
63
66
  [r.name or "" for r in sorted(layer_wms.restrictionareas, key=lambda r: cast(str, r.name))]
64
67
  ),
65
68
  ),
66
- ] + TreeItemViews._extra_list_fields
69
+ ] + TreeItemViews._extra_list_fields # pylint: disable=protected-access
67
70
 
68
- def _base_query(self, query: sqlalchemy.orm.query.Query) -> sqlalchemy.orm.query.Query:
69
- return super()._base_query(
71
+ def _sub_query(self, query: sqlalchemy.orm.query.Query[Layer]) -> sqlalchemy.orm.query.Query[Layer]:
72
+ return super()._sub_query(
70
73
  query.outerjoin(Layer.interfaces)
71
- .options(subqueryload("interfaces"))
72
- .options(subqueryload("restrictionareas"))
74
+ .options(subqueryload(Layer.interfaces))
75
+ .options(subqueryload(Layer.restrictionareas))
73
76
  )
@@ -0,0 +1,135 @@
1
+ # Copyright (c) 2017-2024, Camptocamp SA
2
+ # All rights reserved.
3
+
4
+ # Redistribution and use in source and binary forms, with or without
5
+ # modification, are permitted provided that the following conditions are met:
6
+
7
+ # 1. Redistributions of source code must retain the above copyright notice, this
8
+ # list of conditions and the following disclaimer.
9
+ # 2. Redistributions in binary form must reproduce the above copyright notice,
10
+ # this list of conditions and the following disclaimer in the documentation
11
+ # and/or other materials provided with the distribution.
12
+
13
+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
14
+ # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15
+ # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16
+ # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
17
+ # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18
+ # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19
+ # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
20
+ # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21
+ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22
+ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23
+
24
+ # The views and conclusions contained in the software and documentation are those
25
+ # of the authors and should not be interpreted as representing official policies,
26
+ # either expressed or implied, of the FreeBSD Project.
27
+
28
+
29
+ from functools import partial
30
+ from typing import cast
31
+
32
+ import sqlalchemy
33
+ import sqlalchemy.orm.query
34
+ from c2cgeoform.schema import GeoFormSchemaNode
35
+ from c2cgeoform.views.abstract_views import (
36
+ DeleteResponse,
37
+ GridResponse,
38
+ IndexResponse,
39
+ ListField,
40
+ ObjectResponse,
41
+ SaveResponse,
42
+ )
43
+ from deform.widget import FormWidget
44
+ from pyramid.httpexceptions import HTTPNotFound
45
+ from pyramid.view import view_config, view_defaults
46
+
47
+ from c2cgeoportal_admin import _
48
+ from c2cgeoportal_admin.schemas.interfaces import interfaces_schema_node
49
+ from c2cgeoportal_admin.schemas.metadata import metadata_schema_node
50
+ from c2cgeoportal_admin.schemas.restriction_areas import restrictionareas_schema_node
51
+ from c2cgeoportal_admin.schemas.treeitem import parent_id_node
52
+ from c2cgeoportal_admin.views.layers import LayerViews
53
+ from c2cgeoportal_commons.lib.literal import Literal
54
+ from c2cgeoportal_commons.models.main import LayerCOG, LayerGroup
55
+
56
+ _list_field = partial(ListField, LayerCOG)
57
+
58
+
59
+ base_schema = GeoFormSchemaNode(LayerCOG, widget=FormWidget(fields_template="layer_fields"))
60
+ base_schema.add(metadata_schema_node(LayerCOG.metadatas, LayerCOG))
61
+ base_schema.add(interfaces_schema_node(LayerCOG.interfaces))
62
+ base_schema.add(restrictionareas_schema_node(LayerCOG.restrictionareas))
63
+ base_schema.add_unique_validator(LayerCOG.name, LayerCOG.id)
64
+ base_schema.add(parent_id_node(LayerGroup))
65
+
66
+
67
+ @view_defaults(match_param="table=layers_cog")
68
+ class LayerCOGViews(LayerViews[LayerCOG]):
69
+ """The vector tiles administration view."""
70
+
71
+ _list_fields = (
72
+ LayerViews._list_fields # typer: ignore[misc] # pylint: disable=protected-access
73
+ + [_list_field("url")]
74
+ + LayerViews._extra_list_fields # pylint: disable=protected-access
75
+ )
76
+
77
+ _id_field = "id"
78
+ _model = LayerCOG
79
+ _base_schema = base_schema
80
+
81
+ def _base_query(self) -> sqlalchemy.orm.query.Query[LayerCOG]:
82
+ return super()._sub_query(self._request.dbsession.query(LayerCOG).distinct())
83
+
84
+ def _sub_query(
85
+ self, query: sqlalchemy.orm.query.Query[LayerCOG] | None
86
+ ) -> sqlalchemy.orm.query.Query[LayerCOG]:
87
+ del query
88
+ return self._base_query()
89
+
90
+ @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2") # type: ignore[misc]
91
+ def index(self) -> IndexResponse:
92
+ return super().index()
93
+
94
+ @view_config(route_name="c2cgeoform_grid", renderer="fast_json") # type: ignore[misc]
95
+ def grid(self) -> GridResponse:
96
+ return super().grid()
97
+
98
+ def schema(self) -> GeoFormSchemaNode:
99
+ try:
100
+ obj = self._get_object()
101
+ except HTTPNotFound:
102
+ obj = None
103
+
104
+ schema = cast(GeoFormSchemaNode, self._base_schema.clone())
105
+ if obj is not None:
106
+ schema["url"].description = Literal(
107
+ _("{}<br>Current runtime value is: {}").format(
108
+ schema["url"].description,
109
+ obj.url_description(self._request),
110
+ )
111
+ )
112
+ return schema
113
+
114
+ @view_config(route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2") # type: ignore[misc]
115
+ def view(self) -> ObjectResponse:
116
+ if self._is_new():
117
+ dbsession = self._request.dbsession
118
+ default_cog = LayerCOG.get_default(dbsession)
119
+ if default_cog:
120
+ return self.copy(default_cog, excludes=["name", "url"])
121
+ return super().edit()
122
+
123
+ @view_config(route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2") # type: ignore[misc]
124
+ def save(self) -> SaveResponse:
125
+ return super().save()
126
+
127
+ @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json") # type: ignore[misc]
128
+ def delete(self) -> DeleteResponse:
129
+ return super().delete()
130
+
131
+ @view_config( # type: ignore[misc]
132
+ route_name="c2cgeoform_item_duplicate", request_method="GET", renderer="../templates/edit.jinja2"
133
+ )
134
+ def duplicate(self) -> ObjectResponse:
135
+ return super().duplicate()
@@ -1,4 +1,4 @@
1
- # Copyright (c) 2017-2021, Camptocamp SA
1
+ # Copyright (c) 2017-2024, Camptocamp SA
2
2
  # All rights reserved.
3
3
 
4
4
  # Redistribution and use in source and binary forms, with or without
@@ -27,11 +27,19 @@
27
27
 
28
28
 
29
29
  from functools import partial
30
- from typing import Optional
30
+ from typing import cast
31
31
 
32
32
  import sqlalchemy
33
+ import sqlalchemy.orm.query
33
34
  from c2cgeoform.schema import GeoFormSchemaNode
34
- from c2cgeoform.views.abstract_views import ListField
35
+ from c2cgeoform.views.abstract_views import (
36
+ DeleteResponse,
37
+ GridResponse,
38
+ IndexResponse,
39
+ ListField,
40
+ ObjectResponse,
41
+ SaveResponse,
42
+ )
35
43
  from deform.widget import FormWidget
36
44
  from pyramid.httpexceptions import HTTPNotFound
37
45
  from pyramid.view import view_config, view_defaults
@@ -53,32 +61,38 @@ base_schema.add(metadata_schema_node(LayerVectorTiles.metadatas, LayerVectorTile
53
61
  base_schema.add(interfaces_schema_node(LayerVectorTiles.interfaces))
54
62
  base_schema.add(restrictionareas_schema_node(LayerVectorTiles.restrictionareas))
55
63
  base_schema.add_unique_validator(LayerVectorTiles.name, LayerVectorTiles.id)
56
- base_schema.add(parent_id_node(LayerGroup)) # type: ignore
64
+ base_schema.add(parent_id_node(LayerGroup))
57
65
 
58
66
 
59
67
  @view_defaults(match_param="table=layers_vectortiles")
60
- class LayerVectorTilesViews(DimensionLayerViews):
68
+ class LayerVectorTilesViews(DimensionLayerViews[LayerVectorTiles]):
61
69
  """The vector tiles administration view."""
62
70
 
63
71
  _list_fields = (
64
- DimensionLayerViews._list_fields
72
+ DimensionLayerViews._list_fields # typer: ignore[misc] # pylint: disable=protected-access
65
73
  + [_list_field("style"), _list_field("xyz")]
66
- + DimensionLayerViews._extra_list_fields
74
+ + DimensionLayerViews._extra_list_fields # pylint: disable=protected-access
67
75
  )
76
+
68
77
  _id_field = "id"
69
78
  _model = LayerVectorTiles
70
79
  _base_schema = base_schema
71
80
 
72
- def _base_query(self, query: Optional[sqlalchemy.orm.query.Query] = None) -> sqlalchemy.orm.query.Query:
81
+ def _base_query(self) -> sqlalchemy.orm.query.Query[LayerVectorTiles]:
82
+ return super()._sub_query(self._request.dbsession.query(LayerVectorTiles).distinct())
83
+
84
+ def _sub_query(
85
+ self, query: sqlalchemy.orm.query.Query[LayerVectorTiles] | None
86
+ ) -> sqlalchemy.orm.query.Query[LayerVectorTiles]:
73
87
  del query
74
- return super()._base_query(self._request.dbsession.query(LayerVectorTiles).distinct())
88
+ return self._base_query()
75
89
 
76
- @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")
77
- def index(self):
90
+ @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2") # type: ignore[misc]
91
+ def index(self) -> IndexResponse:
78
92
  return super().index()
79
93
 
80
- @view_config(route_name="c2cgeoform_grid", renderer="fast_json")
81
- def grid(self):
94
+ @view_config(route_name="c2cgeoform_grid", renderer="fast_json") # type: ignore[misc]
95
+ def grid(self) -> GridResponse:
82
96
  return super().grid()
83
97
 
84
98
  def schema(self) -> GeoFormSchemaNode:
@@ -87,29 +101,30 @@ class LayerVectorTilesViews(DimensionLayerViews):
87
101
  except HTTPNotFound:
88
102
  obj = None
89
103
 
90
- schema = self._base_schema.clone()
91
- schema["style"].description = Literal(
92
- _("{}<br>Current runtime value is: {}").format(
93
- schema["style"].description,
94
- obj.style_description(self._request),
104
+ schema = cast(GeoFormSchemaNode, self._base_schema.clone())
105
+ if obj is not None:
106
+ schema["style"].description = Literal(
107
+ _("{}<br>Current runtime value is: {}").format(
108
+ schema["style"].description,
109
+ obj.style_description(self._request),
110
+ )
95
111
  )
96
- )
97
112
  return schema
98
113
 
99
- @view_config(route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2")
100
- def view(self):
114
+ @view_config(route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2") # type: ignore[misc]
115
+ def view(self) -> ObjectResponse:
101
116
  return super().edit(self.schema())
102
117
 
103
- @view_config(route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2")
104
- def save(self):
118
+ @view_config(route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2") # type: ignore[misc]
119
+ def save(self) -> SaveResponse:
105
120
  return super().save()
106
121
 
107
- @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")
108
- def delete(self):
122
+ @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json") # type: ignore[misc]
123
+ def delete(self) -> DeleteResponse:
109
124
  return super().delete()
110
125
 
111
- @view_config(
126
+ @view_config( # type: ignore[misc]
112
127
  route_name="c2cgeoform_item_duplicate", request_method="GET", renderer="../templates/edit.jinja2"
113
128
  )
114
- def duplicate(self):
129
+ def duplicate(self) -> ObjectResponse:
115
130
  return super().duplicate()