Merge pull request #1375 from NEU-Libraries/develop

UAT refinement

Author: dgcliff

.env.example

@@ -1,4 +1,4 @@
-ATLAS=0.6.128
+ATLAS=0.6.136
 #ATLAS_RAILS_MASTER_KEY=123123
 # Cantaloupe as reachable from INSIDE the web container, for server-side
 # IIIF info.json reads (manifest dimensions). Browsers use the public

.rubocop.yml

@@ -15,6 +15,12 @@ Lint/MissingSuper:
     - 'app/components/blacklight/**/*'
 Metrics/ClassLength:
   Max: 120
+  Exclude:
+    # Blacklight's configure_blacklight block is a declarative table of facets,
+    # search fields and sorts, and the project keeps that config in the
+    # controller. Its length tracks the size of the Solr index, not the
+    # complexity of the class.
+    - 'app/controllers/catalog_controller.rb'
 Metrics/AbcSize:
   Max: 22
   Exclude:

.version

@@ -1 +1 @@
-2.9.486
+2.10.8

Gemfile.lock

@@ -84,7 +84,7 @@ GEM
     addressable (2.9.0)
       public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
-    atlas_rb (1.9.3)
+    atlas_rb (1.10.1)
       faraday (~> 2.7)
       faraday-follow_redirects (~> 0.3.0)
       faraday-multipart (~> 1)
@@ -272,7 +272,7 @@ GEM
       timeout
     net-smtp (0.5.1)
       net-protocol
-    neu-mods (0.2.0)
+    neu-mods (0.3.0)
       nokogiri (>= 1.13)
     next_rails (1.6.0)
     nio4r (2.7.5)

app/assets/stylesheets/_admin_dashboard.scss

@@ -151,4 +151,5 @@
   &--impersonation { --admin-action-color: #a8322a; }
   &--files        { --admin-action-color: #5a5e8c; } // desaturated indigo: versioned content
   &--groups       { --admin-action-color: #7a5c84; } // desaturated violet: a naming / label affordance
+  &--triage       { --admin-action-color: #8a6a1f; } // muted ochre: something is waiting. The caution family the In progress / Incomplete pills use, aged down out of Bootstrap orange
 }

app/assets/stylesheets/_admin_registry.scss

@@ -165,6 +165,12 @@
     word-break: break-all;
   }
 
+  // A date in a ledger column. Tabular figures so the column scans vertically:
+  // the cell exists to be compared against the rows above and below it.
+  &__when {
+    font-variant-numeric: tabular-nums;
+  }
+
   // Raw OCFL version label sitting under the revision ordinal — a borderless,
   // muted footnote to the primary chip. Kept for debugging (the OCFL vN can
   // skip when preservation-envelope bumps consume versions); the revision

app/assets/stylesheets/_audit_history.scss

@@ -278,12 +278,20 @@ $audit-tone-unlink:    #8f5e78;
     padding-left: 0;
   }
 
-  // WHO cell — actor pill on top; the proxy / acting-as target (rare) stacks
-  // beneath it as a muted "for <nuid>" line, mirroring the date-over-time
-  // idiom in the When cell. Most rows are just the actor pill, no extra line.
+  // WHO cell — actor name over its NUID chip; the proxy / acting-as target
+  // (rare) stacks beneath as a muted "for <name>" line. The same
+  // meaning-over-identifier idiom as the When cell's date over time.
+  // Most rows are just the actor, no extra line.
   &__who {
     line-height: 1.35;
   }
+  // Block, not inline: this column is narrow and names are not short, so an
+  // inline chip wraps mid-cell. Stacked, the name reads first and the
+  // identifier stays available beneath it.
+  &__actor {
+    display: block;
+    color: $gray-800;
+  }
   &__on-behalf {
     display: block;
     margin-top: 0.15rem;

app/assets/stylesheets/_blacklight_discovery.scss

@@ -73,6 +73,22 @@
   background-color: $danger;
 }
 
+// Unfinished-deposit override — $warning, the same caution tone the Cancel
+// buttons carry, one step down from embargo's red. Keeps the pill's inherited
+// white text: every other pill state is white on colour, and a single
+// dark-text pill would read as a mistake rather than a distinction.
+.thumb-type-pill--unfinished {
+  background-color: $warning;
+}
+
+// Incomplete override — $yellow, one step down again from the unfinished orange
+// it sits beside. The two are close on purpose: both are caution, and the label
+// is what separates them. Orange means a person has not finished the deposit;
+// amber means a job gave up on a record that is otherwise readable.
+.thumb-type-pill--incomplete {
+  background-color: $yellow;
+}
+
 .document-thumbnail img {
   position: absolute;
   margin: auto;

app/components/blacklight/document_component.html.erb

@@ -41,7 +41,14 @@
 
       <div class="text-end">
         <%= helpers.embargo_notice(@document) %>
-        <% if @document.klass == Work %>
+        <%# An embargo withholds every download, so the modal this opens would
+            list nothing. The adjacent notice already says why, and the release
+            date is indexed — so the button can be suppressed from the result
+            list without the per-Work Atlas read that judging an arbitrary
+            empty modal would need. Staff and admins bypass the embargo and
+            keep the button, since their modal does have files. %>
+        <% if @document.klass == Work &&
+              !helpers.embargo_withholds?(@document.try(:embargo_release_date)) %>
           <button type="button"
                   class="btn btn-sm btn-link text-decoration-none p-0 me-2"
                   data-bs-toggle="modal"

app/components/blacklight/gallery/document_component.html.erb

@@ -12,7 +12,11 @@
         <%= render Blacklight::Gallery::DocumentTitleComponent.new(presenter: @presenter, counter: @counter) %>
         <div class="text-center">
           <%= helpers.embargo_notice(@document) %>
-          <% if @document.klass == Work %>
+          <%# Mirrors the list view: an embargo empties the downloads modal, so
+              the button is suppressed for viewers the embargo applies to. See
+              Blacklight::DocumentComponent's template for the reasoning. %>
+          <% if @document.klass == Work &&
+                !helpers.embargo_withholds?(@document.try(:embargo_release_date)) %>
             <button type="button"
                     class="btn btn-sm btn-link text-decoration-none p-0 me-2"
                     data-bs-toggle="modal"