merge

keephq · Nov 24, 2024 · 2081a9a · 2081a9a
1 parent ffb51b7
commit 2081a9a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 12 deletions.
diff --git a/keep-ui/app/runbooks/layout.tsx 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 (
+    <html lang="en">
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git 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 ? (
           <Loading />
         ) : createIncident ? (
-          <CreateOrUpdateIncident
+          <CreateOrUpdateIncidentForm
             incidentToEdit={null}
             createCallback={onIncidentCreated}
             exitCallback={hideCreateIncidentForm}

diff --git a/keep-ui/app/runbooks/runbook-table.tsx b/keep-ui/app/runbooks/runbook-table.tsx
@@ -23,11 +23,11 @@ import { useForm } from "react-hook-form";
 import { getApiURL } from "@/utils/apiUrl";
 import useSWR, { mutate } from "swr";
 import { fetcher } from "@/utils/fetcher";
-import { useSession } from "next-auth/react";
+import { useSession, SessionProvider } from "next-auth/react";
 import RunbookActions from "./runbook-actions";
 import { RunbookDto, RunbookResponse } from "./models";
 import { ExclamationCircleIcon } from "@heroicons/react/20/solid";
-import Loading from "../loading";
+import Loading from "@/app/(keep)/loading";
 import { useRouter } from "next/navigation";
 
 const customStyles = {
@@ -142,7 +142,7 @@ function SettingsPage({handleRunbookMutation}:{
                 <SelectItem key={"provider_select"} value="">
                   Select Provider
                 </SelectItem>
-                {runBookInstalledProviders?.map((provider) => {
+                {runBookInstalledProviders?.map((provider:any) => {
                   return (
                     <SelectItem key={provider.id} value={provider.id}>
                       {provider?.details?.name}
@@ -282,5 +282,3 @@ function RunbookIncidentTable() {
     </div>
   );
 }
-
-export default RunbookIncidentTable;
diff --git a/keep-ui/next-env.d.ts b/keep-ui/next-env.d.ts
@@ -3,4 +3,4 @@
 /// <reference types="next/navigation-types/compat/navigation" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
+// 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
@@ -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__)