diff --git a/keep-ui/app/runbooks/layout.tsx b/keep-ui/app/runbooks/layout.tsx
new file mode 100644
index 000000000..a14e64fcd
--- /dev/null
+++ b/keep-ui/app/runbooks/layout.tsx
@@ -0,0 +1,16 @@
+export const metadata = {
+ title: 'Next.js',
+ description: 'Generated by Next.js',
+}
+
+export default function RootLayout({
+ children,
+}: {
+ children: React.ReactNode
+}) {
+ return (
+
+ {children}
+
+ )
+}
diff --git a/keep-ui/app/runbooks/runbook-associate-incident-modal.tsx b/keep-ui/app/runbooks/runbook-associate-incident-modal.tsx
index b0ffe2260..431eb7fc4 100644
--- a/keep-ui/app/runbooks/runbook-associate-incident-modal.tsx
+++ b/keep-ui/app/runbooks/runbook-associate-incident-modal.tsx
@@ -1,15 +1,15 @@
import Modal from "@/components/ui/Modal";
import { Button, Divider, SelectItem, Title } from "@tremor/react";
import Select from "@/components/ui/Select";
-import CreateOrUpdateIncident from "app/incidents/create-or-update-incident";
import { useSession } from "next-auth/react";
import { useRouter } from "next/navigation";
import { FormEvent, useCallback, useEffect, useState } from "react";
import { toast } from "react-toastify";
import { getApiURL } from "../../utils/apiUrl";
import { useIncidents, usePollIncidents } from "../../utils/hooks/useIncidents";
-import Loading from "../loading";
import { RunbookDto } from "./models";
+import Loading from "../(keep)/loading";
+import { CreateOrUpdateIncidentForm } from "@/features/create-or-update-incident";
interface AlertAssociateIncidentModalProps {
isOpen: boolean;
@@ -105,7 +105,7 @@ const RunbookAssociateIncidentModal = ({
{isLoading ? (
) : createIncident ? (
-
Select Provider
- {runBookInstalledProviders?.map((provider) => {
+ {runBookInstalledProviders?.map((provider:any) => {
return (
{provider?.details?.name}
@@ -282,5 +282,3 @@ function RunbookIncidentTable() {
);
}
-
-export default RunbookIncidentTable;
diff --git a/keep-ui/next-env.d.ts b/keep-ui/next-env.d.ts
index 24c22530f..725dd6f24 100644
--- a/keep-ui/next-env.d.ts
+++ b/keep-ui/next-env.d.ts
@@ -3,4 +3,4 @@
///
// NOTE: This file should not be edited
-// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
\ No newline at end of file
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
diff --git a/keep/api/core/db.py b/keep/api/core/db.py
index 137657795..428977db5 100644
--- a/keep/api/core/db.py
+++ b/keep/api/core/db.py
@@ -64,11 +64,8 @@
from keep.api.models.db.tenant import * # pylint: disable=unused-wildcard-import
from keep.api.models.db.topology import * # pylint: disable=unused-wildcard-import
from keep.api.models.db.workflow import * # pylint: disable=unused-wildcard-import
-<<<<<<< HEAD
from keep.api.models.db.runbook import * # pylint: disable=unused-wildcard-import
-=======
from keep.api.models.time_stamp import TimeStampFilter
->>>>>>> main
logger = logging.getLogger(__name__)