fix: show parent project breadcrumb for folders too

js/app/packages/macro-entity/src/components/EntityWithEverything.tsx

@@ -969,7 +969,7 @@ function EntityProject(props: {
   entity: ProjectContainedEntity;
   onClick?: EntityClickHandler<ProjectEntity>;
 }) {
-  const projectQuery = createProjectQuery(props.entity);
+  const projectQuery = createProjectQuery(props.entity.projectId);
   let projectIconRef!: HTMLDivElement;
 
   createEffect(() => {

js/app/packages/macro-entity/src/queries/dss.ts

@@ -228,7 +228,7 @@ const selectData: (
               ownerId: item.data.ownerId,
               frecencyScore: item.frecency_score,
               viewedAt: item.data.viewedAt ?? undefined,
-              parentId: item.data.parentId ?? undefined,
+              projectId: item.data.parentId ?? undefined,
               type: item.tag,
               name: item.data.name || 'New Project',
             };

js/app/packages/macro-entity/src/queries/project.ts

@@ -5,20 +5,25 @@ import type {
   ProjectPreviewData,
 } from '@service-storage/generated/schemas';
 import { useQuery } from '@tanstack/solid-query';
-import type { ChatEntity, DocumentEntity, EntityData } from '../types/entity';
+import {
+  type ChatEntity,
+  type DocumentEntity,
+  type EntityData,
+  getEntityProjectId,
+  type ProjectEntity,
+} from '../types/entity';
 import { createApiTokenQuery } from './auth';
 import { queryKeys } from './key';
 
 export type ProjectContainedEntity = WithRequired<
-  Extract<EntityData, DocumentEntity | ChatEntity>,
+  Extract<EntityData, DocumentEntity | ChatEntity | ProjectEntity>,
   'projectId'
 >;
 
 export const isProjectContainedEntity = (
   entity: EntityData
 ): entity is ProjectContainedEntity => {
-  if (entity.type !== 'chat' && entity.type !== 'document') return false;
-  return !!entity.projectId;
+  return getEntityProjectId(entity) !== false;
 };
 
 const fetchProjectData = async (
@@ -103,18 +108,20 @@ const fetchProjectData = async (
   }
 };
 
-export function createProjectQuery<T extends ProjectContainedEntity>(
-  entity: T
-) {
+export function createProjectQuery(projectId: string) {
   const authQuery = createApiTokenQuery();
 
-  const projectQuery = useQuery(() => ({
-    queryKey: queryKeys.project({ projectId: entity.projectId }),
-    queryFn: () => fetchProjectData(entity.projectId, authQuery.data),
-    enabled: authQuery.isSuccess,
-    gcTime: 1000 * 60 * 10, // 10 minutes
-    staleTime: 1000 * 60 * 5, // 5 minutes
-  }));
+  const projectQuery = useQuery(() => {
+    return {
+      queryKey: queryKeys.project({
+        projectId,
+      }),
+      queryFn: () => fetchProjectData(projectId, authQuery.data),
+      enabled: authQuery.isSuccess && !!projectId,
+      gcTime: 1000 * 60 * 10, // 10 minutes
+      staleTime: 1000 * 60 * 5, // 5 minutes
+    };
+  });
 
   return projectQuery;
 }

js/app/packages/macro-entity/src/queries/search.ts

@@ -292,7 +292,7 @@ const useMapSearchResponseItem = () => {
           ownerId: result.owner_id,
           createdAt: result.created_at,
           updatedAt: result.updated_at,
-          parentId: result.metadata?.parent_project_id ?? undefined,
+          projectId: result.metadata?.parent_project_id ?? undefined,
           search,
         };
       }

js/app/packages/macro-entity/src/types/entity.ts

@@ -62,9 +62,6 @@ export type DocumentEntity = BaseDocumentEntity | MarkdownEntity;
 export type NamedSubType = 'task';
 
 export const getEntityProjectId = (e: EntityData): string | false => {
-  if (e.type === 'project') {
-    return 'parentId' in e ? (e.parentId ?? false) : false;
-  }
   return 'projectId' in e ? (e.projectId ?? false) : false;
 };
 
@@ -84,7 +81,7 @@ export type EmailEntity = EntityBase & {
 
 export type ProjectEntity = EntityBase & {
   type: 'project';
-  parentId?: string;
+  projectId?: string;
 };
 
 // Create new entity types above this comment