diff --git a/console/src/app/modules/filter-events/filter-events.component.html b/console/src/app/modules/filter-events/filter-events.component.html index ed1943b51..2913d7661 100644 --- a/console/src/app/modules/filter-events/filter-events.component.html +++ b/console/src/app/modules/filter-events/filter-events.component.html @@ -34,7 +34,7 @@ {{ 'FILTER.TITLE' | translate }}
diff --git a/console/src/app/modules/filter/filter.component.html b/console/src/app/modules/filter/filter.component.html index 38e257917..35122a6aa 100644 --- a/console/src/app/modules/filter/filter.component.html +++ b/console/src/app/modules/filter/filter.component.html @@ -23,7 +23,7 @@
{{ 'FILTER.TITLE' | translate }} - +
diff --git a/console/src/app/pages/users/user-list/user-table/user-table.component.ts b/console/src/app/pages/users/user-list/user-table/user-table.component.ts index 018c8043d..2eb694866 100644 --- a/console/src/app/pages/users/user-list/user-table/user-table.component.ts +++ b/console/src/app/pages/users/user-list/user-table/user-table.component.ts @@ -96,7 +96,10 @@ export class UserTableComponent implements OnInit { ngOnInit(): void { this.route.queryParams.pipe(take(1)).subscribe((params) => { - this.getData(this.INITIAL_PAGE_SIZE, 0, this.type); + if (!params['filter']) { + this.getData(this.INITIAL_PAGE_SIZE, 0, this.type, this.searchQueries); + } + if (params['deferredReload']) { setTimeout(() => { this.getData(this.paginator.pageSize, this.paginator.pageIndex * this.paginator.pageSize, this.type); @@ -116,7 +119,7 @@ export class UserTableComponent implements OnInit { queryParamsHandling: 'merge', skipLocationChange: false, }); - this.getData(this.paginator.pageSize, this.paginator.pageIndex * this.paginator.pageSize, this.type); + this.getData(this.paginator.pageSize, this.paginator.pageIndex * this.paginator.pageSize, this.type, this.searchQueries); } public isAllSelected(): boolean { @@ -131,7 +134,7 @@ export class UserTableComponent implements OnInit { public changePage(event: PageEvent): void { this.selection.clear(); - this.getData(event.pageSize, event.pageIndex * event.pageSize, this.type); + this.getData(event.pageSize, event.pageIndex * event.pageSize, this.type, this.searchQueries); } public deactivateSelectedUsers(): void { diff --git a/console/src/assets/i18n/bg.json b/console/src/assets/i18n/bg.json index 941b6c395..a021a96c8 100644 --- a/console/src/assets/i18n/bg.json +++ b/console/src/assets/i18n/bg.json @@ -497,7 +497,8 @@ "TABLE": { "SHOWUSER": "Покажи потребител {{value}}" }, - "DOWNLOAD": "Изтегляне" + "DOWNLOAD": "Изтегляне", + "APPLY": "Прилагам" }, "MEMBERROLES": { "IAM_OWNER": "Има контрол върху цялата инстанция, включително всички организации", diff --git a/console/src/assets/i18n/cs.json b/console/src/assets/i18n/cs.json index 7672272e0..b9724cfb7 100644 --- a/console/src/assets/i18n/cs.json +++ b/console/src/assets/i18n/cs.json @@ -498,7 +498,8 @@ "TABLE": { "SHOWUSER": "Zobrazit uživatele {{value}}" }, - "DOWNLOAD": "Stáhnout" + "DOWNLOAD": "Stáhnout", + "APPLY": "Platit" }, "MEMBERROLES": { "IAM_OWNER": "Má kontrolu nad celou instancí, včetně všech organizací", diff --git a/console/src/assets/i18n/de.json b/console/src/assets/i18n/de.json index a1ea2d2ae..322fef696 100644 --- a/console/src/assets/i18n/de.json +++ b/console/src/assets/i18n/de.json @@ -498,7 +498,8 @@ "TABLE": { "SHOWUSER": "Zeige Benutzer {{value}}" }, - "DOWNLOAD": "Herunterladen" + "DOWNLOAD": "Herunterladen", + "APPLY": "Anwenden" }, "MEMBERROLES": { "IAM_OWNER": "Hat die Kontrolle über die gesamte Instanz, einschließlich aller Organisationen", diff --git a/console/src/assets/i18n/en.json b/console/src/assets/i18n/en.json index df622361e..240eee8c2 100644 --- a/console/src/assets/i18n/en.json +++ b/console/src/assets/i18n/en.json @@ -498,7 +498,8 @@ "TABLE": { "SHOWUSER": "Show user {{value}}" }, - "DOWNLOAD": "Download" + "DOWNLOAD": "Download", + "APPLY": "Apply" }, "MEMBERROLES": { "IAM_OWNER": "Has control over the whole instance, including all organizations", diff --git a/console/src/assets/i18n/es.json b/console/src/assets/i18n/es.json index 9df4fa127..80240d8b1 100644 --- a/console/src/assets/i18n/es.json +++ b/console/src/assets/i18n/es.json @@ -498,7 +498,8 @@ "TABLE": { "SHOWUSER": "Mostrar usuario {{value}}" }, - "DOWNLOAD": "Descargar" + "DOWNLOAD": "Descargar", + "APPLY": "Aplicar" }, "MEMBERROLES": { "IAM_OWNER": "Tiene control sobre toda la instancia, incluyendo todas las organizaciones", diff --git a/console/src/assets/i18n/fr.json b/console/src/assets/i18n/fr.json index a6ed4390f..4e18bdd10 100644 --- a/console/src/assets/i18n/fr.json +++ b/console/src/assets/i18n/fr.json @@ -498,7 +498,8 @@ "TABLE": { "SHOWUSER": "Afficher l'utilisateur {{value}}" }, - "DOWNLOAD": "Télécharger" + "DOWNLOAD": "Télécharger", + "APPLY": "Appliquer" }, "MEMBERROLES": { "IAM_OWNER": "A le contrôle de toute l'instance, y compris toutes les organisations", diff --git a/console/src/assets/i18n/it.json b/console/src/assets/i18n/it.json index b29d38fb7..790b52bed 100644 --- a/console/src/assets/i18n/it.json +++ b/console/src/assets/i18n/it.json @@ -497,7 +497,8 @@ "TABLE": { "SHOWUSER": "Mostra utente {{value}}" }, - "DOWNLOAD": "Scarica" + "DOWNLOAD": "Scarica", + "APPLY": "Applicare" }, "MEMBERROLES": { "IAM_OWNER": "Ha il controllo sull'intera istanza, comprese tutte le organizzazioni", diff --git a/console/src/assets/i18n/ja.json b/console/src/assets/i18n/ja.json index fcd8bb736..900eb467a 100644 --- a/console/src/assets/i18n/ja.json +++ b/console/src/assets/i18n/ja.json @@ -498,7 +498,8 @@ "TABLE": { "SHOWUSER": "ユーザー {{value}} を表示する" }, - "DOWNLOAD": "ダウンロード" + "DOWNLOAD": "ダウンロード", + "APPLY": "アプライ" }, "MEMBERROLES": { "IAM_OWNER": "すべての組織を含むインスタンス全体を管理する権限を持ちます", diff --git a/console/src/assets/i18n/mk.json b/console/src/assets/i18n/mk.json index fb55e1743..03f41d3a2 100644 --- a/console/src/assets/i18n/mk.json +++ b/console/src/assets/i18n/mk.json @@ -498,7 +498,8 @@ "TABLE": { "SHOWUSER": "Прикажи корисник {{value}}" }, - "DOWNLOAD": "Преземи" + "DOWNLOAD": "Преземи", + "APPLY": "Пријавете се" }, "MEMBERROLES": { "IAM_OWNER": "Има контрола врз целата инстанца, вклучувајќи ги сите организации", diff --git a/console/src/assets/i18n/nl.json b/console/src/assets/i18n/nl.json index 694549eb9..31ec1a2b9 100644 --- a/console/src/assets/i18n/nl.json +++ b/console/src/assets/i18n/nl.json @@ -498,7 +498,8 @@ "TABLE": { "SHOWUSER": "Toon gebruiker {{value}}" }, - "DOWNLOAD": "Download" + "DOWNLOAD": "Download", + "APPLY": "Toepassen" }, "MEMBERROLES": { "IAM_OWNER": "Heeft controle over de hele instantie, inclusief alle organisaties", diff --git a/console/src/assets/i18n/pl.json b/console/src/assets/i18n/pl.json index aa3a39805..f313b964c 100644 --- a/console/src/assets/i18n/pl.json +++ b/console/src/assets/i18n/pl.json @@ -497,7 +497,8 @@ "TABLE": { "SHOWUSER": "Pokaż użytkownika {{value}}" }, - "DOWNLOAD": "Pobierz" + "DOWNLOAD": "Pobierz", + "APPLY": "Stosować" }, "MEMBERROLES": { "IAM_OWNER": "Ma kontrolę nad całą instancją, włącznie z wszystkimi organizacjami", diff --git a/console/src/assets/i18n/pt.json b/console/src/assets/i18n/pt.json index ff878b3ce..32fcae625 100644 --- a/console/src/assets/i18n/pt.json +++ b/console/src/assets/i18n/pt.json @@ -498,7 +498,8 @@ "TABLE": { "SHOWUSER": "Mostrar usuário {{value}}" }, - "DOWNLOAD": "Baixar" + "DOWNLOAD": "Baixar", + "APPLY": "Aplicar" }, "MEMBERROLES": { "IAM_OWNER": "Tem controle sobre toda a instância, incluindo todas as organizações", diff --git a/console/src/assets/i18n/ru.json b/console/src/assets/i18n/ru.json index 6c5690071..c4a1ac7fc 100644 --- a/console/src/assets/i18n/ru.json +++ b/console/src/assets/i18n/ru.json @@ -497,7 +497,8 @@ "TABLE": { "SHOWUSER": "Показать пользователя {{value}}" }, - "DOWNLOAD": "Скачать" + "DOWNLOAD": "Скачать", + "APPLY": "Применять" }, "MEMBERROLES": { "IAM_OWNER": "Имеет контроль над всем экземпляром, включая все организации", diff --git a/console/src/assets/i18n/sv.json b/console/src/assets/i18n/sv.json index 725f094bf..a3ff1041d 100644 --- a/console/src/assets/i18n/sv.json +++ b/console/src/assets/i18n/sv.json @@ -498,7 +498,8 @@ "TABLE": { "SHOWUSER": "Visa användare {{value}}" }, - "DOWNLOAD": "Ladda ner" + "DOWNLOAD": "Ladda ner", + "APPLY": "Tillämpa" }, "MEMBERROLES": { "IAM_OWNER": "Har kontroll över hela instansen, inklusive alla organisationer", diff --git a/console/src/assets/i18n/zh.json b/console/src/assets/i18n/zh.json index 2a1de447d..632c16bb0 100644 --- a/console/src/assets/i18n/zh.json +++ b/console/src/assets/i18n/zh.json @@ -498,7 +498,8 @@ "TABLE": { "SHOWUSER": "Show user {{value}}" }, - "DOWNLOAD": "下载" + "DOWNLOAD": "下载", + "APPLY": "申请" }, "MEMBERROLES": { "IAM_OWNER": "控制整个实例,包括所有组织",