Show page report in paginator, mark svcs as readonly (#253)

* feat: show page report in paginator, mark svcs as readonly * feat: adjust translations --------- Co-authored-by: Christian Badura <[email protected]>
onecx · Oct 1, 2024 · 047886b · 047886b
1 parent b844b23
commit 047886b
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 4 deletions.
diff --git a/src/app/product-store/app-search/app-search.component.html b/src/app/product-store/app-search/app-search.component.html
@@ -89,6 +89,8 @@
       [filterBy]="filterValueDefault"
       [sortField]="sortField"
       [sortOrder]="sortOrder"
+      [showCurrentPageReport]="true"
+      currentPageReportTemplate="{first} - {last} {{ 'ACTIONS.SEARCH.OF' | translate }} {totalRecords}"
     >
       <ng-template pTemplate="header">
         <div class="flex flex-wrap align-items-center mx-1">

diff --git a/src/app/product-store/product-search/product-search.component.html b/src/app/product-store/product-search/product-search.component.html
@@ -65,6 +65,8 @@
       filterBy="name,displayName,classification"
       [sortField]="sortField"
       [sortOrder]="sortOrder"
+      [showCurrentPageReport]="true"
+      currentPageReportTemplate="{first} - {last} {{ 'ACTIONS.SEARCH.OF' | translate }} {totalRecords}"
     >
       <ng-template pTemplate="header">
         <ocx-data-view-controls

diff --git a/src/app/product-store/slot-search/slot-search.component.html b/src/app/product-store/slot-search/slot-search.component.html
@@ -51,6 +51,8 @@
       [rows]="20"
       [sortField]="sortField"
       [sortOrder]="sortOrder"
+      [showCurrentPageReport]="true"
+      currentPageReportTemplate="{first} - {last} {{ 'ACTIONS.SEARCH.OF' | translate }} {totalRecords}"
     >
       <ng-template pTemplate="header">
         <ocx-data-view-controls

diff --git a/src/app/shared/image-container/image-container.component.ts b/src/app/shared/image-container/image-container.component.ts
@@ -30,7 +30,7 @@ export class ImageContainerComponent implements OnChanges {
 
   prepareUrlPath = prepareUrlPath
 
-  constructor(private appState: AppStateService) {
+  constructor(private readonly appState: AppStateService) {
     this.defaultImageUrl$ = appState.currentMfe$.pipe(
       map((mfe) => {
         return this.prepareUrlPath(mfe.remoteBaseUrl, environment.DEFAULT_LOGO_PATH)

diff --git a/src/app/shared/label.resolver.ts b/src/app/shared/label.resolver.ts
@@ -6,7 +6,7 @@ import { Observable, map } from 'rxjs'
 //dont use `providedIn root` - wont work when we are in shell
 @Injectable()
 export class LabelResolver implements Resolve<string> {
-  constructor(private translate: TranslateService) {}
+  constructor(private readonly translate: TranslateService) {}
   resolve(route: ActivatedRouteSnapshot, _state: RouterStateSnapshot): string | Observable<string> | Promise<string> {
     return route.data['breadcrumb']
       ? this.translate.get(route.data['breadcrumb']).pipe(map((t) => t.toString()))

diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
@@ -133,7 +133,8 @@
         "NOT_EXISTS": "Eine Applikation mit diesem Namen konnte nicht gefunden werden.",
         "LOAD_ERROR": "Applikation konnte nicht geladen werden",
         "NOT_FOUND": "Applikation nicht gefunden"
-      }
+      },
+      "OF": "von"
     },
     "VIEW": {
       "LABEL": "Ansehen",

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -133,7 +133,8 @@
         "NOT_EXISTS": "An Application with this name could not be found.",
         "LOAD_ERROR": "Failed to load the Application",
         "NOT_FOUND": "Application was not found"
-      }
+      },
+      "OF": "of"
     },
     "VIEW": {
       "LABEL": "View",