Merge branch 'DEV' of https://github.com/neo4j-labs/llm-graph-builder into DEV

Author: prakriti-solankey

frontend/src/components/Content.tsx

@@ -30,6 +30,8 @@ const Content: React.FC<ContentProps> = ({
   openTextSchema,
   isSchema,
   setIsSchema,
+  showEnhancementDialog,
+  setshowEnhancementDialog,
 }) => {
   const [init, setInit] = useState<boolean>(false);
   const [openConnection, setOpenConnection] = useState<boolean>(false);
@@ -41,7 +43,6 @@ const Content: React.FC<ContentProps> = ({
   const [extractLoading, setextractLoading] = useState<boolean>(false);
   const [isLargeFile, setIsLargeFile] = useState<boolean>(false);
   const [showSettingnModal, setshowSettingModal] = useState<boolean>(false);
-  const [showEnhancementDialog, setshowEnhancementDialog] = useState<boolean>(false);
 
   const {
     filesData,

frontend/src/components/Layout/PageLayout.tsx

@@ -28,6 +28,7 @@ export default function PageLayoutNew({
   const [showChatBot, setShowChatBot] = useState<boolean>(false);
   const [showDrawerChatbot, setShowDrawerChatbot] = useState<boolean>(true);
   const [clearHistoryData, setClearHistoryData] = useState<boolean>(false);
+  const [showEnhancementDialog, setshowEnhancementDialog] = useState<boolean>(false);
   const { userCredentials } = useCredentials();
   const toggleLeftDrawer = () => setIsLeftExpanded(!isLeftExpanded);
   const toggleRightDrawer = () => setIsRightExpanded(!isRightExpanded);
@@ -86,16 +87,26 @@ export default function PageLayoutNew({
       <SideNav isExpanded={isLeftExpanded} position='left' toggleDrawer={toggleLeftDrawer} />
       <DrawerDropzone isExpanded={isLeftExpanded} />
       <SchemaFromTextDialog
-        open={showTextFromSchemaDialog}
+        open={showTextFromSchemaDialog.show}
         openSettingsDialog={openSettingsDialog}
         onClose={() => {
-          setShowTextFromSchemaDialog(false);
+          setShowTextFromSchemaDialog({ triggeredFrom: '', show: false });
+          switch (showTextFromSchemaDialog.triggeredFrom) {
+            case 'enhancementtab':
+              setshowEnhancementDialog(true);
+              break;
+            case 'schemadialog':
+              openSettingsDialog();
+              break;
+            default:
+              break;
+          }
         }}
         showAlert={showAlert}
       ></SchemaFromTextDialog>
       <SettingsModal
         openTextSchema={() => {
-          setShowTextFromSchemaDialog(true);
+          setShowTextFromSchemaDialog({ triggeredFrom: 'schemadialog', show: true });
         }}
         open={isSettingPanelExpanded}
         onClose={closeSettingModal}
@@ -109,10 +120,12 @@ export default function PageLayoutNew({
         isRightExpanded={isRightExpanded}
         showChatBot={showChatBot}
         openTextSchema={() => {
-          setShowTextFromSchemaDialog(true);
+          setShowTextFromSchemaDialog({ triggeredFrom: 'schemadialog', show: true });
         }}
         isSchema={isSchema}
         setIsSchema={setIsSchema}
+        showEnhancementDialog={showEnhancementDialog}
+        setshowEnhancementDialog={setshowEnhancementDialog}
       />
       {showDrawerChatbot && (
         <DrawerChatbot messages={messages} isExpanded={isRightExpanded} clearHistoryData={clearHistoryData} />

frontend/src/components/Popups/GraphEnhancementDialog/DeleteTabForOrphanNodes/index.tsx

@@ -224,14 +224,12 @@ export default function DeletePopUpForOrphanNodes({
           zebraStriping: true,
           headerStyle: 'clean',
         }}
-        rootProps={
-          {
-            className:'max-h-[355px] !overflow-y-auto'
-          }
-        }
+        rootProps={{
+          className: 'max-h-[355px] !overflow-y-auto',
+        }}
         isLoading={isLoading}
         components={{
-          Body: (props) => <DataGridComponents.Body {...props}  />,
+          Body: (props) => <DataGridComponents.Body {...props} />,
           PaginationNumericButton: ({ isSelected, innerProps, ...restProps }) => {
             return (
               <DataGridComponents.PaginationNumericButton

frontend/src/components/Popups/GraphEnhancementDialog/index.tsx

@@ -78,7 +78,7 @@ export default function GraphEnhancementDialog({
             <EntityExtractionSettings
               view='Tabs'
               openTextSchema={() => {
-                setShowTextFromSchemaDialog(true);
+                setShowTextFromSchemaDialog({ triggeredFrom: 'enhancementtab', show: true });
               }}
               colseEnhanceGraphSchemaDialog={onClose}
               settingView='headerView'

frontend/src/components/WebSources/GenericSourceModal.tsx

@@ -45,7 +45,10 @@ export default function GenericModal({
         <Tabs fill='underline' onChange={setactiveTab} size='large' value={activeTab}>
           {APP_SOURCES != undefined && APP_SOURCES.includes('youtube') && (
             <Tabs.Tab tabId={0} aria-label='Database' disabled={isLoading}>
-              <img src={themeUtils.colorMode==="light"?youtubelightmodelogo:youtubedarkmodelogo} className={`brandimg`}></img>
+              <img
+                src={themeUtils.colorMode === 'light' ? youtubelightmodelogo : youtubedarkmodelogo}
+                className={`brandimg`}
+              ></img>
             </Tabs.Tab>
           )}
           {APP_SOURCES != undefined && APP_SOURCES.includes('wiki') && (

frontend/src/context/UsersFiles.tsx

@@ -2,7 +2,10 @@ import { createContext, useContext, useState, Dispatch, SetStateAction, FC, useE
 import { CustomFile, FileContextProviderProps, OptionType } from '../types';
 import { defaultLLM } from '../utils/Constants';
 import { useCredentials } from './UserCredentials';
-
+interface showTextFromSchemaDialogType {
+  triggeredFrom: string;
+  show: boolean;
+}
 interface FileContextType {
   files: (File | null)[] | [];
   filesData: CustomFile[] | [];
@@ -26,8 +29,8 @@ interface FileContextType {
   setchatMode: Dispatch<SetStateAction<string>>;
   isSchema: boolean;
   setIsSchema: React.Dispatch<React.SetStateAction<boolean>>;
-  showTextFromSchemaDialog: boolean;
-  setShowTextFromSchemaDialog: React.Dispatch<React.SetStateAction<boolean>>;
+  showTextFromSchemaDialog: showTextFromSchemaDialogType;
+  setShowTextFromSchemaDialog: React.Dispatch<React.SetStateAction<showTextFromSchemaDialogType>>;
 }
 const FileContext = createContext<FileContextType | undefined>(undefined);
 
@@ -47,7 +50,10 @@ const FileContextProvider: FC<FileContextProviderProps> = ({ children }) => {
   const [chatMode, setchatMode] = useState<string>('graph+vector');
   const { userCredentials } = useCredentials();
   const [isSchema, setIsSchema] = useState<boolean>(false);
-  const [showTextFromSchemaDialog, setShowTextFromSchemaDialog] = useState<boolean>(false);
+  const [showTextFromSchemaDialog, setShowTextFromSchemaDialog] = useState<showTextFromSchemaDialogType>({
+    triggeredFrom: '',
+    show: false,
+  });
 
   useEffect(() => {
     if (selectedNodeLabelstr != null) {

frontend/src/types.ts

@@ -154,6 +154,8 @@ export interface ContentProps {
   openTextSchema: () => void;
   isSchema?: boolean;
   setIsSchema: Dispatch<SetStateAction<boolean>>;
+  showEnhancementDialog: boolean;
+  setshowEnhancementDialog: Dispatch<SetStateAction<boolean>>;
 }
 
 export interface FileTableProps {