c2cgeoportal-admin 2.5.0.100__py3-none-any.whl → 2.7.1.156__py3-none-any.whl

c2cgeoportal_admin/views/layers_wms.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2017-2020, Camptocamp SA
+# Copyright (c) 2017-2021, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -29,7 +27,9 @@
 
 
 from functools import partial
+from typing import Any, Dict, List, Optional
 
+import sqlalchemy
 from c2cgeoform.schema import GeoFormSchemaNode
 from c2cgeoform.views.abstract_views import ItemAction, ListField
 from deform.widget import FormWidget
@@ -40,7 +40,7 @@ from zope.sqlalchemy import mark_changed
 from c2cgeoportal_admin import _
 from c2cgeoportal_admin.schemas.dimensions import dimensions_schema_node
 from c2cgeoportal_admin.schemas.interfaces import interfaces_schema_node
-from c2cgeoportal_admin.schemas.metadata import metadatas_schema_node
+from c2cgeoportal_admin.schemas.metadata import metadata_schema_node
 from c2cgeoportal_admin.schemas.restriction_areas import restrictionareas_schema_node
 from c2cgeoportal_admin.schemas.treeitem import parent_id_node
 from c2cgeoportal_admin.views.dimension_layers import DimensionLayerViews
@@ -49,29 +49,33 @@ from c2cgeoportal_commons.models.main import LayerGroup, LayerWMS, LayerWMTS, OG
 _list_field = partial(ListField, LayerWMS)
 
 base_schema = GeoFormSchemaNode(LayerWMS, widget=FormWidget(fields_template="layer_fields"))
-base_schema.add(dimensions_schema_node.clone())
-base_schema.add(metadatas_schema_node.clone())
-base_schema.add(interfaces_schema_node.clone())
-base_schema.add(restrictionareas_schema_node.clone())
+base_schema.add(dimensions_schema_node(LayerWMS.dimensions))
+base_schema.add(metadata_schema_node(LayerWMS.metadatas, LayerWMS))
+base_schema.add(interfaces_schema_node(LayerWMS.interfaces))
+base_schema.add(restrictionareas_schema_node(LayerWMS.restrictionareas))
 base_schema.add_unique_validator(LayerWMS.name, LayerWMS.id)
-base_schema.add(parent_id_node(LayerGroup))
+base_schema.add(parent_id_node(LayerGroup))  # type: ignore
 
 
 @view_defaults(match_param="table=layers_wms")
 class LayerWmsViews(DimensionLayerViews):
+    """The WMS layer administration view."""
+
     _list_fields = (
         DimensionLayerViews._list_fields
         + [
-            _list_field("layer"),
-            _list_field("style"),
-            _list_field("time_mode"),
-            _list_field("time_widget"),
             _list_field(
                 "ogc_server",
                 renderer=lambda layer_wms: layer_wms.ogc_server.name,
                 sort_column=OGCServer.name,
                 filter_column=OGCServer.name,
             ),
+            _list_field("layer"),
+            _list_field("style"),
+            _list_field("valid", label="Valid"),
+            _list_field("invalid_reason", visible=False),
+            _list_field("time_mode"),
+            _list_field("time_widget"),
         ]
         + DimensionLayerViews._extra_list_fields
     )
@@ -79,20 +83,20 @@ class LayerWmsViews(DimensionLayerViews):
     _model = LayerWMS
     _base_schema = base_schema
 
-    def _base_query(self, query=None):
+    def _base_query(self, query: Optional[sqlalchemy.orm.query.Query] = None) -> sqlalchemy.orm.query.Query:
         del query
         return super()._base_query(self._request.dbsession.query(LayerWMS).distinct().outerjoin("ogc_server"))
 
-    @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")
-    def index(self):
-        return super().index()
+    @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")  # type: ignore
+    def index(self) -> Dict[str, Any]:
+        return super().index()  # type: ignore
 
-    @view_config(route_name="c2cgeoform_grid", renderer="fast_json")
-    def grid(self):
-        return super().grid()
+    @view_config(route_name="c2cgeoform_grid", renderer="fast_json")  # type: ignore
+    def grid(self) -> Dict[str, Any]:
+        return super().grid()  # type: ignore
 
-    def _item_actions(self, item, readonly=False):
-        actions = super()._item_actions(item, readonly)
+    def _item_actions(self, item: LayerWMS, readonly: bool = False) -> List[ItemAction]:
+        actions: List[ItemAction] = super()._item_actions(item, readonly)
         if inspect(item).persistent:
             actions.insert(
                 next((i for i, v in enumerate(actions) if v.name() == "delete")),
@@ -107,31 +111,35 @@ class LayerWmsViews(DimensionLayerViews):
             )
         return actions
 
-    @view_config(route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2")
-    def view(self):
+    @view_config(  # type: ignore
+        route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2"
+    )
+    def view(self) -> Dict[str, Any]:
         if self._is_new():
             dbsession = self._request.dbsession
             default_wms = LayerWMS.get_default(dbsession)
             if default_wms:
-                return self.copy(default_wms, excludes=["name", "layer"])
-        return super().edit()
+                return self.copy(default_wms, excludes=["name", "layer"])  # type: ignore
+        return super().edit()  # type: ignore
 
-    @view_config(route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2")
-    def save(self):
-        return super().save()
+    @view_config(  # type: ignore
+        route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2"
+    )
+    def save(self) -> Dict[str, Any]:
+        return super().save()  # type: ignore
 
-    @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")
-    def delete(self):
-        return super().delete()
+    @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")  # type: ignore
+    def delete(self) -> Dict[str, Any]:
+        return super().delete()  # type: ignore
 
-    @view_config(
+    @view_config(  # type: ignore
         route_name="c2cgeoform_item_duplicate", request_method="GET", renderer="../templates/edit.jinja2"
     )
-    def duplicate(self):
-        return super().duplicate()
+    def duplicate(self) -> Dict[str, Any]:
+        return super().duplicate()  # type: ignore
 
-    @view_config(route_name="convert_to_wmts", request_method="POST", renderer="fast_json")
-    def convert_to_wmts(self):
+    @view_config(route_name="convert_to_wmts", request_method="POST", renderer="fast_json")  # type: ignore
+    def convert_to_wmts(self) -> Dict[str, Any]:
         src = self._get_object()
         dbsession = self._request.dbsession
         default_wmts = LayerWMTS.get_default(dbsession)

c2cgeoportal_admin/views/layers_wmts.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2017-2020, Camptocamp SA
+# Copyright (c) 2017-2021, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -29,7 +27,9 @@
 
 
 from functools import partial
+from typing import Any, Dict, List, Optional
 
+import sqlalchemy
 from c2cgeoform.schema import GeoFormSchemaNode
 from c2cgeoform.views.abstract_views import ItemAction, ListField
 from deform.widget import FormWidget
@@ -40,7 +40,7 @@ from zope.sqlalchemy import mark_changed
 from c2cgeoportal_admin import _
 from c2cgeoportal_admin.schemas.dimensions import dimensions_schema_node
 from c2cgeoportal_admin.schemas.interfaces import interfaces_schema_node
-from c2cgeoportal_admin.schemas.metadata import metadatas_schema_node
+from c2cgeoportal_admin.schemas.metadata import metadata_schema_node
 from c2cgeoportal_admin.schemas.restriction_areas import restrictionareas_schema_node
 from c2cgeoportal_admin.schemas.treeitem import parent_id_node
 from c2cgeoportal_admin.views.dimension_layers import DimensionLayerViews
@@ -49,16 +49,18 @@ from c2cgeoportal_commons.models.main import LayerGroup, LayerWMS, LayerWMTS, OG
 _list_field = partial(ListField, LayerWMTS)
 
 base_schema = GeoFormSchemaNode(LayerWMTS, widget=FormWidget(fields_template="layer_fields"))
-base_schema.add(dimensions_schema_node.clone())
-base_schema.add(metadatas_schema_node.clone())
-base_schema.add(interfaces_schema_node.clone())
-base_schema.add(restrictionareas_schema_node.clone())
+base_schema.add(dimensions_schema_node(LayerWMTS.dimensions))
+base_schema.add(metadata_schema_node(LayerWMTS.metadatas, LayerWMTS))
+base_schema.add(interfaces_schema_node(LayerWMTS.interfaces))
+base_schema.add(restrictionareas_schema_node(LayerWMTS.restrictionareas))
 base_schema.add_unique_validator(LayerWMTS.name, LayerWMTS.id)
-base_schema.add(parent_id_node(LayerGroup))
+base_schema.add(parent_id_node(LayerGroup))  # type: ignore
 
 
 @view_defaults(match_param="table=layers_wmts")
 class LayerWmtsViews(DimensionLayerViews):
+    """The WMTS layer administration view."""
+
     _list_fields = (
         DimensionLayerViews._list_fields
         + [
@@ -74,19 +76,19 @@ class LayerWmtsViews(DimensionLayerViews):
     _model = LayerWMTS
     _base_schema = base_schema
 
-    def _base_query(self, query=None):
+    def _base_query(self, query: Optional[sqlalchemy.orm.query.Query] = None) -> sqlalchemy.orm.query.Query:
         return super()._base_query(self._request.dbsession.query(LayerWMTS).distinct())
 
-    @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")
-    def index(self):
-        return super().index()
+    @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")  # type: ignore
+    def index(self) -> Dict[str, Any]:
+        return super().index()  # type: ignore
 
-    @view_config(route_name="c2cgeoform_grid", renderer="fast_json")
-    def grid(self):
-        return super().grid()
+    @view_config(route_name="c2cgeoform_grid", renderer="fast_json")  # type: ignore
+    def grid(self) -> Dict[str, Any]:
+        return super().grid()  # type: ignore
 
-    def _item_actions(self, item, readonly=False):
-        actions = super()._item_actions(item, readonly)
+    def _item_actions(self, item: LayerWMTS, readonly: bool = False) -> List[ItemAction]:
+        actions: List[ItemAction] = super()._item_actions(item, readonly)
         if inspect(item).persistent:
             actions.insert(
                 next((i for i, v in enumerate(actions) if v.name() == "delete")),
@@ -101,31 +103,35 @@ class LayerWmtsViews(DimensionLayerViews):
             )
         return actions
 
-    @view_config(route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2")
-    def view(self):
+    @view_config(  # type: ignore
+        route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2"
+    )
+    def view(self) -> Dict[str, Any]:
         if self._is_new():
             dbsession = self._request.dbsession
             default_wmts = LayerWMTS.get_default(dbsession)
             if default_wmts:
-                return self.copy(default_wmts, excludes=["name", "layer"])
-        return super().edit()
+                return self.copy(default_wmts, excludes=["name", "layer"])  # type: ignore
+        return super().edit()  # type: ignore
 
-    @view_config(route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2")
-    def save(self):
-        return super().save()
+    @view_config(  # type: ignore
+        route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2"
+    )
+    def save(self) -> Dict[str, Any]:
+        return super().save()  # type: ignore
 
-    @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")
-    def delete(self):
-        return super().delete()
+    @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")  # type: ignore
+    def delete(self) -> Dict[str, Any]:
+        return super().delete()  # type: ignore
 
-    @view_config(
+    @view_config(  # type: ignore
         route_name="c2cgeoform_item_duplicate", request_method="GET", renderer="../templates/edit.jinja2"
     )
-    def duplicate(self):
-        return super().duplicate()
+    def duplicate(self) -> Dict[str, Any]:
+        return super().duplicate()  # type: ignore
 
-    @view_config(route_name="convert_to_wms", request_method="POST", renderer="fast_json")
-    def convert_to_wms(self):
+    @view_config(route_name="convert_to_wms", request_method="POST", renderer="fast_json")  # type: ignore
+    def convert_to_wms(self) -> Dict[str, Any]:
         src = self._get_object()
         dbsession = self._request.dbsession
         default_wms = LayerWMS.get_default(dbsession)

c2cgeoportal_admin/views/layertree.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2017-2020, Camptocamp SA
+# Copyright (c) 2017-2021, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -28,13 +26,16 @@
 # either expressed or implied, of the FreeBSD Project.
 
 
+from typing import Any, Dict, List, Optional
+
+import pyramid.request
 from c2cgeoform.views.abstract_views import ItemAction
 from pyramid.httpexceptions import HTTPNotFound
 from pyramid.view import view_config, view_defaults
 from translationstring import TranslationStringFactory
 
 from c2cgeoportal_admin import _
-from c2cgeoportal_commons.models.main import LayergroupTreeitem, Theme, TreeItem
+from c2cgeoportal_commons.models.main import Interface, Layer, LayergroupTreeitem, Theme, TreeItem
 
 itemtypes_tables = {
     "theme": "themes",
@@ -46,30 +47,37 @@ itemtypes_tables = {
 
 @view_defaults(match_param=("application=admin"))
 class LayerTreeViews:
-    def __init__(self, request):
+    """The layer tree administration view."""
+
+    def __init__(self, request: pyramid.request.Request):
         self._request = request
         self._dbsession = request.dbsession
 
-    @view_config(route_name="layertree", renderer="../templates/layertree.jinja2")
-    def index(self):
+    @view_config(route_name="layertree", renderer="../templates/layertree.jinja2")  # type: ignore
+    def index(self) -> Dict[str, int]:
         node_limit = self._request.registry.settings["admin_interface"].get("layer_tree_max_nodes")
         limit_exceeded = self._dbsession.query(LayergroupTreeitem).count() < node_limit
-        return {"limit_exceeded": limit_exceeded}
+        return {"limit_exceeded": limit_exceeded, "interfaces": self._dbsession.query(Interface).all()}
 
-    @view_config(route_name="layertree_children", renderer="fast_json")
-    def children(self):
+    @view_config(route_name="layertree_children", renderer="fast_json")  # type: ignore
+    def children(self) -> List[Dict[str, Any]]:
+        interface = self._request.params.get("interface", None)
         group_id = self._request.params.get("group_id", None)
         path = self._request.params.get("path", "")
 
-        client_tsf = TranslationStringFactory("{}-client".format(self._request.registry.package_name))
+        client_tsf = TranslationStringFactory(f"{self._request.registry.package_name}-client")
 
         if group_id is None:
             items = self._dbsession.query(Theme).order_by(Theme.ordering)
+            if interface is not None:
+                items = items.join(Theme.interfaces).filter(Interface.name == interface)
+
         else:
             items = (
                 self._dbsession.query(TreeItem)
                 .join(TreeItem.parents_relation)
                 .filter(LayergroupTreeitem.treegroup_id == group_id)
+                .order_by(LayergroupTreeitem.ordering)
             )
 
         return [
@@ -79,14 +87,17 @@ class LayerTreeViews:
                 "name": item.name,
                 "translated_name": self._request.localizer.translate(client_tsf(item.name)),
                 "description": item.description,
-                "path": "{}_{}".format(path, item.id),
+                "path": f"{path}_{item.id}",
                 "parent_path": path,
                 "actions": [action.to_dict(self._request) for action in self._item_actions(item, group_id)],
             }
             for item in items
+            if interface is None
+            or not isinstance(item, Layer)
+            or interface in [interface.name for interface in item.interfaces]
         ]
 
-    def _item_actions(self, item, parent_id=None):
+    def _item_actions(self, item: TreeItem, parent_id: Optional[int] = None) -> List[ItemAction]:
         actions = []
         actions.append(
             ItemAction(
@@ -105,9 +116,8 @@ class LayerTreeViews:
                     name="new_layer_group",
                     label=_("New layer group"),
                     icon="glyphicon glyphicon-plus",
-                    url="{}?parent_id={}".format(
-                        self._request.route_url("c2cgeoform_item", table="layer_groups", id="new"), item.id
-                    ),
+                    url=f"{self._request.route_url('c2cgeoform_item', table='layer_groups', id='new')}?"
+                    f"parent_id={item.id}",
                 )
             )
 
@@ -117,9 +127,8 @@ class LayerTreeViews:
                     name="new_layer_wms",
                     label=_("New WMS layer"),
                     icon="glyphicon glyphicon-plus",
-                    url="{}?parent_id={}".format(
-                        self._request.route_url("c2cgeoform_item", table="layers_wms", id="new"), item.id
-                    ),
+                    url=f"{self._request.route_url('c2cgeoform_item', table='layers_wms', id='new')}?"
+                    f"parent_id={item.id}",
                 )
             )
 
@@ -128,9 +137,8 @@ class LayerTreeViews:
                     name="new_layer_wmts",
                     label=_("New WMTS layer"),
                     icon="glyphicon glyphicon-plus",
-                    url="{}?parent_id={}".format(
-                        self._request.route_url("c2cgeoform_item", table="layers_wmts", id="new"), item.id
-                    ),
+                    url=f"{self._request.route_url('c2cgeoform_item', table='layers_wmts', id='new')}?"
+                    f"parent_id={item.id}",
                 )
             )
 
@@ -170,8 +178,8 @@ class LayerTreeViews:
 
         return actions
 
-    @view_config(route_name="layertree_unlink", request_method="DELETE", renderer="fast_json")
-    def unlink(self):
+    @view_config(route_name="layertree_unlink", request_method="DELETE", renderer="fast_json")  # type: ignore
+    def unlink(self) -> Dict[str, Any]:
         group_id = self._request.matchdict.get("group_id")
         item_id = self._request.matchdict.get("item_id")
         link = (
@@ -186,8 +194,8 @@ class LayerTreeViews:
         self._request.dbsession.flush()
         return {"success": True, "redirect": self._request.route_url("layertree")}
 
-    @view_config(route_name="layertree_delete", request_method="DELETE", renderer="fast_json")
-    def delete(self):
+    @view_config(route_name="layertree_delete", request_method="DELETE", renderer="fast_json")  # type: ignore
+    def delete(self) -> Dict[str, Any]:
         item_id = self._request.matchdict.get("item_id")
         item = self._request.dbsession.query(TreeItem).get(item_id)
         if item is None:

c2cgeoportal_admin/views/oauth2_clients.py

@@ -0,0 +1,89 @@
+# Copyright (c) 2021, 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 typing import Any, Dict
+
+from c2cgeoform.schema import GeoFormSchemaNode
+from c2cgeoform.views.abstract_views import AbstractViews, ListField
+from pyramid.view import view_config, view_defaults
+
+from c2cgeoportal_commons.models.static import OAuth2Client
+
+_list_field = partial(ListField, OAuth2Client)
+
+base_schema = GeoFormSchemaNode(OAuth2Client)
+base_schema.add_unique_validator(OAuth2Client.client_id, OAuth2Client.id)
+
+
+@view_defaults(match_param="table=oauth2_clients")
+class OAuth2ClientViews(AbstractViews):  # type: ignore
+    """The oAuth2 client administration view."""
+
+    _list_fields = [
+        _list_field("id"),
+        _list_field("client_id"),
+        _list_field("secret"),
+        _list_field("redirect_uri"),
+    ]
+    _id_field = "id"
+    _model = OAuth2Client
+    _base_schema = base_schema
+
+    def _base_query(self):
+        return self._request.dbsession.query(OAuth2Client)
+
+    @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")  # type: ignore
+    def index(self) -> Dict[str, Any]:
+        return super().index()  # type: ignore
+
+    @view_config(route_name="c2cgeoform_grid", renderer="fast_json")  # type: ignore
+    def grid(self) -> Dict[str, Any]:
+        return super().grid()  # type: ignore
+
+    @view_config(  # type: ignore
+        route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2"
+    )
+    def view(self) -> Dict[str, Any]:
+        return super().edit()  # type: ignore
+
+    @view_config(  # type: ignore
+        route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2"
+    )
+    def save(self) -> Dict[str, Any]:
+        return super().save()  # type: ignore
+
+    @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")  # type: ignore
+    def delete(self) -> Dict[str, Any]:
+        return super().delete()  # type: ignore
+
+    @view_config(  # type: ignore
+        route_name="c2cgeoform_item_duplicate", request_method="GET", renderer="../templates/edit.jinja2"
+    )
+    def duplicate(self) -> Dict[str, Any]:
+        return super().duplicate()  # type: ignore