Fix project selector failing test (#780)

chore: fix project selector failing test Signed-off-by: Frank Flitton <[email protected]>
flyteorg · Jun 23, 2023 · e2fd2a4 · e2fd2a4
1 parent 007e636
commit e2fd2a4
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -76,6 +76,8 @@
     "@typescript-eslint/parser": "^5.48.2",
     "babel-loader": "^8.2.5",
     "chalk": "^4",
+    "chart.js": "3.6.2",
+    "chartjs-plugin-datalabels": "2.0.0",
     "cheerio": "^1.0.0-rc.12",
     "compression-webpack-plugin": "^9.2.0",
     "cookie-parser": "^1.4.3",

diff --git a/...s/console/src/components/Executions/ExecutionDetails/Timeline/TimelineChart/barOptions.ts b/...s/console/src/components/Executions/ExecutionDetails/Timeline/TimelineChart/barOptions.ts
@@ -1,8 +1,64 @@
-import { Chart as ChartJS, registerables, Tooltip } from 'chart.js';
+import {
+  Chart as ChartJS,
+  // registerables
+  ArcElement,
+  LineElement,
+  BarElement,
+  PointElement,
+  BarController,
+  BubbleController,
+  DoughnutController,
+  LineController,
+  PieController,
+  PolarAreaController,
+  RadarController,
+  ScatterController,
+  CategoryScale,
+  LinearScale,
+  LogarithmicScale,
+  RadialLinearScale,
+  TimeScale,
+  TimeSeriesScale,
+  Decimation,
+  Filler,
+  Legend,
+  Title,
+  Tooltip,
+  SubTitle,
+} from 'chart.js';
 import ChartDataLabels from 'chartjs-plugin-datalabels';
 import { isEqual, isNil } from 'lodash';
 
-ChartJS.register(...registerables, ChartDataLabels);
+const registerables = [
+  ArcElement,
+  LineElement,
+  BarElement,
+  PointElement,
+  BarController,
+  BubbleController,
+  DoughnutController,
+  LineController,
+  PieController,
+  PolarAreaController,
+  RadarController,
+  ScatterController,
+  CategoryScale,
+  LinearScale,
+  LogarithmicScale,
+  RadialLinearScale,
+  TimeScale,
+  TimeSeriesScale,
+  Decimation,
+  Filler,
+  Legend,
+  Title,
+  Tooltip,
+  SubTitle,
+];
+
+// "registerables" helper was failing tests
+registerables.forEach(plugin => ChartJS.register(plugin));
+ChartJS.register(ChartDataLabels);
 
 // Create positioner to put tooltip at cursor position
 Tooltip.positioners.cursor = function (_chartElements, coordinates) {

diff --git a/packages/console/src/components/Navigation/ProjectSelector.tsx b/packages/console/src/components/Navigation/ProjectSelector.tsx
@@ -1,3 +1,4 @@
+import * as React from 'react';
 import ButtonBase from '@material-ui/core/ButtonBase';
 import { makeStyles, Theme } from '@material-ui/core/styles';
 import ExpandMore from '@material-ui/icons/ExpandMore';
@@ -6,7 +7,6 @@ import { KeyCodes } from 'common/constants';
 import { useCommonStyles } from 'components/common/styles';
 import { listhoverColor } from 'components/Theme/constants';
 import { Project } from 'models/Project/types';
-import * as React from 'react';
 import { SearchableProjectList } from './SearchableProjectList';
 
 const expanderGridHeight = 12;

diff --git a/yarn.lock b/yarn.lock
@@ -11705,6 +11705,8 @@ __metadata:
     "@typescript-eslint/parser": ^5.48.2
     babel-loader: ^8.2.5
     chalk: ^4
+    chart.js: 3.6.2
+    chartjs-plugin-datalabels: 2.0.0
     cheerio: ^1.0.0-rc.12
     compression-webpack-plugin: ^9.2.0
     cookie-parser: ^1.4.3