Merge branch 'cognition-integration-provider' of github.com:code-kern-ai/refinery-ui into cognition-integration-provider

LennartSchmidtKern · LennartSchmidtKern · commit ab59fd6aa0aa · 2025-06-26T14:34:52.000+02:00
diff --git a/src/components/projects/projectId/attributes/attributeId/AttributeCalculations.tsx b/src/components/projects/projectId/attributes/attributeId/AttributeCalculations.tsx
@@ -1,6 +1,6 @@
 import Statuses from "@/src/components/shared/statuses/Statuses";
 import { selectAllLookupLists, setAllLookupLists } from "@/src/reduxStore/states/pages/lookup-lists";
-import { selectAttributes, selectVisibleAttributeAC, setAllAttributes, setLabelingTasksAll, updateAttributeById } from "@/src/reduxStore/states/pages/settings";
+import { selectAttributes, selectVisibleAttributeAC, selectVisibleAttributesWithoutPermissions, setAllAttributes, setLabelingTasksAll, updateAttributeById } from "@/src/reduxStore/states/pages/settings";
 import { selectProjectId } from "@/src/reduxStore/states/project"
 import { Attribute, AttributeState, AttributeVisibility, AttributeWithOnClick, LLMConfig } from "@/src/types/components/projects/projectId/settings/data-schema";
 import { DataTypeEnum } from "@/src/types/shared/general";
@@ -52,7 +52,7 @@ export default function AttributeCalculation() {
 
     const projectId = useSelector(selectProjectId);
     const attributes = useSelector(selectAttributes);
-    const usableAttributes = useSelector(selectVisibleAttributeAC)
+    const usableAttributes = useSelector(selectVisibleAttributesWithoutPermissions);
     const lookupLists = useSelector(selectAllLookupLists);
     const allUsers = useSelector(selectAllUsers);
 
diff --git a/src/components/projects/projectId/attributes/attributeId/ExecutionContainer.tsx b/src/components/projects/projectId/attributes/attributeId/ExecutionContainer.tsx
@@ -74,10 +74,12 @@ export default function ExecutionContainer(props: ExecutionContainerProps) {
 
     const sampleRecordsFinal = useMemo(() => {
         if (sampleRecords && sampleRecords.calculatedAttributesDisplay) {
-            return sampleRecords.calculatedAttributesDisplay.map((record: any) => {
+            return sampleRecords.calculatedAttributesDisplay.map((record: any, index) => {
+                const calculatedValue = currentAttributesRef.current.dataType != DataTypeEnum.EMBEDDING_LIST ? record : { id: record.id, value: JSON.parse(record.value) }
                 return {
                     ...record,
-                    onClick: viewRecordDetails(record.id)
+                    onClick: viewRecordDetails(index),
+                    calculatedValue: calculatedValue
                 }
             }
             );
@@ -130,7 +132,7 @@ export default function ExecutionContainer(props: ExecutionContainerProps) {
                 <div className="inline-block min-w-full align-middle">
                     <div className="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
                         <div className="min-w-full border divide-y divide-gray-300">
-                            {sampleRecordsFinal.map((record: any, index: number) => (
+                            {sampleRecordsFinal.map((record: any) => (
                                 <div key={record.id} className="divide-y divide-gray-200 bg-white">
                                     <div className="flex-shrink-0 border-b border-gray-200 shadow-sm flex justify-between items-center">
                                         <div className="flex items-center text-xs leading-5 text-gray-500 font-normal mx-4 my-3 text-justify">
@@ -151,7 +153,7 @@ export default function ExecutionContainer(props: ExecutionContainerProps) {
             </div>
         </div >}
 
-        <ViewRecordDetailsModal currentAttribute={props.currentAttribute} sampleRecords={sampleRecords} />
+        <ViewRecordDetailsModal currentAttribute={props.currentAttribute} sampleRecords={sampleRecordsFinal} />
         <ConfirmExecutionModal currentAttributeId={props.currentAttribute.id} />
     </div >)
 }
diff --git a/src/components/projects/projectId/attributes/attributeId/ViewRecordDetailsModal.tsx b/src/components/projects/projectId/attributes/attributeId/ViewRecordDetailsModal.tsx
@@ -24,10 +24,10 @@ export default function ViewRecordDetailsModal(props: ViewRecordDetailsModalProp
                     <div className="text-sm leading-5 text-left text-gray-900 font-medium">Calculated value</div>
                     <div className="text-sm leading-5 text-left text-gray-500 font-normal whitespace-pre-line">
                         {props.currentAttribute.dataType != DataTypeEnum.EMBEDDING_LIST ? <span>
-                            {props.sampleRecords.calculatedAttributes[modalViewRecordDetails.recordIdx]}
+                            {props.sampleRecords[modalViewRecordDetails.recordIdx].calculatedValue.value}
                         </span> : <div className="flex flex-col gap-y-2 divide-y">
-                            {props.sampleRecords.calculatedAttributesListDisplay[modalViewRecordDetails.recordIdx].map((item: any) => <span key={item.id} className="mt-1">
-                                {props.sampleRecords.calculatedAttributesList[modalViewRecordDetails.recordIdx]}
+                            {props.sampleRecords[modalViewRecordDetails.recordIdx].calculatedValue.value.map((item: any) => <span key={item} className="mt-1">
+                                {item}
                             </span>)}
                         </div>}
                     </div>
diff --git a/src/components/projects/projectId/data-browser/SearchGroups.tsx b/src/components/projects/projectId/data-browser/SearchGroups.tsx
@@ -85,6 +85,7 @@ export default function SearchGroups() {
         });
         colors.push('gray');
         visibleAttributes.forEach((att) => {
+            if (att.dataType == DataTypeEnum.PERMISSION) return;
             attributesSort.push({
                 name: att.name,
                 key: att.id,
diff --git a/src/components/projects/projectId/heuristics/heuristicId/labeling-function/LabelingFunction.tsx b/src/components/projects/projectId/heuristics/heuristicId/labeling-function/LabelingFunction.tsx
@@ -8,7 +8,7 @@ import { postProcessCurrentHeuristic, postProcessLastTaskLogs } from "@/src/util
 import { Tooltip } from "@nextui-org/react";
 import { TOOLTIPS_DICT } from "@/src/util/tooltip-constants";
 import { postProcessLabelingTasksSchema } from "@/src/util/components/projects/projectId/settings/labeling-tasks-helper";
-import { selectVisibleAttributesHeuristics, selectLabelingTasksAll, setLabelingTasksAll } from "@/src/reduxStore/states/pages/settings";
+import { selectVisibleAttributesHeuristics, selectLabelingTasksAll, setLabelingTasksAll, selectVisibleAttributesWithoutPermissions } from "@/src/reduxStore/states/pages/settings";
 import HeuristicsEditor from "../shared/HeuristicsEditor";
 import DangerZone from "@/src/components/shared/danger-zone/DangerZone";
 import HeuristicRunButtons from "../shared/HeuristicRunButtons";
@@ -46,7 +46,7 @@ export default function LabelingFunction() {
     const projectId = useSelector(selectProjectId);
     const currentHeuristic = useSelector(selectHeuristic);
     const labelingTasks = useSelector(selectLabelingTasksAll);
-    const attributes = useSelector(selectVisibleAttributesHeuristics);
+    const attributes = useSelector(selectVisibleAttributesWithoutPermissions);
     const allUsers = useSelector(selectAllUsers);
 
     const [lastTaskLogs, setLastTaskLogs] = useState<string[]>([]);
diff --git a/src/components/projects/projectId/heuristics/heuristicId/shared/HeuristicsLayout.tsx b/src/components/projects/projectId/heuristics/heuristicId/shared/HeuristicsLayout.tsx
@@ -1,7 +1,7 @@
 import Statuses from "@/src/components/shared/statuses/Statuses";
 import { selectHeuristic, setActiveHeuristics, updateHeuristicsState } from "@/src/reduxStore/states/pages/heuristics";
 import { selectAllLookupLists, setAllLookupLists } from "@/src/reduxStore/states/pages/lookup-lists";
-import { selectVisibleAttributesHeuristics, setAllAttributes } from "@/src/reduxStore/states/pages/settings";
+import { selectVisibleAttributesHeuristics, selectVisibleAttributesWithoutPermissions, setAllAttributes } from "@/src/reduxStore/states/pages/settings";
 import { selectProjectId } from "@/src/reduxStore/states/project"
 import { HeuristicsProperty } from "@/src/types/components/projects/projectId/heuristics/heuristicId/heuristics-details";
 import { Attribute } from "@/src/types/components/projects/projectId/settings/data-schema";
@@ -26,7 +26,7 @@ export default function HeuristicsLayout(props: any) {
 
     const projectId = useSelector(selectProjectId);
     const currentHeuristic = useSelector(selectHeuristic);
-    const usableAttributes = useSelector(selectVisibleAttributesHeuristics);
+    const usableAttributes = useSelector(selectVisibleAttributesWithoutPermissions);
     const lookupLists = useSelector(selectAllLookupLists);
 
     const [isHeaderNormal, setIsHeaderNormal] = useState(true);
diff --git a/src/components/projects/projectId/playground/CreateEvaluationSetModal.tsx b/src/components/projects/projectId/playground/CreateEvaluationSetModal.tsx
@@ -15,6 +15,7 @@ import { useCallback, useEffect, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import QuestionHistory from "./QuestionHistory";
 import { MemoIconPlus, MemoIconWand } from "@/submodules/react-components/components/kern-icons/icons";
+import { postProcessUpdateAndSortRecords } from "@/submodules/javascript-functions/post-process-functions";
 
 const ACCEPT_BUTTON = { buttonCaption: 'Create', useButton: true };
 const SEARCH_REQUEST = { offset: 0, limit: 20 };
@@ -129,16 +130,7 @@ export default function CreateEvaluationSetModal(props: CreateEvaluationSetsModa
     }
 
     function updateAndSortRecordList(newRecords = []) {
-        setRecordList((prev) => {
-            const merged = [...prev, ...newRecords];
-            const uniqueRecords = Array.from(
-                new Map(merged.map((item) => [item.data?.running_id, item])).values()
-            );
-            uniqueRecords.sort(
-                (a, b) => (a.data?.running_id || 0) - (b.data?.running_id || 0)
-            );
-            return uniqueRecords;
-        });
+        setRecordList((prev) => postProcessUpdateAndSortRecords(prev, newRecords));
     }
 
     function resetState() {
diff --git a/src/components/shared/record-display/RecordDisplay.tsx b/src/components/shared/record-display/RecordDisplay.tsx
@@ -3,11 +3,11 @@ import { selectAttributesDict } from "@/src/reduxStore/states/pages/settings";
 import { LineBreaksType } from "@/src/types/components/projects/projectId/data-browser/data-browser";
 import { Attribute } from "@/src/types/components/projects/projectId/settings/data-schema";
 import { DataTypeEnum } from "@/src/types/shared/general";
-import { postProcessAttributes, postProcessRecord } from "@/src/util/shared/record-display-helper";
 import { useEffect, useState } from "react";
 import { useSelector } from "react-redux";
 import Highlight from "../highlight/Highlight";
 import { MemoIconAlertCircle } from "@/submodules/react-components/components/kern-icons/icons";
+import { postProcessAttributes, postProcessRecord } from "@/submodules/javascript-functions/post-process-functions";
 
 export function RecordDisplay(props: any) {
     const attributesDict = useSelector(selectAttributesDict);
@@ -33,16 +33,16 @@ export function RecordDisplay(props: any) {
                 </div>
             </div>
             {attributesDict[attribute.id] && <div className="text-gray-800 text-sm mb-4 overflow-anywhere flex text-left">
-                {attribute.dataType == DataTypeEnum.EMBEDDING_LIST ? (<div className="flex flex-col gap-y-1 divide-y">
-                    {preparedRecord.data[attributesDict[attribute.key].name] && preparedRecord.data[attributesDict[attribute.key].name].map((item, indexJ) => (<div key={indexJ} className="pt-1">
+                {attribute.dataType === DataTypeEnum.EMBEDDING_LIST || attribute.dataType === DataTypeEnum.PERMISSION ? (<div className="flex flex-col gap-y-1 divide-y">
+                    {preparedRecord.data[attributesDict[attribute.key].name] ? preparedRecord.data[attributesDict[attribute.key].name].map((item, indexJ) => (<div key={indexJ} className="pt-1">
                         {(configuration.highlightText && isTextHighlightNeeded[attribute.key]) ? (<Highlight text={item.toString()}
                             additionalClasses={[configuration.lineBreaks == LineBreaksType.NORMAL ? '' : (configuration.lineBreaks == LineBreaksType.IS_PRE_WRAP ? 'whitespace-pre-wrap' : 'whitespace-pre-line')]}
                             searchForExtended={textHighlight[attribute.id]} />) : (
                             <span className={configuration && configuration.lineBreaks != LineBreaksType.NORMAL ? (configuration.lineBreaks == LineBreaksType.IS_PRE_WRAP ? 'whitespace-pre-wrap' : 'whitespace-pre-line') : ''}>
                                 {item != null && item !== '' ? item : <NotPresentInRecord />}
                             </span>
                         )}
-                    </div>))}
+                    </div>)) : <NotPresentInRecord />}
                 </div>) : (<>
                     {(configuration.highlightText && isTextHighlightNeeded[attribute.key]) ? (<Highlight text={preparedRecord.data[attributesDict[attribute.key].name]?.toString()}
                         additionalClasses={[configuration.lineBreaks == LineBreaksType.NORMAL ? '' : (configuration.lineBreaks == LineBreaksType.IS_PRE_WRAP ? 'whitespace-pre-wrap' : 'whitespace-pre-line')]}
diff --git a/src/reduxStore/StoreManagerComponent.tsx b/src/reduxStore/StoreManagerComponent.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
 import { useRouter } from "next/router";
 import { useDispatch, useSelector } from "react-redux";
-import { selectIsAdmin, selectOrganization, setAllUsers, setIsAdmin, setOrganization, setRouteColor, setUser } from "./states/general";
+import { selectIsAdmin, selectOrganization, selectUser, setAllUsers, setIsAdmin, setOrganization, setRouteColor, setUser } from "./states/general";
 import { getUserAvatarUri } from "@/submodules/javascript-functions/general";
 import { setActiveProject } from "./states/project";
 import { WebSocketsService } from "../../submodules/react-components/hooks/web-socket/WebSocketsService";
@@ -18,12 +18,14 @@ import { getProjectByProjectId } from "../services/base/project";
 import { getIsAdmin, getVersionOverview } from "../services/base/misc";
 import { getUserInfo, getOrganization, getOrganizationUsers } from "../services/base/organization";
 import { getAllTokenizerOptions, getEmbeddingPlatforms, getRecommendedEncoders } from "../services/base/embedding";
+import { UserRole } from "../types/shared/sidebar";
 
 export function GlobalStoreDataComponent(props: React.PropsWithChildren) {
     const router = useRouter();
     const dispatch = useDispatch();
     const isAdmin = useSelector(selectIsAdmin);
     const organization = useSelector(selectOrganization);
+    const userRole = useSelector(selectUser)?.role;
 
     const [dataLoaded, setDataLoaded] = useState(false);
 
@@ -33,6 +35,10 @@ export function GlobalStoreDataComponent(props: React.PropsWithChildren) {
         });
 
         getUserInfo((res) => {
+            if (res.role == UserRole.ANNOTATOR || res.role == UserRole.EXPERT) {
+                window.location.href = '/cognition';
+                return;
+            }
             const userInfo = { ...res };
             userInfo.avatarUri = getUserAvatarUri(res);
             dispatch(setUser(userInfo));
@@ -106,6 +112,6 @@ export function GlobalStoreDataComponent(props: React.PropsWithChildren) {
         })
     }, [ConfigManager.isInit()]);
 
-    if (!dataLoaded) return <></>;
+    if (!dataLoaded || userRole !== UserRole.ENGINEER) return <></>;
     return <div>{props.children}</div>;
 }
diff --git a/src/reduxStore/states/pages/settings.ts b/src/reduxStore/states/pages/settings.ts
@@ -148,6 +148,7 @@ export const selectVisibleAttributesDataBrowser = createSelector([selectUsableAt
 export const selectVisibleAttributeAC = createSelector([selectUsableAttributesFiltered], (a): any => a ? a.filter((a) => a.visibility != AttributeVisibility.HIDE) : null);
 export const selectVisibleAttributesHeuristics = createSelector([selectUsableAttributesFiltered], (a): any => a ? a.filter((a) => a.visibility != AttributeVisibility.HIDE) : null);
 export const selectOnAttributeEmbeddings = createSelector([selectEmbeddings], (a): any => a ? a.filter((embedding) => embedding.type == EmbeddingType.ON_ATTRIBUTE && embedding.state == Status.FINISHED) : null);
+export const selectVisibleAttributesWithoutPermissions = createSelector([selectUsableAttributesFiltered], (a): any => a ? a.filter((a) => a.dataType != DataTypeEnum.PERMISSION) : null);
 
 export const { setAllAttributes, extendAllAttributes, removeFromAllAttributesById, updateAttributeById, setAllEmbeddings, setFilteredEmbeddings, removeFromAllEmbeddingsById, setAllRecommendedEncodersDict, setRecommendedEncodersAll, setLabelingTasksAll, removeFromAllLabelingTasksById, removeLabelFromLabelingTask } = settingsSlice.actions;
 export const settingsReducer = settingsSlice.reducer;
diff --git a/src/types/components/projects/projectId/settings/attribute-calculation.ts b/src/types/components/projects/projectId/settings/attribute-calculation.ts
@@ -15,6 +15,7 @@ export type SampleRecord = {
     calculatedAttributesList: any[];
     calculatedAttributesDisplay: any[];
     calculatedAttributesListDisplay: any[];
+    id: number;
 };
 
 export type ContainerLogsProps = {
@@ -31,7 +32,7 @@ export type Record = {
 
 export type ViewRecordDetailsModalProps = {
     currentAttribute: Attribute;
-    sampleRecords: SampleRecord;
+    sampleRecords: any;
 }
 
 export type ConfirmExecutionModalProps = {
diff --git a/src/types/shared/general.ts b/src/types/shared/general.ts
@@ -20,5 +20,6 @@ export enum DataTypeEnum {
     FLOAT = "FLOAT",
     BOOLEAN = "BOOLEAN",
     EMBEDDING_LIST = "EMBEDDING_LIST",
-    LLM_RESPONSE = "LLM_RESPONSE"
+    LLM_RESPONSE = "LLM_RESPONSE",
+    PERMISSION = "PERMISSION",
 }
diff --git a/src/util/components/projects/projectId/settings/data-schema-helper.ts b/src/util/components/projects/projectId/settings/data-schema-helper.ts
@@ -10,6 +10,7 @@ export const DATA_TYPES = [
     { name: 'Boolean', value: 'BOOLEAN' },
     { name: 'Embedding List', value: 'EMBEDDING_LIST' },
     { name: 'LLM Response', value: 'LLM_RESPONSE' },
+    { name: 'Permission', value: 'PERMISSION' },
 ];
 
 export const ATTRIBUTES_VISIBILITY_STATES = [
diff --git a/src/util/shared/record-display-helper.ts b/src/util/shared/record-display-helper.ts
