Minor fixes.

alpinebuster · Oct 9, 2023 · 67dec9f · 67dec9f
1 parent 7bcdf80
commit 67dec9f
Show file tree

Hide file tree

Showing 6 changed files with 461 additions and 165 deletions.
diff --git a/web/package.json b/web/package.json
@@ -61,6 +61,7 @@
     "date-fns": "^2.24.0",
     "diff-arrays-of-objects": "^1.1.8",
     "html2canvas": "^1.0.0-rc.7",
+    "html-to-image": "^1.11.11",
     "immutability-helper": "^3.0.0",
     "insert-if": "^1.1.0",
     "ip-address": "^7.1.0",
@@ -86,6 +87,7 @@
     "rc-dock": "^3.2.9",
     "react": "^17.0.1",
     "react-aspen": "^1.1.0",
+    "react-arborist": "^3.2.0",
     "react-checkbox-tree": "^1.7.2",
     "react-data-grid": "^7.0.0-beta.33",
     "react-dnd": "^16.0.1",

diff --git a/web/pgadmin/dashboard/static/js/SystemStats/CPU.jsx b/web/pgadmin/dashboard/static/js/SystemStats/CPU.jsx
@@ -16,7 +16,7 @@ import {getGCD, getEpoch} from 'sources/utils';
 import {ChartContainer} from '../Dashboard';
 import { Grid } from '@material-ui/core';
 import { DATA_POINT_SIZE } from 'sources/chartjs';
-import StreamingChart from '../../../../static/js/components/PgChart/StreamingChart';
+import StreamingChart from '../../../../static/js/components/pg_chart/StreamingChart';
 import {useInterval, usePrevious} from 'sources/custom_hooks';
 import axios from 'axios';
 import { getStatsUrl, transformData, statsReducer, X_AXIS_LENGTH } from './utility.js';

diff --git a/web/pgadmin/dashboard/static/js/SystemStats/Memory.jsx b/web/pgadmin/dashboard/static/js/SystemStats/Memory.jsx
@@ -15,7 +15,7 @@ import {getGCD, getEpoch} from 'sources/utils';
 import {ChartContainer} from '../Dashboard';
 import { Grid } from '@material-ui/core';
 import { DATA_POINT_SIZE } from 'sources/chartjs';
-import StreamingChart from '../../../../static/js/components/PgChart/StreamingChart';
+import StreamingChart from '../../../../static/js/components/pg_chart/StreamingChart';
 import {useInterval, usePrevious} from 'sources/custom_hooks';
 import axios from 'axios';
 import { getStatsUrl, transformData, statsReducer, X_AXIS_LENGTH } from './utility.js';

diff --git a/web/pgadmin/dashboard/static/js/SystemStats/Storage.jsx b/web/pgadmin/dashboard/static/js/SystemStats/Storage.jsx
@@ -15,14 +15,14 @@ import {getGCD, getEpoch} from 'sources/utils';
 import {ChartContainer} from '../Dashboard';
 import { Grid } from '@material-ui/core';
 import { DATA_POINT_SIZE } from 'sources/chartjs';
-import StreamingChart from '../../../../static/js/components/PgChart/StreamingChart';
+import StreamingChart from '../../../../static/js/components/pg_chart/StreamingChart';
 import {useInterval, usePrevious} from 'sources/custom_hooks';
 import axios from 'axios';
 import { BarChart, PieChart } from '../../../../static/js/chartjs';
 import { getStatsUrl, transformData, X_AXIS_LENGTH } from './utility.js';
 import { toPrettySize } from '../../../../static/js/utils';
 import clsx from 'clsx';
-import { commonTableStyles } from '../../../../static/js/Theme';
+import { commonTableStyles } from '../../../../static/js/theme';
 
 const useStyles = makeStyles((theme) => ({
   container: {

diff --git a/web/pgadmin/dashboard/static/js/SystemStats/Summary.jsx b/web/pgadmin/dashboard/static/js/SystemStats/Summary.jsx
@@ -16,12 +16,12 @@ import {getGCD, getEpoch} from 'sources/utils';
 import {ChartContainer} from '../Dashboard';
 import { Grid } from '@material-ui/core';
 import { DATA_POINT_SIZE } from 'sources/chartjs';
-import StreamingChart from '../../../../static/js/components/PgChart/StreamingChart';
+import StreamingChart from '../../../../static/js/components/pg_chart/StreamingChart';
 import {useInterval, usePrevious} from 'sources/custom_hooks';
 import axios from 'axios';
 import { getStatsUrl, transformData,statsReducer, X_AXIS_LENGTH } from './utility.js';
 import clsx from 'clsx';
-import { commonTableStyles } from '../../../../static/js/Theme';
+import { commonTableStyles } from '../../../../static/js/theme';
 
 const useStyles = makeStyles((theme) => ({
   container: {