Merge branch 'main' into Feat/Workflow-secrets

Author: Mubashirshariq

examples/workflows/webhook_example_foreach.yml

@@ -0,0 +1,42 @@
+workflow:
+  id: run-webhook-foreach
+  description: Run a webhook for each alert
+  name: Run webhook for each alert
+  debug: true
+  triggers:
+    - type: manual
+
+  steps:
+    - name: webhook-get
+      provider:
+        type: webhook
+        config: "{{ providers.test }}"
+        with:
+          method: GET
+          url: "http://localhost:8000"
+    - name: get-alerts
+      foreach: " {{ steps.webhook-get.results.body.ids }}"
+      provider:
+        type: keep
+        with:
+          version: 2
+          filter: 'id=="{{ foreach.value }}"'
+  actions:
+    - name: echo
+      foreach: " {{ steps.get-alerts.results }}"
+      if: '{{ foreach.value.0.status }} == "firing"'
+      provider:
+        type: console
+        with:
+          logger: true
+          message: "alert {{ foreach.value.0.id }} is {{ foreach.value.0.status }}"
+  # actions:
+  #   - name: webhook-test
+  #     foreach: " {{ steps.get-alerts.results }}"
+  #     if: '{{ foreach.value.0.status }} == "firing"'
+  #     provider:
+  #       type: webhook
+  #       config: "{{ providers.test }}"
+  #       with:
+  #         body:
+  #           message: "Hello world"

keep-ui/app/(keep)/alerts/alert-table-utils.tsx

@@ -287,13 +287,15 @@ export const useAlertTableCols = (
             const incidentString = String(value || "");
             const incidentSplit = incidentString.split(",");
             return incidentSplit.map((incidentId, index) => {
-              const incidentName = incidents?.items.find(
+              const incident = incidents?.items.find(
                 (incident) => incident.id === incidentId
-              )?.user_generated_name;
+              );
               return (
                 <>
                   <Link href={`/incidents/${incidentId}`}>
-                    {incidentName || incidentId}
+                    {incident?.user_generated_name ||
+                      incident?.ai_generated_name ||
+                      incidentId}
                   </Link>
                   {index < incidentSplit.length - 1 && ", "}
                 </>

keep-ui/app/(keep)/rules/CorrelationPlaceholder.tsx

@@ -1,5 +1,5 @@
 import { Fragment, useState } from "react";
-import { Button, Card, Subtitle, Title } from "@tremor/react";
+import { Button } from "@tremor/react";
 import { CorrelationSidebar } from "./CorrelationSidebar";
 import { PlaceholderSankey } from "./ui/PlaceholderSankey";
 import { PlusIcon } from "@heroicons/react/20/solid";

keep-ui/app/(keep)/rules/CorrelationSidebar/RuleFields.tsx

@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import {
   Button,
   SearchSelect,
@@ -21,6 +21,7 @@ import { useFormContext } from "react-hook-form";
 import { useSearchAlerts } from "utils/hooks/useSearchAlerts";
 import { CorrelationFormType } from "./types";
 import { TIMEFRAME_UNITS_TO_SECONDS } from "./timeframe-constants";
+import { useDeduplicationFields } from "@/utils/hooks/useDeduplicationRules";
 
 const DEFAULT_OPERATORS = defaultOperators.filter((operator) =>
   [
@@ -67,6 +68,10 @@ const Field = ({
   const [searchValue, setSearchValue] = useState("");
   const [isValueEnabled, setIsValueEnabled] = useState(true);
 
+  useEffect(() => {
+    setFields(avaliableFields);
+  }, [avaliableFields]);
+
   const onValueChange = (selectedValue: string) => {
     if (searchValue.length) {
       const doesSearchedValueExistInFields = fields.some(
@@ -190,9 +195,24 @@ export const RuleFields = ({
     []
   );
 
-  const availableFields = DEFAULT_FIELDS.filter(
-    ({ name }) => selectedFields.includes(name) === false
-  );
+  const { data: deduplicationFields = {} } = useDeduplicationFields();
+
+  const uniqueDeduplicationFields = Object.values(deduplicationFields)
+    .flat()
+    .filter(
+      (field) => DEFAULT_FIELDS.find((f) => f.name === field) === undefined
+    ) // remove duplicates
+    .map((field) => ({
+      label: field,
+      name: field,
+      datatype: "text",
+    }));
+
+  const availableFields = DEFAULT_FIELDS.concat(
+    uniqueDeduplicationFields
+  ).filter(({ name }) => selectedFields.includes(name) === false);
+
+  console.log(availableFields);
 
   const onAddRuleFieldClick = () => {
     const nextAvailableField = availableFields.at(0);

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

@@ -1,8 +1,27 @@
 import React from "react";
 import WorkflowsPage from "./workflows.client";
+import { FacetDto } from "@/features/filter";
+import { createServerApiClient } from "@/shared/api/server";
+import { getInitialFacets } from "@/features/filter/api";
 
-export default function Page() {
-  return <WorkflowsPage />;
+export default async function Page() {
+  let initialFacets: FacetDto[] | null = null;
+
+  try {
+    const api = await createServerApiClient();
+    initialFacets = await getInitialFacets(api, "workflows");
+  } catch (error) {
+    console.log(error);
+  }
+  return (
+    <WorkflowsPage
+      initialFacetsData={
+        initialFacets
+          ? { facets: initialFacets, facetOptions: null }
+          : undefined
+      }
+    />
+  );
 }
 
 export const metadata = {