feat(Goal): sort by updatedAt by default

taskany-inc · May 25, 2023 · fbfd6a6 · fbfd6a6
1 parent 3f13c2c
commit fbfd6a6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/components/GoalListItem/GoalListItem.tsx b/src/components/GoalListItem/GoalListItem.tsx
@@ -24,6 +24,7 @@ interface GoalListItemProps {
     tags?: Array<Tag | undefined>;
     state?: State;
     createdAt: Date;
+    updatedAt: Date;
     owner?: ActivityByIdReturnType;
     comments?: number;
     hasForks?: boolean;
@@ -130,7 +131,7 @@ export const GoalListItem: React.FC<GoalListItemProps> = React.memo(
         shortId,
         owner,
         issuer,
-        createdAt,
+        updatedAt,
         tags,
         title,
         comments,
@@ -171,7 +172,7 @@ export const GoalListItem: React.FC<GoalListItemProps> = React.memo(
                     </StyledTags>
 
                     <StyledSubTitle size="s">
-                        #{shortId} <RelativeTime date={createdAt} kind="created" />
+                        #{shortId} <RelativeTime date={updatedAt} kind="updated" />
                         {` ${tr('by')} ${issuer?.user?.name}`}
                     </StyledSubTitle>
                 </StyledName>

diff --git a/src/components/GoalsGroup.tsx b/src/components/GoalsGroup.tsx
@@ -61,6 +61,7 @@ export const GoalsGroup: React.FC<GoalGroupProps> = React.memo(
                 {goals.map((g) => (
                     <GoalListItem
                         createdAt={g.createdAt}
+                        updatedAt={g.updatedAt}
                         id={g.id}
                         shortId={g._shortId}
                         state={g.state!}

diff --git a/trpc/queries/goals.ts b/trpc/queries/goals.ts
@@ -113,7 +113,7 @@ export const goalsFilter = (
             ...extra,
         },
         orderBy: {
-            createdAt: 'asc',
+            updatedAt: 'desc',
         },
     };
 };

diff --git a/trpc/router/goal.ts b/trpc/router/goal.ts
@@ -288,6 +288,8 @@ export const goal = router({
             tagsToDisconnect = actualGoal.tags?.filter((t) => !input.tags?.some((tag) => tag.id === t.id)) || [];
         }
 
+        console.log(input.tags);
+
         try {
             return prisma.goal.update({
                 where: { id: actualGoal.id },
@@ -309,13 +311,13 @@ export const goal = router({
                         : undefined,
                     tags: input.tags?.length
                         ? {
-                              connect: input.tags,
+                              connect: input.tags.map((t) => ({ id: t.id })),
                               disconnect: tagsToDisconnect,
                           }
                         : undefined,
                     participants: input.participants?.length
                         ? {
-                              connect: input.participants,
+                              connect: input.participants.map((p) => ({ id: p.id })),
                               disconnect: participantsToDisconnect,
                           }
                         : undefined,