swh.web 0.14.2__py3-none-any.whl → 0.15.0__py3-none-any.whl

swh/web/static/jssources/swh/web/browse/assets/browse/sidetabs.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2024  The Software Heritage developers
+ * Copyright (C) 2018-2025  The Software Heritage developers
  * See the AUTHORS file at the top-level directory of this distribution
  * License: GNU Affero General Public License version 3, or any later version
  * See top-level LICENSE file for more information
@@ -92,7 +92,7 @@ function updateTabsSize() {
   const top = window.innerHeight >= 700 ? 250 : 35;
   $('.swh-side-tab').css('top', top + 'px');
   // move citations tab handle below the permalinks one
-  $('#swh-citations .handle').css('top', '105px');
+  $('#swh-citations .handle').css('top', '128px');
 
   // backup current display states for tab contents
   const currentSWHIDsDisplay = $('#swh-identifiers-content').css('display');
@@ -244,6 +244,11 @@ export async function initSideTabs() {
         $('#swh-identifiers').data('opening', false);
         $('#swhids-handle').attr('aria-expanded', 'true');
         $('#swhids-handle').attr('aria-label', 'Collapse permalinks tab');
+        $('#swhids-handle').attr('title', 'Collapse permalinks tab');
+        $('#citations-handle').attr('aria-label', 'Display citations tab');
+        $('#citations-handle').attr('title', 'Display citations tab');
+        $('.tab-handle-arrow').removeClass('mdi-chevron-up');
+        $('.tab-handle-arrow').addClass('mdi-chevron-down');
       },
       onBeforeClose: function() {
         $('#swh-identifiers').data('closing', true);
@@ -257,6 +262,9 @@ export async function initSideTabs() {
         $('#swh-identifiers').data('closing', false);
         $('#swhids-handle').attr('aria-expanded', 'false');
         $('#swhids-handle').attr('aria-label', 'Expand permalinks tab');
+        $('#swhids-handle').attr('title', 'Expand permalinks tab');
+        $('.tab-handle-arrow').removeClass('mdi-chevron-down');
+        $('.tab-handle-arrow').addClass('mdi-chevron-up');
         $('#swhids-handle').css('padding-bottom', '0.1em');
         setTimeout(() => {
           // ensure elements in closed SWHIDs tab are not keyboard focusable
@@ -275,6 +283,10 @@ export async function initSideTabs() {
           // display SWHIDs tab content if not visible
           toggleTabContentDisplay('#swh-identifiers', true);
           toggleTabContentDisplay('#swh-citations', false);
+          $('#citations-handle').attr('aria-label', 'Display citations tab');
+          $('#citations-handle').attr('title', 'Display citations tab');
+          $('#swhids-handle').attr('aria-label', 'Collapse permalinks tab');
+          $('#swhids-handle').attr('title', 'Collapse permalinks tab');
         } else {
           $('#swh-identifiers').trigger('close');
         }
@@ -322,6 +334,9 @@ export async function initSideTabs() {
           $('#swh-citations').data('opening', false);
           $('#citations-handle').attr('aria-expanded', 'true');
           $('#citations-handle').attr('aria-label', 'Collapse citations tab');
+          $('#citations-handle').attr('title', 'Collapse citations tab');
+          $('#swhids-handle').attr('aria-label', 'Display permalinks tab');
+          $('#swhids-handle').attr('title', 'Display permalinks tab');
         },
         onBeforeClose: function() {
           $('#swh-citations').data('closing', true);
@@ -335,6 +350,7 @@ export async function initSideTabs() {
           $('#swh-citations').data('closing', false);
           $('#citations-handle').attr('aria-expanded', 'false');
           $('#citations-handle').attr('aria-label', 'Expand citations tab');
+          $('#citations-handle').attr('title', 'Expand citations tab');
           $('#citations-handle').css('padding-bottom', '0.1em');
           setTimeout(() => {
             // ensure elements in closed citations tab are not keyboard focusable
@@ -353,6 +369,10 @@ export async function initSideTabs() {
             // display citation tab content if not visible
             toggleTabContentDisplay('#swh-identifiers', false);
             toggleTabContentDisplay('#swh-citations', true);
+            $('#swhids-handle').attr('aria-label', 'Display permalinks tab');
+            $('#swhids-handle').attr('title', 'Display permalinks tab');
+            $('#citations-handle').attr('aria-label', 'Collapse citations tab');
+            $('#citations-handle').attr('title', 'Collapse citations tab');
           } else {
             $('#swh-citations').trigger('close');
           }

swh/web/static/jssources/swh/web/webapp/assets/webapp/webapp-utils.js

@@ -138,6 +138,16 @@ $(document).ready(() => {
     }
   });
 
+  // modals in DOM are forced to not be displayed by default to avoid
+  // issues when animations are disabled, we need to set some event
+  // handlers forcing their display/hiding to restore expected behavior
+  $('.modal.fade').on('show.bs.modal', event => {
+    $(event.target).removeClass('d-none');
+  });
+  $('.modal.fade').on('hidden.bs.modal', event => {
+    $(event.target).addClass('d-none');
+  });
+
 });
 
 export function initPage(page) {

swh/web/static/webpack-stats.json

@@ -51,15 +51,15 @@
       "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/css/badges.52d6fb6f998319e1690a.css.map",
       "publicPath": "/static/css/badges.52d6fb6f998319e1690a.css.map"
     },
-    "css/browse.5775e0a313f4ccb8aef5.css": {
-      "name": "css/browse.5775e0a313f4ccb8aef5.css",
-      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/css/browse.5775e0a313f4ccb8aef5.css",
-      "publicPath": "/static/css/browse.5775e0a313f4ccb8aef5.css"
+    "css/browse.0a250d3b07ce628588a5.css": {
+      "name": "css/browse.0a250d3b07ce628588a5.css",
+      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/css/browse.0a250d3b07ce628588a5.css",
+      "publicPath": "/static/css/browse.0a250d3b07ce628588a5.css"
     },
-    "css/browse.5775e0a313f4ccb8aef5.css.map": {
-      "name": "css/browse.5775e0a313f4ccb8aef5.css.map",
-      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/css/browse.5775e0a313f4ccb8aef5.css.map",
-      "publicPath": "/static/css/browse.5775e0a313f4ccb8aef5.css.map"
+    "css/browse.0a250d3b07ce628588a5.css.map": {
+      "name": "css/browse.0a250d3b07ce628588a5.css.map",
+      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/css/browse.0a250d3b07ce628588a5.css.map",
+      "publicPath": "/static/css/browse.0a250d3b07ce628588a5.css.map"
     },
     "css/guided_tour.96ec07d95e2576133b7b.css": {
       "name": "css/guided_tour.96ec07d95e2576133b7b.css",
@@ -644,20 +644,20 @@
       "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/alter.5fc556e2e1ea9a108e8b.js.map",
       "publicPath": "/static/js/alter.5fc556e2e1ea9a108e8b.js.map"
     },
-    "js/archive_coverage.b37e2158e800bc69180b.js": {
-      "name": "js/archive_coverage.b37e2158e800bc69180b.js",
-      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/archive_coverage.b37e2158e800bc69180b.js",
-      "publicPath": "/static/js/archive_coverage.b37e2158e800bc69180b.js"
+    "js/archive_coverage.71f6961fbdc0d76c313b.js": {
+      "name": "js/archive_coverage.71f6961fbdc0d76c313b.js",
+      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/archive_coverage.71f6961fbdc0d76c313b.js",
+      "publicPath": "/static/js/archive_coverage.71f6961fbdc0d76c313b.js"
     },
-    "js/archive_coverage.b37e2158e800bc69180b.js.LICENSE.txt": {
-      "name": "js/archive_coverage.b37e2158e800bc69180b.js.LICENSE.txt",
-      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/archive_coverage.b37e2158e800bc69180b.js.LICENSE.txt",
-      "publicPath": "/static/js/archive_coverage.b37e2158e800bc69180b.js.LICENSE.txt"
+    "js/archive_coverage.71f6961fbdc0d76c313b.js.LICENSE.txt": {
+      "name": "js/archive_coverage.71f6961fbdc0d76c313b.js.LICENSE.txt",
+      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/archive_coverage.71f6961fbdc0d76c313b.js.LICENSE.txt",
+      "publicPath": "/static/js/archive_coverage.71f6961fbdc0d76c313b.js.LICENSE.txt"
     },
-    "js/archive_coverage.b37e2158e800bc69180b.js.map": {
-      "name": "js/archive_coverage.b37e2158e800bc69180b.js.map",
-      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/archive_coverage.b37e2158e800bc69180b.js.map",
-      "publicPath": "/static/js/archive_coverage.b37e2158e800bc69180b.js.map"
+    "js/archive_coverage.71f6961fbdc0d76c313b.js.map": {
+      "name": "js/archive_coverage.71f6961fbdc0d76c313b.js.map",
+      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/archive_coverage.71f6961fbdc0d76c313b.js.map",
+      "publicPath": "/static/js/archive_coverage.71f6961fbdc0d76c313b.js.map"
     },
     "js/auth.971392ebe3f22c222189.js": {
       "name": "js/auth.971392ebe3f22c222189.js",
@@ -684,20 +684,20 @@
       "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/badges.fba53d5f61bed948ddd4.js.map",
       "publicPath": "/static/js/badges.fba53d5f61bed948ddd4.js.map"
     },
-    "js/browse.b150f8992236375f2e9b.js": {
-      "name": "js/browse.b150f8992236375f2e9b.js",
-      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/browse.b150f8992236375f2e9b.js",
-      "publicPath": "/static/js/browse.b150f8992236375f2e9b.js"
+    "js/browse.d5014e5cae44a2cd3e6e.js": {
+      "name": "js/browse.d5014e5cae44a2cd3e6e.js",
+      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/browse.d5014e5cae44a2cd3e6e.js",
+      "publicPath": "/static/js/browse.d5014e5cae44a2cd3e6e.js"
     },
-    "js/browse.b150f8992236375f2e9b.js.LICENSE.txt": {
-      "name": "js/browse.b150f8992236375f2e9b.js.LICENSE.txt",
-      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/browse.b150f8992236375f2e9b.js.LICENSE.txt",
-      "publicPath": "/static/js/browse.b150f8992236375f2e9b.js.LICENSE.txt"
+    "js/browse.d5014e5cae44a2cd3e6e.js.LICENSE.txt": {
+      "name": "js/browse.d5014e5cae44a2cd3e6e.js.LICENSE.txt",
+      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/browse.d5014e5cae44a2cd3e6e.js.LICENSE.txt",
+      "publicPath": "/static/js/browse.d5014e5cae44a2cd3e6e.js.LICENSE.txt"
     },
-    "js/browse.b150f8992236375f2e9b.js.map": {
-      "name": "js/browse.b150f8992236375f2e9b.js.map",
-      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/browse.b150f8992236375f2e9b.js.map",
-      "publicPath": "/static/js/browse.b150f8992236375f2e9b.js.map"
+    "js/browse.d5014e5cae44a2cd3e6e.js.map": {
+      "name": "js/browse.d5014e5cae44a2cd3e6e.js.map",
+      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/browse.d5014e5cae44a2cd3e6e.js.map",
+      "publicPath": "/static/js/browse.d5014e5cae44a2cd3e6e.js.map"
     },
     "js/d3.2fe5b1ddad0dbb25a61b.js": {
       "name": "js/d3.2fe5b1ddad0dbb25a61b.js",
@@ -1125,20 +1125,20 @@
       "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/pdf.worker.min.js.LICENSE.txt",
       "publicPath": "/static/js/pdf.worker.min.js.LICENSE.txt"
     },
-    "js/pdfjs.ca88359f90430972e38c.js": {
-      "name": "js/pdfjs.ca88359f90430972e38c.js",
-      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/pdfjs.ca88359f90430972e38c.js",
-      "publicPath": "/static/js/pdfjs.ca88359f90430972e38c.js"
+    "js/pdfjs.97ecbde9d93314dba75a.js": {
+      "name": "js/pdfjs.97ecbde9d93314dba75a.js",
+      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/pdfjs.97ecbde9d93314dba75a.js",
+      "publicPath": "/static/js/pdfjs.97ecbde9d93314dba75a.js"
     },
-    "js/pdfjs.ca88359f90430972e38c.js.LICENSE.txt": {
-      "name": "js/pdfjs.ca88359f90430972e38c.js.LICENSE.txt",
-      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/pdfjs.ca88359f90430972e38c.js.LICENSE.txt",
-      "publicPath": "/static/js/pdfjs.ca88359f90430972e38c.js.LICENSE.txt"
+    "js/pdfjs.97ecbde9d93314dba75a.js.LICENSE.txt": {
+      "name": "js/pdfjs.97ecbde9d93314dba75a.js.LICENSE.txt",
+      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/pdfjs.97ecbde9d93314dba75a.js.LICENSE.txt",
+      "publicPath": "/static/js/pdfjs.97ecbde9d93314dba75a.js.LICENSE.txt"
     },
-    "js/pdfjs.ca88359f90430972e38c.js.map": {
-      "name": "js/pdfjs.ca88359f90430972e38c.js.map",
-      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/pdfjs.ca88359f90430972e38c.js.map",
-      "publicPath": "/static/js/pdfjs.ca88359f90430972e38c.js.map"
+    "js/pdfjs.97ecbde9d93314dba75a.js.map": {
+      "name": "js/pdfjs.97ecbde9d93314dba75a.js.map",
+      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/pdfjs.97ecbde9d93314dba75a.js.map",
+      "publicPath": "/static/js/pdfjs.97ecbde9d93314dba75a.js.map"
     },
     "js/revision.c5f4750ef7caee355fd9.js": {
       "name": "js/revision.c5f4750ef7caee355fd9.js",
@@ -1200,35 +1200,35 @@
       "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/vault.8c6e8e445d128eb30488.js.map",
       "publicPath": "/static/js/vault.8c6e8e445d128eb30488.js.map"
     },
-    "js/vendors.076b42bbe0326fc632ae.js": {
-      "name": "js/vendors.076b42bbe0326fc632ae.js",
-      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/vendors.076b42bbe0326fc632ae.js",
-      "publicPath": "/static/js/vendors.076b42bbe0326fc632ae.js"
+    "js/vendors.532425b092b95d43a1d6.js": {
+      "name": "js/vendors.532425b092b95d43a1d6.js",
+      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/vendors.532425b092b95d43a1d6.js",
+      "publicPath": "/static/js/vendors.532425b092b95d43a1d6.js"
     },
-    "js/vendors.076b42bbe0326fc632ae.js.LICENSE.txt": {
-      "name": "js/vendors.076b42bbe0326fc632ae.js.LICENSE.txt",
-      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/vendors.076b42bbe0326fc632ae.js.LICENSE.txt",
-      "publicPath": "/static/js/vendors.076b42bbe0326fc632ae.js.LICENSE.txt"
+    "js/vendors.532425b092b95d43a1d6.js.LICENSE.txt": {
+      "name": "js/vendors.532425b092b95d43a1d6.js.LICENSE.txt",
+      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/vendors.532425b092b95d43a1d6.js.LICENSE.txt",
+      "publicPath": "/static/js/vendors.532425b092b95d43a1d6.js.LICENSE.txt"
     },
-    "js/vendors.076b42bbe0326fc632ae.js.map": {
-      "name": "js/vendors.076b42bbe0326fc632ae.js.map",
-      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/vendors.076b42bbe0326fc632ae.js.map",
-      "publicPath": "/static/js/vendors.076b42bbe0326fc632ae.js.map"
+    "js/vendors.532425b092b95d43a1d6.js.map": {
+      "name": "js/vendors.532425b092b95d43a1d6.js.map",
+      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/vendors.532425b092b95d43a1d6.js.map",
+      "publicPath": "/static/js/vendors.532425b092b95d43a1d6.js.map"
     },
-    "js/webapp.ec7025df24c9f358f1cc.js": {
-      "name": "js/webapp.ec7025df24c9f358f1cc.js",
-      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/webapp.ec7025df24c9f358f1cc.js",
-      "publicPath": "/static/js/webapp.ec7025df24c9f358f1cc.js"
+    "js/webapp.5427bd8b32cec7de0951.js": {
+      "name": "js/webapp.5427bd8b32cec7de0951.js",
+      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/webapp.5427bd8b32cec7de0951.js",
+      "publicPath": "/static/js/webapp.5427bd8b32cec7de0951.js"
     },
-    "js/webapp.ec7025df24c9f358f1cc.js.LICENSE.txt": {
-      "name": "js/webapp.ec7025df24c9f358f1cc.js.LICENSE.txt",
-      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/webapp.ec7025df24c9f358f1cc.js.LICENSE.txt",
-      "publicPath": "/static/js/webapp.ec7025df24c9f358f1cc.js.LICENSE.txt"
+    "js/webapp.5427bd8b32cec7de0951.js.LICENSE.txt": {
+      "name": "js/webapp.5427bd8b32cec7de0951.js.LICENSE.txt",
+      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/webapp.5427bd8b32cec7de0951.js.LICENSE.txt",
+      "publicPath": "/static/js/webapp.5427bd8b32cec7de0951.js.LICENSE.txt"
     },
-    "js/webapp.ec7025df24c9f358f1cc.js.map": {
-      "name": "js/webapp.ec7025df24c9f358f1cc.js.map",
-      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/webapp.ec7025df24c9f358f1cc.js.map",
-      "publicPath": "/static/js/webapp.ec7025df24c9f358f1cc.js.map"
+    "js/webapp.5427bd8b32cec7de0951.js.map": {
+      "name": "js/webapp.5427bd8b32cec7de0951.js.map",
+      "path": "/var/lib/jenkins/agent-workdir/workspace/DWAPPS/pypi-upload/swh/web/static/js/webapp.5427bd8b32cec7de0951.js.map",
+      "publicPath": "/static/js/webapp.5427bd8b32cec7de0951.js.map"
     },
     "robots.txt": {
       "name": "robots.txt",
@@ -1247,7 +1247,7 @@
     ],
     "archive_coverage": [
       "css/archive_coverage.70eba3d32ed75472d638.css",
-      "js/archive_coverage.b37e2158e800bc69180b.js"
+      "js/archive_coverage.71f6961fbdc0d76c313b.js"
     ],
     "auth": [
       "css/auth.4d6bb8912926efb08000.css",
@@ -1258,8 +1258,8 @@
       "js/badges.fba53d5f61bed948ddd4.js"
     ],
     "browse": [
-      "css/browse.5775e0a313f4ccb8aef5.css",
-      "js/browse.b150f8992236375f2e9b.js"
+      "css/browse.0a250d3b07ce628588a5.css",
+      "js/browse.d5014e5cae44a2cd3e6e.js"
     ],
     "deposit": [
       "js/deposit.060ba94288f399dfe89e.js"
@@ -1288,11 +1288,11 @@
     ],
     "vendors": [
       "css/vendors.2aeca7777ec7af396ad7.css",
-      "js/vendors.076b42bbe0326fc632ae.js"
+      "js/vendors.532425b092b95d43a1d6.js"
     ],
     "webapp": [
       "css/webapp.4655323082740f1a4862.css",
-      "js/webapp.ec7025df24c9f358f1cc.js"
+      "js/webapp.5427bd8b32cec7de0951.js"
     ]
   },
   "publicPath": "/static/"

swh/web/utils/archive.py

@@ -560,12 +560,17 @@ def lookup_origin_intrinsic_metadata(
 
 def _lookup_directory_intrinsic_citation_metadata(
     directory_id: str,
+    max_top_level_dir_recurse: int = 3,
 ) -> List[IntrinsicMetadataFile]:
     """Get raw intrinsic metadata given a directory id, respectively original codemeta.json
     and citation.cff found in this directory.
 
+    If the directory only contains a single directory, that function will recurse.
+
     Args:
         directory_id: hexadecimal representation of a directory id (sha1_git)
+        max_top_level_dir_recurse: the maximum number of recursion to
+            perform in case of top level directories to traverse
 
     Returns:
         list of intrinsic metadata files info
@@ -590,6 +595,13 @@ def _lookup_directory_intrinsic_citation_metadata(
             pass
 
     if not metadata_files_info:
+        if max_top_level_dir_recurse > 0:
+            dir_entries = list(lookup_directory(directory_id))
+            if len(dir_entries) == 1 and dir_entries[0]["type"] == "dir":
+                # handle top level directory edge case
+                return _lookup_directory_intrinsic_citation_metadata(
+                    dir_entries[0]["target"], max_top_level_dir_recurse - 1
+                )
         raise NotFoundExc(
             f"No metadata file ({', '.join(metadata_file_paths)}) in directory"
             f" with sha1_git {directory_id} found."

swh/web/utils/tests/test_archive.py

@@ -1218,11 +1218,7 @@ def test_lookup_snapshot_branch_names_filtering_paginated(
         assert partial_branches["next_branch"] is None
 
 
-def test_lookup_origin_intrinsic_citation_metadata(origin_with_metadata_file):
-    intrinsic_citation_metadata = archive.lookup_origin_intrinsic_citation_metadata(
-        origin_with_metadata_file["url"]
-    )
-
+def _check_intrinsic_citation_metadata(intrinsic_citation_metadata):
     assert len(intrinsic_citation_metadata) == 2
     assert intrinsic_citation_metadata[0]["type"] == "codemeta.json"
     assert intrinsic_citation_metadata[1]["type"] == "citation.cff"
@@ -1236,6 +1232,13 @@ def test_lookup_origin_intrinsic_citation_metadata(origin_with_metadata_file):
     assert cff_file["cff-version"] == "1.2.0"
 
 
+def test_lookup_origin_intrinsic_citation_metadata(origin_with_metadata_file):
+    intrinsic_citation_metadata = archive.lookup_origin_intrinsic_citation_metadata(
+        origin_with_metadata_file["url"]
+    )
+    _check_intrinsic_citation_metadata(intrinsic_citation_metadata)
+
+
 def test_lookup_swhid_raw_intrinsic_metadata(objects_with_metadata_file):
     for object_with_metadata_file in objects_with_metadata_file:
         intrinsic_citation_metadata = (
@@ -1244,19 +1247,33 @@ def test_lookup_swhid_raw_intrinsic_metadata(objects_with_metadata_file):
             )
         )
 
-        assert len(intrinsic_citation_metadata) == 2
-        assert intrinsic_citation_metadata[0]["type"] == "codemeta.json"
-        assert intrinsic_citation_metadata[1]["type"] == "citation.cff"
+        _check_intrinsic_citation_metadata(intrinsic_citation_metadata)
 
-        codemeta_file = intrinsic_citation_metadata[0]["content"]
-        cff_file = intrinsic_citation_metadata[1]["content"]
 
-        assert (
-            codemeta_file["@context"] == "https://doi.org/10.5063/schema/codemeta-2.0"
+def test_lookup_swhid_raw_intrinsic_metadata_top_level_dir(
+    archive_data, origin_with_metadata_file
+):
+    snapshot = archive.lookup_latest_origin_snapshot(origin_with_metadata_file["url"])
+    revision = archive.lookup_revision(
+        snapshot["branches"]["refs/heads/master"]["target"]
+    )
+    directory = Directory(
+        entries=(
+            DirectoryEntry(
+                name=b"root_dir",
+                type="dir",
+                target=hash_to_bytes(revision["directory"]),
+                perms=DentryPerms.directory,
+            ),
         )
-        assert codemeta_file["type"] == "SoftwareSourceCode"
-        assert codemeta_file["name"] == "Test Software"
-        assert cff_file["cff-version"] == "1.2.0"
+    )
+    archive_data.directory_add([directory])
+    intrinsic_citation_metadata = (
+        archive.lookup_intrinsic_citation_metadata_by_target_swhid(
+            str(directory.swhid())
+        )
+    )
+    _check_intrinsic_citation_metadata(intrinsic_citation_metadata)
 
 
 def test_lookup_swhid_raw_intrinsic_metadata_not_found(unknown_core_swhid):

swh/web/vault/templates/includes/vault-common.html

@@ -6,7 +6,7 @@ See top-level LICENSE file for more information
 {% endcomment %}
 
 <iframe id="vault-download-iframe" style="display:none;"></iframe>
-<div class="modal fade"
+<div class="modal fade d-none"
      id="vault-recook-object-modal"
      tabindex="-1"
      role="dialog"

swh/web/vault/templates/includes/vault-create-tasks.html

@@ -47,7 +47,7 @@ See top-level LICENSE file for more information
   {% endif %}
   <!-- modals related to the creation of vault cooking tasks -->
   <!-- they will be reparented in the script below in order to be able to display them -->
-  <div class="modal fade"
+  <div class="modal fade d-none"
        id="vault-cook-directory-modal"
        tabindex="-1"
        role="dialog"
@@ -92,7 +92,7 @@ See top-level LICENSE file for more information
       </div>
     </div>
   </div>
-  <div class="modal fade"
+  <div class="modal fade d-none"
        id="vault-download-directory-modal"
        tabindex="-1"
        role="dialog"
@@ -129,7 +129,7 @@ See top-level LICENSE file for more information
       </div>
     </div>
   </div>
-  <div class="modal fade"
+  <div class="modal fade d-none"
        id="vault-cook-revision-modal"
        tabindex="-1"
        role="dialog"
@@ -174,7 +174,7 @@ See top-level LICENSE file for more information
       </div>
     </div>
   </div>
-  <div class="modal fade"
+  <div class="modal fade d-none"
        id="vault-download-revision-modal"
        tabindex="-1"
        role="dialog"
@@ -211,7 +211,7 @@ See top-level LICENSE file for more information
       </div>
     </div>
   </div>
-  <div class="modal fade"
+  <div class="modal fade d-none"
        id="invalid-email-modal"
        tabindex="-1"
        role="dialog"

swh/web/webapp/assets/webapp/webapp-utils.js

@@ -138,6 +138,16 @@ $(document).ready(() => {
     }
   });
 
+  // modals in DOM are forced to not be displayed by default to avoid
+  // issues when animations are disabled, we need to set some event
+  // handlers forcing their display/hiding to restore expected behavior
+  $('.modal.fade').on('show.bs.modal', event => {
+    $(event.target).removeClass('d-none');
+  });
+  $('.modal.fade').on('hidden.bs.modal', event => {
+    $(event.target).addClass('d-none');
+  });
+
 });
 
 export function initPage(page) {

swh/web/webapp/templates/includes/footer.html

@@ -26,7 +26,7 @@ See top-level LICENSE file for more information
         <a href="https://www.softwareheritage.org/legal/bulk-access-terms-of-use/">Archive access</a>,
         <a href="https://www.softwareheritage.org/legal/api-terms-of-use/">API</a>&mdash;
         {% if "swh.web.alter" in SWH_DJANGO_APPS %}
-          <a href="{% url 'content-policies' %}"
+          <a href="{% url 'content-policy' %}"
              data-testid="swh-web-alter-content-policy">Content policy</a>&mdash;
         {% endif %}
         <a href="https://www.softwareheritage.org/contact/">Contact</a>&mdash;

swh/web/webapp/templates/includes/global-modals.html

@@ -5,7 +5,7 @@ License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
-<div class="modal fade"
+<div class="modal fade d-none"
      id="swh-web-modal-message"
      tabindex="-1"
      role="dialog"
@@ -33,7 +33,7 @@ See top-level LICENSE file for more information
     </div>
   </div>
 </div>
-<div class="modal fade"
+<div class="modal fade d-none"
      id="swh-web-modal-confirm"
      tabindex="-1"
      role="dialog"
@@ -65,7 +65,7 @@ See top-level LICENSE file for more information
     </div>
   </div>
 </div>
-<div class="modal fade"
+<div class="modal fade d-none"
      id="swh-web-modal-html"
      tabindex="-1"
      role="dialog"

{swh_web-0.14.2.dist-info → swh_web-0.15.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swh.web
-Version: 0.14.2
+Version: 0.15.0
 Summary: Software Heritage web UI
 Author-email: Software Heritage developers <swh-devel@inria.fr>
 Project-URL: Homepage, https://gitlab.softwareheritage.org/swh/devel/swh-web