labels change

Author: prakriti-solankey

frontend/src/components/Layout/PageLayout.tsx

@@ -19,7 +19,7 @@ import { useAuth0 } from '@auth0/auth0-react';
 import { showErrorToast } from '../../utils/Toasts';
 import { APP_SOURCES } from '../../utils/Constants';
 import { createDefaultFormData } from '../../API/Index';
-import LoadExistingSchemaDialog from '../Popups/GraphEnhancementDialog/EnitityExtraction/LoadExistingSchema';
+import LoadDBSchemaDialog from '../Popups/GraphEnhancementDialog/EnitityExtraction/LoadExistingSchema';
 import PredefinedSchemaDialog from '../Popups/GraphEnhancementDialog/EnitityExtraction/PredefinedSchemaDialog';
 
 const GCSModal = lazy(() => import('../DataSources/GCS/GCSModal'));
@@ -437,7 +437,7 @@ const PageLayout: React.FC = () => {
         }}
         onApply={handleApplyPatternsFromText}
       ></SchemaFromTextDialog>
-      <LoadExistingSchemaDialog
+      <LoadDBSchemaDialog
         open={schemaLoadDialog.show}
         onClose={() => {
           setSchemaLoadDialog({ triggeredFrom: '', show: false });
@@ -467,9 +467,8 @@ const PageLayout: React.FC = () => {
       ></PredefinedSchemaDialog>
       {isLargeDesktop ? (
         <div
-          className={`layout-wrapper ${!isLeftExpanded ? 'drawerdropzoneclosed' : ''} ${
-            !isRightExpanded ? 'drawerchatbotclosed' : ''
-          } ${!isRightExpanded && !isLeftExpanded ? 'drawerclosed' : ''}`}
+          className={`layout-wrapper ${!isLeftExpanded ? 'drawerdropzoneclosed' : ''} ${!isRightExpanded ? 'drawerchatbotclosed' : ''
+            } ${!isRightExpanded && !isLeftExpanded ? 'drawerclosed' : ''}`}
         >
           <SideNav
             toggles3Modal={toggleS3Modal}

frontend/src/components/Popups/GraphEnhancementDialog/EnitityExtraction/LoadExistingSchema.tsx

@@ -6,12 +6,12 @@ import { extractOptions } from '../../../../utils/Utils';
 import { useFileContext } from '../../../../context/UsersFiles';
 import SchemaViz from '../../../../components/Graph/SchemaViz';
 
-interface LoadExistingSchemaDialogProps {
+interface LoadDBSchemaDialogProps {
   open: boolean;
   onClose: () => void;
   onApply: (patterns: string[], nodeLabels: OptionType[], relationshipLabels: OptionType[], view: string) => void;
 }
-const LoadExistingSchemaDialog = ({ open, onClose, onApply }: LoadExistingSchemaDialogProps) => {
+const LoadDBSchemaDialog = ({ open, onClose, onApply }: LoadDBSchemaDialogProps) => {
   const [loading, setLoading] = useState<boolean>(false);
   const { setDbPattern, dbPattern, dbNodes, setDbNodes, dbRels, setDbRels } = useFileContext();
   const [openGraphView, setOpenGraphView] = useState<boolean>(false);
@@ -127,4 +127,4 @@ const LoadExistingSchemaDialog = ({ open, onClose, onApply }: LoadExistingSchema
   );
 };
 
-export default LoadExistingSchemaDialog;
+export default LoadDBSchemaDialog;

frontend/src/components/Popups/GraphEnhancementDialog/EnitityExtraction/NewEntityExtractionSetting.tsx

@@ -77,6 +77,7 @@ export default function NewEntityExtractionSetting({
   const [combinedRels, setCombinedRels] = useState<OptionType[]>([]);
   const [isSchemaMenuOpen, setIsSchemaMenuOpen] = useState<boolean>(false);
   const schemaBtnRef = useRef<HTMLButtonElement>(null);
+  
   useEffect(() => {
     const patterns = Array.from(
       new Set([...userDefinedPattern, ...preDefinedPattern, ...dbPattern, ...schemaTextPattern])

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

@@ -9,8 +9,6 @@ import DeduplicationTab from './Deduplication';
 import { tokens } from '@neo4j-ndl/base';
 import PostProcessingCheckList from './PostProcessingCheckList';
 import AdditionalInstructionsText from './AdditionalInstructions';
-import { updateLocalStorage } from '../../../utils/Utils';
-import { useCredentials } from '../../../context/UserCredentials';
 
 export default function GraphEnhancementDialog({ open, onClose }: { open: boolean; onClose: () => void }) {
   const { breakpoints } = tokens;
@@ -19,9 +17,6 @@ export default function GraphEnhancementDialog({ open, onClose }: { open: boolea
     setShowTextFromSchemaDialog,
     setSchemaLoadDialog,
     setPredefinedSchemaDialog,
-    setSelectedNodes,
-    setAllPatterns,
-    setSelectedRels,
     setUserDefinedPattern,
     setUserDefinedNodes,
     setUserDefinedRels,
@@ -37,7 +32,6 @@ export default function GraphEnhancementDialog({ open, onClose }: { open: boolea
     setSelectedPreDefOption,
   } = useFileContext();
   const isTablet = useMediaQuery(`(min-width:${breakpoints.xs}) and (max-width: ${breakpoints.lg})`);
-  const { userCredentials } = useCredentials();
 
   const orphanNodesDeleteHandler = async (selectedEntities: string[]) => {
     try {
@@ -51,10 +45,6 @@ export default function GraphEnhancementDialog({ open, onClose }: { open: boolea
   };
 
   const handleOnclose = () => {
-    // overall
-    setSelectedNodes([]);
-    setSelectedRels([]);
-    setAllPatterns([]);
     // User
     setUserDefinedPattern([]);
     setUserDefinedNodes([]);
@@ -72,10 +62,6 @@ export default function GraphEnhancementDialog({ open, onClose }: { open: boolea
     setPreDefinedRels([]);
     setPreDefinedPattern([]);
     setSelectedPreDefOption(null);
-
-    updateLocalStorage(userCredentials!, 'selectedNodeLabels', []);
-    updateLocalStorage(userCredentials!, 'selectedRelationshipLabels', []);
-    updateLocalStorage(userCredentials!, 'selectedPattern', []);
     onClose();
   };