Removal of GraphQL Data Return Schema

src/components/models-download/ModelsDownload.tsx

@@ -29,7 +29,7 @@ export default function ModelsDownload() {
 
     function refetchModels() {
         getModelProviderInfo((res) => {
-            dispatch(setModelsDownloaded(res.data['modelProviderInfo']));
+            dispatch(setModelsDownloaded(res));
         });
     }
 

src/components/projects/ProjectsList.tsx

@@ -49,24 +49,15 @@ export default function ProjectsList() {
 
     function refetchProjectsAndPostProcess() {
         getAllProjects((res) => {
-            const projects = res.data["allProjects"].edges.map((edge: any) => edge.node);
-            dispatch(setAllProjects(projects));
+            dispatch(setAllProjects(res));
             setDataLoaded(true);
         });
     }
 
     function refetchStatsAndPostProcess() {
         getOverviewStats((res) => {
-            const stats = res.data["overviewStats"];
-            const statsDict = {};
-            if (stats == null) return;
-            stats.forEach((stat: ProjectStatistics) => {
-                const statCopy = { ...stat };
-                stat.manuallyLabeled = percentRoundString(statCopy.numDataScaleManual / statCopy.numDataScaleUploaded, 2);
-                stat.weaklySupervised = percentRoundString(statCopy.numDataScaleProgrammatical / statCopy.numDataScaleUploaded, 2);
-                statsDict[stat.projectId] = stat;
-            });
-            setProjectStatisticsById(statsDict);
+            if (res == null) return;
+            setProjectStatisticsById(res);
         });
     }
 

src/components/projects/SampleProjectsDropdown.tsx

@@ -40,7 +40,7 @@ export default function SampleProjectsDropdown() {
         dispatch(setSearchGroupsStore({}));
         createSampleProject({ name: projectNameFinal, projectType: projectTypeFinal }, (res) => {
             dispatch(closeModal(ModalEnum.SAMPLE_PROJECT_TITLE));
-            const projectId = res['data']['createSampleProject']['project'].id;
+            const projectId = res['project'].id;
             dispatch(setProjectIdSampleProject(projectId));
         });
     }, [projects, projectNameInput, projectTypeInput, router]);

src/components/projects/new/NewProject.tsx

@@ -19,8 +19,7 @@ export default function NewProject() {
     useEffect(() => {
         dispatch(setUploadFileType(COMPONENT_FILE_TYPE));
         getAllProjects((res) => {
-            const projects = res.data["allProjects"].edges.map((edge: any) => edge.node);
-            dispatch(setAllProjects(projects));
+            dispatch(setAllProjects(res));
         });
     }, []);
 

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

@@ -27,7 +27,7 @@ import { CommentType } from "@/src/types/shared/comments";
 import { AttributeCodeLookup } from "@/src/util/classes/attribute-calculation";
 import KernDropdown from "@/submodules/react-components/components/KernDropdown";
 import { useWebsocket } from "@/submodules/react-components/hooks/web-socket/useWebsocket";
-import { postProcessLabelingTasks, postProcessLabelingTasksSchema } from "@/src/util/components/projects/projectId/settings/labeling-tasks-helper";
+import { postProcessLabelingTasksSchema } from "@/src/util/components/projects/projectId/settings/labeling-tasks-helper";
 import { getAllComments } from "@/src/services/base/comment";
 import { getAttributes } from "@/src/services/base/attribute";
 import { getLookupListsByProjectId } from "@/src/services/base/lookup-lists";
@@ -65,15 +65,15 @@ export default function AttributeCalculation() {
         if (!projectId) return;
         if (!currentAttribute || attributes.length == 0) {
             getAttributes(projectId, ['ALL'], (res) => {
-                dispatch(setAllAttributes(res.data['attributesByProjectId']));
+                dispatch(setAllAttributes(res));
                 const currentAttribute = postProcessCurrentAttribute(attributes.find((attribute) => attribute.id === router.query.attributeId));
                 setCurrentAttribute(currentAttribute);
                 setEditorValue(currentAttribute?.sourceCodeToDisplay);
             });
         }
         if (lookupLists.length == 0) {
             getLookupListsByProjectId(projectId, (res) => {
-                dispatch(setAllLookupLists(res.data['knowledgeBasesByProjectId']));
+                dispatch(setAllLookupLists(res));
             });
         }
         refetchLabelingTasksAndProcess();
@@ -136,7 +136,7 @@ export default function AttributeCalculation() {
         CommentDataManager.registerCommentRequests(CurrentPage.ATTRIBUTE_CALCULATION, requests);
         const requestJsonString = CommentDataManager.buildRequestJSON();
         getAllComments(requestJsonString, (res) => {
-            CommentDataManager.parseCommentData(res.data['getAllComments']);
+            CommentDataManager.parseCommentData(res);
             CommentDataManager.parseToCurrentData(allUsers);
             dispatch(setComments(CommentDataManager.currentDataOrder));
         });
@@ -221,14 +221,13 @@ export default function AttributeCalculation() {
 
     function checkProjectTokenization() {
         getProjectTokenization(projectId, (res) => {
-            setTokenizationProgress(res.data['projectTokenization']?.progress);
+            setTokenizationProgress(res?.progress);
         });
     }
 
     function refetchLabelingTasksAndProcess() {
         getLabelingTasksByProjectId(projectId, (res) => {
-            const labelingTasks = postProcessLabelingTasks(res['data']['projectByProjectId']['labelingTasks']['edges']);
-            dispatch(setLabelingTasksAll(postProcessLabelingTasksSchema(labelingTasks)));
+            dispatch(setLabelingTasksAll(postProcessLabelingTasksSchema(res)));
         });
     }
 
@@ -243,11 +242,11 @@ export default function AttributeCalculation() {
                 setCurrentAttribute(currentAttributeCopy);
             } else {
                 getAttributes(projectId, ['ALL'], (res) => {
-                    dispatch(setAllAttributes(res.data['attributesByProjectId']));
+                    dispatch(setAllAttributes(res));
                 });
-                getAttributeByAttributeId(projectId, currentAttribute?.id, (res) => {
-                    const attribute = res.data['attributeByAttributeId'];
-                    if (attribute == null) setCurrentAttribute(null);
+                if (msgParts[2] == 'deleted') return
+                getAttributeByAttributeId(projectId, currentAttribute?.id, (attribute) => {
+                    if (!attribute) setCurrentAttribute(null);
                     else setCurrentAttribute(postProcessCurrentAttribute(attribute));
                 });
                 if (msgParts[2] == "finished") {
@@ -256,7 +255,7 @@ export default function AttributeCalculation() {
             }
         } else if (['knowledge_base_updated', 'knowledge_base_deleted', 'knowledge_base_created'].includes(msgParts[1])) {
             getLookupListsByProjectId(projectId, (res) => {
-                dispatch(setAllLookupLists(res.data['knowledgeBasesByProjectId']));
+                dispatch(setAllLookupLists(res));
             });
         } else if (msgParts[1] == 'tokenization' && msgParts[2] == 'docbin') {
             if (msgParts[3] == 'progress') {
@@ -388,8 +387,7 @@ export default function AttributeCalculation() {
                 <ExecutionContainer currentAttribute={currentAttribute} tokenizationProgress={tokenizationProgress} enableRunButton={enableRunButton} checkUnsavedChanges={checkUnsavedChanges}
                     setEnabledButton={(value: boolean) => setEnableButton(value)}
                     refetchCurrentAttribute={() => {
-                        getAttributeByAttributeId(projectId, currentAttribute?.id, (res) => {
-                            const attribute = res.data['attributeByAttributeId'];
+                        getAttributeByAttributeId(projectId, currentAttribute?.id, (attribute) => {
                             if (attribute == null) setCurrentAttribute(null);
                             else setCurrentAttribute(postProcessCurrentAttribute(attribute));
                         });

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

@@ -37,7 +37,7 @@ export default function ExecutionContainer(props: ExecutionContainerProps) {
         if (requestedSomething) return;
         setRequestedSomething(true);
         getSampleRecords(projectId, props.currentAttribute.id, (res) => {
-            const sampleRecordsFinal = { ...res.data['calculateUserAttributeSampleRecords'] };
+            const sampleRecordsFinal = { ...res };
             setRequestedSomething(false);
             props.setEnabledButton(false);
             setRunOn10HasError(sampleRecordsFinal.calculatedAttributes.length > 0 ? false : true);
@@ -53,7 +53,7 @@ export default function ExecutionContainer(props: ExecutionContainerProps) {
 
     function recordByRecordId(recordId: string) {
         getRecordByRecordId(projectId, recordId, (res) => {
-            dispatch(setModalStates(ModalEnum.VIEW_RECORD_DETAILS, { record: postProcessRecordByRecordId(res.data['recordByRecordId']) }));
+            dispatch(setModalStates(ModalEnum.VIEW_RECORD_DETAILS, { record: postProcessRecordByRecordId(res) }));
         });
     }
 

src/components/projects/projectId/data-browser/DataBrowser.tsx

@@ -5,7 +5,7 @@ import { useCallback, useEffect, useState } from "react";
 import { expandRecordList, selectActiveSearchParams, selectActiveSlice, selectConfiguration, selectFullSearchStore, selectRecords, setActiveDataSlice, setDataSlices, setRecordComments, setUniqueValuesDict, updateAdditionalDataState } from "@/src/reduxStore/states/pages/data-browser";
 import { postProcessRecordsExtended, postProcessUniqueValues } from "@/src/util/components/projects/projectId/data-browser/data-browser-helper";
 import { selectAttributes, selectLabelingTasksAll, setAllAttributes, setAllEmbeddings, setLabelingTasksAll } from "@/src/reduxStore/states/pages/settings";
-import { postProcessLabelingTasks, postProcessLabelingTasksSchema } from "@/src/util/components/projects/projectId/settings/labeling-tasks-helper";
+import { postProcessLabelingTasksSchema } from "@/src/util/components/projects/projectId/settings/labeling-tasks-helper";
 import { selectAllUsers, selectOrganizationId, selectUser, setComments } from "@/src/reduxStore/states/general";
 import DataBrowserRecords from "./DataBrowserRecords";
 import { postProcessingEmbeddings } from "@/src/util/components/projects/projectId/settings/embeddings-helper";
@@ -64,12 +64,12 @@ export default function DataBrowser() {
             getRecordsByStaticSlice(projectId, activeSlice.id, {
                 offset: searchRequest.offset, limit: searchRequest.limit
             }, (res) => {
-                dispatch(expandRecordList(postProcessRecordsExtended(res.data['recordsByStaticSlice'], labelingTasks)));
+                dispatch(expandRecordList(postProcessRecordsExtended(res, labelingTasks)));
             });
         } else {
             const filterData = parseFilterToExtended(activeSearchParams, attributes, configuration, labelingTasks, user, fullSearchStore[SearchGroup.DRILL_DOWN])
             searchRecordsExtended(projectId, filterData, searchRequest.offset, searchRequest.limit, (res) => {
-                const parsedRecordData = postProcessRecordsExtended(res.data['searchRecordsExtended'], labelingTasks);
+                const parsedRecordData = postProcessRecordsExtended(res, labelingTasks);
                 dispatch(expandRecordList(parsedRecordData));
                 refetchRecordCommentsAndProcess(parsedRecordData.recordList);
             });
@@ -93,38 +93,37 @@ export default function DataBrowser() {
         CommentDataManager.registerCommentRequests(CurrentPage.DATA_BROWSER, requests);
         const requestJsonString = CommentDataManager.buildRequestJSON();
         getAllComments(requestJsonString, (res) => {
-            CommentDataManager.parseCommentData(res.data['getAllComments']);
+            CommentDataManager.parseCommentData(res);
             CommentDataManager.parseToCurrentData(users);
             dispatch(setComments(CommentDataManager.currentDataOrder));
         });
     }
 
     function refetchDataSlicesAndProcess(dataSliceId?: string) {
         getDataSlices(projectId, null, (res) => {
-            dispatch(setDataSlices(res.data.dataSlices));
+            dispatch(setDataSlices(res));
             if (dataSliceId) {
-                const findSlice = res.data.dataSlices.find((slice) => slice.id == dataSliceId);
+                const findSlice = res.find((slice) => slice.id == dataSliceId);
                 if (findSlice) dispatch(setActiveDataSlice(findSlice));
             }
         });
     }
 
     function refetchAttributesAndProcess() {
         getAttributes(projectId, ['ALL'], (res) => {
-            dispatch(setAllAttributes(res.data['attributesByProjectId']));
+            dispatch(setAllAttributes(res));
         });
     }
 
     function refetchLabelingTasksAndProcess() {
         getLabelingTasksByProjectId(projectId, (res) => {
-            const labelingTasks = postProcessLabelingTasks(res['data']['projectByProjectId']['labelingTasks']['edges']);
-            dispatch(setLabelingTasksAll(postProcessLabelingTasksSchema(labelingTasks)));
+            dispatch(setLabelingTasksAll(postProcessLabelingTasksSchema(res)));
         });
     }
 
     function refetchEmbeddingsAndPostProcess() {
         getEmbeddings(projectId, (res) => {
-            const embeddings = postProcessingEmbeddings(res.data['projectByProjectId']['embeddings']['edges'].map((e) => e['node']), []);
+            const embeddings = postProcessingEmbeddings(res['embeddings'], []);
             dispatch(setAllEmbeddings(embeddings));
         });
     }
@@ -133,7 +132,7 @@ export default function DataBrowser() {
         const currentRecordIds = parsedRecordData?.map((record) => record.id);
         if (!currentRecordIds || currentRecordIds.length == 0) return;
         getRecordComments(projectId, currentRecordIds, (res) => {
-            dispatch(setRecordComments(res.data['getRecordComments']));
+            dispatch(setRecordComments(res));
         });
     }
 
@@ -143,7 +142,7 @@ export default function DataBrowser() {
 
     function refetchUniqueValuesAndProcess() {
         getUniqueValuesByAttributes(projectId, (res) => {
-            dispatch(setUniqueValuesDict(postProcessUniqueValues(res.data['uniqueValuesByAttributes'], attributes)));
+            dispatch(setUniqueValuesDict(postProcessUniqueValues(res, attributes)));
         });
     }
 

src/components/projects/projectId/data-browser/SearchGroups.tsx

@@ -112,7 +112,7 @@ export default function SearchGroups() {
             dispatch(updateAdditionalDataState('loading', true));
             const refetchTimer = setTimeout(() => {
                 searchRecordsExtended(projectId, parseFilterToExtended(activeSearchParams, attributes, configuration, labelingTasks, user, fullSearchStore[SearchGroup.DRILL_DOWN]), 0, 20, (res) => {
-                    dispatch(setSearchRecordsExtended(postProcessRecordsExtended(res.data['searchRecordsExtended'], labelingTasks)));
+                    dispatch(setSearchRecordsExtended(postProcessRecordsExtended(res, labelingTasks)));
                     dispatch(updateAdditionalDataState('loading', false));
                 });
             }, 500);
@@ -133,14 +133,14 @@ export default function SearchGroups() {
                 options.limit = 20;
             }
             getRecordsByStaticSlice(projectId, activeSlice.id, options, (res) => {
-                dispatch(setSearchRecordsExtended(postProcessRecordsExtended(res.data['recordsByStaticSlice'], labelingTasks)));
+                dispatch(setSearchRecordsExtended(postProcessRecordsExtended(res, labelingTasks)));
                 staticDataSlicesCurrentCount(projectId, activeSlice.id, (res) => {
-                    if (!res.data) {
+                    if (!res) {
                         dispatch(updateAdditionalDataState('staticDataSliceCurrentCount', null));
                         return;
 
                     }
-                    dispatch(updateAdditionalDataState('staticDataSliceCurrentCount', res['data']['staticDataSlicesCurrentCount']));
+                    dispatch(updateAdditionalDataState('staticDataSliceCurrentCount', res));
                 });
             });
         }
@@ -569,7 +569,7 @@ export default function SearchGroups() {
             if (res == null) {
                 setCurrentWeakSupervisionRun({ state: Status.NOT_YET_RUN });
             } else {
-                setCurrentWeakSupervisionRun(postProcessCurrentWeakSupervisionRun(res['data']['currentWeakSupervisionRun']));
+                setCurrentWeakSupervisionRun(postProcessCurrentWeakSupervisionRun(res));
             }
         });
     }

src/components/projects/projectId/data-browser/modals/SaveDataSliceModal.tsx

@@ -37,7 +37,7 @@ export default function SaveDataSliceModal(props: { fullSearch: {} }) {
             filterRaw: getRawFilterForSave(props.fullSearch),
             filterData: parseFilterToExtended(activeSearchParams, attributes, configuration, labelingTasks, user, props.fullSearch[SearchGroup.DRILL_DOWN].value)
         }, (res) => {
-            const id = res["data"]["createDataSlice"]["id"];
+            const id = res?.id;
             const slice = {
                 id: id, name: modalSaveDataSlice.sliceName, static: isStatic, filterRaw: getRawFilterForSave(props.fullSearch),
                 filterData: parseFilterToExtended(activeSearchParams, attributes, configuration, labelingTasks, user, props.fullSearch[SearchGroup.DRILL_DOWN].value), color: getColorStruct(isStatic),

src/components/projects/projectId/data-browser/modals/SimilaritySeachModal.tsx

@@ -45,7 +45,7 @@ export default function SimilaritySearchModal() {
     function getSimilarRecords(hasFilter: boolean = false) {
         const attFilter = hasFilter ? prepareAttFilter(filterAttributesForm, attributes) : null;
         getRecordsBySimilarity(projectId, selectedEmbedding.id, modalSS.recordId, attFilter, null, (res) => {
-            dispatch(setSearchRecordsExtended(postProcessRecordsExtended(res.data['searchRecordsBySimilarity'], labelingTasks)));
+            dispatch(setSearchRecordsExtended(postProcessRecordsExtended(res, labelingTasks)));
             dispatch(setRecordsInDisplay(true));
         });
     }

src/components/projects/projectId/edit-records/SyncRecordsModal.tsx

@@ -29,13 +29,12 @@ export default function SyncRecordsModal(props: SyncRecordsModalProps) {
         const changes = jsonCopy(erdDataCopy.cachedRecordChanges);
         for (const key in changes) delete changes[key].display;
         syncEditedRecords(projectId, changes, (res) => {
-            const tmp = res?.data?.editRecords;
-            if (tmp?.ok) {
+            if (res) {
                 erdDataCopy.data.records = jsonCopy(erdDataCopy.displayRecords);
                 erdDataCopy.cachedRecordChanges = {};
                 dispatch(setModalStates(ModalEnum.SYNC_RECORDS, { syncModalAmount: Object.keys(erdDataCopy.cachedRecordChanges).length }));
             } else {
-                if (tmp) erdDataCopy.errors = tmp.errors;
+                if (res) erdDataCopy.errors = JSON.parse(res);
                 else erdDataCopy.errors = ["Request didn't go through"];
             }
             setSyncing(false);

src/components/projects/projectId/heuristics/HeuristicsHeader.tsx

@@ -60,7 +60,7 @@ export default function HeuristicsHeader(props: HeuristicsHeaderProps) {
             if (res == null) {
                 setCurrentWeakSupervisionRun({ state: Status.NOT_YET_RUN });
             } else {
-                setCurrentWeakSupervisionRun(postProcessCurrentWeakSupervisionRun(res['data']['currentWeakSupervisionRun']));
+                setCurrentWeakSupervisionRun(postProcessCurrentWeakSupervisionRun(res));
             }
         });
     }