tslint, fix apm jest test, update time filter icon when disabling app…

…lyGlobalTime
elastic · Nov 9, 2020 · a97a4cd · a97a4cd
1 parent 526d120
commit a97a4cd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/...components/app/RumDashboard/VisitorBreakdownMap/__tests__/__mocks__/regions_layer.mock.ts b/...components/app/RumDashboard/VisitorBreakdownMap/__tests__/__mocks__/regions_layer.mock.ts
@@ -21,6 +21,8 @@ export const mockLayerList = [
       {
         leftField: 'iso2',
         right: {
+          applyGlobalQuery: true,
+          applyGlobalTime: true,
           type: 'ES_TERM_SOURCE',
           id: '3657625d-17b0-41ef-99ba-3a2b2938655c',
           indexPatternTitle: 'apm-*',
@@ -38,15 +40,13 @@ export const mockLayerList = [
             },
           ],
           indexPatternId: 'apm_static_index_pattern_id',
-          applyGlobalQuery: true,
         },
       },
     ],
     sourceDescriptor: {
       type: 'EMS_FILE',
       id: 'world_countries',
       tooltipProperties: ['name'],
-      applyGlobalQuery: true,
     },
     style: {
       type: 'VECTOR',
@@ -96,6 +96,8 @@ export const mockLayerList = [
       {
         leftField: 'region_iso_code',
         right: {
+          applyGlobalQuery: true,
+          applyGlobalTime: true,
           type: 'ES_TERM_SOURCE',
           id: 'e62a1b9c-d7ff-4fd4-a0f6-0fdc44bb9e41',
           indexPatternTitle: 'apm-*',

diff --git a/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.ts b/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.ts
@@ -56,7 +56,7 @@ export class ESTermSource extends AbstractESAggSource {
     }
     return {
       ...normalizedDescriptor,
-      term: descriptor!.term,
+      term: descriptor.term!,
       type: SOURCE_TYPES.ES_TERM_SOURCE,
     };
   }

diff --git a/...ts/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_button/toc_entry_button.tsx b/...ts/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_button/toc_entry_button.tsx
@@ -51,13 +51,17 @@ export class TOCEntryButton extends Component<Props, State> {
     this._loadIsFilteredByGlobalTime();
   }
 
+  componentDidUpdate() {
+    this._loadIsFilteredByGlobalTime();
+  }
+
   componentWillUnmount() {
     this._isMounted = false;
   }
 
   async _loadIsFilteredByGlobalTime() {
     const isFilteredByGlobalTime = await this.props.layer.isFilteredByGlobalTime();
-    if (this._isMounted) {
+    if (this._isMounted && isFilteredByGlobalTime !== this.state.isFilteredByGlobalTime) {
       this.setState({ isFilteredByGlobalTime });
     }
   }