fix(INTERNAL-1206): editable props for dnd

taskany-inc · Oct 14, 2024 · 035000c · 035000c
1 parent f2ac532
commit 035000c
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 7 deletions.
diff --git a/src/components/Kanban/Kanban.module.css b/src/components/Kanban/Kanban.module.css
@@ -15,6 +15,14 @@
     flex: 1;
 }
 
+.KanbanSortableListItem_disable {
+    cursor: default;
+}
+
+.KanbanSortableListItem_ghost {
+    opacity: 0.2;
+}
+
 .KanbanLink {
     display: block;
 }

diff --git a/src/components/Kanban/Kanban.tsx b/src/components/Kanban/Kanban.tsx
@@ -3,6 +3,7 @@ import { KanbanColumn, KanbanContainer } from '@taskany/bricks/harmony';
 import { QueryStatus } from '@tanstack/react-query';
 import { nullable, useIntersectionLoader } from '@taskany/bricks';
 import { ReactSortable } from 'react-sortablejs';
+import cn from 'classnames';
 
 import { trpc } from '../../utils/trpcClient';
 import { FilterById, State } from '../../../trpc/inferredTypes';
@@ -36,7 +37,7 @@ const calculateCommonLoadingState = (map: Map<unknown, LoadingState>): LoadingSt
     const loadingStates = new Set(map.values());
 
     if (loadingStates.size === 1) {
-        return loadingStates.values().next().value;
+        return loadingStates.values().next().value || 'success';
     }
 
     if (loadingStates.has('loading')) {
@@ -66,6 +67,13 @@ const intersectionOptions = {
     rootMargin: '0px 0px 300px',
 };
 
+const onSortableMove: ComponentProps<typeof ReactSortable>['onMove'] = (event) => {
+    if (event.dragged.classList.contains(s.KanbanSortableListItem_disable)) {
+        return false;
+    }
+    return -1;
+};
+
 const KanbanStateColumn: FC<KanbanStateColumnProps> = ({
     state,
     shownStates,
@@ -234,9 +242,11 @@ const KanbanStateColumn: FC<KanbanStateColumnProps> = ({
                 animation={150}
                 list={list}
                 setList={setList}
+                ghostClass={s.KanbanSortableListItem_ghost}
+                filter={`.${s.KanbanLink}.${s.KanbanSortableListItem_disable}`}
                 group="states"
                 onEnd={onDragEnd}
-                sort={false}
+                onMove={onSortableMove}
             >
                 {list.map((goal) => {
                     return (
@@ -248,7 +258,9 @@ const KanbanStateColumn: FC<KanbanStateColumnProps> = ({
                                 _shortId: goal._shortId,
                                 title: goal.title,
                             })}
-                            className={s.KanbanLink}
+                            className={cn(s.KanbanLink, {
+                                [s.KanbanSortableListItem_disable]: !goal._isEditable,
+                            })}
                         >
                             <GoalsKanbanCard
                                 id={goal.id}

diff --git a/trpc/queries/goalV2.ts b/trpc/queries/goalV2.ts
@@ -115,6 +115,22 @@ export const getGoalsQuery = (params: GetGoalsQueryParams) =>
                     )
                         .$castTo<boolean>()
                         .as('_isParticipant'),
+                    exists(
+                        selectFrom('_projectParticipants')
+                            .select('A')
+                            .whereRef('B', '=', 'Goal.projectId')
+                            .where('A', '=', params.activityId),
+                    )
+                        .$castTo<boolean>()
+                        .as('_isParentParticipant'),
+                    exists(
+                        selectFrom('Project')
+                            .select('Project.activityId')
+                            .whereRef('Project.id', '=', 'Goal.projectId')
+                            .where('Project.activityId', '=', params.activityId),
+                    )
+                        .$castTo<boolean>()
+                        .as('_isParentOwner'),
                     exists(
                         selectFrom('_goalWatchers')
                             .select('B')
@@ -132,9 +148,6 @@ export const getGoalsQuery = (params: GetGoalsQueryParams) =>
                         .$castTo<boolean>()
                         .as('_isStarred'),
                     sql`(count(criteria.id) > 0)`.as('_hasAchievementCriteria'),
-                    sql<boolean>`((${val(params.role === Role.ADMIN)} or "Goal"."activityId" = ${val(
-                        params.activityId,
-                    )}) and not "Goal"."personal")`.as('_isEditable'),
                     caseFn()
                         .when(fn.count('criteria.id'), '>', 0)
                         .then(fn.agg('array_agg', [sql`"criteria"`]).distinct())
@@ -276,13 +289,18 @@ export const getGoalsQuery = (params: GetGoalsQueryParams) =>
         )
         .innerJoin('Project', 'Project.id', 'proj_goals.projectId')
         .selectAll('proj_goals')
-        .select(({ selectFrom, fn }) => [
+        .select(({ selectFrom, fn, val }) => [
             sql<string>`concat("proj_goals"."projectId", '-', "proj_goals"."scopeId")::text`.as('_shortId'),
             jsonBuildObject({
                 comments: selectFrom('Comment')
                     .select(({ fn }) => [fn.count('Comment.id').as('count')])
                     .whereRef('Comment.goalId', '=', 'proj_goals.id'),
             }).as('_count'),
+            sql<boolean>`${val(
+                params.role === Role.ADMIN,
+            )} or proj_goals."_isOwner" or proj_goals."_isIssuer" or proj_goals."_isParentOwner" or proj_goals."_isParentParticipant"`.as(
+                '_isEditable',
+            ),
             sql`to_jsonb(proj_goals.tags)`.as('tags'),
             sql`to_jsonb(proj_goals.criteria)`.as('criteria'),
             sql`to_jsonb(proj_goals.participants)`.as('participants'),

diff --git a/trpc/router/projectV2.ts b/trpc/router/projectV2.ts
@@ -87,6 +87,8 @@ type ProjectGoal = ExtractTypeFromGenerated<Goal> & {
     _isEditable: boolean;
     _isIssuer: boolean;
     _isParticipant: boolean;
+    _isParentParticipant: boolean;
+    _isParentOwner: boolean;
     _hasAchievementCriteria: boolean;
 };