Merge pull request #229 from aXenDeveloper/refactor/drag_and_drop_table

refactor(frontend): Improve drag and drop hook
VitNode · Feb 25, 2024 · d4bc46a · d4bc46a
2 parents 467a829 + 1d26325
commit d4bc46a
Show file tree

Hide file tree

Showing 15 changed files with 479 additions and 417 deletions.
diff --git a/backend/src/admin/forum/forums/change_position/change_position.service.ts b/backend/src/admin/forum/forums/change_position/change_position.service.ts
@@ -27,8 +27,8 @@ export class ChangePositionForumForumsService {
     const allChildrenParent =
       await this.databaseService.db.query.forum_forums.findMany({
         where: (table, { eq }) =>
-          parent_id === null
-            ? isNull(table.parent_id)
+          !parent_id
+            ? isNull(table.parent_id ?? null)
             : eq(table.parent_id, parent_id),
         orderBy: (table, { asc }) => asc(table.position)
       });

diff --git a/backend/src/forum/forums/show/dto/show.obj.ts b/backend/src/forum/forums/show/dto/show.obj.ts
@@ -54,17 +54,17 @@ export class FirstShowForumForums extends ShowForumForums {
 
 @ObjectType()
 export class ChildrenShowForumForums extends ShowForumForums {
-  @Field(() => [LastChildShowForumForums], { nullable: true })
-  children: LastChildShowForumForums[] | null;
+  @Field(() => [LastChildShowForumForums])
+  children: LastChildShowForumForums[];
 }
 
 @ObjectType()
 export class ShowForumForumsWithParent extends FirstShowForumForums {
   @Field(() => ShowForumForums, { nullable: true })
   parent: ShowForumForums | null;
 
-  @Field(() => [ChildrenShowForumForums], { nullable: true })
-  children: ChildrenShowForumForums[] | null;
+  @Field(() => [ChildrenShowForumForums])
+  children: ChildrenShowForumForums[];
 }
 
 @ObjectType()

diff --git a/backend/src/schema.gql b/backend/src/schema.gql
@@ -34,7 +34,7 @@ type AvatarUser {
 
 type ChildrenShowForumForums {
   _count: ShowForumForumsCount!
-  children: [LastChildShowForumForums!]
+  children: [LastChildShowForumForums!]!
   created: Int!
   description: [TextLanguage!]!
   id: Int!
@@ -44,7 +44,7 @@ type ChildrenShowForumForums {
 
 type CreateForumForumsObj {
   _count: ShowForumForumsCount!
-  children: [ChildrenShowForumForums!]
+  children: [ChildrenShowForumForums!]!
   created: Int!
   description: [TextLanguage!]!
   id: Int!
@@ -438,7 +438,7 @@ type ShowForumForums {
 
 type ShowForumForumsAdmin {
   _count: ShowForumForumsCount!
-  children: [ChildrenShowForumForums!]
+  children: [ChildrenShowForumForums!]!
   created: Int!
   description: [TextLanguage!]!
   id: Int!
@@ -463,7 +463,7 @@ type ShowForumForumsObj {
 
 type ShowForumForumsWithParent {
   _count: ShowForumForumsCount!
-  children: [ChildrenShowForumForums!]
+  children: [ChildrenShowForumForums!]!
   created: Int!
   description: [TextLanguage!]!
   id: Int!

diff --git a/frontend/admin/forum/views/forums/forums-forum-admin-view.tsx b/frontend/admin/forum/views/forums/forums-forum-admin-view.tsx
@@ -3,8 +3,9 @@ import { useTranslations } from "next-intl";
 import { HeaderContent } from "@/components/header-content/header-content";
 import { ActionsForumsForumAdmin } from "./actions/actions";
 import { TableForumsForumAdmin } from "./table/table";
+import type { Admin__Forum_Forums__ShowQuery } from "@/graphql/hooks";
 
-export const ForumsForumAdminView = () => {
+export const ForumsForumAdminView = (props: Admin__Forum_Forums__ShowQuery) => {
   const t = useTranslations("admin.forum.forums");
 
   return (
@@ -13,7 +14,7 @@ export const ForumsForumAdminView = () => {
         <ActionsForumsForumAdmin />
       </HeaderContent>
 
-      <TableForumsForumAdmin />
+      <TableForumsForumAdmin {...props} />
     </>
   );
 };