Merge pull request #609 from bcgov/oleks

Fix: Filtered out items in Aggregated Listings table are greyed out now
bcgov · Sep 6, 2024 · 0c83e6f · 0c83e6f
2 parents 735826d + aaa9eb9
commit 0c83e6f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/...nd/src/app/features/components/bulk-compliance-notice/bulk-compliance-notice.component.ts b/...nd/src/app/features/components/bulk-compliance-notice/bulk-compliance-notice.component.ts
@@ -79,7 +79,7 @@ export class BulkComplianceNoticeComponent implements OnInit {
     this.route.queryParams.subscribe(
       (param) => {
         if (!this.searchStateService?.selectedListings || !param['returnUrl']) {
-          this.router.navigateByUrl('/listings');
+          this.router.navigateByUrl('/');
         }
         else {
           this.returnUrl = param['returnUrl'];

diff --git a/...tend/src/app/features/components/bulk-takedown-request/bulk-takedown-request.component.ts b/...tend/src/app/features/components/bulk-takedown-request/bulk-takedown-request.component.ts
@@ -81,7 +81,7 @@ export class BulkTakedownRequestComponent implements OnInit {
     this.route.queryParams.subscribe(
       (param) => {
         if (!this.searchStateService?.selectedListings || !param['returnUrl']) {
-          this.router.navigateByUrl('/listings');
+          this.router.navigateByUrl('/');
         }
         else {
           this.returnUrl = param['returnUrl'];

diff --git a/...ponents/listings-table/aggregated-listings-table/aggregated-listings-table.component.html b/...ponents/listings-table/aggregated-listings-table/aggregated-listings-table.component.html
@@ -50,7 +50,7 @@ <h2 class="title">Aggregated Listings</h2>
         </ng-template>
 
         <p-table dataKey="id" [value]="aggregatedListings" #table [ariaLabel]="'table-of-listings'" id="listings-table"
-            [scrollable]="true" scrollHeight="{{isCEU?'650px':'600px'}}" [(selection)]="selectedListings"
+            [scrollable]="true" scrollHeight="{{isCEU?'635px':'585px'}}" [(selection)]="selectedListings"
             styleClass="p-datatable-sm" [tableStyle]="{ 'min-width': '50rem' }" [selectionPageOnly]="true">
 
             <ng-template pTemplate="header">
@@ -132,7 +132,7 @@ <h2 class="title">Aggregated Listings</h2>
                 </tr>
             </ng-template>
             <ng-template pTemplate="body" let-listing let-index="rowIndex">
-                <tr>
+                <tr [class.filtered-out]="!listing.filtered">
                     <td>
                         <p-checkbox [(ngModel)]="listing.selected" [binary]="true" [inputId]="'listing-select-chbx'"
                             (onChange)="onListingRowSelected($event,listing)"></p-checkbox>

diff --git a/...ponents/listings-table/aggregated-listings-table/aggregated-listings-table.component.scss b/...ponents/listings-table/aggregated-listings-table/aggregated-listings-table.component.scss
@@ -137,6 +137,10 @@
         }
 
         tr {
+            &.filtered-out {
+                opacity: .4;
+            }
+
             th {
                 font-size: 14px;
                 font-family: 'BcSans-bold';