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

src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx

@@ -136,7 +136,7 @@ export default function ParameterComponent({
           nodeIconsLucide[item.family] ?? nodeIconsLucide["unknown"];
 
         return (
-          <>
+          <div key={index}>
             {index === 0 && (
               <span>
                 {left
@@ -183,7 +183,7 @@ export default function ParameterComponent({
                 </span>
               </span>
             </span>
-          </>
+          </div>
         );
       });
     } else {

src/frontend/src/contexts/typesContext.tsx

@@ -92,14 +92,22 @@ export function TypesProvider({ children }: { children: ReactNode }) {
     }
   }
 
-  function deleteNode(idx: string) {
+  function deleteNode(idx: string | Array<string>) {
     reactFlowInstance!.setNodes(
-      reactFlowInstance!.getNodes().filter((node: Node) => node.id !== idx)
+      reactFlowInstance!
+        .getNodes()
+        .filter((node: Node) =>
+          typeof idx === "string" ? node.id !== idx : !idx.includes(node.id)
+        )
     );
     reactFlowInstance!.setEdges(
       reactFlowInstance!
         .getEdges()
-        .filter((edge) => edge.source !== idx && edge.target !== idx)
+        .filter((edge) =>
+          typeof idx === "string"
+            ? edge.source !== idx && edge.target !== idx
+            : !idx.includes(edge.source) && !idx.includes(edge.target)
+        )
     );
   }
   return (

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

@@ -17,11 +17,7 @@ import { alertContext } from "../../contexts/alertContext";
 import { postValidatePrompt } from "../../controllers/API";
 import { genericModalPropsType } from "../../types/components";
 import { handleKeyDown } from "../../utils/reactflowUtils";
-import {
-  classNames,
-  getRandomKeyByssmm,
-  varHighlightHTML,
-} from "../../utils/utils";
+import { classNames, varHighlightHTML } from "../../utils/utils";
 import BaseModal from "../baseModal";
 
 export default function GenericModal({
@@ -97,19 +93,6 @@ export default function GenericModal({
     .replace(regexHighlight, varHighlightHTML({ name: "$1" }))
     .replace(/\n/g, "<br />");
 
-  const TextAreaContentView = (): JSX.Element => {
-    return (
-      <SanitizedHTMLWrapper
-        className={getClassByNumberLength()}
-        content={coloredContent}
-        onClick={() => {
-          setIsEdit(true);
-        }}
-        suppressWarning={true}
-      />
-    );
-  };
-
   function getClassByNumberLength(): string {
     let sumOfCaracteres: number = 0;
     wordsHighlight.forEach((element) => {
@@ -224,7 +207,14 @@ export default function GenericModal({
                 }}
               />
             ) : type === TypeModal.PROMPT && !isEdit ? (
-              <TextAreaContentView />
+              <SanitizedHTMLWrapper
+                className={getClassByNumberLength()}
+                content={coloredContent}
+                onClick={() => {
+                  setIsEdit(true);
+                }}
+                suppressWarning={true}
+              />
             ) : type !== TypeModal.PROMPT ? (
               <Textarea
                 //@ts-ignore
@@ -263,7 +253,7 @@ export default function GenericModal({
 
                       {wordsHighlight.map((word, index) => (
                         <ShadTooltip
-                          key={getRandomKeyByssmm() + index}
+                          key={index}
                           content={word.replace(/[{}]/g, "")}
                           asChild={false}
                         >

src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx

@@ -120,9 +120,8 @@ export default function Page({
           lastSelection
         ) {
           event.preventDefault();
-          lastSelection.nodes.forEach((k) => {
-            deleteNode(k.id);
-          });
+          console.log(lastSelection);
+          deleteNode(lastSelection.nodes.map((node) => node.id));
         }
       }
     };

src/frontend/src/types/typesContext/index.ts

@@ -9,7 +9,7 @@ const data: { [char: string]: string } = {};
 export type typesContextType = {
   reactFlowInstance: ReactFlowInstance | null;
   setReactFlowInstance: (newState: ReactFlowInstance) => void;
-  deleteNode: (idx: string) => void;
+  deleteNode: (idx: string | Array<string>) => void;
   types: typeof types;
   setTypes: (newState: {}) => void;
   templates: typeof template;