Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#8606 refactor files in pageEditor/ directory root #8749

Merged
merged 22 commits into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
dec644f
refactor move Modals.tsx to modals/ directory
mnholtz Jul 3, 2024
643e16b
move PanelContent to new layout/ directory
mnholtz Jul 3, 2024
c07202a
move Panel.tsx into layout/ directory
mnholtz Jul 3, 2024
d49bf7a
move EditorLayout.tsx into layout/ directory
mnholtz Jul 3, 2024
117ab31
refactor move EditorContent to layout/ directory
mnholtz Jul 3, 2024
c7124c8
refactor rename Editor.module.scss -> EditorLayout.module.scss
mnholtz Jul 3, 2024
55c02a4
refactor move store.ts into new store/ directory
mnholtz Jul 3, 2024
0d78fba
refactor move slices directory to store/ directory
mnholtz Jul 3, 2024
9ef6dc4
refactor move tabState into store/ directory
mnholtz Jul 3, 2024
41f05a9
reactor move uiState files to store/editor/ directory
mnholtz Jul 3, 2024
9d3e856
refactor move savingModComponentSlice to store/savingModComponent/
mnholtz Jul 3, 2024
ff90072
refactor move ModComponentFormStateWizard and NonScriptablePage
mnholtz Jul 3, 2024
80204f4
refactor move brickSummary to editorNodeLayout
mnholtz Jul 3, 2024
5cca629
refactor rename brickSummary -> nodeSummary
mnholtz Jul 3, 2024
dfb220f
refactor rename brickSummary.module.scss -> nodeSummary.module.scss
mnholtz Jul 3, 2024
bf14ebb
refactor move baseFormStateTypes to store/editor/ directory
mnholtz Jul 3, 2024
64fefeb
refactor move TabConnectionErrorBanner.tsx
mnholtz Jul 3, 2024
e17ade0
refactor move analysisManager to store/ directory
mnholtz Jul 3, 2024
a998310
refactor move exampleBrickConfigs -> bricks/ directory
mnholtz Jul 3, 2024
247715a
Merge branch 'refs/heads/main' into feature/8606_refactor_pageeditor_…
mnholtz Jul 3, 2024
abfb102
refactor move savingModComponentSlice to root levelt pageEditor/store…
mnholtz Jul 3, 2024
b5c8ff8
Merge branch 'main' into feature/8606_refactor_pageeditor_root_files
mnholtz Jul 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/analysis/ReduxAnalysisManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

import { selectActiveModComponentFormState } from "@/pageEditor/slices/editorSelectors";
import { selectActiveModComponentFormState } from "@/pageEditor/store/editor/editorSelectors";
import {
type AnyAction,
type ListenerEffect,
Expand All @@ -29,7 +29,7 @@ import {
type TypedActionCreator,
} from "@reduxjs/toolkit/dist/listenerMiddleware/types";
import { type Analysis } from "./analysisTypes";
import { type RootState } from "@/pageEditor/pageEditorTypes";
import { type RootState } from "@/pageEditor/store/editor/pageEditorTypes";
import { debounce } from "lodash";
import { type UUID } from "@/types/stringTypes";
import AsyncAnalysisQueue from "./asyncAnalysisQueue";
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/analysisVisitors/brickTypeAnalysis.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import BrickTypeAnalysis from "@/analysis/analysisVisitors/brickTypeAnalysis";
import brickRegistry from "@/bricks/registry";
import CommentEffect from "@/bricks/effects/comment";
import { sidebarPanelFormStateFactory } from "@/testUtils/factories/pageEditorFactories";
import { createNewConfiguredBrick } from "@/pageEditor/exampleBrickConfigs";
import { createNewConfiguredBrick } from "@/bricks/exampleBrickConfigs";
import { DocumentRenderer } from "@/bricks/renderers/document";
import CancelEffect from "@/bricks/effects/CancelEffect";
import { ALERT_EFFECT_ID, AlertEffect } from "@/bricks/effects/alert";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import PageStateAnalysis from "@/analysis/analysisVisitors/pageStateAnalysis/pag
import { AnnotationType } from "@/types/annotationTypes";
import { registryIdFactory } from "@/testUtils/factories/stringFactories";
import { CustomFormRenderer } from "@/bricks/renderers/customForm";
import { type BaseFormState } from "@/pageEditor/baseFormStateTypes";
import { type BaseFormState } from "@/pageEditor/store/editor/baseFormStateTypes";
import { StateNamespaces } from "@/platform/state/stateController";

describe("PageStateAnalysis", () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ import { uuidSequence } from "@/testUtils/factories/stringFactories";
import { CustomFormRenderer } from "@/bricks/renderers/customForm";
import { toExpression } from "@/utils/expressionUtils";
import IdentityTransformer from "@/bricks/transformers/IdentityTransformer";
import { createNewConfiguredBrick } from "@/pageEditor/exampleBrickConfigs";
import { createNewConfiguredBrick } from "@/bricks/exampleBrickConfigs";
import pixiebrixIntegrationDependencyFactory from "@/integrations/util/pixiebrixIntegrationDependencyFactory";

jest.mocked(services.locate).mockResolvedValue(
Expand Down
2 changes: 1 addition & 1 deletion src/background/deploymentUpdater.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import { getEditorState, saveEditorState } from "@/store/editorStorage";
import {
editorSlice,
initialState as initialEditorState,
} from "@/pageEditor/slices/editorSlice";
} from "@/pageEditor/store/editor/editorSlice";
import { ADAPTERS } from "@/pageEditor/starterBricks/adapter";
import { type ButtonFormState } from "@/pageEditor/starterBricks/formStateTypes";
import { parsePackage } from "@/registry/packageRegistry";
Expand Down
4 changes: 2 additions & 2 deletions src/background/deploymentUpdater.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ import { selectUpdatePromptState } from "@/store/settings/settingsSelectors";
import settingsSlice from "@/store/settings/settingsSlice";
import { locator } from "@/background/locator";
import { getEditorState, saveEditorState } from "@/store/editorStorage";
import { type EditorState } from "@/pageEditor/pageEditorTypes";
import { editorSlice } from "@/pageEditor/slices/editorSlice";
import { type EditorState } from "@/pageEditor/store/editor/pageEditorTypes";
import { editorSlice } from "@/pageEditor/store/editor/editorSlice";
import { removeModComponentForEveryTab } from "@/background/removeModComponentForEveryTab";
import registerBuiltinBricks from "@/bricks/registerBuiltinBricks";
import registerContribBricks from "@/contrib/registerContribBricks";
Expand Down
4 changes: 2 additions & 2 deletions src/background/modUpdater.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import { groupBy, isEmpty, uniq } from "lodash";
import { forEachTab } from "@/utils/extensionUtils";
import { queueReloadFrameMods } from "@/contentScript/messenger/api";
import { getEditorState, saveEditorState } from "@/store/editorStorage";
import type { EditorState } from "@/pageEditor/pageEditorTypes";
import { editorSlice } from "@/pageEditor/slices/editorSlice";
import type { EditorState } from "@/pageEditor/store/editor/pageEditorTypes";
import { editorSlice } from "@/pageEditor/store/editor/editorSlice";
import type {
ActivatedModComponent,
SerializedModComponent,
Expand Down
2 changes: 1 addition & 1 deletion src/bricks/effects/AddDynamicTextSnippet.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { reducePipeline } from "@/runtime/reducePipeline";
import { uuidv4, validateRegistryId } from "@/types/helpers";
import ConsoleLogger from "@/utils/ConsoleLogger";
import IdentityTransformer from "@/bricks/transformers/IdentityTransformer";
import { getExampleBrickConfig } from "@/pageEditor/exampleBrickConfigs";
import { getExampleBrickConfig } from "@/bricks/exampleBrickConfigs";
import { validateOutputKey } from "@/runtime/runtimeTypes";
import { registryIdFactory } from "@/testUtils/factories/stringFactories";

Expand Down
2 changes: 1 addition & 1 deletion src/bricks/effects/AddTextSnippets.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import AddTextSnippets from "@/bricks/effects/AddTextSnippets";
import { unsafeAssumeValidArg } from "@/runtime/runtimeTypes";
import { brickOptionsFactory } from "@/testUtils/factories/runtimeFactories";
import { snippetRegistry } from "@/contentScript/snippetShortcutMenu/snippetShortcutMenuController";
import { getExampleBrickConfig } from "@/pageEditor/exampleBrickConfigs";
import { getExampleBrickConfig } from "@/bricks/exampleBrickConfigs";

const brick = new AddTextSnippets();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import React from "react";
import { render } from "@/pageEditor/testHelpers";
import IdentityTransformerOptions from "@/bricks/transformers/IdentityTransformerOptions";
import { getExampleBrickConfig } from "@/pageEditor/exampleBrickConfigs";
import { getExampleBrickConfig } from "@/bricks/exampleBrickConfigs";
import IdentityTransformer from "@/bricks/transformers/IdentityTransformer";
import brickRegistry from "@/bricks/registry";
import { screen } from "@testing-library/react";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import {
throwBrick,
} from "@/runtime/pipelineTests/pipelineTestHelpers";
import { DocumentRenderer } from "@/bricks/renderers/document";
import { getExampleBrickConfig } from "@/pageEditor/exampleBrickConfigs";
import { getExampleBrickConfig } from "@/bricks/exampleBrickConfigs";
import { reducePipeline } from "@/runtime/reducePipeline";
import { type BusinessError } from "@/errors/businessErrors";
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

import SchemaSelectWidget from "@/components/fields/schemaFields/widgets/SchemaSelectWidget";
import { selectKnownEventNamesForActiveModComponent } from "@/pageEditor/slices/editorSelectors";
import { selectKnownEventNamesForActiveModComponent } from "@/pageEditor/store/editor/editorSelectors";
import { type SchemaFieldProps } from "@/components/fields/schemaFields/propTypes";
import React from "react";
import { useSelector } from "react-redux";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/no-unsafe-enum-comparison -- It seems to be the correct option for now */
import React from "react";
import { type NodeInfo } from "@/pageEditor/uiState/uiStateTypes";
import { type NodeInfo } from "@/pageEditor/store/editor/uiStateTypes";
import { KnownSources } from "@/analysis/analysisVisitors/varAnalysis/varAnalysis";
import styles from "./SourceLabel.module.scss";
import { type TypedBrickMap } from "@/bricks/registry";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { render, screen } from "@/pageEditor/testHelpers";
import React, { type MutableRefObject } from "react";
import VarMenu from "@/components/fields/schemaFields/widgets/varPopup/VarMenu";
import { formStateFactory } from "@/testUtils/factories/pageEditorFactories";
import { actions as editorActions } from "@/pageEditor/slices/editorSlice";
import { actions as editorActions } from "@/pageEditor/store/editor/editorSlice";
import { waitForEffect } from "@/testUtils/testHelpers";
import registerBuiltinBricks from "@/bricks/registerBuiltinBricks";
import analysisSlice from "@/analysis/analysisSlice";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,22 @@ import VariablesTree from "./VariablesTree";
import {
selectActiveModComponentFormState,
selectPipelineMap,
} from "@/pageEditor/slices/editorSelectors";
} from "@/pageEditor/store/editor/editorSelectors";
import { ADAPTERS } from "@/pageEditor/starterBricks/adapter";
import SourceLabel from "./SourceLabel";
import useAllBricks from "@/bricks/hooks/useAllBricks";
import { useAsyncEffect } from "use-async-effect";
import { computePosition, flip, offset, size } from "@floating-ui/dom";
import getMenuOptions from "./getMenuOptions";
import { selectActiveNodeTrace } from "@/pageEditor/slices/runtimeSelectors";
import { selectActiveNodeTrace } from "@/pageEditor/store/runtime/runtimeSelectors";
import {
filterOptionsByVariable,
filterVarMapByVariable,
} from "@/components/fields/schemaFields/widgets/varPopup/menuFilters";
import cx from "classnames";
import VarMap from "@/analysis/analysisVisitors/varAnalysis/varMap";
import useKeyboardNavigation from "@/components/fields/schemaFields/widgets/varPopup/useKeyboardNavigation";
import { actions as editorActions } from "@/pageEditor/slices/editorSlice";
import { actions as editorActions } from "@/pageEditor/store/editor/editorSlice";
import useAsyncState from "@/hooks/useAsyncState";
import { getPageState } from "@/contentScript/messenger/api";
import { isEmpty } from "lodash";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { selectKnownVars } from "@/analysis/analysisSelectors";
import {
selectActiveModComponentId,
selectActiveNodeInfo,
} from "@/pageEditor/slices/editorSelectors";
} from "@/pageEditor/store/editor/editorSelectors";
import { createSelector } from "@reduxjs/toolkit";

export const selectKnownVarsForActiveNode = createSelector(
Expand Down
4 changes: 2 additions & 2 deletions src/components/form/ConnectedFieldTemplate.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ import {
} from "@/testUtils/factories/brickFactories";
import type { AnalysisAnnotation } from "@/analysis/analysisTypes";
import { AnnotationType } from "@/types/annotationTypes";
import { actions } from "@/pageEditor/slices/editorSlice";
import { actions } from "@/pageEditor/store/editor/editorSlice";
import analysisSlice from "@/analysis/analysisSlice";
import { toExpression } from "@/utils/expressionUtils";
import AnalysisAnnotationsContext from "@/analysis/AnalysisAnnotationsContext";
import { selectActiveModComponentAnalysisAnnotationsForPath } from "@/pageEditor/slices/editorSelectors";
import { selectActiveModComponentAnalysisAnnotationsForPath } from "@/pageEditor/store/editor/editorSelectors";

describe("ConnectedFieldTemplate", () => {
it("shows formik error only when touched", async () => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/formBuilder/FormBuilder.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

import { getExampleBrickConfig } from "@/pageEditor/exampleBrickConfigs";
import { getExampleBrickConfig } from "@/bricks/exampleBrickConfigs";
import {
createFormikTemplate,
fireTextInput,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { Events } from "@/telemetry/events";
import { useModals } from "@/components/ConfirmationModal";
import { type Permissions } from "webextension-polyfill";
import { extractAdditionalPermissions } from "webext-permissions";
import { selectSessionId } from "@/pageEditor/slices/sessionSelectors";
import { selectSessionId } from "@/pageEditor/store/session/sessionSelectors";
import { revertAll } from "@/store/commonActions";
import ReduxPersistenceContext from "@/store/ReduxPersistenceContext";
import { allSettled } from "@/utils/promiseUtils";
Expand Down
2 changes: 1 addition & 1 deletion src/pageEditor/components/DimensionGate.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import React from "react";
import { type ComponentStory, type ComponentMeta } from "@storybook/react";
import { GatePanel } from "@/pageEditor/components/DimensionGate";
import { editorSlice } from "@/pageEditor/slices/editorSlice";
import { editorSlice } from "@/pageEditor/store/editor/editorSlice";
import { configureStore } from "@reduxjs/toolkit";
import { Provider } from "react-redux";

Expand Down
4 changes: 2 additions & 2 deletions src/pageEditor/components/DimensionGate.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

import React from "react";
import { useWindowSize } from "@/hooks/useWindowSize";
import { selectIsDimensionsWarningDismissed } from "@/pageEditor/slices/editorSelectors";
import { selectIsDimensionsWarningDismissed } from "@/pageEditor/store/editor/editorSelectors";
import { useDispatch, useSelector } from "react-redux";
import { Button, Col, Row } from "react-bootstrap";
import { editorSlice } from "@/pageEditor/slices/editorSlice";
import { editorSlice } from "@/pageEditor/store/editor/editorSlice";
import devtoolsToolbarScreenshot from "@img/devtools-pixiebrix-toolbar-screenshot.png";
import devtoolsDockingContextMenu from "@img/devtools-docking-context-menu.png";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import React from "react";
import { Button } from "react-bootstrap";
import { getErrorMessage, isSpecificError } from "@/errors/errorHelpers";
import { useSelector } from "react-redux";
import { selectTabStateError } from "@/pageEditor/tabState/tabStateSelectors";
import { selectTabStateError } from "@/pageEditor/store/tabState/tabStateSelectors";
import { TimeoutError } from "p-timeout";

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import userEvent from "@testing-library/user-event";
import { type ModComponentFormState } from "@/pageEditor/starterBricks/formStateTypes";
import { validateRegistryId } from "@/types/helpers";
import { render, screen } from "@/pageEditor/testHelpers";
import { actions } from "@/pageEditor/slices/editorSlice";
import { actions } from "@/pageEditor/store/editor/editorSlice";
import { type IntegrationDependency } from "@/integrations/integrationTypes";

import { uuidSequence } from "@/testUtils/factories/stringFactories";
Expand Down
2 changes: 1 addition & 1 deletion src/pageEditor/documentBuilder/edit/DocumentOptions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import ConfigErrorBoundary from "@/pageEditor/fields/ConfigErrorBoundary";
import { joinName } from "@/utils/formUtils";
import useAsyncEffect from "use-async-effect";
import { useSelector } from "react-redux";
import { selectActiveBuilderPreviewElement } from "@/pageEditor/slices/editorSelectors";
import { selectActiveBuilderPreviewElement } from "@/pageEditor/store/editor/editorSelectors";
import ElementEditor from "@/pageEditor/documentBuilder/edit/ElementEditor";
import ConnectedCollapsibleFieldSection from "@/pageEditor/fields/ConnectedCollapsibleFieldSection";
import SchemaField from "@/components/fields/schemaFields/SchemaField";
Expand Down
2 changes: 1 addition & 1 deletion src/pageEditor/documentBuilder/edit/ElementEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import MoveElement from "./MoveElement";
import documentBuilderElementTypeLabels from "@/pageEditor/documentBuilder/elementTypeLabels";
import useElementOptions from "@/pageEditor/documentBuilder/edit/useElementOptions";
import { useSelector } from "react-redux";
import { selectActiveBuilderPreviewElement } from "@/pageEditor/slices/editorSelectors";
import { selectActiveBuilderPreviewElement } from "@/pageEditor/store/editor/editorSelectors";
import { getProperty } from "@/utils/objectUtils";
import ConnectedCollapsibleFieldSection from "@/pageEditor/fields/ConnectedCollapsibleFieldSection";
import { joinName } from "@/utils/formUtils";
Expand Down
2 changes: 1 addition & 1 deletion src/pageEditor/documentBuilder/edit/RemoveElement.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { Button } from "react-bootstrap";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faTrash } from "@fortawesome/free-solid-svg-icons";
import useDeleteElement from "@/pageEditor/documentBuilder/hooks/useDeleteElement";
import { selectActiveBuilderPreviewElement } from "@/pageEditor/slices/editorSelectors";
import { selectActiveBuilderPreviewElement } from "@/pageEditor/store/editor/editorSelectors";
import { useSelector } from "react-redux";

type RemoveElementProps = {
Expand Down
2 changes: 1 addition & 1 deletion src/pageEditor/documentBuilder/hooks/useDeleteElement.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import getElementCollectionName from "@/pageEditor/documentBuilder/edit/getEleme
import { produce } from "immer";
import { produceExcludeUnusedDependencies } from "@/components/fields/schemaFields/integrations/integrationDependencyFieldUtils";
import { useCallback } from "react";
import { actions as editorActions } from "@/pageEditor/slices/editorSlice";
import { actions as editorActions } from "@/pageEditor/store/editor/editorSlice";
import { useDispatch } from "react-redux";

function useDeleteElement(documentBodyName: string) {
Expand Down
4 changes: 2 additions & 2 deletions src/pageEditor/documentBuilder/hooks/useMoveElement.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import { getIn, useField } from "formik";
import { getAllowedChildTypes } from "@/pageEditor/documentBuilder/allowedElementTypes";
import { useCallback } from "react";
import useReduxState from "@/hooks/useReduxState";
import { selectActiveBuilderPreviewElement } from "@/pageEditor/slices/editorSelectors";
import { actions as editorActions } from "@/pageEditor/slices/editorSlice";
import { selectActiveBuilderPreviewElement } from "@/pageEditor/store/editor/editorSelectors";
import { actions as editorActions } from "@/pageEditor/store/editor/editorSlice";

// https://stackoverflow.com/a/6470794/402560
export function arrayMove(
Expand Down
4 changes: 2 additions & 2 deletions src/pageEditor/documentBuilder/hooks/useMoveWithinParent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
*/

import useReduxState from "@/hooks/useReduxState";
import { selectActiveBuilderPreviewElement } from "@/pageEditor/slices/editorSelectors";
import { actions } from "@/pageEditor/slices/editorSlice";
import { selectActiveBuilderPreviewElement } from "@/pageEditor/store/editor/editorSelectors";
import { actions } from "@/pageEditor/store/editor/editorSlice";
import { useField } from "formik";
import { type DocumentBuilderElement } from "@/pageEditor/documentBuilder/documentBuilderTypes";
import getElementCollectionName from "@/pageEditor/documentBuilder/edit/getElementCollectionName";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

import { useDispatch } from "react-redux";
import { actions as editorActions } from "@/pageEditor/slices/editorSlice";
import { actions as editorActions } from "@/pageEditor/store/editor/editorSlice";

const elementsParentRegexp =
/(?<parentElementName>.*)\.((config\.element\.__value__)|(children\.\d+))/;
Expand Down
6 changes: 3 additions & 3 deletions src/pageEditor/documentBuilder/outline/DocumentOutline.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import Tree, {
type TreeSourcePosition,
} from "@atlaskit/tree";
import { useDispatch, useSelector } from "react-redux";
import { type RootState } from "@/pageEditor/pageEditorTypes";
import { selectNodeDataPanelTabState } from "@/pageEditor/slices/editorSelectors";
import { type RootState } from "@/pageEditor/store/editor/pageEditorTypes";
import { selectNodeDataPanelTabState } from "@/pageEditor/store/editor/editorSelectors";
import { DataPanelTabKey } from "@/pageEditor/tabs/editTab/dataPanel/dataPanelTypes";
import { actions } from "@/pageEditor/slices/editorSlice";
import { actions } from "@/pageEditor/store/editor/editorSlice";
import { selectTreeData } from "@/pageEditor/documentBuilder/outline/outlineHelpers";
import OutlineItem, {
LEVEL_PADDING_PX,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import DocumentPreview from "@/pageEditor/documentBuilder/preview/DocumentPrevie
import userEvent from "@testing-library/user-event";
import { render } from "@/pageEditor/testHelpers";
import { DocumentRenderer } from "@/bricks/renderers/document";
import { actions } from "@/pageEditor/slices/editorSlice";
import { actions } from "@/pageEditor/store/editor/editorSlice";
import DisplayTemporaryInfo from "@/bricks/transformers/temporaryInfo/DisplayTemporaryInfo";
import registerDefaultWidgets from "@/components/fields/schemaFields/widgets/registerDefaultWidgets";
import blockRegistry from "@/bricks/registry";
Expand Down
4 changes: 2 additions & 2 deletions src/pageEditor/documentBuilder/preview/DocumentPreview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ import { useSelector } from "react-redux";
import {
selectActiveNodeId,
selectParentNodeInfo,
} from "@/pageEditor/slices/editorSelectors";
} from "@/pageEditor/store/editor/editorSelectors";
import { Button } from "react-bootstrap";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faExternalLinkAlt } from "@fortawesome/free-solid-svg-icons";
import Alert from "@/components/Alert";
import { getErrorMessage } from "@/errors/errorHelpers";
import DisplayTemporaryInfo from "@/bricks/transformers/temporaryInfo/DisplayTemporaryInfo";
import { selectActiveModComponentTraceForBrick } from "@/pageEditor/slices/runtimeSelectors";
import { selectActiveModComponentTraceForBrick } from "@/pageEditor/store/runtime/runtimeSelectors";
import ClickableElement from "@/components/ClickableElement";

type DocumentPreviewProps = {
Expand Down
Loading
Loading