{columns.map((tag) => (
@@ -90,6 +94,4 @@ export function _PlotEventOverlayTable({ plot, range, agg }: PlotEventOverlayTab
{chunk?.more && more...
}
);
-}
-
-export const PlotEventOverlayTable = memo(_PlotEventOverlayTable);
+});
diff --git a/statshouse-ui/src/components2/Plot/PlotView/PlotEvents.tsx b/statshouse-ui/src/components2/Plot/PlotView/PlotEvents.tsx
index 41a61b053..82e5eaaab 100644
--- a/statshouse-ui/src/components2/Plot/PlotView/PlotEvents.tsx
+++ b/statshouse-ui/src/components2/Plot/PlotView/PlotEvents.tsx
@@ -10,13 +10,13 @@ import cn from 'classnames';
import css from './style.module.css';
import 'react-data-grid/lib/styles.css';
import { PlotEventsButtonColumns } from './PlotEventsButtonColumns';
-import { Button } from 'components/UI';
-import { EventDataRow } from 'store2/plotEventsDataStore';
-import { useEventTagColumns2 } from 'hooks/useEventTagColumns2';
-import { PlotKey } from 'url2';
-import { useStatsHouseShallow } from 'store2';
+import { Button } from '@/components/UI';
+import { EventDataRow } from '@/store2/plotEventsDataStore';
+import { useEventTagColumns2 } from '@/hooks/useEventTagColumns2';
+import { PlotKey } from '@/url2';
+import { useStatsHouseShallow } from '@/store2';
-import { eventColumnDefault, getEventColumnsType } from 'view/getEventColumnsType';
+import { eventColumnDefault, getEventColumnsType } from '@/view/getEventColumnsType';
export type PlotEventsProps = {
plotKey: PlotKey;
@@ -78,7 +78,7 @@ export function PlotEvents({ plotKey, className, onCursor, cursor }: PlotEventsP
[eventColumns, plotEventsData?.what]
);
const loadPrev = useCallback(() => {
- if (!!plotEventsData?.prevKey) {
+ if (plotEventsData?.prevKey) {
loadPlotEvents(plotKey, plotEventsData.prevKey, true)
.then((res) => {
if (gridRef.current?.element && res) {
@@ -95,7 +95,7 @@ export function PlotEvents({ plotKey, className, onCursor, cursor }: PlotEventsP
}, [loadPlotEvents, plotEventsData?.chunks.length, plotEventsData?.prevKey, plotKey]);
const loadNext = useCallback(() => {
- if (!!plotEventsData?.nextKey) {
+ if (plotEventsData?.nextKey) {
loadPlotEvents(plotKey, plotEventsData.nextKey, false).catch(() => undefined);
}
}, [loadPlotEvents, plotEventsData?.nextKey, plotKey]);
@@ -206,7 +206,7 @@ export function PlotEvents({ plotKey, className, onCursor, cursor }: PlotEventsP
)}
- {!!plotEventsData?.rows?.length ? (
+ {plotEventsData?.rows?.length ? (
className={cn('z-0 position-absolute top-0 start-0 w-100 h-100', css.rdgTheme)}
ref={gridRef}
diff --git a/statshouse-ui/src/components2/Plot/PlotView/PlotEventsButtonColumns.tsx b/statshouse-ui/src/components2/Plot/PlotView/PlotEventsButtonColumns.tsx
index 089d480ce..7b07fbed8 100644
--- a/statshouse-ui/src/components2/Plot/PlotView/PlotEventsButtonColumns.tsx
+++ b/statshouse-ui/src/components2/Plot/PlotView/PlotEventsButtonColumns.tsx
@@ -9,8 +9,8 @@ import { ReactComponent as SVGListCheck } from 'bootstrap-icons/icons/list-check
import { PlotEventsSelectColumns } from './PlotEventsSelectColumns';
import cn from 'classnames';
import css from './style.module.css';
-import { Button } from 'components/UI';
-import { PlotKey } from 'url2';
+import { Button } from '@/components/UI';
+import { PlotKey } from '@/url2';
export type PlotEventsButtonColumnsProps = {
plotKey: PlotKey;
diff --git a/statshouse-ui/src/components2/Plot/PlotView/PlotEventsSelectColumns.tsx b/statshouse-ui/src/components2/Plot/PlotView/PlotEventsSelectColumns.tsx
index 2c077654e..4f24bece0 100644
--- a/statshouse-ui/src/components2/Plot/PlotView/PlotEventsSelectColumns.tsx
+++ b/statshouse-ui/src/components2/Plot/PlotView/PlotEventsSelectColumns.tsx
@@ -6,12 +6,12 @@
import React, { useCallback, useRef } from 'react';
import cn from 'classnames';
-import { useOnClickOutside } from 'hooks';
-import { useEventTagColumns2 } from 'hooks/useEventTagColumns2';
+import { useOnClickOutside } from '@/hooks';
+import { useEventTagColumns2 } from '@/hooks/useEventTagColumns2';
import { ReactComponent as SVGEye } from 'bootstrap-icons/icons/eye.svg';
import { ReactComponent as SVGEyeSlash } from 'bootstrap-icons/icons/eye-slash.svg';
-import { getNewMetric, type PlotKey } from 'url2';
-import { useStatsHouseShallow } from 'store2';
+import { getNewMetric, type PlotKey } from '@/url2';
+import { useStatsHouseShallow } from '@/store2';
import { TagKey, toTagKey } from '../../../api/enum';
export type PlotEventsSelectColumnsProps = {
@@ -30,8 +30,8 @@ export function PlotEventsSelectColumns({ plotKey, className, onClose }: PlotEve
const onChange = useCallback(
(e: React.ChangeEvent) => {
- // @ts-ignore
- const ctrl = e.nativeEvent.ctrlKey || e.nativeEvent.metaKey;
+ const nativeEvent = e.nativeEvent as MouseEvent;
+ const ctrl = nativeEvent.ctrlKey || nativeEvent.metaKey;
const tagKey = toTagKey(e.currentTarget.value);
const tagKeyChecked = e.currentTarget.checked;
if (tagKey != null) {
diff --git a/statshouse-ui/src/components2/Plot/PlotView/PlotHeader.tsx b/statshouse-ui/src/components2/Plot/PlotView/PlotHeader.tsx
index 7bfff51d7..a19964ffe 100644
--- a/statshouse-ui/src/components2/Plot/PlotView/PlotHeader.tsx
+++ b/statshouse-ui/src/components2/Plot/PlotView/PlotHeader.tsx
@@ -4,11 +4,11 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import React, { memo, useCallback, useEffect, useId, useMemo, useRef, useState } from 'react';
-import { PlotKey } from 'url2';
-import { Button, InputText, TextArea, Tooltip } from 'components/UI';
-import { useStatsHouseShallow } from 'store2';
-import { PlotNavigate } from '../PlotNavigate';
+import { memo, useCallback, useEffect, useId, useMemo, useRef, useState } from 'react';
+import { PlotKey } from '@/url2';
+import { Button, InputText, TextArea, Tooltip } from '@/components/UI';
+import { useStatsHouseShallow } from '@/store2';
+import { PlotNavigate } from '@/components2';
import cn from 'classnames';
import css from './style.module.css';
import markdownStyles from '../../style.module.css';
@@ -19,11 +19,11 @@ import { ReactComponent as SVGChevronDown } from 'bootstrap-icons/icons/chevron-
import { ReactComponent as SVGCheckLg } from 'bootstrap-icons/icons/check-lg.svg';
import { ReactComponent as SVGX } from 'bootstrap-icons/icons/x.svg';
import { ReactComponent as SVGPencil } from 'bootstrap-icons/icons/pencil.svg';
-import { useOnClickOutside } from 'hooks';
+import { useOnClickOutside } from '@/hooks';
import { PlotHeaderTooltipContent } from './PlotHeaderTooltipContent';
import { PlotName } from './PlotName';
import { PlotHeaderBadges } from './PlotHeaderBadges';
-import { getMetricMeta, getMetricName, getMetricWhat } from '../../../store2/helpers';
+import { getMetricMeta, getMetricName, getMetricWhat } from '@/store2/helpers';
import { PlotLink } from '../PlotLink';
import { PlotHeaderBadgeResolution } from './PlotHeaderBadgeResolution';
import { MarkdownRender } from './MarkdownRender';
@@ -35,7 +35,7 @@ const stopPropagation = (e: React.MouseEvent) => {
e.stopPropagation();
};
-export function _PlotHeader({ plotKey, isDashboard }: PlotHeaderProps) {
+export const PlotHeader = memo(function PlotHeader({ plotKey, isDashboard }: PlotHeaderProps) {
const { plot, metricName, what, meta, isEmbed, dashboardLayoutEdit, canRemove, setPlot, removePlot } =
useStatsHouseShallow(
({ plotsData, params: { plots, orderPlot }, metricMeta, isEmbed, dashboardLayoutEdit, setPlot, removePlot }) => {
@@ -340,5 +340,4 @@ export function _PlotHeader({ plotKey, isDashboard }: PlotHeaderProps) {
))}
);
-}
-export const PlotHeader = memo(_PlotHeader);
+});
diff --git a/statshouse-ui/src/components2/Plot/PlotView/PlotHeaderBadgeResolution.tsx b/statshouse-ui/src/components2/Plot/PlotView/PlotHeaderBadgeResolution.tsx
index e28a639ad..edc9649bf 100644
--- a/statshouse-ui/src/components2/Plot/PlotView/PlotHeaderBadgeResolution.tsx
+++ b/statshouse-ui/src/components2/Plot/PlotView/PlotHeaderBadgeResolution.tsx
@@ -1,4 +1,4 @@
-import { Tooltip } from 'components/UI';
+import { Tooltip } from '@/components/UI';
import cn from 'classnames';
import React from 'react';
diff --git a/statshouse-ui/src/components2/Plot/PlotView/PlotHeaderBadges.tsx b/statshouse-ui/src/components2/Plot/PlotView/PlotHeaderBadges.tsx
index 20d7cd9bb..453f16ed2 100644
--- a/statshouse-ui/src/components2/Plot/PlotView/PlotHeaderBadges.tsx
+++ b/statshouse-ui/src/components2/Plot/PlotView/PlotHeaderBadges.tsx
@@ -7,12 +7,12 @@ import React, { useMemo } from 'react';
import cn from 'classnames';
-import { Tooltip } from 'components/UI';
-import { getNewMetric, type PlotKey } from 'url2';
-import { useStatsHouseShallow } from 'store2';
-import { METRIC_VALUE_BACKEND_VERSION, toTagKey } from 'api/enum';
-import { formatTagValue } from 'view/api';
-import { getMetricMeta } from 'store2/helpers';
+import { Tooltip } from '@/components/UI';
+import { getNewMetric, type PlotKey } from '@/url2';
+import { useStatsHouseShallow } from '@/store2';
+import { METRIC_VALUE_BACKEND_VERSION, toTagKey } from '@/api/enum';
+import { formatTagValue } from '@/view/api';
+import { getMetricMeta } from '@/store2/helpers';
import { PlotHeaderBadgeResolution } from './PlotHeaderBadgeResolution';
const emptyPlot = getNewMetric();
diff --git a/statshouse-ui/src/components2/Plot/PlotView/PlotHealsStatus.tsx b/statshouse-ui/src/components2/Plot/PlotView/PlotHealsStatus.tsx
index e0b22d1c5..5c4666b25 100644
--- a/statshouse-ui/src/components2/Plot/PlotView/PlotHealsStatus.tsx
+++ b/statshouse-ui/src/components2/Plot/PlotView/PlotHealsStatus.tsx
@@ -4,21 +4,22 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import React, { memo, useCallback, useMemo } from 'react';
-import { type PlotKey } from 'url2';
-import { Button, Tooltip } from 'components/UI';
+import { memo, useCallback, useMemo } from 'react';
+import type { PlotKey } from '@/url2';
+import { Button, Tooltip } from '@/components/UI';
import { ReactComponent as SVGExclamationTriangleFill } from 'bootstrap-icons/icons/exclamation-triangle-fill.svg';
import { ReactComponent as SVGArrowCounterclockwise } from 'bootstrap-icons/icons/arrow-counterclockwise.svg';
-import { useStatsHouseShallow } from 'store2';
+import { useStatsHouseShallow } from '@/store2';
import cn from 'classnames';
-import { useLiveModeStore } from 'store2/liveModeStore';
-import { usePlotLoader } from 'store2/plotQueryStore';
+import { useLiveModeStore } from '@/store2/liveModeStore';
+import { usePlotLoader } from '@/store2/plotQueryStore';
export type PlotHealsStatusProps = {
className?: string;
plotKey: PlotKey;
};
-export function _PlotHealsStatus({ className, plotKey }: PlotHealsStatusProps) {
+
+export const PlotHealsStatus = memo(function PlotHealsStatus({ className, plotKey }: PlotHealsStatusProps) {
const interval = useLiveModeStore(({ interval }) => interval);
const loader = usePlotLoader(plotKey);
const { lastError, plotHealsTimeout, clearPlotError, loadPlotData } = useStatsHouseShallow(
@@ -69,12 +70,11 @@ export function _PlotHealsStatus({ className, plotKey }: PlotHealsStatusProps) {
>
{loader ? (
- ) : !!lastError ? (
+ ) : lastError ? (
) : null}
);
-}
-export const PlotHealsStatus = memo(_PlotHealsStatus);
+});
diff --git a/statshouse-ui/src/components2/Plot/PlotView/PlotName.tsx b/statshouse-ui/src/components2/Plot/PlotView/PlotName.tsx
index 48c90a12e..130a3eb9a 100644
--- a/statshouse-ui/src/components2/Plot/PlotView/PlotName.tsx
+++ b/statshouse-ui/src/components2/Plot/PlotView/PlotName.tsx
@@ -4,17 +4,17 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import React, { memo } from 'react';
+import { memo } from 'react';
import cn from 'classnames';
-import { PlotKey } from 'url2';
-import { useStatsHouseShallow } from 'store2';
-import { getMetricName, getMetricWhat } from 'store2/helpers';
+import type { PlotKey } from '@/url2';
+import { useStatsHouseShallow } from '@/store2';
+import { getMetricName, getMetricWhat } from '@/store2/helpers';
export type PlotNameProps = {
plotKey: PlotKey;
className?: string;
};
-export function _PlotName({ plotKey, className }: PlotNameProps) {
+export const PlotName = memo(function PlotName({ plotKey, className }: PlotNameProps) {
const { customName, metricName, what } = useStatsHouseShallow(({ params: { plots }, plotsData }) => {
const plot = plots[plotKey];
const plotData = plotsData[plotKey];
@@ -37,6 +37,4 @@ export function _PlotName({ plotKey, className }: PlotNameProps) {
);
}
return ;
-}
-
-export const PlotName = memo(_PlotName);
+});
diff --git a/statshouse-ui/src/components2/Plot/PlotView/PlotSubMenu.tsx b/statshouse-ui/src/components2/Plot/PlotView/PlotSubMenu.tsx
index 9db1cd7d7..315104e38 100644
--- a/statshouse-ui/src/components2/Plot/PlotView/PlotSubMenu.tsx
+++ b/statshouse-ui/src/components2/Plot/PlotView/PlotSubMenu.tsx
@@ -4,22 +4,22 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import React, { memo } from 'react';
-import { PlotKey } from 'url2';
+import { memo } from 'react';
+import { PlotKey } from '@/url2';
import { Link } from 'react-router-dom';
import cn from 'classnames';
-import { useStatsHouseShallow } from 'store2';
-import { formatSI } from 'common/formatByMetricType';
-import { useLinkCSV2 } from 'hooks/useLinkCSV2';
-import { useMetricBadges } from 'hooks/useMetricBadges';
-import { isPromQL } from 'store2/helpers';
+import { useStatsHouseShallow } from '@/store2';
+import { formatSI } from '@/common/formatByMetricType';
+import { useLinkCSV2 } from '@/hooks/useLinkCSV2';
+import { useMetricBadges } from '@/hooks/useMetricBadges';
+import { isPromQL } from '@/store2/helpers';
export type PlotSubMenuProps = {
className?: string;
plotKey: PlotKey;
};
-export function _PlotSubMenu({ className, plotKey }: PlotSubMenuProps) {
+export const PlotSubMenu = memo(function PlotSubMenu({ className, plotKey }: PlotSubMenuProps) {
const { metricName, params, plot, timeRange } = useStatsHouseShallow(({ plotsData, params }) => ({
metricName:
plotsData[plotKey]?.metricName ??
@@ -150,5 +150,4 @@ export function _PlotSubMenu({ className, plotKey }: PlotSubMenuProps) {
);
-}
-export const PlotSubMenu = memo(_PlotSubMenu);
+});
diff --git a/statshouse-ui/src/components2/Plot/PlotView/PlotView.tsx b/statshouse-ui/src/components2/Plot/PlotView/PlotView.tsx
index a399ab5b0..f6eb0f27d 100644
--- a/statshouse-ui/src/components2/Plot/PlotView/PlotView.tsx
+++ b/statshouse-ui/src/components2/Plot/PlotView/PlotView.tsx
@@ -4,19 +4,19 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import React, { memo } from 'react';
-import { PLOT_TYPE } from 'api/enum';
+import { memo } from 'react';
+import { PLOT_TYPE } from '@/api/enum';
import { PlotViewMetric } from './PlotViewMetric';
import { PlotViewEvent } from './PlotViewEvent';
-import { PlotKey } from 'url2';
-import { useStatsHouse } from 'store2';
+import { PlotKey } from '@/url2';
+import { useStatsHouse } from '@/store2';
export type PlotViewProps = {
className?: string;
plotKey: PlotKey;
isDashboard?: boolean;
};
-export function _PlotView(props: PlotViewProps) {
+export const PlotView = memo(function PlotView(props: PlotViewProps) {
const type = useStatsHouse((s) => s.params.plots[props.plotKey]?.type);
switch (type) {
case PLOT_TYPE.Metric:
@@ -26,6 +26,4 @@ export function _PlotView(props: PlotViewProps) {
default:
return null;
}
-}
-
-export const PlotView = memo(_PlotView);
+});
diff --git a/statshouse-ui/src/components2/Plot/PlotView/PlotViewEvent.tsx b/statshouse-ui/src/components2/Plot/PlotView/PlotViewEvent.tsx
index ce607342f..5314664a2 100644
--- a/statshouse-ui/src/components2/Plot/PlotView/PlotViewEvent.tsx
+++ b/statshouse-ui/src/components2/Plot/PlotView/PlotViewEvent.tsx
@@ -5,36 +5,35 @@
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { type PlotViewProps } from './PlotView';
-import { useStatsHouse, useStatsHouseShallow } from 'store2';
-import { useThemeStore } from 'store2/themeStore';
-import { useIntersectionObserver, useStateToRef, useUPlotPluginHooks } from 'hooks';
-import { black, grey, greyDark } from 'view/palette';
+import type { PlotViewProps } from './PlotView';
+import { useStatsHouse, useStatsHouseShallow } from '@/store2';
+import { useThemeStore } from '@/store2/themeStore';
+import { useIntersectionObserver, useStateToRef, useUPlotPluginHooks } from '@/hooks';
+import { black, grey, greyDark } from '@/view/palette';
import {
UPlotPluginPortal,
UPlotWrapper,
UPlotWrapperPropsOpts,
UPlotWrapperPropsScales,
-} from 'components/UPlotWrapper';
-import { formatByMetricType, getMetricType, splitByMetricType } from 'common/formatByMetricType';
-import { dataIdxNearest } from 'common/dataIdxNearest';
-import { font, getYAxisSize, xAxisValues, xAxisValuesCompact } from 'common/axisValues';
-import { yAxisSize } from 'common/settings';
-import { METRIC_TYPE } from 'api/enum';
+} from '@/components/UPlotWrapper';
+import { formatByMetricType, getMetricType } from '@/common/formatByMetricType';
+import { dataIdxNearest } from '@/common/dataIdxNearest';
+import { font, getYAxisSize, xAxisValues, xAxisValuesCompact } from '@/common/axisValues';
+import { yAxisSize } from '@/common/settings';
import { xRangeStatic } from './xRangeStatic';
-import { calcYRange } from 'common/calcYRange';
+import { calcYRange } from '@/common/calcYRange';
import { dateRangeFormat } from './dateRangeFormat';
import cn from 'classnames';
import { PlotHealsStatus } from './PlotHealsStatus';
import { PlotHeader } from './PlotHeader';
import { PlotSubMenu } from './PlotSubMenu';
import css from './style.module.css';
-import { incrs, metricTypeIncrs } from './constants';
+import { metricTypeIncrs } from './constants';
import { PlotEvents } from './PlotEvents';
import uPlot from 'uplot';
-import { setLiveMode } from 'store2/liveModeStore';
-import { setPlotVisibility } from 'store2/plotVisibilityStore';
-import { createPlotPreview } from 'store2/plotPreviewStore';
+import { setLiveMode } from '@/store2/liveModeStore';
+import { setPlotVisibility } from '@/store2/plotVisibilityStore';
+import { createPlotPreview } from '@/store2/plotPreviewStore';
const rightPad = 16;
@@ -224,7 +223,7 @@ export function PlotViewEvent({ plotKey, className, isDashboard }: PlotViewProps
scales: {
x: { auto: false, range: xRangeStatic },
y: {
- auto: (u) => !yLockRef.current || (yLockRef.current.min === 0 && yLockRef.current.max === 0),
+ auto: (_) => !yLockRef.current || (yLockRef.current.min === 0 && yLockRef.current.max === 0),
range: (u: uPlot): uPlot.Range.MinMax => {
const min = yLockRef.current.min;
const max = yLockRef.current.max;
@@ -258,8 +257,7 @@ export function PlotViewEvent({ plotKey, className, isDashboard }: PlotViewProps
}
// setUPlotWidth(indexPlot, u.bbox.width);
u.over.onclick = () => {
- // @ts-ignore
- setCursorLock(u.cursor._lock);
+ setCursorLock((u.cursor as { _lock: boolean })._lock);
};
u.over.ondblclick = () => {
resetZoomRef.current(plotKey);
diff --git a/statshouse-ui/src/components2/Plot/PlotView/PlotViewMetric.tsx b/statshouse-ui/src/components2/Plot/PlotView/PlotViewMetric.tsx
index d66f39056..5ed70b742 100644
--- a/statshouse-ui/src/components2/Plot/PlotView/PlotViewMetric.tsx
+++ b/statshouse-ui/src/components2/Plot/PlotView/PlotViewMetric.tsx
@@ -5,38 +5,38 @@
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { type PlotViewProps } from './PlotView';
-import { black, grey, greyDark } from 'view/palette';
-import { useIntersectionObserver, useStateToRef, useUPlotPluginHooks } from 'hooks';
+import type { PlotViewProps } from './PlotView';
+import { black, grey, greyDark } from '@/view/palette';
+import { useIntersectionObserver, useStateToRef, useUPlotPluginHooks } from '@/hooks';
import cn from 'classnames';
-import { useStatsHouse, useStatsHouseShallow } from 'store2';
-import { yAxisSize } from 'common/settings';
+import { useStatsHouse, useStatsHouseShallow } from '@/store2';
+import { yAxisSize } from '@/common/settings';
import { PlotHealsStatus } from './PlotHealsStatus';
import { PlotHeader } from './PlotHeader';
import { PlotSubMenu } from './PlotSubMenu';
import { PlotLegend } from '../PlotLegend';
import { dateRangeFormat } from './dateRangeFormat';
-import { dataIdxNearest } from 'common/dataIdxNearest';
-import { font, getYAxisSize, xAxisValues, xAxisValuesCompact } from 'common/axisValues';
-import { formatByMetricType, getMetricType } from 'common/formatByMetricType';
+import { dataIdxNearest } from '@/common/dataIdxNearest';
+import { font, getYAxisSize, xAxisValues, xAxisValuesCompact } from '@/common/axisValues';
+import { formatByMetricType, getMetricType } from '@/common/formatByMetricType';
import { xRangeStatic } from './xRangeStatic';
-import { calcYRange } from 'common/calcYRange';
+import { calcYRange } from '@/common/calcYRange';
import css from './style.module.css';
import { PlotEventOverlay } from './PlotEventOverlay';
-import { type PlotValues } from 'store2/plotDataStore';
-import { useThemeStore } from 'store2/themeStore';
+import type { PlotValues } from '@/store2/plotDataStore';
+import { useThemeStore } from '@/store2/themeStore';
import { metricTypeIncrs } from './constants';
-import { setLiveMode } from 'store2/liveModeStore';
-import { setPlotVisibility } from 'store2/plotVisibilityStore';
-import { createPlotPreview } from 'store2/plotPreviewStore';
+import { setLiveMode } from '@/store2/liveModeStore';
+import { setPlotVisibility } from '@/store2/plotVisibilityStore';
+import { createPlotPreview } from '@/store2/plotPreviewStore';
import {
LegendItem,
UPlotPluginPortal,
UPlotWrapper,
UPlotWrapperPropsOpts,
UPlotWrapperPropsScales,
-} from 'components/UPlotWrapper';
-import { bwd, fwd, log2Filter, log2Splits } from 'common/helpers';
+} from '@/components/UPlotWrapper';
+import { bwd, fwd, log2Filter, log2Splits } from '@/common/helpers';
import type uPlot from 'uplot';
const rightPad = 16;
@@ -269,8 +269,7 @@ export function PlotViewMetric({ className, plotKey, isDashboard }: PlotViewProp
}
// setUPlotWidth(indexPlot, u.bbox.width);
u.over.onclick = () => {
- // @ts-ignore
- setCursorLock(u.cursor._lock);
+ setCursorLock((u.cursor as { _lock: boolean })._lock);
};
u.over.ondblclick = () => {
resetZoomRef.current(plotKey);
@@ -337,7 +336,7 @@ export function PlotViewMetric({ className, plotKey, isDashboard }: PlotViewProp
}
}, [isActive, isDashboard, plotKey, visibleBool]);
- const onUpdateLegend = useCallback[]>>>(
+ const onUpdateLegend = useCallback[]>>>(
(legend) => {
setLegend((prevLegend) => {
const nextLegend = typeof legend === 'function' ? legend(prevLegend) : legend;
diff --git a/statshouse-ui/src/components2/Plot/PlotView/dateRangeFormat.tsx b/statshouse-ui/src/components2/Plot/PlotView/dateRangeFormat.tsx
index 481e4ab57..4a4030c05 100644
--- a/statshouse-ui/src/components2/Plot/PlotView/dateRangeFormat.tsx
+++ b/statshouse-ui/src/components2/Plot/PlotView/dateRangeFormat.tsx
@@ -6,7 +6,7 @@
import uPlot from 'uplot';
-import { fmtInputDateTime } from 'view/utils2';
+import { fmtInputDateTime } from '@/view/utils2';
export function dateRangeFormat(self: uPlot, rawValue: number, seriesIdx: number, idx: number | null): string | number {
if (idx === null) {
diff --git a/statshouse-ui/src/components2/Plot/PlotView/xRangeStatic.tsx b/statshouse-ui/src/components2/Plot/PlotView/xRangeStatic.tsx
index 3e7224978..41434cd7c 100644
--- a/statshouse-ui/src/components2/Plot/PlotView/xRangeStatic.tsx
+++ b/statshouse-ui/src/components2/Plot/PlotView/xRangeStatic.tsx
@@ -6,7 +6,7 @@
import uPlot from 'uplot';
-import { now } from 'view/utils2';
+import { now } from '@/view/utils2';
export function xRangeStatic(u: uPlot, dataMin: number | null, dataMax: number | null): [number, number] {
if (dataMin === null || dataMax === null) {
diff --git a/statshouse-ui/src/components2/TvMode/ButtonToggleTvMode.tsx b/statshouse-ui/src/components2/TvMode/ButtonToggleTvMode.tsx
index d3cf50275..070beea41 100644
--- a/statshouse-ui/src/components2/TvMode/ButtonToggleTvMode.tsx
+++ b/statshouse-ui/src/components2/TvMode/ButtonToggleTvMode.tsx
@@ -4,17 +4,18 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import React, { memo, useCallback } from 'react';
+import { memo, useCallback } from 'react';
import cn from 'classnames';
-import { ToggleButton } from 'components/UI';
+import { ToggleButton } from '@/components/UI';
import { ReactComponent as SVGFullscreen } from 'bootstrap-icons/icons/fullscreen.svg';
import { ReactComponent as SVGFullscreenExit } from 'bootstrap-icons/icons/fullscreen-exit.svg';
-import { setTVMode, useTvModeStore } from 'store2/tvModeStore';
+import { setTVMode, useTvModeStore } from '@/store2/tvModeStore';
export type ButtonToggleTvModeProps = {
className?: string;
};
-export function _ButtonToggleTvMode({ className }: ButtonToggleTvModeProps) {
+
+export const ButtonToggleTvMode = memo(function ButtonToggleTvMode({ className }: ButtonToggleTvModeProps) {
const enable = useTvModeStore(({ enable }) => enable);
const onToggle = useCallback((status: boolean) => {
@@ -30,5 +31,4 @@ export function _ButtonToggleTvMode({ className }: ButtonToggleTvModeProps) {
{enable ? : }
);
-}
-export const ButtonToggleTvMode = memo(_ButtonToggleTvMode);
+});
diff --git a/statshouse-ui/src/components2/TvMode/TvModeInterval.tsx b/statshouse-ui/src/components2/TvMode/TvModeInterval.tsx
index 524fd81d5..78a1c0e58 100644
--- a/statshouse-ui/src/components2/TvMode/TvModeInterval.tsx
+++ b/statshouse-ui/src/components2/TvMode/TvModeInterval.tsx
@@ -5,8 +5,8 @@
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
import React, { memo, useCallback } from 'react';
-import { toNumber } from 'common/helpers';
-import { defaultInterval, setTVMode, useTvModeStore } from 'store2/tvModeStore';
+import { toNumber } from '@/common/helpers';
+import { defaultInterval, setTVMode, useTvModeStore } from '@/store2/tvModeStore';
export type TvModeIntervalProps = {
className?: string;
@@ -25,7 +25,7 @@ const tvModeIntervalsOptions = [
{ value: 300000, name: '6 min.' },
];
-export function _TvModeInterval({ className }: TvModeIntervalProps) {
+export const TvModeInterval = memo(function TvModeInterval() {
const interval = useTvModeStore(({ interval }) => interval);
const onChange = useCallback((event: React.ChangeEvent) => {
const value = toNumber(event.currentTarget.value, defaultInterval);
@@ -40,6 +40,4 @@ export function _TvModeInterval({ className }: TvModeIntervalProps) {
))}
);
-}
-
-export const TvModeInterval = memo(_TvModeInterval);
+});
diff --git a/statshouse-ui/src/components2/TvMode/TvModePanel.tsx b/statshouse-ui/src/components2/TvMode/TvModePanel.tsx
index 2c6439478..d85e5238d 100644
--- a/statshouse-ui/src/components2/TvMode/TvModePanel.tsx
+++ b/statshouse-ui/src/components2/TvMode/TvModePanel.tsx
@@ -4,16 +4,15 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import React, { memo } from 'react';
+import { memo } from 'react';
import { ButtonToggleLiveMode } from '../Plot/PlotNavigate/ButtonToggleLiveMode';
-import { ButtonToggleTvMode } from './ButtonToggleTvMode';
-import { TvModeInterval } from './TvModeInterval';
+import { ButtonToggleTvMode, TvModeInterval } from '@/components2';
export type TvModePanelProps = {
className?: string;
};
-export function _TvModePanel({ className }: TvModePanelProps) {
+export const TvModePanel = memo(function TvModePanel({ className }: TvModePanelProps) {
return (
@@ -23,6 +22,4 @@ export function _TvModePanel({ className }: TvModePanelProps) {
);
-}
-
-export const TvModePanel = memo(_TvModePanel);
+});
diff --git a/statshouse-ui/src/css.d.ts b/statshouse-ui/src/css.d.ts
new file mode 100644
index 000000000..15f3046e3
--- /dev/null
+++ b/statshouse-ui/src/css.d.ts
@@ -0,0 +1,14 @@
+declare module '*.module.css' {
+ const classes: { readonly [key: string]: string };
+ export default classes;
+}
+
+declare module '*.module.scss' {
+ const classes: { readonly [key: string]: string };
+ export default classes;
+}
+
+declare module '*.module.sass' {
+ const classes: { readonly [key: string]: string };
+ export default classes;
+}
diff --git a/statshouse-ui/src/hooks/useError.ts b/statshouse-ui/src/hooks/useError.ts
index 89ed3f5ef..10df7cb0b 100644
--- a/statshouse-ui/src/hooks/useError.ts
+++ b/statshouse-ui/src/hooks/useError.ts
@@ -4,7 +4,7 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { selectorError, useErrorStore } from 'store/errors';
+import { selectorError, useErrorStore } from '@/store/errors';
import { useMemo } from 'react';
export function useError(channel?: string) {
diff --git a/statshouse-ui/src/hooks/useEventTagColumns2.ts b/statshouse-ui/src/hooks/useEventTagColumns2.ts
index 34149c02b..3eb1eebf5 100644
--- a/statshouse-ui/src/hooks/useEventTagColumns2.ts
+++ b/statshouse-ui/src/hooks/useEventTagColumns2.ts
@@ -6,11 +6,11 @@
import { useMemo } from 'react';
import { ApiTableRowNormalize } from '../api/tableOld';
-import { PlotParams } from 'url2';
+import { PlotParams } from '@/url2';
import { MetricMetaValue } from '../api/metric';
import { toTagKey } from '../url/queryParams';
import { TAG_KEY } from '../api/enum';
-import { useStatsHouse } from 'store2';
+import { useStatsHouse } from '@/store2';
import { getTagDescription } from '../view/utils2';
export function getEventTagColumns(plot?: PlotParams, meta?: MetricMetaValue, selectedOnly: boolean = false) {
diff --git a/statshouse-ui/src/hooks/useIntersectionObserver.ts b/statshouse-ui/src/hooks/useIntersectionObserver.ts
index 41542dc41..1a02c1a95 100644
--- a/statshouse-ui/src/hooks/useIntersectionObserver.ts
+++ b/statshouse-ui/src/hooks/useIntersectionObserver.ts
@@ -1,7 +1,7 @@
import { RefObject, useEffect, useState } from 'react';
export function buildThresholdList(step: number = 0.5) {
- let thresholds = [];
+ const thresholds = [];
for (let i = 0; i <= 1; i += step) {
thresholds.push(i);
}
diff --git a/statshouse-ui/src/hooks/useLinkCSV.ts b/statshouse-ui/src/hooks/useLinkCSV.ts
index 024d31f32..9f2163fcb 100644
--- a/statshouse-ui/src/hooks/useLinkCSV.ts
+++ b/statshouse-ui/src/hooks/useLinkCSV.ts
@@ -22,8 +22,8 @@ export function useLinkCSV(indexPlot: number) {
lastPlotParams.customAgg === -1
? `${Math.floor(width / 2)}`
: lastPlotParams.customAgg === 0
- ? `${Math.floor(width * devicePixelRatio)}`
- : `${lastPlotParams.customAgg}s`;
+ ? `${Math.floor(width * devicePixelRatio)}`
+ : `${lastPlotParams.customAgg}s`;
return queryURLCSV(lastPlotParams, timeRange, timeShifts, agg, params);
}, [indexPlot, params, timeRange, width]);
}
diff --git a/statshouse-ui/src/hooks/useLinkCSV2.ts b/statshouse-ui/src/hooks/useLinkCSV2.ts
index 35212186b..831343db7 100644
--- a/statshouse-ui/src/hooks/useLinkCSV2.ts
+++ b/statshouse-ui/src/hooks/useLinkCSV2.ts
@@ -1,5 +1,5 @@
import { useMemo } from 'react';
-import { type PlotKey, type QueryParams } from 'url2';
+import type { PlotKey, QueryParams } from '@/url2';
import { useStatsHouse } from '../store2';
import { GET_PARAMS } from '../api/enum';
import { getLoadPlotUrlParams } from '../store2/plotDataStore/loadPlotData';
diff --git a/statshouse-ui/src/hooks/useLinkPlot.ts b/statshouse-ui/src/hooks/useLinkPlot.ts
index d97c67e60..b468adeaa 100644
--- a/statshouse-ui/src/hooks/useLinkPlot.ts
+++ b/statshouse-ui/src/hooks/useLinkPlot.ts
@@ -1,12 +1,12 @@
-import { type PlotKey } from 'url2';
-import { useStatsHouse, useStatsHouseShallow, viewPath } from 'store2';
+import type { PlotKey } from '@/url2';
+import { useStatsHouse, useStatsHouseShallow, viewPath } from '@/store2';
import { useEffect, useMemo } from 'react';
-import { getAddPlotLink, getPlotLink, getPlotSingleLink } from 'store2/helpers';
+import { getAddPlotLink, getPlotLink, getPlotSingleLink } from '@/store2/helpers';
import { To } from 'react-router-dom';
import { create } from 'zustand';
import { immer } from 'zustand/middleware/immer';
-import { usePlotVisibilityStore } from 'store2/plotVisibilityStore';
-import { getUrlObject } from '../common/getUrlObject';
+import { usePlotVisibilityStore } from '@/store2/plotVisibilityStore';
+import { getUrlObject } from '@/common/getUrlObject';
type LinkPlot = {
plotLinks: Partial>;
@@ -70,7 +70,7 @@ export function useLinkPlot(plotKey: PlotKey, visible?: boolean, single?: boolea
return link;
}
-export function useAddLinkPlot(visible: boolean): To {
+export function useAddLinkPlot(_visible: boolean): To {
const { params, saveParams } = useStatsHouseShallow(({ params, saveParams }) => ({ params, saveParams }));
return useMemo(
() => ({
diff --git a/statshouse-ui/src/hooks/useOnClickOutside.ts b/statshouse-ui/src/hooks/useOnClickOutside.ts
index c19b3f7ab..bd4df22e5 100644
--- a/statshouse-ui/src/hooks/useOnClickOutside.ts
+++ b/statshouse-ui/src/hooks/useOnClickOutside.ts
@@ -1,7 +1,7 @@
import { RefObject, useEffect } from 'react';
export function useOnClickOutside(
- ref: RefObject | RefObject[],
+ ref: RefObject | RefObject[],
callback?: (event: MouseEvent) => void
) {
useEffect(() => {
diff --git a/statshouse-ui/src/hooks/useRectObserver.ts b/statshouse-ui/src/hooks/useRectObserver.ts
index f05225ae3..d7c10bfc1 100644
--- a/statshouse-ui/src/hooks/useRectObserver.ts
+++ b/statshouse-ui/src/hooks/useRectObserver.ts
@@ -1,7 +1,7 @@
import { useCallback, useEffect, useState } from 'react';
function getRect(target: Element, fixed: boolean = false) {
- let nextRect = target.getBoundingClientRect();
+ const nextRect = target.getBoundingClientRect();
if (!fixed) {
nextRect.x += window.scrollX;
nextRect.y += window.scrollY;
diff --git a/statshouse-ui/src/hooks/useUPlotPluginHooks.ts b/statshouse-ui/src/hooks/useUPlotPluginHooks.ts
index 2ac2d2d77..a21465d25 100644
--- a/statshouse-ui/src/hooks/useUPlotPluginHooks.ts
+++ b/statshouse-ui/src/hooks/useUPlotPluginHooks.ts
@@ -1,5 +1,5 @@
import { MutableRefObject, useMemo, useRef } from 'react';
-import { type Plugin } from 'uplot';
+import type { Plugin } from 'uplot';
import { UPlotWrapperPropsHooks } from '../components/UPlotWrapper';
import { EventObserver } from '../common/EventObserver';
diff --git a/statshouse-ui/src/hooks/useVariableLink.ts b/statshouse-ui/src/hooks/useVariableLink.ts
index a3ed4708a..4605262bf 100644
--- a/statshouse-ui/src/hooks/useVariableLink.ts
+++ b/statshouse-ui/src/hooks/useVariableLink.ts
@@ -1,7 +1,7 @@
-import { useStatsHouseShallow } from 'store2';
+import { useStatsHouseShallow } from '@/store2';
import { useMemo } from 'react';
-import type { PlotKey } from 'url2';
-import { PlotVariablesLink } from 'store2/plotsInfoStore';
+import type { PlotKey } from '@/url2';
+import { PlotVariablesLink } from '@/store2/plotsInfoStore';
import { TagKey } from '../api/enum';
export function useVariableLink(plotKey: PlotKey, tagKey: TagKey) {
diff --git a/statshouse-ui/src/hooks/useVariablesPlotByPromQL.tsx b/statshouse-ui/src/hooks/useVariablesPlotByPromQL.tsx
index 43d73348a..5585ae436 100644
--- a/statshouse-ui/src/hooks/useVariablesPlotByPromQL.tsx
+++ b/statshouse-ui/src/hooks/useVariablesPlotByPromQL.tsx
@@ -4,10 +4,10 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import type { PlotKey, VariableParams } from 'url2';
-import { useStatsHouseShallow } from 'store2';
+import type { PlotKey, VariableParams } from '@/url2';
+import { useStatsHouseShallow } from '@/store2';
import { useMemo } from 'react';
-import { filterVariableByPromQl } from 'store2/helpers/filterVariableByPromQl';
+import { filterVariableByPromQl } from '@/store2/helpers/filterVariableByPromQl';
export function useVariablesPlotByPromQL(plotKey: PlotKey) {
const { variables, orderVariables, plotPromQL } = useStatsHouseShallow(
diff --git a/statshouse-ui/src/index.scss b/statshouse-ui/src/index.scss
index 301fe5829..26435ef09 100644
--- a/statshouse-ui/src/index.scss
+++ b/statshouse-ui/src/index.scss
@@ -31,7 +31,7 @@
@import '~bootstrap/scss/nav';
@import '~bootstrap/scss/dropdown';
-@import 'uplot/dist/uPlot.min.css';
+@import '~uplot/dist/uPlot.min.css';
@import 'fix.css';
:root {
diff --git a/statshouse-ui/src/index.tsx b/statshouse-ui/src/index.tsx
index 9cf7f9679..72e4a41db 100644
--- a/statshouse-ui/src/index.tsx
+++ b/statshouse-ui/src/index.tsx
@@ -7,17 +7,17 @@
import React, { Suspense } from 'react';
import { createRoot } from 'react-dom/client';
import './index.scss';
-import reportWebVitals from './reportWebVitals';
-import { AppRouter } from 'components/AppRouter';
+import { AppRouter } from '@/components/AppRouter';
import './api/stat'; // global error log
const appVersion = localStorage.getItem('appVersion');
+// eslint-disable-next-line react-refresh/only-export-components
const App = React.lazy(() => {
if (appVersion === '1') {
- return import('./AppOld');
+ return import('./AppOld').then((exports) => ({ default: exports.AppOld }));
} else {
- return import('./App');
+ return import('./App').then((exports) => ({ default: exports.App }));
}
});
@@ -31,5 +31,3 @@ root.render(
);
-
-reportWebVitals(undefined);
diff --git a/statshouse-ui/src/lib/codeMirror/promql.ts b/statshouse-ui/src/lib/codeMirror/promql.ts
index 39fd3f767..046472fa4 100644
--- a/statshouse-ui/src/lib/codeMirror/promql.ts
+++ b/statshouse-ui/src/lib/codeMirror/promql.ts
@@ -12,10 +12,10 @@
// limitations under the License.
// import { CompletionContext } from '@codemirror/autocomplete';
-import { LRLanguage } from '@codemirror/language';
-import { Extension } from '@codemirror/state';
+import {LRLanguage} from '@codemirror/language';
+import {Extension} from '@codemirror/state';
-import { parser } from '../lezer/src/parser';
+import {parser} from '../lezer/src/parser';
// import { CompleteConfiguration, CompleteStrategy, newCompleteStrategy } from './complete';
// import { LintStrategy, newLintStrategy, promQLLinter } from './lint';
diff --git a/statshouse-ui/src/lib/lezer/src/parser.js b/statshouse-ui/src/lib/lezer/src/parser.js
index a87fabacf..2480c1dd8 100644
--- a/statshouse-ui/src/lib/lezer/src/parser.js
+++ b/statshouse-ui/src/lib/lezer/src/parser.js
@@ -101,11 +101,7 @@ export const parser = LRParser.deserialize({
tokenizers: [0, 1, 2, 3],
topRules: { PromQL: [0, 28], MetricName: [1, 150] },
specialized: [
- {
- term: 53,
- get: (value, stack) => specializeIdentifier(value, stack) << 1,
- external: specializeIdentifier,
- },
+ { term: 53, get: (value, stack) => specializeIdentifier(value, stack) << 1, external: specializeIdentifier },
{
term: 53,
get: (value, stack) => (extendIdentifier(value, stack) << 1) | 1,
diff --git a/statshouse-ui/src/lib/lezer/src/parser.terms.js b/statshouse-ui/src/lib/lezer/src/parser.terms.js
index 9acf073a4..443c7a5ca 100644
--- a/statshouse-ui/src/lib/lezer/src/parser.terms.js
+++ b/statshouse-ui/src/lib/lezer/src/parser.terms.js
@@ -1,5 +1,6 @@
// This file was generated by lezer-generator. You probably shouldn't edit it.
-export const inf = 155,
+export const
+ inf = 155,
nan = 156,
Bool = 1,
Ignoring = 2,
@@ -150,4 +151,4 @@ export const inf = 155,
StepInvariantExpr = 147,
At = 148,
AtModifierPreprocessors = 149,
- MetricName = 150;
+ MetricName = 150
diff --git a/statshouse-ui/src/reportWebVitals.ts b/statshouse-ui/src/reportWebVitals.ts
deleted file mode 100644
index 412e18402..000000000
--- a/statshouse-ui/src/reportWebVitals.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2022 V Kontakte LLC
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-import { ReportHandler } from 'web-vitals';
-
-function reportWebVitals(onPerfEntry?: ReportHandler) {
- if (onPerfEntry) {
- import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
- getCLS(onPerfEntry);
- getFID(onPerfEntry);
- getFCP(onPerfEntry);
- getLCP(onPerfEntry);
- getTTFB(onPerfEntry);
- });
- }
-}
-
-export default reportWebVitals;
diff --git a/statshouse-ui/src/setupProxy.js b/statshouse-ui/src/setupProxy.js
deleted file mode 100644
index 7d7049455..000000000
--- a/statshouse-ui/src/setupProxy.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const { createProxyMiddleware } = require('http-proxy-middleware');
-
-module.exports = function (app) {
- if (process.env.REACT_APP_PROXY) {
- app.use(
- '/api',
- createProxyMiddleware({
- target: process.env.REACT_APP_PROXY,
- changeOrigin: true,
- onProxyReq: (proxyReq) => {
- if (process.env.REACT_APP_PROXY_COOKIE) {
- proxyReq.setHeader('cookie', process.env.REACT_APP_PROXY_COOKIE);
- }
- },
- })
- );
- }
-};
diff --git a/statshouse-ui/src/store/dev/selectors.ts b/statshouse-ui/src/store/dev/selectors.ts
index 91e9e4234..1695040a9 100644
--- a/statshouse-ui/src/store/dev/selectors.ts
+++ b/statshouse-ui/src/store/dev/selectors.ts
@@ -4,6 +4,6 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { type DevStore } from './devStore';
+import type { DevStore } from './devStore';
export const selectorDevEnabled = (s: DevStore) => s.enabled;
diff --git a/statshouse-ui/src/store/linkList/linkListStore.ts b/statshouse-ui/src/store/linkList/linkListStore.ts
index cbd9d7cb3..2d428c853 100644
--- a/statshouse-ui/src/store/linkList/linkListStore.ts
+++ b/statshouse-ui/src/store/linkList/linkListStore.ts
@@ -49,7 +49,7 @@ export function getLinkById(indexPlot: number, params: QueryParams, defaultParam
}
export function getAddNewPlotLink(params: QueryParams, defaultParams: QueryParams) {
- let tabNum = params.tabNum < 0 ? params.plots.length - 1 : params.tabNum;
+ const tabNum = params.tabNum < 0 ? params.plots.length - 1 : params.tabNum;
const copyPlot = deepClone(params.plots[tabNum]) ?? getNewPlot();
const groupInfo = params.dashboard?.groupInfo?.map((g) => ({ ...g }));
if (groupInfo?.length) {
diff --git a/statshouse-ui/src/store/liveMode/liveModeStore.ts b/statshouse-ui/src/store/liveMode/liveModeStore.ts
index f0cb3bad3..4d2db83d6 100644
--- a/statshouse-ui/src/store/liveMode/liveModeStore.ts
+++ b/statshouse-ui/src/store/liveMode/liveModeStore.ts
@@ -1,8 +1,8 @@
import { createStore } from '../createStore';
import { useStore } from '../statshouse';
-import { debug } from 'common/debug';
+import { debug } from '@/common/debug';
import { produce } from 'immer';
-import { now } from 'view/utils2';
+import { now } from '@/view/utils2';
export type LiveModeStore = {
live: boolean;
diff --git a/statshouse-ui/src/store/namespace/namespaceListStore.ts b/statshouse-ui/src/store/namespace/namespaceListStore.ts
index a3409378a..b21aea5b9 100644
--- a/statshouse-ui/src/store/namespace/namespaceListStore.ts
+++ b/statshouse-ui/src/store/namespace/namespaceListStore.ts
@@ -1,15 +1,15 @@
import { createStore } from '../createStore';
import { useErrorStore } from '../errors';
-import { GET_PARAMS } from 'api/enum';
+import { GET_PARAMS } from '@/api/enum';
import {
apiNamespaceFetch,
ApiNamespacePost,
ApiNamespacePut,
apiPostNamespaceFetch,
apiPutNamespaceFetch,
-} from 'api/namespace';
-import { apiNamespaceListFetch, NamespaceShort } from 'api/namespaceList';
-import { sortByKey } from 'view/utils';
+} from '@/api/namespace';
+import { apiNamespaceListFetch, NamespaceShort } from '@/api/namespaceList';
+import { sortByKey } from '@/view/utils';
import { ExtendedError } from '../../api/api';
export const namespaceListErrors = 'groupListErrors';
diff --git a/statshouse-ui/src/store/plot/plotPreviewStore.ts b/statshouse-ui/src/store/plot/plotPreviewStore.ts
index db612a309..3f1704b75 100644
--- a/statshouse-ui/src/store/plot/plotPreviewStore.ts
+++ b/statshouse-ui/src/store/plot/plotPreviewStore.ts
@@ -44,7 +44,7 @@ export async function createPlotPreview(indexPlot: number, u: uPlot, width: numb
controller.signal
);
setPlotPreview(indexPlot, url);
- } catch (e) {
+ } catch (_) {
// abort task
}
usePlotPreviewStore.setState((state) => {
diff --git a/statshouse-ui/src/store/selectors.ts b/statshouse-ui/src/store/selectors.ts
index d54ad6893..c27576a40 100644
--- a/statshouse-ui/src/store/selectors.ts
+++ b/statshouse-ui/src/store/selectors.ts
@@ -4,9 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { type Store } from './statshouse';
+import { EventData, type Store } from './statshouse';
import { TimeRange } from '../common/TimeRange';
-import { EventData } from './statshouse';
import { MetricMetaValue } from '../api/metric';
export const selectorParams = (s: Store) => s.params;
diff --git a/statshouse-ui/src/store/statshouse.ts b/statshouse-ui/src/store/statshouse.ts
index f859224c5..8a2e20f6f 100644
--- a/statshouse-ui/src/store/statshouse.ts
+++ b/statshouse-ui/src/store/statshouse.ts
@@ -27,8 +27,8 @@ import {
queryTableRow,
queryTableURL,
queryURL,
-} from '../view/api';
-import { defaultTimeRange, SetTimeRangeValue, TIME_RANGE_KEYS_TO, TimeRange } from '../common/TimeRange';
+} from '@/view/api';
+import { defaultTimeRange, SetTimeRangeValue, TIME_RANGE_KEYS_TO, TimeRange } from '@/common/TimeRange';
import {
apiGet,
apiPost,
@@ -41,20 +41,20 @@ import {
replaceVariable,
sortByKey,
tagSyncToVariableConvert,
-} from '../view/utils';
-import { globalSettings, pxPerChar } from '../common/settings';
-import { debug } from '../common/debug';
-import { calcYRange2 } from '../common/calcYRange';
-import { rgba, selectColor } from '../view/palette';
-import { filterPoints } from '../common/filterPoints';
-import { getNextState } from '../common/getNextState';
-import { stackData } from '../common/stackData';
+} from '@/view/utils';
+import { globalSettings, pxPerChar } from '@/common/settings';
+import { debug } from '@/common/debug';
+import { calcYRange2 } from '@/common/calcYRange';
+import { rgba, selectColor } from '@/view/palette';
+import { filterPoints } from '@/common/filterPoints';
+import { getNextState } from '@/common/getNextState';
+import { stackData } from '@/common/stackData';
import { ErrorCustom, useErrorStore } from './errors';
-import { apiMetricFetch, MetricMetaValue } from '../api/metric';
-import { GET_PARAMS, isQueryWhat, METRIC_TYPE, QUERY_WHAT, type QueryWhat, TAG_KEY, type TagKey } from 'api/enum';
-import { deepClone, defaultBaseRange, mergeLeft, sortEntity, toNumber } from '../common/helpers';
-import { promiseRun } from '../common/promiseRun';
-import { appHistory } from '../common/appHistory';
+import { apiMetricFetch, MetricMetaValue } from '@/api/metric';
+import { GET_PARAMS, isQueryWhat, METRIC_TYPE, QUERY_WHAT, type QueryWhat, TAG_KEY, type TagKey } from '@/api/enum';
+import { deepClone, defaultBaseRange, mergeLeft, sortEntity, toNumber } from '@/common/helpers';
+import { promiseRun } from '@/common/promiseRun';
+import { appHistory } from '@/common/appHistory';
import {
decodeDashboardIdParam,
decodeDashboardVersionParam,
@@ -71,16 +71,16 @@ import {
toIndexTag,
toPlotKey,
VariableParams,
-} from '../url/queryParams';
+} from '@/url/queryParams';
import { clearPlotVisibility, resortPlotVisibility, usePlotVisibilityStore } from './plot/plotVisibilityStore';
import { clearAllPlotPreview, clearPlotPreview, resortPlotPreview } from './plot/plotPreviewStore';
import { createStoreWithEqualityFn } from './createStore';
import { setLiveMode, setLiveModeInterval, useLiveModeStore } from './liveMode';
import { addStatus, removePlotHeals, resortPlotHeals, skipRequestPlot, usePlotHealsStore } from './plot/plotHealsStore';
-import { formatByMetricType, getMetricType } from '../common/formatByMetricType';
-import { dashboardURL } from '../view/dashboardURL';
-import { promQLMetric } from '../view/promQLMetric';
-import { whatToWhatDesc } from '../view/whatToWhatDesc';
+import { formatByMetricType, getMetricType } from '@/common/formatByMetricType';
+import { dashboardURL } from '@/view/dashboardURL';
+import { promQLMetric } from '@/view/promQLMetric';
+import { whatToWhatDesc } from '@/view/whatToWhatDesc';
import {
fmtInputDateTime,
formatLegendValue,
@@ -91,12 +91,12 @@ import {
timeRangeAbbrevExpand,
timeShiftAbbrevExpand,
timeShiftToDash,
-} from '../view/utils2';
-import { DashboardInfo, normalizeDashboard } from '../view/normalizeDashboard';
-import { SelectOptionProps } from '../components/Select';
-import { UPlotWrapperPropsScales } from '../components/UPlotWrapper';
-import { fixMessageTrouble } from '../url/fixMessageTrouble';
-import { ExtendedError } from '../api/api';
+} from '@/view/utils2';
+import { DashboardInfo, normalizeDashboard } from '@/view/normalizeDashboard';
+import { SelectOptionProps } from '@/components/Select';
+import { UPlotWrapperPropsScales } from '@/components/UPlotWrapper';
+import { fixMessageTrouble } from '@/url/fixMessageTrouble';
+import { ExtendedError } from '@/api/api';
export type PlotStore = {
nameMetric: string;
@@ -321,7 +321,11 @@ export const useStore = createStoreWithEqualityFn((setState, getState, st
getState().setParams(
produce((params) => {
params.timeRange = nextTimeRange;
- if (nextTimeRange.from < params.eventFrom && nextTimeRange.to > params.eventFrom) {
+ if (
+ nextTimeRange.from < params.eventFrom &&
+ typeof nextTimeRange.to === 'number' &&
+ nextTimeRange.to > params.eventFrom
+ ) {
params.eventFrom = 0;
}
}),
@@ -351,13 +355,13 @@ export const useStore = createStoreWithEqualityFn((setState, getState, st
saveParams && !(typeof saveParams?.timeRange.to === 'number' && saveParams.timeRange.to > 0)
? saveParams.timeRange.to
: id
- ? 0
- : getDefaultParams().timeRange.to,
+ ? 0
+ : getDefaultParams().timeRange.to,
from: saveParams?.timeRange.from ?? getDefaultParams().timeRange.from,
},
};
- let decodeP = decodeParams(searchParams, localDefaultParams);
+ const decodeP = decodeParams(searchParams, localDefaultParams);
if (!decodeP) {
return;
}
@@ -615,7 +619,7 @@ export const useStore = createStoreWithEqualityFn((setState, getState, st
id: indexPlot.toString(), // fix fallback
events: p.events.filter((v) => v !== index).map((v) => (v > index ? v - 1 : v)),
}));
- params.tagSync = params.tagSync.map((g) => g.filter((tags, plot) => plot !== index));
+ params.tagSync = params.tagSync.map((g) => g.filter((_tags, plot) => plot !== index));
groups.splice(index, 1);
if (params.dashboard?.groupInfo?.length) {
params.dashboard.groupInfo = params.dashboard.groupInfo.map((g, index) => ({
@@ -826,8 +830,8 @@ export const useStore = createStoreWithEqualityFn((setState, getState, st
lastPlotParams.customAgg === -1
? `${Math.floor(width / 4)}`
: lastPlotParams.customAgg === 0
- ? `${Math.floor(width * devicePixelRatio)}`
- : `${lastPlotParams.customAgg}s`;
+ ? `${Math.floor(width * devicePixelRatio)}`
+ : `${lastPlotParams.customAgg}s`;
if (!getState().metricsMeta[lastPlotParams.metricName]) {
getState().loadMetricsMeta(lastPlotParams.metricName);
}
@@ -885,16 +889,16 @@ export const useStore = createStoreWithEqualityFn((setState, getState, st
: apiGet(url, controller.signal, true)
)
.then((resp) => {
- const promqltestfailed = !!resp?.promqltestfailed;
+ const promqltestfailed = !!resp.promqltestfailed;
const uniqueWhat: Set = new Set();
const uniqueName = new Set();
const uniqueMetricType: Set = new Set();
- let series_meta = [...resp?.series.series_meta];
+ let series_meta = [...resp.series.series_meta];
let series_data = [...resp.series.series_data] as (number | null)[][];
const totalLineId = lastPlotParams.totalLine ? series_meta.length : null;
const totalLineLabel = 'Total';
if (lastPlotParams.totalLine) {
- const totalLineData = resp.series.time.map((time, idx) =>
+ const totalLineData = resp.series.time.map((_time, idx) =>
series_data.reduce((res, d) => res + (d[idx] ?? 0), 0)
);
series_meta.push({
@@ -932,7 +936,9 @@ export const useStore = createStoreWithEqualityFn((setState, getState, st
if (isQueryWhat(meta.what)) {
uniqueWhat.add(meta.what);
}
- meta.name && uniqueName.add(meta.name);
+ if (meta.name) {
+ uniqueName.add(meta.name);
+ }
if (meta.metric_type) {
uniqueMetricType.add(meta.metric_type);
}
@@ -964,7 +970,7 @@ export const useStore = createStoreWithEqualityFn((setState, getState, st
const usedBaseColors = {};
const baseColors: Record = {};
let changeColor = false;
- let changeType = currentPrevLastPlotParams?.type !== lastPlotParams.type;
+ const changeType = currentPrevLastPlotParams?.type !== lastPlotParams.type;
const changeView =
currentPrevLastPlotParams?.totalLine !== lastPlotParams.totalLine ||
currentPrevLastPlotParams?.filledGraph !== lastPlotParams.filledGraph;
@@ -1291,7 +1297,7 @@ export const useStore = createStoreWithEqualityFn((setState, getState, st
const otherShow = state.plotsData[indexPlot].seriesShow.some((_show, indexSeries) =>
indexSeries === idx ? false : _show
);
- state.plotsData[indexPlot].seriesShow = state.plotsData[indexPlot].seriesShow.map((s, indexSeries) =>
+ state.plotsData[indexPlot].seriesShow = state.plotsData[indexPlot].seriesShow.map((_, indexSeries) =>
indexSeries === idx ? true : !otherShow
);
} else {
@@ -1435,7 +1441,7 @@ export const useStore = createStoreWithEqualityFn((setState, getState, st
params.plots[indexPlot].what = [QUERY_WHAT.countNorm];
params.plots[indexPlot].numSeries = 5;
break;
- case PLOT_TYPE.Event:
+ case PLOT_TYPE.Event: {
params.plots[indexPlot].what = [QUERY_WHAT.count];
params.plots[indexPlot].numSeries = 0;
params.plots[indexPlot].customAgg = -1;
@@ -1454,9 +1460,10 @@ export const useStore = createStoreWithEqualityFn((setState, getState, st
params.plots[indexPlot].eventsBy = eventsBy;
break;
+ }
}
if (params.plots[indexPlot].type === PLOT_TYPE.Metric) {
- params.plots = params.plots.map((plot, indexP, plotList) => {
+ params.plots = params.plots.map((plot, _indexP, plotList) => {
const eventsFilter = plot.events.filter((eventPlot) => plotList[eventPlot]?.type === PLOT_TYPE.Event);
return {
...plot,
@@ -1931,8 +1938,8 @@ export const useStore = createStoreWithEqualityFn((setState, getState, st
prevPlot.customAgg === -1
? `${Math.floor(width / 4)}`
: prevPlot.customAgg === 0
- ? `${Math.floor(width * devicePixelRatio)}`
- : `${prevPlot.customAgg}s`;
+ ? `${Math.floor(width * devicePixelRatio)}`
+ : `${prevPlot.customAgg}s`;
const lastPlotParams: PlotParams | undefined = replaceVariable(plotKey, prevPlot, prevStateVariables);
@@ -2243,7 +2250,7 @@ export function moveAndResortPlot(
const variables: VariableParams[] = prevState.params.variables.map((variable) => ({
...variable,
link: variable.link.map(([plotKey, tagKey]) => {
- let indexP = toNumber(plotKey);
+ const indexP = toNumber(plotKey);
return [toPlotKey(indexP == null ? indexP : localRemapIndexPlot[indexP]) ?? plotKey, tagKey];
}),
}));
@@ -2338,7 +2345,7 @@ export function moveGroup(indexGroup: number, direction: -1 | 1) {
useStore.getState().setParams(store.params);
} else if (group && targetGroup && count && targetCount) {
let remapIndexPlot: Record | undefined = undefined;
- let startIndex = groups.slice(0, indexGroup).reduce((res, { count }) => res + count, 0);
+ const startIndex = groups.slice(0, indexGroup).reduce((res, { count }) => res + count, 0);
const targetGroupIndex = Math.max(0, indexGroup + (direction > 0 ? direction * 2 : direction));
// add new group
store = produce(store, (p) => {
@@ -2363,13 +2370,13 @@ export function moveGroup(indexGroup: number, direction: -1 | 1) {
// move plot in new group
if (direction > 0) {
for (let i = 0; i < count; i++) {
- let next = moveAndResortPlot(store, startIndex, null, targetGroupIndex, remapIndexPlot);
+ const next = moveAndResortPlot(store, startIndex, null, targetGroupIndex, remapIndexPlot);
store = next.store;
remapIndexPlot = next.remapIndexPlot;
}
} else {
for (let i = 0; i < count; i++) {
- let next = moveAndResortPlot(store, startIndex + i, null, targetGroupIndex, remapIndexPlot);
+ const next = moveAndResortPlot(store, startIndex + i, null, targetGroupIndex, remapIndexPlot);
store = next.store;
remapIndexPlot = next.remapIndexPlot;
}
diff --git a/statshouse-ui/src/store2/constants.ts b/statshouse-ui/src/store2/constants.ts
index d3563261e..014a65f1e 100644
--- a/statshouse-ui/src/store2/constants.ts
+++ b/statshouse-ui/src/store2/constants.ts
@@ -4,7 +4,7 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { TIME_RANGE_ABBREV } from 'api/enum';
+import { TIME_RANGE_ABBREV } from '@/api/enum';
export const prefixPath = '/';
export const viewPath = [prefixPath + 'view'];
diff --git a/statshouse-ui/src/store2/createStore.ts b/statshouse-ui/src/store2/createStore.ts
index 3c7ed3a4b..7cb8bd947 100644
--- a/statshouse-ui/src/store2/createStore.ts
+++ b/statshouse-ui/src/store2/createStore.ts
@@ -21,9 +21,6 @@ export type StoreSlice = S
T
>;
-export function createStore(
- store: Store,
- name: string = ''
-) {
+export function createStore(store: Store) {
return create()(immer(store));
}
diff --git a/statshouse-ui/src/store2/favoriteStore/favoriteStore.ts b/statshouse-ui/src/store2/favoriteStore/favoriteStore.ts
index da20dbb35..0df221771 100644
--- a/statshouse-ui/src/store2/favoriteStore/favoriteStore.ts
+++ b/statshouse-ui/src/store2/favoriteStore/favoriteStore.ts
@@ -1,7 +1,7 @@
import { createJSONStorage, persist, type StateStorage } from 'zustand/middleware';
import { create } from 'zustand';
import { immer } from 'zustand/middleware/immer';
-import { isNotNil, isObject } from 'common/helpers';
+import { isNotNil, isObject } from '@/common/helpers';
export const favoriteStateStorage: StateStorage = {
getItem(name) {
diff --git a/statshouse-ui/src/store2/helpers/addPlot.ts b/statshouse-ui/src/store2/helpers/addPlot.ts
index 598fc785c..4f5004082 100644
--- a/statshouse-ui/src/store2/helpers/addPlot.ts
+++ b/statshouse-ui/src/store2/helpers/addPlot.ts
@@ -4,7 +4,7 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { type GroupKey, type PlotParams, type QueryParams } from 'url2';
+import type { GroupKey, PlotParams, QueryParams } from '@/url2';
import { produce } from 'immer';
import { getNextPlotKey, updateQueryParamsPlotStruct } from '../urlStore/updateParamsPlotStruct';
diff --git a/statshouse-ui/src/store2/helpers/addPlotByUrl.ts b/statshouse-ui/src/store2/helpers/addPlotByUrl.ts
index 14e0d7a60..13206b961 100644
--- a/statshouse-ui/src/store2/helpers/addPlotByUrl.ts
+++ b/statshouse-ui/src/store2/helpers/addPlotByUrl.ts
@@ -4,7 +4,7 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import type { QueryParams } from 'url2';
+import type { QueryParams } from '@/url2';
import { addPlot } from './addPlot';
import { getPlotByUrl } from './getPlotByUrl';
diff --git a/statshouse-ui/src/store2/helpers/filterHasTagID.ts b/statshouse-ui/src/store2/helpers/filterHasTagID.ts
index 576bae98d..6002c8563 100644
--- a/statshouse-ui/src/store2/helpers/filterHasTagID.ts
+++ b/statshouse-ui/src/store2/helpers/filterHasTagID.ts
@@ -4,8 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import type { PlotParams } from 'url2';
-import type { TagKey } from 'api/enum';
+import type { PlotParams } from '@/url2';
+import type { TagKey } from '@/api/enum';
export function filterHasTagID(
params: Pick,
diff --git a/statshouse-ui/src/store2/helpers/filterVariableByLink.ts b/statshouse-ui/src/store2/helpers/filterVariableByLink.ts
index ce4dc0792..db2b54507 100644
--- a/statshouse-ui/src/store2/helpers/filterVariableByLink.ts
+++ b/statshouse-ui/src/store2/helpers/filterVariableByLink.ts
@@ -4,7 +4,7 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { type PlotKey, type VariableParamsLink } from 'url2';
+import type { PlotKey, VariableParamsLink } from '@/url2';
export function filterVariableByLink(
plotKey?: PlotKey
diff --git a/statshouse-ui/src/store2/helpers/filterVariableByPlot.ts b/statshouse-ui/src/store2/helpers/filterVariableByPlot.ts
index 37df383e4..23606acae 100644
--- a/statshouse-ui/src/store2/helpers/filterVariableByPlot.ts
+++ b/statshouse-ui/src/store2/helpers/filterVariableByPlot.ts
@@ -5,7 +5,7 @@
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
import { filterVariableByLink } from './filterVariableByLink';
-import { type PlotParams, type VariableParamsLink } from 'url2';
+import type { PlotParams, VariableParamsLink } from '@/url2';
import { isPromQL } from './isPromQL';
import { filterVariableByPromQl } from './filterVariableByPromQl';
diff --git a/statshouse-ui/src/store2/helpers/getAddPlotLink.ts b/statshouse-ui/src/store2/helpers/getAddPlotLink.ts
index 29a0b52a6..59eb650e9 100644
--- a/statshouse-ui/src/store2/helpers/getAddPlotLink.ts
+++ b/statshouse-ui/src/store2/helpers/getAddPlotLink.ts
@@ -4,12 +4,12 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { getNewMetric, type QueryParams, urlEncode } from 'url2';
+import { getNewMetric, type QueryParams, urlEncode } from '@/url2';
import { getNextPlotKey, updateQueryParamsPlotStruct } from '../urlStore/updateParamsPlotStruct';
import { produce } from 'immer';
-import { clonePlot } from 'url2/clonePlot';
+import { clonePlot } from '@/url2/clonePlot';
-import { fixMessageTrouble } from 'url/fixMessageTrouble';
+import { fixMessageTrouble } from '@/url/fixMessageTrouble';
export function getAddPlotLink(params: QueryParams, saveParams?: QueryParams): string {
const tabNum = params.plots[params.tabNum] ? params.tabNum : params.orderPlot.slice(-1)[0];
diff --git a/statshouse-ui/src/store2/helpers/getPlotByUrl.ts b/statshouse-ui/src/store2/helpers/getPlotByUrl.ts
index 7107fa4b9..b0a9f2b2a 100644
--- a/statshouse-ui/src/store2/helpers/getPlotByUrl.ts
+++ b/statshouse-ui/src/store2/helpers/getPlotByUrl.ts
@@ -4,8 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { arrToObj, type PlotParams, toTreeObj, urlDecode } from 'url2';
-import { isNotNil } from 'common/helpers';
+import { arrToObj, type PlotParams, toTreeObj, urlDecode } from '@/url2';
+import { isNotNil } from '@/common/helpers';
export function getPlotByUrl(url: string): PlotParams[] {
try {
@@ -13,7 +13,7 @@ export function getPlotByUrl(url: string): PlotParams[] {
const tree = toTreeObj(arrToObj([...getUrl.searchParams.entries()]));
const params = urlDecode(tree);
return Object.values(params.plots).filter(isNotNil);
- } catch (e) {
+ } catch (_) {
return [];
}
}
diff --git a/statshouse-ui/src/store2/helpers/getPlotLink.ts b/statshouse-ui/src/store2/helpers/getPlotLink.ts
index 082afa48e..568fd8791 100644
--- a/statshouse-ui/src/store2/helpers/getPlotLink.ts
+++ b/statshouse-ui/src/store2/helpers/getPlotLink.ts
@@ -4,10 +4,10 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { getNewMetric, getNewGroup, type PlotKey, type QueryParams, urlEncode } from 'url2';
+import { getNewGroup, getNewMetric, type PlotKey, type QueryParams, urlEncode } from '@/url2';
import { produce } from 'immer';
-import { clonePlot } from 'url2/clonePlot';
-import { fixMessageTrouble } from 'url/fixMessageTrouble';
+import { clonePlot } from '@/url2/clonePlot';
+import { fixMessageTrouble } from '@/url/fixMessageTrouble';
let localParams: QueryParams;
let localSaveParams: QueryParams;
diff --git a/statshouse-ui/src/store2/helpers/getSinglePlotLink.ts b/statshouse-ui/src/store2/helpers/getSinglePlotLink.ts
index 33a68c1f1..5712365a0 100644
--- a/statshouse-ui/src/store2/helpers/getSinglePlotLink.ts
+++ b/statshouse-ui/src/store2/helpers/getSinglePlotLink.ts
@@ -4,7 +4,7 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { getNewMetric, getDefaultParams, type PlotKey, type QueryParams, urlEncode } from 'url2';
+import { getDefaultParams, getNewMetric, type PlotKey, type QueryParams, urlEncode } from '@/url2';
import { addPlot } from './addPlot';
export function getSinglePlotLink(plotKey: PlotKey, params: QueryParams, saveParams?: QueryParams): string {
diff --git a/statshouse-ui/src/store2/helpers/getUrl.ts b/statshouse-ui/src/store2/helpers/getUrl.ts
index 124c66e23..6491932de 100644
--- a/statshouse-ui/src/store2/helpers/getUrl.ts
+++ b/statshouse-ui/src/store2/helpers/getUrl.ts
@@ -4,8 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { type UrlStore } from '../urlStore';
-import { urlEncode } from 'url2';
+import type { UrlStore } from '../urlStore';
+import { urlEncode } from '@/url2';
export function getUrl(state: UrlStore): string {
const urlSearchArray = urlEncode(state.params, state.saveParams);
diff --git a/statshouse-ui/src/store2/helpers/isPromQL.ts b/statshouse-ui/src/store2/helpers/isPromQL.ts
index db1aeef44..2f7b3a0d5 100644
--- a/statshouse-ui/src/store2/helpers/isPromQL.ts
+++ b/statshouse-ui/src/store2/helpers/isPromQL.ts
@@ -4,7 +4,7 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { type PlotParams, promQLMetric } from 'url2';
+import { type PlotParams, promQLMetric } from '@/url2';
export function isPromQL(plot?: PlotParams): boolean {
return plot?.metricName === promQLMetric || !!plot?.promQL;
diff --git a/statshouse-ui/src/store2/helpers/isValidPath.ts b/statshouse-ui/src/store2/helpers/isValidPath.ts
index 9cdc6550a..d6de05ae0 100644
--- a/statshouse-ui/src/store2/helpers/isValidPath.ts
+++ b/statshouse-ui/src/store2/helpers/isValidPath.ts
@@ -4,8 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { type Location } from 'history';
-import { validPath, embedPath } from '../constants';
+import type { Location } from 'history';
+import { embedPath, validPath } from '@/store2';
export function isValidPath(location: Location) {
return validPath.indexOf(location.pathname) > -1;
diff --git a/statshouse-ui/src/store2/helpers/lib.ts b/statshouse-ui/src/store2/helpers/lib.ts
index 3081d5af1..595f9eaf6 100644
--- a/statshouse-ui/src/store2/helpers/lib.ts
+++ b/statshouse-ui/src/store2/helpers/lib.ts
@@ -4,8 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { type PlotParams, promQLMetric } from 'url2';
-import { type PlotData } from '../plotDataStore';
+import { type PlotParams, promQLMetric } from '@/url2';
+import type { PlotData } from '../plotDataStore';
import { MetricMeta } from '../metricsMetaStore';
import { whatToWhatDesc } from '../../view/whatToWhatDesc';
@@ -36,7 +36,7 @@ export function getMetricFullName(plot?: PlotParams, plotData?: PlotData) {
}
const metricName = getMetricName(plot, plotData);
const metricWhat = getMetricWhat(plot, plotData);
- return metricName ? `${metricName}${!!metricWhat ? ': ' + metricWhat : ''}` : '';
+ return metricName ? `${metricName}${metricWhat ? ': ' + metricWhat : ''}` : '';
}
export function getMetricMeta(metricMeta: Partial>, plot?: PlotParams, plotData?: PlotData) {
diff --git a/statshouse-ui/src/store2/helpers/replaceVariable.ts b/statshouse-ui/src/store2/helpers/replaceVariable.ts
index d4f296710..98e9b70f0 100644
--- a/statshouse-ui/src/store2/helpers/replaceVariable.ts
+++ b/statshouse-ui/src/store2/helpers/replaceVariable.ts
@@ -1,6 +1,6 @@
-import { PlotKey, PlotParams, VariableParams } from 'url2';
+import { PlotKey, PlotParams, VariableParams } from '@/url2';
import { produce } from 'immer';
-import { isNotNil } from 'common/helpers';
+import { isNotNil } from '@/common/helpers';
/**
* replace filter value by variable
diff --git a/statshouse-ui/src/store2/helpers/timeRangeAbbrev.ts b/statshouse-ui/src/store2/helpers/timeRangeAbbrev.ts
index 90ccd4f51..718a5ccf4 100644
--- a/statshouse-ui/src/store2/helpers/timeRangeAbbrev.ts
+++ b/statshouse-ui/src/store2/helpers/timeRangeAbbrev.ts
@@ -4,8 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { TIME_RANGE_ABBREV, type TimeRangeAbbrev } from 'api/enum';
-import type { TimeRange } from 'url2';
+import { TIME_RANGE_ABBREV, type TimeRangeAbbrev } from '@/api/enum';
+import type { TimeRange } from '@/url2';
export function timeRangeAbbrevExpand(abbr: TimeRangeAbbrev): number {
switch (abbr) {
diff --git a/statshouse-ui/src/store2/helpers/updateTitle.ts b/statshouse-ui/src/store2/helpers/updateTitle.ts
index 9a2d553bf..6179be7d3 100644
--- a/statshouse-ui/src/store2/helpers/updateTitle.ts
+++ b/statshouse-ui/src/store2/helpers/updateTitle.ts
@@ -1,6 +1,5 @@
-import type { StatsHouseStore } from '../statsHouseStore';
-
-import { pageTitle } from '../constants';
+import type { StatsHouseStore } from '@/store2';
+import { pageTitle } from '@/store2';
import { getMetricFullName } from './lib';
export function updateTitle({ params: { tabNum, plots, dashboardName }, plotsData }: StatsHouseStore) {
@@ -11,9 +10,10 @@ export function updateTitle({ params: { tabNum, plots, dashboardName }, plotsDat
case '-2':
document.title = `Dashboard setting — ${pageTitle}`;
break;
- default:
+ default: {
const fullName = getMetricFullName(plots[tabNum], plotsData[tabNum]);
document.title = `${fullName} — ${pageTitle}`;
break;
+ }
}
}
diff --git a/statshouse-ui/src/store2/liveModeStore/liveModeStore.ts b/statshouse-ui/src/store2/liveModeStore/liveModeStore.ts
index e917c3ba6..026b1e8b7 100644
--- a/statshouse-ui/src/store2/liveModeStore/liveModeStore.ts
+++ b/statshouse-ui/src/store2/liveModeStore/liveModeStore.ts
@@ -7,9 +7,9 @@
import { createStore, type StoreSlice } from '../createStore';
import { type StatsHouseStore, useStatsHouse } from '../statsHouseStore';
import { isValidPath, type ProduceUpdate } from '../helpers';
-import { appHistory } from 'common/appHistory';
-import { debug } from 'common/debug';
-import { METRIC_VALUE_BACKEND_VERSION, TIME_RANGE_KEYS_TO } from 'api/enum';
+import { appHistory } from '@/common/appHistory';
+import { debug } from '@/common/debug';
+import { METRIC_VALUE_BACKEND_VERSION, TIME_RANGE_KEYS_TO } from '@/api/enum';
import { useShallow } from 'zustand/react/shallow';
export type LiveModeStore = {
diff --git a/statshouse-ui/src/store2/metricsMetaStore/metricMetaStore.ts b/statshouse-ui/src/store2/metricsMetaStore/metricMetaStore.ts
index 461b500da..40862936d 100644
--- a/statshouse-ui/src/store2/metricsMetaStore/metricMetaStore.ts
+++ b/statshouse-ui/src/store2/metricsMetaStore/metricMetaStore.ts
@@ -4,13 +4,13 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { type StoreSlice } from '../createStore';
-import { apiMetric, type MetricMetaTag, type MetricMetaValue } from 'api/metric';
-import { type TagKey, toTagKey } from 'api/enum';
-import { type StatsHouseStore } from '../statsHouseStore';
-import { type PlotKey, promQLMetric } from 'url2';
-import { useErrorStore } from 'store/errors';
-import { debug } from 'common/debug';
+import type { StoreSlice } from '../createStore';
+import { apiMetric, type MetricMetaTag, type MetricMetaValue } from '@/api/metric';
+import { type TagKey, toTagKey } from '@/api/enum';
+import type { StatsHouseStore } from '../statsHouseStore';
+import { type PlotKey, promQLMetric } from '@/url2';
+import { useErrorStore } from '@/store/errors';
+import { debug } from '@/common/debug';
import { updateMetricMeta } from './updateMetricMeta';
import { ExtendedError } from '../../api/api';
@@ -26,7 +26,7 @@ export type MetricMetaStore = {
clearMetricMeta(metricName: string): void;
};
-export const metricMetaStore: StoreSlice = (setState, getState, store) => ({
+export const metricMetaStore: StoreSlice = (setState, getState) => ({
metricMeta: {},
async loadMetricMeta(metricName) {
if (!metricName || metricName === promQLMetric) {
diff --git a/statshouse-ui/src/store2/plotDataStore/changePlotParamForData.ts b/statshouse-ui/src/store2/plotDataStore/changePlotParamForData.ts
index 6c4022ba8..7cd3d442e 100644
--- a/statshouse-ui/src/store2/plotDataStore/changePlotParamForData.ts
+++ b/statshouse-ui/src/store2/plotDataStore/changePlotParamForData.ts
@@ -1,4 +1,4 @@
-import { type PlotParams } from 'url2';
+import type { PlotParams } from '@/url2';
import { dequal } from 'dequal/lite';
export function changePlotParamForData(plot?: PlotParams, prevPlot?: PlotParams) {
diff --git a/statshouse-ui/src/store2/plotDataStore/getClearPlotsData.ts b/statshouse-ui/src/store2/plotDataStore/getClearPlotsData.ts
index 88cb5d0bc..1197f5f49 100644
--- a/statshouse-ui/src/store2/plotDataStore/getClearPlotsData.ts
+++ b/statshouse-ui/src/store2/plotDataStore/getClearPlotsData.ts
@@ -4,8 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import type { PlotKey, PlotParams } from 'url2';
-import { type StatsHouseStore } from '../statsHouseStore';
+import type { PlotKey, PlotParams } from '@/url2';
+import type { StatsHouseStore } from '../statsHouseStore';
const clearProps: (keyof PlotParams)[] = [
'metricName',
diff --git a/statshouse-ui/src/store2/plotDataStore/getEmptyPlotData.ts b/statshouse-ui/src/store2/plotDataStore/getEmptyPlotData.ts
index 1f5183baa..5b5da56e9 100644
--- a/statshouse-ui/src/store2/plotDataStore/getEmptyPlotData.ts
+++ b/statshouse-ui/src/store2/plotDataStore/getEmptyPlotData.ts
@@ -4,8 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { METRIC_TYPE } from 'api/enum';
-import { type PlotData } from './plotsDataStore';
+import { METRIC_TYPE } from '@/api/enum';
+import type { PlotData } from './plotsDataStore';
import { autoAgg } from '../constants';
export function getEmptyPlotData(): PlotData {
diff --git a/statshouse-ui/src/store2/plotDataStore/loadPlotData.ts b/statshouse-ui/src/store2/plotDataStore/loadPlotData.ts
index 1b9944a77..147a89e56 100644
--- a/statshouse-ui/src/store2/plotDataStore/loadPlotData.ts
+++ b/statshouse-ui/src/store2/plotDataStore/loadPlotData.ts
@@ -4,18 +4,18 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { metricFilterEncode, type PlotKey, promQLMetric, type QueryParams, urlEncodeVariables } from 'url2';
-import { apiQuery, type ApiQueryGet } from 'api/query';
-import { GET_PARAMS } from 'api/enum';
+import { metricFilterEncode, type PlotKey, promQLMetric, type QueryParams, urlEncodeVariables } from '@/url2';
+import { apiQuery, type ApiQueryGet } from '@/api/query';
+import { GET_PARAMS } from '@/api/enum';
import { normalizePlotData } from './normalizePlotData';
-import { type ProduceUpdate } from '../helpers';
-import { type StatsHouseStore } from '../statsHouseStore';
+import type { ProduceUpdate } from '../helpers';
+import type { StatsHouseStore } from '@/store2';
+import { autoAgg, autoLowAgg } from '@/store2';
import { produce } from 'immer';
import { getEmptyPlotData } from './getEmptyPlotData';
-import { autoAgg, autoLowAgg } from '../constants';
import { replaceVariable } from '../helpers/replaceVariable';
import { MetricMeta, tagsArrToObject } from '../metricsMetaStore';
-import { ExtendedError } from '../../api/api';
+import { ExtendedError } from '@/api/api';
export function getLoadPlotUrlParams(
plotKey: PlotKey,
@@ -50,9 +50,10 @@ export function getLoadPlotUrlParams(
urlParams[GET_PARAMS.metricPromQL] = plot.promQL;
//add variable params for PromQL
urlEncodeVariables(params).forEach(([key, value]) => {
- // @ts-ignore
urlParams[key] ??= [];
- // @ts-ignore
+ if (typeof urlParams[key] === 'string') {
+ urlParams[key] = [urlParams[key]];
+ }
urlParams[key].push(value);
});
}
diff --git a/statshouse-ui/src/store2/plotDataStore/normalizePlotData.ts b/statshouse-ui/src/store2/plotDataStore/normalizePlotData.ts
index b7885cb4a..54913ad96 100644
--- a/statshouse-ui/src/store2/plotDataStore/normalizePlotData.ts
+++ b/statshouse-ui/src/store2/plotDataStore/normalizePlotData.ts
@@ -4,13 +4,13 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { type SeriesResponse } from 'api/query';
-import { type PlotParams, promQLMetric, type QueryParams } from 'url2';
-import { type ProduceUpdate } from '../helpers';
-import { isQueryWhat, METRIC_TYPE, PLOT_TYPE, QUERY_WHAT, type QueryWhat, toMetricType } from 'api/enum';
+import type { SeriesResponse } from '@/api/query';
+import { type PlotParams, promQLMetric, type QueryParams } from '@/url2';
+import type { ProduceUpdate } from '../helpers';
+import { isQueryWhat, METRIC_TYPE, PLOT_TYPE, QUERY_WHAT, type QueryWhat, toMetricType } from '@/api/enum';
import uPlot from 'uplot';
-import type { SelectOptionProps } from 'components/Select';
-import { type PlotData, type PlotValues } from './plotsDataStore';
+import type { SelectOptionProps } from '@/components/Select';
+import type { PlotData, PlotValues } from './plotsDataStore';
import { metaToBaseLabel, metaToLabel } from '../../view/api';
import { pxPerChar } from '../../common/settings';
import { stackData } from '../../common/stackData';
@@ -20,7 +20,7 @@ import { dequal } from 'dequal/lite';
import { calcYRange2 } from '../../common/calcYRange';
import { getEmptyPlotData } from './getEmptyPlotData';
import { deepClone } from '../../common/helpers';
-import { formatLegendValue, formatPercent, timeShiftToDash } from 'view/utils2';
+import { formatLegendValue, formatPercent, timeShiftToDash } from '@/view/utils2';
import { useThemeStore } from '../themeStore';
export function normalizePlotData(
diff --git a/statshouse-ui/src/store2/plotDataStore/plotsDataStore.ts b/statshouse-ui/src/store2/plotDataStore/plotsDataStore.ts
index ed8b8cec6..2b541cd0d 100644
--- a/statshouse-ui/src/store2/plotDataStore/plotsDataStore.ts
+++ b/statshouse-ui/src/store2/plotDataStore/plotsDataStore.ts
@@ -5,11 +5,11 @@
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
import uPlot from 'uplot';
-import { type MetricType, PLOT_TYPE, type QueryWhat } from 'api/enum';
-import { type PlotKey, type PlotParams, type TimeRange } from 'url2';
-import { type QuerySeriesMeta } from 'api/query';
-import { type StoreSlice } from '../createStore';
-import { type StatsHouseStore } from '../statsHouseStore';
+import { type MetricType, PLOT_TYPE, type QueryWhat } from '@/api/enum';
+import type { PlotKey, PlotParams, TimeRange } from '@/url2';
+import type { QuerySeriesMeta } from '@/api/query';
+import type { StoreSlice } from '../createStore';
+import type { StatsHouseStore } from '../statsHouseStore';
import { loadPlotData } from './loadPlotData';
import { getClearPlotsData } from './getClearPlotsData';
import { updateClearPlotError } from './updateClearPlotError';
@@ -22,7 +22,7 @@ import { skipTimeout } from '../../common/helpers';
import { usePlotVisibilityStore } from '../plotVisibilityStore';
import { useVariableChangeStatusStore } from '../variableChangeStatusStore';
import { filterVariableByPlot } from '../helpers/filterVariableByPlot';
-import { type SelectOptionProps } from 'components/Select';
+import type { SelectOptionProps } from '@/components/Select';
export type PlotValues = {
rawValue: number | null;
@@ -157,7 +157,6 @@ export const plotsDataStore: StoreSlice = (setS
const prevPlot = getState().plotsData[plotKey]?.lastPlotParams;
const orderVariables = getState().params.orderVariables;
const variables = getState().params.variables;
- const isEmbed = getState().isEmbed;
let priority = 3;
const changeVariablesKey = useVariableChangeStatusStore.getState().changeVariable;
const changeVariable = orderVariables.some(
@@ -212,7 +211,7 @@ export const plotsDataStore: StoreSlice = (setS
const changeNowTime = getState().params.timeRange.to !== getState().plotsData[plotKey]?.lastTimeRange?.to;
const changeTimeShifts = !dequal(getState().params.timeShifts, getState().plotsData[plotKey]?.lastTimeShifts);
- let update = changePlotParam || changeTime || changeNowTime || changeTimeShifts || changeVariable;
+ const update = changePlotParam || changeTime || changeNowTime || changeTimeShifts || changeVariable;
prepareEnd();
if (update) {
@@ -269,7 +268,7 @@ export const plotsDataStore: StoreSlice = (setS
if (plotData) {
if (single) {
const otherShow = plotData.seriesShow.some((_show, indexSeries) => (indexSeries === idx ? false : _show));
- plotData.seriesShow = plotData.seriesShow.map((s, indexSeries) =>
+ plotData.seriesShow = plotData.seriesShow.map((_, indexSeries) =>
indexSeries === idx ? true : !otherShow
);
} else {
diff --git a/statshouse-ui/src/store2/plotDataStore/updateClearPlotError.ts b/statshouse-ui/src/store2/plotDataStore/updateClearPlotError.ts
index 1ace030b3..aaf6c64ed 100644
--- a/statshouse-ui/src/store2/plotDataStore/updateClearPlotError.ts
+++ b/statshouse-ui/src/store2/plotDataStore/updateClearPlotError.ts
@@ -1,6 +1,6 @@
-import { type PlotKey } from 'url2';
-import { type ProduceUpdate } from '../helpers';
-import { type StatsHouseStore } from '../statsHouseStore';
+import type { PlotKey } from '@/url2';
+import type { ProduceUpdate } from '../helpers';
+import type { StatsHouseStore } from '../statsHouseStore';
export function updateClearPlotError(plotKey: PlotKey): ProduceUpdate {
return (state) => {
diff --git a/statshouse-ui/src/store2/plotEventsDataStore/plotEventsDataStore.ts b/statshouse-ui/src/store2/plotEventsDataStore/plotEventsDataStore.ts
index c0e90676c..625e25e66 100644
--- a/statshouse-ui/src/store2/plotEventsDataStore/plotEventsDataStore.ts
+++ b/statshouse-ui/src/store2/plotEventsDataStore/plotEventsDataStore.ts
@@ -5,8 +5,8 @@
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
import { StoreSlice } from '../createStore';
-import { autoAgg, autoLowAgg, StatsHouseStore } from 'store2';
-import { GET_PARAMS, METRIC_TYPE, PLOT_TYPE, QueryWhat } from 'api/enum';
+import { autoAgg, autoLowAgg, StatsHouseStore } from '@/store2';
+import { GET_PARAMS, METRIC_TYPE, PLOT_TYPE, QueryWhat } from '@/api/enum';
import {
freeKeyPrefix,
getTimeRangeAbsolute,
@@ -16,14 +16,14 @@ import {
type QueryParams,
readTimeRange,
TimeRange,
-} from 'url2';
-import { querySeriesMetaTag } from 'view/api';
+} from '@/url2';
+import { querySeriesMetaTag } from '@/view/api';
import { replaceVariable } from '../helpers/replaceVariable';
-import { apiTable, ApiTableGet, GetTableResp, QueryTableRow } from 'api/table';
-import { uniqueArray } from 'common/helpers';
-import { formatByMetricType, getMetricType } from 'common/formatByMetricType';
-import { debug } from 'common/debug';
-import { fmtInputDateTime, formatLegendValue } from 'view/utils2';
+import { apiTable, ApiTableGet, GetTableResp, QueryTableRow } from '@/api/table';
+import { uniqueArray } from '@/common/helpers';
+import { formatByMetricType, getMetricType } from '@/common/formatByMetricType';
+import { debug } from '@/common/debug';
+import { fmtInputDateTime, formatLegendValue } from '@/view/utils2';
import { useLiveModeStore } from '../liveModeStore';
import { ExtendedError } from '../../api/api';
@@ -56,7 +56,7 @@ export type PlotEventsDataStore = {
clearPlotEvents(plotKey: PlotKey): void;
};
-export const plotEventsDataStore: StoreSlice = (setState, getState, store) => ({
+export const plotEventsDataStore: StoreSlice = (setState, getState) => ({
plotsEventsData: {},
async loadPlotEvents(plotKey, key, fromEnd = false, from) {
if (!getState().plotsEventsData[plotKey]) {
diff --git a/statshouse-ui/src/store2/plotHealsStore/plotHealsStore.ts b/statshouse-ui/src/store2/plotHealsStore/plotHealsStore.ts
index bd581a274..1e2230863 100644
--- a/statshouse-ui/src/store2/plotHealsStore/plotHealsStore.ts
+++ b/statshouse-ui/src/store2/plotHealsStore/plotHealsStore.ts
@@ -1,7 +1,7 @@
import { StoreSlice } from '../createStore';
-import { StatsHouseStore } from '../statsHouseStore';
-import { PlotKey } from 'url2';
-import { sumArray } from 'common/helpers';
+import { StatsHouseStore } from '@/store2';
+import { PlotKey } from '@/url2';
+import { sumArray } from '@/common/helpers';
const limitHistory = 10;
const changeStatus = (limitHistory / 2) * 0.8;
@@ -21,7 +21,7 @@ export type PlotHealsStore = {
isPlotHeal(plotKey: PlotKey): boolean;
};
-export const plotHealsStore: StoreSlice = (setState, getState, store) => ({
+export const plotHealsStore: StoreSlice = (setState, getState) => ({
plotHeals: {},
removePlotHeals(plotKey) {
setState((state) => {
diff --git a/statshouse-ui/src/store2/plotPreviewStore/plotPreviewStore.ts b/statshouse-ui/src/store2/plotPreviewStore/plotPreviewStore.ts
index 4f446d1cc..ac528a916 100644
--- a/statshouse-ui/src/store2/plotPreviewStore/plotPreviewStore.ts
+++ b/statshouse-ui/src/store2/plotPreviewStore/plotPreviewStore.ts
@@ -4,13 +4,12 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { Queue } from 'common/Queue';
+import { Queue } from '@/common/Queue';
import { createStore, StoreSlice } from '../createStore';
-import { StatsHouseStore } from '../statsHouseStore';
-import { PlotKey } from 'url2';
-import { canvasToImageData } from 'common/canvasToImage';
+import { PlotKey } from '@/url2';
+import { canvasToImageData } from '@/common/canvasToImage';
import { skipTimeout } from '../../common/helpers';
-import { plotVisibilityStore, PlotVisibilityStore, usePlotVisibilityStore } from '../plotVisibilityStore';
+import { usePlotVisibilityStore } from '../plotVisibilityStore';
const queuePreview = new Queue();
@@ -54,7 +53,7 @@ export async function createPlotPreview(plotKey: PlotKey, u: uPlot, width: numbe
controller.signal
);
setPlotPreview(plotKey, url);
- } catch (e) {
+ } catch (_) {
// abort task
}
usePlotPreviewStore.setState((state) => {
@@ -74,7 +73,9 @@ export function setPlotPreview(plotKey: PlotKey, url: string) {
export function clearAllPlotPreview() {
usePlotPreviewStore.setState((state) => {
Object.values(state.plotPreviewUrlList).forEach((url) => {
- url && URL.revokeObjectURL(url);
+ if (url) {
+ URL.revokeObjectURL(url);
+ }
});
state.plotPreviewUrlList = {};
state.plotPreviewAbortController = {};
diff --git a/statshouse-ui/src/store2/plotQueryStore/plotQueryStore.ts b/statshouse-ui/src/store2/plotQueryStore/plotQueryStore.ts
index a730c99b0..e6c220f13 100644
--- a/statshouse-ui/src/store2/plotQueryStore/plotQueryStore.ts
+++ b/statshouse-ui/src/store2/plotQueryStore/plotQueryStore.ts
@@ -1,5 +1,5 @@
import { createStore } from '../createStore';
-import type { PlotKey } from 'url2';
+import type { PlotKey } from '@/url2';
export type PlotQueryStore = {
globalQuery: number;
diff --git a/statshouse-ui/src/store2/plotVisibilityStore/plotVisibilityStore.ts b/statshouse-ui/src/store2/plotVisibilityStore/plotVisibilityStore.ts
index 1c6042942..6de3d69cf 100644
--- a/statshouse-ui/src/store2/plotVisibilityStore/plotVisibilityStore.ts
+++ b/statshouse-ui/src/store2/plotVisibilityStore/plotVisibilityStore.ts
@@ -5,7 +5,7 @@
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
import { createStore, StoreSlice } from '../createStore';
-import { PlotKey } from 'url2';
+import { PlotKey } from '@/url2';
import { getPlotLoader } from '../plotQueryStore';
import { useStatsHouse } from '../statsHouseStore';
diff --git a/statshouse-ui/src/store2/plotsInfoStore/plotsInfoStore.ts b/statshouse-ui/src/store2/plotsInfoStore/plotsInfoStore.ts
index 318e65e29..9dd97c8ed 100644
--- a/statshouse-ui/src/store2/plotsInfoStore/plotsInfoStore.ts
+++ b/statshouse-ui/src/store2/plotsInfoStore/plotsInfoStore.ts
@@ -4,9 +4,9 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { type TagKey, TimeRangeAbbrev } from 'api/enum';
-import { type VariableKey } from 'url2';
-import { type StoreSlice } from '../createStore';
+import { type TagKey, TimeRangeAbbrev } from '@/api/enum';
+import type { VariableKey } from '@/url2';
+import type { StoreSlice } from '../createStore';
import { defaultBaseRange } from '../constants';
import { StatsHouseStore } from '../statsHouseStore';
diff --git a/statshouse-ui/src/store2/plotsInfoStore/updateGroupInfo.ts b/statshouse-ui/src/store2/plotsInfoStore/updateGroupInfo.ts
index 3ddd75bed..ffdd510f0 100644
--- a/statshouse-ui/src/store2/plotsInfoStore/updateGroupInfo.ts
+++ b/statshouse-ui/src/store2/plotsInfoStore/updateGroupInfo.ts
@@ -4,8 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import type { GroupKey, PlotKey, QueryParams } from 'url2';
-import { isNotNil } from 'common/helpers';
+import type { GroupKey, PlotKey, QueryParams } from '@/url2';
+import { isNotNil } from '@/common/helpers';
export function updateGroupInfo(params: QueryParams) {
const orderPlots = [...params.orderPlot];
diff --git a/statshouse-ui/src/store2/plotsInfoStore/updatePlotVariablesLink.ts b/statshouse-ui/src/store2/plotsInfoStore/updatePlotVariablesLink.ts
index 59249254e..e8c5b6cd9 100644
--- a/statshouse-ui/src/store2/plotsInfoStore/updatePlotVariablesLink.ts
+++ b/statshouse-ui/src/store2/plotsInfoStore/updatePlotVariablesLink.ts
@@ -4,7 +4,7 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import type { PlotKey, QueryParams } from 'url2';
+import type { PlotKey, QueryParams } from '@/url2';
import { PlotVariablesLink } from './plotsInfoStore';
export function updatePlotVariablesLink(params: QueryParams) {
diff --git a/statshouse-ui/src/store2/statsHouseStore.ts b/statshouse-ui/src/store2/statsHouseStore.ts
index f91c449f7..e6a5c58ce 100644
--- a/statshouse-ui/src/store2/statsHouseStore.ts
+++ b/statshouse-ui/src/store2/statsHouseStore.ts
@@ -7,22 +7,19 @@
import { createStore, type Store } from './createStore';
import { updateTitle, urlStore, type UrlStore } from './urlStore';
import { useShallow } from 'zustand/react/shallow';
-import { userStore, type UserStore } from './userStore';
-import { plotsInfoStore, type PlotsInfoStore } from './plotsInfoStore';
+import { type UserStore, userStore } from './userStore';
+import { type PlotsInfoStore, plotsInfoStore } from './plotsInfoStore';
import { updateLiveMode, useLiveModeStore } from './liveModeStore';
-import { metricMetaStore, MetricMetaStore } from './metricsMetaStore';
+import { MetricMetaStore, metricMetaStore } from './metricsMetaStore';
import { usePlotPreviewStore } from './plotPreviewStore';
-import { plotHealsStore, type PlotHealsStore } from './plotHealsStore';
-import { plotsDataStore, PlotsDataStore } from './plotDataStore';
-import { plotEventsDataStore, PlotEventsDataStore } from './plotEventsDataStore';
+import { type PlotHealsStore, plotHealsStore } from './plotHealsStore';
+import { PlotsDataStore, plotsDataStore } from './plotDataStore';
+import { PlotEventsDataStore, plotEventsDataStore } from './plotEventsDataStore';
import { updateFavicon } from './helpers/updateFavicon';
import { useVariableChangeStatusStore } from './variableChangeStatusStore';
import { dequal } from 'dequal/lite';
-import { useLinkPlots } from 'hooks/useLinkPlot';
+import { useLinkPlots } from '@/hooks/useLinkPlot';
import { updateTheme } from './themeStore';
-import { viewPath } from './constants';
-import { getUrlObject } from '../common/getUrlObject';
-import { getAddPlotLink } from './helpers';
export type StatsHouseStore = UrlStore &
UserStore &
diff --git a/statshouse-ui/src/store2/tvModeStore/tvModeStore.ts b/statshouse-ui/src/store2/tvModeStore/tvModeStore.ts
index 809c1cdd1..5d90ae1a4 100644
--- a/statshouse-ui/src/store2/tvModeStore/tvModeStore.ts
+++ b/statshouse-ui/src/store2/tvModeStore/tvModeStore.ts
@@ -1,5 +1,5 @@
import { createStore, StoreSlice } from '../createStore';
-import { toNumber } from 'common/helpers';
+import { toNumber } from '@/common/helpers';
export type TVModeStore = {
enable: boolean;
diff --git a/statshouse-ui/src/store2/urlStore/dashboardMigrate.ts b/statshouse-ui/src/store2/urlStore/dashboardMigrate.ts
index fe0ef7d52..008115c44 100644
--- a/statshouse-ui/src/store2/urlStore/dashboardMigrate.ts
+++ b/statshouse-ui/src/store2/urlStore/dashboardMigrate.ts
@@ -1,13 +1,13 @@
-import { DashboardInfo } from 'api/dashboard';
+import { DashboardInfo } from '@/api/dashboard';
import {
- type DashboardParams as OldDashboardParams,
encodeParams,
PLOT_TYPE as OLD_PLOT_TYPE,
+ type DashboardParams as OldDashboardParams,
type PlotParams as OldPlotParams,
type QueryParams as OldQueryParams,
type VariableParams as OldVariableParams,
-} from 'url/queryParams';
-import { type PlotKey, type QueryParams } from 'url2';
+} from '@/url/queryParams';
+import type { PlotKey, QueryParams } from '@/url2';
import { deepClone, toNumber } from '../../common/helpers';
import { METRIC_TYPE, METRIC_VALUE_BACKEND_VERSION, PLOT_TYPE } from '../../api/enum';
import { normalizeDashboard as normalizeDashboardOld } from '../../view/normalizeDashboard';
diff --git a/statshouse-ui/src/store2/urlStore/getAutoSearchVariable.ts b/statshouse-ui/src/store2/urlStore/getAutoSearchVariable.ts
index 37fd08924..ffcfd9407 100644
--- a/statshouse-ui/src/store2/urlStore/getAutoSearchVariable.ts
+++ b/statshouse-ui/src/store2/urlStore/getAutoSearchVariable.ts
@@ -1,9 +1,9 @@
-import { type StatsHouseStore } from '../statsHouseStore';
-import { getNewVariable, promQLMetric, type QueryParams, type VariableParamsLink } from 'url2';
-import { GET_PARAMS, TAG_KEY, toTagKey } from 'api/enum';
+import type { StatsHouseStore } from '../statsHouseStore';
+import { getNewVariable, promQLMetric, type QueryParams, type VariableParamsLink } from '@/url2';
+import { GET_PARAMS, TAG_KEY, toTagKey } from '@/api/enum';
import { produce } from 'immer';
import { getNextVariableKey } from './updateParamsPlotStruct';
-import { getTagDescription, isTagEnabled, isValidVariableName } from 'view/utils2';
+import { getTagDescription, isTagEnabled, isValidVariableName } from '@/view/utils2';
export async function getAutoSearchVariable(
getState: () => StatsHouseStore
@@ -32,7 +32,7 @@ export async function getAutoSearchVariable(
if (!meta) {
return;
}
- meta.tags?.forEach((tag, indexTag) => {
+ meta.tags?.forEach((_, indexTag) => {
const tagKey = toTagKey(indexTag);
if (tagKey && isTagEnabled(meta, tagKey)) {
const tagName = getTagDescription(meta, indexTag);
@@ -47,18 +47,17 @@ export async function getAutoSearchVariable(
}
});
return produce({ variables, orderVariables }, (v) => {
- Object.entries(variablesLink).forEach(([description, link], index) => {
+ Object.entries(variablesLink).forEach(([description, link]) => {
if (link.length > 1) {
const id = getNextVariableKey(v);
const name = isValidVariableName(description) ? description : `${GET_PARAMS.variableNamePrefix}${id}`;
- const variable = {
+ v.variables[id] = {
...getNewVariable(),
id,
name,
description: description === name ? '' : description,
link,
};
- v.variables[id] = variable;
v.orderVariables.push(id);
}
});
diff --git a/statshouse-ui/src/store2/urlStore/getMinMaxY.ts b/statshouse-ui/src/store2/urlStore/getMinMaxY.ts
index 6c7aae470..2af8d69ff 100644
--- a/statshouse-ui/src/store2/urlStore/getMinMaxY.ts
+++ b/statshouse-ui/src/store2/urlStore/getMinMaxY.ts
@@ -4,9 +4,9 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { calcYRange2 } from 'common/calcYRange';
-import { type PlotKey } from 'url2';
-import { type StatsHouseStore } from '../statsHouseStore';
+import { calcYRange2 } from '@/common/calcYRange';
+import type { PlotKey } from '@/url2';
+import type { StatsHouseStore } from '../statsHouseStore';
export function getMinMaxY(
plotKey: PlotKey,
diff --git a/statshouse-ui/src/store2/urlStore/getUrlState.ts b/statshouse-ui/src/store2/urlStore/getUrlState.ts
index c26cbb81f..e9b436ab5 100644
--- a/statshouse-ui/src/store2/urlStore/getUrlState.ts
+++ b/statshouse-ui/src/store2/urlStore/getUrlState.ts
@@ -4,11 +4,11 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { arrToObj, getDefaultParams, type QueryParams, toTreeObj, urlDecode } from 'url2';
+import { arrToObj, getDefaultParams, type QueryParams, toTreeObj, urlDecode } from '@/url2';
import { UrlStore } from './urlStore';
import { resetDefaultParams } from './resetDefaultParams';
import { loadDashboard } from './loadDashboard';
-import { type Location } from 'history';
+import type { Location } from 'history';
import { ExtendedError } from '../../api/api';
export async function getUrlState(
diff --git a/statshouse-ui/src/store2/urlStore/loadDashboard.ts b/statshouse-ui/src/store2/urlStore/loadDashboard.ts
index 1d1c17e9f..14bcc1588 100644
--- a/statshouse-ui/src/store2/urlStore/loadDashboard.ts
+++ b/statshouse-ui/src/store2/urlStore/loadDashboard.ts
@@ -4,10 +4,10 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { getDefaultParams, type QueryParams, type TreeParamsObject, treeParamsObjectValueSymbol } from 'url2';
-import { GET_PARAMS } from 'api/enum';
-import { debug } from 'common/debug';
-import { apiDashboard } from 'api/dashboard';
+import { getDefaultParams, type QueryParams, type TreeParamsObject, treeParamsObjectValueSymbol } from '@/url2';
+import { GET_PARAMS } from '@/api/enum';
+import { debug } from '@/common/debug';
+import { apiDashboard } from '@/api/dashboard';
import { readDataDashboard } from './readDataDashboard';
import { ExtendedError } from '../../api/api';
diff --git a/statshouse-ui/src/store2/urlStore/mergeParams.ts b/statshouse-ui/src/store2/urlStore/mergeParams.ts
index ea74de032..c36141cb1 100644
--- a/statshouse-ui/src/store2/urlStore/mergeParams.ts
+++ b/statshouse-ui/src/store2/urlStore/mergeParams.ts
@@ -1,4 +1,4 @@
-import { type GroupInfo, type PlotParams, type QueryParams, type VariableParams } from 'url2';
+import type { QueryParams } from '@/url2';
import { dequal } from 'dequal/lite';
export function mergeParams(target: QueryParams, value: QueryParams): QueryParams {
diff --git a/statshouse-ui/src/store2/urlStore/normalizeDashboard.ts b/statshouse-ui/src/store2/urlStore/normalizeDashboard.ts
index 4a7f1d828..172795de2 100644
--- a/statshouse-ui/src/store2/urlStore/normalizeDashboard.ts
+++ b/statshouse-ui/src/store2/urlStore/normalizeDashboard.ts
@@ -4,9 +4,9 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { arrToObj, type QueryParams, toTreeObj, urlDecode } from 'url2';
-import { isArray, isObject } from 'common/helpers';
-import { debug } from 'common/debug';
+import { arrToObj, type QueryParams, toTreeObj, urlDecode } from '@/url2';
+import { isArray, isObject } from '@/common/helpers';
+import { debug } from '@/common/debug';
import { dashboardMigrate } from './dashboardMigrate';
export function isUrlSearchArray(item: unknown): item is [string, string][] {
diff --git a/statshouse-ui/src/store2/urlStore/readDataDashboard.ts b/statshouse-ui/src/store2/urlStore/readDataDashboard.ts
index 96f4d86fd..5cf7c64ce 100644
--- a/statshouse-ui/src/store2/urlStore/readDataDashboard.ts
+++ b/statshouse-ui/src/store2/urlStore/readDataDashboard.ts
@@ -1,5 +1,5 @@
-import { DashboardInfo } from 'api/dashboard';
-import { getDefaultParams } from 'url2';
+import { DashboardInfo } from '@/api/dashboard';
+import { getDefaultParams } from '@/url2';
import { normalizeDashboard } from './normalizeDashboard';
export function readDataDashboard(data: DashboardInfo, defaultParams = getDefaultParams()) {
diff --git a/statshouse-ui/src/store2/urlStore/resetDefaultParams.ts b/statshouse-ui/src/store2/urlStore/resetDefaultParams.ts
index 930926060..ad204588e 100644
--- a/statshouse-ui/src/store2/urlStore/resetDefaultParams.ts
+++ b/statshouse-ui/src/store2/urlStore/resetDefaultParams.ts
@@ -4,9 +4,9 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { getHomePlot, QueryParams, readTimeRange } from 'url2';
+import { getHomePlot, QueryParams, readTimeRange } from '@/url2';
import { produce } from 'immer';
-import { globalSettings } from 'common/settings';
+import { globalSettings } from '@/common/settings';
import { METRIC_VALUE_BACKEND_VERSION, TIME_RANGE_KEYS_TO } from '../../api/enum';
import { addPlot, timeRangeAbbrevExpand } from '../helpers';
import { defaultBaseRange } from '../constants';
diff --git a/statshouse-ui/src/store2/urlStore/timeRangeNavigate.ts b/statshouse-ui/src/store2/urlStore/timeRangeNavigate.ts
index bd050ea6c..b9b7045d8 100644
--- a/statshouse-ui/src/store2/urlStore/timeRangeNavigate.ts
+++ b/statshouse-ui/src/store2/urlStore/timeRangeNavigate.ts
@@ -4,10 +4,10 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { getNow, PlotKey, readTimeRange } from 'url2';
+import { getNow, PlotKey, readTimeRange } from '@/url2';
import { ProduceUpdate, timeRangeAbbrevExpand } from '../helpers';
import { StatsHouseStore } from '../statsHouseStore';
-import { TIME_RANGE_KEYS_TO } from 'api/enum';
+import { TIME_RANGE_KEYS_TO } from '@/api/enum';
export const maxTimeRange = 10 * 365 * 24 * 3600;
diff --git a/statshouse-ui/src/store2/urlStore/toggleGroupShow.ts b/statshouse-ui/src/store2/urlStore/toggleGroupShow.ts
index 3bb4baab8..8dcebcdbf 100644
--- a/statshouse-ui/src/store2/urlStore/toggleGroupShow.ts
+++ b/statshouse-ui/src/store2/urlStore/toggleGroupShow.ts
@@ -1,4 +1,4 @@
-import type { GroupKey } from 'url2';
+import type { GroupKey } from '@/url2';
import type { ProduceUpdate } from '../helpers';
import type { StatsHouseStore } from '../statsHouseStore';
diff --git a/statshouse-ui/src/store2/urlStore/updateParams.ts b/statshouse-ui/src/store2/urlStore/updateParams.ts
index 316f89050..f36fde014 100644
--- a/statshouse-ui/src/store2/urlStore/updateParams.ts
+++ b/statshouse-ui/src/store2/urlStore/updateParams.ts
@@ -5,7 +5,7 @@
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
import type { ProduceUpdate } from '../helpers';
-import type { QueryParams } from 'url2';
+import type { QueryParams } from '@/url2';
import type { StatsHouseStore } from '../statsHouseStore';
import { produce } from 'immer';
diff --git a/statshouse-ui/src/store2/urlStore/updateParamsPlotStruct.ts b/statshouse-ui/src/store2/urlStore/updateParamsPlotStruct.ts
index 8ee29a5ef..93ab86561 100644
--- a/statshouse-ui/src/store2/urlStore/updateParamsPlotStruct.ts
+++ b/statshouse-ui/src/store2/urlStore/updateParamsPlotStruct.ts
@@ -1,9 +1,18 @@
import { produce } from 'immer';
import type { ProduceUpdate } from '../helpers';
-import { getNewMetric, GroupInfo, GroupKey, PlotKey, PlotParams, QueryParams, VariableKey, VariableParams } from 'url2';
+import {
+ getNewMetric,
+ GroupInfo,
+ GroupKey,
+ PlotKey,
+ PlotParams,
+ QueryParams,
+ VariableKey,
+ VariableParams,
+} from '@/url2';
import type { StatsHouseStore } from '../statsHouseStore';
-import type { TagKey } from 'api/enum';
-import { isNotNil, toNumberM } from 'common/helpers';
+import type { TagKey } from '@/api/enum';
+import { isNotNil, toNumberM } from '@/common/helpers';
import { clonePlot } from '../../url2/clonePlot';
import { cloneGroup } from '../../url2/cloneGroup';
import { cloneVariable } from '../../url2/cloneVariable';
diff --git a/statshouse-ui/src/store2/urlStore/updatePlot.ts b/statshouse-ui/src/store2/urlStore/updatePlot.ts
index f8b3b80e8..7fa27f554 100644
--- a/statshouse-ui/src/store2/urlStore/updatePlot.ts
+++ b/statshouse-ui/src/store2/urlStore/updatePlot.ts
@@ -4,7 +4,7 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import type { PlotKey, PlotParams } from 'url2';
+import type { PlotKey, PlotParams } from '@/url2';
import type { ProduceUpdate } from '../helpers';
import type { StatsHouseStore } from '../statsHouseStore';
import { produce } from 'immer';
diff --git a/statshouse-ui/src/store2/urlStore/updatePlotType.ts b/statshouse-ui/src/store2/urlStore/updatePlotType.ts
index e5cc823e8..e58a707e4 100644
--- a/statshouse-ui/src/store2/urlStore/updatePlotType.ts
+++ b/statshouse-ui/src/store2/urlStore/updatePlotType.ts
@@ -5,11 +5,11 @@
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
import { StatsHouseStore } from '../statsHouseStore';
-import { type PlotKey } from 'url2';
-import { PLOT_TYPE, type PlotType, QUERY_WHAT, TAG_KEY } from 'api/enum';
+import type { PlotKey } from '@/url2';
+import { PLOT_TYPE, type PlotType, QUERY_WHAT, TAG_KEY } from '@/api/enum';
import { ProduceUpdate } from '../helpers';
import { dequal } from 'dequal/lite';
-import { getTimeShifts, timeShiftAbbrevExpand } from 'view/utils2';
+import { getTimeShifts, timeShiftAbbrevExpand } from '@/view/utils2';
export function updatePlotType(plotKey: PlotKey, nextType: PlotType): ProduceUpdate {
return (store) => {
@@ -24,7 +24,7 @@ export function updatePlotType(plotKey: PlotKey, nextType: PlotType): ProduceUpd
plot.what = [QUERY_WHAT.countNorm];
plot.numSeries = 5;
break;
- case PLOT_TYPE.Event:
+ case PLOT_TYPE.Event: {
plot.what = [QUERY_WHAT.count];
plot.numSeries = 0;
plot.customAgg = -1;
@@ -36,6 +36,7 @@ export function updatePlotType(plotKey: PlotKey, nextType: PlotType): ProduceUpd
];
}
break;
+ }
}
if (plot.type === PLOT_TYPE.Metric) {
diff --git a/statshouse-ui/src/store2/urlStore/updatePlotYLock.ts b/statshouse-ui/src/store2/urlStore/updatePlotYLock.ts
index 7ef51529f..6dd07f377 100644
--- a/statshouse-ui/src/store2/urlStore/updatePlotYLock.ts
+++ b/statshouse-ui/src/store2/urlStore/updatePlotYLock.ts
@@ -4,9 +4,9 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { type PlotKey } from '../../url2';
-import { type ProduceUpdate } from '../helpers';
-import { type StatsHouseStore } from '../statsHouseStore';
+import type { PlotKey } from '../../url2';
+import type { ProduceUpdate } from '../helpers';
+import type { StatsHouseStore } from '../statsHouseStore';
import { getMinMaxY } from './getMinMaxY';
export function updatePlotYLock(
diff --git a/statshouse-ui/src/store2/urlStore/updateRemovePlot.ts b/statshouse-ui/src/store2/urlStore/updateRemovePlot.ts
deleted file mode 100644
index a5dac32b1..000000000
--- a/statshouse-ui/src/store2/urlStore/updateRemovePlot.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2024 V Kontakte LLC
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-import { PlotKey } from 'url2';
-import { ProduceUpdate } from '../helpers';
-import { StatsHouseStore } from '../statsHouseStore';
-
-export function updateRemovePlot(plotKey: PlotKey): ProduceUpdate {
- return (state) => {
- const plot = state.params.plots[plotKey];
- // todo: remove plot
- // if (plot) {
- // plot.yLock = { min: 0, max: 0 };
- // }
- // const from = timeRangeAbbrevExpand(state.baseRange);
- // state.params.timeRange = readTimeRange(
- // from,
- // state.params.timeRange.absolute ? TIME_RANGE_KEYS_TO.default : TIME_RANGE_KEYS_TO.Now
- // );
- };
-}
diff --git a/statshouse-ui/src/store2/urlStore/updateTimeRange.ts b/statshouse-ui/src/store2/urlStore/updateTimeRange.ts
index f8311ed06..0df009bea 100644
--- a/statshouse-ui/src/store2/urlStore/updateTimeRange.ts
+++ b/statshouse-ui/src/store2/urlStore/updateTimeRange.ts
@@ -4,10 +4,10 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { TimeRangeKeysTo } from 'api/enum';
+import { TimeRangeKeysTo } from '@/api/enum';
import type { ProduceUpdate } from '../helpers';
import type { StatsHouseStore } from '../statsHouseStore';
-import { readTimeRange } from 'url2';
+import { readTimeRange } from '@/url2';
export function updateTimeRange(from: number, to: number | TimeRangeKeysTo): ProduceUpdate {
return (s) => {
diff --git a/statshouse-ui/src/store2/urlStore/urlStore.ts b/statshouse-ui/src/store2/urlStore/urlStore.ts
index 094352fa0..c9dd3ae99 100644
--- a/statshouse-ui/src/store2/urlStore/urlStore.ts
+++ b/statshouse-ui/src/store2/urlStore/urlStore.ts
@@ -13,13 +13,13 @@ import {
type PlotKey,
type PlotParams,
type QueryParams,
-} from 'url2';
-import { type StoreSlice } from '../createStore';
-import { appHistory } from 'common/appHistory';
+} from '@/url2';
+import type { StoreSlice } from '../createStore';
+import { appHistory } from '@/common/appHistory';
import { getAbbrev, getUrl, isEmbedPath, isValidPath, type ProduceUpdate } from '../helpers';
import { getUrlState } from './getUrlState';
-import { type StatsHouseStore } from '../statsHouseStore';
-import { type PlotType, type TimeRangeKeysTo } from 'api/enum';
+import type { StatsHouseStore } from '../statsHouseStore';
+import type { PlotType, TimeRangeKeysTo } from '@/api/enum';
import { updatePlot } from './updatePlot';
import { updateTimeRange } from './updateTimeRange';
import { updateParams } from './updateParams';
@@ -36,13 +36,13 @@ import { toggleGroupShow } from './toggleGroupShow';
import { updateParamsPlotStruct, VariableLinks } from './updateParamsPlotStruct';
import { getAutoSearchVariable } from './getAutoSearchVariable';
import { defaultBaseRange } from '../constants';
-import { useErrorStore } from 'store/errors';
+import { useErrorStore } from '@/store/errors';
import { debug } from '../../common/debug';
import { readDataDashboard } from './readDataDashboard';
import { mergeParams } from './mergeParams';
import { setLiveMode } from '../liveModeStore';
import { filterVariableByPlot } from '../helpers/filterVariableByPlot';
-import { fixMessageTrouble } from 'url/fixMessageTrouble';
+import { fixMessageTrouble } from '@/url/fixMessageTrouble';
import { isNotNil } from '../../common/helpers';
import { getUrlObject } from '../../common/getUrlObject';
import { apiDashboardSave } from '../../api/dashboard';
diff --git a/statshouse-ui/src/store2/userStore/userStore.ts b/statshouse-ui/src/store2/userStore/userStore.ts
index 5edb192d2..940e85ac6 100644
--- a/statshouse-ui/src/store2/userStore/userStore.ts
+++ b/statshouse-ui/src/store2/userStore/userStore.ts
@@ -4,11 +4,11 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { globalSettings } from 'common/settings';
-import { appHistory } from 'common/appHistory';
+import { globalSettings } from '@/common/settings';
+import { appHistory } from '@/common/appHistory';
import { dequal } from 'dequal/lite';
-import { type StoreSlice } from '../createStore';
-import { type StatsHouseStore } from '../statsHouseStore';
+import type { StoreSlice } from '../createStore';
+import type { StatsHouseStore } from '../statsHouseStore';
export const logoutURL = '/vkuth/logout';
export const cookieName = 'vkuth_data';
@@ -16,7 +16,7 @@ export const cookieName = 'vkuth_data';
export type UserInfo = { login: string; admin: boolean; developer: boolean; logoutURL: string };
export type UserStore = { user: UserInfo };
-export const userStore: StoreSlice = (setState, getState, store) => {
+export const userStore: StoreSlice = (setState, getState) => {
appHistory.listen(() => {
const next = updateUser();
if (!dequal(next, getState().user)) {
diff --git a/statshouse-ui/src/store2/variableChangeStatusStore/variableChangeStatusStore.ts b/statshouse-ui/src/store2/variableChangeStatusStore/variableChangeStatusStore.ts
index d9c1c5cd7..f3b236b2a 100644
--- a/statshouse-ui/src/store2/variableChangeStatusStore/variableChangeStatusStore.ts
+++ b/statshouse-ui/src/store2/variableChangeStatusStore/variableChangeStatusStore.ts
@@ -5,7 +5,7 @@
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
import { createStore } from '../createStore';
-import { type VariableKey } from 'url2';
+import type { VariableKey } from '@/url2';
export type VariableChangeStatusStore = {
changeVariable: Partial>;
diff --git a/statshouse-ui/src/store2/variableList/replaceVariable.ts b/statshouse-ui/src/store2/variableList/replaceVariable.ts
index 3da69173b..ff294ea9f 100644
--- a/statshouse-ui/src/store2/variableList/replaceVariable.ts
+++ b/statshouse-ui/src/store2/variableList/replaceVariable.ts
@@ -1,6 +1,6 @@
import { produce } from 'immer';
import { isNotNil } from '../../common/helpers';
-import { type PlotKey, type PlotParams, type VariableKey, type VariableParams } from '../../url2';
+import type { PlotKey, PlotParams, VariableKey, VariableParams } from '../../url2';
/**
* replace filter value by variable
diff --git a/statshouse-ui/src/store2/variableList/variableListStore.ts b/statshouse-ui/src/store2/variableList/variableListStore.ts
index 021a296cb..c4ed68962 100644
--- a/statshouse-ui/src/store2/variableList/variableListStore.ts
+++ b/statshouse-ui/src/store2/variableList/variableListStore.ts
@@ -16,11 +16,11 @@ import {
import { globalSettings } from '../../common/settings';
import { filterParamsArr } from '../../view/api';
import { deepClone, isNotNil, toNumber } from '../../common/helpers';
-import { type MetricMetaTag } from '../../api/metric';
+import type { MetricMetaTag } from '../../api/metric';
import { createStore } from '../createStore';
import { produce } from 'immer';
-import { useErrorStore } from 'store/errors';
+import { useErrorStore } from '@/store/errors';
import { replaceVariable } from './replaceVariable';
import { getNewVariable, type PlotKey, promQLMetric, type VariableParams, type VariableParamsSource } from '../../url2';
import { type StatsHouseStore, useStatsHouse } from '../statsHouseStore';
diff --git a/statshouse-ui/src/svgr.d.ts b/statshouse-ui/src/svgr.d.ts
new file mode 100644
index 000000000..36f0dca3f
--- /dev/null
+++ b/statshouse-ui/src/svgr.d.ts
@@ -0,0 +1,8 @@
+declare module '*.svg' {
+ import * as React from 'react';
+
+ export const ReactComponent: React.FunctionComponent & { title?: string }>;
+
+ const src: string;
+ export default src;
+}
diff --git a/statshouse-ui/src/testMock/matchMedia.mock.ts b/statshouse-ui/src/testMock/matchMedia.mock.ts
index 52af3c851..124f5dd08 100644
--- a/statshouse-ui/src/testMock/matchMedia.mock.ts
+++ b/statshouse-ui/src/testMock/matchMedia.mock.ts
@@ -4,7 +4,6 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-// @ts-ignore
Object.defineProperty(window, 'matchMedia', {
writable: true,
value: jest.fn().mockImplementation((query) => ({
diff --git a/statshouse-ui/src/url/queryParams.ts b/statshouse-ui/src/url/queryParams.ts
index fbe0f7f66..4a5d29610 100644
--- a/statshouse-ui/src/url/queryParams.ts
+++ b/statshouse-ui/src/url/queryParams.ts
@@ -431,7 +431,7 @@ export function encodeParams(value: QueryParams, defaultParams?: QueryParams): [
!defaultParams?.dashboard?.groupInfo?.length
)
) {
- value.dashboard.groupInfo.forEach(({ name, show, count, size, description }, indexGroup) => {
+ value.dashboard.groupInfo.forEach(({ name, count, size, description }, indexGroup) => {
const prefix = toGroupInfoPrefix(indexGroup) + '.';
search.push([prefix + GET_PARAMS.dashboardGroupInfoName, name]);
if (count) {
@@ -643,7 +643,7 @@ export function decodeParams(searchParams: [string, string][], defaultParams?: Q
const groupInfo: GroupInfo[] = [];
- let dashboard: DashboardParams = {
+ const dashboard: DashboardParams = {
dashboard_id:
toNumber(urlParams[GET_PARAMS.dashboardID]?.[searchParamsObjectValueSymbol]?.[0]) ??
defaultParams?.dashboard?.dashboard_id ??
diff --git a/statshouse-ui/src/url2/getDefault.ts b/statshouse-ui/src/url2/getDefault.ts
index 482e6e24e..3be58a983 100644
--- a/statshouse-ui/src/url2/getDefault.ts
+++ b/statshouse-ui/src/url2/getDefault.ts
@@ -1,7 +1,7 @@
import type { GroupInfo, PlotParams, QueryParams, VariableParams, VariableParamsSource } from './queryParams';
-import { TAG_KEY, TIME_RANGE_KEYS_TO } from 'api/enum';
-import { deepClone } from 'common/helpers';
-import { globalSettings } from 'common/settings';
+import { TAG_KEY, TIME_RANGE_KEYS_TO } from '@/api/enum';
+import { deepClone } from '@/common/helpers';
+import { globalSettings } from '@/common/settings';
import { getNewMetric } from './widgetsParams';
export function getDefaultParams(): QueryParams {
diff --git a/statshouse-ui/src/url2/queryParams.ts b/statshouse-ui/src/url2/queryParams.ts
index f2e0f369b..7ef4c9c3c 100644
--- a/statshouse-ui/src/url2/queryParams.ts
+++ b/statshouse-ui/src/url2/queryParams.ts
@@ -5,7 +5,7 @@ import {
type QueryWhat,
type TagKey,
type TimeRangeKeysTo,
-} from 'api/enum';
+} from '@/api/enum';
export type PlotKey = string;
diff --git a/statshouse-ui/src/url2/timeRangeHelpers.test.ts b/statshouse-ui/src/url2/timeRangeHelpers.test.ts
index 2570e4efc..2b1e19b5b 100644
--- a/statshouse-ui/src/url2/timeRangeHelpers.test.ts
+++ b/statshouse-ui/src/url2/timeRangeHelpers.test.ts
@@ -1,5 +1,5 @@
-import 'testMock/matchMedia.mock';
-import { TIME_RANGE_KEYS_TO } from 'api/enum';
+import '@/testMock/matchMedia.mock';
+import { TIME_RANGE_KEYS_TO } from '@/api/enum';
import { getEndDay, getEndWeek, getNow, readTimeRange, toDateTime, toTimeStamp } from './timeRangeHelpers';
const nowDateTime = '2020-01-01 00:00:00';
diff --git a/statshouse-ui/src/url2/timeRangeHelpers.ts b/statshouse-ui/src/url2/timeRangeHelpers.ts
index 8fd887287..c6d74fd3a 100644
--- a/statshouse-ui/src/url2/timeRangeHelpers.ts
+++ b/statshouse-ui/src/url2/timeRangeHelpers.ts
@@ -1,6 +1,6 @@
import type { TimeRange } from './queryParams';
-import { toNumber } from 'common/helpers';
-import { TIME_RANGE_KEYS_TO, type TimeRangeKeysTo, toTimeRangeKeysTo } from 'api/enum';
+import { toNumber } from '@/common/helpers';
+import { TIME_RANGE_KEYS_TO, type TimeRangeKeysTo, toTimeRangeKeysTo } from '@/api/enum';
export function toTimeStamp(time: number) {
return Math.floor(time / 1000);
@@ -18,13 +18,13 @@ export function getNow(now?: number): number {
}
export function getEndDay(now?: number) {
- let time = toDateTime(now);
+ const time = toDateTime(now);
time.setHours(23, 59, 59, 0);
return toTimeStamp(+time);
}
export function getEndWeek(now?: number) {
- let time = toDateTime(now);
+ const time = toDateTime(now);
time.setHours(23, 59, 59, 0);
time.setDate(time.getDate() - (time.getDay() || 7) + 7);
return toTimeStamp(+time);
@@ -34,7 +34,7 @@ export function readTimeRange(from: unknown, to: unknown): TimeRange {
const timeNow = getNow();
let urlTo = toNumber(to) || toTimeRangeKeysTo(to, TIME_RANGE_KEYS_TO.default); //?
let timeTo;
- let timeAbsolute = (typeof urlTo === 'number' && urlTo > 0) || urlTo === TIME_RANGE_KEYS_TO.default;
+ const timeAbsolute = (typeof urlTo === 'number' && urlTo > 0) || urlTo === TIME_RANGE_KEYS_TO.default;
switch (urlTo) {
case TIME_RANGE_KEYS_TO.EndDay:
timeTo = getEndDay(timeNow);
diff --git a/statshouse-ui/src/url2/url.test.ts b/statshouse-ui/src/url2/url.test.ts
index 6f54bd7f4..ef47455bb 100644
--- a/statshouse-ui/src/url2/url.test.ts
+++ b/statshouse-ui/src/url2/url.test.ts
@@ -1,5 +1,5 @@
-import 'testMock/matchMedia.mock';
-import { type QueryParams } from './queryParams';
+import '@/testMock/matchMedia.mock';
+import type { QueryParams } from './queryParams';
import { urlEncode } from './urlEncode';
import { urlDecode } from './urlDecode';
import { getDefaultParams, getNewGroup, getNewVariable } from './getDefault';
@@ -56,11 +56,11 @@ const params2: QueryParams = {
orderVariables: ['3', '1', '0'],
};
-describe('urlStore', () => {
- test('urlEncode => urlDecode', () => {
+describe('@/urlStore', () => {
+ test('@/urlEncode => urlDecode', () => {
expect(urlDecode(toTreeObj(arrToObj(urlEncode(params))), params)).toEqual(params);
});
- test('urlEncode => urlDecode save', () => {
+ test('@/urlEncode => urlDecode save', () => {
expect(urlDecode(toTreeObj(arrToObj(urlEncode(params2, params))), params)).toEqual(params2);
expect(urlDecode(toTreeObj(arrToObj(urlEncode(params, params2))), params2)).toEqual(params);
});
diff --git a/statshouse-ui/src/url2/urlDecode.test.ts b/statshouse-ui/src/url2/urlDecode.test.ts
index 3a637764b..09532c350 100644
--- a/statshouse-ui/src/url2/urlDecode.test.ts
+++ b/statshouse-ui/src/url2/urlDecode.test.ts
@@ -1,4 +1,4 @@
-import 'testMock/matchMedia.mock';
+import '@/testMock/matchMedia.mock';
import {
urlDecode,
urlDecodeGlobalParam,
@@ -9,24 +9,18 @@ import {
urlDecodeVariables,
urlDecodeVariableSource,
} from './urlDecode';
-import { GET_PARAMS, TIME_RANGE_KEYS_TO } from 'api/enum';
-import { THEMES } from 'store/theme';
+import { GET_PARAMS, TIME_RANGE_KEYS_TO } from '@/api/enum';
+import { THEMES } from '@/store/theme';
import { QueryParams, VariableParams, VariableParamsSource } from './queryParams';
import { getDefaultParams, getNewGroup, getNewVariable, getNewVariableSource } from './getDefault';
-import {
- orderGroupSplitter,
- orderPlotSplitter,
- orderVariableSplitter,
- promQLMetric,
- removeValueChar,
-} from './constants';
+import { orderGroupSplitter, orderVariableSplitter, promQLMetric, removeValueChar } from './constants';
import { toTreeObj, treeParamsObjectValueSymbol } from './urlHelpers';
import { getNewMetric } from './widgetsParams/metric';
jest.useFakeTimers().setSystemTime(new Date('2020-01-01 00:00:00'));
-describe('urlStore urlDecode', () => {
- test('urlDecodeGlobalParam', () => {
+describe('@/urlStore urlDecode', () => {
+ test('@/urlDecodeGlobalParam', () => {
const dParams = {
...getDefaultParams(),
dashboardDescription: 'desc',
@@ -103,7 +97,7 @@ describe('urlStore urlDecode', () => {
timeShifts: [24, 48],
});
});
- test('urlDecodeTimeRange', () => {
+ test('@/urlDecodeTimeRange', () => {
const dParams = {
...getDefaultParams(),
timeRange: {
@@ -151,7 +145,7 @@ describe('urlStore urlDecode', () => {
},
});
});
- test('urlDecodeGroup', () => {
+ test('@/urlDecodeGroup', () => {
const dParams = {
...getNewGroup(),
id: '0',
@@ -193,7 +187,7 @@ describe('urlStore urlDecode', () => {
size: '4',
});
});
- test('urlDecodeGroups', () => {
+ test('@/urlDecodeGroups', () => {
const dParams = {
...getDefaultParams(),
groups: {
@@ -228,7 +222,7 @@ describe('urlStore urlDecode', () => {
)
).toEqual({ orderGroup: ['2'], groups: { '2': dParams.groups['2'] } });
});
- test('urlDecodeVariableSource', () => {
+ test('@/urlDecodeVariableSource', () => {
const dParams: VariableParamsSource = { ...getNewVariableSource(), id: '0' };
expect(urlDecodeVariableSource(dParams.id, {}, dParams)).toEqual(dParams);
expect(
@@ -254,7 +248,7 @@ describe('urlStore urlDecode', () => {
)
).toEqual({ ...dParams, metric: 'metric', tag: '_s' });
});
- test('urlDecodeVariable', () => {
+ test('@/urlDecodeVariable', () => {
const dParams: VariableParams = {
...getNewVariable(),
id: '0',
@@ -350,7 +344,7 @@ describe('urlStore urlDecode', () => {
)
).toEqual({ ...dParams, values: [] });
});
- test('urlDecodeVariables', () => {
+ test('@/urlDecodeVariables', () => {
const dParams: QueryParams = {
...getDefaultParams(),
variables: {
@@ -383,7 +377,7 @@ describe('urlStore urlDecode', () => {
orderVariables: ['2'],
});
});
- test('urlDecode', () => {
+ test('@/urlDecode', () => {
const dParams: QueryParams = {
...getDefaultParams(),
timeRange: {
diff --git a/statshouse-ui/src/url2/urlDecode.ts b/statshouse-ui/src/url2/urlDecode.ts
index 2c7aa6b79..6a301ad09 100644
--- a/statshouse-ui/src/url2/urlDecode.ts
+++ b/statshouse-ui/src/url2/urlDecode.ts
@@ -7,8 +7,8 @@ import {
VariableParamsSource,
VariableSourceKey,
} from './queryParams';
-import { isNotNil, toNumber, toNumberM, uniqueArray } from 'common/helpers';
-import { GET_PARAMS, toTagKey } from 'api/enum';
+import { isNotNil, toNumber, toNumberM, uniqueArray } from '@/common/helpers';
+import { GET_PARAMS, toTagKey } from '@/api/enum';
import { getDefaultParams, getNewGroup, getNewVariable, getNewVariableSource } from './getDefault';
import { orderGroupSplitter, orderVariableSplitter, removeValueChar } from './constants';
import { isKeyId, isNotNilVariableLink, TreeParamsObject, treeParamsObjectValueSymbol } from './urlHelpers';
@@ -263,7 +263,7 @@ export function urlDecodeVariable(
link,
source,
sourceOrder,
- values: values?.[0] === removeValueChar ? [] : values ?? defaultVariable.values,
+ values: values?.[0] === removeValueChar ? [] : (values ?? defaultVariable.values),
groupBy: groupBy != null ? groupBy === '1' : defaultVariable.groupBy,
negative: negative != null ? negative === '1' : defaultVariable.negative,
};
diff --git a/statshouse-ui/src/url2/urlEncode.test.ts b/statshouse-ui/src/url2/urlEncode.test.ts
index d55a57c35..0e8d6a983 100644
--- a/statshouse-ui/src/url2/urlEncode.test.ts
+++ b/statshouse-ui/src/url2/urlEncode.test.ts
@@ -1,4 +1,4 @@
-import 'testMock/matchMedia.mock';
+import '@/testMock/matchMedia.mock';
import {
urlEncode,
urlEncodeGlobalParam,
@@ -9,27 +9,18 @@ import {
urlEncodeVariables,
urlEncodeVariableSource,
} from './urlEncode';
-import { GroupInfo, PlotParams, QueryParams, VariableParams } from './queryParams';
-import {
- GET_PARAMS,
- METRIC_TYPE,
- METRIC_VALUE_BACKEND_VERSION,
- PLOT_TYPE,
- QUERY_WHAT,
- TIME_RANGE_KEYS_TO,
-} from 'api/enum';
-import { THEMES } from 'store/theme';
+import { GroupInfo, QueryParams, VariableParams } from './queryParams';
+import { GET_PARAMS, TIME_RANGE_KEYS_TO } from '@/api/enum';
+import { THEMES } from '@/store/theme';
import { getDefaultParams, getNewGroup, getNewVariable, getNewVariableSource } from './getDefault';
-import { promQLMetric, removeValueChar } from './constants';
-import { getNewMetric, metricEncode, metricFilterEncode } from './widgetsParams/metric';
-import { widgetsParamsEncode } from './widgetsParams';
+import { removeValueChar } from './constants';
jest.useFakeTimers().setSystemTime(new Date('2020-01-01 00:00:00'));
const params: QueryParams = getDefaultParams();
-describe('urlStore urlEncode', () => {
- test('urlEncodeVariableSource', () => {
+describe('@/urlStore urlEncode', () => {
+ test('@/urlEncodeVariableSource', () => {
const dParam = {
...getNewVariableSource(),
id: '0',
@@ -52,7 +43,7 @@ describe('urlStore urlEncode', () => {
[prefix + GET_PARAMS.variableSourceFilter, '1~ns2'],
]);
});
- test('urlEncodeVariable', () => {
+ test('@/urlEncodeVariable', () => {
const dParam: VariableParams = {
...getNewVariable(),
id: '0',
@@ -128,7 +119,7 @@ describe('urlStore urlEncode', () => {
[GET_PARAMS.variableValuePrefix + '.' + dParam2.name + '.' + GET_PARAMS.variableNegative, '0'],
]);
});
- test('urlEncodeVariables', () => {
+ test('@/urlEncodeVariables', () => {
const params2: QueryParams = {
...params,
variables: {
@@ -210,7 +201,7 @@ describe('urlStore urlEncode', () => {
['ov', '1'],
]);
});
- test('urlEncodeGroup', () => {
+ test('@/urlEncodeGroup', () => {
const dParam: GroupInfo = {
...getNewGroup(),
id: '0',
@@ -228,7 +219,7 @@ describe('urlStore urlEncode', () => {
]);
expect(urlEncodeGroup({ ...dParam, show: true }, { ...dParam, show: false })).toEqual([['g0.v', '1']]);
});
- test('urlEncodeGroups', () => {
+ test('@/urlEncodeGroups', () => {
const params2: QueryParams = {
...params,
groups: {
@@ -262,7 +253,7 @@ describe('urlStore urlEncode', () => {
]);
});
- test('urlEncodeTimeRange', () => {
+ test('@/urlEncodeTimeRange', () => {
expect(urlEncodeTimeRange(params)).toEqual([]);
expect(urlEncodeTimeRange(params, params)).toEqual([]);
expect(
@@ -282,7 +273,7 @@ describe('urlStore urlEncode', () => {
['f', '-1000'],
]);
});
- test('urlEncodeGlobalParam', () => {
+ test('@/urlEncodeGlobalParam', () => {
expect(urlEncodeGlobalParam(params)).toEqual([]);
expect(urlEncodeGlobalParam(params, params)).toEqual([]);
expect(
@@ -324,7 +315,7 @@ describe('urlStore urlEncode', () => {
).toEqual([['live', '0']]);
});
- test('urlEncode', () => {
+ test('@/urlEncode', () => {
expect(urlEncode(params)).toEqual([]);
});
});
diff --git a/statshouse-ui/src/url2/urlEncode.ts b/statshouse-ui/src/url2/urlEncode.ts
index f615f9ce9..9756b1e95 100644
--- a/statshouse-ui/src/url2/urlEncode.ts
+++ b/statshouse-ui/src/url2/urlEncode.ts
@@ -1,5 +1,5 @@
import { GroupInfo, QueryParams, VariableParams, VariableParamsSource } from './queryParams';
-import { GET_PARAMS } from 'api/enum';
+import { GET_PARAMS } from '@/api/enum';
import { dequal } from 'dequal/lite';
import { getDefaultParams, getNewGroup, getNewVariable, getNewVariableSource } from './getDefault';
diff --git a/statshouse-ui/src/url2/urlHelpers.test.ts b/statshouse-ui/src/url2/urlHelpers.test.ts
index 23466402e..fcb204d9b 100644
--- a/statshouse-ui/src/url2/urlHelpers.test.ts
+++ b/statshouse-ui/src/url2/urlHelpers.test.ts
@@ -1,6 +1,7 @@
-import 'testMock/matchMedia.mock';
+import '@/testMock/matchMedia.mock';
import { arrToObj } from './urlHelpers';
-describe('urlHelpers', () => {
+
+describe('@/urlHelpers', () => {
test('arrToObj', () => {
expect(
arrToObj([
diff --git a/statshouse-ui/src/url2/urlHelpers.ts b/statshouse-ui/src/url2/urlHelpers.ts
index c33815506..f5a830103 100644
--- a/statshouse-ui/src/url2/urlHelpers.ts
+++ b/statshouse-ui/src/url2/urlHelpers.ts
@@ -1,6 +1,6 @@
-import { toNumber, toString } from 'common/helpers';
+import { toNumber, toString } from '@/common/helpers';
import type { PlotKey, VariableParamsLink } from './queryParams';
-import { GET_PARAMS, toTagKey } from 'api/enum';
+import { GET_PARAMS, toTagKey } from '@/api/enum';
export function freeKeyPrefix(str: string): string {
return str.replace('skey', '_s').replace('key', '');
@@ -57,7 +57,7 @@ export type TreeParamsObject = Partial<{
export function toTreeObj(obj: Partial>): TreeParamsObject {
const res = {};
- for (let key in obj) {
+ for (const key in obj) {
const keys = key.split('.');
let target: TreeParamsObject = res;
keys.forEach((keyName) => {
diff --git a/statshouse-ui/src/url2/widgetsParams/metric/metricDecode.test.ts b/statshouse-ui/src/url2/widgetsParams/metric/metricDecode.test.ts
index 50e381190..45bcb7ee0 100644
--- a/statshouse-ui/src/url2/widgetsParams/metric/metricDecode.test.ts
+++ b/statshouse-ui/src/url2/widgetsParams/metric/metricDecode.test.ts
@@ -1,6 +1,5 @@
-import 'testMock/matchMedia.mock';
+import '@/testMock/matchMedia.mock';
import { getNewMetric } from './getNewMetric';
-import { metricFilterDecode } from './metricFilterDecode';
import {
GET_PARAMS,
METRIC_TYPE,
@@ -10,10 +9,10 @@ import {
QUERY_WHAT,
} from '../../../api/enum';
import { toTreeObj, treeParamsObjectValueSymbol } from '../../urlHelpers';
-import { filterInSep, filterNotInSep, promQLMetric, removeValueChar } from '../../constants';
+import { promQLMetric, removeValueChar } from '../../constants';
import { metricDecode } from './metricDecode';
-describe('urlStore widgetsParams/metric/metricDecode.ts', () => {
+describe('@/urlStore widgetsParams/metric/metricDecode.ts', () => {
test('metricDecode', () => {
const dParams = {
...getNewMetric(),
diff --git a/statshouse-ui/src/url2/widgetsParams/metric/metricEncode.test.ts b/statshouse-ui/src/url2/widgetsParams/metric/metricEncode.test.ts
index cf817f31b..9c5386949 100644
--- a/statshouse-ui/src/url2/widgetsParams/metric/metricEncode.test.ts
+++ b/statshouse-ui/src/url2/widgetsParams/metric/metricEncode.test.ts
@@ -1,11 +1,12 @@
-import 'testMock/matchMedia.mock';
+import '@/testMock/matchMedia.mock';
import { PlotParams } from '../../queryParams';
import { getNewMetric } from './getNewMetric';
import { METRIC_TYPE, METRIC_VALUE_BACKEND_VERSION, PLOT_TYPE, QUERY_WHAT } from '../../../api/enum';
import { metricEncode } from './metricEncode';
import { promQLMetric } from '../../constants';
-describe('urlStore widgetsParams/metric/metricEncode.ts', () => {
- test('urlEncodePlot', () => {
+
+describe('@/urlStore widgetsParams/metric/metricEncode.ts', () => {
+ test('@/urlEncodePlot', () => {
const dParam: PlotParams = {
...getNewMetric(),
id: '0',
diff --git a/statshouse-ui/src/url2/widgetsParams/metric/metricEncode.ts b/statshouse-ui/src/url2/widgetsParams/metric/metricEncode.ts
index c140f47fc..826b9ef7d 100644
--- a/statshouse-ui/src/url2/widgetsParams/metric/metricEncode.ts
+++ b/statshouse-ui/src/url2/widgetsParams/metric/metricEncode.ts
@@ -1,4 +1,4 @@
-import { type PlotParams } from '../../queryParams';
+import type { PlotParams } from '../../queryParams';
import { getNewMetric } from './getNewMetric';
import { GET_PARAMS, metricTypeToMetricTypeUrl, PLOT_TYPE, type TagKey } from '../../../api/enum';
import { toPlotPrefix } from '../../urlHelpers';
diff --git a/statshouse-ui/src/url2/widgetsParams/metric/metricFilterDecode.test.ts b/statshouse-ui/src/url2/widgetsParams/metric/metricFilterDecode.test.ts
index 66d8c8350..287b37166 100644
--- a/statshouse-ui/src/url2/widgetsParams/metric/metricFilterDecode.test.ts
+++ b/statshouse-ui/src/url2/widgetsParams/metric/metricFilterDecode.test.ts
@@ -1,11 +1,11 @@
-import 'testMock/matchMedia.mock';
+import '@/testMock/matchMedia.mock';
import { getNewMetric } from './getNewMetric';
import { metricFilterDecode } from './metricFilterDecode';
import { GET_PARAMS } from '../../../api/enum';
import { toTreeObj } from '../../urlHelpers';
import { filterInSep, filterNotInSep } from '../../constants';
-describe('urlStore widgetsParams/metric/metricFilterDecode.ts', () => {
+describe('@/urlStore widgetsParams/metric/metricFilterDecode.ts', () => {
test('metricFilterDecode', () => {
const dParams = {
...getNewMetric(),
diff --git a/statshouse-ui/src/url2/widgetsParams/metric/metricFilterEncode.test.ts b/statshouse-ui/src/url2/widgetsParams/metric/metricFilterEncode.test.ts
index 5ba621a9f..7e15250bd 100644
--- a/statshouse-ui/src/url2/widgetsParams/metric/metricFilterEncode.test.ts
+++ b/statshouse-ui/src/url2/widgetsParams/metric/metricFilterEncode.test.ts
@@ -1,7 +1,8 @@
-import 'testMock/matchMedia.mock';
+import '@/testMock/matchMedia.mock';
import { metricFilterEncode } from './metricFilterEncode';
import { GET_PARAMS } from '../../../api/enum';
-describe('urlStore widgetsParams/metric/metricFilterEncode.ts', () => {
+
+describe('@/urlStore widgetsParams/metric/metricFilterEncode.ts', () => {
test('metricFilterEncode', () => {
expect(metricFilterEncode(GET_PARAMS.plotPrefix + '1.', {}, {})).toEqual([]);
expect(metricFilterEncode(GET_PARAMS.plotPrefix + '1.', { '0': ['val1'] }, { '1': ['val1'] })).toEqual([
diff --git a/statshouse-ui/src/url2/widgetsParams/widgetsParamsDecode.test.ts b/statshouse-ui/src/url2/widgetsParams/widgetsParamsDecode.test.ts
index 377fd8154..b63e76da3 100644
--- a/statshouse-ui/src/url2/widgetsParams/widgetsParamsDecode.test.ts
+++ b/statshouse-ui/src/url2/widgetsParams/widgetsParamsDecode.test.ts
@@ -1,11 +1,12 @@
-import 'testMock/matchMedia.mock';
+import '@/testMock/matchMedia.mock';
import { getDefaultParams } from '../getDefault';
import { getNewMetric } from './metric';
import { GET_PARAMS } from '../../api/enum';
import { toTreeObj } from '../urlHelpers';
import { orderPlotSplitter, removeValueChar } from '../constants';
import { widgetsParamsDecode } from './widgetsParamsDecode';
-describe('urlStore widgetsParamsDecode', () => {
+
+describe('@/urlStore widgetsParamsDecode', () => {
test('widgetsParamsDecode', () => {
const dParams = {
...getDefaultParams(),
diff --git a/statshouse-ui/src/url2/widgetsParams/widgetsParamsEncode.test.ts b/statshouse-ui/src/url2/widgetsParams/widgetsParamsEncode.test.ts
index 2cb034c47..43fa4b937 100644
--- a/statshouse-ui/src/url2/widgetsParams/widgetsParamsEncode.test.ts
+++ b/statshouse-ui/src/url2/widgetsParams/widgetsParamsEncode.test.ts
@@ -1,4 +1,4 @@
-import 'testMock/matchMedia.mock';
+import '@/testMock/matchMedia.mock';
import { QueryParams } from '../queryParams';
import { getNewMetric } from './metric';
import { widgetsParamsEncode } from './widgetsParamsEncode';
@@ -7,8 +7,8 @@ import { getDefaultParams } from '../getDefault';
const params: QueryParams = getDefaultParams();
-describe('urlStore widgetsParamsEncode', () => {
- test('urlEncodePlots', () => {
+describe('@/urlStore widgetsParamsEncode', () => {
+ test('@/urlEncodePlots', () => {
const params2: QueryParams = {
...params,
plots: {
diff --git a/statshouse-ui/src/view/DashboardListView.tsx b/statshouse-ui/src/view/DashboardListView.tsx
index 6488b2ffa..f6bcbf5cf 100644
--- a/statshouse-ui/src/view/DashboardListView.tsx
+++ b/statshouse-ui/src/view/DashboardListView.tsx
@@ -10,8 +10,8 @@ import { useStateInput } from '../hooks';
import { ErrorMessages } from '../components/ErrorMessages';
import cn from 'classnames';
import { emptyArray, SearchFabric } from '../common/helpers';
-import { useWindowSize } from 'hooks/useWindowSize';
-import { toggleDashboardsFavorite, useFavoriteStore } from 'store2/favoriteStore';
+import { useWindowSize } from '@/hooks/useWindowSize';
+import { toggleDashboardsFavorite, useFavoriteStore } from '@/store2/favoriteStore';
import { ReactComponent as SVGStar } from 'bootstrap-icons/icons/star.svg';
import { ReactComponent as SVGStarFill } from 'bootstrap-icons/icons/star-fill.svg';
import { Tooltip } from '../components/UI';
diff --git a/statshouse-ui/src/view/Settings/GroupPage.tsx b/statshouse-ui/src/view/Settings/GroupPage.tsx
index 93668f26b..1c2071dfd 100644
--- a/statshouse-ui/src/view/Settings/GroupPage.tsx
+++ b/statshouse-ui/src/view/Settings/GroupPage.tsx
@@ -5,14 +5,14 @@
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { groupAdd, groupListErrors, groupListLoad, groupLoad, groupSave, useGroupListStore } from 'store/group';
+import { groupAdd, groupListErrors, groupListLoad, groupLoad, groupSave, useGroupListStore } from '@/store/group';
import { ReactComponent as SVGPlus } from 'bootstrap-icons/icons/plus.svg';
import cn from 'classnames';
-import { GroupInfo, GroupMetric } from 'api/group';
-import { toNumber } from 'common/helpers';
+import { GroupInfo, GroupMetric } from '@/api/group';
+import { toNumber } from '@/common/helpers';
import { produce } from 'immer';
-import { ErrorMessages } from 'components/ErrorMessages';
-import { InputText } from 'components/UI';
+import { ErrorMessages } from '@/components/ErrorMessages';
+import { InputText } from '@/components/UI';
type SelectGroup = {
group: Pick &
diff --git a/statshouse-ui/src/view/Settings/NamespacePage.tsx b/statshouse-ui/src/view/Settings/NamespacePage.tsx
index 285517b14..cb3939805 100644
--- a/statshouse-ui/src/view/Settings/NamespacePage.tsx
+++ b/statshouse-ui/src/view/Settings/NamespacePage.tsx
@@ -12,12 +12,12 @@ import {
namespaceLoad,
namespaceSave,
useNamespaceListStore,
-} from 'store/namespace';
+} from '@/store/namespace';
import { ReactComponent as SVGPlus } from 'bootstrap-icons/icons/plus.svg';
import cn from 'classnames';
-import { toNumber } from 'common/helpers';
+import { toNumber } from '@/common/helpers';
import { produce } from 'immer';
-import { type Namespace } from 'api/namespace';
+import type { Namespace } from '@/api/namespace';
import { ErrorMessages } from '../../components/ErrorMessages';
import { InputText } from '../../components/UI';
diff --git a/statshouse-ui/src/view/Settings/PrometheusPage.tsx b/statshouse-ui/src/view/Settings/PrometheusPage.tsx
index 387c67a79..61880576e 100644
--- a/statshouse-ui/src/view/Settings/PrometheusPage.tsx
+++ b/statshouse-ui/src/view/Settings/PrometheusPage.tsx
@@ -5,9 +5,9 @@
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
import React, { useCallback, useEffect, useState } from 'react';
-import { selectorLoadPromConfig, selectorPromConfig, selectorSavePromConfig, useStore } from '../../store';
-import { useStateInput } from '../../hooks';
-import { ErrorMessages } from 'components/ErrorMessages';
+import { selectorLoadPromConfig, selectorPromConfig, selectorSavePromConfig, useStore } from '@/store';
+import { useStateInput } from '@/hooks';
+import { ErrorMessages } from '@/components/ErrorMessages';
export type PrometheusPageProps = {};
export const PrometheusPage: React.FC = () => {
diff --git a/statshouse-ui/src/view/ViewPage.tsx b/statshouse-ui/src/view/ViewPage.tsx
index 3f589b1e7..34bd269e9 100644
--- a/statshouse-ui/src/view/ViewPage.tsx
+++ b/statshouse-ui/src/view/ViewPage.tsx
@@ -5,7 +5,7 @@
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
import React, { useCallback, useEffect, useState } from 'react';
-import { ToggleButton } from 'components/UI';
+import { ToggleButton } from '@/components/UI';
import {
defaultInterval,
selectorDisabledLive,
diff --git a/statshouse-ui/src/view/api.ts b/statshouse-ui/src/view/api.ts
index 5dea36261..8ab2a3738 100644
--- a/statshouse-ui/src/view/api.ts
+++ b/statshouse-ui/src/view/api.ts
@@ -24,7 +24,7 @@ import {
type QueryWhat,
type QueryWhatSelector,
type TagKey,
-} from 'api/enum';
+} from '@/api/enum';
import { promQLMetric } from './promQLMetric';
import { whatToWhatDesc } from './whatToWhatDesc';
import { convert, timeShiftDesc } from './utils2';
diff --git a/statshouse-ui/src/view/normalizeDashboard.ts b/statshouse-ui/src/view/normalizeDashboard.ts
index cf71754f7..edc275bc8 100644
--- a/statshouse-ui/src/view/normalizeDashboard.ts
+++ b/statshouse-ui/src/view/normalizeDashboard.ts
@@ -2,6 +2,7 @@ import {
getDefaultParams,
isNotNilVariableLink,
normalizeFilterKey,
+ PlotParams,
QueryParams,
toPlotKey,
toTagKey,
@@ -23,8 +24,17 @@ export interface DashboardInfo {
delete_mark?: boolean;
}
+type timeShiftsDeprecated = {
+ /**
+ * @deprecated
+ */
+ timeShifts?: unknown;
+};
+
export function normalizeDashboard(data: DashboardInfo): QueryParams {
- const params = data.dashboard.data as QueryParams;
+ const params = data.dashboard.data as QueryParams & {
+ plots: (PlotParams & timeShiftsDeprecated)[];
+ };
if (params.dashboard?.groups) {
params.dashboard.groupInfo = params.dashboard.groupInfo?.map((g, index) => ({
...g,
@@ -38,15 +48,13 @@ export function normalizeDashboard(data: DashboardInfo): QueryParams {
}));
delete params.dashboard.groups;
}
- // @ts-ignore
const timeShifts = params.timeShifts ?? params.plots[0]?.timeShifts ?? [];
return {
...getDefaultParams(),
...params,
live: getDefaultParams().live,
theme: getDefaultParams().theme,
- plots: params.plots.map((p, index) => {
- // @ts-ignore
+ plots: params.plots.map((p: PlotParams & timeShiftsDeprecated, index) => {
delete p.timeShifts;
p.id ??= `${index}`;
p.customName ??= '';
diff --git a/statshouse-ui/src/view/utils.ts b/statshouse-ui/src/view/utils.ts
index 9c66416c6..b15802c8d 100644
--- a/statshouse-ui/src/view/utils.ts
+++ b/statshouse-ui/src/view/utils.ts
@@ -6,7 +6,7 @@
import { GET_PARAMS, TAG_KEY } from '../api/enum';
import { metricTagValueInfo } from './api';
-import { type UseEventTagColumnReturn } from '../hooks/useEventTagColumns';
+import type { UseEventTagColumnReturn } from '../hooks/useEventTagColumns';
import { MetricMetaValue } from '../api/metric';
import { PlotStore } from '../store';
import { produce } from 'immer';
@@ -145,7 +145,7 @@ export function readJSONLD(type: string): T | null {
if (json['@type'] === type) {
return json as T;
}
- } catch (e) {}
+ } catch (_) {}
}
return null;
}
@@ -188,7 +188,7 @@ export function normalizeTagValues(values: readonly metricTagValueInfo[], sortBy
return copy.map((v) => ({ value: v.value, count: v.count / totalCount }));
}
-export function sortByKey(key: string, a: Record, b: Record) {
+export function sortByKey(key: string, a: Record, b: Record) {
return a[key] > b[key] ? 1 : a[key] < b[key] ? -1 : 0;
}
@@ -208,7 +208,7 @@ export function getMetricFullName(plot: PlotParams, plotData: PlotStore) {
}
const metricName = getMetricName(plot, plotData);
const metricWhat = getMetricWhat(plot, plotData);
- return metricName ? `${metricName}${!!metricWhat ? ': ' + metricWhat : ''}` : '';
+ return metricName ? `${metricName}${metricWhat ? ': ' + metricWhat : ''}` : '';
}
export function getEventTagColumns(plot: PlotParams, meta?: MetricMetaValue, selectedOnly: boolean = false) {
diff --git a/statshouse-ui/src/view/utils2.ts b/statshouse-ui/src/view/utils2.ts
index b885ad51e..61ed549e4 100644
--- a/statshouse-ui/src/view/utils2.ts
+++ b/statshouse-ui/src/view/utils2.ts
@@ -48,8 +48,8 @@ export function secondsRangeToString(seconds: number, short?: boolean): string {
[0, 'year', 'years', 'y'],
];
let range = seconds;
- let result = [];
- for (let key in suffix) {
+ const result = [];
+ for (const key in suffix) {
if (suffix[key][0] > 0) {
const num = range % (suffix[key][0] as number);
if (num > 0) {
@@ -411,8 +411,8 @@ export function ieee32ToFloat(intval: number): number {
let fval = 0.0;
let x; //exponent
let m; //mantissa
- let s; //sign
- s = intval & 0x80000000 ? -1 : 1;
+ //sign
+ const s = intval & 0x80000000 ? -1 : 1;
x = (intval >> 23) & 0xff;
m = intval & 0x7fffff;
switch (x) {
@@ -461,11 +461,12 @@ export function convert(kind: RawValueKind | undefined, input: number): string {
return (input >>> 0).toString(10);
case 'lexenc_float':
return parseFloat(lexDecode(input).toPrecision(8)).toString(10);
- case 'float':
+ case 'float': {
const buffer = new ArrayBuffer(4);
const dataView = new DataView(buffer);
dataView.setInt32(0, input, false);
return parseFloat(dataView.getFloat32(0, false).toPrecision(8)).toString(10);
+ }
default:
return input.toString(10);
}
diff --git a/statshouse-ui/src/view2/Core.tsx b/statshouse-ui/src/view2/Core.tsx
index 9589b0feb..3de2878b6 100644
--- a/statshouse-ui/src/view2/Core.tsx
+++ b/statshouse-ui/src/view2/Core.tsx
@@ -2,10 +2,10 @@ import React from 'react';
import { Outlet } from 'react-router-dom';
import css from './style.module.css';
-import { LeftMenu } from 'components2';
-import { useTvModeStore } from 'store2/tvModeStore';
-import { useStatsHouse } from 'store2';
-import { BuildVersion } from 'components/BuildVersion';
+import { LeftMenu } from '@/components2';
+import { useTvModeStore } from '@/store2/tvModeStore';
+import { useStatsHouse } from '@/store2';
+import { BuildVersion } from '@/components/BuildVersion';
export function Core() {
const isPlot = useStatsHouse(({ params: { tabNum } }) => +tabNum >= 0);
diff --git a/statshouse-ui/src/view2/ViewPage.tsx b/statshouse-ui/src/view2/ViewPage.tsx
index f41b8a1bc..5ba393481 100644
--- a/statshouse-ui/src/view2/ViewPage.tsx
+++ b/statshouse-ui/src/view2/ViewPage.tsx
@@ -1,10 +1,10 @@
import React, { useEffect, useState } from 'react';
-import { useStatsHouse, useStatsHouseShallow } from 'store2';
-import { Dashboard, TvModePanel } from 'components2';
-import { useEmbedMessage } from 'hooks/useEmbedMessage';
-import { ErrorMessages } from 'components/ErrorMessages';
-import { PlotLayout } from 'components2/Plot/PlotLayout';
-import { useTvModeStore } from '../store2/tvModeStore';
+import { useStatsHouse, useStatsHouseShallow } from '@/store2';
+import { Dashboard, TvModePanel } from '@/components2';
+import { useEmbedMessage } from '@/hooks/useEmbedMessage';
+import { ErrorMessages } from '@/components/ErrorMessages';
+import { PlotLayout } from '@/components2/Plot/PlotLayout';
+import { useTvModeStore } from '@/store2/tvModeStore';
export function ViewPage() {
// const { params, activePlotMeta, activePlot, globalNumQueriesPlot } = useStore(selector, shallow);
diff --git a/statshouse-ui/src/vite-env.d.ts b/statshouse-ui/src/vite-env.d.ts
new file mode 100644
index 000000000..11f02fe2a
--- /dev/null
+++ b/statshouse-ui/src/vite-env.d.ts
@@ -0,0 +1 @@
+///
diff --git a/statshouse-ui/src/widgets2/TopMenu/TopMenuWidget.tsx b/statshouse-ui/src/widgets2/TopMenu/TopMenuWidget.tsx
index c410b966a..fadc2c12e 100644
--- a/statshouse-ui/src/widgets2/TopMenu/TopMenuWidget.tsx
+++ b/statshouse-ui/src/widgets2/TopMenu/TopMenuWidget.tsx
@@ -1,7 +1,5 @@
-import React from 'react';
-
-import { PlotNavigate } from 'components2';
-import { useStatsHouseShallow } from '../../store2';
+import { PlotNavigate } from '@/components2';
+import { useStatsHouseShallow } from '@/store2';
export function TopMenuWidget() {
const { dashboardName, dashboardDescription, tabNum } = useStatsHouseShallow(
diff --git a/statshouse-ui/tsconfig.app.json b/statshouse-ui/tsconfig.app.json
new file mode 100644
index 000000000..f5e96dbb4
--- /dev/null
+++ b/statshouse-ui/tsconfig.app.json
@@ -0,0 +1,40 @@
+{
+ "compilerOptions": {
+ "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+ "target": "ES2020",
+ //"target": "es6",
+ "useDefineForClassFields": true,
+ "lib": ["ESNext", "DOM", "DOM.Iterable"],
+ // "lib": ["dom", "dom.iterable", "esnext"],
+ "module": "ESNext",
+ "skipLibCheck": true,
+
+ /* Bundler mode */
+ // "moduleResolution": "Bundler",
+ "moduleResolution": "Node",
+ "allowImportingTsExtensions": false,
+ "isolatedModules": true,
+ "moduleDetection": "force",
+ "noEmit": true,
+ "jsx": "react-jsx",
+
+ /* Linting */
+ "strict": true,
+ "noUnusedLocals": true,
+ "noUnusedParameters": true,
+ "noFallthroughCasesInSwitch": true,
+ "noUncheckedSideEffectImports": true,
+
+ "allowJs": true,
+ "esModuleInterop": true,
+ "allowSyntheticDefaultImports": true,
+ "forceConsistentCasingInFileNames": true,
+ "resolveJsonModule": true,
+ "baseUrl": "./",
+ "paths": {
+ "@/*": ["./src/*"],
+ "~*": ["./node_modules/*"]
+ }
+ },
+ "include": ["src"]
+}
diff --git a/statshouse-ui/tsconfig.json b/statshouse-ui/tsconfig.json
index 3ad2789cb..1ffef600d 100644
--- a/statshouse-ui/tsconfig.json
+++ b/statshouse-ui/tsconfig.json
@@ -1,21 +1,7 @@
{
- "compilerOptions": {
- "target": "es6",
- "lib": ["dom", "dom.iterable", "esnext"],
- "allowJs": true,
- "skipLibCheck": true,
- "esModuleInterop": true,
- "allowSyntheticDefaultImports": true,
- "strict": true,
- "forceConsistentCasingInFileNames": true,
- "noFallthroughCasesInSwitch": true,
- "module": "esnext",
- "moduleResolution": "node",
- "resolveJsonModule": true,
- "isolatedModules": true,
- "noEmit": true,
- "jsx": "react-jsx",
- "baseUrl": "src"
- },
- "include": ["src"]
+ "files": [],
+ "references": [
+ { "path": "./tsconfig.app.json" },
+ { "path": "./tsconfig.node.json" }
+ ]
}
diff --git a/statshouse-ui/tsconfig.node.json b/statshouse-ui/tsconfig.node.json
new file mode 100644
index 000000000..819186c45
--- /dev/null
+++ b/statshouse-ui/tsconfig.node.json
@@ -0,0 +1,24 @@
+{
+ "compilerOptions": {
+ "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
+ "target": "ES2022",
+ "lib": ["ES2023"],
+ "module": "ESNext",
+ "skipLibCheck": true,
+
+ /* Bundler mode */
+ "moduleResolution": "Node",
+ "allowImportingTsExtensions": true,
+ "isolatedModules": true,
+ "moduleDetection": "force",
+ "noEmit": true,
+
+ /* Linting */
+ "strict": true,
+ "noUnusedLocals": true,
+ "noUnusedParameters": true,
+ "noFallthroughCasesInSwitch": true,
+ "noUncheckedSideEffectImports": true
+ },
+ "include": ["vite.config.ts"]
+}
diff --git a/statshouse-ui/vite.config.ts b/statshouse-ui/vite.config.ts
new file mode 100644
index 000000000..7172517cd
--- /dev/null
+++ b/statshouse-ui/vite.config.ts
@@ -0,0 +1,92 @@
+import { join } from 'path';
+
+import { defineConfig, loadEnv, type UserConfig } from 'vite';
+import ReactSWC from '@vitejs/plugin-react-swc';
+import { ViteEjsPlugin } from 'vite-plugin-ejs';
+import SVGRRollup from '@svgr/rollup';
+import eslintPlugin from 'vite-plugin-eslint';
+
+// https://vitejs.dev/config/
+export default defineConfig(async (init) => {
+ const { REACT_APP_PROXY, REACT_APP_PROXY_COOKIE, REACT_APP_DEV_PORT, REACT_APP_DEV_HOST } = loadEnv(
+ init.mode,
+ process.cwd(),
+ ['REACT_']
+ );
+ const port = parseInt(REACT_APP_DEV_PORT) || 3000;
+ const headers: { [header: string]: string } = REACT_APP_PROXY_COOKIE ? { cookie: REACT_APP_PROXY_COOKIE } : {};
+ const config: UserConfig = {
+ base: './',
+ root: './',
+ build: {
+ sourcemap: true,
+ assetsInlineLimit: 0,
+ outDir: 'build',
+ chunkSizeWarningLimit: 1000000,
+ },
+ plugins: [
+ ViteEjsPlugin((viteConfig) => ({
+ env: viteConfig.env,
+ })),
+ ReactSWC({
+ devTarget: 'es2020',
+ }),
+ SVGRRollup({
+ typescript: true,
+ svgo: true,
+ svgoConfig: {
+ plugins: [
+ {
+ name: 'preset-default',
+ params: {
+ overrides: {
+ removeViewBox: false,
+ },
+ },
+ },
+ ],
+ },
+ }),
+ eslintPlugin(),
+ ],
+ resolve: {
+ alias: [
+ {
+ find: /~(.+)/,
+ replacement: join(process.cwd(), 'node_modules/$1'),
+ },
+ {
+ find: /@\//,
+ replacement: join(process.cwd(), './src') + '/',
+ },
+ ],
+ },
+ server: {
+ port,
+ host: REACT_APP_DEV_HOST || undefined,
+ proxy: {
+ '/api': {
+ target: REACT_APP_PROXY,
+ changeOrigin: true,
+ headers,
+ },
+ },
+ open: '/',
+ },
+ preview: {
+ port,
+ host: REACT_APP_DEV_HOST || undefined,
+ proxy: {
+ '/api': {
+ target: REACT_APP_PROXY,
+ changeOrigin: true,
+ headers,
+ },
+ },
+ open: '/',
+ },
+ envPrefix: ['VITE_', 'REACT_'],
+ esbuild: { logOverride: { 'negative-zero-esbuild-warn': 'silent' } },
+ };
+ return config;
+});