Merge remote-tracking branch 'origin/development' into YDA-6102-csv-i…

…mport-parse
UtrechtUniversity · Jan 22, 2025 · 1ae6012 · 1ae6012
2 parents 4530a6a + 6e6b908
commit 1ae6012
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/.github/workflows/smoke-test.yml b/.github/workflows/smoke-test.yml
@@ -75,7 +75,7 @@ jobs:
       run: |
         cd yoda/docker/compose
         docker exec provider.yoda sh -c 'set -x ; cd /etc/irods/yoda-ruleset && sudo chown irods:irods -R /etc/irods/yoda-ruleset && sudo -u irods git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" && sudo -u irods git pull && sudo -u irods git status'
-        docker exec provider.yoda sh -c "set -x ; cd /etc/irods/yoda-ruleset && sudo -u irods git checkout ${{ steps.extract_branch.outputs.branch }} && sudo -u irods python3 -m pip --no-cache-dir install --user --break-system-packages -r /etc/irods/yoda-ruleset/requirements.txt && sudo -u irods make && sudo -u irods make install"
+        docker exec provider.yoda sh -c "set -x ; cd /etc/irods/yoda-ruleset && ( sudo -u irods git checkout ${{ steps.extract_branch.outputs.branch }} || true ) && sudo -u irods python3 -m pip --no-cache-dir install --user --break-system-packages -r /etc/irods/yoda-ruleset/requirements.txt && sudo -u irods make && sudo -u irods make install"
         docker exec provider.yoda sh -c 'set -x ; sudo -u irods /var/lib/irods/irodsctl restart'
 
     - name: Pull and install branch version of the portal

diff --git a/group_manager/static/group_manager/js/group_manager.js b/group_manager/static/group_manager/js/group_manager.js
@@ -20,6 +20,13 @@ function collapseUncollapseOnScroll () {
   const topOfScreenPoint = 60
   const collapsePoint = 300
   const st = Math.floor(window.scrollY)
+  // Should be height of: header + search bar + whichever tree/list is visible
+  const groupsListHeight = $('#groups-card-header').outerHeight() +
+    ($('#pills-tree.show').outerHeight() || 0) +
+    ($('#pills-list.show').outerHeight() || 0) +
+    $('#search').outerHeight()
+  // group properties + group members list (+ priv buttons)
+  const groupOverviewHeight = $('#group-overview').outerHeight()
   let collapseEl = bootstrap.Collapse.getInstance('#group-properties')
   if (!collapseEl) {
     collapseEl = new bootstrap.Collapse('#group-properties', {
@@ -29,6 +36,10 @@ function collapseUncollapseOnScroll () {
 
   if (Math.abs(lastScrollTop - st) <= delta) {
     return
+  } else if (groupsListHeight < groupOverviewHeight) {
+    // Skip if group list shorter than screen
+    lastScrollTop = st
+    return
   }
 
   if (st <= lastScrollTop && st <= topOfScreenPoint) {
@@ -37,7 +48,7 @@ function collapseUncollapseOnScroll () {
   } else if (st > lastScrollTop &&
     st > collapsePoint &&
     Math.abs(lastScrollTop - st) <= collapseDelta &&
-    $('#group-overview').outerHeight() + buffer > $(window).height()) {
+    groupOverviewHeight + buffer > $(window).height()) {
     // Have scrolled down at least a little
     bootstrap.Collapse.getInstance('#group-properties').hide()
   }

diff --git a/group_manager/templates/group_manager/index.html b/group_manager/templates/group_manager/index.html
@@ -30,7 +30,7 @@
     <div class="col-md-6">
         <h1 id="group-manager-text">Group manager</h1>
         <div class="card groups">
-            <div class="card-header">
+            <div id="groups-card-header" class="card-header">
                 Groups
                 <ul class="nav nav-pills float-end" id="pills-tab" role="tablist">
                     <li class="nav-item" role="presentation">