Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

fix: read workspace description from organization field

Tin343d1246006b
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/workspace/general.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/workspace/general.tsx
index 287619e74..7f4a8ed30 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/workspace/general.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/workspace/general.tsx
@@ -56,6 +56,29 @@ function normalizeWorkspaceValues(
};
}
+/** Better Auth persists description as an organization additional field (DB column), not only inside metadata. */
+function getWorkspaceDescription(
+ workspace:
+ | { description?: string | null; metadata?: unknown }
+ | null
+ | undefined,
+): string {
+ if (!workspace) return "";
+ if (typeof workspace.description === "string") {
+ return workspace.description;
+ }
+ if (
+ typeof workspace.metadata === "object" &&
+ workspace.metadata &&
+ "description" in workspace.metadata
+ ) {
+ return String(
+ (workspace.metadata as { description?: unknown }).description ?? "",
+ );
+ }
+ return "";
+}
+
function RouteComponent() {
const { t } = useTranslation();
const workspaceSchema = useMemo(
@@ -82,12 +105,7 @@ function RouteComponent() {
const { mutateAsync: updateWorkspace } = useUpdateWorkspace();
const { mutateAsync: deleteWorkspace, isPending: isDeleting } =
useDeleteWorkspace();
- const workspaceDescription =
- typeof workspace?.metadata === "object" &&
- workspace?.metadata &&
- "description" in workspace.metadata
- ? String(workspace.metadata.description ?? "")
- : "";
+ const workspaceDescription = getWorkspaceDescription(workspace);
const workspaceForm = useForm<WorkspaceFormValues>({
resolver: standardSchemaResolver(workspaceSchema),