fix(ProjectsPage): show only first level projects

taskany-inc · Jun 27, 2023 · e1733bf · e1733bf
1 parent a12a059
commit e1733bf
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 15 deletions.
diff --git a/src/components/PageHeader/PageHeader.tsx b/src/components/PageHeader/PageHeader.tsx
@@ -30,14 +30,14 @@ export const PageHeader: FC = () => {
             href: routes.goals(),
             title: tr('Goals'),
         },
-        {
-            href: routes.exploreTopProjects(),
-            title: tr('Explore'),
-        },
         {
             href: routes.projects(),
             title: tr('Projects'),
         },
+        {
+            href: routes.exploreTopProjects(),
+            title: tr('Explore'),
+        },
     ];
 
     const onUserMenuClick = useCallback(() => (user ? userSettings() : signIn()), [user, userSettings, signIn]);

diff --git a/src/components/ProjectsPage/ProjectsPage.tsx b/src/components/ProjectsPage/ProjectsPage.tsx
@@ -30,7 +30,9 @@ export const ProjectsPage = ({ user, ssrTime }: ExternalPageProps) => {
     const [preview, setPreview] = useState<GoalByIdReturnType | null>(null);
     const { toggleFilterStar } = useFilterResource();
 
-    const { data: projects = [] } = trpc.project.getAll.useQuery();
+    const { data: projects = [] } = trpc.project.getAll.useQuery({
+        firstLevel: true,
+    });
 
     const utils = trpc.useContext();
     const preset = trpc.filter.getById.useQuery(String(nextRouter.query.filter), {

diff --git a/trpc/router/project.ts b/trpc/router/project.ts
@@ -67,16 +67,33 @@ export const project = router({
             },
         });
     }),
-    getAll: protectedProcedure.query(({ ctx }) => {
-        return prisma.project
-            .findMany({
-                orderBy: {
-                    createdAt: 'asc',
-                },
-                include: { ...projectFullSchema },
-            })
-            .then((res) => res.map((project) => addCalculatedProjectFields(project, ctx.session.user.activityId)));
-    }),
+    getAll: protectedProcedure
+        .input(
+            z
+                .object({
+                    firstLevel: z.boolean().optional(),
+                })
+                .optional(),
+        )
+        .query(({ ctx, input: { firstLevel } = {} }) => {
+            return prisma.project
+                .findMany({
+                    orderBy: {
+                        createdAt: 'asc',
+                    },
+                    include: { ...projectFullSchema },
+                    ...(firstLevel
+                        ? {
+                              where: {
+                                  parent: {
+                                      none: {},
+                                  },
+                              },
+                          }
+                        : {}),
+                })
+                .then((res) => res.map((project) => addCalculatedProjectFields(project, ctx.session.user.activityId)));
+        }),
     getTop: protectedProcedure.query(async ({ ctx }) => {
         const allProjects = await prisma.project
             .findMany({