@oneuptime/common 10.0.62 → 10.0.65

package/Models/DatabaseModels/WorkspaceNotificationSummary.ts

@@ -32,12 +32,15 @@ import FilterCondition from "../../Types/Filter/FilterCondition";
     Permission.ProjectAdmin,
     Permission.ProjectOwner,
     Permission.ProjectMember,
+    Permission.SettingsManager,
     Permission.CreateWorkspaceNotificationSummary,
   ],
   read: [
     Permission.ProjectAdmin,
     Permission.ProjectOwner,
     Permission.ProjectMember,
+    Permission.Viewer,
+    Permission.SettingsManager,
     Permission.ReadWorkspaceNotificationSummary,
     Permission.ReadAllProjectResources,
   ],
@@ -45,12 +48,14 @@ import FilterCondition from "../../Types/Filter/FilterCondition";
     Permission.ProjectAdmin,
     Permission.ProjectOwner,
     Permission.ProjectMember,
+    Permission.SettingsManager,
     Permission.DeleteWorkspaceNotificationSummary,
   ],
   update: [
     Permission.ProjectAdmin,
     Permission.ProjectOwner,
     Permission.ProjectMember,
+    Permission.SettingsManager,
     Permission.EditWorkspaceNotificationSummary,
   ],
 })
@@ -78,12 +83,15 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.CreateWorkspaceNotificationSummary,
     ],
     read: [
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsManager,
       Permission.ReadWorkspaceNotificationSummary,
       Permission.ReadAllProjectResources,
     ],
@@ -115,12 +123,15 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.CreateWorkspaceNotificationSummary,
     ],
     read: [
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsManager,
       Permission.ReadWorkspaceNotificationSummary,
       Permission.ReadAllProjectResources,
     ],
@@ -146,12 +157,15 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.CreateWorkspaceNotificationSummary,
     ],
     read: [
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsManager,
       Permission.ReadWorkspaceNotificationSummary,
       Permission.ReadAllProjectResources,
     ],
@@ -159,6 +173,7 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.EditWorkspaceNotificationSummary,
     ],
   })
@@ -183,12 +198,15 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.CreateWorkspaceNotificationSummary,
     ],
     read: [
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsManager,
       Permission.ReadWorkspaceNotificationSummary,
       Permission.ReadAllProjectResources,
     ],
@@ -196,6 +214,7 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.EditWorkspaceNotificationSummary,
     ],
   })
@@ -220,12 +239,15 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.CreateWorkspaceNotificationSummary,
     ],
     read: [
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsManager,
       Permission.ReadWorkspaceNotificationSummary,
       Permission.ReadAllProjectResources,
     ],
@@ -233,6 +255,7 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.EditWorkspaceNotificationSummary,
     ],
   })
@@ -257,12 +280,15 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.CreateWorkspaceNotificationSummary,
     ],
     read: [
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsManager,
       Permission.ReadWorkspaceNotificationSummary,
       Permission.ReadAllProjectResources,
     ],
@@ -270,6 +296,7 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.EditWorkspaceNotificationSummary,
     ],
   })
@@ -294,12 +321,15 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.CreateWorkspaceNotificationSummary,
     ],
     read: [
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsManager,
       Permission.ReadWorkspaceNotificationSummary,
       Permission.ReadAllProjectResources,
     ],
@@ -307,6 +337,7 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.EditWorkspaceNotificationSummary,
     ],
   })
@@ -328,12 +359,15 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.CreateWorkspaceNotificationSummary,
     ],
     read: [
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsManager,
       Permission.ReadWorkspaceNotificationSummary,
       Permission.ReadAllProjectResources,
     ],
@@ -341,6 +375,7 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.EditWorkspaceNotificationSummary,
     ],
   })
@@ -362,12 +397,15 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.CreateWorkspaceNotificationSummary,
     ],
     read: [
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsManager,
       Permission.ReadWorkspaceNotificationSummary,
       Permission.ReadAllProjectResources,
     ],
@@ -375,6 +413,7 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.EditWorkspaceNotificationSummary,
     ],
   })
@@ -397,12 +436,15 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.CreateWorkspaceNotificationSummary,
     ],
     read: [
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsManager,
       Permission.ReadWorkspaceNotificationSummary,
       Permission.ReadAllProjectResources,
     ],
@@ -410,6 +452,7 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.EditWorkspaceNotificationSummary,
     ],
   })
@@ -430,12 +473,15 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.CreateWorkspaceNotificationSummary,
     ],
     read: [
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsManager,
       Permission.ReadWorkspaceNotificationSummary,
       Permission.ReadAllProjectResources,
     ],
@@ -443,6 +489,7 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.EditWorkspaceNotificationSummary,
     ],
   })
@@ -466,12 +513,15 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.CreateWorkspaceNotificationSummary,
     ],
     read: [
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsManager,
       Permission.ReadWorkspaceNotificationSummary,
       Permission.ReadAllProjectResources,
     ],
@@ -479,6 +529,7 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.EditWorkspaceNotificationSummary,
     ],
   })
@@ -499,12 +550,15 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.CreateWorkspaceNotificationSummary,
     ],
     read: [
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsManager,
       Permission.ReadWorkspaceNotificationSummary,
       Permission.ReadAllProjectResources,
     ],
@@ -512,6 +566,7 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.EditWorkspaceNotificationSummary,
     ],
   })
@@ -532,12 +587,15 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.CreateWorkspaceNotificationSummary,
     ],
     read: [
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsManager,
       Permission.ReadWorkspaceNotificationSummary,
       Permission.ReadAllProjectResources,
     ],
@@ -545,6 +603,7 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.EditWorkspaceNotificationSummary,
     ],
   })
@@ -567,12 +626,15 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.CreateWorkspaceNotificationSummary,
     ],
     read: [
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsManager,
       Permission.ReadWorkspaceNotificationSummary,
       Permission.ReadAllProjectResources,
     ],
@@ -580,6 +642,7 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.EditWorkspaceNotificationSummary,
     ],
   })
@@ -599,12 +662,15 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.CreateWorkspaceNotificationSummary,
     ],
     read: [
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsManager,
       Permission.ReadWorkspaceNotificationSummary,
       Permission.ReadAllProjectResources,
     ],
@@ -612,6 +678,7 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.EditWorkspaceNotificationSummary,
     ],
   })
@@ -631,12 +698,15 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.CreateWorkspaceNotificationSummary,
     ],
     read: [
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsManager,
       Permission.ReadWorkspaceNotificationSummary,
       Permission.ReadAllProjectResources,
     ],
@@ -644,6 +714,7 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.EditWorkspaceNotificationSummary,
     ],
   })
@@ -665,12 +736,15 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.CreateWorkspaceNotificationSummary,
     ],
     read: [
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsManager,
       Permission.ReadWorkspaceNotificationSummary,
       Permission.ReadAllProjectResources,
     ],
@@ -678,6 +752,7 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.EditWorkspaceNotificationSummary,
     ],
   })
@@ -708,12 +783,15 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.CreateWorkspaceNotificationSummary,
     ],
     read: [
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsManager,
       Permission.ReadWorkspaceNotificationSummary,
       Permission.ReadAllProjectResources,
     ],
@@ -721,6 +799,7 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.EditWorkspaceNotificationSummary,
     ],
   })
@@ -742,12 +821,15 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.CreateWorkspaceNotificationSummary,
     ],
     read: [
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsManager,
       Permission.ReadWorkspaceNotificationSummary,
       Permission.ReadAllProjectResources,
     ],
@@ -755,6 +837,7 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.EditWorkspaceNotificationSummary,
     ],
   })
@@ -786,12 +869,15 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.CreateWorkspaceNotificationSummary,
     ],
     read: [
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsManager,
       Permission.ReadWorkspaceNotificationSummary,
       Permission.ReadAllProjectResources,
     ],
@@ -799,6 +885,7 @@ class WorkspaceNotificationSummary extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectOwner,
       Permission.ProjectMember,
+      Permission.SettingsManager,
       Permission.EditWorkspaceNotificationSummary,
     ],
   })

package/Models/DatabaseModels/WorkspaceProjectAuthToken.ts

@@ -66,6 +66,7 @@ export type WorkspaceMiscData = SlackMiscData | MicrosoftTeamsMiscData;
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
+    Permission.Viewer,
     Permission.ReadAllProjectResources,
   ],
   delete: [Permission.ProjectOwner, Permission.ProjectAdmin],
@@ -97,6 +98,7 @@ class WorkspaceProjectAuthToken extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
+      Permission.Viewer,
       Permission.ReadAllProjectResources,
     ],
     update: [],
@@ -132,6 +134,7 @@ class WorkspaceProjectAuthToken extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
+      Permission.Viewer,
       Permission.ReadAllProjectResources,
     ],
     update: [],
@@ -184,6 +187,7 @@ class WorkspaceProjectAuthToken extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
+      Permission.Viewer,
       Permission.ReadAllProjectResources,
     ],
     update: [],
@@ -214,6 +218,7 @@ class WorkspaceProjectAuthToken extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
+      Permission.Viewer,
       Permission.ReadAllProjectResources,
     ],
     update: [
@@ -247,6 +252,7 @@ class WorkspaceProjectAuthToken extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
+      Permission.Viewer,
       Permission.ReadAllProjectResources,
     ],
     update: [
@@ -279,6 +285,7 @@ class WorkspaceProjectAuthToken extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
+      Permission.Viewer,
       Permission.ReadAllProjectResources,
     ],
     update: [
@@ -319,6 +326,7 @@ class WorkspaceProjectAuthToken extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
+      Permission.Viewer,
       Permission.ReadAllProjectResources,
     ],
     update: [
@@ -350,6 +358,7 @@ class WorkspaceProjectAuthToken extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
+      Permission.Viewer,
       Permission.ReadAllProjectResources,
     ],
     update: [
@@ -391,6 +400,7 @@ class WorkspaceProjectAuthToken extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
+      Permission.Viewer,
       Permission.ReadAllProjectResources,
     ],
     update: [

package/Server/Utils/Monitor/MonitorResource.ts

@@ -727,6 +727,15 @@ export default class MonitorResourceUtil {
         evaluationSummary: evaluationSummary,
       });
 
+      await MonitorAlert.checkOpenAlertsAndCloseIfResolved({
+        monitorId: monitor.id!,
+        autoResolveCriteriaInstanceIdAlertIdsDictionary,
+        rootCause: "No monitoring criteria met. Change to default status.",
+        criteriaInstance: null, // no criteria met!
+        dataToProcess: dataToProcess,
+        evaluationSummary: evaluationSummary,
+      });
+
       // get last monitor status timeline.
       const lastMonitorStatusTimeline: MonitorStatusTimeline | null =
         await MonitorStatusTimelineService.findOneBy({

package/Tests/UI/Components/ProgressBar.test.tsx

@@ -22,14 +22,9 @@ describe("ProgressBar Component", () => {
   test("should display the correct count and total count with suffix", () => {
     render(<ProgressBar count={30} totalCount={99} suffix="items" />);
     const countText: HTMLElement = screen.getByTestId("progress-bar-count");
-    const totalCountText: HTMLElement = screen.getByTestId(
-      "progress-bar-total-count",
-    );
     expect(countText).toBeInTheDocument();
-    expect(totalCountText).toBeInTheDocument();
 
-    expect(countText.innerHTML).toEqual("30 items");
-    expect(totalCountText.innerHTML).toEqual("99 items");
+    expect(countText.innerHTML).toEqual("30 of 99 items");
   });
 
   test("should handle zero total count without crashing", () => {