@oneuptime/common 14.0.2 → 14.0.3

package/Tests/UI/Utils/Breadcrumb/fixtures/RealBreadcrumbTrails.ts

@@ -78,6 +78,11 @@ const realBreadcrumbTrails: Array<BreadcrumbTrailFixture> = [
     pagePattern: "/dashboard/:projectId/alerts/:id/description",
     titles: ["Project", "Alerts", "Description"],
   },
+  {
+    getter: "getAlertsBreadcrumbs",
+    pagePattern: "/dashboard/:projectId/alerts/:id/incidents",
+    titles: ["Project", "Alerts", "View Alert", "Linked Incidents"],
+  },
   {
     getter: "getAlertsBreadcrumbs",
     pagePattern: "/dashboard/:projectId/alerts/:id/internal-notes",
@@ -807,6 +812,11 @@ const realBreadcrumbTrails: Array<BreadcrumbTrailFixture> = [
     pagePattern: "/dashboard/:projectId/incidents/:id",
     titles: ["Project", "Incidents", "View Incident"],
   },
+  {
+    getter: "getIncidentsBreadcrumbs",
+    pagePattern: "/dashboard/:projectId/incidents/:id/alerts",
+    titles: ["Project", "Incidents", "View Incident", "Linked Alerts"],
+  },
   {
     getter: "getIncidentsBreadcrumbs",
     pagePattern: "/dashboard/:projectId/incidents/:id/custom-fields",

package/Tests/UI/Utils/Breadcrumb/fixtures/RealRoutePatterns.ts

@@ -70,6 +70,7 @@ const realRoutePatterns: Array<string> = [
   "/dashboard/:projectId/alerts/:id/custom-fields",
   "/dashboard/:projectId/alerts/:id/internal-notes",
   "/dashboard/:projectId/alerts/:id/runbooks",
+  "/dashboard/:projectId/alerts/:id/incidents",
   "/dashboard/:projectId/alerts/settings/state",
   "/dashboard/:projectId/alerts/settings/severity",
   "/dashboard/:projectId/alerts/settings/note-templates",
@@ -154,6 +155,7 @@ const realRoutePatterns: Array<string> = [
   "/dashboard/:projectId/incidents/:id/sla",
   "/dashboard/:projectId/incidents/:id/audit-logs",
   "/dashboard/:projectId/incidents/:id/runbooks",
+  "/dashboard/:projectId/incidents/:id/alerts",
   "/dashboard/:projectId/incidents/settings/state",
   "/dashboard/:projectId/incidents/settings/severity",
   "/dashboard/:projectId/incidents/settings/templates",

package/Tests/UI/Utils/PermissionGate.test.ts

@@ -273,6 +273,28 @@ describe("PermissionGate", () => {
       expect(result.disabledReason).toContain("this Monitor Template");
     });
 
+    test("uses the caller's verb in the reason, but still checks the operation", () => {
+      permissionsForTest = [Permission.Viewer];
+
+      const denied: PermissionGateResult = PermissionGate.check(
+        new Monitor(),
+        ModelAction.Delete,
+        { verb: "Unlink" },
+      );
+
+      expect(denied.isAllowed).toBe(false);
+      expect(denied.disabledReason).toContain("permission to unlink this");
+      expect(denied.disabledReason).not.toContain("delete this");
+
+      permissionsForTest = [Permission.ProjectAdmin];
+
+      expect(
+        PermissionGate.check(new Monitor(), ModelAction.Delete, {
+          verb: "Unlink",
+        }).isAllowed,
+      ).toBe(true);
+    });
+
     /*
      * Both model hierarchies are unrelated classes that happen to expose the
      * same permission API, and the gate is structurally typed so one
@@ -465,6 +487,60 @@ describe("PermissionGate", () => {
         PermissionGate.getMissingPermissionMessage(monitor, ModelAction.Update),
       ).toContain("permission to update this Monitor");
     });
+
+    /*
+     * A table of links calls its delete "Unlink". The sentence follows the
+     * label, but the permissions it lists are still the delete ones.
+     */
+    test("uses the caller's verb when one is supplied", () => {
+      const monitor: Monitor = new Monitor();
+
+      const withVerb: string = PermissionGate.getMissingPermissionMessage(
+        monitor,
+        ModelAction.Delete,
+        { verb: "Unlink" },
+      );
+      const withoutVerb: string = PermissionGate.getMissingPermissionMessage(
+        monitor,
+        ModelAction.Delete,
+      );
+
+      expect(withVerb).toContain("permission to unlink this Monitor.");
+      expect(withVerb).not.toContain("delete this Monitor");
+      expect(withVerb).toBe(
+        withoutVerb.replace("to delete this", "to unlink this"),
+      );
+    });
+
+    test("ignores a blank verb", () => {
+      const monitor: Monitor = new Monitor();
+
+      expect(
+        PermissionGate.getMissingPermissionMessage(
+          monitor,
+          ModelAction.Delete,
+          { verb: "  " },
+        ),
+      ).toBe(
+        PermissionGate.getMissingPermissionMessage(monitor, ModelAction.Delete),
+      );
+    });
+
+    test("uses the verb in the bare sentence too", () => {
+      const model: PermissionCheckableModel = {
+        ...modelWithNoDeletePermissions,
+        getDeletePermissions: (): Array<Permission> => {
+          return ["NotARealPermission" as Permission];
+        },
+      };
+
+      expect(
+        PermissionGate.getMissingPermissionMessage(model, ModelAction.Delete, {
+          verb: "Unlink",
+          singularName: "Link",
+        }),
+      ).toBe("You do not have permission to unlink this Link.");
+    });
   });
 
   describe("gateCardButton", () => {