Skip to content

Commit

Permalink
[Discover] Deangularize uiCapabilities (#88057)
Browse files Browse the repository at this point in the history
  • Loading branch information
kertal authored Jan 15, 2021
1 parent 86218a4 commit 82c30a3
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions src/plugins/discover/public/application/angular/discover.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ const services = getServices();

const {
core,
capabilities,
chrome,
data,
history: getHistory,
Expand Down Expand Up @@ -106,8 +107,8 @@ app.config(($routeProvider) => {
requireUICapability: 'discover.show',
k7Breadcrumbs: ($route, $injector) =>
$injector.invoke($route.current.params.id ? getSavedSearchBreadcrumbs : getRootBreadcrumbs),
badge: (uiCapabilities) => {
if (uiCapabilities.discover.save) {
badge: () => {
if (capabilities.discover.save) {
return undefined;
}

Expand Down Expand Up @@ -184,7 +185,7 @@ app.directive('discoverApp', function () {
};
});

function discoverController($element, $route, $scope, $timeout, Promise, uiCapabilities) {
function discoverController($element, $route, $scope, $timeout, Promise) {
const { isDefault: isDefaultType } = indexPatternsUtils;
const subscriptions = new Subscription();
const refetch$ = new Subject();
Expand Down Expand Up @@ -341,7 +342,7 @@ function discoverController($element, $route, $scope, $timeout, Promise, uiCapab
};
$scope.minimumVisibleRows = 50;
$scope.fetchStatus = fetchStatuses.UNINITIALIZED;
$scope.showSaveQuery = uiCapabilities.discover.saveQuery;
$scope.showSaveQuery = capabilities.discover.saveQuery;
$scope.showTimeCol =
!config.get('doc_table:hideTimeColumn', false) && $scope.indexPattern.timeFieldName;

Expand Down Expand Up @@ -769,7 +770,7 @@ function discoverController($element, $route, $scope, $timeout, Promise, uiCapab
};

$scope.addColumn = function addColumn(columnName) {
if (uiCapabilities.discover.save) {
if (capabilities.discover.save) {
const { indexPattern } = $scope;
popularizeField(indexPattern, columnName, indexPatterns);
}
Expand All @@ -778,7 +779,7 @@ function discoverController($element, $route, $scope, $timeout, Promise, uiCapab
};

$scope.removeColumn = function removeColumn(columnName) {
if (uiCapabilities.discover.save) {
if (capabilities.discover.save) {
const { indexPattern } = $scope;
popularizeField(indexPattern, columnName, indexPatterns);
}
Expand Down

0 comments on commit 82c30a3

Please sign in to comment.