From 62b29b26d59e1f6e4c0ca52d682a49d163886e15 Mon Sep 17 00:00:00 2001 From: pablodanswer Date: Thu, 24 Oct 2024 15:02:25 -0700 Subject: [PATCH 1/4] modal fallback --- backend/danswer/configs/app_configs.py | 2 +- .../docker_compose/docker-compose.dev.yml | 2 +- .../docker_compose/docker-compose.gpu-dev.yml | 2 +- .../docker-compose.search-testing.yml | 2 +- .../prompt-library/modals/AddPromptModal.tsx | 6 +- .../prompt-library/modals/EditPromptModal.tsx | 15 ++--- web/src/app/chat/modal/FeedbackModal.tsx | 6 +- .../chat/modal/MakePublicAssistantModal.tsx | 6 +- .../app/chat/modal/SetDefaultModelModal.tsx | 9 +-- .../app/chat/modal/ShareChatSessionModal.tsx | 6 +- web/src/components/Modal.tsx | 6 +- .../components/modals/DeleteEntityModal.tsx | 6 +- .../components/modals/GenericConfirmModal.tsx | 6 +- web/src/components/modals/ModalWrapper.tsx | 63 ------------------- .../components/modals/NoAssistantModal.tsx | 6 +- 15 files changed, 39 insertions(+), 104 deletions(-) delete mode 100644 web/src/components/modals/ModalWrapper.tsx diff --git a/backend/danswer/configs/app_configs.py b/backend/danswer/configs/app_configs.py index caf7a103b94..505268b6edd 100644 --- a/backend/danswer/configs/app_configs.py +++ b/backend/danswer/configs/app_configs.py @@ -140,7 +140,7 @@ os.environ.get("POSTGRES_PASSWORD") or "password" ) POSTGRES_HOST = os.environ.get("POSTGRES_HOST") or "localhost" -POSTGRES_PORT = os.environ.get("POSTGRES_PORT") or "5432" +POSTGRES_PORT = os.environ.get("POSTGRES_PORT") or "5433" POSTGRES_DB = os.environ.get("POSTGRES_DB") or "postgres" POSTGRES_API_SERVER_POOL_SIZE = int( diff --git a/deployment/docker_compose/docker-compose.dev.yml b/deployment/docker_compose/docker-compose.dev.yml index 7b31689c8f3..1780772583e 100644 --- a/deployment/docker_compose/docker-compose.dev.yml +++ b/deployment/docker_compose/docker-compose.dev.yml @@ -315,7 +315,7 @@ services: - POSTGRES_USER=${POSTGRES_USER:-postgres} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password} ports: - - "5432:5432" + - "5433:5432" volumes: - db_volume:/var/lib/postgresql/data diff --git a/deployment/docker_compose/docker-compose.gpu-dev.yml b/deployment/docker_compose/docker-compose.gpu-dev.yml index a7e0a2afe97..ea40c2fef0a 100644 --- a/deployment/docker_compose/docker-compose.gpu-dev.yml +++ b/deployment/docker_compose/docker-compose.gpu-dev.yml @@ -313,7 +313,7 @@ services: - POSTGRES_USER=${POSTGRES_USER:-postgres} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password} ports: - - "5432:5432" + - "5433:5432" volumes: - db_volume:/var/lib/postgresql/data diff --git a/deployment/docker_compose/docker-compose.search-testing.yml b/deployment/docker_compose/docker-compose.search-testing.yml index fab950c064e..2afd54e029c 100644 --- a/deployment/docker_compose/docker-compose.search-testing.yml +++ b/deployment/docker_compose/docker-compose.search-testing.yml @@ -157,7 +157,7 @@ services: - POSTGRES_USER=${POSTGRES_USER:-postgres} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password} ports: - - "5432" + - "5433" volumes: - db_volume:/var/lib/postgresql/data diff --git a/web/src/app/admin/prompt-library/modals/AddPromptModal.tsx b/web/src/app/admin/prompt-library/modals/AddPromptModal.tsx index be83a19e926..eaa3c7d27c5 100644 --- a/web/src/app/admin/prompt-library/modals/AddPromptModal.tsx +++ b/web/src/app/admin/prompt-library/modals/AddPromptModal.tsx @@ -1,12 +1,12 @@ import React from "react"; import { Formik, Form } from "formik"; import * as Yup from "yup"; -import { ModalWrapper } from "@/components/modals/ModalWrapper"; import { Button } from "@tremor/react"; import { BookstackIcon } from "@/components/icons/icons"; import { AddPromptModalProps } from "../interfaces"; import { TextFormField } from "@/components/admin/connectors/Field"; +import { Modal } from "@/components/Modal"; const AddPromptSchema = Yup.object().shape({ title: Yup.string().required("Title is required"), @@ -15,7 +15,7 @@ const AddPromptSchema = Yup.object().shape({ const AddPromptModal = ({ onClose, onSubmit }: AddPromptModalProps) => { return ( - + { )} - + ); }; diff --git a/web/src/app/admin/prompt-library/modals/EditPromptModal.tsx b/web/src/app/admin/prompt-library/modals/EditPromptModal.tsx index bd20ce5e453..996b70b9fb4 100644 --- a/web/src/app/admin/prompt-library/modals/EditPromptModal.tsx +++ b/web/src/app/admin/prompt-library/modals/EditPromptModal.tsx @@ -1,8 +1,9 @@ import React from "react"; import { Formik, Form, Field, ErrorMessage } from "formik"; import * as Yup from "yup"; -import { ModalWrapper } from "@/components/modals/ModalWrapper"; +import { Modal } from "@/components/Modal"; import { Button, Textarea, TextInput } from "@tremor/react"; + import { useInputPrompt } from "../hooks"; import { EditPromptModalProps } from "../interfaces"; @@ -25,20 +26,20 @@ const EditPromptModal = ({ if (error) return ( - +

Failed to load prompt data

- + ); if (!promptData) return ( - +

Loading...

- + ); return ( - + )} - + ); }; diff --git a/web/src/app/chat/modal/FeedbackModal.tsx b/web/src/app/chat/modal/FeedbackModal.tsx index 64feffefc73..39c3253b76a 100644 --- a/web/src/app/chat/modal/FeedbackModal.tsx +++ b/web/src/app/chat/modal/FeedbackModal.tsx @@ -2,7 +2,7 @@ import { useState } from "react"; import { FeedbackType } from "../types"; -import { ModalWrapper } from "@/components/modals/ModalWrapper"; +import { Modal } from "@/components/Modal"; import { FilledLikeIcon } from "@/components/icons/icons"; const predefinedPositiveFeedbackOptions = @@ -49,7 +49,7 @@ export const FeedbackModal = ({ : predefinedNegativeFeedbackOptions; return ( - + <>

@@ -112,6 +112,6 @@ export const FeedbackModal = ({
- + ); }; diff --git a/web/src/app/chat/modal/MakePublicAssistantModal.tsx b/web/src/app/chat/modal/MakePublicAssistantModal.tsx index a234050a52b..757cf060e80 100644 --- a/web/src/app/chat/modal/MakePublicAssistantModal.tsx +++ b/web/src/app/chat/modal/MakePublicAssistantModal.tsx @@ -1,4 +1,4 @@ -import { ModalWrapper } from "@/components/modals/ModalWrapper"; +import { Modal } from "@/components/Modal"; import { Button, Divider, Text } from "@tremor/react"; export function MakePublicAssistantModal({ @@ -11,7 +11,7 @@ export function MakePublicAssistantModal({ onClose: () => void; }) { return ( - +

{isPublic ? "Public Assistant" : "Make Assistant Public"} @@ -67,6 +67,6 @@ export function MakePublicAssistantModal({

)} - + ); } diff --git a/web/src/app/chat/modal/SetDefaultModelModal.tsx b/web/src/app/chat/modal/SetDefaultModelModal.tsx index 5a47d9e66f2..61190120dc2 100644 --- a/web/src/app/chat/modal/SetDefaultModelModal.tsx +++ b/web/src/app/chat/modal/SetDefaultModelModal.tsx @@ -1,5 +1,5 @@ import { Dispatch, SetStateAction, useEffect, useRef } from "react"; -import { ModalWrapper } from "@/components/modals/ModalWrapper"; +import { Modal } from "@/components/Modal"; import { Text } from "@tremor/react"; import { getDisplayNameForModel, LlmOverride } from "@/lib/hooks"; import { LLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces"; @@ -123,10 +123,7 @@ export function SetDefaultModelModal({ ); return ( - + <>

@@ -203,6 +200,6 @@ export function SetDefaultModelModal({

- + ); } diff --git a/web/src/app/chat/modal/ShareChatSessionModal.tsx b/web/src/app/chat/modal/ShareChatSessionModal.tsx index 16a9147b52a..1b797e77ab9 100644 --- a/web/src/app/chat/modal/ShareChatSessionModal.tsx +++ b/web/src/app/chat/modal/ShareChatSessionModal.tsx @@ -1,5 +1,5 @@ import { useState } from "react"; -import { ModalWrapper } from "@/components/modals/ModalWrapper"; +import { Modal } from "@/components/Modal"; import { Button, Callout, Divider, Text } from "@tremor/react"; import { Spinner } from "@/components/Spinner"; import { ChatSessionSharedStatus } from "../interfaces"; @@ -57,7 +57,7 @@ export function ShareChatSessionModal({ ); return ( - + <>

@@ -154,6 +154,6 @@ export function ShareChatSessionModal({ )}

- + ); } diff --git a/web/src/components/Modal.tsx b/web/src/components/Modal.tsx index 169e85025d1..4155c94fa92 100644 --- a/web/src/components/Modal.tsx +++ b/web/src/components/Modal.tsx @@ -54,9 +54,9 @@ export function Modal({ e.stopPropagation(); } }} - className={`bg-background text-emphasis rounded shadow-2xl + className={`bg-background text-emphasis rounded shadow-2xl transform transition-all duration-300 ease-in-out - ${width ?? "w-11/12 max-w-5xl"} + ${width ?? "w-11/12 max-w-3xl"} ${noPadding ? "" : "p-10"} ${className || ""}`} > @@ -88,7 +88,7 @@ export function Modal({ {!hideDividerForTitle && } )} - {children} +
{children}
diff --git a/web/src/components/modals/DeleteEntityModal.tsx b/web/src/components/modals/DeleteEntityModal.tsx index 5ef76f9c851..85cda2fd4d5 100644 --- a/web/src/components/modals/DeleteEntityModal.tsx +++ b/web/src/components/modals/DeleteEntityModal.tsx @@ -1,6 +1,6 @@ import { FiTrash, FiX } from "react-icons/fi"; -import { ModalWrapper } from "@/components/modals/ModalWrapper"; import { BasicClickable } from "@/components/BasicClickable"; +import { Modal } from "../Modal"; export const DeleteEntityModal = ({ onClose, @@ -16,7 +16,7 @@ export const DeleteEntityModal = ({ additionalDetails?: string; }) => { return ( - + <>

Delete {entityType}?

@@ -37,6 +37,6 @@ export const DeleteEntityModal = ({
- + ); }; diff --git a/web/src/components/modals/GenericConfirmModal.tsx b/web/src/components/modals/GenericConfirmModal.tsx index fe6c2b020ae..893ae2f6b9e 100644 --- a/web/src/components/modals/GenericConfirmModal.tsx +++ b/web/src/components/modals/GenericConfirmModal.tsx @@ -1,5 +1,5 @@ import { FiCheck } from "react-icons/fi"; -import { ModalWrapper } from "./ModalWrapper"; +import { Modal } from "@/components/Modal"; import { BasicClickable } from "@/components/BasicClickable"; export const GenericConfirmModal = ({ @@ -16,7 +16,7 @@ export const GenericConfirmModal = ({ onConfirm: () => void; }) => { return ( - +

@@ -37,6 +37,6 @@ export const GenericConfirmModal = ({

- + ); }; diff --git a/web/src/components/modals/ModalWrapper.tsx b/web/src/components/modals/ModalWrapper.tsx deleted file mode 100644 index f69ff0e2b6e..00000000000 --- a/web/src/components/modals/ModalWrapper.tsx +++ /dev/null @@ -1,63 +0,0 @@ -"use client"; -import { XIcon } from "@/components/icons/icons"; -import { isEventWithinRef } from "@/lib/contains"; -import { useRef } from "react"; - -export const ModalWrapper = ({ - children, - bgClassName, - modalClassName, - onClose, -}: { - children: JSX.Element; - bgClassName?: string; - modalClassName?: string; - onClose?: () => void; -}) => { - const modalRef = useRef(null); - - const handleMouseDown = (e: React.MouseEvent) => { - if ( - onClose && - modalRef.current && - !modalRef.current.contains(e.target as Node) && - !isEventWithinRef(e.nativeEvent, modalRef) - ) { - onClose(); - } - }; - return ( -
-
{ - if (onClose) { - e.stopPropagation(); - } - }} - className={`bg-background text-emphasis p-10 rounded shadow-2xl - w-11/12 max-w-3xl transform transition-all duration-300 ease-in-out - relative ${modalClassName || ""}`} - > - {onClose && ( -
- -
- )} - -
{children}
-
-
- ); -}; diff --git a/web/src/components/modals/NoAssistantModal.tsx b/web/src/components/modals/NoAssistantModal.tsx index 0eed8876629..94d20aadba8 100644 --- a/web/src/components/modals/NoAssistantModal.tsx +++ b/web/src/components/modals/NoAssistantModal.tsx @@ -1,8 +1,8 @@ -import { ModalWrapper } from "@/components/modals/ModalWrapper"; +import { Modal } from "@/components/Modal"; export const NoAssistantModal = ({ isAdmin }: { isAdmin: boolean }) => { return ( - + <>

No Assistant Available @@ -32,6 +32,6 @@ export const NoAssistantModal = ({ isAdmin }: { isAdmin: boolean }) => {

)} - + ); }; From 6439c5a0038bf72a625d7eea597d6470b9daa119 Mon Sep 17 00:00:00 2001 From: pablodanswer Date: Thu, 24 Oct 2024 15:09:25 -0700 Subject: [PATCH 2/4] nit --- web/src/app/admin/configuration/llm/LLMConfiguration.tsx | 6 +++++- .../app/admin/embeddings/modals/ProviderCreationModal.tsx | 2 +- web/src/components/Modal.tsx | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/web/src/app/admin/configuration/llm/LLMConfiguration.tsx b/web/src/app/admin/configuration/llm/LLMConfiguration.tsx index f8fb7512740..6911571196d 100644 --- a/web/src/app/admin/configuration/llm/LLMConfiguration.tsx +++ b/web/src/app/admin/configuration/llm/LLMConfiguration.tsx @@ -32,7 +32,11 @@ function LLMProviderUpdateModal({ existingLlmProvider?.name || "Custom LLM Provider"; return ( - onClose()}> + onClose()} + >
{llmProviderDescriptor ? ( From a76acb3c18aaca5cb712f07e4e4a0a354488ecb5 Mon Sep 17 00:00:00 2001 From: pablodanswer Date: Thu, 24 Oct 2024 15:09:57 -0700 Subject: [PATCH 3/4] k --- backend/danswer/configs/app_configs.py | 2 +- deployment/docker_compose/docker-compose.dev.yml | 2 +- deployment/docker_compose/docker-compose.gpu-dev.yml | 2 +- deployment/docker_compose/docker-compose.search-testing.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/danswer/configs/app_configs.py b/backend/danswer/configs/app_configs.py index 505268b6edd..caf7a103b94 100644 --- a/backend/danswer/configs/app_configs.py +++ b/backend/danswer/configs/app_configs.py @@ -140,7 +140,7 @@ os.environ.get("POSTGRES_PASSWORD") or "password" ) POSTGRES_HOST = os.environ.get("POSTGRES_HOST") or "localhost" -POSTGRES_PORT = os.environ.get("POSTGRES_PORT") or "5433" +POSTGRES_PORT = os.environ.get("POSTGRES_PORT") or "5432" POSTGRES_DB = os.environ.get("POSTGRES_DB") or "postgres" POSTGRES_API_SERVER_POOL_SIZE = int( diff --git a/deployment/docker_compose/docker-compose.dev.yml b/deployment/docker_compose/docker-compose.dev.yml index 1780772583e..7b31689c8f3 100644 --- a/deployment/docker_compose/docker-compose.dev.yml +++ b/deployment/docker_compose/docker-compose.dev.yml @@ -315,7 +315,7 @@ services: - POSTGRES_USER=${POSTGRES_USER:-postgres} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password} ports: - - "5433:5432" + - "5432:5432" volumes: - db_volume:/var/lib/postgresql/data diff --git a/deployment/docker_compose/docker-compose.gpu-dev.yml b/deployment/docker_compose/docker-compose.gpu-dev.yml index ea40c2fef0a..a7e0a2afe97 100644 --- a/deployment/docker_compose/docker-compose.gpu-dev.yml +++ b/deployment/docker_compose/docker-compose.gpu-dev.yml @@ -313,7 +313,7 @@ services: - POSTGRES_USER=${POSTGRES_USER:-postgres} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password} ports: - - "5433:5432" + - "5432:5432" volumes: - db_volume:/var/lib/postgresql/data diff --git a/deployment/docker_compose/docker-compose.search-testing.yml b/deployment/docker_compose/docker-compose.search-testing.yml index 2afd54e029c..fab950c064e 100644 --- a/deployment/docker_compose/docker-compose.search-testing.yml +++ b/deployment/docker_compose/docker-compose.search-testing.yml @@ -157,7 +157,7 @@ services: - POSTGRES_USER=${POSTGRES_USER:-postgres} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password} ports: - - "5433" + - "5432" volumes: - db_volume:/var/lib/postgresql/data From 730d42e6b577447156cf961e59dbd3c6f50a74d9 Mon Sep 17 00:00:00 2001 From: pablodanswer Date: Thu, 24 Oct 2024 15:11:02 -0700 Subject: [PATCH 4/4] k --- web/src/app/admin/configuration/llm/LLMConfiguration.tsx | 6 +----- .../app/admin/embeddings/modals/ProviderCreationModal.tsx | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/web/src/app/admin/configuration/llm/LLMConfiguration.tsx b/web/src/app/admin/configuration/llm/LLMConfiguration.tsx index 6911571196d..f8fb7512740 100644 --- a/web/src/app/admin/configuration/llm/LLMConfiguration.tsx +++ b/web/src/app/admin/configuration/llm/LLMConfiguration.tsx @@ -32,11 +32,7 @@ function LLMProviderUpdateModal({ existingLlmProvider?.name || "Custom LLM Provider"; return ( - onClose()} - > + onClose()}>
{llmProviderDescriptor ? (