From 41a06a8dfbee2a101c00b35903b705b565a2bcbb Mon Sep 17 00:00:00 2001 From: Lina Date: Thu, 28 Nov 2024 14:19:44 +0100 Subject: [PATCH 01/10] Release version --- src/components/shared/sidebar/Sidebar.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/shared/sidebar/Sidebar.tsx b/src/components/shared/sidebar/Sidebar.tsx index a6cbe55c..f3b81dd6 100644 --- a/src/components/shared/sidebar/Sidebar.tsx +++ b/src/components/shared/sidebar/Sidebar.tsx @@ -190,7 +190,7 @@ export default function Sidebar() {
- v1.17.0 + v1.18.0 {hasUpdates && } From e911d9a62bb47c54cc84fe5e3cadddab21fffe23 Mon Sep 17 00:00:00 2001 From: andhreljaKern Date: Tue, 3 Dec 2024 11:18:44 +0100 Subject: [PATCH 02/10] fix: forcePathStyle for S3 downloadFile --- src/services/base/s3-service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/services/base/s3-service.ts b/src/services/base/s3-service.ts index be3f0eb4..de8ab2dc 100644 --- a/src/services/base/s3-service.ts +++ b/src/services/base/s3-service.ts @@ -53,6 +53,7 @@ export function downloadFile(credentialBlock: any, isStringData: boolean = true) const s3Client = new S3Client({ endpoint: s3Endpoint, + forcePathStyle: true, region: s3Region, credentials: { accessKeyId: credentials["AccessKeyId"], From 579e477b36e684b03597e08bada8509e70d04fb4 Mon Sep 17 00:00:00 2001 From: Lina Date: Tue, 3 Dec 2024 14:22:26 +0100 Subject: [PATCH 03/10] Console error on the labeling page(happens with the following steps) --- .../projectId/labeling/labeling-main-component-helper.ts | 2 +- .../projects/projectId/labeling/overview-table-helper.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/components/projects/projectId/labeling/labeling-main-component-helper.ts b/src/util/components/projects/projectId/labeling/labeling-main-component-helper.ts index b5d63cb2..4a8758fb 100644 --- a/src/util/components/projects/projectId/labeling/labeling-main-component-helper.ts +++ b/src/util/components/projects/projectId/labeling/labeling-main-component-helper.ts @@ -144,7 +144,7 @@ export function getDefaultTaskOverviewLabelSettings(): LabelingSuiteTaskHeaderLa } export function prepareRLADataForRole(rlaData: any[], user: User, displayUserId: string, userDisplayRole: UserRole): any[] { - if (user.role != UserRole.ANNOTATOR && userDisplayRole != UserRole.ANNOTATOR) return rlaData; + if (user?.role != UserRole.ANNOTATOR && userDisplayRole != UserRole.ANNOTATOR) return rlaData; const currentSourceId = SessionManager.getSourceId(); const allowedTask = SessionManager.getAllowedTask(); const rlaDataCopy = jsonCopy(rlaData); diff --git a/src/util/components/projects/projectId/labeling/overview-table-helper.ts b/src/util/components/projects/projectId/labeling/overview-table-helper.ts index 28010d0f..09b604ef 100644 --- a/src/util/components/projects/projectId/labeling/overview-table-helper.ts +++ b/src/util/components/projects/projectId/labeling/overview-table-helper.ts @@ -159,7 +159,7 @@ export function filterRlaDataForUser(rlaData: any[], user: User, displayUserId: } export function filterRlaCondition(rla, user, displayUserId, userDisplayRole): boolean { - if (user.role != UserRole.ENGINEER || userDisplayRole != UserRole.ENGINEER) return rla.sourceType == LabelSource.MANUAL && rla.createdBy == displayUserId; + if (user?.role != UserRole.ENGINEER || userDisplayRole != UserRole.ENGINEER) return rla.sourceType == LabelSource.MANUAL && rla.createdBy == displayUserId; if (rla.sourceType != LabelSource.MANUAL) return true; if (displayUserId == ALL_USERS_USER_ID) return true; if (!!rla.isGoldStar) return displayUserId == GOLD_STAR_USER_ID; From a09098ca4594d78be2f893b5e4aab99a29a948e4 Mon Sep 17 00:00:00 2001 From: Lina Date: Tue, 3 Dec 2024 14:41:38 +0100 Subject: [PATCH 04/10] Bricks button on active learners navigate to home --- .../heuristicId/active-learning/ActiveLearning.tsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/projects/projectId/heuristics/heuristicId/active-learning/ActiveLearning.tsx b/src/components/projects/projectId/heuristics/heuristicId/active-learning/ActiveLearning.tsx index a59d2cc8..8dbb0425 100644 --- a/src/components/projects/projectId/heuristics/heuristicId/active-learning/ActiveLearning.tsx +++ b/src/components/projects/projectId/heuristics/heuristicId/active-learning/ActiveLearning.tsx @@ -2,7 +2,7 @@ import { useDispatch, useSelector } from "react-redux"; import HeuristicsLayout from "../shared/HeuristicsLayout"; import { useRouter } from "next/router"; import { selectProjectId } from "@/src/reduxStore/states/project"; -import { Fragment, useCallback, useEffect, useState } from "react"; +import { Fragment, useCallback, useEffect, useMemo, useState } from "react"; import { selectHeuristic, setActiveHeuristics, updateHeuristicsState } from "@/src/reduxStore/states/pages/heuristics"; import { getClassLine, postProcessCurrentHeuristic, postProcessLastTaskLogs } from "@/src/util/components/projects/projectId/heuristics/heuristicId/heuristics-details-helper"; import { TOOLTIPS_DICT } from "@/src/util/tooltip-constants"; @@ -204,6 +204,11 @@ export default function ActiveLearning() { const orgId = useSelector(selectOrganizationId); useWebsocket(orgId, Application.REFINERY, CurrentPage.ACTIVE_LEARNING, handleWebsocketNotification, projectId); + const bricksUrlExtension = useMemo(() => { + if (currentHeuristic?.labelingTaskType == 'INFORMATION_EXTRACTION') return 'extractors'; + return "classifiers" + }, [currentHeuristic?.labelingTaskType]); + return ( updateSourceCodeToDisplay(code)}> @@ -252,7 +257,7 @@ export default function ActiveLearning() { )}
- +
Date: Tue, 3 Dec 2024 15:08:53 +0100 Subject: [PATCH 05/10] Lookup lists unsupported dropdown icon error with existing list --- submodules/react-components | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/react-components b/submodules/react-components index a90abdd0..e0da1870 160000 --- a/submodules/react-components +++ b/submodules/react-components @@ -1 +1 @@ -Subproject commit a90abdd0061491a2f17e089b441aade2afc4465d +Subproject commit e0da1870283bfa0fd0b7a3d50239848e6cbf0fd1 From dcc3c47c94cadaaffc4f4e0e620a18c957a53464 Mon Sep 17 00:00:00 2001 From: Lina Date: Tue, 3 Dec 2024 15:10:40 +0100 Subject: [PATCH 06/10] =?UTF-8?q?=20Lookup=20lists=20paste=20terms=20split?= =?UTF-8?q?=20on=20doesn=E2=80=99t=20display=20default=20value=20complete?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lookup-lists/lookupListId/PasteLookupListModal.tsx | 2 +- .../lookup-lists/lookupListId/RemoveLookupListModal.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/projects/projectId/lookup-lists/lookupListId/PasteLookupListModal.tsx b/src/components/projects/projectId/lookup-lists/lookupListId/PasteLookupListModal.tsx index 92d34d56..a0a10d53 100644 --- a/src/components/projects/projectId/lookup-lists/lookupListId/PasteLookupListModal.tsx +++ b/src/components/projects/projectId/lookup-lists/lookupListId/PasteLookupListModal.tsx @@ -36,7 +36,7 @@ export default function PasteLookupListModal() {
Split On setInputSplit(e.target.value)} - className="h-8 w-10 text-sm border-gray-300 rounded-md placeholder-italic border text-gray-900 pl-4 placeholder:text-gray-400 focus:outline-none focus:ring-2 focus:ring-gray-300 focus:ring-offset-2 focus:ring-offset-gray-100" /> + className="h-8 w-12 text-sm border-gray-300 rounded-md placeholder-italic border text-gray-900 pl-4 placeholder:text-gray-400 focus:outline-none focus:ring-2 focus:ring-gray-300 focus:ring-offset-2 focus:ring-offset-gray-100" />