From 8b52e6fc44c9ebe04d9f012c39b0d9ea4961c215 Mon Sep 17 00:00:00 2001 From: Michael Bromley Date: Mon, 28 Aug 2023 10:07:06 +0200 Subject: [PATCH] feat(admin-ui): Implement filter preset renaming --- packages/admin-ui/i18n-coverage.json | 66 +++++++++---------- .../data-table-filter-presets.component.html | 4 ++ .../data-table-filter-presets.component.ts | 27 +++++++- .../filter-preset.service.ts | 12 ++++ .../rename-filter-preset-dialog.component.css | 0 ...rename-filter-preset-dialog.component.html | 11 ++++ .../rename-filter-preset-dialog.component.ts | 18 +++++ .../src/lib/core/src/shared/shared.module.ts | 2 + .../src/lib/static/i18n-messages/ar.json | 1 + .../src/lib/static/i18n-messages/cs.json | 1 + .../src/lib/static/i18n-messages/de.json | 1 + .../src/lib/static/i18n-messages/en.json | 1 + .../src/lib/static/i18n-messages/es.json | 1 + .../src/lib/static/i18n-messages/fr.json | 1 + .../src/lib/static/i18n-messages/he.json | 1 + .../src/lib/static/i18n-messages/it.json | 1 + .../src/lib/static/i18n-messages/pl.json | 1 + .../src/lib/static/i18n-messages/pt_BR.json | 1 + .../src/lib/static/i18n-messages/pt_PT.json | 1 + .../src/lib/static/i18n-messages/ru.json | 1 + .../src/lib/static/i18n-messages/uk.json | 1 + .../src/lib/static/i18n-messages/zh_Hans.json | 1 + .../src/lib/static/i18n-messages/zh_Hant.json | 1 + 23 files changed, 121 insertions(+), 34 deletions(-) create mode 100644 packages/admin-ui/src/lib/core/src/shared/components/data-table-filter-presets/rename-filter-preset-dialog.component.css create mode 100644 packages/admin-ui/src/lib/core/src/shared/components/data-table-filter-presets/rename-filter-preset-dialog.component.html create mode 100644 packages/admin-ui/src/lib/core/src/shared/components/data-table-filter-presets/rename-filter-preset-dialog.component.ts diff --git a/packages/admin-ui/i18n-coverage.json b/packages/admin-ui/i18n-coverage.json index de83ddcf06..0312e93668 100644 --- a/packages/admin-ui/i18n-coverage.json +++ b/packages/admin-ui/i18n-coverage.json @@ -1,80 +1,80 @@ { - "generatedOn": "2023-08-25T13:17:19.387Z", - "lastCommit": "8deb17927b4fc69c2602c82ed722a0980026e698", + "generatedOn": "2023-08-28T07:56:15.924Z", + "lastCommit": "0c5ce7d43ecbaf67da4254c25fe3562626072844", "translationStatus": { "ar": { - "tokenCount": 745, - "translatedCount": 743, + "tokenCount": 746, + "translatedCount": 745, "percentage": 100 }, "cs": { - "tokenCount": 745, - "translatedCount": 548, + "tokenCount": 746, + "translatedCount": 550, "percentage": 74 }, "de": { - "tokenCount": 745, - "translatedCount": 743, + "tokenCount": 746, + "translatedCount": 745, "percentage": 100 }, "en": { - "tokenCount": 745, - "translatedCount": 743, + "tokenCount": 746, + "translatedCount": 745, "percentage": 100 }, "es": { - "tokenCount": 745, - "translatedCount": 743, + "tokenCount": 746, + "translatedCount": 745, "percentage": 100 }, "fr": { - "tokenCount": 745, - "translatedCount": 739, + "tokenCount": 746, + "translatedCount": 741, "percentage": 99 }, "he": { - "tokenCount": 745, - "translatedCount": 743, + "tokenCount": 746, + "translatedCount": 745, "percentage": 100 }, "it": { - "tokenCount": 745, - "translatedCount": 573, + "tokenCount": 746, + "translatedCount": 575, "percentage": 77 }, "pl": { - "tokenCount": 745, - "translatedCount": 383, - "percentage": 51 + "tokenCount": 746, + "translatedCount": 385, + "percentage": 52 }, "pt_BR": { - "tokenCount": 745, - "translatedCount": 742, + "tokenCount": 746, + "translatedCount": 744, "percentage": 100 }, "pt_PT": { - "tokenCount": 745, - "translatedCount": 582, + "tokenCount": 746, + "translatedCount": 584, "percentage": 78 }, "ru": { - "tokenCount": 745, - "translatedCount": 743, + "tokenCount": 746, + "translatedCount": 745, "percentage": 100 }, "uk": { - "tokenCount": 745, - "translatedCount": 572, + "tokenCount": 746, + "translatedCount": 574, "percentage": 77 }, "zh_Hans": { - "tokenCount": 745, - "translatedCount": 518, + "tokenCount": 746, + "translatedCount": 520, "percentage": 70 }, "zh_Hant": { - "tokenCount": 745, - "translatedCount": 363, + "tokenCount": 746, + "translatedCount": 365, "percentage": 49 } } diff --git a/packages/admin-ui/src/lib/core/src/shared/components/data-table-filter-presets/data-table-filter-presets.component.html b/packages/admin-ui/src/lib/core/src/shared/components/data-table-filter-presets/data-table-filter-presets.component.html index fb573286b5..ec22b2e33b 100644 --- a/packages/admin-ui/src/lib/core/src/shared/components/data-table-filter-presets/data-table-filter-presets.component.html +++ b/packages/admin-ui/src/lib/core/src/shared/components/data-table-filter-presets/data-table-filter-presets.component.html @@ -28,6 +28,10 @@ + + diff --git a/packages/admin-ui/src/lib/core/src/shared/components/data-table-filter-presets/rename-filter-preset-dialog.component.ts b/packages/admin-ui/src/lib/core/src/shared/components/data-table-filter-presets/rename-filter-preset-dialog.component.ts new file mode 100644 index 0000000000..a274c7cc57 --- /dev/null +++ b/packages/admin-ui/src/lib/core/src/shared/components/data-table-filter-presets/rename-filter-preset-dialog.component.ts @@ -0,0 +1,18 @@ +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; +import { FilterPresetService } from '@vendure/admin-ui/core'; +import { Dialog } from '../../../providers/modal/modal.types'; + +@Component({ + selector: 'vdr-rename-filter-preset-dialog', + templateUrl: './rename-filter-preset-dialog.component.html', + styleUrls: ['./rename-filter-preset-dialog.component.css'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class RenameFilterPresetDialogComponent implements Dialog { + name: string; + resolveWith: (result?: string) => void; + + rename() { + this.resolveWith(this.name); + } +} diff --git a/packages/admin-ui/src/lib/core/src/shared/shared.module.ts b/packages/admin-ui/src/lib/core/src/shared/shared.module.ts index 58a6c543e6..e131035308 100644 --- a/packages/admin-ui/src/lib/core/src/shared/shared.module.ts +++ b/packages/admin-ui/src/lib/core/src/shared/shared.module.ts @@ -173,6 +173,7 @@ import { CurrencyCodeSelectorComponent } from './components/currency-code-select import { LanguageCodeSelectorComponent } from './components/language-code-selector/language-code-selector.component'; import { DataTableFilterPresetsComponent } from './components/data-table-filter-presets/data-table-filter-presets.component'; import { AddFilterPresetButtonComponent } from './components/data-table-filter-presets/add-filter-preset-button.component'; +import { RenameFilterPresetDialogComponent } from './components/data-table-filter-presets/rename-filter-preset-dialog.component'; const IMPORTS = [ ClarityModule, @@ -353,6 +354,7 @@ const DYNAMIC_FORM_INPUTS = [ ...DYNAMIC_FORM_INPUTS, DataTableFilterPresetsComponent, AddFilterPresetButtonComponent, + RenameFilterPresetDialogComponent, ], providers: [ // This needs to be shared, since lazy-loaded diff --git a/packages/admin-ui/src/lib/static/i18n-messages/ar.json b/packages/admin-ui/src/lib/static/i18n-messages/ar.json index d8a524aadc..2cda5e230b 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/ar.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/ar.json @@ -302,6 +302,7 @@ "remove": "إزالة", "remove-from-channel": "إزالة من القناة الحالية", "remove-item-from-list": "إزالة العنصر من القائمة", + "rename-filter-preset": "إعادة تسمية الضبط", "reset-columns": "إعادة تعيين الأعمدة", "results-count": "{ count } {count, plural, one {نتيجة واحدة} other {من النتائج}}", "sample-formatting": "تنسيق العينة", diff --git a/packages/admin-ui/src/lib/static/i18n-messages/cs.json b/packages/admin-ui/src/lib/static/i18n-messages/cs.json index 1ede4db3aa..ef6d7d1b7b 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/cs.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/cs.json @@ -302,6 +302,7 @@ "remove": "Smazat", "remove-from-channel": "", "remove-item-from-list": "Odebrat položku ze seznamu", + "rename-filter-preset": "Přejmenovat předvolbu", "reset-columns": "", "results-count": "{ count } {count, plural, one {výsledek} other {výsledků/y}}", "sample-formatting": "", diff --git a/packages/admin-ui/src/lib/static/i18n-messages/de.json b/packages/admin-ui/src/lib/static/i18n-messages/de.json index 7d957b4524..859780f35a 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/de.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/de.json @@ -302,6 +302,7 @@ "remove": "Entfernen", "remove-from-channel": "Aus dem Kanal entfernen", "remove-item-from-list": "Artikel von Liste entfernen", + "rename-filter-preset": "Voreinstellung umbenennen", "reset-columns": "Spalten zurücksetzen", "results-count": "{ count } {count, plural, one {Ergebnis} other {Ergebnisse}}", "sample-formatting": "Beispiel Formatierung", diff --git a/packages/admin-ui/src/lib/static/i18n-messages/en.json b/packages/admin-ui/src/lib/static/i18n-messages/en.json index a8ddc658fa..825942c74a 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/en.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/en.json @@ -302,6 +302,7 @@ "remove": "Remove", "remove-from-channel": "Remove from current channel", "remove-item-from-list": "Remove item from list", + "rename-filter-preset": "Rename preset", "reset-columns": "Reset columns", "results-count": "{ count } {count, plural, one {result} other {results}}", "sample-formatting": "Sample formatting", diff --git a/packages/admin-ui/src/lib/static/i18n-messages/es.json b/packages/admin-ui/src/lib/static/i18n-messages/es.json index 8d050583a3..17f3595c90 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/es.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/es.json @@ -302,6 +302,7 @@ "remove": "Borrar", "remove-from-channel": "Borrar del canal", "remove-item-from-list": "Eliminar elemento de la lista", + "rename-filter-preset": "Renombrar preestablecido", "reset-columns": "Reajustar las columnas al estado inicial", "results-count": "{ count } {count, plural, one {resultado} other {resultados}}", "sample-formatting": "Formato de ejemplo", diff --git a/packages/admin-ui/src/lib/static/i18n-messages/fr.json b/packages/admin-ui/src/lib/static/i18n-messages/fr.json index 8e69d6083e..ec5db6703a 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/fr.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/fr.json @@ -302,6 +302,7 @@ "remove": "Retirer", "remove-from-channel": "Retirer du canal", "remove-item-from-list": "Retirer l'article de la liste", + "rename-filter-preset": "Renommer le préréglage", "reset-columns": "RAZ colonnes", "results-count": "{ count } {count, plural, one {result} other {results}}", "sample-formatting": "Exemple de mise en forme", diff --git a/packages/admin-ui/src/lib/static/i18n-messages/he.json b/packages/admin-ui/src/lib/static/i18n-messages/he.json index 7571495f17..60504e4aac 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/he.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/he.json @@ -302,6 +302,7 @@ "remove": "הסר", "remove-from-channel": "הסר מהערוץ הנוכחי", "remove-item-from-list": "הסר פריט מהרשימה", + "rename-filter-preset": "שינוי שם להגדרה", "reset-columns": "אפס עמודות", "results-count": "{ count } {count, plural, one {תוצאה} other {תוצאות}}", "sample-formatting": "פורמט דוגמא", diff --git a/packages/admin-ui/src/lib/static/i18n-messages/it.json b/packages/admin-ui/src/lib/static/i18n-messages/it.json index de5daf96a7..0ab3f00897 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/it.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/it.json @@ -302,6 +302,7 @@ "remove": "Rimuovi", "remove-from-channel": "", "remove-item-from-list": "Rimuovi elemento dalla lista", + "rename-filter-preset": "Rinomina preimpostazione", "reset-columns": "", "results-count": "{ count } {count, plural, one {risultato} other {risultati}}", "sample-formatting": "", diff --git a/packages/admin-ui/src/lib/static/i18n-messages/pl.json b/packages/admin-ui/src/lib/static/i18n-messages/pl.json index f88ccc6e00..6fb901479f 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/pl.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/pl.json @@ -302,6 +302,7 @@ "remove": "Usuń", "remove-from-channel": "", "remove-item-from-list": "", + "rename-filter-preset": "Zmień nazwę preselekcji", "reset-columns": "", "results-count": "{ count } {count, plural, one {wynik} other {wyników}}", "sample-formatting": "", diff --git a/packages/admin-ui/src/lib/static/i18n-messages/pt_BR.json b/packages/admin-ui/src/lib/static/i18n-messages/pt_BR.json index d075c658db..7f278918ce 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/pt_BR.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/pt_BR.json @@ -302,6 +302,7 @@ "remove": "Exclui", "remove-from-channel": "Remover do canal atual", "remove-item-from-list": "Remover item da lista", + "rename-filter-preset": "Renomear predefinição", "reset-columns": "Redefinir colunas", "results-count": "{ count } {count, plural, one {resultado} other {resultados}}", "sample-formatting": "Formataçāo simples", diff --git a/packages/admin-ui/src/lib/static/i18n-messages/pt_PT.json b/packages/admin-ui/src/lib/static/i18n-messages/pt_PT.json index f22a1921f1..ad5cca86a5 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/pt_PT.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/pt_PT.json @@ -302,6 +302,7 @@ "remove": "Eliminar", "remove-from-channel": "", "remove-item-from-list": "Remover item da lista", + "rename-filter-preset": "Renomear predefinição", "reset-columns": "", "results-count": "{ count } {count, plural, one {resultado} other {resultados}}", "sample-formatting": "Formatação de amostra", diff --git a/packages/admin-ui/src/lib/static/i18n-messages/ru.json b/packages/admin-ui/src/lib/static/i18n-messages/ru.json index c596f9d136..ea02c0d2ff 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/ru.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/ru.json @@ -302,6 +302,7 @@ "remove": "Удалить", "remove-from-channel": "Удалить из канала", "remove-item-from-list": "Удалить позицию из списка", + "rename-filter-preset": "Переименовать пресет", "reset-columns": "Сброс колонок", "results-count": "{ count } {count, plural, one {результат} other {результатов}}", "sample-formatting": "Пример форматирования", diff --git a/packages/admin-ui/src/lib/static/i18n-messages/uk.json b/packages/admin-ui/src/lib/static/i18n-messages/uk.json index be246675d6..b124067d83 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/uk.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/uk.json @@ -302,6 +302,7 @@ "remove": "Видалити", "remove-from-channel": "", "remove-item-from-list": "Видалити позицію зі списку", + "rename-filter-preset": "Перейменувати пресет", "reset-columns": "", "results-count": "{ count } {count, plural, one {результат} other {результатів}}", "sample-formatting": "", diff --git a/packages/admin-ui/src/lib/static/i18n-messages/zh_Hans.json b/packages/admin-ui/src/lib/static/i18n-messages/zh_Hans.json index 7e1fd0b89f..03e9dfbd22 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/zh_Hans.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/zh_Hans.json @@ -302,6 +302,7 @@ "remove": "删除", "remove-from-channel": "", "remove-item-from-list": "从列表中移除", + "rename-filter-preset": "重命名预设", "reset-columns": "", "results-count": "{count, plural, =0{无} other {{count}个过滤结果}}", "sample-formatting": "", diff --git a/packages/admin-ui/src/lib/static/i18n-messages/zh_Hant.json b/packages/admin-ui/src/lib/static/i18n-messages/zh_Hant.json index 5703fd1d53..1d1d16dcf5 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/zh_Hant.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/zh_Hant.json @@ -302,6 +302,7 @@ "remove": "移除", "remove-from-channel": "", "remove-item-from-list": "", + "rename-filter-preset": "重新命名預設", "reset-columns": "", "results-count": "{count, plural, =0{無} other {{count}個篩選結果}}", "sample-formatting": "",