Allowed nodes validation (#1290)

* added validation for tuple schema relationships

* remove duplicate

---------

Co-authored-by: kaustubh-darekar <[email protected]>

Author: prakriti-solankey

frontend/src/components/Layout/PageLayout.tsx

@@ -22,7 +22,7 @@ import LoadDBSchemaDialog from '../Popups/GraphEnhancementDialog/EnitityExtracti
 import PredefinedSchemaDialog from '../Popups/GraphEnhancementDialog/EnitityExtraction/PredefinedSchemaDialog';
 import { SKIP_AUTH } from '../../utils/Constants';
 import { useNavigate } from 'react-router';
-import { deduplicateByRelationshipTypeOnly, deduplicateNodeByValue } from '../../utils/Utils';
+import { deduplicateByFullPattern, deduplicateNodeByValue } from '../../utils/Utils';
 
 const GCSModal = lazy(() => import('../DataSources/GCS/GCSModal'));
 const S3Modal = lazy(() => import('../DataSources/AWS/S3Modal'));
@@ -378,7 +378,7 @@ const PageLayout: React.FC = () => {
       setSchemaValRels(rels);
       setCombinedRelsVal((prevRels: OptionType[]) => {
         const combined = [...rels, ...prevRels];
-        return deduplicateByRelationshipTypeOnly(combined);
+        return deduplicateByFullPattern(combined);
       });
       setSchemaView('text');
       localStorage.setItem(LOCAL_KEYS.source, JSON.stringify(updatedSource));
@@ -418,7 +418,7 @@ const PageLayout: React.FC = () => {
       setDbRels(rels);
       setCombinedRelsVal((prevRels: OptionType[]) => {
         const combined = [...rels, ...prevRels];
-        return deduplicateByRelationshipTypeOnly(combined);
+        return deduplicateByFullPattern(combined);
       });
       localStorage.setItem(LOCAL_KEYS.source, JSON.stringify(updatedSource));
       localStorage.setItem(LOCAL_KEYS.type, JSON.stringify(updatedType));
@@ -456,7 +456,7 @@ const PageLayout: React.FC = () => {
       setPreDefinedRels(rels);
       setCombinedRelsVal((prevRels: OptionType[]) => {
         const combined = [...rels, ...prevRels];
-        return deduplicateByRelationshipTypeOnly(combined);
+        return deduplicateByFullPattern(combined);
       });
       localStorage.setItem(LOCAL_KEYS.source, JSON.stringify(updatedSource));
       localStorage.setItem(LOCAL_KEYS.type, JSON.stringify(updatedType));

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

@@ -13,7 +13,7 @@ import {
   updateLocalStorage,
   extractOptions,
   parseRelationshipString,
-  deduplicateByRelationshipTypeOnly,
+  deduplicateByFullPattern,
   deduplicateNodeByValue,
 } from '../../../../utils/Utils';
 import TooltipWrapper from '../../../UI/TipWrapper';
@@ -175,15 +175,15 @@ export default function NewEntityExtractionSetting({
         });
         setUserDefinedRels((prev: OptionType[]) => {
           const combined = [...prev, ...relationshipTypeOptions];
-          return deduplicateByRelationshipTypeOnly(combined);
+          return deduplicateByFullPattern(combined);
         });
         setCombinedNodes((prev: OptionType[]) => {
           const combined = [...prev, ...nodeLabelOptions];
           return deduplicateNodeByValue(combined);
         });
         setCombinedRels((prev: OptionType[]) => {
           const combined = [...prev, ...relationshipTypeOptions];
-          return deduplicateByRelationshipTypeOnly(combined);
+          return deduplicateByFullPattern(combined);
         });
         setTupleOptions((prev) => [...updatedTuples, ...prev]);
       } else {

frontend/src/utils/Utils.ts

@@ -881,14 +881,12 @@ export const deduplicateNodeByValue = (arrays: { value: any }[]) => {
   });
   return Array.from(map.values());
 };
-
-export const deduplicateByRelationshipTypeOnly = (arrays: { value: string; label: string }[]) => {
+export const deduplicateByFullPattern = (arrays: { value: string; label: string }[]) => {
   const seen = new Set<string>();
   const result: { value: string; label: string }[] = [];
   arrays.forEach((item) => {
-    const [, type] = item.value.split(',');
-    if (!seen.has(type)) {
-      seen.add(type);
+    if (!seen.has(item.value)) {
+      seen.add(item.value);
       result.push(item);
     }
   });