Merge branch 'main' into feature/historical-rules-poc

.github/workflows/test-pr-e2e.yml

@@ -60,11 +60,25 @@ jobs:
       - name: Install dependencies using poetry
         run: poetry install --no-interaction --no-root --with dev
 
-      - name: Install Playwright dependencies
-        run: npx playwright install --with-deps
+      - name: Get Playwright version from poetry.lock
+        id: playwright-version
+        run: |
+          PLAYWRIGHT_VERSION=$(grep "playwright" poetry.lock -A 5 | grep "version" | head -n 1 | cut -d'"' -f2)
+          echo "version=$PLAYWRIGHT_VERSION" >> $GITHUB_OUTPUT
+      - name: Cache Playwright browsers
+        id: playwright-cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/ms-playwright
+          key: playwright-${{ steps.playwright-version.outputs.version }}
 
-      - name: Install playwright
-        run: poetry run playwright install
+      - name: Install Playwright and dependencies
+        run: |
+          if [ "${{ steps.playwright-cache.outputs.cache-hit }}" != "true" ]; then
+            poetry run playwright install --with-deps
+          else
+            poetry run playwright install-deps
+          fi
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2

docker/Dockerfile.ui

@@ -1,6 +1,4 @@
-
-
-FROM node:18-alpine AS base
+FROM node:20-alpine AS base
 
 # Install dependencies only when needed
 FROM base AS deps

keep-ui/.dockerignore

@@ -0,0 +1,8 @@
+node_modules
+.next
+.vercel
+.env.*
+.venv/
+.vscode/
+.github/
+.pytest_cache

keep-ui/app/(keep)/alerts/alert-push-alert-to-server-modal.tsx

@@ -80,6 +80,11 @@ const PushAlertToServerModal = ({
 
   const onSubmit: SubmitHandler<FieldValues> = async (data) => {
     try {
+      // if type is string, parse it to JSON
+      if (typeof data.alertJson === "string") {
+        data.alertJson = JSON.parse(data.alertJson);
+      }
+
       const response = await api.post(
         `/alerts/event/${data.source.type}`,
         data.alertJson

keep-ui/app/(keep)/workflows/builder/builder-workflow-testrun-modal.tsx

@@ -3,15 +3,18 @@ import { Button, Card, Subtitle, Title } from "@tremor/react";
 import ReactLoading from "react-loading";
 import { ExecutionResults } from "./workflow-execution-results";
 import { WorkflowExecution, WorkflowExecutionFailure } from "./types";
+import { ApiClient } from "@/shared/api";
 
 interface Props {
   closeModal: () => void;
   workflowExecution: WorkflowExecution | WorkflowExecutionFailure | null;
+  apiClient: ApiClient;
 }
 
 export default function BuilderWorkflowTestRunModalContent({
   closeModal,
   workflowExecution,
+  apiClient,
 }: Props) {
   return (
     <>
@@ -34,7 +37,10 @@ export default function BuilderWorkflowTestRunModalContent({
       <Card className={`p-4 md:p-10 mx-auto max-w-7xl mt-6 h-full`}>
         <div className="flex flex-col">
           {workflowExecution ? (
-            <ExecutionResults executionData={workflowExecution} />
+            <ExecutionResults
+              executionData={workflowExecution}
+              api={apiClient}
+            />
           ) : (
             <div className="flex justify-center">
               <ReactLoading

keep-ui/app/(keep)/workflows/builder/builder.tsx

@@ -16,7 +16,6 @@ import { globalValidatorV2, stepValidatorV2 } from "./builder-validators";
 import Modal from "react-modal";
 import { Alert } from "./alert";
 import BuilderModalContent from "./builder-modal";
-import { useApiUrl } from "utils/hooks/useConfig";
 import Loader from "./loader";
 import { stringify } from "yaml";
 import { useSearchParams } from "next/navigation";
@@ -344,6 +343,7 @@ function Builder({
         <BuilderWorkflowTestRunModalContent
           closeModal={closeWorkflowExecutionResultsModal}
           workflowExecution={runningWorkflowExecution}
+          apiClient={api}
         />
       </Modal>
       {generateModalIsOpen || testRunModalOpen ? null : (

keep-ui/app/(keep)/workflows/builder/types.ts

@@ -25,6 +25,8 @@ export interface WorkflowExecution {
   logs?: LogEntry[] | null;
   error?: string | null;
   execution_time?: number;
+  event_id?: string;
+  event_type?: string;
 }
 
 export interface PaginatedWorkflowExecutionDto {