Annotators display fix

Author: lumburovskalina

src/components/projects/projectId/labeling/sessionId/main-component/LabelingMainComponent.tsx

@@ -7,7 +7,7 @@ import { UserRole } from "@/src/types/shared/sidebar";
 import { LabelingSuiteManager } from "@/src/util/classes/labeling/manager";
 import { SessionManager } from "@/src/util/classes/labeling/session-manager";
 import { UserManager } from "@/src/util/classes/labeling/user-manager";
-import { DUMMY_HUDDLE_ID, getDefaultLabelingSuiteSettings, parseLabelingLink } from "@/src/util/components/projects/projectId/labeling/labeling-main-component-helper";
+import { DUMMY_HUDDLE_ID, getDefaultLabelingSuiteSettings, parseLabelingLink, prepareRLADataForRole } from "@/src/util/components/projects/projectId/labeling/labeling-main-component-helper";
 import { useLazyQuery } from "@apollo/client";
 import { useRouter } from "next/router";
 import { useCallback, useEffect, useState } from "react";
@@ -152,7 +152,7 @@ export default function LabelingMainComponent() {
     }, [projectId]);
 
     useEffect(() => {
-        if (!projectId || allUsers.length == 0 || !router.query.sessionId) return;
+        if (!projectId || allUsers.length == 0 || !router.query.sessionId || !user) return;
         if (router.query.sessionId == DUMMY_HUDDLE_ID) return;
         if (!SessionManager.currentRecordId) return;
         if (SessionManager.currentRecordId == "deleted") return;
@@ -174,9 +174,10 @@ export default function LabelingMainComponent() {
         ]).subscribe(([tokenized, record, rla]) => {
             dispatch(updateRecordRequests('token', tokenized.data.tokenizeRecord));
             dispatch(updateRecordRequests('record', record.data.recordByRecordId));
-            dispatch(updateRecordRequests('rla', rla?.data?.recordByRecordId?.recordLabelAssociations));
+            const rlas = rla['data']?.['recordByRecordId']?.['recordLabelAssociations']['edges'].map(e => e.node);;
+            dispatch(updateRecordRequests('rla', prepareRLADataForRole(rlas, user, userDisplayId, userDisplayRole)));
         });
-    }, [SessionManager.currentRecordId]);
+    }, [SessionManager.currentRecordId, user]);
 
     useEffect(() => {
         if (!rlas || !user) return;
@@ -303,8 +304,12 @@ export default function LabelingMainComponent() {
 
     function prepareTasksForRole(taskData: LabelingTask[], userDisplayRole): LabelingTask[] {
         if (user?.role != UserRole.ANNOTATOR && userDisplayRole != UserRole.ANNOTATOR) return taskData;
-        if (!JSON.parse(localStorage.getItem('huddleData'))) return null;
-        const taskId = JSON.parse(localStorage.getItem('huddleData')).allowedTask;
+        let taskId;
+        if (userDisplayRole != UserRole.ENGINEER) {
+            taskId = JSON.parse(localStorage.getItem('huddleData'))?.allowedTask;
+        } else {
+            taskId = JSON.parse(localStorage.getItem('huddleData')).allowedTask;
+        }
         if (!taskId) return null;
         else return taskData.filter(t => t.id == taskId);
     }
@@ -324,7 +329,8 @@ export default function LabelingMainComponent() {
         } else if (['payload_finished', 'weak_supervision_finished', 'rla_created', 'rla_deleted'].includes(msgParts[1])) {
             const recordId = SessionManager.currentRecordId ?? record.id;
             refetchRla({ variables: { projectId, recordId: recordId } }).then((result) => {
-                dispatch(updateRecordRequests('rla', result?.data?.recordByRecordId?.recordLabelAssociations));
+                const rlas = result['data']?.['recordByRecordId']?.['recordLabelAssociations']['edges'].map(e => e.node);;
+                dispatch(updateRecordRequests('rla', prepareRLADataForRole(rlas, user, userDisplayId, userDisplayRole)));
             });
         } else if (['access_link_changed', 'access_link_removed'].includes(msgParts[1])) {
             if (router.pathname.includes(msgParts[3]) && SessionManager.labelingLinkData) {

src/reduxStore/states/pages/labeling.ts

@@ -80,7 +80,7 @@ const labelingSlice = createSlice({
                             state.recordRequests.record = postProcessRecordByRecordId(data);
                             break;
                         case 'rla':
-                            state.recordRequests.rla = postProcessRla(data);
+                            state.recordRequests.rla = data;
                             if (RecordManager.ignoreRlas(state.recordRequests.rla)) return;
                             LabelingSuiteManager.somethingLoading = false;
                             break;

src/util/classes/labeling/session-manager.ts

@@ -122,7 +122,7 @@ export class SessionManager {
     }
 
     public static getAllowedTask(): string {
-        return this.huddleData.allowedTask;
+        return this.huddleData?.allowedTask;
     }
     public static initMeOnDestruction() {
         this.labelingLinkData = null;

src/util/components/projects/projectId/labeling/labeling-main-component-helper.ts

@@ -5,7 +5,7 @@ import { User } from "@/src/types/shared/general";
 import { UserRole } from "@/src/types/shared/sidebar";
 import { SessionManager } from "@/src/util/classes/labeling/session-manager";
 import { LabelSource } from "@/submodules/javascript-functions/enums/enums";
-import { countOccurrences } from "@/submodules/javascript-functions/general";
+import { countOccurrences, jsonCopy } from "@/submodules/javascript-functions/general";
 
 export const ONE_DAY = 86400000; // 24 * 60 * 60 * 1000;
 export const DUMMY_HUDDLE_ID = "00000000-0000-0000-0000-000000000000";
@@ -148,7 +148,8 @@ export function prepareRLADataForRole(rlaData: any[], user: User, displayUserId:
     if (user.role != UserRole.ANNOTATOR && userDisplayRole != UserRole.ANNOTATOR) return rlaData;
     const currentSourceId = SessionManager.getSourceId();
     const allowedTask = SessionManager.getAllowedTask();
-    rlaData.forEach((rla) => {
+    const rlaDataCopy = jsonCopy(rlaData);
+    rlaDataCopy.forEach((rla) => {
         if ((rla.sourceId && rla.sourceId == currentSourceId)) {
             rla.sourceType = LabelSource.MANUAL;
             rla.sourceId = null;
@@ -158,5 +159,5 @@ export function prepareRLADataForRole(rlaData: any[], user: User, displayUserId:
             rla.id = "x";
         }
     });
-    return rlaData.filter(rla => rla.id != "x");
+    return rlaDataCopy.filter(rla => rla.id != "x");
 }