Merge branch 'master' into SWAP-3647-scicat-remove-header-filters-and…

…-use-query-filter
SciCatProject · Nov 27, 2023 · e5c64ba · e5c64ba
2 parents 7b25aec + 0110d25
commit e5c64ba
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 24 deletions.
diff --git a/src/app/datasets/dataset-lifecycle/dataset-lifecycle.component.html b/src/app/datasets/dataset-lifecycle/dataset-lifecycle.component.html
@@ -81,7 +81,6 @@
               [pageSize]="itemsPerPage"
               [pageSizeOptions]="pageSizeOptions"
               (page)="onPageChange($event)"
-              showFirstLastButtons
             ></mat-paginator>
           </div>
 

diff --git a/src/app/datasets/dataset-table/dataset-table.component.html b/src/app/datasets/dataset-table/dataset-table.component.html
@@ -9,7 +9,6 @@
       [length]="datasetCount$ | async"
       [pageSize]="datasetsPerPage$ | async"
       (page)="onPageChange($event)"
-      showFirstLastButtons
     >
     </mat-paginator>
 
@@ -108,7 +107,7 @@
         *matCellDef="let dataset"
         matTooltip="{{ dataset.sourceFolder }}"
       >
-        ...{{ dataset.sourceFolder | slice : -10 }}
+        ...{{ dataset.sourceFolder | slice: -10 }}
       </mat-cell>
     </ng-container>
 
@@ -177,8 +176,8 @@
       </mat-header-cell>
       <mat-cell *matCellDef="let dataset">
         <div fxLayout="column">
-          <div>{{ dataset.creationTime | date : "yyyy-MM-dd" }}</div>
-          <div>{{ dataset.creationTime | date : "EEE HH:mm" }}</div>
+          <div>{{ dataset.creationTime | date: "yyyy-MM-dd" }}</div>
+          <div>{{ dataset.creationTime | date: "EEE HH:mm" }}</div>
         </div>
       </mat-cell>
     </ng-container>
@@ -243,7 +242,7 @@
         }}</ng-template>
         <ng-template #elseBlock
           >{{
-            dataset.scientificMetadata | json | slice : 0 : 100
+            dataset.scientificMetadata | json | slice: 0 : 100
           }}...</ng-template
         >
       </mat-cell>

diff --git a/src/app/datasets/sample-edit/sample-edit.component.html b/src/app/datasets/sample-edit/sample-edit.component.html
@@ -16,7 +16,6 @@ <h1 mat-dialog-title>Edit Dataset Sample</h1>
         [length]="sampleCount$ | async"
         [pageSize]="samplesPerPage$ | async"
         (page)="onPageChange($event)"
-        showFirstLastButtons
       ></mat-paginator>
     </div>
   </div>
@@ -57,7 +56,7 @@ <h1 mat-dialog-title>Edit Dataset Sample</h1>
         Creation Time
       </mat-header-cell>
       <mat-cell *matCellDef="let row">
-        {{ row.createdAt | date : "yyyy-MM-dd, hh:mm" }}
+        {{ row.createdAt | date: "yyyy-MM-dd, hh:mm" }}
       </mat-cell>
     </ng-container>
 

diff --git a/src/app/logbooks/logbooks-detail/logbooks-detail.component.html b/src/app/logbooks/logbooks-detail/logbooks-detail.component.html
@@ -5,7 +5,6 @@
     [length]="entriesCount"
     [pageSize]="entriesPerPage"
     (page)="doPageChange($event)"
-    showFirstLastButtons
   >
   </mat-paginator>
 
@@ -29,7 +28,7 @@
         </div>
       </mat-header-cell>
       <mat-cell *matCellDef="let message">
-        {{ message.origin_server_ts | date : "yyyy-MM-dd, EEE HH:mm" }}
+        {{ message.origin_server_ts | date: "yyyy-MM-dd, EEE HH:mm" }}
       </mat-cell>
     </ng-container>
 
@@ -107,20 +106,20 @@
             *ngIf="
               first ||
               (!first &&
-                (message.origin_server_ts | date : 'yyyy-MM-dd') !==
+                (message.origin_server_ts | date: 'yyyy-MM-dd') !==
                   (logbook.messages[i - 1].origin_server_ts
-                    | date : 'yyyy-MM-dd'))
+                    | date: 'yyyy-MM-dd'))
             "
           >
             <mat-expansion-panel-header>
               <mat-panel-title>
-                {{ message.origin_server_ts | date : "MMM d, y" }}
+                {{ message.origin_server_ts | date: "MMM d, y" }}
               </mat-panel-title>
             </mat-expansion-panel-header>
             <div>
               <div class="sender">
                 {{ message.senderName }},
-                {{ message.origin_server_ts | date : "HH:mm" }}:
+                {{ message.origin_server_ts | date: "HH:mm" }}:
               </div>
               <div>
                 <div
@@ -163,13 +162,13 @@
               <div
                 *ngIf="
                   value !== message &&
-                  (value.origin_server_ts | date : 'yyyy-MM-dd') ===
-                    (message.origin_server_ts | date : 'yyyy-MM-dd')
+                  (value.origin_server_ts | date: 'yyyy-MM-dd') ===
+                    (message.origin_server_ts | date: 'yyyy-MM-dd')
                 "
               >
                 <div class="sender">
                   {{ value.senderName }},
-                  {{ value.origin_server_ts | date : "HH:mm" }}:
+                  {{ value.origin_server_ts | date: "HH:mm" }}:
                 </div>
                 <div>
                   <div

diff --git a/src/app/shared/modules/shared-table/shared-table.component.html b/src/app/shared/modules/shared-table/shared-table.component.html
@@ -25,7 +25,6 @@
     [length]="dataSource.count$ | async"
     [pageSize]="pageSize"
     [pageSizeOptions]="pageSizeOptions"
-    showFirstLastButtons
   >
   </mat-paginator>
   <button mat-icon-button (click)="onShare()">
@@ -142,7 +141,7 @@
         </ng-container>
         <ng-container *ngSwitchDefault class="ellipsis">
           {{
-            getPropertyByPath(row, column.id) | newDynamicPipe : column.format
+            getPropertyByPath(row, column.id) | newDynamicPipe: column.format
           }}
         </ng-container>
       </ng-container>
@@ -177,7 +176,7 @@
             <ng-container *ngSwitchDefault>
               {{
                 getPropertyByPath(row, hiddenColumn.id)
-                  | newDynamicPipe : hiddenColumn.format
+                  | newDynamicPipe: hiddenColumn.format
               }}</ng-container
             >
           </ng-container>

diff --git a/src/app/shared/modules/table/table.component.html b/src/app/shared/modules/table/table.component.html
@@ -6,9 +6,8 @@
     [length]="dataCount"
     [pageSize]="dataPerPage"
     (page)="onPageChange($event)"
-    showFirstLastButtons
     *ngIf="paginate"
-      >
+  >
   </mat-paginator>
 
   <mat-table
@@ -56,12 +55,12 @@
         </mat-header-cell>
         <div *ngIf="column.dateFormat">
           <mat-cell *matCellDef="let data">
-            {{ data[column.name] | date : column.dateFormat }}</mat-cell
+            {{ data[column.name] | date: column.dateFormat }}</mat-cell
           >
         </div>
         <div *ngIf="!column.dateFormat && column.pipe">
           <mat-cell *matCellDef="let data">
-            {{ data[column.name] | dynamicPipe : column.pipe : [] }}</mat-cell
+            {{ data[column.name] | dynamicPipe: column.pipe : [] }}</mat-cell
           >
         </div>
         <div *ngIf="!column.dateFormat && !column.pipe">