From 5f6d9a6993c8113614ec16337f2f9401c2b63022 Mon Sep 17 00:00:00 2001 From: Lina Date: Mon, 7 Jul 2025 12:33:06 +0200 Subject: [PATCH 01/10] Release version v1.20.0 --- 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 9dae75e2..5911f837 100644 --- a/src/components/shared/sidebar/Sidebar.tsx +++ b/src/components/shared/sidebar/Sidebar.tsx @@ -181,7 +181,7 @@ export default function Sidebar() {
- v1.19.0 + v1.20.0 {hasUpdates && } From 64b85b7c46a471409c9a13e82fd7b9466ddd8cbd Mon Sep 17 00:00:00 2001 From: Lina Date: Mon, 7 Jul 2025 14:22:50 +0200 Subject: [PATCH 02/10] The flag for projects from integrations is missing --- src/components/projects/ProjectCard.tsx | 2 +- .../projectId/settings/ProjectMetaData.tsx | 17 +++++++++++++---- src/types/components/projects/projects-list.ts | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/components/projects/ProjectCard.tsx b/src/components/projects/ProjectCard.tsx index c0f4097c..640f22e2 100644 --- a/src/components/projects/ProjectCard.tsx +++ b/src/components/projects/ProjectCard.tsx @@ -65,7 +65,7 @@ export default function ProjectCard(props: ProjectCardProps) { {props.project.time} }
} - {props.project.is_integration_project &&
+ {props.project.isIntegrationProject &&
This is an integration project, please do not delete it unless the integration is deleted
} {(isAdmin && props.project.status !== ProjectStatus.INIT_SAMPLE_PROJECT) && diff --git a/src/components/projects/projectId/settings/ProjectMetaData.tsx b/src/components/projects/projectId/settings/ProjectMetaData.tsx index 68eaf679..1d7abf5e 100644 --- a/src/components/projects/projectId/settings/ProjectMetaData.tsx +++ b/src/components/projects/projectId/settings/ProjectMetaData.tsx @@ -1,9 +1,9 @@ -import { selectProject, setActiveProject } from "@/src/reduxStore/states/project"; -import { updateProjectNameAndDescriptionPost } from "@/src/services/base/project"; +import { selectAllProjects, selectProject, setActiveProject, setAllProjects } from "@/src/reduxStore/states/project"; +import { getAllProjects, updateProjectNameAndDescriptionPost } from "@/src/services/base/project"; import { TOOLTIPS_DICT } from "@/src/util/tooltip-constants"; import { Tooltip } from "@nextui-org/react"; import { useRouter } from "next/router"; -import { useState } from "react"; +import { use, useEffect, useMemo, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import { deleteProjectPost } from "@/src/services/base/project"; import KernButton from "@/submodules/react-components/components/kern-button/KernButton"; @@ -14,6 +14,7 @@ export default function ProjectMetaData() { const dispatch = useDispatch(); const project = useSelector(selectProject); + const allProjects = useSelector(selectAllProjects); const [projectName, setProjectName] = useState(''); const [projectDescription, setProjectDescription] = useState(''); @@ -39,6 +40,14 @@ export default function ProjectMetaData() { }); } + useEffect(() => { + getAllProjects((projects) => dispatch(setAllProjects(projects))); + }, []); + + const isIntegrationProject = useMemo(() => { + return allProjects && allProjects.some(p => p.id === project.id && p.isIntegrationProject); + }, [allProjects, project.id]); + return (
@@ -85,7 +94,7 @@ export default function ProjectMetaData() {
Danger zone
This action can not be reversed. Are you sure you want to delete this project?
- {project.is_integration_project &&
+ {isIntegrationProject &&
This is an integration project, please do not delete it unless the integration is deleted
}
diff --git a/src/types/components/projects/projects-list.ts b/src/types/components/projects/projects-list.ts index 8be362f8..a87b9fef 100644 --- a/src/types/components/projects/projects-list.ts +++ b/src/types/components/projects/projects-list.ts @@ -14,7 +14,7 @@ export type Project = { timeStamp: string; date: string; time: string - is_integration_project: boolean; + isIntegrationProject: boolean; } export enum ProjectStatus { From 5275023fabd4ab61890585ab430acadf39937bfb Mon Sep 17 00:00:00 2001 From: JWittmeyer Date: Mon, 7 Jul 2025 14:28:00 +0200 Subject: [PATCH 03/10] Adds different z-index for sticky header --- .../projectId/attributes/attributeId/AttributeCalculations.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/projects/projectId/attributes/attributeId/AttributeCalculations.tsx b/src/components/projects/projectId/attributes/attributeId/AttributeCalculations.tsx index 2b36e105..e5af0f86 100644 --- a/src/components/projects/projectId/attributes/attributeId/AttributeCalculations.tsx +++ b/src/components/projects/projectId/attributes/attributeId/AttributeCalculations.tsx @@ -332,7 +332,7 @@ export default function AttributeCalculation() { return (projectId &&
onScrollEvent(e)}> {currentAttribute &&
-
+
From 59419c2de9b3355317c0ea8c8d3b879116f63281 Mon Sep 17 00:00:00 2001 From: JWittmeyer Date: Mon, 7 Jul 2025 14:49:47 +0200 Subject: [PATCH 04/10] Removes outdated sections from user page --- src/components/projects/ProjectsList.tsx | 3 +- src/components/shared/header/Header.tsx | 5 +- src/components/users/UsersList.tsx | 65 ++++-------------------- 3 files changed, 13 insertions(+), 60 deletions(-) diff --git a/src/components/projects/ProjectsList.tsx b/src/components/projects/ProjectsList.tsx index 00dc2f67..96771162 100644 --- a/src/components/projects/ProjectsList.tsx +++ b/src/components/projects/ProjectsList.tsx @@ -44,6 +44,8 @@ export default function ProjectsList() { if (!organizationInactive) { refetchProjectsAndPostProcess(); refetchStatsAndPostProcess(); + } else { + setDataLoaded(true); } }, [organizationInactive, user]); @@ -70,7 +72,6 @@ export default function ProjectsList() { const orgId = useSelector(selectOrganizationId); useWebsocket(orgId, Application.REFINERY, CurrentPage.PROJECTS, handleWebsocketNotification); - return (
{dataLoaded ? (<> diff --git a/src/components/shared/header/Header.tsx b/src/components/shared/header/Header.tsx index 3dd14ac4..df3135f3 100644 --- a/src/components/shared/header/Header.tsx +++ b/src/components/shared/header/Header.tsx @@ -64,7 +64,6 @@ export default function Header() { }); }); } - return (
- {(user?.role == UserRole.ENGINEER) ? ( + {(organizationInactive !== true && user?.role == UserRole.ENGINEER) ? (
{ e.preventDefault(); dispatch(setProjectIdSampleProject(null)); router.push(`/users`) }} className="flex mr-6"> @@ -105,7 +104,7 @@ export default function Header() {
{displayComments && }
- {user?.role == UserRole.ENGINEER &&
+ {organizationInactive !== true && user?.role == UserRole.ENGINEER &&
} {warning.key == 'HEURISTIC' &&
- - - - Current source code: - - - - Suggested changes: - + Current source code: + + Suggested changes: +
} + return (
         {parts && parts.map((part, index) => (
             {part.text}
         ))}
-    )
+
) } \ No newline at end of file From 640af3824f4b56903ed54a3c1e72d9f115e094da Mon Sep 17 00:00:00 2001 From: JWittmeyer Date: Mon, 7 Jul 2025 15:50:32 +0200 Subject: [PATCH 06/10] fix record edit --- .../projectId/edit-records/EditField.tsx | 13 +++++- .../projectId/edit-records/EditRecords.tsx | 41 +++++++++++-------- 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/src/components/projects/projectId/edit-records/EditField.tsx b/src/components/projects/projectId/edit-records/EditField.tsx index 1afbb2d8..94cfd4e8 100644 --- a/src/components/projects/projectId/edit-records/EditField.tsx +++ b/src/components/projects/projectId/edit-records/EditField.tsx @@ -4,13 +4,14 @@ import { DataTypeEnum } from "@/src/types/shared/general"; import { ModalEnum } from "@/src/types/shared/modal"; import { buildAccessKey } from "@/src/util/components/projects/projectId/edit-records-helper"; import { jsonCopy } from "@/submodules/javascript-functions/general"; -import { useRef, useState } from "react"; +import { useEffect, useRef, useState } from "react"; import { useDispatch } from "react-redux"; export default function EditField(props: EditFieldProps) { const dispatch = useDispatch(); - const [inputValue, setInputValue] = useState(props.record.data[props.attribute.name]); + + const [inputValue, setInputValue] = useState(null); const inputRef = useRef(null); @@ -67,6 +68,14 @@ export default function EditField(props: EditFieldProps) { } } + useEffect(() => { + if (props.subKey == undefined) setInputValue(props.record.data[props.attribute.name]); + else setInputValue(props.record.data[props.attribute.name][props.subKey]); + }, [props.record.data[props.attribute.name], props.subKey]); + + if (!inputValue) return null; + + return (<> {(props.attribute.dataType == DataTypeEnum.TEXT || props.attribute.dataType == DataTypeEnum.LLM_RESPONSE) &&