Skip to content

Commit 4dd3b81

Browse files
UI improvement: Add option to select/deselect all filters in Log Viewer drop-down (#10815)
* Update search.controller.js Minor linting update to existing code * Basic functionality for select and deselect all log level filters * Fix button texts and added localisations for languages en, en_us, da * Grammar correction of Danish localisation * Finalise button styling using the umb-button directive, including localisation of labels * Minor linting update * Add various localisations of "select all" and "deselect all" for Log Viewer * Minor refactor of select/deselect buttons to be wrapped in <umb-dropdown-item> directive * use foreach/map Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
1 parent f4504d7 commit 4dd3b81

File tree

23 files changed

+114
-3
lines changed

23 files changed

+114
-3
lines changed

src/Umbraco.Web.UI.Client/src/views/logviewer/search.controller.js

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
},
2525
{
2626
name: 'Information',
27-
logTypeColor: 'success'
27+
logTypeColor: 'success'
2828
},
2929
{
3030
name: 'Warning',
@@ -44,7 +44,7 @@
4444
enabled: false,
4545
interval: 0,
4646
promise: null,
47-
47+
4848
defaultButton: {
4949
labelKey: "logViewer_polling",
5050
handler: function() {
@@ -156,6 +156,8 @@
156156
vm.search = search;
157157
vm.getFilterName = getFilterName;
158158
vm.setLogLevelFilter = setLogLevelFilter;
159+
vm.selectAllLogLevelFilters = selectAllLogLevelFilters;
160+
vm.deselectAllLogLevelFilters = deselectAllLogLevelFilters;
159161
vm.toggleOrderBy = toggleOrderBy;
160162
vm.selectSearch = selectSearch;
161163
vm.resetSearch = resetSearch;
@@ -259,7 +261,7 @@
259261
}
260262

261263
function setLogTypeColor(logItems) {
262-
logItems.forEach(logItem =>
264+
logItems.forEach(logItem =>
263265
logItem.logTypeColor = vm.logLevels.find(x => x.name === logItem.Level).logTypeColor);
264266
}
265267

@@ -295,6 +297,24 @@
295297
getLogs();
296298
}
297299

300+
function updateAllLogLevelFilterCheckboxes(bool) {
301+
vm.logLevels.forEach(logLevel => logLevel.selected = bool);
302+
}
303+
304+
function selectAllLogLevelFilters() {
305+
vm.logOptions.logLevels = vm.logLevels.map(logLevel => logLevel.name);
306+
updateAllLogLevelFilterCheckboxes(true);
307+
308+
getLogs();
309+
}
310+
311+
function deselectAllLogLevelFilters() {
312+
vm.logOptions.logLevels = [];
313+
updateAllLogLevelFilterCheckboxes(false);
314+
315+
getLogs();
316+
}
317+
298318
function toggleOrderBy(){
299319
vm.logOptions.orderDirection = vm.logOptions.orderDirection === 'Descending' ? 'Ascending' : 'Descending';
300320

src/Umbraco.Web.UI.Client/src/views/logviewer/search.html

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,29 @@
4848
</label>
4949
</div>
5050
</umb-dropdown-item>
51+
52+
<!-- Select all log level filters -->
53+
<umb-dropdown-item>
54+
<umb-button action="vm.selectAllLogLevelFilters()"
55+
label="Select all"
56+
label-key="logViewer_selectAllLogLevelFilters"
57+
type="button"
58+
button-style="link"
59+
size="xs">
60+
</umb-button>
61+
</umb-dropdown-item>
62+
63+
<!-- Deselect all log level filters -->
64+
<umb-dropdown-item>
65+
<umb-button action="vm.deselectAllLogLevelFilters()"
66+
label="Deselect all"
67+
label-key="logViewer_deselectAllLogLevelFilters"
68+
type="button"
69+
button-style="link"
70+
size="xs">
71+
</umb-button>
72+
</umb-dropdown-item>
73+
5174
</umb-dropdown>
5275
</div>
5376

src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2195,6 +2195,8 @@
21952195
</area>
21962196
<area alias="logViewer">
21972197
<key alias="logLevels">Úrovně logování</key>
2198+
<key alias="selectAllLogLevelFilters">Vybrat vše</key>
2199+
<key alias="deselectAllLogLevelFilters">Odznačit vše</key>
21982200
<key alias="savedSearches">Uložená vyhledávání</key>
21992201
<key alias="totalItems">Celkem položek</key>
22002202
<key alias="timestamp">Časové razítko</key>

src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2544,6 +2544,8 @@ Er mwyn gweinyddu eich gwefan, agorwch swyddfa gefn Umbraco a dechreuwch ychwang
25442544
<area alias="logViewer">
25452545
<key alias="deleteSavedSearch">Dileu Chwiliad Cadwedig</key>
25462546
<key alias="logLevels">Lefelau Log</key>
2547+
<key alias="selectAllLogLevelFilters">Dewiswch y cyfan</key>
2548+
<key alias="deselectAllLogLevelFilters">Dad-ddewiswch bawb</key>
25472549
<key alias="savedSearches">Chwiliadau Cadwedig</key>
25482550
<key alias="saveSearch">Arbed Chwiliad</key>
25492551
<key alias="saveSearchDescription">Rhoi enw cyfeillgar am eich ymholiad chwilio</key>

src/Umbraco.Web.UI/Umbraco/config/lang/da.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1931,6 +1931,8 @@ Mange hilsner fra Umbraco robotten
19311931
<area alias="logViewer">
19321932
<key alias="deleteSavedSearch">Slet gemte søgning</key>
19331933
<key alias="logLevels">Log type</key>
1934+
<key alias="selectAllLogLevelFilters">Vælg alle</key>
1935+
<key alias="deselectAllLogLevelFilters">Fravælg alle</key>
19341936
<key alias="savedSearches">Gemte søgninger</key>
19351937
<key alias="saveSearch">Gem søgning</key>
19361938
<key alias="saveSearchDescription">Indtast et navn for din søgebetingelse</key>

src/Umbraco.Web.UI/Umbraco/config/lang/de.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2231,4 +2231,8 @@
22312231
<key alias="openCloseBackofficeHelp">Back-Office Hilfe öffnen / schliessen</key>
22322232
<key alias="openCloseBackofficeProfileOptions">Ihre Profil-Einstellungen öffnen / schliessen</key>
22332233
</area>
2234+
<area alias="logViewer">
2235+
<key alias="selectAllLogLevelFilters">Wählen Sie Alle</key>
2236+
<key alias="deselectAllLogLevelFilters">Alle abwählen</key>
2237+
</area>
22342238
</language>

src/Umbraco.Web.UI/Umbraco/config/lang/en.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2329,6 +2329,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
23292329
<area alias="logViewer">
23302330
<key alias="deleteSavedSearch">Delete Saved Search</key>
23312331
<key alias="logLevels">Log Levels</key>
2332+
<key alias="selectAllLogLevelFilters">Select all</key>
2333+
<key alias="deselectAllLogLevelFilters">Deselect all</key>
23322334
<key alias="savedSearches">Saved Searches</key>
23332335
<key alias="saveSearch">Save Search</key>
23342336
<key alias="saveSearchDescription">Enter a friendly name for your search query</key>

src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2348,6 +2348,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
23482348
<area alias="logViewer">
23492349
<key alias="deleteSavedSearch">Delete Saved Search</key>
23502350
<key alias="logLevels">Log Levels</key>
2351+
<key alias="selectAllLogLevelFilters">Select all</key>
2352+
<key alias="deselectAllLogLevelFilters">Deselect all</key>
23512353
<key alias="savedSearches">Saved Searches</key>
23522354
<key alias="saveSearch">Save Search</key>
23532355
<key alias="saveSearchDescription">Enter a friendly name for your search query</key>

src/Umbraco.Web.UI/Umbraco/config/lang/es.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1627,4 +1627,8 @@
16271627
<area alias="textbox">
16281628
<key alias="characters_left">caracteres restantes</key>
16291629
</area>
1630+
<area alias="logViewer">
1631+
<key alias="selectAllLogLevelFilters">Seleccionar todo</key>
1632+
<key alias="deselectAllLogLevelFilters">Deseleccionar todo</key>
1633+
</area>
16301634
</language>

src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2208,6 +2208,8 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
22082208
</area>
22092209
<area alias="logViewer">
22102210
<key alias="logLevels">Niveaux de Log</key>
2211+
<key alias="selectAllLogLevelFilters">Tout sélectionner</key>
2212+
<key alias="deselectAllLogLevelFilters">Tout déselectionner</key>
22112213
<key alias="savedSearches">Recherches sauvegardées</key>
22122214
<key alias="totalItems">Nombre total d'éléments</key>
22132215
<key alias="timestamp">Date</key>

0 commit comments

Comments
 (0)