From 23bb91eb91045217aa1b29ddaee3b66e742388bd Mon Sep 17 00:00:00 2001 From: jorgenherje Date: Fri, 25 Oct 2024 10:35:18 +0200 Subject: [PATCH] Move EnsembleRealizationFilter to internal components Move component from framework/components to framework/internal/components --- .../framework/components/EnsembleRealizationFilter/index.ts | 1 - .../EnsembleRealizationFilter/ensembleRealizationFilter.tsx | 0 .../internal/components/EnsembleRealizationFilter/index.ts | 2 ++ .../EnsembleRealizationFilter/private-assets/folder.svg | 0 .../EnsembleRealizationFilter/private-assets/misc.svg | 0 .../private-components/byParameterValueFilter.tsx | 0 .../private-components/byRealizationNumberFilter.tsx | 0 .../private-components/realizationNumberDisplay.tsx | 0 .../private-utils/conversionUtils.ts | 0 .../private-utils/realizationPickerUtils.ts | 0 .../EnsembleRealizationFilter/private-utils/sliderUtils.ts | 0 .../private-utils/smartNodeSelectorUtils.ts | 0 .../RealizationFilterSettings/realizationFilterSettings.tsx | 4 ++-- .../unit/EnsembleRealizationFilterConversionUtils.test.ts | 2 +- .../EnsembleRealizationFilterRealizationPickerUtils.test.ts | 2 +- .../EnsembleRealizationFilterSmartNodeSelectorUtils.test.ts | 2 +- 16 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 frontend/src/framework/components/EnsembleRealizationFilter/index.ts rename frontend/src/framework/{ => internal}/components/EnsembleRealizationFilter/ensembleRealizationFilter.tsx (100%) create mode 100644 frontend/src/framework/internal/components/EnsembleRealizationFilter/index.ts rename frontend/src/framework/{ => internal}/components/EnsembleRealizationFilter/private-assets/folder.svg (100%) rename frontend/src/framework/{ => internal}/components/EnsembleRealizationFilter/private-assets/misc.svg (100%) rename frontend/src/framework/{ => internal}/components/EnsembleRealizationFilter/private-components/byParameterValueFilter.tsx (100%) rename frontend/src/framework/{ => internal}/components/EnsembleRealizationFilter/private-components/byRealizationNumberFilter.tsx (100%) rename frontend/src/framework/{ => internal}/components/EnsembleRealizationFilter/private-components/realizationNumberDisplay.tsx (100%) rename frontend/src/framework/{ => internal}/components/EnsembleRealizationFilter/private-utils/conversionUtils.ts (100%) rename frontend/src/framework/{ => internal}/components/EnsembleRealizationFilter/private-utils/realizationPickerUtils.ts (100%) rename frontend/src/framework/{ => internal}/components/EnsembleRealizationFilter/private-utils/sliderUtils.ts (100%) rename frontend/src/framework/{ => internal}/components/EnsembleRealizationFilter/private-utils/smartNodeSelectorUtils.ts (100%) diff --git a/frontend/src/framework/components/EnsembleRealizationFilter/index.ts b/frontend/src/framework/components/EnsembleRealizationFilter/index.ts deleted file mode 100644 index 5cc1b345f..000000000 --- a/frontend/src/framework/components/EnsembleRealizationFilter/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { EnsembleRealizationFilter } from "./ensembleRealizationFilter"; diff --git a/frontend/src/framework/components/EnsembleRealizationFilter/ensembleRealizationFilter.tsx b/frontend/src/framework/internal/components/EnsembleRealizationFilter/ensembleRealizationFilter.tsx similarity index 100% rename from frontend/src/framework/components/EnsembleRealizationFilter/ensembleRealizationFilter.tsx rename to frontend/src/framework/internal/components/EnsembleRealizationFilter/ensembleRealizationFilter.tsx diff --git a/frontend/src/framework/internal/components/EnsembleRealizationFilter/index.ts b/frontend/src/framework/internal/components/EnsembleRealizationFilter/index.ts new file mode 100644 index 000000000..d5742f4ca --- /dev/null +++ b/frontend/src/framework/internal/components/EnsembleRealizationFilter/index.ts @@ -0,0 +1,2 @@ +export { EnsembleRealizationFilter } from "./ensembleRealizationFilter"; +export type { EnsembleRealizationFilterSelections } from "./ensembleRealizationFilter"; diff --git a/frontend/src/framework/components/EnsembleRealizationFilter/private-assets/folder.svg b/frontend/src/framework/internal/components/EnsembleRealizationFilter/private-assets/folder.svg similarity index 100% rename from frontend/src/framework/components/EnsembleRealizationFilter/private-assets/folder.svg rename to frontend/src/framework/internal/components/EnsembleRealizationFilter/private-assets/folder.svg diff --git a/frontend/src/framework/components/EnsembleRealizationFilter/private-assets/misc.svg b/frontend/src/framework/internal/components/EnsembleRealizationFilter/private-assets/misc.svg similarity index 100% rename from frontend/src/framework/components/EnsembleRealizationFilter/private-assets/misc.svg rename to frontend/src/framework/internal/components/EnsembleRealizationFilter/private-assets/misc.svg diff --git a/frontend/src/framework/components/EnsembleRealizationFilter/private-components/byParameterValueFilter.tsx b/frontend/src/framework/internal/components/EnsembleRealizationFilter/private-components/byParameterValueFilter.tsx similarity index 100% rename from frontend/src/framework/components/EnsembleRealizationFilter/private-components/byParameterValueFilter.tsx rename to frontend/src/framework/internal/components/EnsembleRealizationFilter/private-components/byParameterValueFilter.tsx diff --git a/frontend/src/framework/components/EnsembleRealizationFilter/private-components/byRealizationNumberFilter.tsx b/frontend/src/framework/internal/components/EnsembleRealizationFilter/private-components/byRealizationNumberFilter.tsx similarity index 100% rename from frontend/src/framework/components/EnsembleRealizationFilter/private-components/byRealizationNumberFilter.tsx rename to frontend/src/framework/internal/components/EnsembleRealizationFilter/private-components/byRealizationNumberFilter.tsx diff --git a/frontend/src/framework/components/EnsembleRealizationFilter/private-components/realizationNumberDisplay.tsx b/frontend/src/framework/internal/components/EnsembleRealizationFilter/private-components/realizationNumberDisplay.tsx similarity index 100% rename from frontend/src/framework/components/EnsembleRealizationFilter/private-components/realizationNumberDisplay.tsx rename to frontend/src/framework/internal/components/EnsembleRealizationFilter/private-components/realizationNumberDisplay.tsx diff --git a/frontend/src/framework/components/EnsembleRealizationFilter/private-utils/conversionUtils.ts b/frontend/src/framework/internal/components/EnsembleRealizationFilter/private-utils/conversionUtils.ts similarity index 100% rename from frontend/src/framework/components/EnsembleRealizationFilter/private-utils/conversionUtils.ts rename to frontend/src/framework/internal/components/EnsembleRealizationFilter/private-utils/conversionUtils.ts diff --git a/frontend/src/framework/components/EnsembleRealizationFilter/private-utils/realizationPickerUtils.ts b/frontend/src/framework/internal/components/EnsembleRealizationFilter/private-utils/realizationPickerUtils.ts similarity index 100% rename from frontend/src/framework/components/EnsembleRealizationFilter/private-utils/realizationPickerUtils.ts rename to frontend/src/framework/internal/components/EnsembleRealizationFilter/private-utils/realizationPickerUtils.ts diff --git a/frontend/src/framework/components/EnsembleRealizationFilter/private-utils/sliderUtils.ts b/frontend/src/framework/internal/components/EnsembleRealizationFilter/private-utils/sliderUtils.ts similarity index 100% rename from frontend/src/framework/components/EnsembleRealizationFilter/private-utils/sliderUtils.ts rename to frontend/src/framework/internal/components/EnsembleRealizationFilter/private-utils/sliderUtils.ts diff --git a/frontend/src/framework/components/EnsembleRealizationFilter/private-utils/smartNodeSelectorUtils.ts b/frontend/src/framework/internal/components/EnsembleRealizationFilter/private-utils/smartNodeSelectorUtils.ts similarity index 100% rename from frontend/src/framework/components/EnsembleRealizationFilter/private-utils/smartNodeSelectorUtils.ts rename to frontend/src/framework/internal/components/EnsembleRealizationFilter/private-utils/smartNodeSelectorUtils.ts diff --git a/frontend/src/framework/internal/components/RightSettingsPanel/private-components/RealizationFilterSettings/realizationFilterSettings.tsx b/frontend/src/framework/internal/components/RightSettingsPanel/private-components/RealizationFilterSettings/realizationFilterSettings.tsx index 13e742ae6..27752f348 100644 --- a/frontend/src/framework/internal/components/RightSettingsPanel/private-components/RealizationFilterSettings/realizationFilterSettings.tsx +++ b/frontend/src/framework/internal/components/RightSettingsPanel/private-components/RealizationFilterSettings/realizationFilterSettings.tsx @@ -4,11 +4,11 @@ import { EnsembleIdent } from "@framework/EnsembleIdent"; import { GuiState, RightDrawerContent, useGuiValue } from "@framework/GuiMessageBroker"; import { Workbench } from "@framework/Workbench"; import { useEnsembleSet } from "@framework/WorkbenchSession"; +import { Drawer } from "@framework/internal/components/Drawer"; import { EnsembleRealizationFilter, EnsembleRealizationFilterSelections, -} from "@framework/components/EnsembleRealizationFilter/ensembleRealizationFilter"; -import { Drawer } from "@framework/internal/components/Drawer"; +} from "@framework/internal/components/EnsembleRealizationFilter"; import { areParameterIdentStringToValueSelectionMapCandidatesEqual } from "@framework/utils/realizationFilterTypesUtils"; import { Button } from "@lib/components/Button"; import { Dialog } from "@lib/components/Dialog"; diff --git a/frontend/tests/unit/EnsembleRealizationFilterConversionUtils.test.ts b/frontend/tests/unit/EnsembleRealizationFilterConversionUtils.test.ts index 562452d5a..190fcfc9d 100644 --- a/frontend/tests/unit/EnsembleRealizationFilterConversionUtils.test.ts +++ b/frontend/tests/unit/EnsembleRealizationFilterConversionUtils.test.ts @@ -1,4 +1,4 @@ -import { createBestSuggestedRealizationNumberSelections } from "@framework/components/EnsembleRealizationFilter/private-utils/conversionUtils"; +import { createBestSuggestedRealizationNumberSelections } from "@framework/internal/components/EnsembleRealizationFilter/private-utils/conversionUtils"; import { RealizationNumberSelection } from "@framework/types/realizationFilterTypes"; import { describe, expect, test } from "vitest"; diff --git a/frontend/tests/unit/EnsembleRealizationFilterRealizationPickerUtils.test.ts b/frontend/tests/unit/EnsembleRealizationFilterRealizationPickerUtils.test.ts index bef3d7d7e..57479685f 100644 --- a/frontend/tests/unit/EnsembleRealizationFilterRealizationPickerUtils.test.ts +++ b/frontend/tests/unit/EnsembleRealizationFilterRealizationPickerUtils.test.ts @@ -3,7 +3,7 @@ import { makeRealizationNumberSelectionsFromRealizationPickerTags, makeRealizationPickerTagFromRealizationNumberSelection, makeRealizationPickerTagsFromRealizationNumberSelections, -} from "@framework/components/EnsembleRealizationFilter/private-utils/realizationPickerUtils"; +} from "@framework/internal/components/EnsembleRealizationFilter/private-utils/realizationPickerUtils"; import { RealizationNumberSelection } from "@framework/types/realizationFilterTypes"; import { describe, expect, test } from "vitest"; diff --git a/frontend/tests/unit/EnsembleRealizationFilterSmartNodeSelectorUtils.test.ts b/frontend/tests/unit/EnsembleRealizationFilterSmartNodeSelectorUtils.test.ts index ce1bdec56..ac8437999 100644 --- a/frontend/tests/unit/EnsembleRealizationFilterSmartNodeSelectorUtils.test.ts +++ b/frontend/tests/unit/EnsembleRealizationFilterSmartNodeSelectorUtils.test.ts @@ -11,7 +11,7 @@ import { createSmartNodeSelectorTagTextFromParameterIdentString, createSmartNodeSelectorTagTextListFromParameterIdentStrings, createTreeDataNodeListFromParameters, -} from "../../src/framework/components/EnsembleRealizationFilter/private-utils/smartNodeSelectorUtils"; +} from "../../src/framework/internal/components/EnsembleRealizationFilter/private-utils/smartNodeSelectorUtils"; describe("createSmartNodeSelectorTagListFromParameterList", () => { const param1: Parameter = {