spaces are back

elastic · Nov 15, 2022 · b0a1c95 · b0a1c95
1 parent d2d1394
commit b0a1c95
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/packages/kbn-rule-data-utils/index.ts b/packages/kbn-rule-data-utils/index.ts
@@ -10,4 +10,4 @@ export * from './src/technical_field_names';
 export * from './src/alerts_as_data_rbac';
 export * from './src/alerts_as_data_severity';
 export * from './src/alerts_as_data_status';
-export * from './src/paths';
+export * from './src/routes/stack_rule_paths';
diff --git a/packages/kbn-rule-data-utils/src/paths.ts → ...data-utils/src/routes/stack_rule_paths.ts b/packages/kbn-rule-data-utils/src/paths.ts → ...data-utils/src/routes/stack_rule_paths.ts
diff --git a/x-pack/plugins/alerting/server/task_runner/execution_handler.ts b/x-pack/plugins/alerting/server/task_runner/execution_handler.ts
@@ -209,7 +209,7 @@ export class ExecutionHandler<
               kibanaBaseUrl: this.taskRunnerContext.kibanaBaseUrl,
               alertParams: this.rule.params,
               actionParams: action.params,
-              ruleUrl: this.buildRuleUrl(),
+              ruleUrl: this.buildRuleUrl(spaceId),
             }),
           }),
         };
@@ -284,14 +284,16 @@ export class ExecutionHandler<
     return executables;
   }
 
-  private buildRuleUrl(): string | undefined {
+  private buildRuleUrl(spaceId: string): string | undefined {
     if (!this.taskRunnerContext.kibanaBaseUrl) {
       return;
     }
 
     try {
       const ruleUrl = new URL(
-        `${triggersActionsRoute}${getRuleDetailsRoute(this.rule.id)}`,
+        `${
+          spaceId !== 'default' ? `/s/${spaceId}` : ''
+        }${triggersActionsRoute}${getRuleDetailsRoute(this.rule.id)}`,
         this.taskRunnerContext.kibanaBaseUrl
       );