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

c2cgeoportal_admin/widgets.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2018-2020, Camptocamp SA
+# Copyright (c) 2018-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -27,9 +25,10 @@
 # of the authors and should not be interpreted as representing official policies,
 # either expressed or implied, of the FreeBSD Project.
 
-from typing import Optional
+from typing import Any
 
 import colander
+import pyramid.request
 from colander import Mapping, SchemaNode
 from deform import widget
 from deform.widget import MappingWidget, SequenceWidget
@@ -55,10 +54,11 @@ widget.DateTimeInputWidget._pstruct_schema = SchemaNode(  # pylint: disable=prot
 )
 
 
-class ChildWidget(MappingWidget):
+class ChildWidget(MappingWidget):  # type: ignore
     """
-    Extension of the widget ````deform.widget.MappingWidget`` to be used in conjunction with ChildrenWidget,
-    to manage n-m relationships.
+    Extension of the widget ````deform.widget.MappingWidget``.
+
+    To be used in conjunction with ChildrenWidget, to manage n-m relationships.
 
     Do not embed complete children forms, but just an hidden input for child primary key.
 
@@ -82,7 +82,7 @@ class ChildWidget(MappingWidget):
 
     For further attributes, please refer to the documentation of
     ``deform.widget.MappingWidget`` in the deform documentation:
-    <http://deform.readthedocs.org/en/latest/api.html>
+    <https://deform.readthedocs.org/en/latest/api.html>
     """
 
     template = "child"
@@ -90,11 +90,13 @@ class ChildWidget(MappingWidget):
     model = TreeItem
     label_field = "name"
 
-    def icon_class(self, child) -> Optional[str]:  # pylint: disable=no-self-use,useless-return
+    def icon_class(self, child: Any) -> str | None:  # pylint: disable=useless-return
         del child
         return None
 
-    def edit_url(self, request, child) -> Optional[str]:  # pylint: disable=no-self-use,useless-return
+    def edit_url(  # pylint: disable=useless-return
+        self, request: pyramid.request.Request, child: Any
+    ) -> str | None:
         del request
         del child
         return None
@@ -107,10 +109,11 @@ class ChildWidget(MappingWidget):
         return super().serialize(field, cstruct, **kw)
 
 
-class ChildrenWidget(SequenceWidget):
+class ChildrenWidget(SequenceWidget):  # type: ignore
     """
-    Extension of the widget ````deform.widget.SequenceWidget``, to be used in conjunction with ChildWidget,
-    to manage n-m relationships.
+    Extension of the widget ````deform.widget.SequenceWidget``.
+
+    To be used in conjunction with ChildWidget, to manage n-m relationships.
 
     Use Magicsuggest for searching into parent schema candidates property, which should be a list of
     dictionaries of the form:
@@ -129,7 +132,7 @@ class ChildrenWidget(SequenceWidget):
 
     For further attributes, please refer to the documentation of
     ``deform.widget.SequenceWidget`` in the deform documentation:
-    <http://deform.readthedocs.org/en/latest/api.html>
+    <https://deform.readthedocs.org/en/latest/api.html>
     """
 
     template = "children"

{c2cgeoportal_admin-2.6.0.dist-info → c2cgeoportal_admin-2.9rc44.dist-info}/METADATA

@@ -1,21 +1,23 @@
 Metadata-Version: 2.1
 Name: c2cgeoportal-admin
-Version: 2.6.0
+Version: 2.9rc44
 Summary: c2cgeoportal admin
 Home-page: https://github.com/camptocamp/c2cgeoportal/
 Author: Camptocamp
 Author-email: info@camptocamp.com
-License: UNKNOWN
 Keywords: web gis geoportail c2cgeoportal geocommune pyramid
-Platform: UNKNOWN
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
+Classifier: Development Status :: 6 - Mature
+Classifier: Environment :: Web Environment
 Classifier: Framework :: Pyramid
-Classifier: Topic :: Internet :: WWW/HTTP
-Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Application
+Classifier: Intended Audience :: Other Audience
 Classifier: License :: OSI Approved :: BSD License
-Classifier: Development Status :: 6 - Mature
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Topic :: Scientific/Engineering :: GIS
+Classifier: Typing :: Typed
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: c2cgeoform
 Requires-Dist: c2cwsgiutils
@@ -42,6 +44,4 @@ make preparedev
 make serve
 ```
 
-Now open http://localhost:8888/ in your favorite browser.
-
-
+Now open http://localhost:8888/admin/ in your favorite browser.

c2cgeoportal_admin-2.9rc44.dist-info/RECORD

@@ -0,0 +1,97 @@
+c2cgeoportal_admin/__init__.py,sha256=HVSQ-CwK5aR9URA-NVH7JlYHGU49xT5vARiTkdxpV70,5767
+c2cgeoportal_admin/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+c2cgeoportal_admin/routes.py,sha256=oja-Seyn08geema9lKJEVU-bPzuT8RaNBfUORDxEm6w,5302
+c2cgeoportal_admin/subscribers.py,sha256=P1CaccDTpuxrWak_gMN2qBurz3OrAZ6aZ1LA7P3avu8,2430
+c2cgeoportal_admin/widgets.py,sha256=8bozaTGBZKxDIMWbkHU1eD0MmOQ9KMOn21PDLYbQGFs,6092
+c2cgeoportal_admin/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+c2cgeoportal_admin/lib/lingva_extractor.py,sha256=5XsUHeVHnGF6GmD83shaTXasigGXtDXwgnswU0xA410,3355
+c2cgeoportal_admin/lib/ogcserver_synchronizer.py,sha256=AFr0TbI_l7QTf9oNyO6rFEy6Ix096R2V0EFYcw-ArIc,15536
+c2cgeoportal_admin/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+c2cgeoportal_admin/schemas/dimensions.py,sha256=pVEN8VjPjoANWUEIB-aWh6Yli_ybu1ghQcaYC2tSFyI,2368
+c2cgeoportal_admin/schemas/functionalities.py,sha256=JecG1DYagM_Bgd7sMj0clN-4CAuYZEdELwDXlLRLBZs,3852
+c2cgeoportal_admin/schemas/interfaces.py,sha256=N_b1LQ0Ur2i09dprnLLqXrcEq1p7uaKZJhaQpW7mOKc,2662
+c2cgeoportal_admin/schemas/metadata.py,sha256=cp-QJkUf0zH0s6rBgV3uIZuXhHVFG5E8mF4J1ty2c6c,8897
+c2cgeoportal_admin/schemas/restriction_areas.py,sha256=1xVR1SQfBReWVK5eFyGyrvw8tYqY2iOehuXVX3EMdf0,2682
+c2cgeoportal_admin/schemas/roles.py,sha256=YyRaStlu1IJwB5gRHlvS285twSy2xxatNOqV9klq1s8,2591
+c2cgeoportal_admin/schemas/treegroup.py,sha256=pLBIGBeaCmsAUMC4yCFCdSkYqLytG38qVygYqNr_AX8,7150
+c2cgeoportal_admin/schemas/treeitem.py,sha256=VhGhpG8VcsT-3dnnNlln-uVlsqjwJQXbg6Ap1tEanMI,2146
+c2cgeoportal_admin/static/layertree.css,sha256=tk54KGW0yRRmdrY35gOCZG3qTsqWtGNEwvBYPQKhaVs,3177
+c2cgeoportal_admin/static/navbar.css,sha256=QIaAQsb4n17OfwdKEQdmNDVPCP23Yu-oGW4xsSaHyW0,2307
+c2cgeoportal_admin/static/theme.css,sha256=3knC4gpPnEwLF0-jEJze15C1hm1K87aCpxGyqdjrLxw,2068
+c2cgeoportal_admin/templates/404.jinja2,sha256=KSpqCNFwv37rKSmX6kL_VvCnn5egcT1eRD6kIKwWx34,1807
+c2cgeoportal_admin/templates/edit.jinja2,sha256=rkBQiz0JZdL7VDq8XrhRLTv6JaiFt_QB8CwP3NMHWQY,1302
+c2cgeoportal_admin/templates/home.jinja2,sha256=WDQwmBGMZxsiOLw9YeYPLuca_mjjntjrTh529euzd1o,1516
+c2cgeoportal_admin/templates/index.jinja2,sha256=HPgilbqh5dv-yc_T_bc1hV2DEtV2wD617_aAERC2VSk,2005
+c2cgeoportal_admin/templates/layertree.jinja2,sha256=1ys5XDY3nb4gAu8JazkwSFeJUdGRadT7WaBuvin_hYg,9830
+c2cgeoportal_admin/templates/layout.jinja2,sha256=KCDwATUYBu-ZXv7ijo0S0PlTmKtU-JxW8gMhvPA_kAE,4105
+c2cgeoportal_admin/templates/navigation_navbar.jinja2,sha256=XzVQDpo3ClIiRxWf5eDULHZi9u-veYOmndiE_Twqxog,4166
+c2cgeoportal_admin/templates/ogcserver_synchronize.jinja2,sha256=rdQfbHBzrV5VUq5TC97QR7pv8bRvrdKaUUZpnQyldoE,4327
+c2cgeoportal_admin/templates/widgets/child.pt,sha256=JjxI0oVADhS3SoFgg0iN8P4ca1I_UGr7fWRp3wpZXsE,2159
+c2cgeoportal_admin/templates/widgets/children.pt,sha256=0TPpatvmZcU2TxbcZMjDz8VQcLGtoHkuDJ-eAGvjXho,6625
+c2cgeoportal_admin/templates/widgets/dimension.pt,sha256=1BXmE7s9JpzaJSHAQEtZk0DHB11pQ4FNQPaG_4c8CYo,2627
+c2cgeoportal_admin/templates/widgets/dimensions.pt,sha256=LjWjsgdcFYZxpB_30-3NOfvq5KYkKTu49F-P-r9d5Jg,1211
+c2cgeoportal_admin/templates/widgets/functionality_fields.pt,sha256=8TvwXCmQOtYFkiqsa4AHFUYsWk92LLnthz8bDrLmMBc,1969
+c2cgeoportal_admin/templates/widgets/layer_fields.pt,sha256=RJBYt8ji6YQp9ZaNZJD-caLgy856a6rzlKSMnuZWphw,3223
+c2cgeoportal_admin/templates/widgets/layer_group_fields.pt,sha256=xnqIqFjPPan81OqLwKeDnvNtlhEvYss6h2J9txH5neE,2459
+c2cgeoportal_admin/templates/widgets/layer_v1_fields.pt,sha256=w-MujUevHWmnOkOTbbvES6alDoL_UO1eiMj8SCxcQEY,3956
+c2cgeoportal_admin/templates/widgets/metadata.pt,sha256=P8noHX8YAv3m6EGh0IDUJCFsyeZDX88HtlqOWab8DAU,3735
+c2cgeoportal_admin/templates/widgets/metadatas.pt,sha256=ErgAH0DA94MO7gqEJ2iZdQ9LRptP2YKH78yze-jdl2Q,1476
+c2cgeoportal_admin/templates/widgets/ogcserver_fields.pt,sha256=x0bDmgrnj9SA6RCVpg3k2lTkkXPkuBFPKMScDgDeyGU,1724
+c2cgeoportal_admin/templates/widgets/restriction_area_fields.pt,sha256=pZVE0KcitAF7HXc3ZlniLr0QwSD05TOhlgieLUR1i7Q,1731
+c2cgeoportal_admin/templates/widgets/role_fields.pt,sha256=gVd9eRYaqw8fGmZauqEUS_Igmyxaa71qcmdC1KUx5nY,2623
+c2cgeoportal_admin/templates/widgets/theme_fields.pt,sha256=68G1Ya8-Dc6pCeP-taQ0ofCIpnY_v0rouazkFhfQflU,3083
+c2cgeoportal_admin/templates/widgets/user_fields.pt,sha256=twmajhUYL1xa47Eu-iATKifNPA5lu3SGpqdKajH6gL8,1753
+c2cgeoportal_admin/views/__init__.py,sha256=jtI6CdoXJwizznjwb8ClYySgq4kbwhTIJYutSw89PAw,683
+c2cgeoportal_admin/views/dimension_layers.py,sha256=WL3CqfAY8mref9cen1lCF5vADg_csf2Pp5zeEYX1ZXg,2778
+c2cgeoportal_admin/views/functionalities.py,sha256=F51rdqVqbdWx1iNz8DHauhh3B8f6x6lEidaskxBn1so,4379
+c2cgeoportal_admin/views/home.py,sha256=h_hJWIKpzJeSmXl58J0nvZdEg7avSYOOVUEEnlV-r0k,1943
+c2cgeoportal_admin/views/interfaces.py,sha256=psp5dw22rI3enY9AS0aIspHBdv-sVzSPBQKGIhW3-Hw,3844
+c2cgeoportal_admin/views/layer_groups.py,sha256=xQiEkO7LuNy0FiwfHZa1XwaoMvr9UE2bLpckOtdyuMM,4489
+c2cgeoportal_admin/views/layers.py,sha256=JDEO8hEIPhRxZVpxyT_0FU6gWCgREllw5O9qBCCxipU,3248
+c2cgeoportal_admin/views/layers_cog.py,sha256=tFljZufefGP8YZvidAhUA5cgwbO1R2D7wXdQdS1EX1I,5627
+c2cgeoportal_admin/views/layers_vectortiles.py,sha256=fTNaGGt7ZIX9wydZvED6mp1B8iBtt-qbywv2MqQgV_Q,5617
+c2cgeoportal_admin/views/layers_wms.py,sha256=kjhH4TWnVnH81J__vcbyST2qEMSz3qHOxcEL8ELvLuU,8335
+c2cgeoportal_admin/views/layers_wmts.py,sha256=Kb-j_yPEJycBYh5E-D-eP3xEhuzraotNL9bLup7GoNM,8080
+c2cgeoportal_admin/views/layertree.py,sha256=0FxaVrIg2A7ArMCiI9tj7diaLPn2Cl16iFUerdPDpV4,8629
+c2cgeoportal_admin/views/logged_views.py,sha256=Yg8HnrLCog4geNWOjkhF_Zo2ByOKuevdVT8xLd9x5Ow,3335
+c2cgeoportal_admin/views/logs.py,sha256=N1I0gqzoqbEtkOsP0EhrlEWsDYuiuKQ46_YeKy7zFHs,3776
+c2cgeoportal_admin/views/oauth2_clients.py,sha256=RC_vrMQaYGujN97wHihQXrO_0K7CrcFF1rSI0-dHZlg,3840
+c2cgeoportal_admin/views/ogc_servers.py,sha256=kIhlZ7Sp_mdZUlyl2h4foTTgkevWrbZb_chLZUXEF1o,9716
+c2cgeoportal_admin/views/restriction_areas.py,sha256=QQKDC7nUkNecC2knnnoLijhc2LvvjV8wZm3fcmRjftc,6122
+c2cgeoportal_admin/views/roles.py,sha256=I6di90WR20EkFoy33milrHZ74_dgCkEVeNDM8E4P46w,6387
+c2cgeoportal_admin/views/themes.py,sha256=6le9_3vhYa_ez0q52i--M24xPsycrGtpVKoCRhn7H0k,6267
+c2cgeoportal_admin/views/themes_ordering.py,sha256=PgPaqKe7A5d2cYcDeJyoK615BNXayOmRcKNAAopvfRc,5689
+c2cgeoportal_admin/views/treeitems.py,sha256=EgDArC5M39iihbB1Ok2VXmAAuH2DhhBrjeF0TbJgOQ4,4038
+c2cgeoportal_admin/views/users.py,sha256=8zoSgSn0RFnu-Gc6gJr58T5ySsd0L2UQFZdSwfptdY8,6147
+tests/__init__.py,sha256=weLUoRCG6zIlhW7Rfr7QEA0Ju-gYLfBekRcTCb5lTZ4,9785
+tests/conftest.py,sha256=vowo5nwQ3DLSfost3ndihoYJFuhuhpoK__-B_ffsSLY,2646
+tests/test_edit_url.py,sha256=Mo_Vo5xvdpPasfjvhQUif5F3nKVpJ6GQJ_x_Hj5VNY8,4494
+tests/test_functionalities.py,sha256=tGQbEsQWjr_oExI3vWhLIioxylDaoUaOfEas42YPw50,5191
+tests/test_home.py,sha256=oWsKaWqRicNpUdaca54YvLIBRaGYnsXlv_Tjqv7guEQ,425
+tests/test_interface.py,sha256=z1jpRzW0R2e9BJWWurE-j-YkG5yhorn7h1XRIauUQ7A,5669
+tests/test_layer_groups.py,sha256=bisbaDY0SiyBc0rexYajbcvfdDt8Kux6VqXIEBLSULM,12191
+tests/test_layers_cog.py,sha256=5p7NHZw1IXfHg8Weqie3ibjDIJYVm7KAGGOiaZoBYO0,9848
+tests/test_layers_vectortiles.py,sha256=uZGO-0-uVuvkPVMQI11tSY381tEmgWeYvlxKI19pslg,10158
+tests/test_layers_wms.py,sha256=ynqO1cnXk2ZbSXR3l9hp0IyG8PMXbmR4eyubnwRvRfU,19494
+tests/test_layers_wmts.py,sha256=7zye_pZ_e0RyJdoT8oeHKPoYJMKWfTg0K8lEgMIu77Q,12181
+tests/test_layertree.py,sha256=Dxe10OwuilQ-AEgVIDU4Ns9U6PQ4kPWTxwItdBE7nSg,11335
+tests/test_learn.py,sha256=gQwe-Bim0eihZH0rbBWDn6_rIBxvQD_lyu9MlOljupM,2307
+tests/test_left_menu.py,sha256=xnlv5sD0k3wpCChKCnbpYRN0TA895pg8k6wVvjf99-4,919
+tests/test_lingva_extractor_config.py,sha256=ZQE8zBl91khK68MX0chL6mQPgfpIWQgMxlqFFpCwmSw,2495
+tests/test_logs.py,sha256=pxzHyOElW-x2-M3yoMEsHIZ3nrm5EptDAAAGfziEfv4,3132
+tests/test_main.py,sha256=_gUdMrMMAEzvGIf1QwkoHQkd0eBACz05ycTidCHP5Ao,365
+tests/test_metadatas.py,sha256=bVNxvZRKNRMmjQGr7Al1d4H85EjEaoesRpxytyld4Fw,12088
+tests/test_oauth2_clients.py,sha256=5vyuCsba2WVgr6yMJysw73pAnXCZXhLO7dLIgV-spic,7028
+tests/test_ogc_servers.py,sha256=DGSMVIzYnw3bJT53VFGuPYIPMPCyHJDb5ZPJj1VM3Bo,8204
+tests/test_restriction_areas.py,sha256=5VhO9ZvtFQPy1kVFm96Mh_vf1LCI5oeIdl0dfvS6JD8,9003
+tests/test_role.py,sha256=2mbi0RwTESnIZIuUTxMi275ONOcPNKWN-ni7b00SO90,12804
+tests/test_themes.py,sha256=uhzHe2TbuNoLnL4VdYATPnOqtnZWWPKsvUTq6GUxwiU,16207
+tests/test_themes_ordering.py,sha256=T4Esr0C3EN5UdeEyYLa4ePvEn-bx3RNPkGBK3lDFoBo,2243
+tests/test_treegroup.py,sha256=Plv119G4TWlurWLE7Z1mWGeHHPScK_fWKcDmDzMUlIU,576
+tests/test_user.py,sha256=5C9nrQVk4Bf0Z9BKd0uf_J8EtJLTOFSpzrNHXfg3NzI,13095
+tests/themes_ordering.py,sha256=UdydcRIzWC6RRnTMfl2JM_250DHuAhGC7rijHqfy7lk,1342
+c2cgeoportal_admin-2.9rc44.dist-info/METADATA,sha256=FL4D_vI8WCcesDbNuwvSy7SVtqGOj7z5mYoC_jQRlQc,1382
+c2cgeoportal_admin-2.9rc44.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+c2cgeoportal_admin-2.9rc44.dist-info/entry_points.txt,sha256=iRK5w2E-PVbqHx48OuxznFEXTpoOdJyx6kjpaca0Fxc,164
+c2cgeoportal_admin-2.9rc44.dist-info/top_level.txt,sha256=DgcTJgTvpJUB8HqwYB14PdLBPAOAFk0B8oqnSTFoAU4,25
+c2cgeoportal_admin-2.9rc44.dist-info/RECORD,,

{c2cgeoportal_admin-2.6.0.dist-info → c2cgeoportal_admin-2.9rc44.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.34.2)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

c2cgeoportal_admin-2.9rc44.dist-info/entry_points.txt

@@ -0,0 +1,5 @@
+[lingva.extractors]
+geomapfish-admin-config = c2cgeoportal_admin.lib.lingva_extractor:GeomapfishConfigExtractor
+
+[paste.app_factory]
+main = c2cgeoportal_admin:main

tests/__init__.py

@@ -9,13 +9,15 @@ skip_if_ci = pytest.mark.skipif(os.environ.get("CI", "false") == "true", reason=
 
 
 def get_test_default_layers(dbsession, default_ogc_server):
-    from c2cgeoportal_commons.models.main import LayerVectorTiles, LayerWMS, LayerWMTS
-
-    default_wms = LayerWMS("wms-defaults")
-    default_wms.ogc_server = default_ogc_server
-    default_wms.time_widget = "datepicker"
-    default_wms.time_mode = "value"
-    dbsession.add(default_wms)
+    from c2cgeoportal_commons.models.main import LayerCOG, LayerVectorTiles, LayerWMS, LayerWMTS
+
+    default_wms = None
+    if default_ogc_server:
+        default_wms = LayerWMS("wms-defaults")
+        default_wms.ogc_server = default_ogc_server
+        default_wms.time_widget = "datepicker"
+        default_wms.time_mode = "value"
+        dbsession.add(default_wms)
     default_wmts = LayerWMTS("wmts-defaults")
     default_wmts.url = "https:///wmts.geo.admin_default.ch.org?service=wms&request=GetCapabilities"
     default_wmts.layer = "default"
@@ -24,8 +26,11 @@ def get_test_default_layers(dbsession, default_ogc_server):
     default_vectortiles = LayerVectorTiles("vectortiles-defaults")
     default_vectortiles.style = "https://vectortiles-staging.geoportail.lu/styles/roadmap/style.json"
     dbsession.add(default_vectortiles)
+    default_cog = LayerCOG("cog-defaults")
+    default_cog.url = "https://example.com/image.tiff"
+    dbsession.add(default_cog)
     dbsession.flush()
-    return {"wms": default_wms, "wmts": default_wmts, "vectortiles": default_vectortiles}
+    return {"wms": default_wms, "wmts": default_wmts, "vectortiles": default_vectortiles, "cog": default_cog}
 
 
 def factory_build_layers(layer_builder, dbsession, add_dimension=True):
@@ -38,7 +43,7 @@ def factory_build_layers(layer_builder, dbsession, add_dimension=True):
         RestrictionArea,
     )
 
-    restrictionareas = [RestrictionArea(name="restrictionarea_{}".format(i)) for i in range(0, 5)]
+    restrictionareas = [RestrictionArea(name=f"restrictionarea_{i}") for i in range(0, 5)]
 
     interfaces = [Interface(name) for name in ["desktop", "mobile", "edit", "routing"]]
 
@@ -50,11 +55,10 @@ def factory_build_layers(layer_builder, dbsession, add_dimension=True):
         ("snappingConfig", '{"tolerance": 50}'),
     ]
 
-    groups = [LayerGroup(name="layer_group_{}".format(i)) for i in range(0, 5)]
+    groups = [LayerGroup(name=f"layer_group_{i}") for i in range(0, 5)]
 
     layers = []
     for i in range(0, 25):
-
         layer = layer_builder(i)
 
         if add_dimension:
@@ -90,23 +94,22 @@ def factory_build_layers(layer_builder, dbsession, add_dimension=True):
 
 
 class AbstractViewsTests:
-
     _prefix = None  # url prefix (index view url). Example: /users
 
     def get(self, test_app, path="", locale="en", status=200, **kwargs):
         return test_app.get(
-            "{}{}".format(self._prefix, path),
-            headers={"Cookie": "_LOCALE_={}".format(locale)},
+            f"{self._prefix}{path}",
+            headers={"Cookie": f"_LOCALE_={locale}"},
             status=status,
             **kwargs,
         )
 
     def get_item(self, test_app, item_id, **kwargs):
-        return self.get(test_app, "/{}".format(item_id), **kwargs)
+        return self.get(test_app, f"/{item_id}", **kwargs)
 
     def check_left_menu(self, resp, title):
         link = resp.html.select_one(".navbar li.active a")
-        assert "http://localhost{}".format(self._prefix) == link.attrs["href"]
+        assert f"http://localhost{self._prefix}" == link.attrs["href"]
         assert title == link.getText()
 
     def check_grid_headers(self, resp, expected_col_headers, new="New"):
@@ -120,11 +123,12 @@ class AbstractViewsTests:
         )
         actions = resp.html.select_one('th[data-field="actions"]')
         assert "false" == actions.attrs["data-sortable"]
-        assert 1 == len(list(filter(lambda x: next(x.stripped_strings) == new, resp.html.findAll("a"))))
+        if new is not False:
+            assert 1 == len(list(filter(lambda x: next(x.stripped_strings) == new, resp.html.findAll("a"))))
 
     def check_search(self, test_app, search="", offset=0, limit=10, sort="", order="", total=None):
         json = test_app.post(
-            "{}/grid.json".format(self._prefix),
+            f"{self._prefix}/grid.json",
             params={"offset": offset, "limit": limit, "search": search, "sort": sort, "order": order},
             status=200,
         ).json
@@ -135,8 +139,8 @@ class AbstractViewsTests:
     def check_checkboxes(self, form, name, expected):
         for i, exp in enumerate(expected):
             field = form.get(name, index=i)
-            checkbox = form.html.select_one("#{}".format(field.id))
-            label = form.html.select_one("label[for={}]".format(field.id))
+            checkbox = form.html.select_one(f"#{field.id}")
+            label = form.html.select_one(f"label[for={field.id}]")
             assert exp["label"] == list(label.stripped_strings)[0]
             assert exp["value"] == checkbox["value"]
             assert exp["checked"] == field.checked

tests/conftest.py

@@ -1,8 +1,15 @@
+from typing import Any
+
+import pyramid.request
 import pytest
+import sqlalchemy.exc
 import transaction
 from pyramid import testing
 from pyramid.paster import bootstrap
+from pyramid.router import Router
+from pyramid.scripting import AppEnvironment
 from sqlalchemy.exc import DBAPIError
+from sqlalchemy.orm import Session, SessionTransaction
 from webtest import TestApp as WebTestApp  # Avoid warning with pytest
 
 from c2cgeoportal_commons.testing import generate_mappers, get_engine, get_session_factory, get_tm_session
@@ -11,31 +18,34 @@ from c2cgeoportal_commons.testing.initializedb import truncate_tables
 
 @pytest.fixture(scope="session")
 @pytest.mark.usefixtures("settings")
-def dbsession(settings):
+def dbsession(settings: dict[str, Any]) -> Session:
     generate_mappers()
     engine = get_engine(settings)
-    truncate_tables(engine)
     session_factory = get_session_factory(engine)
     session = get_tm_session(session_factory, transaction.manager)
+    truncate_tables(session)
     yield session
 
 
 @pytest.fixture(scope="function")
 @pytest.mark.usefixtures("dbsession")
-def transact(dbsession):
+def transact(dbsession: Session) -> SessionTransaction:
     t = dbsession.begin_nested()
     yield t
-    t.rollback()
+    try:
+        t.rollback()
+    except sqlalchemy.exc.ResourceClosedError:
+        print("The transaction was already closed")
     dbsession.expire_all()
 
 
-def raise_db_error(_):
+def raise_db_error(_: Any) -> None:
     raise DBAPIError("this is a test !", None, None)
 
 
 @pytest.fixture(scope="function")
 @pytest.mark.usefixtures("dbsession")
-def raise_db_error_on_query(dbsession):
+def raise_db_error_on_query(dbsession: Session) -> None:
     query = dbsession.query
     dbsession.query = raise_db_error
     yield
@@ -43,7 +53,7 @@ def raise_db_error_on_query(dbsession):
 
 
 @pytest.fixture(scope="session")
-def app_env():
+def app_env() -> AppEnvironment:
     file_name = "/opt/c2cgeoportal/admin/tests/tests.ini"
     with bootstrap(file_name) as env:
         yield env
@@ -51,11 +61,12 @@ def app_env():
 
 @pytest.fixture(scope="session")
 @pytest.mark.usefixtures("app_env", "dbsession")
-def app(app_env, dbsession):
+def app(app_env: AppEnvironment, dbsession: Session) -> Router:
     config = testing.setUp(registry=app_env["registry"])
     config.add_request_method(lambda request: dbsession, "dbsession", reify=True)
     config.add_route("user_add", "user_add")
     config.add_route("users_nb", "users_nb")
+    config.add_route("base", "/", static=True)
     config.scan(package="tests")
     app = config.make_wsgi_app()
     yield app
@@ -63,12 +74,12 @@ def app(app_env, dbsession):
 
 @pytest.fixture(scope="session")
 @pytest.mark.usefixtures("app_env")
-def settings(app_env):
+def settings(app_env: AppEnvironment) -> Any:
     yield app_env.get("registry").settings
 
 
-@pytest.fixture(scope="session")  # noqa: F811
+@pytest.fixture(scope="session")  # noqa: ignore=F811
 @pytest.mark.usefixtures("app")
-def test_app(request, app):
+def test_app(request: pyramid.request.Request, app: Router) -> WebTestApp:
     testapp = WebTestApp(app)
     yield testapp

tests/test_edit_url.py

@@ -24,12 +24,12 @@ def edit_url_test_data(dbsession, transact):
         Theme,
     )
 
-    restrictionareas = [RestrictionArea(name="restrictionarea_{}".format(i)) for i in range(0, 5)]
+    restrictionareas = [RestrictionArea(name=f"restrictionarea_{i}") for i in range(0, 5)]
     functionalities = {}
-    for name in ("default_basemap", "location"):
+    for name in ("default_basemap", "default_theme"):
         functionalities[name] = []
         for v in range(0, 4):
-            functionality = Functionality(name=name, value="value_{}".format(v))
+            functionality = Functionality(name=name, value=f"value_{v}")
             dbsession.add(functionality)
             functionalities[name].append(functionality)
 
@@ -38,10 +38,10 @@ def edit_url_test_data(dbsession, transact):
 
     layers_wmts = []
     for i in range(0, 5):
-        name = "layer_wmts_{}".format(i)
+        name = f"layer_wmts_{i}"
         layer_wmts = LayerWMTS(name=name)
         layer_wmts.layer = name
-        layer_wmts.url = "https://server{}.net/wmts".format(i)
+        layer_wmts.url = f"https://server{i}.net/wmts"
         layer_wmts.restrictionareas = [restrictionareas[i % 5], restrictionareas[(i + 2) % 5]]
         if i % 10 != 1:
             layer_wmts.interfaces = [interfaces[i % 4], interfaces[(i + 2) % 4]]
@@ -52,8 +52,8 @@ def edit_url_test_data(dbsession, transact):
 
     layers_wms = []
     for i in range(0, 5):
-        layer_wms = LayerWMS(name="layer_wms_{}".format(i))
-        layer_wms.layer = "wms_layer_{}".format(i)
+        layer_wms = LayerWMS(name=f"layer_wms_{i}")
+        layer_wms.layer = f"wms_layer_{i}"
         layer_wms.ogc_server = ogc_server
         layers_wms.append(layer_wms)
         dbsession.add(layer_wms)
@@ -63,9 +63,7 @@ def edit_url_test_data(dbsession, transact):
     for i in range(0, 5):
         role = Role("secretary_" + str(i))
         role.functionalities = [
-            functionalities["default_basemap"][0],
-            functionalities["location"][0],
-            functionalities["location"][1],
+            functionalities["default_theme"][0],
         ]
         role.restrictionareas = [restrictionareas[0], restrictionareas[1]]
         dbsession.add(role)
@@ -94,16 +92,15 @@ def edit_url_test_data(dbsession, transact):
 
 @pytest.mark.usefixtures("edit_url_test_data", "test_app")
 class TestUrlEdit(AbstractViewsTests):
-
     _prefix = "/admin/"
 
     def _get(self, test_app, tablename, pk):
-        path = "/{}/{}".format(tablename, pk)
+        path = f"/{tablename}/{pk}"
         return test_app.get(path, status=200)
 
     def _check_link(self, test_app, resp, item, table, status):
-        link = resp.html.select_one(".form-group.item-{} a".format(item))
-        assert re.match(r"http://localhost/admin/{}/\d+".format(table), link["href"]) is not None
+        link = resp.html.select_one(f".form-group.item-{item} a")
+        assert re.match(rf"http://localhost/admin/{table}/\d+", link["href"]) is not None
         test_app.get(link.get("href"), status=status)
 
     def test_layer_wms_edit(self, edit_url_test_data, test_app):

tests/test_functionalities.py

@@ -9,15 +9,18 @@ from . import AbstractViewsTests
 
 @pytest.fixture(scope="function")
 @pytest.mark.usefixtures("dbsession", "transact")
-def functionality_test_data(dbsession, transact):
+def functionality_test_data(dbsession, transact, settings):
     del transact
 
     from c2cgeoportal_commons.models.main import Functionality
 
     functionalities = []
     for i in range(0, 4):
-        functionality = Functionality(name="functionality_{}".format(i), value="value_{}".format(i))
-        functionality.description = "description_{}".format(i)
+        functionality = Functionality(
+            settings["admin_interface"]["available_functionalities"][i]["name"],
+            value=f"value_{i}",
+        )
+        functionality.description = f"description_{i}"
         dbsession.add(functionality)
         functionalities.append(functionality)
 
@@ -28,7 +31,6 @@ def functionality_test_data(dbsession, transact):
 
 @pytest.mark.usefixtures("functionality_test_data", "test_app")
 class TestFunctionality(AbstractViewsTests):
-
     _prefix = "/admin/functionalities"
 
     def test_index_rendering(self, test_app):
@@ -47,10 +49,10 @@ class TestFunctionality(AbstractViewsTests):
 
     def test_grid_search(self, test_app):
         # search on functionality name
-        self.check_search(test_app, "functionality_0", total=1)
+        self.check_search(test_app, "default_basemap", total=1)
 
     def test_submit_new(self, dbsession, test_app):
-        from c2cgeoportal_commons.models.main import Functionality
+        from c2cgeoportal_commons.models.main import Functionality, Log, LogAction
 
         resp = test_app.post(
             "/admin/functionalities/new",
@@ -63,9 +65,19 @@ class TestFunctionality(AbstractViewsTests):
         ).group(1)
         assert functionality.name == "new_name"
 
-    def test_edit(self, test_app, functionality_test_data):
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.INSERT
+        assert log.element_type == "functionality"
+        assert log.element_id == functionality.id
+        assert log.element_name == functionality.name
+        assert log.username == "test_user"
+
+    def test_edit(self, test_app, functionality_test_data, dbsession):
+        from c2cgeoportal_commons.models.main import Log, LogAction
+
         functionality = functionality_test_data["functionalities"][0]
-        resp = test_app.get("/admin/functionalities/{}".format(functionality.id), status=200)
+        resp = test_app.get(f"/admin/functionalities/{functionality.id}", status=200)
         form = resp.form
         assert str(functionality.id) == self.get_first_field_named(form, "id").value
         assert "hidden" == self.get_first_field_named(form, "id").attrs["type"]
@@ -74,25 +86,51 @@ class TestFunctionality(AbstractViewsTests):
         assert form.submit().status_int == 302
         assert functionality.description == "new_description"
 
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.UPDATE
+        assert log.element_type == "functionality"
+        assert log.element_id == functionality.id
+        assert log.element_name == functionality.name
+        assert log.username == "test_user"
+
     def test_delete(self, test_app, functionality_test_data, dbsession):
-        from c2cgeoportal_commons.models.main import Functionality
+        from c2cgeoportal_commons.models.main import Functionality, Log, LogAction
 
         functionality = functionality_test_data["functionalities"][0]
         deleted_id = functionality.id
-        test_app.delete("/admin/functionalities/{}".format(deleted_id), status=200)
+        test_app.delete(f"/admin/functionalities/{deleted_id}", status=200)
         assert dbsession.query(Functionality).get(deleted_id) is None
 
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.DELETE
+        assert log.element_type == "functionality"
+        assert log.element_id == functionality.id
+        assert log.element_name == functionality.name
+        assert log.username == "test_user"
+
     def test_duplicate(self, functionality_test_data, test_app, dbsession):
         from c2cgeoportal_commons.models.main import Functionality
 
         functionality = functionality_test_data["functionalities"][3]
-        resp = test_app.get("/admin/functionalities/{}/duplicate".format(functionality.id), status=200)
+
+        resp = test_app.get(f"/admin/functionalities/{functionality.id}/duplicate", status=200)
+
         form = resp.form
-        assert "" == self.get_first_field_named(form, "id").value
-        self.set_first_field_named(form, "name", "clone")
+        assert form["name"].value == functionality.name
+        assert form["description"].value == functionality.description
+        assert form["value"].value == functionality.value
+        form["value"].value = "another_value"
         resp = form.submit("submit")
+
         assert resp.status_int == 302
-        functionality = dbsession.query(Functionality).filter(Functionality.name == "clone").one()
+        functionality = (
+            dbsession.query(Functionality)
+            .filter(Functionality.name == functionality.name)
+            .filter(Functionality.value == "another_value")
+            .one()
+        )
         assert str(functionality.id) == re.match(
             r"http://localhost/admin/functionalities/(.*)\?msg_col=submit_ok", resp.location
         ).group(1)

tests/test_home.py

@@ -5,7 +5,6 @@ from . import AbstractViewsTests
 
 @pytest.mark.usefixtures("test_app")
 class TestHome(AbstractViewsTests):
-
     _prefix = "/admin/"
 
     def test_index_rendering(self, test_app):