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

c2cgeoportal_admin/static/navbar.css

@@ -32,7 +32,7 @@
 }
 
 @media (min-width: 992px) and (max-width: 1125px) {
-  .navbar-default .navbar-nav>li>a {
+  .navbar-default .navbar-nav > li > a {
     max-width: 8.5vw;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -42,39 +42,40 @@
 
 /*csslint important: false*/
 @media (max-width: 991px) {
-    .navbar-header {
-        float: none;
-    }
-    .navbar-left,.navbar-right {
-        float: none !important;
-    }
-    .navbar-toggle {
-        display: block;
-    }
-    .navbar-collapse {
-        border-top: 1px solid transparent;
-        box-shadow: inset 0 1px 0 rgba(255,255,255,0.1);
-    }
-    .navbar-fixed-top {
-        top: 0;
-        border-width: 0 0 1px;
-    }
-    .navbar-collapse.collapse {
-        display: none!important;
-    }
-    .navbar-nav {
-        float: none!important;
-        margin-top: 7.5px;
-    }
-    .navbar-nav>li {
-        float: none;
-    }
-    .navbar-nav>li>a {
-        padding-top: 10px;
-        padding-bottom: 10px;
-    }
-    .collapse.in{
-        display:block !important;
-    }
+  .navbar-header {
+    float: none;
+  }
+  .navbar-left,
+  .navbar-right {
+    float: none !important;
+  }
+  .navbar-toggle {
+    display: block;
+  }
+  .navbar-collapse {
+    border-top: 1px solid transparent;
+    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
+  }
+  .navbar-fixed-top {
+    top: 0;
+    border-width: 0 0 1px;
+  }
+  .navbar-collapse.collapse {
+    display: none !important;
+  }
+  .navbar-nav {
+    float: none !important;
+    margin-top: 7.5px;
+  }
+  .navbar-nav > li {
+    float: none;
+  }
+  .navbar-nav > li > a {
+    padding-top: 10px;
+    padding-bottom: 10px;
+  }
+  .collapse.in {
+    display: block !important;
+  }
 }
 /*csslint important: true*/

c2cgeoportal_admin/static/theme.css

@@ -21,33 +21,35 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-@import "navbar.css";
+@import 'navbar.css';
 
-.nav>li>a {
+.nav > li > a {
   padding-left: 8px;
   padding-right: 8px;
 }
 
 .bootstrap-table th.actions,
-.bootstrap-table td.actions
-{
+.bootstrap-table td.actions {
   width: 30px;
 }
 
 .icon-theme:before {
-  content: "\e139";
+  content: '\e139';
 }
 .icon-group:before {
-  content: "\e118";
+  content: '\e118';
 }
 .icon-l_wms:before {
-  content: "\e060";
+  content: '\e060';
 }
 .icon-l_wmts:before {
-  content: "\e011";
+  content: '\e011';
+}
+.icon-mvt:before {
+  content: '\e011';
 }
 .icon-user:before {
-  content: "\e008";
+  content: '\e008';
 }
 
 .ms-res-ctn .ms-res-item {
@@ -74,3 +76,8 @@
 #layertree .alert-info {
   margin-top: 30px;
 }
+
+.item-functionalities .checkbox label {
+  overflow: hidden;
+  overflow-wrap: break-word;
+}

c2cgeoportal_admin/subscribers.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2018-2020, Camptocamp SA
+# Copyright (c) 2018-2021, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -34,6 +32,7 @@ from pyramid.i18n import TranslationStringFactory, get_localizer
 
 
 def add_renderer_globals(event):
+    """Add the localizer to the global event."""
     request = event["request"]
     event["_"] = request.translate
     event["localizer"] = request.localizer
@@ -44,6 +43,7 @@ tsf2 = TranslationStringFactory("c2cgeoform")
 
 
 def add_localizer(event):
+    """Add the localizer to the request."""
     request = event.request
     localizer = get_localizer(request)
 

c2cgeoportal_admin/templates/layertree.jinja2

@@ -37,15 +37,26 @@
 {% block content %}
 <div id="layertree" class="container-fluid">
     <div id="toolbar">
-      <div class="btn-group">
-        {% if limit_exceeded %}
-        <button id="layertree-expand" type="button" class="btn btn-default"><span class="glyphicon glyphicon-chevron-down"></span> {{_("Expand all")}}</button>
-        {% endif %}
-        <button id="layertree-collapse" type="button" class="btn btn-default"><span class="glyphicon glyphicon-chevron-up"></span> {{_("Collapse all")}}</button>
-      </div>
-      <div class="btn-group">
-        <a id="layertree-ordering" class="btn btn-default" href="{{request.route_url('layertree_ordering')}}"><span class="glyphicon glyphicon-sort"></span> {{_("Edit themes order")}}</a>
-      </div>
+      <form class="form-inline">
+        <div class="form-group">
+          <label for="interface">{{ _("Interface") }}</label>
+          <select class="form-control" id="interface">
+            <option value="all">{{ _("All") }}</option>
+            {% for interface in interfaces %}
+            <option>{{ interface.name }}</option>
+            {% endfor %}
+          </select>
+        </div>
+        <div class="btn-group">
+          {% if limit_exceeded %}
+          <button id="layertree-expand" type="button" class="btn btn-default"><span class="glyphicon glyphicon-chevron-down"></span> {{_("Expand all")}}</button>
+          {% endif %}
+          <button id="layertree-collapse" type="button" class="btn btn-default"><span class="glyphicon glyphicon-chevron-up"></span> {{_("Collapse all")}}</button>
+        </div>
+        <div class="btn-group">
+          <a id="layertree-ordering" class="btn btn-default" href="{{request.route_url('layertree_ordering')}}"><span class="glyphicon glyphicon-sort"></span> {{_("Edit themes order")}}</a>
+        </div>
+      </form>
     </div>
 
     <div id="tree"></div>
@@ -56,8 +67,14 @@
         core: {
           data: function(node, callback) {
             var url = "{{ request.route_url('layertree_children') }}";
+            let separator = '?';
             if (node.id != '#') {
               url += "?group_id=" + node.data.id + "&path=" + node.id;
+              separator = '&';
+            }
+            const interface = $('#interface')[0].value;
+            if (interface != 'all') {
+              url += separator + "interface=" + interface;
             }
             $.ajax({ url: url })
             .done(function(data) {
@@ -226,6 +243,11 @@
         $('.jstree-grid-wrapper').height($(window).height() - $('nav').height() - $('#toolbar').height() - 50);
         $('.jstree-grid-wrapper').width('100%');
       });
+
+      const interfaceField = $('#interface');
+      interfaceField.on('change', function(e) {
+        $jstree.jstree(true).refresh();
+      });
     });
     </script>
 

c2cgeoportal_admin/templates/navigation_navbar.jinja2

@@ -46,6 +46,39 @@
         {% endfor %}
       </ul>
 
+      <button id="help-button" type="button" class="btn btn-default navbar-btn navbar-right">{{_("Show help")}}</button>
+      <script>
+      $(function() {
+        const key = 'adminShowHelp';
+
+        const getCurrentValue = function() {
+          // Get current value from localStorage
+          // True by default
+          return localStorage.getItem(key) !== 'false'
+        }
+
+        const apply = function(value) {
+          // Apply some value on UI
+          if (value) {
+            $("#help-button").addClass("active")
+            $(".help-block").removeClass("hidden")
+          } else {
+            $("#help-button").removeClass("active")
+            $(".help-block").addClass("hidden")
+          }
+        }
+
+        $("#help-button").click(function() {
+          // Toggle value in localStorage and apply on UI
+          localStorage.setItem(key, getCurrentValue() ? 'false' : 'true');
+          apply(getCurrentValue())
+        })
+
+        // Apply current value from localStorage on UI
+        apply(getCurrentValue())
+      });
+      </script>
+
       <ul class="nav navbar-nav navbar-right">
         <li id="language-dropdown" class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{request.locale_name}} <span class="caret"></span></a>

c2cgeoportal_admin/templates/ogcserver_synchronize.jinja2

@@ -59,6 +59,18 @@
         <li>else it will create a <code>Group</code> object.</li>
       </ul>
       <form method="POST" class="deform" id="form-synchronize">
+        <div class="form-group">
+            <input type="checkbox" name="force-parents" id="force-parents-field">
+            <label for="force-parents-field" class="control-label">{{_("Force parents re-initialization.")}}</label>
+        </div>
+        <div class="form-group">
+            <input type="checkbox" name="force-ordering" id="force-ordering-field">
+            <label for="force-ordering-field" class="control-label">{{_("Force children sorting, current server at top and other servers at bottom.")}}</label>
+        </div>
+        <div class="form-group">
+            <input type="checkbox" name="clean" id="clean">
+            <label for="clean" class="control-label">{{_("Remove unexisting layers and empty groups.")}}</label>
+        </div>
         <button type="submit" name="synchronize" class="btn btn-primary">{{_("Synchronize")}}</button>
       </form>
     </div>

c2cgeoportal_admin/templates/widgets/functionality_fields.pt

@@ -0,0 +1,51 @@
+<tal:comment replace="nothing">
+The MIT License (MIT)
+
+Copyright (c) Camptocamp SA
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+</tal:comment>
+
+<?python import json ?>
+
+<tal metal:use-macro='load:mapping_fields.pt'></tal>
+
+<script type="text/javascript">
+  deform.addCallback(
+     '${field['name'].oid}',
+     function(oid) {
+       const $name = $('#' + oid);
+
+       const functionalities = ${structure: json.dumps(field.schema.functionalities, indent=4, separators=(',', ': '))};
+
+       const $form = $name.closest('form');
+       const $valueItem = $form.find('.item-value');
+       const $helpBlock = $valueItem.find('p.help-block');
+
+       const updateDescription = function() {
+         const functionality = functionalities[$name.val()] || {};
+         const description = functionality.description || '';
+         $helpBlock.text(description);
+       }
+       $name.change(function() {
+         updateDescription();
+       });
+       updateDescription();
+     }
+   );
+</script>

c2cgeoportal_admin/templates/widgets/metadata.pt

@@ -75,13 +75,19 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
          $metadataItem.find('.col-value .form-group').hide();
          $metadataItem.find('.col-value .form-group .form-control').attr('disabled', true);
 
-         var type = (c2cgeoportalAdmin.metadata_definitions[$name.val()] || {}).type || 'string';
+         var metadataDef = c2cgeoportalAdmin.metadata_definitions[$name.val()] || {};
+         var type = metadataDef.type || 'string';
+         var description = metadataDef.description || '';
+
          $typedFormgroup = $metadataItem.find('.item-' + type);
          if ($typedFormgroup.length == 0) {
            $typedFormgroup = $metadataItem.find('.item-string');
          }
          $typedFormgroup.show();
          $typedFormgroup.find('.form-control').attr('disabled', false);
+
+         $helpBlock = $typedFormgroup.find('p.help-block');
+         $helpBlock.text(description);
        };
        $name.change(function() {
          updateType();

c2cgeoportal_admin/views/dimension_layers.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
@@ -30,7 +28,9 @@
 
 from functools import partial
 from itertools import groupby
+from typing import cast
 
+import sqlalchemy
 from c2cgeoform.views.abstract_views import ListField
 from sqlalchemy.orm import subqueryload
 
@@ -41,18 +41,19 @@ _list_field = partial(ListField, DimensionLayer)
 
 
 class DimensionLayerViews(LayerViews):
+    """The layer with dimensions administration view."""
 
     _extra_list_fields = [
         _list_field(
             "dimensions",
             renderer=lambda layer_wms: "; ".join(
                 [
-                    "{}: {}".format(group[0], ", ".join([d.value or "NULL" for d in group[1]]))
-                    for group in groupby(layer_wms.dimensions, lambda d: d.name)
+                    f"{group[0]}: {', '.join([d.value or 'NULL' for d in group[1]])}"
+                    for group in groupby(layer_wms.dimensions, lambda d: cast(str, d.name))
                 ]
             ),
         )
     ] + LayerViews._extra_list_fields
 
-    def _base_query(self, query):
+    def _base_query(self, query: sqlalchemy.orm.query.Query) -> sqlalchemy.orm.query.Query:
         return super()._base_query(query.options(subqueryload("dimensions")))

c2cgeoportal_admin/views/functionalities.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,20 +27,48 @@
 
 
 from functools import partial
+from typing import Any, Dict
 
+import colander
+import pyramid.request
 from c2cgeoform.schema import GeoFormSchemaNode
 from c2cgeoform.views.abstract_views import AbstractViews, ListField
+from deform.widget import FormWidget
 from pyramid.view import view_config, view_defaults
 
+from c2cgeoportal_admin import _
 from c2cgeoportal_commons.models.main import Functionality
 
 _list_field = partial(ListField, Functionality)
 
-base_schema = GeoFormSchemaNode(Functionality)
+
+def _translate_available_functionality(
+    available_functionality: Dict[str, Any], request: pyramid.request.Request
+) -> Dict[str, Any]:
+    result = {}
+    result.update(available_functionality)
+    result["description"] = request.localizer.translate(
+        _(available_functionality.get("description", "").strip())
+    )
+    return result
+
+
+base_schema = GeoFormSchemaNode(
+    Functionality,
+    widget=FormWidget(fields_template="functionality_fields"),
+    functionalities=colander.deferred(
+        lambda node, kw: {
+            f["name"]: _translate_available_functionality(f, kw["request"])
+            for f in kw["request"].registry.settings["admin_interface"]["available_functionalities"]
+        },
+    ),
+)
 
 
 @view_defaults(match_param="table=functionalities")
-class FunctionalityViews(AbstractViews):
+class FunctionalityViews(AbstractViews):  # type: ignore
+    """The functionality administration view."""
+
     _list_fields = [_list_field("id"), _list_field("name"), _list_field("description"), _list_field("value")]
     _id_field = "id"
     _model = Functionality

c2cgeoportal_admin/views/home.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,10 +26,12 @@
 # either expressed or implied, of the FreeBSD Project.
 
 
+import pyramid.request
 from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config
 
 
-@view_config(route_name="admin")
-def home_view(request):
+@view_config(route_name="admin")  # type: ignore  # type: ignore
+def home_view(request: pyramid.request.Request) -> HTTPFound:
+    """Get the main administration view, redirect to the layertree."""
     return HTTPFound(request.route_url("layertree", application="admin"))

c2cgeoportal_admin/views/interfaces.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
@@ -42,7 +40,9 @@ base_schema = GeoFormSchemaNode(Interface)
 
 
 @view_defaults(match_param="table=interfaces")
-class InterfacesViews(AbstractViews):
+class InterfacesViews(AbstractViews):  # type: ignore
+    """The interface administration view."""
+
     _list_fields = [
         _list_field("id"),
         _list_field("name"),
@@ -52,9 +52,7 @@ class InterfacesViews(AbstractViews):
         ),
         _list_field(
             "theme",
-            renderer=lambda interface: ", ".join(
-                ["{}-{}".format(t.name, t.name) or "" for t in interface.theme]
-            ),
+            renderer=lambda interface: ", ".join([f"{t.name}-{t.name}" or "" for t in interface.theme]),
         ),
     ]
     _id_field = "id"

c2cgeoportal_admin/views/layer_groups.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,13 +27,15 @@
 
 
 from functools import partial
+from typing import Optional
 
+import sqlalchemy
 from c2cgeoform.schema import GeoFormSchemaNode
 from c2cgeoform.views.abstract_views import ListField
 from deform.widget import FormWidget
 from pyramid.view import view_config, view_defaults
 
-from c2cgeoportal_admin.schemas.metadata import metadatas_schema_node
+from c2cgeoportal_admin.schemas.metadata import metadata_schema_node
 from c2cgeoportal_admin.schemas.treegroup import children_schema_node
 from c2cgeoportal_admin.schemas.treeitem import parent_id_node
 from c2cgeoportal_admin.views.treeitems import TreeItemViews
@@ -43,26 +43,24 @@ from c2cgeoportal_commons.models.main import LayerGroup, TreeGroup
 
 _list_field = partial(ListField, LayerGroup)
 
-
 base_schema = GeoFormSchemaNode(LayerGroup, widget=FormWidget(fields_template="layer_group_fields"))
 base_schema.add(children_schema_node())
-base_schema.add(metadatas_schema_node.clone())
+base_schema.add(metadata_schema_node(LayerGroup.metadatas, LayerGroup))
 base_schema.add_unique_validator(LayerGroup.name, LayerGroup.id)
-base_schema.add(parent_id_node(TreeGroup))
+base_schema.add(parent_id_node(TreeGroup))  # type: ignore
 
 
 @view_defaults(match_param="table=layer_groups")
 class LayerGroupsViews(TreeItemViews):
+    """The layer group administration view."""
 
-    _list_fields = (
-        TreeItemViews._list_fields + [_list_field("is_expanded")] + TreeItemViews._extra_list_fields
-    )
+    _list_fields = TreeItemViews._list_fields + TreeItemViews._extra_list_fields
 
     _id_field = "id"
     _model = LayerGroup
     _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(LayerGroup).distinct())
 
     @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")

c2cgeoportal_admin/views/layers.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 cast
 
+import sqlalchemy
 from c2cgeoform.views.abstract_views import ListField
 from sqlalchemy.orm import subqueryload
 
@@ -40,6 +40,7 @@ _list_field = partial(ListField, Layer)
 
 
 class LayerViews(TreeItemViews):
+    """The layer administration view."""
 
     _list_fields = TreeItemViews._list_fields + [
         _list_field("public"),
@@ -51,7 +52,7 @@ class LayerViews(TreeItemViews):
         _list_field(
             "interfaces",
             renderer=lambda layer_wms: ", ".join(
-                [i.name or "" for i in sorted(layer_wms.interfaces, key=lambda i: i.name)]
+                [i.name or "" for i in sorted(layer_wms.interfaces, key=lambda i: cast(str, i.name))]
             ),
             sort_column=Interface.name,
             filter_column=Interface.name,
@@ -59,14 +60,14 @@ class LayerViews(TreeItemViews):
         _list_field(
             "restrictionareas",
             renderer=lambda layer_wms: ", ".join(
-                [r.name or "" for r in sorted(layer_wms.restrictionareas, key=lambda r: r.name)]
+                [r.name or "" for r in sorted(layer_wms.restrictionareas, key=lambda r: cast(str, r.name))]
             ),
         ),
     ] + TreeItemViews._extra_list_fields
 
-    def _base_query(self, query):
+    def _base_query(self, query: sqlalchemy.orm.query.Query) -> sqlalchemy.orm.query.Query:
         return super()._base_query(
-            query.outerjoin("interfaces")
+            query.outerjoin(Layer.interfaces)
             .options(subqueryload("interfaces"))
             .options(subqueryload("restrictionareas"))
         )