Knowledge graphs

src/components/projects/ProjectsList.tsx

@@ -17,6 +17,7 @@ import { useWebsocket } from "@/submodules/react-components/hooks/web-socket/use
 import { getAllProjects } from "@/src/services/base/project";
 import { getOverviewStats } from "@/src/services/base/organization";
 import { Application, CurrentPage } from "@/submodules/react-components/hooks/web-socket/constants";
+import { setActiveDataBlock } from "@/src/reduxStore/states/pages/data-blocks";
 
 export default function ProjectsList() {
     const dispatch = useDispatch();
@@ -37,6 +38,7 @@ export default function ProjectsList() {
         dispatch(setAllEmbeddings([]));
         dispatch(setDataSlices([]));
         dispatch(setComments(null));
+        dispatch(setActiveDataBlock(null));
     }, []);
 
     useEffect(() => {

src/components/projects/projectId/attributes/attributeId/AttributeCalculations.tsx

@@ -519,7 +519,7 @@ export default function AttributeCalculation() {
                     </div>}
                 </div>
 
-                <DangerZone elementType={DangerZoneEnum.ATTRIBUTE} name={currentAttribute.name} id={currentAttribute.id} />
+                <DangerZone elementType={DangerZoneEnum.ATTRIBUTE} name={currentAttribute.name} id={currentAttribute.id} relatedDataBlocks={currentAttribute.relatedDataBlocks} />
             </div >
         </div >}
     </div >)

src/components/projects/projectId/attributes/attributeId/ConfirmExecutionModal.tsx

@@ -6,17 +6,20 @@ import { ModalButton, ModalEnum } from "@/src/types/shared/modal";
 import { useCallback, useEffect, useState } from "react";
 import { useSelector } from "react-redux";
 import { calculateUserAttributeAllRecordsPost } from "@/src/services/base/project-setting";
+import { useRouter } from "next/router";
 
 const ACCEPT_BUTTON = { buttonCaption: 'Accept', useButton: true };
 
 
 export default function ConfirmExecutionModal(props: ConfirmExecutionModalProps) {
+    const router = useRouter();
     const projectId = useSelector(selectProjectId);
     const modalExecuteAll = useSelector(selectModal(ModalEnum.EXECUTE_ATTRIBUTE_CALCULATION));
 
     const calculateUserAttributeAllRecords = useCallback(() => {
-        calculateUserAttributeAllRecordsPost(projectId, { attributeId: props.currentAttributeId }, (res) => { });
-    }, [modalExecuteAll]);
+        const attributeId = props.dataBlockId ? router.query.columnId as string : props.currentAttributeId;
+        calculateUserAttributeAllRecordsPost(projectId, { attributeId: attributeId, dataBlockId: props.dataBlockId }, (res) => { });
+    }, [modalExecuteAll, props.currentAttributeId, props.dataBlockId]);
 
     useEffect(() => {
         setAcceptButton({ ...ACCEPT_BUTTON, emitFunction: calculateUserAttributeAllRecords, disabled: modalExecuteAll.requestedSomething });

src/components/projects/projectId/attributes/attributeId/ExecutionContainer.tsx

@@ -1,6 +1,7 @@
 import LoadingIcon from "@/submodules/react-components/components/LoadingIcon";
 import { setModalStates } from "@/src/reduxStore/states/modal";
 import { selectProjectId } from "@/src/reduxStore/states/project";
+import { selectDataBlock } from "@/src/reduxStore/states/pages/data-blocks";
 import { ExecutionContainerProps, SampleRecord } from "@/src/types/components/projects/projectId/settings/attribute-calculation";
 import { AttributeState } from "@/src/types/components/projects/projectId/settings/data-schema";
 import { ModalEnum } from "@/src/types/shared/modal";
@@ -17,17 +18,23 @@ import { getSampleRecords } from "@/src/services/base/attribute";
 import { DataTypeEnum } from "@/src/types/shared/general";
 import KernButton from "@/submodules/react-components/components/kern-button/KernButton";
 import useRefFor from "@/submodules/react-components/hooks/useRefFor";
+import ViewRecordDetailsDataBlockColumnModal from "../../data-blocks/dataBlockId/columnId/ViewRecordDetailsDataBlockColumnModal";
+import { getRecordByRecordIdDataBlockColumn, getSampleRecordsDataBlockColumn } from "@/src/services/base/data-blocks";
+
 
 export default function ExecutionContainer(props: ExecutionContainerProps) {
-    const projectId = useSelector(selectProjectId);
     const dispatch = useDispatch();
 
+    const projectId = useSelector(selectProjectId);
+    const dataBlock = useSelector(selectDataBlock);
 
     const [requestedSomething, setRequestedSomething] = useState(false);
     const [runOn10HasError, setRunOn10HasError] = useState(false);
     const [sampleRecords, setSampleRecords] = useState<SampleRecord>(null);
     const [checkIfAtLeastRunning, setCheckIfAtLeastRunning] = useState(false);
     const [checkIfAtLeastQueued, setCheckIfAtLeastQueued] = useState(false);
+    const currentAttributesRef = useRefFor(props.currentAttribute);
+
 
     useEffect(() => {
         if (props.enableRunButton) {
@@ -36,41 +43,64 @@ export default function ExecutionContainer(props: ExecutionContainerProps) {
         }
     }, [props.enableRunButton]);
 
-    const currentAttributesRef = useRefFor(props.currentAttribute);
+    const postProcessSampleRecords = useCallback((res: any) => {
+        const sampleRecordsFinal = { ...res };
+        setRequestedSomething(false);
+        props.setEnabledButton(false);
+        setRunOn10HasError(sampleRecordsFinal.calculatedAttributes.length > 0 ? false : true);
+        if (currentAttributesRef.current.dataType == DataTypeEnum.EMBEDDING_LIST || currentAttributesRef.current.dataType == DataTypeEnum.TEXT_LIST) {
+            sampleRecordsFinal.calculatedAttributesList = sampleRecordsFinal.calculatedAttributes.map((record: string) => JSON.parse(record));
+            sampleRecordsFinal.calculatedAttributesListDisplay = extendArrayElementsByUniqueId(sampleRecordsFinal.calculatedAttributesList);
+        }
+        sampleRecordsFinal.calculatedAttributesDisplay = extendArrayElementsByUniqueId(sampleRecordsFinal.calculatedAttributes);
+        setSampleRecords(sampleRecordsFinal);
+        props.refetchCurrentAttribute();
+    }, [props.setEnabledButton, props.refetchCurrentAttribute]);
+
     const calculateUserAttributeSampleRecords = useCallback(() => {
         if (requestedSomething) return;
         setRequestedSomething(true);
-        getSampleRecords(projectId, currentAttributesRef.current.id, (res) => {
-            const sampleRecordsFinal = { ...res };
-            setRequestedSomething(false);
-            props.setEnabledButton(false);
-            setRunOn10HasError(sampleRecordsFinal.calculatedAttributes.length > 0 ? false : true);
-            if (currentAttributesRef.current.dataType == DataTypeEnum.EMBEDDING_LIST || currentAttributesRef.current.dataType == DataTypeEnum.TEXT_LIST) {
-                sampleRecordsFinal.calculatedAttributesList = sampleRecordsFinal.calculatedAttributes.map((record: string) => JSON.parse(record));
-                sampleRecordsFinal.calculatedAttributesListDisplay = extendArrayElementsByUniqueId(sampleRecordsFinal.calculatedAttributesList);
-            }
-            sampleRecordsFinal.calculatedAttributesDisplay = extendArrayElementsByUniqueId(sampleRecordsFinal.calculatedAttributes);
-            setSampleRecords(sampleRecordsFinal);
-            props.refetchCurrentAttribute();
-        });
-    }, [projectId]);
+        if (props.isDataBlockColumn) {
+            getSampleRecordsDataBlockColumn(projectId, dataBlock?.id, currentAttributesRef.current.id, (res) => {
+                postProcessSampleRecords(res);
+            });
+        }
+        else {
+            getSampleRecords(projectId, currentAttributesRef.current.id, (res) => {
+                postProcessSampleRecords(res);
+            });
+        }
+    }, [projectId, dataBlock?.id, props.isDataBlockColumn]);
 
     function recordByRecordId(recordId: string) {
         getRecordByRecordId(projectId, recordId, (res) => {
             dispatch(setModalStates(ModalEnum.VIEW_RECORD_DETAILS, { record: postProcessRecordByRecordId(res) }));
         });
     }
 
+
+    const recordByRecordIdDataBlockColumn = useCallback((recordId: string) => {
+        getRecordByRecordIdDataBlockColumn(projectId, dataBlock?.id, recordId, (res) => {
+            dispatch(setModalStates(ModalEnum.VIEW_RECORD_DETAILS_DATA_BLOCK_COLUMN, { record: postProcessRecordByRecordId(res) }));
+        });
+    }, [projectId, dataBlock?.id]);
+
     const requestedSomethingRef = useRefFor(requestedSomething);
     const executeAttribute = useCallback(() => {
         dispatch(setModalStates(ModalEnum.EXECUTE_ATTRIBUTE_CALCULATION, { open: true, requestedSomething: requestedSomethingRef.current }));
     }, []);
 
     const sampleRecordsRef = useRefFor(sampleRecords);
     const viewRecordDetails = useCallback((index: number) => () => {
-        dispatch(setModalStates(ModalEnum.VIEW_RECORD_DETAILS, { open: true, recordIdx: index }));
-        recordByRecordId(sampleRecordsRef.current.recordIds[index]);
-    }, []);
+        if (props.isDataBlockColumn) {
+            dispatch(setModalStates(ModalEnum.VIEW_RECORD_DETAILS_DATA_BLOCK_COLUMN, { open: true, recordIdx: index }));
+            recordByRecordIdDataBlockColumn(sampleRecordsRef.current.recordIds[index]);
+        }
+        else {
+            dispatch(setModalStates(ModalEnum.VIEW_RECORD_DETAILS, { open: true, recordIdx: index }));
+            recordByRecordId(sampleRecordsRef.current.recordIds[index]);
+        }
+    }, [dataBlock, props.isDataBlockColumn]);
 
     const sampleRecordsFinal = useMemo(() => {
         if (sampleRecords && sampleRecords.calculatedAttributesDisplay) {
@@ -159,6 +189,7 @@ export default function ExecutionContainer(props: ExecutionContainerProps) {
         </div >}
 
         <ViewRecordDetailsModal currentAttribute={props.currentAttribute} sampleRecords={sampleRecordsFinal} />
-        <ConfirmExecutionModal currentAttributeId={props.currentAttribute.id} />
+        <ConfirmExecutionModal currentAttributeId={props.currentAttribute.id} dataBlockId={dataBlock?.id} />
+        <ViewRecordDetailsDataBlockColumnModal currentAttribute={props.currentAttribute} sampleRecords={sampleRecordsFinal} />
     </div >)
 }