github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Hide pinned filter state in embed mode (#10935)

Browse source 
Backports PR #10816

**Commit 1:**
Hide pinned filter state in embed mode

It doesn’t make sense there, since there won’t be any cross app
navigation, so don’t expose it.

fixes #5056

* Original sha: db3b881227
* Authored by Stacey Gammon <gammon@elastic.co> on 2017-03-20T17:05:21Z

**Commit 2:**
Also conditionally hide "all filter" pin state actions

* Original sha: 6314e431be
* Authored by Stacey Gammon <gammon@elastic.co> on 2017-03-28T20:44:44Z
This commit is contained in:
jasper 2017-03-30 08:36:28 -04:00 • committed by Stacey Gammon
parent 3c92197192
commit c25fa65fd7
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ui/public/filter_bar/filter_bar.html
View file

@ -12,7 +12,7 @@
<div class="filter-bar" ng-show="filters.length">
<div class="filter" ng-class="{ negate: filter.meta.negate, disabled: filter.meta.disabled }" ng-repeat="filter in filters">
<div class="filter-description">
<span ng-if="filter.$state.store == 'globalState'"><i class="fa fa-fw fa-thumb-tack pinned"></i></span>
<span ng-if="filter.$state.store === 'globalState' && showFilterPin()"><i class="fa fa-fw fa-thumb-tack pinned"></i></span>
<span ng-if="filter.meta.alias">{{ filter.meta.alias }}</span>
<span ng-if="!filter.meta.alias">{{ filter.meta.key }}:</span>
<span ng-if="!filter.meta.alias">"{{ filter.meta.value }}"</span>
@ -22,7 +22,7 @@
<i ng-show="filter.meta.disabled" class="fa fa-fw fa-square-o disabled"></i>
<i ng-hide="filter.meta.disabled" class="fa fa-fw fa-check-square-o enabled"></i>
</a>
<a class="action filter-pin" ng-click="pinFilter(filter)" data-test-subj="pinFilter-{{ filter.meta.key }}">
<a class="action filter-pin" ng-if="showFilterPin()" ng-click="pinFilter(filter)" data-test-subj="pinFilter-{{ filter.meta.key }}">
<i ng-show="filter.$state.store == 'globalState'" class="fa fa-fw fa-thumb-tack pinned"></i>
<i ng-hide="filter.$state.store == 'globalState'" class="fa fa-fw fa-thumb-tack fa-rotate-270 unpinned"></i>
</a>
@ -90,10 +90,10 @@
<div class="filter-link">
<div class="filter-description"><a ng-click="toggleAll(true)">Disable</a></div>
</div>
<div class="filter-link">
<div class="filter-link" ng-if="showFilterPin()">
<div class="filter-description"><a ng-click="pinAll(true)">Pin</a></div>
</div>
<div class="filter-link">
<div class="filter-link" ng-if="showFilterPin()">
<div class="filter-description"><a ng-click="pinAll(false)">Unpin</a></div>
</div>
<div class="filter-link">

5
src/ui/public/filter_bar/filter_bar.js
View file

@ -10,6 +10,7 @@ import FilterBarLibChangeTimeFilterProvider from 'ui/filter_bar/lib/change_time_
import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
import compareFilters from './lib/compare_filters';
import uiModules from 'ui/modules';
import chrome from 'ui/chrome';
const module = uiModules.get('kibana');
@ -45,6 +46,10 @@ module.directive('filterBar', function (Private, Promise, getAppState) {
$scope.state = getAppState();
// Don't show filter "pinnability" when in embedded mode, as it doesn't make sense in that context
// as there will be no cross app navigation for which the filter should persist.
$scope.showFilterPin = () => chrome.getVisible();
$scope.aceLoaded = function (editor) {
editor.$blockScrolling = Infinity;
const session = editor.getSession();