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

nreese · nreese · commit a97a4cd151a2 · 2020-11-09T14:21:16.000-07:00
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/VisitorBreakdownMap/__tests__/__mocks__/regions_layer.mock.ts b/x-pack/plugins/apm/public/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/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_button/toc_entry_button.tsx b/x-pack/plugins/maps/public/connected_components/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 });
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ export class ESTermSource extends AbstractESAggSource {`
`56`	`56`	`}`
`57`	`57`	`return {`
`58`	`58`	`...normalizedDescriptor,`
`59`		`- term: descriptor!.term,`
	`59`	`+ term: descriptor.term!,`
`60`	`60`	`type: SOURCE_TYPES.ES_TERM_SOURCE,`
`61`	`61`	`};`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,13 +51,17 @@ export class TOCEntryButton extends Component<Props, State> {`
`51`	`51`	`this._loadIsFilteredByGlobalTime();`
`52`	`52`	`}`
`53`	`53`
	`54`	`+ componentDidUpdate() {`
	`55`	`+ this._loadIsFilteredByGlobalTime();`
	`56`	`+ }`
	`57`	`+`
`54`	`58`	`componentWillUnmount() {`
`55`	`59`	`this._isMounted = false;`
`56`	`60`	`}`
`57`	`61`
`58`	`62`	`async _loadIsFilteredByGlobalTime() {`
`59`	`63`	`const isFilteredByGlobalTime = await this.props.layer.isFilteredByGlobalTime();`
`60`		`- if (this._isMounted) {`
	`64`	`+ if (this._isMounted && isFilteredByGlobalTime !== this.state.isFilteredByGlobalTime) {`
`61`	`65`	`this.setState({ isFilteredByGlobalTime });`
`62`	`66`	`}`
`63`	`67`	`}`