c2cgeoportal-admin 2.6.0__py3-none-any.whl → 2.9rc45__py3-none-any.whl

c2cgeoportal_admin/views/logged_views.py

@@ -0,0 +1,83 @@
+# Copyright (c) 2023-2024, Camptocamp SA
+# All rights reserved.
+
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# The views and conclusions contained in the software and documentation are those
+# of the authors and should not be interpreted as representing official policies,
+# either expressed or implied, of the FreeBSD Project.
+
+import datetime
+from typing import Generic, TypeVar
+
+from c2cgeoform.views.abstract_views import AbstractViews, DeleteResponse, SaveResponse
+from pyramid.httpexceptions import HTTPFound
+
+from c2cgeoportal_commons.models import Base
+from c2cgeoportal_commons.models.main import Log, LogAction
+
+_T = TypeVar("_T", bound=Log)
+
+
+class LoggedViews(AbstractViews[_T], Generic[_T]):
+    """Extension of AbstractViews which log actions in a table."""
+
+    _log_model = Log  # main.Log or static.Log
+    _name_field = "name"
+
+    def save(self) -> SaveResponse:
+        response = super().save()
+        if isinstance(response, HTTPFound):
+            self._create_log(
+                action=LogAction.INSERT if self._is_new() else LogAction.UPDATE,
+                obj=self._obj,
+            )
+
+        return response
+
+    def delete(self) -> DeleteResponse:
+        obj = self._get_object()
+
+        response = super().delete()
+
+        self._create_log(LogAction.DELETE, obj)
+
+        return response
+
+    def _create_log(
+        self,
+        action: LogAction,
+        obj: Base,  # type: ignore[valid-type]
+        element_url_table: str | None = None,
+    ) -> None:
+        assert self._model is not None
+        assert self._name_field is not None
+        assert self._id_field is not None
+        log = self._log_model(
+            date=datetime.datetime.now(datetime.timezone.utc),
+            action=action,
+            element_type=self._model.__tablename__,
+            element_id=getattr(obj, self._id_field),
+            element_name=getattr(obj, self._name_field),
+            element_url_table=element_url_table or self._request.matchdict.get("table", None),
+            username=self._request.user.username,
+        )
+        self._request.dbsession.add(log)

c2cgeoportal_admin/views/logs.py

@@ -0,0 +1,91 @@
+# Copyright (c) 2023-2024, Camptocamp SA
+# All rights reserved.
+
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# The views and conclusions contained in the software and documentation are those
+# of the authors and should not be interpreted as representing official policies,
+# either expressed or implied, of the FreeBSD Project.
+
+from functools import partial
+
+from c2cgeoform import JSONDict
+from c2cgeoform.views.abstract_views import AbstractViews, GridResponse, IndexResponse, ItemAction, ListField
+from pyramid.view import view_config, view_defaults
+
+from c2cgeoportal_commons.models import _
+from c2cgeoportal_commons.models.main import AbstractLog
+
+_list_field = partial(ListField, AbstractLog)
+
+
+@view_defaults(match_param="table=logs")
+class LogViews(AbstractViews[AbstractLog]):
+    """The theme administration view."""
+
+    # We pass labels explicitly because actually we are not able to get info
+    # from InstrumentedAttribute created from AbstractConcreteBase.
+    _list_fields = [
+        _list_field("id"),
+        _list_field("date", label=_("Date")),
+        _list_field("username", label=_("Username")),
+        _list_field("action", label=_("Action"), renderer=lambda log: log.action.name),
+        _list_field("element_type", label=_("Element type")),
+        _list_field("element_id", label=_("Element identifier")),
+        _list_field("element_name", label=_("Element name")),
+    ]
+    _list_ordered_fields = [AbstractLog.date.desc()]
+
+    _id_field = "id"
+    _model = AbstractLog
+
+    @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")  # type: ignore[misc]
+    def index(self) -> IndexResponse:
+        return super().index()
+
+    @view_config(route_name="c2cgeoform_grid", renderer="fast_json")  # type: ignore[misc]
+    def grid(self) -> GridResponse:
+        return super().grid()
+
+    def _grid_actions(self):
+        return []
+
+    def _grid_item_actions(self, item: AbstractLog) -> JSONDict:
+        element_url = self._request.route_url(
+            "c2cgeoform_item",
+            table=item.element_url_table,
+            id=item.element_id,
+        )
+
+        return {
+            "dblclick": element_url,
+            "dropdown": [
+                ItemAction(
+                    name="edit_element",
+                    label=_("Edit element"),
+                    icon="glyphicon glyphicon-pencil",
+                    url=element_url,
+                ).to_dict(self._request)
+            ],
+        }
+
+    def _item_actions(self, item, readonly=False):
+        return []

c2cgeoportal_admin/views/oauth2_clients.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2021, Camptocamp SA
+# Copyright (c) 2021-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -31,10 +29,18 @@
 from functools import partial
 
 from c2cgeoform.schema import GeoFormSchemaNode
-from c2cgeoform.views.abstract_views import AbstractViews, ListField
+from c2cgeoform.views.abstract_views import (
+    DeleteResponse,
+    GridResponse,
+    IndexResponse,
+    ListField,
+    ObjectResponse,
+    SaveResponse,
+)
 from pyramid.view import view_config, view_defaults
 
-from c2cgeoportal_commons.models.static import OAuth2Client
+from c2cgeoportal_admin.views.logged_views import LoggedViews
+from c2cgeoportal_commons.models.static import Log, OAuth2Client
 
 _list_field = partial(ListField, OAuth2Client)
 
@@ -43,7 +49,9 @@ base_schema.add_unique_validator(OAuth2Client.client_id, OAuth2Client.id)
 
 
 @view_defaults(match_param="table=oauth2_clients")
-class OAuth2ClientViews(AbstractViews):
+class OAuth2ClientViews(LoggedViews[OAuth2Client]):
+    """The oAuth2 client administration view."""
+
     _list_fields = [
         _list_field("id"),
         _list_field("client_id"),
@@ -53,32 +61,36 @@ class OAuth2ClientViews(AbstractViews):
     _id_field = "id"
     _model = OAuth2Client
     _base_schema = base_schema
+    _log_model = Log
+    _name_field = "client_id"
 
     def _base_query(self):
         return self._request.dbsession.query(OAuth2Client)
 
-    @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")
-    def index(self):
+    @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")  # type: ignore[misc]
+    def index(self) -> IndexResponse:
         return super().index()
 
-    @view_config(route_name="c2cgeoform_grid", renderer="fast_json")
-    def grid(self):
+    @view_config(route_name="c2cgeoform_grid", renderer="fast_json")  # type: ignore[misc]
+    def grid(self) -> GridResponse:
         return super().grid()
 
-    @view_config(route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2")
-    def view(self):
+    @view_config(  # type: ignore[misc]
+        route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2"
+    )
+    def view(self) -> ObjectResponse:
         return super().edit()
 
-    @view_config(route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2")
-    def save(self):
+    @view_config(route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2")  # type: ignore[misc]
+    def save(self) -> SaveResponse:
         return super().save()
 
-    @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")
-    def delete(self):
+    @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")  # type: ignore[misc]
+    def delete(self) -> DeleteResponse:
         return super().delete()
 
-    @view_config(
+    @view_config(  # type: ignore[misc]
         route_name="c2cgeoform_item_duplicate", request_method="GET", renderer="../templates/edit.jinja2"
     )
-    def duplicate(self):
+    def duplicate(self) -> ObjectResponse:
         return super().duplicate()

c2cgeoportal_admin/views/ogc_servers.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2017-2021, Camptocamp SA
+# Copyright (c) 2017-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -28,27 +26,49 @@
 # either expressed or implied, of the FreeBSD Project.
 
 
+import logging
+import threading
 from functools import partial
+from typing import Any, cast
 
+import requests
+from c2cgeoform import JSONDict
 from c2cgeoform.schema import GeoFormSchemaNode
-from c2cgeoform.views.abstract_views import AbstractViews, ItemAction, ListField, UserMessage
+from c2cgeoform.views.abstract_views import (
+    AbstractViews,
+    DeleteResponse,
+    GridResponse,
+    IndexResponse,
+    ItemAction,
+    ListField,
+    ObjectResponse,
+    SaveResponse,
+    UserMessage,
+)
 from deform.widget import FormWidget
-from pyramid.httpexceptions import HTTPNotFound
+from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config, view_defaults
 from sqlalchemy import inspect
 
 from c2cgeoportal_admin import _
 from c2cgeoportal_admin.lib.ogcserver_synchronizer import OGCServerSynchronizer
-from c2cgeoportal_commons.models.main import OGCServer
+from c2cgeoportal_admin.views.logged_views import LoggedViews
+from c2cgeoportal_commons.lib.literal import Literal
+from c2cgeoportal_commons.models import cache_invalidate_cb
+from c2cgeoportal_commons.models.main import LogAction, OGCServer
 
 _list_field = partial(ListField, OGCServer)
 
 base_schema = GeoFormSchemaNode(OGCServer, widget=FormWidget(fields_template="ogcserver_fields"))
 base_schema.add_unique_validator(OGCServer.name, OGCServer.id)
 
+_LOG = logging.getLogger(__name__)
+
 
 @view_defaults(match_param="table=ogc_servers")
-class OGCServerViews(AbstractViews):
+class OGCServerViews(LoggedViews[OGCServer]):
+    """The OGC server administration view."""
+
     _list_fields = [
         _list_field("id"),
         _list_field("name"),
@@ -73,28 +93,51 @@ class OGCServerViews(AbstractViews):
         ),
     }
 
-    @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")
-    def index(self):
+    @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")  # type: ignore[misc]
+    def index(self) -> IndexResponse:
         return super().index()
 
-    @view_config(route_name="c2cgeoform_grid", renderer="fast_json")
-    def grid(self):
+    @view_config(route_name="c2cgeoform_grid", renderer="fast_json")  # type: ignore[misc]
+    def grid(self) -> GridResponse:
         return super().grid()
 
-    def schema(self):
-        try:
-            obj = self._get_object()
-        except HTTPNotFound:
-            obj = None
+    def schema(self) -> GeoFormSchemaNode:
+        obj = self._get_object()
 
-        schema = self._base_schema.clone()
-        schema["url"].description = obj.url_description(self._request)
-        schema["url_wfs"].description = obj.url_wfs_description(self._request)
+        schema = cast(GeoFormSchemaNode, self._base_schema.clone())
+        schema["url"].description = Literal(
+            _("{}<br>Current runtime value is: {}").format(
+                schema["url"].description,
+                obj.url_description(self._request),
+            )
+        )
+        schema["url_wfs"].description = Literal(
+            _("{}<br>Current runtime value is: {}").format(
+                schema["url_wfs"].description,
+                obj.url_wfs_description(self._request),
+            )
+        )
         return schema
 
-    def _item_actions(self, item, readonly=False):
-        actions = super()._item_actions(item, readonly)
-        if inspect(item).persistent:
+    def _item_actions(self, item: OGCServer, readonly: bool = False) -> list[Any]:
+        actions = cast(list[Any], super()._item_actions(item, readonly))
+        if inspect(item).persistent:  # type: ignore[attr-defined]
+            actions.insert(
+                next((i for i, v in enumerate(actions) if v.name() == "delete")),
+                ItemAction(
+                    name="clear-cache",
+                    label=_("Clear the cache"),
+                    icon="glyphicon glyphicon-hdd",
+                    url=self._request.route_url(
+                        "ogc_server_clear_cache",
+                        id=getattr(item, self._id_field),
+                        _query={
+                            "came_from": self._request.current_route_url(),
+                        },
+                    ),
+                    confirmation=_("The current changes will be lost."),
+                ),
+            )
             actions.insert(
                 next((i for i, v in enumerate(actions) if v.name() == "delete")),
                 ItemAction(
@@ -106,16 +149,24 @@ class OGCServerViews(AbstractViews):
             )
         return actions
 
-    @view_config(route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2")
-    def view(self):
+    @view_config(  # type: ignore[misc]
+        route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2"
+    )
+    def view(self) -> ObjectResponse:
         return super().edit(self.schema())
 
-    @view_config(route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2")
-    def save(self):
-        return super().save()
+    @view_config(  # type: ignore[misc]
+        route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2"
+    )
+    def save(self) -> SaveResponse:
+        result = super().save()
+        if isinstance(result, HTTPFound):
+            assert self._obj is not None
+            self._update_cache(self._obj)
+        return result
 
-    @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")
-    def delete(self):
+    @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")  # type: ignore[misc]
+    def delete(self) -> DeleteResponse:
         obj = self._get_object()
         if len(obj.layers) > 0:
             return {
@@ -127,16 +178,20 @@ class OGCServerViews(AbstractViews):
                     _query=[("msg_col", "cannot_delete")],
                 ),
             }
-        return super().delete()
+        result = super().delete()
+        cache_invalidate_cb()
+        return result
 
-    @view_config(
+    @view_config(  # type: ignore[misc]
         route_name="c2cgeoform_item_duplicate", request_method="GET", renderer="../templates/edit.jinja2"
     )
-    def duplicate(self):
+    def duplicate(self) -> ObjectResponse:
         return super().duplicate()
 
-    @view_config(route_name="ogcserver_synchronize", renderer="../templates/ogcserver_synchronize.jinja2")
-    def synchronize(self):
+    @view_config(  # type: ignore[misc]
+        route_name="ogcserver_synchronize", renderer="../templates/ogcserver_synchronize.jinja2"
+    )
+    def synchronize(self) -> JSONDict:
         obj = self._get_object()
 
         if self._request.method == "GET":
@@ -147,17 +202,58 @@ class OGCServerViews(AbstractViews):
             }
 
         if self._request.method == "POST":
-            synchronizer = OGCServerSynchronizer(self._request, obj)
+            force_parents = self._request.POST.get("force-parents", "false") == "on"
+            force_ordering = self._request.POST.get("force-ordering", "false") == "on"
+            clean = self._request.POST.get("clean", "false") == "on"
+
+            synchronizer = OGCServerSynchronizer(
+                self._request,
+                obj,
+                force_parents=force_parents,
+                force_ordering=force_ordering,
+                clean=clean,
+            )
+
+            ogc_server_id = obj.id
             if "check" in self._request.params:
                 synchronizer.check_layers()
+
             elif "dry-run" in self._request.params:
                 synchronizer.synchronize(dry_run=True)
+
             elif "synchronize" in self._request.params:
                 synchronizer.synchronize()
+
+                self._create_log(LogAction.SYNCHRONIZE, obj)
+
             return {
-                "ogcserver": obj,
+                "ogcserver": self._request.dbsession.query(OGCServer).get(ogc_server_id),
                 "success": True,
                 "report": synchronizer.report(),
             }
 
+        self._update_cache(obj)
+
         return {}
+
+    def _update_cache(self, ogc_server: OGCServer) -> None:
+        try:
+            ogc_server_id = ogc_server.id
+
+            def update_cache() -> None:
+                response = requests.get(
+                    self._request.route_url(
+                        "ogc_server_clear_cache",
+                        id=ogc_server_id,
+                        _query={
+                            "came_from": self._request.current_route_url(),
+                        },
+                    ),
+                    timeout=60,
+                )
+                if not response.ok:
+                    _LOG.error("Error while cleaning the OGC server cache:\n%s", response.text)
+
+            threading.Thread(target=update_cache).start()
+        except Exception:  # pylint: disable=broad-exception-caught
+            _LOG.error("Error on cleaning the OGC server cache", exc_info=True)

c2cgeoportal_admin/views/restriction_areas.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2017-2020, Camptocamp SA
+# Copyright (c) 2017-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -31,33 +29,42 @@
 from functools import partial
 
 import colander
+import sqlalchemy.orm.query
 from c2cgeoform.schema import GeoFormManyToManySchemaNode, GeoFormSchemaNode
-from c2cgeoform.views.abstract_views import AbstractViews, ListField
+from c2cgeoform.views.abstract_views import (
+    DeleteResponse,
+    GridResponse,
+    IndexResponse,
+    ListField,
+    ObjectResponse,
+    SaveResponse,
+)
 from deform.widget import FormWidget
 from pyramid.view import view_config, view_defaults
 from sqlalchemy.orm import subqueryload
 
-from c2cgeoportal_admin import _
 from c2cgeoportal_admin.schemas.roles import roles_schema_node
 from c2cgeoportal_admin.schemas.treegroup import treeitem_edit_url
+from c2cgeoportal_admin.views.logged_views import LoggedViews
 from c2cgeoportal_admin.widgets import ChildrenWidget, ChildWidget
 from c2cgeoportal_commons.models.main import Layer, RestrictionArea
 
 _list_field = partial(ListField, RestrictionArea)
 
 base_schema = GeoFormSchemaNode(RestrictionArea, widget=FormWidget(fields_template="restriction_area_fields"))
-base_schema.add_before("area", roles_schema_node("roles"))
+base_schema.add_before("area", roles_schema_node(RestrictionArea.roles))
 base_schema.add_unique_validator(RestrictionArea.name, RestrictionArea.id)
 
 
 def layers(node, kw):  # pylint: disable=unused-argument
+    """Get the layers serializable representation."""
     dbsession = kw["request"].dbsession
     query = dbsession.query(Layer).order_by(Layer.name)
     return [
         {
             "id": layer.id,
             "label": layer.name,
-            "icon_class": "icon-{}".format(layer.item_type),
+            "icon_class": f"icon-{layer.item_type}",
             "edit_url": treeitem_edit_url(kw["request"], layer),
             "group": "All",
         }
@@ -75,12 +82,13 @@ base_schema.add(
                 input_name="id",
                 model=Layer,
                 label_field="name",
-                icon_class=lambda layer: "icon-{}".format(layer.item_type),
+                icon_class=lambda layer: f"icon-{layer.item_type}",
                 edit_url=treeitem_edit_url,
             ),
         ),
         name="layers",
-        title=_("Layers"),
+        title=RestrictionArea.layers.info["colanderalchemy"]["title"],
+        description=RestrictionArea.layers.info["colanderalchemy"]["description"],
         candidates=colander.deferred(layers),
         widget=ChildrenWidget(child_input_name="id", orderable=False),
     )
@@ -88,7 +96,9 @@ base_schema.add(
 
 
 @view_defaults(match_param="table=restriction_areas")
-class RestrictionAreaViews(AbstractViews):
+class RestrictionAreaViews(LoggedViews[RestrictionArea]):
+    """The restriction area administration view."""
+
     _list_fields = [
         _list_field("id"),
         _list_field("name"),
@@ -100,7 +110,7 @@ class RestrictionAreaViews(AbstractViews):
         _list_field(
             "layers",
             renderer=lambda restriction_area: ", ".join(
-                "{}-{}".format(layer.item_type, layer.name) or "" for layer in restriction_area.layers
+                f"{layer.item_type}-{layer.name}" or "" for layer in restriction_area.layers
             ),
         ),
     ]
@@ -108,35 +118,37 @@ class RestrictionAreaViews(AbstractViews):
     _model = RestrictionArea
     _base_schema = base_schema
 
-    def _base_query(self):
+    def _base_query(self) -> sqlalchemy.orm.query.Query[RestrictionArea]:
+        session = self._request.dbsession
+        assert isinstance(session, sqlalchemy.orm.Session)
         return (
-            self._request.dbsession.query(RestrictionArea)
-            .options(subqueryload("roles"))
-            .options(subqueryload("layers"))
+            session.query(RestrictionArea)
+            .options(subqueryload(RestrictionArea.roles))
+            .options(subqueryload(RestrictionArea.layers))
         )
 
-    @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")
-    def index(self):
+    @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")  # type: ignore[misc]
+    def index(self) -> IndexResponse:
         return super().index()
 
-    @view_config(route_name="c2cgeoform_grid", renderer="fast_json")
-    def grid(self):
+    @view_config(route_name="c2cgeoform_grid", renderer="fast_json")  # type: ignore[misc]
+    def grid(self) -> GridResponse:
         return super().grid()
 
-    @view_config(route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2")
-    def view(self):
+    @view_config(route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2")  # type: ignore[misc]
+    def view(self) -> ObjectResponse:
         return super().edit()
 
-    @view_config(route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2")
-    def save(self):
+    @view_config(route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2")  # type: ignore[misc]
+    def save(self) -> SaveResponse:
         return super().save()
 
-    @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")
-    def delete(self):
+    @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")  # type: ignore[misc]
+    def delete(self) -> DeleteResponse:
         return super().delete()
 
-    @view_config(
+    @view_config(  # type: ignore[misc]
         route_name="c2cgeoform_item_duplicate", request_method="GET", renderer="../templates/edit.jinja2"
     )
-    def duplicate(self):
+    def duplicate(self) -> ObjectResponse:
         return super().duplicate()