From 670b58dd6a6432d509430195e82ec6e2aee1e046 Mon Sep 17 00:00:00 2001
From: Ruben Thoms <69145689+rubenthoms@users.noreply.github.com>
Date: Tue, 29 Aug 2023 13:52:53 +0200
Subject: [PATCH 1/2] Fixed duplicate key in color gradient (#282)
---
frontend/src/lib/components/ColorGradient/colorGradient.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/frontend/src/lib/components/ColorGradient/colorGradient.tsx b/frontend/src/lib/components/ColorGradient/colorGradient.tsx
index 2365daa2e..d7f7fd51e 100644
--- a/frontend/src/lib/components/ColorGradient/colorGradient.tsx
+++ b/frontend/src/lib/components/ColorGradient/colorGradient.tsx
@@ -14,7 +14,7 @@ function makeColorSamples(steps: number, colorPalette: ColorPalette) {
const color = colorPalette.getInterpolatedColor(i / (steps - 1));
samples.push(
Date: Wed, 30 Aug 2023 16:49:16 +0200
Subject: [PATCH 2/2] Adjustments to dependency cruiser (#284)
---
frontend/.dependency-cruiser.cjs | 20 +++++++++----------
.../ChannelSelect/channelSelect.tsx | 2 +-
.../colorPaletteSettings.tsx | 2 +-
.../internal/components/NavBar/navBar.tsx | 2 +-
.../internal/components/Settings/settings.tsx | 2 +-
.../ApiStateWrapper/apiStateWrapper.tsx | 3 +--
frontend/src/lib/components/Badge/badge.tsx | 3 +--
.../baseComponent.tsx | 2 +-
.../index.ts | 0
frontend/src/lib/components/Button/button.tsx | 4 ++--
.../src/lib/components/Checkbox/checkbox.tsx | 5 +++--
.../CircularProgress/circularProgress.tsx | 5 +++--
.../CollapsibleGroup/collapsibleGroup.tsx | 4 ++--
.../lib/components/ColorTile/colorTile.tsx | 2 +-
.../ColorTileGroup/colorTileGroup.tsx | 3 +--
frontend/src/lib/components/Dialog/dialog.tsx | 3 +--
.../src/lib/components/Dropdown/dropdown.tsx | 6 +++---
.../lib/components/IconButton/iconButton.tsx | 4 ++--
frontend/src/lib/components/Input/input.tsx | 4 ++--
frontend/src/lib/components/Label/label.tsx | 3 +--
.../lib/components/RadioGroup/radioGroup.tsx | 9 +++++----
.../ResizablePanels/resizablePanels.tsx | 3 +--
frontend/src/lib/components/Select/select.tsx | 6 +++---
frontend/src/lib/components/Slider/slider.tsx | 4 ++--
.../private-components/suggestions.tsx | 2 +-
.../private-components/tag.tsx | 2 +-
.../SmartNodeSelector/smartNodeSelector.tsx | 3 +--
frontend/src/lib/components/Switch/switch.tsx | 4 ++--
frontend/src/lib/components/Table/table.tsx | 11 +++++-----
.../components/ToggleButton/toggleButton.tsx | 2 +-
.../private-utils/VectorSelection.ts | 2 +-
.../Virtualization/virtualization.tsx | 2 +-
.../components.tsx | 0
.../_utils => utils}/resolveClassNames.ts | 0
34 files changed, 62 insertions(+), 67 deletions(-)
rename frontend/src/lib/components/{_BaseComponent => BaseComponent}/baseComponent.tsx (90%)
rename frontend/src/lib/components/{_BaseComponent => BaseComponent}/index.ts (100%)
rename frontend/src/lib/components/{_utils => _component-utils}/components.tsx (100%)
rename frontend/src/lib/{components/_utils => utils}/resolveClassNames.ts (100%)
diff --git a/frontend/.dependency-cruiser.cjs b/frontend/.dependency-cruiser.cjs
index 299286a37..bc995c20c 100644
--- a/frontend/.dependency-cruiser.cjs
+++ b/frontend/.dependency-cruiser.cjs
@@ -15,8 +15,7 @@ module.exports = {
},
{
name: "lib-has-dependencies-in-src-tree",
- comment:
- "Files in the 'lib' folder are not allowed to import from project files from outside the 'lib' folder.",
+ comment: "Files in the 'lib' folder must not be imported from project files from outside the 'lib' folder.",
severity: "error",
from: {
path: "^(src/lib)",
@@ -26,27 +25,26 @@ module.exports = {
},
},
{
- name: "shared-used-outside-modules",
+ name: "access-to-api-not-via-main-index-file",
comment:
- "Files in the 'modules/_shared' folder are not allowed to be imported from files outside the 'modules' folder.",
+ "Models, types, objects and functions of the API should only be accessed through the main index file (import {...} from '@api').",
severity: "error",
from: {
- pathNot: "^(src/modules)",
+ pathNot: "^(src/api)",
},
to: {
- path: "^(src/modules/_shared)",
+ path: "^(src/api/(?!index.ts))",
},
},
{
- name: "access-to-api-not-via-main-index-file",
- comment:
- "Models, types, objects and functions of the API should only be accessed through the main index file (import {...} from '@api').",
+ name: "private-folder-accessed-from-outside",
+ comment: "Files in private folders (e.g. '_utils/') must not be imported from files on the outside.",
severity: "error",
from: {
- pathNot: "^(src/api)",
+ path: "^src/(api|framework|lib|modules)",
},
to: {
- path: "^(src/api/(?!index.ts))",
+ path: "^src/(?!$1/).*(/_[^/]+/)",
},
},
],
diff --git a/frontend/src/framework/components/ChannelSelect/channelSelect.tsx b/frontend/src/framework/components/ChannelSelect/channelSelect.tsx
index af0317de3..9a149080a 100644
--- a/frontend/src/framework/components/ChannelSelect/channelSelect.tsx
+++ b/frontend/src/framework/components/ChannelSelect/channelSelect.tsx
@@ -6,8 +6,8 @@ import {
Broadcaster,
checkChannelCompatibility,
} from "@framework/Broadcaster";
+import { BaseComponentProps } from "@lib/components/BaseComponent";
import { Dropdown } from "@lib/components/Dropdown";
-import { BaseComponentProps } from "@lib/components/_BaseComponent";
export type ChannelSelectProps = {
initialChannel?: string;
diff --git a/frontend/src/framework/internal/components/ColorPaletteSettings/colorPaletteSettings.tsx b/frontend/src/framework/internal/components/ColorPaletteSettings/colorPaletteSettings.tsx
index 2637f09a4..e21fd805d 100644
--- a/frontend/src/framework/internal/components/ColorPaletteSettings/colorPaletteSettings.tsx
+++ b/frontend/src/framework/internal/components/ColorPaletteSettings/colorPaletteSettings.tsx
@@ -12,9 +12,9 @@ import { IconButton } from "@lib/components/IconButton";
import { Input } from "@lib/components/Input";
import { Label } from "@lib/components/Label";
import { Overlay } from "@lib/components/Overlay";
-import { resolveClassNames } from "@lib/components/_utils/resolveClassNames";
import { useElementBoundingRect } from "@lib/hooks/useElementBoundingRect";
import { ColorPalette } from "@lib/utils/ColorPalette";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
import { convertRemToPixels } from "@lib/utils/screenUnitConversions";
enum ColorPaletteSelectorType {
diff --git a/frontend/src/framework/internal/components/NavBar/navBar.tsx b/frontend/src/framework/internal/components/NavBar/navBar.tsx
index 2476b8e37..888a87e48 100644
--- a/frontend/src/framework/internal/components/NavBar/navBar.tsx
+++ b/frontend/src/framework/internal/components/NavBar/navBar.tsx
@@ -22,8 +22,8 @@ import {
import { Badge } from "@lib/components/Badge";
import { Button } from "@lib/components/Button";
import { CircularProgress } from "@lib/components/CircularProgress";
-import { resolveClassNames } from "@lib/components/_utils/resolveClassNames";
import { isDevMode } from "@lib/utils/devMode";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
import { useQueryClient } from "@tanstack/react-query";
type NavBarProps = {
diff --git a/frontend/src/framework/internal/components/Settings/settings.tsx b/frontend/src/framework/internal/components/Settings/settings.tsx
index ab939fbf4..04eba096e 100644
--- a/frontend/src/framework/internal/components/Settings/settings.tsx
+++ b/frontend/src/framework/internal/components/Settings/settings.tsx
@@ -4,7 +4,7 @@ import { useStoreValue } from "@framework/StateStore";
import { DrawerContent, Workbench } from "@framework/Workbench";
import { useActiveModuleId, useModuleInstances } from "@framework/internal/hooks/workbenchHooks";
import { Cog6ToothIcon } from "@heroicons/react/20/solid";
-import { resolveClassNames } from "@lib/components/_utils/resolveClassNames";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
import { ModulesList } from "./private-components/modulesList";
import { Setting } from "./private-components/setting";
diff --git a/frontend/src/lib/components/ApiStateWrapper/apiStateWrapper.tsx b/frontend/src/lib/components/ApiStateWrapper/apiStateWrapper.tsx
index c2c36375c..1a4f68326 100644
--- a/frontend/src/lib/components/ApiStateWrapper/apiStateWrapper.tsx
+++ b/frontend/src/lib/components/ApiStateWrapper/apiStateWrapper.tsx
@@ -1,9 +1,8 @@
import React from "react";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
import { QueryObserverResult } from "@tanstack/react-query";
-import { resolveClassNames } from "../_utils/resolveClassNames";
-
export type ApiStateWrapperProps = {
apiResult: QueryObserverResult;
loadingComponent: React.ReactNode;
diff --git a/frontend/src/lib/components/Badge/badge.tsx b/frontend/src/lib/components/Badge/badge.tsx
index 13855944a..f2b7a2613 100644
--- a/frontend/src/lib/components/Badge/badge.tsx
+++ b/frontend/src/lib/components/Badge/badge.tsx
@@ -1,9 +1,8 @@
import React from "react";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
import { Badge as MuiBadge, BadgeProps as MuiBadgeProps } from "@mui/base";
-import { resolveClassNames } from "../_utils/resolveClassNames";
-
export type BadgeProps = MuiBadgeProps;
export const Badge: React.FC
= (props) => {
diff --git a/frontend/src/lib/components/_BaseComponent/baseComponent.tsx b/frontend/src/lib/components/BaseComponent/baseComponent.tsx
similarity index 90%
rename from frontend/src/lib/components/_BaseComponent/baseComponent.tsx
rename to frontend/src/lib/components/BaseComponent/baseComponent.tsx
index 1dad26d7c..feaf1efdb 100644
--- a/frontend/src/lib/components/_BaseComponent/baseComponent.tsx
+++ b/frontend/src/lib/components/BaseComponent/baseComponent.tsx
@@ -1,6 +1,6 @@
import React from "react";
-import { resolveClassNames } from "../_utils/resolveClassNames";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
export type BaseComponentProps = {
disabled?: boolean;
diff --git a/frontend/src/lib/components/_BaseComponent/index.ts b/frontend/src/lib/components/BaseComponent/index.ts
similarity index 100%
rename from frontend/src/lib/components/_BaseComponent/index.ts
rename to frontend/src/lib/components/BaseComponent/index.ts
diff --git a/frontend/src/lib/components/Button/button.tsx b/frontend/src/lib/components/Button/button.tsx
index 198261220..373682243 100644
--- a/frontend/src/lib/components/Button/button.tsx
+++ b/frontend/src/lib/components/Button/button.tsx
@@ -1,9 +1,9 @@
import React from "react";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
import { Button as ButtonUnstyled, ButtonProps as ButtonUnstyledProps } from "@mui/base";
-import { BaseComponent } from "../_BaseComponent";
-import { resolveClassNames } from "../_utils/resolveClassNames";
+import { BaseComponent } from "../BaseComponent";
export type ButtonProps = {
variant?: "text" | "outlined" | "contained";
diff --git a/frontend/src/lib/components/Checkbox/checkbox.tsx b/frontend/src/lib/components/Checkbox/checkbox.tsx
index 14ed25ab4..d3a639cc9 100644
--- a/frontend/src/lib/components/Checkbox/checkbox.tsx
+++ b/frontend/src/lib/components/Checkbox/checkbox.tsx
@@ -1,9 +1,10 @@
import React from "react";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
+
import { v4 } from "uuid";
-import { BaseComponent, BaseComponentProps } from "../_BaseComponent";
-import { resolveClassNames } from "../_utils/resolveClassNames";
+import { BaseComponent, BaseComponentProps } from "../BaseComponent";
export type CheckboxProps = {
id?: string;
diff --git a/frontend/src/lib/components/CircularProgress/circularProgress.tsx b/frontend/src/lib/components/CircularProgress/circularProgress.tsx
index d8b8f7181..623952fb4 100644
--- a/frontend/src/lib/components/CircularProgress/circularProgress.tsx
+++ b/frontend/src/lib/components/CircularProgress/circularProgress.tsx
@@ -1,7 +1,8 @@
import React from "react";
-import { OptionalValues, withDefaults } from "../_utils/components";
-import { resolveClassNames } from "../_utils/resolveClassNames";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
+
+import { OptionalValues, withDefaults } from "../_component-utils/components";
export type CircularProgressProps = {
size?: "extra-small" | "small" | "medium-small" | "medium" | "large";
diff --git a/frontend/src/lib/components/CollapsibleGroup/collapsibleGroup.tsx b/frontend/src/lib/components/CollapsibleGroup/collapsibleGroup.tsx
index c3a6618cb..bcb7aee29 100644
--- a/frontend/src/lib/components/CollapsibleGroup/collapsibleGroup.tsx
+++ b/frontend/src/lib/components/CollapsibleGroup/collapsibleGroup.tsx
@@ -1,9 +1,9 @@
import React from "react";
import { ChevronDownIcon, ChevronUpIcon } from "@heroicons/react/20/solid";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
-import { BaseComponent, BaseComponentProps } from "../_BaseComponent";
-import { resolveClassNames } from "../_utils/resolveClassNames";
+import { BaseComponent, BaseComponentProps } from "../BaseComponent";
export type CollapsibleGroupProps = {
icon?: React.ReactElement;
diff --git a/frontend/src/lib/components/ColorTile/colorTile.tsx b/frontend/src/lib/components/ColorTile/colorTile.tsx
index b9ffa960e..c7375af93 100644
--- a/frontend/src/lib/components/ColorTile/colorTile.tsx
+++ b/frontend/src/lib/components/ColorTile/colorTile.tsx
@@ -1,6 +1,6 @@
import React from "react";
-import { resolveClassNames } from "../_utils/resolveClassNames";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
export type ColorTileProps = {
color: string;
diff --git a/frontend/src/lib/components/ColorTileGroup/colorTileGroup.tsx b/frontend/src/lib/components/ColorTileGroup/colorTileGroup.tsx
index a2e7f1c26..a01f13354 100644
--- a/frontend/src/lib/components/ColorTileGroup/colorTileGroup.tsx
+++ b/frontend/src/lib/components/ColorTileGroup/colorTileGroup.tsx
@@ -2,8 +2,7 @@ import React from "react";
import { ColorTile } from "@lib/components/ColorTile";
import { ColorPalette } from "@lib/utils/ColorPalette";
-
-import { resolveClassNames } from "../_utils/resolveClassNames";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
export type ColorPaletteProps = {
colorPalette: ColorPalette;
diff --git a/frontend/src/lib/components/Dialog/dialog.tsx b/frontend/src/lib/components/Dialog/dialog.tsx
index 3ff40b016..bb7fee514 100644
--- a/frontend/src/lib/components/Dialog/dialog.tsx
+++ b/frontend/src/lib/components/Dialog/dialog.tsx
@@ -3,8 +3,7 @@ import ReactDOM from "react-dom";
import { XMarkIcon } from "@heroicons/react/20/solid";
import { useElementSize } from "@lib/hooks/useElementSize";
-
-import { resolveClassNames } from "../_utils/resolveClassNames";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
export type DialogProps = {
title?: string;
diff --git a/frontend/src/lib/components/Dropdown/dropdown.tsx b/frontend/src/lib/components/Dropdown/dropdown.tsx
index 0f61ee56c..6cdb4dfe1 100644
--- a/frontend/src/lib/components/Dropdown/dropdown.tsx
+++ b/frontend/src/lib/components/Dropdown/dropdown.tsx
@@ -3,14 +3,14 @@ import ReactDOM from "react-dom";
import { ChevronDownIcon, ChevronUpIcon } from "@heroicons/react/20/solid";
import { useElementBoundingRect } from "@lib/hooks/useElementBoundingRect";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
import { getTextWidth } from "@lib/utils/textSize";
+import { BaseComponent, BaseComponentProps } from "../BaseComponent";
import { IconButton } from "../IconButton";
import { Input } from "../Input";
import { Virtualization } from "../Virtualization";
-import { BaseComponent, BaseComponentProps } from "../_BaseComponent";
-import { withDefaults } from "../_utils/components";
-import { resolveClassNames } from "../_utils/resolveClassNames";
+import { withDefaults } from "../_component-utils/components";
export type DropdownOption = {
value: string;
diff --git a/frontend/src/lib/components/IconButton/iconButton.tsx b/frontend/src/lib/components/IconButton/iconButton.tsx
index e10ccfef6..f1274245b 100644
--- a/frontend/src/lib/components/IconButton/iconButton.tsx
+++ b/frontend/src/lib/components/IconButton/iconButton.tsx
@@ -1,9 +1,9 @@
import React from "react";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
import { Button as ButtonUnstyled, ButtonProps as ButtonUnstyledProps } from "@mui/base";
-import { BaseComponent } from "../_BaseComponent";
-import { resolveClassNames } from "../_utils/resolveClassNames";
+import { BaseComponent } from "../BaseComponent";
export type IconButtonProps = {
children: React.ReactNode;
diff --git a/frontend/src/lib/components/Input/input.tsx b/frontend/src/lib/components/Input/input.tsx
index c1127faeb..b1a66e7ef 100644
--- a/frontend/src/lib/components/Input/input.tsx
+++ b/frontend/src/lib/components/Input/input.tsx
@@ -1,9 +1,9 @@
import React from "react";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
import { Input as InputUnstyled, InputProps as InputUnstyledProps } from "@mui/base";
-import { BaseComponent } from "../_BaseComponent";
-import { resolveClassNames } from "../_utils/resolveClassNames";
+import { BaseComponent } from "../BaseComponent";
export type InputProps = InputUnstyledProps & {
wrapperStyle?: React.CSSProperties;
diff --git a/frontend/src/lib/components/Label/label.tsx b/frontend/src/lib/components/Label/label.tsx
index 32b08eb0b..ac83f2259 100644
--- a/frontend/src/lib/components/Label/label.tsx
+++ b/frontend/src/lib/components/Label/label.tsx
@@ -1,11 +1,10 @@
import React from "react";
import { LinkIcon } from "@heroicons/react/20/solid";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
import { v4 } from "uuid";
-import { resolveClassNames } from "../_utils/resolveClassNames";
-
export type LabelProps = {
text: string;
children: React.ReactElement;
diff --git a/frontend/src/lib/components/RadioGroup/radioGroup.tsx b/frontend/src/lib/components/RadioGroup/radioGroup.tsx
index 0e7746b6e..1c5f78562 100644
--- a/frontend/src/lib/components/RadioGroup/radioGroup.tsx
+++ b/frontend/src/lib/components/RadioGroup/radioGroup.tsx
@@ -1,11 +1,12 @@
import React from "react";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
+
import { v4 } from "uuid";
-import { BaseComponent } from "../_BaseComponent";
-import { BaseComponentProps } from "../_BaseComponent/baseComponent";
-import { OptionalValues, withDefaults } from "../_utils/components";
-import { resolveClassNames } from "../_utils/resolveClassNames";
+import { BaseComponent } from "../BaseComponent";
+import { BaseComponentProps } from "../BaseComponent";
+import { OptionalValues, withDefaults } from "../_component-utils/components";
export type RadioGroupProps = {
name?: string;
diff --git a/frontend/src/lib/components/ResizablePanels/resizablePanels.tsx b/frontend/src/lib/components/ResizablePanels/resizablePanels.tsx
index c1a0d13f0..05dc35683 100644
--- a/frontend/src/lib/components/ResizablePanels/resizablePanels.tsx
+++ b/frontend/src/lib/components/ResizablePanels/resizablePanels.tsx
@@ -1,8 +1,7 @@
import React from "react";
import { useElementSize } from "@lib/hooks/useElementSize";
-
-import { resolveClassNames } from "../_utils/resolveClassNames";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
type ResizablePanelsProps = {
id: string;
diff --git a/frontend/src/lib/components/Select/select.tsx b/frontend/src/lib/components/Select/select.tsx
index f95e03cae..f7c47c8e6 100644
--- a/frontend/src/lib/components/Select/select.tsx
+++ b/frontend/src/lib/components/Select/select.tsx
@@ -1,12 +1,12 @@
import React, { Key } from "react";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
import { getTextWidth } from "@lib/utils/textSize";
+import { BaseComponent, BaseComponentProps } from "../BaseComponent";
import { Input } from "../Input";
import { Virtualization } from "../Virtualization";
-import { BaseComponent, BaseComponentProps } from "../_BaseComponent/baseComponent";
-import { withDefaults } from "../_utils/components";
-import { resolveClassNames } from "../_utils/resolveClassNames";
+import { withDefaults } from "../_component-utils/components";
export type SelectOption = {
value: string;
diff --git a/frontend/src/lib/components/Slider/slider.tsx b/frontend/src/lib/components/Slider/slider.tsx
index 87a313d93..6e9d48b46 100644
--- a/frontend/src/lib/components/Slider/slider.tsx
+++ b/frontend/src/lib/components/Slider/slider.tsx
@@ -3,10 +3,10 @@ import ReactDOM from "react-dom";
import { useElementBoundingRect } from "@lib/hooks/useElementBoundingRect";
import { Point } from "@lib/utils/geometry";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
import { Slider as SliderUnstyled, SliderProps as SliderUnstyledProps } from "@mui/base";
-import { BaseComponent } from "../_BaseComponent";
-import { resolveClassNames } from "../_utils/resolveClassNames";
+import { BaseComponent } from "../BaseComponent";
export type SliderProps = {
valueLabelDisplay?: "auto" | "off";
diff --git a/frontend/src/lib/components/SmartNodeSelector/private-components/suggestions.tsx b/frontend/src/lib/components/SmartNodeSelector/private-components/suggestions.tsx
index 929cf22dc..c4c79e706 100644
--- a/frontend/src/lib/components/SmartNodeSelector/private-components/suggestions.tsx
+++ b/frontend/src/lib/components/SmartNodeSelector/private-components/suggestions.tsx
@@ -1,7 +1,7 @@
import React from "react";
import ReactDOM from "react-dom";
-import { resolveClassNames } from "@lib/components/_utils/resolveClassNames";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
import { TreeDataNodeMetaData } from "../private-utils/treeDataNodeTypes";
import { TreeNodeSelection } from "../private-utils/treeNodeSelection";
diff --git a/frontend/src/lib/components/SmartNodeSelector/private-components/tag.tsx b/frontend/src/lib/components/SmartNodeSelector/private-components/tag.tsx
index b15efcd95..6e3bfd241 100644
--- a/frontend/src/lib/components/SmartNodeSelector/private-components/tag.tsx
+++ b/frontend/src/lib/components/SmartNodeSelector/private-components/tag.tsx
@@ -8,7 +8,7 @@ import {
QuestionMarkCircleIcon,
XMarkIcon,
} from "@heroicons/react/20/solid";
-import { resolveClassNames } from "@lib/components/_utils/resolveClassNames";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
import "animate.css";
diff --git a/frontend/src/lib/components/SmartNodeSelector/smartNodeSelector.tsx b/frontend/src/lib/components/SmartNodeSelector/smartNodeSelector.tsx
index d9431e279..5badecab4 100644
--- a/frontend/src/lib/components/SmartNodeSelector/smartNodeSelector.tsx
+++ b/frontend/src/lib/components/SmartNodeSelector/smartNodeSelector.tsx
@@ -1,6 +1,7 @@
import React from "react";
import { XMarkIcon } from "@heroicons/react/20/solid";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
import _ from "lodash";
@@ -10,8 +11,6 @@ import { TreeData } from "./private-utils/treeData";
import { TreeDataNode } from "./private-utils/treeDataNodeTypes";
import { TreeNodeSelection } from "./private-utils/treeNodeSelection";
-import { resolveClassNames } from "../_utils/resolveClassNames";
-
export enum Direction {
Left = 0,
Right,
diff --git a/frontend/src/lib/components/Switch/switch.tsx b/frontend/src/lib/components/Switch/switch.tsx
index 38fb78f96..48b10bc54 100644
--- a/frontend/src/lib/components/Switch/switch.tsx
+++ b/frontend/src/lib/components/Switch/switch.tsx
@@ -1,9 +1,9 @@
import React from "react";
+import { resolveClassNames } from "@lib/utils/resolveClassNames";
import { Switch as SwitchUnstyled, UseSwitchParameters, useSwitch } from "@mui/base";
-import { BaseComponent } from "../_BaseComponent";
-import { resolveClassNames } from "../_utils/resolveClassNames";
+import { BaseComponent } from "../BaseComponent";
export const Switch = React.forwardRef((props: UseSwitchParameters, ref: React.ForwardedRef) => {
const { getInputProps, checked, disabled } = useSwitch(props);
diff --git a/frontend/src/lib/components/Table/table.tsx b/frontend/src/lib/components/Table/table.tsx
index 20ca62b20..3bbac9515 100644
--- a/frontend/src/lib/components/Table/table.tsx
+++ b/frontend/src/lib/components/Table/table.tsx
@@ -4,10 +4,10 @@ import { ChevronDownIcon, ChevronUpIcon, XMarkIcon } from "@heroicons/react/20/s
import { v4 } from "uuid";
+import { BaseComponent, BaseComponentProps } from "../BaseComponent";
import { IconButton } from "../IconButton";
import { Input } from "../Input";
import { Virtualization } from "../Virtualization";
-import { BaseComponent, BaseComponentProps } from "../_BaseComponent/baseComponent";
export type TableHeading = {
[key: string]: {
@@ -226,10 +226,11 @@ export const Table: React.FC> = (props) => {
return (
handlePointerOver(item.values)}
onPointerDown={() => handlePointerDown(item.values)}
style={{ height: 30 }}
diff --git a/frontend/src/lib/components/ToggleButton/toggleButton.tsx b/frontend/src/lib/components/ToggleButton/toggleButton.tsx
index fdb5de6b7..3cecad371 100644
--- a/frontend/src/lib/components/ToggleButton/toggleButton.tsx
+++ b/frontend/src/lib/components/ToggleButton/toggleButton.tsx
@@ -2,7 +2,7 @@ import React from "react";
import { Button as ButtonUnstyled, ButtonProps as ButtonUnstyledProps } from "@mui/base";
-import { BaseComponent } from "../_BaseComponent/baseComponent";
+import { BaseComponent } from "../BaseComponent";
export type ToggleButtonProps = ButtonUnstyledProps & {
active: boolean;
diff --git a/frontend/src/lib/components/VectorSelector/private-utils/VectorSelection.ts b/frontend/src/lib/components/VectorSelector/private-utils/VectorSelection.ts
index 4f682a2e1..ed9ee5b69 100644
--- a/frontend/src/lib/components/VectorSelector/private-utils/VectorSelection.ts
+++ b/frontend/src/lib/components/VectorSelector/private-utils/VectorSelection.ts
@@ -1,4 +1,4 @@
-import { MatchType, TreeData, TreeNodeSelection } from "../../SmartNodeSelector";
+import { MatchType, TreeData, TreeNodeSelection } from "@lib/components/SmartNodeSelector";
export class VectorSelection extends TreeNodeSelection {
private _myTreeData: TreeData;
diff --git a/frontend/src/lib/components/Virtualization/virtualization.tsx b/frontend/src/lib/components/Virtualization/virtualization.tsx
index 5f9ea7339..4a3477c0e 100644
--- a/frontend/src/lib/components/Virtualization/virtualization.tsx
+++ b/frontend/src/lib/components/Virtualization/virtualization.tsx
@@ -2,7 +2,7 @@ import React from "react";
import { useElementSize } from "@lib/hooks/useElementSize";
-import { withDefaults } from "../_utils/components";
+import { withDefaults } from "../_component-utils/components";
export type VirtualizationProps = {
placeholderComponent?: string;
diff --git a/frontend/src/lib/components/_utils/components.tsx b/frontend/src/lib/components/_component-utils/components.tsx
similarity index 100%
rename from frontend/src/lib/components/_utils/components.tsx
rename to frontend/src/lib/components/_component-utils/components.tsx
diff --git a/frontend/src/lib/components/_utils/resolveClassNames.ts b/frontend/src/lib/utils/resolveClassNames.ts
similarity index 100%
rename from frontend/src/lib/components/_utils/resolveClassNames.ts
rename to frontend/src/lib/utils/resolveClassNames.ts