Merge branch 'dev' of https://github.com/logspace-ai/langflow into dev

src/frontend/src/components/promptComponent/index.tsx

@@ -5,6 +5,7 @@ import CodeAreaModal from "../../modals/codeAreaModal";
 import TextAreaModal from "../../modals/textAreaModal";
 import { TextAreaComponentType } from "../../types/components";
 import GenericModal from "../../modals/genericModal";
+import { TypeModal } from "../../utils";
 
 export default function PromptAreaComponent({
   value,
@@ -30,6 +31,7 @@ export default function PromptAreaComponent({
           onClick={() => {
             openPopUp(
               <GenericModal
+                type={TypeModal.PROMPT}
                 value={myValue}
                 buttonText="Check & Save"
                 modalTitle="Edit Prompt"
@@ -51,6 +53,7 @@ export default function PromptAreaComponent({
           onClick={() => {
             openPopUp(
               <GenericModal
+                type={TypeModal.PROMPT}
                 value={myValue}
                 buttonText="Check & Save"
                 modalTitle="Edit Prompt"

src/frontend/src/components/textAreaComponent/index.tsx

@@ -3,6 +3,7 @@ import { useContext, useEffect, useState } from "react";
 import { PopUpContext } from "../../contexts/popUpContext";
 import { TextAreaComponentType } from "../../types/components";
 import GenericModal from "../../modals/genericModal";
+import { TypeModal } from "../../utils";
 
 export default function TextAreaComponent({
   value,
@@ -24,6 +25,7 @@ export default function TextAreaComponent({
           onClick={() => {
             openPopUp(
               <GenericModal
+                type={TypeModal.TEXT}
                 buttonText="Finishing Editing"
                 modalTitle="Edit Text"
                 value={myValue}
@@ -45,6 +47,7 @@ export default function TextAreaComponent({
           onClick={() => {
             openPopUp(
               <GenericModal
+                type={TypeModal.TEXT}
                 buttonText="Finishing Editing"
                 modalTitle="Edit Text"
                 value={myValue}

src/frontend/src/modals/genericModal/index.tsx

@@ -5,19 +5,23 @@ import { PopUpContext } from "../../contexts/popUpContext";
 import { darkContext } from "../../contexts/darkContext";
 import { checkPrompt } from "../../controllers/API";
 import { alertContext } from "../../contexts/alertContext";
+import { TypeModal } from "../../utils";
 export default function PromptAreaModal({
   value,
   setValue,
   buttonText,
   modalTitle,
+  type
 }: {
   setValue: (value: string) => void;
   value: string;
   buttonText: string;
   modalTitle: string;
+  type: number;
 }) {
-  const [myButtonText, setmyButtonText] = useState(buttonText);
+  const [myButtonText] = useState(buttonText);
-  const [myModalTitle, setMyModalTitle] = useState(modalTitle);
+  const [myModalTitle] = useState(modalTitle);
+  const [myModalType] = useState(type);
   const [open, setOpen] = useState(true);
   const [myValue, setMyValue] = useState(value);
   const { dark } = useContext(darkContext);
@@ -114,36 +118,46 @@ export default function PromptAreaModal({
                       type="button"
                       className="inline-flex w-full justify-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 sm:ml-3 sm:w-auto sm:text-sm"
                       onClick={() => {
-                        checkPrompt(myValue)
+                        switch (myModalType) {
-                          .then((apiReturn) => {
+                          case 1:
-                            if (apiReturn.data) {
+                            setModalOpen(false);
-                              let inputVariables =
+                          break;
-                                apiReturn.data.input_variables;
+                          case 2:
-                              if (inputVariables.length === 0) {
+                            checkPrompt(myValue)
-                                setErrorData({
+                            .then((apiReturn) => {
-                                  title:
+                              if (apiReturn.data) {
-                                    "The template you are attempting to use does not contain any variables for data entry.",
+                                let inputVariables =
-                                });
+                                  apiReturn.data.input_variables;
+                                if (inputVariables.length === 0) {
+                                  setErrorData({
+                                    title:
+                                      "The template you are attempting to use does not contain any variables for data entry.",
+                                  });
+                                } else {
+                                  setSuccessData({
+                                    title: "Prompt is ready",
+                                  });
+                                  setModalOpen(false);
+                                  setValue(myValue);
+                                }
                               } else {
-                                setSuccessData({
+                                setErrorData({
-                                  title: "Prompt is ready",
+                                  title: "Something went wrong, please try again",
                                 });
-                                setModalOpen(false);
-                                setValue(myValue);
                               }
-                            } else {
+                            })
-                              setErrorData({
+                            .catch((error) => {
-                                title: "Something went wrong, please try again",
+                              return setErrorData({
+                                title:
+                                  "There is something wrong with this prompt, please review it",
+                                list: [error.response.data.detail],
                               });
-                            }
-                          })
-                          .catch((error) => {
-                            return setErrorData({
-                              title:
-                                "There is something wrong with this prompt, please review it",
-                              list: [error.response.data.detail],
                             });
-                          });
+                          break;
+                        
+                          default:
+                            break;
+                        }
                       }}
                     >
                       {myButtonText}

src/frontend/src/utils.ts

@@ -25,6 +25,11 @@ export function classNames(...classes: Array<string>) {
   return classes.filter(Boolean).join(" ");
 }
 
+export enum TypeModal {
+  TEXT = 1,
+  PROMPT = 2 
+}
+
 export const textColors = {
   white: "text-white",
   red: "text-red-700",