Skip to content

Commit 64b85b7

Browse files
The flag for projects from integrations is missing
1 parent 5f6d9a6 commit 64b85b7

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

src/components/projects/ProjectCard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export default function ProjectCard(props: ProjectCardProps) {
6565
<span className="text-sm text-gray-900 ">{props.project.time}</span>
6666
</>}
6767
</div>}
68-
{props.project.is_integration_project && <div className="absolute bottom-0 left-2/4 flex flex-row flex-nowrap gap-x-1 bg-gray-100 px-1 rounded-br rounded-bl" style={{ 'transform': 'translate(-50%' }}>
68+
{props.project.isIntegrationProject && <div className="absolute bottom-0 left-2/4 flex flex-row flex-nowrap gap-x-1 bg-gray-100 px-1 rounded-br rounded-bl" style={{ 'transform': 'translate(-50%' }}>
6969
<span className="text-sm text-red-500">This is an integration project, please do not delete it unless the integration is deleted</span>
7070
</div>}
7171
{(isAdmin && props.project.status !== ProjectStatus.INIT_SAMPLE_PROJECT) &&

src/components/projects/projectId/settings/ProjectMetaData.tsx

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { selectProject, setActiveProject } from "@/src/reduxStore/states/project";
2-
import { updateProjectNameAndDescriptionPost } from "@/src/services/base/project";
1+
import { selectAllProjects, selectProject, setActiveProject, setAllProjects } from "@/src/reduxStore/states/project";
2+
import { getAllProjects, updateProjectNameAndDescriptionPost } from "@/src/services/base/project";
33
import { TOOLTIPS_DICT } from "@/src/util/tooltip-constants";
44
import { Tooltip } from "@nextui-org/react";
55
import { useRouter } from "next/router";
6-
import { useState } from "react";
6+
import { use, useEffect, useMemo, useState } from "react";
77
import { useDispatch, useSelector } from "react-redux";
88
import { deleteProjectPost } from "@/src/services/base/project";
99
import KernButton from "@/submodules/react-components/components/kern-button/KernButton";
@@ -14,6 +14,7 @@ export default function ProjectMetaData() {
1414
const dispatch = useDispatch();
1515

1616
const project = useSelector(selectProject);
17+
const allProjects = useSelector(selectAllProjects);
1718

1819
const [projectName, setProjectName] = useState('');
1920
const [projectDescription, setProjectDescription] = useState('');
@@ -39,6 +40,14 @@ export default function ProjectMetaData() {
3940
});
4041
}
4142

43+
useEffect(() => {
44+
getAllProjects((projects) => dispatch(setAllProjects(projects)));
45+
}, []);
46+
47+
const isIntegrationProject = useMemo(() => {
48+
return allProjects && allProjects.some(p => p.id === project.id && p.isIntegrationProject);
49+
}, [allProjects, project.id]);
50+
4251
return (<div>
4352
<div className="mt-8">
4453
<div className="text-gray-900 text-lg leading-6 font-medium">
@@ -85,7 +94,7 @@ export default function ProjectMetaData() {
8594
<div className="text-gray-900 text-lg leading-6 font-medium">Danger zone</div>
8695
<div className="text-sm leading-5 font-normal mt-2 text-gray-500 inline-block">This action can not be reversed.
8796
Are you sure you want to delete this project?</div>
88-
{project.is_integration_project && <div className="text-sm text-red-500 italic">
97+
{isIntegrationProject && <div className="text-sm text-red-500 italic">
8998
This is an integration project, please do not delete it unless the integration is deleted
9099
</div>}
91100
<div className="form-control">

src/types/components/projects/projects-list.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export type Project = {
1414
timeStamp: string;
1515
date: string;
1616
time: string
17-
is_integration_project: boolean;
17+
isIntegrationProject: boolean;
1818
}
1919

2020
export enum ProjectStatus {

0 commit comments

Comments
 (0)