yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Logviewer adjustments (#8513)

Browse Source
This commit is contained in:
Bjarne Fyrstenborg
2020-07-30 16:40:35 +02:00
committed by GitHub
parent 56c3d5858b
commit d1d50f2ff4
5 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/src/less/components/umb-badge.less
View File

@@ -29,6 +29,11 @@
color: @white;
}
.umb-badge--info {
background-color: @blue;
color: @white;
}
.umb-badge--warning {
background-color: @orange;
color: @white;
@@ -39,6 +44,11 @@
color: @white;
}
.umb-badge--dark {
background-color: @grayDark;
color: @white;
}
// Size
.umb-badge--xxs {
font-size: 11px;

2
src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
View File

@@ -25,7 +25,7 @@
// ChartJS Options - for count/overview of log distribution
vm.logTypeLabels = ["Debug", "Info", "Warning", "Error", "Fatal"];
vm.logTypeData = [0, 0, 0, 0, 0];
vm.logTypeColors = ['#eaddd5', '#2bc37c', '#3544b1', '#ff9412', '#d42054'];
vm.logTypeColors = ['#2e8aea', '#2bc37c', '#ff9412', '#d42054', '#343434'];
vm.chartOptions = {
legend: {
display: true,

1
src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
View File

@@ -11,6 +11,7 @@
</umb-editor-header>
<umb-editor-container>
<umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
<!-- Warning message (if unable to view log files) -->

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

@@ -16,11 +16,11 @@
vm.logLevels = [
{
name: 'Verbose',
logTypeColor: ''
logTypeColor: 'gray'
},
{
name: 'Debug',
logTypeColor: 'gray'
logTypeColor: 'info'
},
{
name: 'Information',
@@ -28,15 +28,15 @@
},
{
name: 'Warning',
logTypeColor: 'primary'
},
{
name: 'Error',
logTypeColor: 'warning'
},
{
name: 'Fatal',
name: 'Error',
logTypeColor: 'danger'
},
{
name: 'Fatal',
logTypeColor: 'dark'
}
];

59
src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
View File

@@ -23,13 +23,11 @@
<!-- Log Level filter -->
<div class="flex log-viewer-filter" style="position: relative;">
<button
type="button"
class="btn-link dropdown-toggle flex mb2 filter-toggle"
ng-click="vm.page.showLevelFilter = !vm.page.showLevelFilter"
aria-haspopup="true"
aria-expanded="{{vm.page.showLevelFilter === undefined ? false : vm.page.showLevelFilter}}"
>
<button type="button"
class="btn-link dropdown-toggle flex mb2 filter-toggle"
ng-click="vm.page.showLevelFilter = !vm.page.showLevelFilter"
aria-haspopup="true"
aria-expanded="{{vm.page.showLevelFilter === undefined ? false : vm.page.showLevelFilter}}">
<span>
<localize key="logViewer_logLevels">Log Levels</localize>:
</span>
@@ -39,7 +37,7 @@
<umb-dropdown class="pull-left" ng-if="vm.page.showLevelFilter" on-close="vm.page.showLevelFilter = false;">
<umb-dropdown-item ng-repeat="level in vm.logLevels" class="dropdown-item">
<div class="flex items-center">
<umb-checkbox input-id="loglevel-{{$index}}" name="loglevel" model="level.selected" on-change="vm.setLogLevelFilter(level)" />
<umb-checkbox input-id="loglevel-{{$index}}" name="loglevel" model="level.selected" on-change="vm.setLogLevelFilter(level)"></umb-checkbox>
<label for="loglevel-{{$index}}">
<umb-badge size="s" color="{{level.logTypeColor}}">{{level.name}}</umb-badge>
</label>
@@ -54,33 +52,34 @@
<input class="form-control search-input" type="text" ng-model="vm.logOptions.filterExpression" placeholder="Search logs..." />
<!-- Save Search & Clear Search icon buttons -->
<button class="save-search btn-reset" type="button" ng-show="vm.checkForSavedSearch()" ng-click="vm.addToSavedSearches()">
<umb-icon icon="icon-rate" class="icon-rate" aria-hidden="true"></umb-icon>
<button type="button" class="btn-reset save-search" ng-show="vm.checkForSavedSearch()" ng-click="vm.addToSavedSearches()">
<umb-icon icon="icon-rate" class="icon-rate"></umb-icon>
<localize class="sr-only" key="logViewer_saveSearch">Save Search</localize>
</button>
<button class="filter-search btn-reset" ng-show="vm.logOptions.filterExpression" ng-click="vm.resetSearch()">
<umb-icon icon="icon-wrong" class="icon-wrong" aria-hidden="true"></umb-icon>
<button type="button" class="btn-reset filter-search" ng-show="vm.logOptions.filterExpression" ng-click="vm.resetSearch()">
<umb-icon icon="icon-wrong" class="icon-wrong"></umb-icon>
<localize class="sr-only" key="logViewer_filterSearch">Filter Search</localize>
</button>
<!-- Saved Searches -->
<a class="umb-variant-switcher__toggle ng-scope" href="" ng-click="vm.dropdownOpen = !vm.dropdownOpen">
<span class="ng-binding">
<localize key="logViewer_savedSearches">Saved Searches</localize>
</span>
<umb-icon icon="icon-navigation-down" class="umb-variant-switcher__expand icon-navigation-down" ng-class="{'icon-navigation-down': !vm.dropdownOpen, 'icon-navigation-up': vm.dropdownOpen}">&nbsp;</umb-icon>
</a>
<button type="button" class="umb-variant-switcher__toggle" ng-click="vm.dropdownOpen = !vm.dropdownOpen">
<localize key="logViewer_savedSearches">Saved Searches</localize>
<umb-icon icon="{{vm.dropdownOpen ? 'icon-navigation-up' : 'icon-navigation-down'}}" class="umb-variant-switcher__expand {{vm.dropdownOpen ? 'icon-navigation-up' : 'icon-navigation-down'}}"></umb-icon>
</button>
<!-- Saved Searches Dropdown -->
<umb-dropdown ng-if="vm.dropdownOpen" class="saved-searches" on-close="vm.dropdownOpen = false" umb-keyboard-list>
<umb-dropdown-item class="umb-variant-switcher__item" ng-class="{'umb-variant-switcher_item--current': variant.active}" ng-repeat="search in vm.searches">
<a href="" class="umb-variant-switcher__name-wrapper" ng-click="vm.selectSearch(search)" prevent-default>
<button type="button" class="umb-variant-switcher__name-wrapper" ng-click="vm.selectSearch(search)">
<span class="umb-variant-switcher__name">{{search.name}}</span>
<span>{{ search.query }}</span>
</a>
<a href=""><span><i class="icon icon-trash text-error" localize="title" title="@logViewer_deleteThisSearch" ng-click="vm.deleteSavedSearch(search)"></i></span></a>
<span>{{search.query}}</span>
</button>
<button type="button" class="btn-reset" style="width: auto;" ng-click="vm.deleteSavedSearch(search)" localize="title" title="@logViewer_deleteThisSearch">
<umb-icon icon="icon-trash" class="icon-trash text-error"></umb-icon>
</button>
</umb-dropdown-item>
</umb-dropdown>
</div>
<!-- Search Button -->
@@ -101,7 +100,7 @@
<umb-load-indicator ng-if="vm.logsLoading"></umb-load-indicator>
<!-- Empty states -->
<umb-empty-state ng-if="vm.logItems.totalItems === 0" position="center">
<umb-empty-state ng-if="vm.logItems.totalItems === 0 && !vm.logsLoading" position="center">
<localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
</umb-empty-state>
@@ -158,7 +157,7 @@
<a ng-switch-when="HttpRequestNumber" ng-click="vm.findItem(key, val.Value)" localize="title" title="@logViewer_findLogsWithRequestId">{{val.Value}} <i class="icon-search"></i></a>
<a ng-switch-when="SourceContext" ng-click="vm.findItem(key, val.Value)" localize="title" title="@logViewer_findLogsWithNamespace">{{val.Value}} <i class="icon-search"></i></a>
<a ng-switch-when="MachineName" ng-click="vm.findItem(key, val.Value)" localize="title" title="@logViewer_findLogsWithMachineName">{{val.Value}} <i class="icon-search"></i></a>
<a ng-switch-when="RequestUrl" href="{{val.Value}}" target="_blank" rel="noopener" localize="title" title="@logViewer_Open">{{val.Value}} <i class="icon-link"></i></a>
<a ng-switch-when="RequestUrl" href="{{val.Value}}" target="_blank" rel="noreferrer" localize="title" title="@logViewer_Open">{{val.Value}} <i class="icon-link"></i></a>
<span ng-switch-default>{{val.Value}}</span>
</td>
</tr>
@@ -179,37 +178,37 @@
<umb-dropdown ng-if="log.searchDropdownOpen" on-close="log.searchDropdownOpen = false">
<umb-dropdown-item>
<a ng-href="https://www.google.com/search?q={{ log.RenderedMessage }}" target="_blank" localize="title" title="@logViewer_searchThisMessageWithGoogle">
<a ng-href="https://www.google.com/search?q={{ log.RenderedMessage }}" href="" target="_blank" rel="noreferrer" localize="title" title="@logViewer_searchThisMessageWithGoogle">
<img src="https://www.google.com/favicon.ico" width="16" height="16" alt="" /> <localize key="logViewer_searchWithGoogle">Search With Google</localize>
</a>
</umb-dropdown-item>
<umb-dropdown-item>
<a ng-href="https://www.bing.com/search?q={{ log.RenderedMessage }}" target="_blank" localize="title" title="@logViewer_searchThisMessageWithBing">
<a ng-href="https://www.bing.com/search?q={{ log.RenderedMessage }}" href="" target="_blank" rel="noreferrer" localize="title" title="@logViewer_searchThisMessageWithBing">
<img src="https://www.bing.com/favicon.ico" width="16" height="16" alt="" /> <localize key="logViewer_searchWithBing">Search With Bing</localize>
</a>
</umb-dropdown-item>
<umb-dropdown-item>
<a ng-href="https://our.umbraco.com/search?q={{ log.RenderedMessage }}&content=wiki,forum,documentation" target="_blank" localize="title" title="@logViewer_searchThisMessageOnOurUmbracoForumsAndDocs">
<a ng-href="https://our.umbraco.com/search?q={{ log.RenderedMessage }}&content=wiki,forum,documentation" href="" target="_blank" rel="noreferrer" localize="title" title="@logViewer_searchThisMessageOnOurUmbracoForumsAndDocs">
<img src="https://our.umbraco.com/assets/images/app-icons/favicon.png" width="16" height="16" alt="" /> <localize key="logViewer_searchOurUmbraco">Search Our Umbraco</localize>
</a>
</umb-dropdown-item>
<umb-dropdown-item>
<a ng-href="https://www.google.co.uk/?q=site:our.umbraco.com {{ log.RenderedMessage }}&safe=off#q=site:our.umbraco.com {{ log.RenderedMessage }} {{ log.Properties['SourceContext'].Value }}&safe=off" target="_blank" localize="title" title="@logViewer_searchOurUmbracoForumsUsingGoogle">
<a ng-href="https://www.google.com/?q=site:our.umbraco.com {{ log.RenderedMessage }}&safe=off#q=site:our.umbraco.com {{ log.RenderedMessage }} {{ log.Properties['SourceContext'].Value }}&safe=off" href="" target="_blank" rel="noreferrer" localize="title" title="@logViewer_searchOurUmbracoForumsUsingGoogle">
<img src="https://www.google.com/favicon.ico" width="16" height="16" alt="" /> <localize key="logViewer_searchOurUmbracoWithGoogle">Search Our Umbraco with Google</localize>
</a>
</umb-dropdown-item>
<umb-dropdown-item>
<a ng-href="https://github.com/umbraco/Umbraco-CMS/search?q={{ log.Properties['SourceContext'].Value }}" target="_blank" localize="title" title="@logViewer_searchWithinUmbracoSourceCodeOnGithub">
<a ng-href="https://github.com/umbraco/Umbraco-CMS/search?q={{ log.Properties['SourceContext'].Value }}" href="" target="_blank" rel="noreferrer" localize="title" title="@logViewer_searchWithinUmbracoSourceCodeOnGithub">
<img src="https://www.github.com/favicon.ico" width="16" height="16" alt="" /> <localize key="logViewer_searchUmbracoSource">Search Umbraco Source</localize>
</a>
</umb-dropdown-item>
<umb-dropdown-item>
<a ng-href="https://github.com/umbraco/Umbraco-CMS/issues?q={{ log.Properties['SourceContext'].Value }}" target="_blank" localize="title" title="@logViewer_searchUmbracoIssuesOnGithub">
<a ng-href="https://github.com/umbraco/Umbraco-CMS/issues?q={{ log.Properties['SourceContext'].Value }}" href="" target="_blank" rel="noreferrer" localize="title" title="@logViewer_searchUmbracoIssuesOnGithub">
<img src="https://www.github.com/favicon.ico" width="16" height="16" alt="" /> <localize key="logViewer_searchUmbracoIssues">Search Umbraco Issues</localize>
</a>
</umb-dropdown-item>