@oneuptime/common 7.0.3786 → 7.0.3815

package/Server/Utils/Workspace/Slack/Actions/Auth.ts

@@ -32,8 +32,11 @@ export interface SlackRequest {
   slackUsername?: string | undefined;
   actions?: SlackAction[] | undefined;
   triggerId?: string | undefined;
+  payloadType?: string | undefined;
   view?: JSONObject | undefined; // view object from slack.
-  viewValues?: Dictionary<string | number | Array<string | number>> | undefined;
+  viewValues?:
+    | Dictionary<string | number | Array<string | number> | Date>
+    | undefined;
 }
 
 export default class SlackAuthAction {
@@ -67,6 +70,7 @@ export default class SlackAuthAction {
       (!payload["actions"] || (payload["actions"] as JSONArray).length === 0) &&
       payload["type"] !== "view_submission" &&
       payload["type"] !== "shortcut" &&
+      payload["type"] !== "app_uninstalled" &&
       !payload["command"]
     ) {
       logger.debug("No actions found in payload. Returning unauthorized.");
@@ -194,7 +198,9 @@ export default class SlackAuthAction {
     const view: JSONObject | undefined =
       (payload["view"] as JSONObject) || undefined;
 
-    let viewValues: Dictionary<string | number | Array<string | number>> = {};
+    let viewValues: Dictionary<
+      string | number | Array<string | number> | Date
+    > = {};
 
     if (view) {
       viewValues = SlackUtil.getValuesFromView({
@@ -242,6 +248,7 @@ export default class SlackAuthAction {
     const slackRequest: SlackRequest = {
       isAuthorized: true,
       slackUserId: slackUserId,
+      payloadType: payload["type"] as string,
       userId: userId,
       projectId: projectId,
       projectAuthToken: projectAuth.authToken!,

package/Server/Utils/Workspace/Slack/Actions/Incident.ts

@@ -34,6 +34,7 @@ import MonitorStatusService from "../../../../Services/MonitorStatusService";
 import Label from "../../../../../Models/DatabaseModels/Label";
 import LabelService from "../../../../Services/LabelService";
 import Incident from "../../../../../Models/DatabaseModels/Incident";
+import AccessTokenService from "../../../../Services/AccessTokenService";
 
 export default class SlackIncidentActions {
   public static isIncidentAction(data: {
@@ -382,6 +383,7 @@ export default class SlackIncidentActions {
       placeholder: "Select Labels",
       options: labelsDropdownOptions,
       multiSelect: true,
+      optional: true,
     };
 
     if (labelsForProject.length > 0) {
@@ -786,9 +788,13 @@ export default class SlackIncidentActions {
       data: {
         currentIncidentStateId: stateId,
       },
-      props: {
-        userId: data.slackRequest.userId!,
-      },
+      props:
+        await AccessTokenService.getDatabaseCommonInteractionPropsByUserAndProject(
+          {
+            userId: data.slackRequest.userId!,
+            projectId: data.slackRequest.projectId!,
+          },
+        ),
     });
   }