fix: Filter PR Fix & Pagination for activity history (#301)

ls1intum · Feb 3, 2025 · 007d791 · 007d791
1 parent 652cc4b
commit 007d791
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/client/src/app/components/pull-request-table/pull-request-table.component.ts b/client/src/app/components/pull-request-table/pull-request-table.component.ts
@@ -25,14 +25,14 @@ import { WorkflowRunStatusComponent } from '@app/components/workflow-run-status-
 const FILTER_OPTIONS = [
   { name: 'All pull requests', filter: (prs: PullRequestBaseInfoDto[]) => prs },
   { name: 'Open pull requests', filter: (prs: PullRequestBaseInfoDto[]) => prs.filter(pr => pr.state === 'OPEN') },
-  { name: 'Your pull requests', filter: (prs: PullRequestBaseInfoDto[], username: string) => prs.filter(pr => pr.author?.login === username) },
+  { name: 'Your pull requests', filter: (prs: PullRequestBaseInfoDto[], username: string) => prs.filter(pr => pr.author?.login.toLowerCase() === username.toLowerCase()) },
   {
     name: 'Everything assigned to you',
-    filter: (prs: PullRequestBaseInfoDto[], username: string) => prs.filter(pr => pr.assignees?.some(assignee => assignee.login === username)),
+    filter: (prs: PullRequestBaseInfoDto[], username: string) => prs.filter(pr => pr.assignees?.some(assignee => assignee.login.toLowerCase() === username.toLowerCase())),
   },
   {
     name: 'Everything that requests a review by you',
-    filter: (prs: PullRequestBaseInfoDto[], username: string) => prs.filter(pr => pr.reviewers?.some(reviewer => reviewer.login === username)),
+    filter: (prs: PullRequestBaseInfoDto[], username: string) => prs.filter(pr => pr.reviewers?.some(reviewer => reviewer.login.toLowerCase() === username.toLowerCase())),
   },
 ];
 

diff --git a/...rc/app/pages/environment-deployment-history/environment-deployment-history.component.html b/...rc/app/pages/environment-deployment-history/environment-deployment-history.component.html
@@ -18,7 +18,7 @@
 
   <!-- Loading State -->
   @if (activityHistoryQuery.isPending() || activityHistoryQuery.isError()) {
-    <p-table [value]="[1, 2, 3, 4, 5]" styleClass="p-datatable-lg">
+    <p-table [value]="[1, 2, 3, 4, 5]" [paginator]="true" [rows]="20" styleClass="p-datatable-lg">
       <ng-template pTemplate="header">
         <tr>
           <th>Type</th>
@@ -35,8 +35,8 @@
       </ng-template>
     </p-table>
   } @else {
-    <!-- Data Table -->
-    <p-table [value]="activityHistory() || []" styleClass="p-datatable-sm">
+    <!-- Data Table with Pagination -->
+    <p-table [value]="activityHistory() || []" [paginator]="true" [rows]="20" styleClass="p-datatable-sm">
       <ng-template pTemplate="header">
         <tr>
           <th>Type</th>
@@ -103,7 +103,7 @@
       </ng-template>
       <ng-template pTemplate="emptymessage">
         <tr>
-          <td colspan="4">
+          <td colspan="3">
             <div class="flex flex-col gap-2 p-20 justify-center items-center">
               <i-tabler name="cloud-upload" class="!h-20 !w-20 text-red-500" />
               <span class="font-semibold text-xl">There are no activitiy history found for this environment.</span>