Fix decrypt-and-retry, and give the bell a hierarchy to read

Decrypt and retry unlocked the document but left the user holding two
copies of it, and the retry restarted the upload chain from the front
rather than rejoining it where it stopped. The unlock now versions the
original in place via consumeFiles, and the run resumes at the first
policy that has not already been applied.

Read state moves from the id of the newest notification to a watermark
on the time the list is ordered by. Resolving the newest row used to
leave the marker pointing at nothing, which read every remaining row as
unread again.

Each row now shows two buttons and an overflow menu instead of a line of
near-equal ones, and the failure message sits in its own box with copy
and expand as corner glyphs.

Author: EthanHealy01

app/proprietary/src/main/java/stirling/software/proprietary/failure/FailureKind.java

@@ -46,12 +46,12 @@ public enum FailureKind {
             FailureScope.FILE,
             errorCodes("E004"),
             fallback("This document is password-protected, so the pipeline could not read it."),
-            // The password is the fix and only the owner has it, so everyone else is
-            // offered the run and a way to close the row.
+            // The password is the fix and the owner's own document the runner-up; the rest go to
+            // the overflow menu.
             resolution(DECRYPT_AND_RETRY, OWNER),
+            global(VIEW_FILE, OWNER, SECONDARY),
+            global(VIEW_IN_PROCESSOR, TEAM_REVIEWER, OVERFLOW),
             global(RETRY, OWNER, OVERFLOW),
-            global(VIEW_FILE, OWNER, OVERFLOW),
-            global(VIEW_IN_PROCESSOR, TEAM_REVIEWER, SECONDARY),
             global(DISMISS, ANYONE_WHO_SEES, OVERFLOW)),
 
     UNKNOWN(
@@ -61,11 +61,11 @@ public enum FailureKind {
             FailureScope.RUN,
             noErrorCodes(),
             fallback("This run failed for a reason Stirling does not yet recognise."),
-            // Nothing here is known to be fixable, so there is no resolution to declare. A plain
-            // retry is still worth offering: an unrecognised failure is often a one-off.
+            // Nothing known to be fixable, so no resolution to declare: a plain retry leads
+            // instead, an unrecognised failure often being a one-off.
             global(RETRY, OWNER, SECONDARY),
-            global(VIEW_IN_PROCESSOR, TEAM_REVIEWER, SECONDARY),
-            global(VIEW_FILE, OWNER, OVERFLOW),
+            global(VIEW_FILE, OWNER, SECONDARY),
+            global(VIEW_IN_PROCESSOR, TEAM_REVIEWER, OVERFLOW),
             global(DISMISS, ANYONE_WHO_SEES, OVERFLOW));
 
     private static final String KEY_PREFIX = "portal.failures.kind.";

app/proprietary/src/main/java/stirling/software/proprietary/failure/FileRunEventService.java

@@ -289,8 +289,8 @@ private static boolean offeredTo(
         };
     }
 
-    /** Whether the caller triages the whole team's incidents. Login disabled has no roles. */
-    private boolean reviewsTeam() {
+    /** Whether the caller triages the whole team's incidents, rather than only their own. */
+    public boolean reviewsTeam() {
         return !enforced() || policyManagementAuthority.canEditPolicies();
     }
 

app/proprietary/src/main/java/stirling/software/proprietary/notification/NotificationController.java

@@ -50,7 +50,8 @@ public class NotificationController {
                             + " to mark read here yet: the client tracks what it has shown.")
     public NotificationsResponse list(@RequestParam(required = false) Integer limit) {
         int capped = Math.min(limit == null ? DEFAULT_LIMIT : Math.max(1, limit), MAX_LIMIT);
-        return new NotificationsResponse(notifications.list(capped));
+        return new NotificationsResponse(
+                notifications.list(capped), notifications.callerReviewsTeam());
     }
 
     /**
@@ -81,6 +82,9 @@ public NotificationView resolved(@PathVariable String notificationId) {
 
     /**
      * Wrapped rather than a bare array so paging or a total can be added without breaking clients.
+     * {@code viewerReviewsTeam} lets the client filter a member's list; see {@link
+     * NotificationService#callerReviewsTeam()}.
      */
-    public record NotificationsResponse(List<NotificationView> notifications) {}
+    public record NotificationsResponse(
+            List<NotificationView> notifications, boolean viewerReviewsTeam) {}
 }

app/proprietary/src/main/java/stirling/software/proprietary/notification/NotificationService.java

@@ -34,6 +34,14 @@ public List<NotificationView> list(int limit) {
         return fileRunEvents.list(null, null, limit).stream().map(this::fromFailure).toList();
     }
 
+    /**
+     * Whether the caller sees the whole team's incidents rather than only their own. The client
+     * uses it to hide a member's rows whose document is not in this browser, which it alone knows.
+     */
+    public boolean callerReviewsTeam() {
+        return fileRunEvents.reviewsTeam();
+    }
+
     /**
      * Record that the client's own retry of this notification worked, and return it as it now
      * stands. Takes the prefixed id even though nobody pressed a button: it is still a call made

app/proprietary/src/test/java/stirling/software/proprietary/failure/FailureKindTest.java

@@ -239,12 +239,12 @@ void offersARetryToItsOwnerAndTheRunToWhoeverReviews() {
             assertThat(FailureKind.UNKNOWN.getOfferedActions())
                     .containsExactly(
                             offered(FailureActionId.RETRY, OWNER, SECONDARY, "retry"),
+                            offered(FailureActionId.VIEW_FILE, OWNER, SECONDARY, "viewFile"),
                             offered(
                                     FailureActionId.VIEW_IN_PROCESSOR,
                                     TEAM_REVIEWER,
-                                    SECONDARY,
+                                    OVERFLOW,
                                     "viewInProcessor"),
-                            offered(FailureActionId.VIEW_FILE, OWNER, OVERFLOW, "viewFile"),
                             offered(FailureActionId.DISMISS, ANYONE_WHO_SEES, OVERFLOW, "dismiss"));
         }
 
@@ -308,13 +308,13 @@ void aKindWithSomethingToFixOffersTheFixToItsOwnerAndTheRunToItsReviewer() {
                                     OWNER,
                                     RESOLUTION,
                                     "decryptAndRetry"),
-                            offered(FailureActionId.RETRY, OWNER, OVERFLOW, "retry"),
-                            offered(FailureActionId.VIEW_FILE, OWNER, OVERFLOW, "viewFile"),
+                            offered(FailureActionId.VIEW_FILE, OWNER, SECONDARY, "viewFile"),
                             offered(
                                     FailureActionId.VIEW_IN_PROCESSOR,
                                     TEAM_REVIEWER,
-                                    SECONDARY,
+                                    OVERFLOW,
                                     "viewInProcessor"),
+                            offered(FailureActionId.RETRY, OWNER, OVERFLOW, "retry"),
                             offered(FailureActionId.DISMISS, ANYONE_WHO_SEES, OVERFLOW, "dismiss"));
         }
 

app/proprietary/src/test/java/stirling/software/proprietary/failure/FileRunEventControllerTest.java

@@ -161,7 +161,7 @@ void carriesEnoughForAClientToRenderAndRouteAnActionItDoesNotKnow() {
                             action -> {
                                 assertThat(action.execution())
                                         .isEqualTo(FailureActionId.Execution.CLIENT);
-                                assertThat(action.slot()).isEqualTo(FailureActionSlot.SECONDARY);
+                                assertThat(action.slot()).isEqualTo(FailureActionSlot.OVERFLOW);
                                 assertThat(action.defaultLabel()).isEqualTo("View in processor");
                             });
         }

app/proprietary/src/test/java/stirling/software/proprietary/failure/FileRunEventHttpIntegrationTest.java

@@ -130,7 +130,7 @@ void serialisesAnEventWithItsFacetsCopyKeysAndResolvedActions() throws Exception
             assertThat(actions.get(0).get("defaultLabel").asString())
                     .isEqualTo("View in processor");
             assertThat(actions.get(0).get("execution").asString()).isEqualTo("CLIENT");
-            assertThat(actions.get(0).get("slot").asString()).isEqualTo("SECONDARY");
+            assertThat(actions.get(0).get("slot").asString()).isEqualTo("OVERFLOW");
             assertThat(actions.get(0).get("enabled").asBoolean()).isTrue();
             assertThat(actions.get(0).get("disabledReasonKey").isNull()).isTrue();
             assertThat(actions.get(1).get("id").asString()).isEqualTo("DISMISS");

app/proprietary/src/test/java/stirling/software/proprietary/failure/FileRunEventServiceTest.java

@@ -437,8 +437,8 @@ void theOwnerIsOfferedTheFixAndNotTheReviewersView() {
             assertThat(offeredFor(mine))
                     .containsExactly(
                             FailureActionId.DECRYPT_AND_RETRY,
-                            FailureActionId.RETRY,
                             FailureActionId.VIEW_FILE,
+                            FailureActionId.RETRY,
                             FailureActionId.DISMISS);
             assertThat(service.availableActions(mine))
                     .allMatch(FileRunEventService.AvailableAction::enabled);
@@ -468,9 +468,9 @@ void aReviewerInheritsTheOwnerActionsOnAnUnattendedRow() {
             assertThat(offeredFor(unattended))
                     .containsExactly(
                             FailureActionId.DECRYPT_AND_RETRY,
-                            FailureActionId.RETRY,
                             FailureActionId.VIEW_FILE,
                             FailureActionId.VIEW_IN_PROCESSOR,
+                            FailureActionId.RETRY,
                             FailureActionId.DISMISS);
         }
 

app/proprietary/src/test/java/stirling/software/proprietary/failure/NotificationProjectionTest.java

@@ -2,6 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.when;
 
 import java.util.List;
 
@@ -171,4 +172,23 @@ void carriesWhatAClientNeedsToRenderAnActionItDoesNotKnow() {
                             });
         }
     }
+
+    @Nested
+    @DisplayName("the response says whether the caller reviews the team")
+    class ReviewerFlag {
+
+        @Test
+        void trueForAReviewerSoTheClientFiltersNothing() {
+            when(authority.canEditPolicies()).thenReturn(true);
+
+            assertThat(controller.list(null).viewerReviewsTeam()).isTrue();
+        }
+
+        @Test
+        void falseForAMemberSoTheClientHidesRowsForFilesItDoesNotHold() {
+            when(authority.canEditPolicies()).thenReturn(false);
+
+            assertThat(controller.list(null).viewerReviewsTeam()).isFalse();
+        }
+    }
 }

frontend/editor/public/locales/en-US/translation.toml

@@ -5083,6 +5083,7 @@ unread = "Unread"
 
 [notifications.action]
 failed = "That did not work. Try again in a moment."
+more = "More options"
 unavailable = "Not available for this notification."
 
 [notifications.detail]
@@ -5091,11 +5092,6 @@ copy = "Copy error"
 less = "Show less"
 more = "Show full message"
 
-[notifications.password]
-cancel = "Cancel"
-label = "Document password"
-working = "Unlocking..."
-
 [notifications.section]
 earlier = "Earlier"
 new = "New"