Merge branch 'develop' into feature/api/remodel_gis_queries

openatlas/api/openapi.json

@@ -135,7 +135,9 @@
     },
     "/entity_presentation_view/{entityId}": {
       "get": {
-        "tags": ["Proposal"],
+        "tags": [
+          "Proposal"
+        ],
         "description": "Retrieves an Entity with its linked data for presentation sites",
         "parameters": [
           {
@@ -2341,10 +2343,7 @@
                 "type",
                 "crmClass",
                 "systemClass",
-                "viewClass",
-                "properties",
-                "descriptions",
-                "geometry"
+                "viewClass"
               ],
               "properties": {
                 "@id": {
@@ -4669,12 +4668,7 @@
           "systemClass",
           "title",
           "description",
-          "geometries",
-          "when",
-          "types",
-          "externalReferenceSystems",
-          "files",
-          "relations"
+          "aliases"
         ],
         "properties": {
           "id": {
@@ -4696,6 +4690,7 @@
             }
           },
           "geometries": {
+            "nullable": true,
             "type": "object",
             "required": [
               "type",
@@ -4726,21 +4721,25 @@
             }
           },
           "when": {
+            "nullable": true,
             "$ref": "#/components/schemas/TimeRangeModel"
           },
           "types": {
+            "nullable": true,
             "type": "array",
             "items": {
               "$ref": "#/components/schemas/EntityTypeModel"
             }
           },
           "externalReferenceSystems": {
+            "nullable": true,
             "type": "array",
             "items": {
               "$ref": "#/components/schemas/ExternalReferenceModel"
             }
           },
           "files": {
+            "nullable": true,
             "type": "array",
             "items": {
               "type": "object",
@@ -4759,6 +4758,7 @@
                   "type": "string"
                 },
                 "license": {
+                  "nullable": true,
                   "type": "string"
                 },
                 "creator": {
@@ -4770,6 +4770,7 @@
                   "nullable": true
                 },
                 "publicShareable": {
+                  "nullable": true,
                   "type": "boolean"
                 },
                 "mimetype": {
@@ -4987,6 +4988,7 @@
       },
       "EntityTypeModel": {
         "type": "object",
+        "nullable": true,
         "required": [
           "id",
           "title",
@@ -5007,6 +5009,7 @@
             "type": "boolean"
           },
           "typeHierarchy": {
+            "nullable": true,
             "type": "array",
             "items": {
               "$ref": "#/components/schemas/TypeHierarchyEntryModel"
@@ -5034,6 +5037,7 @@
         }
       },
       "ExternalReferenceModel": {
+        "nullable": true,
         "type": "object",
         "required": [
           "type",
@@ -5065,6 +5069,7 @@
         }
       },
       "RelatedEntityModel": {
+        "nullable": true,
         "type": "object",
         "required": [
           "id",
@@ -5120,6 +5125,7 @@
         }
       },
       "RelationTypeModel": {
+        "nullable": true,
         "type": "object",
         "required": [
           "property",

openatlas/display/classes_base.py

@@ -261,6 +261,7 @@ def add_tabs(self) -> None:
                 'artifact', 'reference', 'file']:
             if entity.class_.name == 'group' or name != 'member':
                 self.tabs[name] = Tab(name, entity=entity)
+        self.tabs['member_of'].label = _('member of')
         self.add_reference_tables_data()
         self.event_links = \
             entity.get_links(['P11', 'P14', 'P22', 'P23', 'P25'], True)

openatlas/display/tab.py

@@ -14,32 +14,13 @@
 if TYPE_CHECKING:  # pragma: no cover
     from openatlas.models.entity import Entity
 
-# Needed for translations of tab titles
-_('bookmarks')
-_('circular dependencies')
-_('export')
-_('invalid dates')
-_('invalid link dates')
-_('invalid involvement dates')
-_('invalid preceding dates')
-_('invalid sub dates')
-_('member of')
-_('missing files')
-_('modules')
-_('notes')
-_('orphaned files')
-_('orphaned iiif files')
-_('orphaned subunits')
-_('presentation site')
-_('texts')
-_('unlinked')
-
 
 class Tab:
 
     def __init__(
             self,
             name: str,
+            label: Optional[str] = None,
             content: Optional[str] = None,
             table: Optional[Table] = None,
             buttons: Optional[list[str]] = None,
@@ -48,6 +29,7 @@ def __init__(
             tooltip: Optional[str] = None) -> None:
 
         self.name = name
+        self.label = uc_first(label or _(name))
         self.content = content
         self.entity = entity
         self.form = form

openatlas/display/util.py

@@ -203,16 +203,22 @@ def bookmark_toggle(entity_id: int, for_table: bool = False) -> str:
 
 
 @app.template_filter()
-def display_menu(entity: Optional[Entity], origin: Optional[Entity]) -> str:
+def menu(entity: Optional[Entity], origin: Optional[Entity]) -> str:
     view_name = ''
     if entity:
         view_name = entity.class_.view
     if origin:
         view_name = origin.class_.view
     html = ''
-    for item in [
-            'source', 'event', 'actor', 'place', 'artifact', 'reference',
-            'type', 'file']:
+    for item, label in {
+            'source': _('source'),
+            'event': _('event'),
+            'actor': _('actor'),
+            'place': _('place'),
+            'artifact': _('artifact'),
+            'reference': _('reference'),
+            'type': _('type'),
+            'file': _('file')}.items():
         active = ''
         request_parts = request.path.split('/')
         if view_name == item \
@@ -225,7 +231,7 @@ def display_menu(entity: Optional[Entity], origin: Optional[Entity]) -> str:
                     and g.class_view_mapping[name] == item:
                 active = 'active'
         html += link(
-            _(item),
+            label,
             url_for(f'{item}_index') if item in ['file', 'type']
             else url_for("index", view=item),
             f'nav-item nav-link fw-bold uc-first {active}')

openatlas/templates/admin/data.html

@@ -42,7 +42,7 @@ <h1 class="mb-1">{{ 'API'|uc_first }}</h1>
         <div class="col-auto">{{ _('edit')|button(url_for('settings', category='api'))|safe }}</div>
       {% endif %}
       {% if 'admin'|is_authorized %}
-        <div class="col-auto">{{ _('api token')|button(url_for('api_token'))|safe }}</div>
+        <div class="col-auto">{{ _('token')|button(url_for('api_token'))|safe }}</div>
       {% endif %}
   </div>
   {{ info|display_info|safe }}

openatlas/templates/layout.html

@@ -71,7 +71,7 @@
     <div class="collapse navbar-collapse" id="navbarNavAltMarkup">
       <div class="navbar-nav me-auto mb-4 mb-md-0">
         {% if current_user.is_authenticated %}
-          {{ entity|display_menu(origin=origin)|safe }}
+          {{ entity|menu(origin=origin)|safe }}
         {% endif %}
       </div>
       <div class="navbar">

openatlas/templates/tabs.html

@@ -18,9 +18,9 @@
                   title="{{ tab.tooltip }}"
                   data-bs-placement="top"
                   class="d-flex gap-1">
-                {{ _(tab.name|replace('_', ' '))|uc_first }}
+                {{ tab.label }}
                 {% if tab.table.rows|length %}
-                <span class="tab-counter badge align-self-center">{{
+                  <span class="tab-counter badge align-self-center">{{
                   '{0:,}'.format(tab.table.rows|length) }}</span>
                 {% endif %}
               </span>
@@ -39,7 +39,7 @@
               {{ tab.content|safe }}
             {% endif %}
             {% if tab.form %}
-              {{ tab.form|display_form |safe }}
+              {{ tab.form|display_form|safe }}
             {% endif %}
             {% if tab.table.rows %}
               {{ tab.table.display(tab.name)|safe }}