Merge branch '351907-time-series-chart-responsiveness' into 'master'

Refactored time series chart responsiveness

See merge request gitlab-org/gitlab!81454

app/assets/javascripts/monitoring/components/charts/time_series.vue

 <script>
-import { GlLink, GlTooltip, GlResizeObserverDirective, GlIcon } from '@gitlab/ui';
+import { GlLink, GlTooltip, GlIcon } from '@gitlab/ui';
 import { GlAreaChart, GlLineChart, GlChartSeriesLabel } from '@gitlab/ui/dist/charts';
 import { isEmpty, omit, throttle } from 'lodash';
 import { makeDataSeries } from '~/helpers/monitor_helper';
@@ -28,9 +28,6 @@ export default {
     GlLink,
     GlIcon,
   },
-  directives: {
-    GlResizeObserverDirective,
-  },
   inheritAttrs: false,
   props: {
     graphData: {
@@ -366,64 +363,58 @@ export default {
       eChart.off('datazoom');
       eChart.on('datazoom', this.throttledDatazoom);
     },
-    onResize() {
-      if (!this.$refs.chart) return;
-      const { width } = this.$refs.chart.$el.getBoundingClientRect();
-      this.width = width;
-    },
   },
 };
 </script>
 
 <template>
-  <div v-gl-resize-observer-directive="onResize">
-    <component
-      :is="glChartComponent"
-      ref="chart"
-      v-bind="$attrs"
-      :group-id="groupId"
-      :data="chartData"
-      :option="chartOptions"
-      :format-tooltip-text="formatTooltipText"
-      :format-annotations-tooltip-text="formatAnnotationsTooltipText"
-      :width="width"
-      :height="height"
-      :legend-layout="legendLayout"
-      :legend-average-text="legendAverageText"
-      :legend-current-text="legendCurrentText"
-      :legend-max-text="legendMaxText"
-      :legend-min-text="legendMinText"
-      @created="onChartCreated"
-      @updated="onChartUpdated"
-    >
-      <template #tooltip-title>
-        <template v-if="tooltip.type === 'deployments'">
-          {{ __('Deployed') }}
-        </template>
-        <div v-else class="text-nowrap">
-          {{ tooltip.title }}
-        </div>
+  <component
+    :is="glChartComponent"
+    ref="chart"
+    v-bind="$attrs"
+    :responsive="true"
+    :group-id="groupId"
+    :data="chartData"
+    :option="chartOptions"
+    :format-tooltip-text="formatTooltipText"
+    :format-annotations-tooltip-text="formatAnnotationsTooltipText"
+    :width="width"
+    :height="height"
+    :legend-layout="legendLayout"
+    :legend-average-text="legendAverageText"
+    :legend-current-text="legendCurrentText"
+    :legend-max-text="legendMaxText"
+    :legend-min-text="legendMinText"
+    @created="onChartCreated"
+    @updated="onChartUpdated"
+  >
+    <template #tooltip-title>
+      <template v-if="tooltip.type === 'deployments'">
+        {{ __('Deployed') }}
       </template>
-      <template #tooltip-content>
-        <div v-if="tooltip.type === 'deployments'" class="d-flex align-items-center">
-          <gl-icon name="commit" class="mr-2" />
-          <gl-link :href="tooltip.commitUrl">{{ tooltip.sha }}</gl-link>
-        </div>
-        <template v-else>
-          <div
-            v-for="(content, key) in tooltip.content"
-            :key="key"
-            class="d-flex justify-content-between"
-          >
-            <gl-chart-series-label :color="isMultiSeries ? content.color : ''">
-              {{ content.name }}
-            </gl-chart-series-label>
-            <div class="gl-ml-7">
-              {{ content.value }}
-            </div>
+      <div v-else class="text-nowrap">
+        {{ tooltip.title }}
+      </div>
+    </template>
+    <template #tooltip-content>
+      <div v-if="tooltip.type === 'deployments'" class="d-flex align-items-center">
+        <gl-icon name="commit" class="mr-2" />
+        <gl-link :href="tooltip.commitUrl">{{ tooltip.sha }}</gl-link>
+      </div>
+      <template v-else>
+        <div
+          v-for="(content, key) in tooltip.content"
+          :key="key"
+          class="d-flex justify-content-between"
+        >
+          <gl-chart-series-label :color="isMultiSeries ? content.color : ''">
+            {{ content.name }}
+          </gl-chart-series-label>
+          <div class="gl-ml-7">
+            {{ content.value }}
           </div>
-        </template>
+        </div>
       </template>
-    </component>
-  </div>
+    </template>
+  </component>
 </template>

spec/frontend/monitoring/components/charts/time_series_spec.js

@@ -335,21 +335,6 @@ describe('Time series component', () => {
             expect(formattedTooltipData.content).toBe(annotationsMetadata.tooltipData.content);
           });
         });
-
-        describe('onResize', () => {
-          const mockWidth = 233;
-
-          beforeEach(() => {
-            jest.spyOn(Element.prototype, 'getBoundingClientRect').mockImplementation(() => ({
-              width: mockWidth,
-            }));
-            wrapper.vm.onResize();
-          });
-
-          it('sets area chart width', () => {
-            expect(wrapper.vm.width).toBe(mockWidth);
-          });
-        });
       });
 
       describe('computed', () => {