Code improvements

CHANGES.rst

@@ -4,8 +4,14 @@ Changelog
 6.1.15 (unreleased)
 -------------------
 
-- Nothing changed yet.
-
+- Remove unused behavior (design.plone.contenttypes.behavior.geolocation_uo).
+  [cekk]
+- Standardize subfolders creations in events.
+  [cekk]
+- Do not return a fieldset if it has all fields hidden (maybe after a schema tweak).
+  [cekk]
+- Improve types test for their schema, required fields, fieldsets.
+  [cekk]
 
 6.1.14 (2024-02-20)
 -------------------
@@ -19,7 +25,6 @@ Changelog
   [eikichi18]
 
 
-
 6.1.13 (2024-02-08)
 -------------------
 

base.cfg

@@ -143,3 +143,4 @@ design.plone.contenttypes =
 #redturtle.volto = git https://github.com/RedTurtle/redturtle.volto.git [email protected]:RedTurtle/redturtle.volto.git
 #redturtle.bandi = git https://github.com/RedTurtle/redturtle.bandi.git [email protected]:RedTurtle/redturtle.bandi.git
 #plone.restapi = git https://github.com/plone/plone.restapi.git
+collective.volto.enhancedlinks = git https://github.com/RegioneER/collective.volto.enhancedlinks.git [email protected]:RegioneER/collective.volto.enhancedlinks.git branch=main

setup.py

@@ -66,6 +66,7 @@
         "z3c.unconfigure",
         "eea.api.taxonomy",
         "openpyxl",
+        "collective.volto.enhancedlinks",
     ],
     extras_require={
         "test": [

src/design/plone/contenttypes/adapters/configure.zcml

@@ -20,4 +20,5 @@
       factory=".searchabletext_indexers.TextBlockSearchableText"
       name="text"
       />
+
 </configure>

src/design/plone/contenttypes/behaviors/configure.zcml

@@ -261,14 +261,6 @@
       provides=".contatti.IContattiEvent"
       marker=".contatti.IContattiEvent"
       />
-  <plone:behavior
-      name="design.plone.contenttypes.behavior.geolocation_uo"
-      title="Geolocatable"
-      description="Behavior geolocatable per UO."
-      factory=".geolocation.GeolocatableUnitaOrganizzativa"
-      provides=".geolocation.IGeolocatableUnitaOrganizzativa"
-      marker=".geolocation.IGeolocatableUnitaOrganizzativa"
-      />
   <plone:behavior
       name="design.plone.contenttypes.behavior.geolocation_venue"
       title="Geolocatable"

src/design/plone/contenttypes/events/common.py

@@ -1,4 +1,142 @@
 # -*- coding: utf-8 -*-
+from design.plone.contenttypes.interfaces import IDesignPloneContenttypesLayer
+from design.plone.contenttypes.utils import create_default_blocks
+from plone import api
+from Products.CMFPlone.interfaces import ISelectableConstrainTypes
+
+
+SUBFOLDERS_MAPPING = {
+    "Bando": [
+        {"id": "documenti", "title": "Documenti", "type": "Bando Folder Deepening"},
+        {
+            "id": "comunicazioni",
+            "title": "Comunicazioni",
+            "type": "Bando Folder Deepening",
+        },
+        {"id": "esiti", "title": "Esiti", "type": "Bando Folder Deepening"},
+    ],
+    "Documento": [
+        {
+            "id": "multimedia",
+            "title": "Multimedia",
+            "type": "Document",
+            "allowed_types": ("Image",),
+        },
+    ],
+    "Event": [
+        {
+            "id": "immagini",
+            "title": "Immagini",
+            "allowed_types": ("Image", "Link"),
+            "publish": True,
+        },
+        {
+            "id": "video",
+            "title": "Video",
+            "allowed_types": ("Link",),
+            "publish": True,
+        },
+        {
+            "id": "sponsor_evento",
+            "title": "Sponsor Evento",
+            "allowed_types": ("Link",),
+            "publish": True,
+        },
+        {
+            "id": "documenti",
+            "title": "Allegati",
+            "allowed_types": ("File",),
+            "publish": True,
+        },
+    ],
+    "Incarico": [
+        {"id": "compensi-file", "title": "Compensi", "allowed": ("File",)},
+        {
+            "id": "importi-di-viaggio-e-o-servizi",
+            "title": "Importi di viaggio e/o servizi",
+            "allowed_types": ("File",),
+        },
+    ],
+    "Venue": [
+        {
+            "id": "multimedia",
+            "title": "Multimedia",
+            "type": "Folder",
+            "allowed_types": (
+                "Image",
+                "Link",
+            ),
+            "publish": True,
+        }
+    ],
+    "News Item": [
+        {
+            "id": "multimedia",
+            "title": "Multimedia",
+            "allowed_types": (
+                "Image",
+                "Link",
+            ),
+        },
+        {
+            "id": "documenti-allegati",
+            "title": "Documenti allegati",
+            "allowed_types": (
+                "File",
+                "Image",
+            ),
+        },
+    ],
+    "Persona": [
+        {
+            "id": "foto-e-attivita-politica",
+            "title": "Foto e attività politica",
+            "allowed_types": ("Image",),
+        },
+        {
+            "id": "curriculum-vitae",
+            "title": "Curriculum vitae",
+            "allowed_types": ("File",),
+        },
+        {
+            "id": "situazione-patrimoniale",
+            "title": "Situazione patrimoniale",
+            "allowed_types": ("File",),
+        },
+        {
+            "id": "dichiarazione-dei-redditi",
+            "title": "Dichiarazione dei redditi",
+            "allowed_types": ("File",),
+        },
+        {
+            "id": "spese-elettorali",
+            "title": "Spese elettorali",
+            "allowed_types": ("File",),
+        },
+        {
+            "id": "variazione-situazione-patrimoniale",
+            "title": "Variazione situazione patrimoniale",
+            "allowed_types": ("File",),
+        },
+        {"id": "altre-cariche", "title": "Altre cariche", "allowed_types": ("File",)},
+        {"id": "incarichi", "title": "Incarichi", "allowed_types": ("Incarico",)},
+    ],
+    "Pratica": [
+        {
+            "id": "allegati",
+            "title": "Allegati",
+            "type": "Folder",
+            "allowed_types": ("File",),
+        }
+    ],
+    "Servizio": [
+        {"id": "modulistica", "title": "Modulistica", "contains": ("File", "Link")},
+        {"id": "allegati", "title": "Allegati", "contains": ("File", "Link")},
+    ],
+    "UnitaOrganizzativa": [
+        {"id": "allegati", "title": "Allegati", "contains": ("File",)},
+    ],
+}
 
 
 def onModify(context, event):
@@ -8,3 +146,34 @@ def onModify(context, event):
         ) or "IDublinCore.title" in getattr(description, "attributes", []):
             for child in context.listFolderContents():
                 child.reindexObject(idxs=["parent"])
+
+
+def createSubfolders(context, event):
+    """
+    Create subfolders structure based on a portal_type mapping
+    """
+    if not IDesignPloneContenttypesLayer.providedBy(context.REQUEST):
+        return
+
+    subfolders_mapping = SUBFOLDERS_MAPPING.get(context.portal_type, [])
+    if not subfolders_mapping:
+        return
+    for mapping in subfolders_mapping:
+        if mapping["id"] not in context.keys():
+            child = api.content.create(
+                container=context,
+                type=mapping.get("type", "Document"),
+                title=mapping["title"],
+                id=mapping["id"],
+            )
+            create_default_blocks(context=child)
+
+            # select constraints
+            if mapping.get("allowed_types", ()):
+                constraintsChild = ISelectableConstrainTypes(child)
+                constraintsChild.setConstrainTypesMode(1)
+                constraintsChild.setLocallyAllowedTypes(mapping["allowed_types"])
+
+            if mapping.get("publish", False):
+                with api.env.adopt_roles(["Reviewer"]):
+                    api.content.transition(obj=child, transition="publish")

src/design/plone/contenttypes/events/configure.zcml

@@ -5,46 +5,6 @@
     i18n_domain="design.plone.contenttypes"
     >
 
-  <subscriber
-      for="design.plone.contenttypes.interfaces.pratica.IPratica
-           zope.lifecycleevent.interfaces.IObjectAddedEvent"
-      handler=".pratica.praticaCreateHandler"
-      />
-  <subscriber
-      for="collective.venue.interfaces.IVenue
-           zope.lifecycleevent.interfaces.IObjectAddedEvent"
-      handler=".luogo.luogoCreateHandler"
-      />
-  <subscriber
-      for="design.plone.contenttypes.interfaces.unita_organizzativa.IUnitaOrganizzativa
-           zope.lifecycleevent.interfaces.IObjectAddedEvent"
-      handler=".unita_organizzativa.unitaOrganizzativaCreateHandler"
-      />
-  <subscriber
-      for="design.plone.contenttypes.interfaces.persona.IPersona
-           zope.lifecycleevent.interfaces.IObjectAddedEvent"
-      handler=".persona.personaCreateHandler"
-      />
-  <subscriber
-      for="plone.event.interfaces.IEvent
-           zope.lifecycleevent.interfaces.IObjectAddedEvent"
-      handler=".evento.eventoCreateHandler"
-      />
-  <subscriber
-      for="design.plone.contenttypes.interfaces.documento.IDocumento
-           zope.lifecycleevent.interfaces.IObjectAddedEvent"
-      handler=".documento.documentoCreateHandler"
-      />
-  <subscriber
-      for="design.plone.contenttypes.interfaces.servizio.IServizio
-           zope.lifecycleevent.interfaces.IObjectAddedEvent"
-      handler=".servizio.servizioCreateHandler"
-      />
-  <subscriber
-      for="plone.app.contenttypes.interfaces.INewsItem
-           zope.lifecycleevent.interfaces.IObjectAddedEvent"
-      handler=".notizie_e_comunicati_stampa.notiziaCreateHandler"
-      />
   <subscriber
       for="design.plone.contenttypes.interfaces.pagina_argomento.IPaginaArgomento
            zope.lifecycleevent.interfaces.IObjectModifiedEvent"
@@ -55,16 +15,6 @@
            zope.lifecycleevent.interfaces.IObjectAddedEvent"
       handler=".document.documentCreateHandler"
       />
-  <subscriber
-      for="redturtle.bandi.interfaces.bando.IBando
-           zope.lifecycleevent.interfaces.IObjectAddedEvent"
-      handler=".bando.bandoCreateHandler"
-      />
-  <subscriber
-      for="design.plone.contenttypes.interfaces.incarico.IIncarico
-           zope.lifecycleevent.interfaces.IObjectAddedEvent"
-      handler=".incarico.incaricoCreateHandler"
-      />
   <subscriber
       for="design.plone.contenttypes.interfaces.incarico.IIncarico
            zope.lifecycleevent.interfaces.IObjectModifiedEvent"
@@ -76,5 +26,9 @@
            zope.lifecycleevent.interfaces.IObjectModifiedEvent"
       handler=".common.onModify"
       />
-
+  <subscriber
+      for="plone.dexterity.interfaces.IDexterityContent
+           zope.lifecycleevent.interfaces.IObjectAddedEvent"
+      handler=".common.createSubfolders"
+      />
 </configure>