fix: duplicated create sorting

novuhq · Dec 27, 2024 · a890879 · a890879
1 parent 0f2b7a2
commit a890879
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/apps/dashboard/src/components/activity/activity-job-item.tsx b/apps/dashboard/src/components/activity/activity-job-item.tsx
@@ -51,7 +51,7 @@ export function ActivityJobItem({ job, isFirst, isLast }: ActivityJobItemProps)
                 {getJobIcon(job.type)}
               </div>
             </div>
-            <span className="text-foreground-950 text-xs capitalize">{formatJobType(job.type)}</span>
+            <span className="text-foreground-950 text-xs capitalize">{job?.step?.name || formatJobType(job.type)}</span>
           </div>
 
           <Button

diff --git a/libs/dal/src/repositories/notification/notification.repository.ts b/libs/dal/src/repositories/notification/notification.repository.ts
@@ -111,7 +111,7 @@ export class NotificationRepository extends BaseRepository<
       .populate({
         options: {
           readPreference: 'secondaryPreferred',
-          sort: { createdAt: 1 },
+          sort: { createdAt: 1, _parentId: 1 },
         },
         path: 'jobs',
         match: {
@@ -120,7 +120,7 @@ export class NotificationRepository extends BaseRepository<
             $nin: [StepTypeEnum.TRIGGER],
           },
         },
-        select: 'createdAt digest payload overrides to tenant actorId providerId step status type updatedAt',
+        select: 'createdAt digest payload overrides to tenant actorId providerId step status type updatedAt _parentId',
         populate: [
           {
             path: 'executionDetails',
-Original file line number
+Diff line change
@@ Expand Up @@
                     {getJobIcon(job.type)}
                   </div>
                 </div>
-                <span className="text-foreground-950 text-xs capitalize">{formatJobType(job.type)}</span>
+                <span className="text-foreground-950 text-xs capitalize">{job?.step?.name || formatJobType(job.type)}</span>
               </div>
               <Button
@@ Expand Down @@