Compare commits
1 Commits
fix/projec
...
feat/kanba
| Author | SHA1 | Date | |
|---|---|---|---|
| 32e021376c |
@@ -8,7 +8,6 @@ import {
|
|||||||
MinLength,
|
MinLength,
|
||||||
MaxLength,
|
MaxLength,
|
||||||
Matches,
|
Matches,
|
||||||
IsUUID,
|
|
||||||
} from "class-validator";
|
} from "class-validator";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -44,10 +43,6 @@ export class CreateProjectDto {
|
|||||||
})
|
})
|
||||||
color?: string;
|
color?: string;
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsUUID("4", { message: "domainId must be a valid UUID" })
|
|
||||||
domainId?: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsObject({ message: "metadata must be an object" })
|
@IsObject({ message: "metadata must be an object" })
|
||||||
metadata?: Record<string, unknown>;
|
metadata?: Record<string, unknown>;
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import {
|
|||||||
MinLength,
|
MinLength,
|
||||||
MaxLength,
|
MaxLength,
|
||||||
Matches,
|
Matches,
|
||||||
IsUUID,
|
|
||||||
} from "class-validator";
|
} from "class-validator";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -46,10 +45,6 @@ export class UpdateProjectDto {
|
|||||||
})
|
})
|
||||||
color?: string | null;
|
color?: string | null;
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsUUID("4", { message: "domainId must be a valid UUID" })
|
|
||||||
domainId?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsObject({ message: "metadata must be an object" })
|
@IsObject({ message: "metadata must be an object" })
|
||||||
metadata?: Record<string, unknown>;
|
metadata?: Record<string, unknown>;
|
||||||
|
|||||||
@@ -47,9 +47,6 @@ export class ProjectsService {
|
|||||||
createProjectDto: CreateProjectDto
|
createProjectDto: CreateProjectDto
|
||||||
): Promise<ProjectWithRelations> {
|
): Promise<ProjectWithRelations> {
|
||||||
const data: Prisma.ProjectCreateInput = {
|
const data: Prisma.ProjectCreateInput = {
|
||||||
...(createProjectDto.domainId
|
|
||||||
? { domain: { connect: { id: createProjectDto.domainId } } }
|
|
||||||
: {}),
|
|
||||||
name: createProjectDto.name,
|
name: createProjectDto.name,
|
||||||
description: createProjectDto.description ?? null,
|
description: createProjectDto.description ?? null,
|
||||||
color: createProjectDto.color ?? null,
|
color: createProjectDto.color ?? null,
|
||||||
@@ -224,18 +221,6 @@ export class ProjectsService {
|
|||||||
if (updateProjectDto.startDate !== undefined) updateData.startDate = updateProjectDto.startDate;
|
if (updateProjectDto.startDate !== undefined) updateData.startDate = updateProjectDto.startDate;
|
||||||
if (updateProjectDto.endDate !== undefined) updateData.endDate = updateProjectDto.endDate;
|
if (updateProjectDto.endDate !== undefined) updateData.endDate = updateProjectDto.endDate;
|
||||||
if (updateProjectDto.color !== undefined) updateData.color = updateProjectDto.color;
|
if (updateProjectDto.color !== undefined) updateData.color = updateProjectDto.color;
|
||||||
if (updateProjectDto.domainId !== undefined)
|
|
||||||
updateData.domain = updateProjectDto.domainId
|
|
||||||
? { connect: { id: updateProjectDto.domainId } }
|
|
||||||
: { disconnect: true };
|
|
||||||
if (updateProjectDto.domainId !== undefined)
|
|
||||||
updateData.domain = updateProjectDto.domainId
|
|
||||||
? {
|
|
||||||
connect: {
|
|
||||||
id: updateProjectDto.domainId,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
: { disconnect: true };
|
|
||||||
if (updateProjectDto.metadata !== undefined) {
|
if (updateProjectDto.metadata !== undefined) {
|
||||||
updateData.metadata = updateProjectDto.metadata as unknown as Prisma.InputJsonValue;
|
updateData.metadata = updateProjectDto.metadata as unknown as Prisma.InputJsonValue;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,8 +17,6 @@ import {
|
|||||||
import { fetchProjects, createProject, deleteProject, ProjectStatus } from "@/lib/api/projects";
|
import { fetchProjects, createProject, deleteProject, ProjectStatus } from "@/lib/api/projects";
|
||||||
import type { Project, CreateProjectDto } from "@/lib/api/projects";
|
import type { Project, CreateProjectDto } from "@/lib/api/projects";
|
||||||
import { useWorkspaceId } from "@/lib/hooks";
|
import { useWorkspaceId } from "@/lib/hooks";
|
||||||
import { fetchDomains } from "@/lib/api/domains";
|
|
||||||
import type { Domain } from "@mosaic/shared";
|
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------------
|
/* ---------------------------------------------------------------------------
|
||||||
Status badge helpers
|
Status badge helpers
|
||||||
@@ -67,14 +65,11 @@ interface ProjectCardProps {
|
|||||||
project: Project;
|
project: Project;
|
||||||
onDelete: (id: string) => void;
|
onDelete: (id: string) => void;
|
||||||
onClick: (id: string) => void;
|
onClick: (id: string) => void;
|
||||||
domains: Domain[];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function ProjectCard({ project, onDelete, onClick, domains }: ProjectCardProps): ReactElement {
|
function ProjectCard({ project, onDelete, onClick }: ProjectCardProps): ReactElement {
|
||||||
const [hovered, setHovered] = useState(false);
|
const [hovered, setHovered] = useState(false);
|
||||||
const status = getStatusStyle(project.status);
|
const status = getStatusStyle(project.status);
|
||||||
// Find domain if project has a domainId
|
|
||||||
const domain = project.domainId ? domains.find((d) => d.id === project.domainId) : undefined;
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
@@ -209,22 +204,6 @@ function ProjectCard({ project, onDelete, onClick, domains }: ProjectCardProps):
|
|||||||
>
|
>
|
||||||
{status.label}
|
{status.label}
|
||||||
</span>
|
</span>
|
||||||
{domain && (
|
|
||||||
<span
|
|
||||||
style={{
|
|
||||||
display: "inline-block",
|
|
||||||
padding: "2px 10px",
|
|
||||||
borderRadius: "var(--r)",
|
|
||||||
background: "rgba(139,92,246,0.15)",
|
|
||||||
color: "var(--purple)",
|
|
||||||
fontSize: "0.75rem",
|
|
||||||
fontWeight: 500,
|
|
||||||
marginLeft: 8,
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{domain.name}
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Timestamps */}
|
{/* Timestamps */}
|
||||||
<span
|
<span
|
||||||
@@ -250,7 +229,6 @@ interface CreateDialogProps {
|
|||||||
onOpenChange: (open: boolean) => void;
|
onOpenChange: (open: boolean) => void;
|
||||||
onSubmit: (data: CreateProjectDto) => Promise<void>;
|
onSubmit: (data: CreateProjectDto) => Promise<void>;
|
||||||
isSubmitting: boolean;
|
isSubmitting: boolean;
|
||||||
domains: Domain[];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function CreateProjectDialog({
|
function CreateProjectDialog({
|
||||||
@@ -258,24 +236,20 @@ function CreateProjectDialog({
|
|||||||
onOpenChange,
|
onOpenChange,
|
||||||
onSubmit,
|
onSubmit,
|
||||||
isSubmitting,
|
isSubmitting,
|
||||||
domains,
|
|
||||||
}: CreateDialogProps): ReactElement {
|
}: CreateDialogProps): ReactElement {
|
||||||
const [name, setName] = useState("");
|
const [name, setName] = useState("");
|
||||||
const [description, setDescription] = useState("");
|
const [description, setDescription] = useState("");
|
||||||
const [formError, setFormError] = useState<string | null>(null);
|
const [formError, setFormError] = useState<string | null>(null);
|
||||||
const [domainId, setDomainId] = useState("");
|
|
||||||
|
|
||||||
function resetForm(): void {
|
function resetForm(): void {
|
||||||
setName("");
|
setName("");
|
||||||
setDescription("");
|
setDescription("");
|
||||||
setFormError(null);
|
setFormError(null);
|
||||||
setDomainId("");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function handleSubmit(e: SyntheticEvent): Promise<void> {
|
async function handleSubmit(e: SyntheticEvent): Promise<void> {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
setFormError(null);
|
setFormError(null);
|
||||||
setDomainId("");
|
|
||||||
|
|
||||||
const trimmedName = name.trim();
|
const trimmedName = name.trim();
|
||||||
if (!trimmedName) {
|
if (!trimmedName) {
|
||||||
@@ -289,9 +263,6 @@ function CreateProjectDialog({
|
|||||||
if (trimmedDesc) {
|
if (trimmedDesc) {
|
||||||
payload.description = trimmedDesc;
|
payload.description = trimmedDesc;
|
||||||
}
|
}
|
||||||
if (domainId) {
|
|
||||||
payload.domainId = domainId;
|
|
||||||
}
|
|
||||||
await onSubmit(payload);
|
await onSubmit(payload);
|
||||||
resetForm();
|
resetForm();
|
||||||
} catch (err: unknown) {
|
} catch (err: unknown) {
|
||||||
@@ -411,47 +382,6 @@ function CreateProjectDialog({
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Domain */}
|
|
||||||
<div style={{ marginBottom: 16 }}>
|
|
||||||
<label
|
|
||||||
htmlFor="project-domain"
|
|
||||||
style={{
|
|
||||||
display: "block",
|
|
||||||
marginBottom: 6,
|
|
||||||
fontSize: "0.85rem",
|
|
||||||
fontWeight: 500,
|
|
||||||
color: "var(--text-2)",
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
Domain (optional)
|
|
||||||
</label>
|
|
||||||
<select
|
|
||||||
id="project-domain"
|
|
||||||
value={domainId}
|
|
||||||
onChange={(e) => {
|
|
||||||
setDomainId(e.target.value);
|
|
||||||
}}
|
|
||||||
style={{
|
|
||||||
width: "100%",
|
|
||||||
padding: "8px 12px",
|
|
||||||
background: "var(--bg)",
|
|
||||||
border: "1px solid var(--border)",
|
|
||||||
borderRadius: "var(--r)",
|
|
||||||
color: "var(--text)",
|
|
||||||
fontSize: "0.9rem",
|
|
||||||
outline: "none",
|
|
||||||
boxSizing: "border-box",
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<option value="">None</option>
|
|
||||||
{domains.map((d) => (
|
|
||||||
<option key={d.id} value={d.id}>
|
|
||||||
{d.name}
|
|
||||||
</option>
|
|
||||||
))}
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Form error */}
|
{/* Form error */}
|
||||||
{formError !== null && (
|
{formError !== null && (
|
||||||
<p style={{ color: "var(--danger)", fontSize: "0.85rem", margin: "0 0 12px" }}>
|
<p style={{ color: "var(--danger)", fontSize: "0.85rem", margin: "0 0 12px" }}>
|
||||||
@@ -602,7 +532,6 @@ export default function ProjectsPage(): ReactElement {
|
|||||||
const workspaceId = useWorkspaceId();
|
const workspaceId = useWorkspaceId();
|
||||||
|
|
||||||
const [projects, setProjects] = useState<Project[]>([]);
|
const [projects, setProjects] = useState<Project[]>([]);
|
||||||
const [domains, setDomains] = useState<Domain[]>([]);
|
|
||||||
const [isLoading, setIsLoading] = useState(true);
|
const [isLoading, setIsLoading] = useState(true);
|
||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
@@ -672,33 +601,6 @@ export default function ProjectsPage(): ReactElement {
|
|||||||
};
|
};
|
||||||
}, [workspaceId]);
|
}, [workspaceId]);
|
||||||
|
|
||||||
// Load domains
|
|
||||||
useEffect(() => {
|
|
||||||
if (!workspaceId) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
let cancelled = false;
|
|
||||||
const wsId = workspaceId;
|
|
||||||
|
|
||||||
async function loadDomains(): Promise<void> {
|
|
||||||
try {
|
|
||||||
const response = await fetchDomains(undefined, wsId);
|
|
||||||
if (!cancelled) {
|
|
||||||
setDomains(response.data);
|
|
||||||
}
|
|
||||||
} catch (err: unknown) {
|
|
||||||
console.error("[Projects] Failed to fetch domains:", err);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void loadDomains();
|
|
||||||
|
|
||||||
return (): void => {
|
|
||||||
cancelled = true;
|
|
||||||
};
|
|
||||||
}, [workspaceId]);
|
|
||||||
|
|
||||||
function handleRetry(): void {
|
function handleRetry(): void {
|
||||||
void loadProjects(workspaceId);
|
void loadProjects(workspaceId);
|
||||||
}
|
}
|
||||||
@@ -877,7 +779,6 @@ export default function ProjectsPage(): ReactElement {
|
|||||||
project={project}
|
project={project}
|
||||||
onDelete={handleDeleteRequest}
|
onDelete={handleDeleteRequest}
|
||||||
onClick={handleCardClick}
|
onClick={handleCardClick}
|
||||||
domains={domains}
|
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
@@ -889,7 +790,6 @@ export default function ProjectsPage(): ReactElement {
|
|||||||
onOpenChange={setCreateOpen}
|
onOpenChange={setCreateOpen}
|
||||||
onSubmit={handleCreate}
|
onSubmit={handleCreate}
|
||||||
isSubmitting={isCreating}
|
isSubmitting={isCreating}
|
||||||
domains={domains}
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{/* Delete Confirmation Dialog */}
|
{/* Delete Confirmation Dialog */}
|
||||||
|
|||||||
@@ -95,7 +95,6 @@ export interface CreateProjectDto {
|
|||||||
startDate?: string;
|
startDate?: string;
|
||||||
endDate?: string;
|
endDate?: string;
|
||||||
color?: string;
|
color?: string;
|
||||||
domainId?: string;
|
|
||||||
metadata?: Record<string, unknown>;
|
metadata?: Record<string, unknown>;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -109,7 +108,6 @@ export interface UpdateProjectDto {
|
|||||||
startDate?: string | null;
|
startDate?: string | null;
|
||||||
endDate?: string | null;
|
endDate?: string | null;
|
||||||
color?: string | null;
|
color?: string | null;
|
||||||
domainId?: string | null;
|
|
||||||
metadata?: Record<string, unknown>;
|
metadata?: Record<string, unknown>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user