mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
* Part1: Unicons implementation (#23197)
* Create a new Icon component
* Update icons in main sidebar
* Update icons in Useful links and in react components on main site
* Update icons in Useful links and in main top navigation
* Adjust sizing
* Update panel navigation and timepicker
* Update icons in Panel menu
* NewPanelEditor: Fixed so that test alert rule works in new edit mode (#23179)
* Update icons in add panel widget
* Resolve merge conflict
* Fix part of the test errors and type errors
* Fix storybook errors
* Update getAvailableIcons import in storybook knobs
* Fix import path
* Fix SyntaxError: Cannot use import statement outside a module in test environment error
* Remove dynamic imports
* Remove types as using @ts-ignore
* Update snapshot test
* Add @iconscout/react-unicons to the shouldExclude list as it is blundled with es2015 syntax
* Remove color prop from icon, remove color implemetation in mono icons
* Update navbar styling
* Move toPascalCase to utils/string
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
* Resolve type errors resulted from merge
* Part2: Unicons implementation (#23266)
* Create a new Icon component
* Update icons in main sidebar
* Update icons in Useful links and in react components on main site
* Update icons in Useful links and in main top navigation
* Adjust sizing
* Update panel navigation and timepicker
* Update icons in Panel menu
* Update icons in add panel widget
* Resolve merge conflict
* Fix part of the test errors and type errors
* Fix storybook errors
* Update getAvailableIcons import in storybook knobs
* Fix import path
* Fix SyntaxError: Cannot use import statement outside a module in test environment error
* Remove dynamic imports
* Remove types as using @ts-ignore
* Update snapshot test
* Add @iconscout/react-unicons to the shouldExclude list as it is blundled with es2015 syntax
* Implment icons in Tabs
* Implement icons in search items and empty list
* Update buttons
* Update button-related snapshot tests
* Update icons in modals and page headers
* Create anfular wrapper and update all icons on search screen
* Update sizing, remove colors, update snapshot tests
* Remove color prop from icon, remove color implemetation in mono icons
* Remove color props from monochrome icons
* Complete update of icons for search screen
* Update icons for infor tooltips, playlist, permissions
* Support temporarly font awesome icons used in enterprise grafana
* Part1: Unicons implementation (#23197)
* Create a new Icon component
* Update icons in main sidebar
* Update icons in Useful links and in react components on main site
* Update icons in Useful links and in main top navigation
* Adjust sizing
* Update panel navigation and timepicker
* Update icons in Panel menu
* NewPanelEditor: Fixed so that test alert rule works in new edit mode (#23179)
* Update icons in add panel widget
* Resolve merge conflict
* Fix part of the test errors and type errors
* Fix storybook errors
* Update getAvailableIcons import in storybook knobs
* Fix import path
* Fix SyntaxError: Cannot use import statement outside a module in test environment error
* Remove dynamic imports
* Remove types as using @ts-ignore
* Update snapshot test
* Add @iconscout/react-unicons to the shouldExclude list as it is blundled with es2015 syntax
* Remove color prop from icon, remove color implemetation in mono icons
* Update navbar styling
* Move toPascalCase to utils/string
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
* Icons update
* Add optional chaining to for isFontAwesome variable
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
* Part3: Unicons implementation (#23356)
* Create a new Icon component
* Update icons in main sidebar
* Update icons in Useful links and in react components on main site
* Update icons in Useful links and in main top navigation
* Adjust sizing
* Update panel navigation and timepicker
* Update icons in Panel menu
* Update icons in add panel widget
* Resolve merge conflict
* Fix part of the test errors and type errors
* Fix storybook errors
* Update getAvailableIcons import in storybook knobs
* Fix import path
* Fix SyntaxError: Cannot use import statement outside a module in test environment error
* Remove dynamic imports
* Remove types as using @ts-ignore
* Update snapshot test
* Add @iconscout/react-unicons to the shouldExclude list as it is blundled with es2015 syntax
* Implment icons in Tabs
* Implement icons in search items and empty list
* Update buttons
* Update button-related snapshot tests
* Update icons in modals and page headers
* Create anfular wrapper and update all icons on search screen
* Update sizing, remove colors, update snapshot tests
* Remove color prop from icon, remove color implemetation in mono icons
* Remove color props from monochrome icons
* Complete update of icons for search screen
* Update icons for infor tooltips, playlist, permissions
* Support temporarly font awesome icons used in enterprise grafana
* Part1: Unicons implementation (#23197)
* Create a new Icon component
* Update icons in main sidebar
* Update icons in Useful links and in react components on main site
* Update icons in Useful links and in main top navigation
* Adjust sizing
* Update panel navigation and timepicker
* Update icons in Panel menu
* NewPanelEditor: Fixed so that test alert rule works in new edit mode (#23179)
* Update icons in add panel widget
* Resolve merge conflict
* Fix part of the test errors and type errors
* Fix storybook errors
* Update getAvailableIcons import in storybook knobs
* Fix import path
* Fix SyntaxError: Cannot use import statement outside a module in test environment error
* Remove dynamic imports
* Remove types as using @ts-ignore
* Update snapshot test
* Add @iconscout/react-unicons to the shouldExclude list as it is blundled with es2015 syntax
* Remove color prop from icon, remove color implemetation in mono icons
* Update navbar styling
* Move toPascalCase to utils/string
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
* Update icons in Explore
* Update icons in alerting
* Update + and x buttons
* Update icons in configurations and settings
* Update close icons
* Update icons in rich history
* Update alert messages
* Add optional chaining to for isFontAwesome variable
* Remove icon mock, set up jest.config
* Fix navbar plus icon
* Fir enable-bacground to enableBackgournd
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
* Merge remote branch origin master to icons-unicons
* Revert "Merge remote branch origin master to icons-unicons"
This reverts commit 3f25d50a39.
* Size-up dashnav icons
* Fix alerting icons, panel headers, update tests
* Fix typecheck error
* Adjustments - add panel icon, spacing
* Set TerserPlugin sourceMap to false to prevent running out of memory when publishing storybook
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
140 lines
4.9 KiB
HTML
140 lines
4.9 KiB
HTML
<div ng-controller="AnnotationsEditorCtrl">
|
|
<div class="page-action-bar">
|
|
<h3 class="dashboard-settings__header">
|
|
<a ng-click="ctrl.backToList()">Annotations</a>
|
|
<span ng-show="ctrl.mode === 'new'"><i class="fa fa-fw fa-chevron-right"></i> New</span>
|
|
<span ng-show="ctrl.mode === 'edit'"><i class="fa fa-fw fa-chevron-right"></i> Edit</span>
|
|
</h3>
|
|
|
|
<div class="page-action-bar__spacer"></div>
|
|
|
|
<a
|
|
type="button"
|
|
class="btn btn-primary"
|
|
ng-click="ctrl.setupNew();"
|
|
ng-if="ctrl.annotations.length > 1"
|
|
ng-hide="ctrl.mode === 'edit' || ctrl.mode === 'new'"
|
|
>
|
|
New
|
|
</a>
|
|
</div>
|
|
|
|
<div ng-if="ctrl.mode === 'list'">
|
|
<table class="filter-table filter-table--hover">
|
|
<thead>
|
|
<tr>
|
|
<th>Query name</th>
|
|
<th>Data source</th>
|
|
<th colspan="3"></th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
<tr ng-repeat="annotation in ctrl.annotations track by annotation.name">
|
|
<td style="width:90%" ng-hide="annotation.builtIn" class="pointer" ng-click="ctrl.edit(annotation)">
|
|
<i class="fa fa-comment" style="color:{{ annotation.iconColor }}"></i> {{ annotation.name }}
|
|
</td>
|
|
<td style="width:90%" ng-show="annotation.builtIn" class="pointer" ng-click="ctrl.edit(annotation)">
|
|
<i class="gicon gicon-annotation"></i>
|
|
<em class="muted">{{ annotation.name }} (Built-in)</em>
|
|
</td>
|
|
<td class="pointer" ng-click="ctrl.edit(annotation)">
|
|
{{ annotation.datasource || 'Default' }}
|
|
</td>
|
|
<td style="width: 1%">
|
|
<i ng-click="ctrl.move($index,-1)" ng-hide="$first" class="pointer fa fa-arrow-up"></i>
|
|
</td>
|
|
<td style="width: 1%">
|
|
<i ng-click="ctrl.move($index,1)" ng-hide="$last" class="pointer fa fa-arrow-down"></i>
|
|
</td>
|
|
<td style="width: 1%">
|
|
<a
|
|
ng-click="ctrl.removeAnnotation(annotation)"
|
|
class="btn btn-danger btn-small"
|
|
ng-hide="annotation.builtIn"
|
|
>
|
|
<icon name="'times'"></icon>
|
|
</a>
|
|
</td>
|
|
</tr>
|
|
</tbody>
|
|
</table>
|
|
|
|
<!-- empty list cta, there is always one built in query -->
|
|
<div ng-if="ctrl.annotations.length === 1" class="p-t-2">
|
|
<empty-list-cta
|
|
title="ctrl.emptyListCta.title"
|
|
buttonIcon="ctrl.emptyListCta.buttonIcon"
|
|
buttonTitle="ctrl.emptyListCta.buttonTitle"
|
|
infoBox="ctrl.emptyListCta.infoBox"
|
|
infoBoxTitle="ctrl.emptyListCta.infoBoxTitle"
|
|
on-click="ctrl.setupNew"
|
|
/>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="annotations-basic-settings" ng-if="ctrl.mode === 'edit' || ctrl.mode === 'new'">
|
|
<div class="gf-form-group">
|
|
<h5 class="section-heading">General</h5>
|
|
<div class="gf-form-inline">
|
|
<div class="gf-form">
|
|
<span class="gf-form-label width-7">Name</span>
|
|
<input type="text" class="gf-form-input width-20" ng-model="ctrl.currentAnnotation.name" placeholder="name" />
|
|
</div>
|
|
<div class="gf-form">
|
|
<span class="gf-form-label width-7">Data source</span>
|
|
<div class="gf-form-select-wrapper">
|
|
<select
|
|
class="gf-form-input"
|
|
ng-model="ctrl.currentAnnotation.datasource"
|
|
ng-options="f.name as f.name for f in ctrl.datasources"
|
|
ng-change="ctrl.datasourceChanged()"
|
|
></select>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="gf-form-group">
|
|
<div class="gf-form-inline">
|
|
<gf-form-switch class="gf-form" label="Enabled" checked="ctrl.currentAnnotation.enable" label-class="width-7">
|
|
</gf-form-switch>
|
|
<gf-form-switch
|
|
class="gf-form"
|
|
label="Hidden"
|
|
tooltip="Hides the annotation query toggle from showing at the top of the dashboard"
|
|
checked="ctrl.currentAnnotation.hide"
|
|
label-class="width-7"
|
|
>
|
|
</gf-form-switch>
|
|
<div class="gf-form">
|
|
<label class="gf-form-label width-9">Color</label>
|
|
<span class="gf-form-label">
|
|
<color-picker color="ctrl.currentAnnotation.iconColor" onChange="ctrl.onColorChange"></color-picker>
|
|
</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<h5 class="section-heading">Query</h5>
|
|
<rebuild-on-change property="ctrl.currentDatasource">
|
|
<plugin-component type="annotations-query-ctrl"> </plugin-component>
|
|
</rebuild-on-change>
|
|
|
|
<div class="gf-form">
|
|
<div class="gf-form-button-row p-y-0">
|
|
<button
|
|
ng-show="ctrl.mode === 'new'"
|
|
type="button"
|
|
class="btn gf-form-button btn-primary"
|
|
ng-click="ctrl.add()"
|
|
>
|
|
Add
|
|
</button>
|
|
<button ng-show="ctrl.mode === 'edit'" type="button" class="btn btn-primary pull-left" ng-click="ctrl.update()">
|
|
Update
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|