From e61fa37db4b7cee5e1b8d2c768a9f4b66651b4c8 Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.sundell87@gmail.com>
Date: Mon, 7 Jan 2019 14:15:53 +0100
Subject: [PATCH] fix filter bug

---
 .../datasource/stackdriver/filter_segments.ts      |  2 +-
 .../datasource/stackdriver/query_filter_ctrl.ts    | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/public/app/plugins/datasource/stackdriver/filter_segments.ts b/public/app/plugins/datasource/stackdriver/filter_segments.ts
index e9adcad6da6..5beae1cdeb1 100644
--- a/public/app/plugins/datasource/stackdriver/filter_segments.ts
+++ b/public/app/plugins/datasource/stackdriver/filter_segments.ts
@@ -44,7 +44,7 @@ export class FilterSegments {
         this.removeSegment.value = DefaultRemoveFilterValue;
         return Promise.resolve([this.removeSegment]);
       } else {
-        return this.getFilterKeysFunc(segment, DefaultRemoveFilterValue);
+        return this.getFilterKeysFunc(segment, DefaultRemoveFilterValue, segment.type === 'plus-button');
       }
     }
 
diff --git a/public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts b/public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts
index c15560c30ab..5bbd91eb6ca 100644
--- a/public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts
+++ b/public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts
@@ -89,7 +89,7 @@ export class StackdriverFilterCtrl {
     return elements;
   }
 
-  async getFilterKeys(segment, removeText?: string) {
+  async getFilterKeys(segment, removeText: string, hideRemoveButton: boolean) {
     let elements = await this.createLabelKeyElements();
 
     if (this.$scope.filters.indexOf(this.resourceTypeValue) !== -1) {
@@ -101,10 +101,12 @@ export class StackdriverFilterCtrl {
       return [];
     }
 
-    return [
-      ...elements,
-      this.uiSegmentSrv.newSegment({ fake: true, value: removeText || this.defaultRemoveGroupByValue }),
-    ];
+    return hideRemoveButton
+      ? elements
+      : [
+          ...elements,
+          this.uiSegmentSrv.newSegment({ fake: true, value: removeText || this.defaultRemoveGroupByValue }),
+        ];
   }
 
   async getGroupBys(segment) {
@@ -117,7 +119,7 @@ export class StackdriverFilterCtrl {
     }
 
     this.removeSegment.value = this.defaultRemoveGroupByValue;
-    return [...elements, this.removeSegment];
+    return segment.type === 'plus-button' ? elements : [...elements, this.removeSegment];
   }
 
   groupByChanged(segment, index) {