Skip to content

Commit

Permalink
move wds constants to ee
Browse files Browse the repository at this point in the history
  • Loading branch information
znamenskii-ilia committed Oct 8, 2024
1 parent 67face6 commit 5ad4756
Show file tree
Hide file tree
Showing 24 changed files with 31 additions and 24 deletions.
2 changes: 1 addition & 1 deletion app/client/cypress/support/Pages/Anvil/Locators/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { MAIN_CONTAINER_WIDGET_ID } from "../../../../../src/constants/WidgetConstants";
import { getAnvilCanvasId } from "../../../../../src/layoutSystems/anvil/viewer/canvas/utils";
import { AnvilDataAttributes } from "../../../../../src/modules/ui-builder/ui/wds/constants";
import { AnvilDataAttributes } from "../../../../../src/ee/modules/ui-builder/ui/wds/constants";

// anvil widget based selectors
const anvilWidgetSelector = "[data-testid=t--anvil-widget-wrapper]";
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/WidgetProvider/factory/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
WidgetFeaturePropertyPaneEnhancements,
} from "../../utils/WidgetFeatures";
import { generateReactKey } from "utils/generators";
import { DEFAULT_WIDGET_ON_CANVAS_UI } from "modules/ui-builder/ui/wds/constants";
import { DEFAULT_WIDGET_ON_CANVAS_UI } from "ee/modules/ui-builder/ui/wds/constants";
import type { WidgetDefaultProps } from "WidgetProvider/constants";

export enum PropertyPaneConfigTypes {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getCanvasClassName } from "../../../../utils/generators";
import { getCanvasClassName } from "../../../../../utils/generators";

export const anvilWidgets = {
SECTION_WIDGET: "SECTION_WIDGET",
Expand Down
1 change: 1 addition & 0 deletions app/client/src/ee/modules/ui-builder/ui/wds/constants.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "ce/modules/ui-builder/ui/wds/constants";
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { Layers } from "constants/Layers";
import { noop } from "utils/AppsmithUtils";
import { convertFlexGrowToFlexBasis } from "../sectionSpaceDistributor/utils/spaceDistributionEditorUtils";
import styles from "./styles.module.css";
import { AnvilDataAttributes } from "modules/ui-builder/ui/wds/constants";
import { AnvilDataAttributes } from "ee/modules/ui-builder/ui/wds/constants";

const anvilWidgetStyleProps: CSSProperties = {
position: "relative",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import type { AnvilHighlightInfo } from "layoutSystems/anvil/utils/anvilTypes";
import { useCallback } from "react";
import { useDispatch } from "react-redux";
import type { AnvilDnDListenerStates } from "./useAnvilDnDListenerStates";
import { anvilWidgets } from "modules/ui-builder/ui/wds/constants";
import { anvilWidgets } from "ee/modules/ui-builder/ui/wds/constants";

export const useAnvilWidgetDrop = (
canvasId: string,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import WidgetFactory from "WidgetProvider/factory";
import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
import type { DragDetails } from "reducers/uiReducers/dragResizeReducer";
import { AnvilDraggedWidgetTypesEnum } from "../types";
import { anvilWidgets } from "modules/ui-builder/ui/wds/constants";
import { anvilWidgets } from "ee/modules/ui-builder/ui/wds/constants";
import { HIGHLIGHT_SIZE } from "layoutSystems/anvil/utils/constants";
import { getWidgetHierarchy } from "layoutSystems/anvil/utils/paste/utils";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useSelector } from "react-redux";
import { useWidgetBorderStyles } from "layoutSystems/anvil/common/hooks/useWidgetBorderStyles";
import type { AppState } from "ee/reducers";
import { getIsNewWidgetBeingDragged } from "sagas/selectors";
import { AnvilDataAttributes } from "modules/ui-builder/ui/wds/constants";
import { AnvilDataAttributes } from "ee/modules/ui-builder/ui/wds/constants";

export const useAnvilWidgetStyles = (
widgetId: string,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
type ReduxAction,
} from "ee/constants/ReduxActionConstants";
import type { WidgetProps } from "widgets/BaseWidget";
import { WDS_V2_WIDGET_MAP } from "modules/ui-builder/ui/wds/constants";
import { WDS_V2_WIDGET_MAP } from "ee/modules/ui-builder/ui/wds/constants";
import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
import { getMainCanvasLastRowHighlight } from "../anvilDraggingSagas/helpers";
import { updateAndSaveAnvilLayout } from "layoutSystems/anvil/utils/anvilChecksUtils";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
import WidgetRow from "../WidgetRow";
import { SectionRow } from "./SectionRow";
import type { FlexLayoutProps } from "../FlexLayout";
import { anvilWidgets } from "modules/ui-builder/ui/wds/constants";
import { anvilWidgets } from "ee/modules/ui-builder/ui/wds/constants";
import { SectionSpaceDistributor } from "layoutSystems/anvil/sectionSpaceDistributor/SectionSpaceDistributor";

class Section extends WidgetRow {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { updateAnvilParentPostWidgetDeletion } from "layoutSystems/anvil/utils/l
import type { FlattenedWidgetProps } from "WidgetProvider/constants";
import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
import { anvilWidgets } from "modules/ui-builder/ui/wds/constants";
import { anvilWidgets } from "ee/modules/ui-builder/ui/wds/constants";
import {
updateSectionWithDefaultSpaceDistribution,
updateSectionsDistributedSpace,
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/layoutSystems/anvil/utils/constants.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { FlexLayerAlignment } from "layoutSystems/common/utils/constants";
import type { HighlightPayload, HighlightRenderInfo } from "./anvilTypes";
import { anvilWidgets } from "modules/ui-builder/ui/wds/constants";
import { anvilWidgets } from "ee/modules/ui-builder/ui/wds/constants";

export const MOBILE_BREAKPOINT = 480;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import LayoutFactory from "layoutSystems/anvil/layoutComponents/LayoutFactory";
import { call } from "redux-saga/effects";

import { severTiesFromParents, transformMovedWidgets } from "./moveUtils";
import { anvilWidgets } from "modules/ui-builder/ui/wds/constants";
import { anvilWidgets } from "ee/modules/ui-builder/ui/wds/constants";
import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
import { addNewAnvilWidgetToDSL } from "layoutSystems/anvil/integrations/sagas/anvilWidgetAdditionSagas/helpers";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidg
import { call } from "redux-saga/effects";
import { severTiesFromParents, transformMovedWidgets } from "./moveUtils";
import type { FlattenedWidgetProps } from "WidgetProvider/constants";
import { anvilWidgets } from "modules/ui-builder/ui/wds/constants";
import { anvilWidgets } from "ee/modules/ui-builder/ui/wds/constants";
import { addNewAnvilWidgetToDSL } from "layoutSystems/anvil/integrations/sagas/anvilWidgetAdditionSagas/helpers";

export function* createSectionAndAddWidget(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { call } from "redux-saga/effects";
import { addWidgetsToChildTemplate } from "./additionUtils";
import type { FlattenedWidgetProps } from "WidgetProvider/constants";
import { isLargeWidget } from "../../widgetUtils";
import { anvilWidgets } from "modules/ui-builder/ui/wds/constants";
import { anvilWidgets } from "ee/modules/ui-builder/ui/wds/constants";
import {
moveWidgets,
severTiesFromParents,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type {
} from "./types";
import { getDestinedParent } from "./destinationUtils";
import type { FlattenedWidgetProps } from "WidgetProvider/constants";
import { anvilWidgets } from "modules/ui-builder/ui/wds/constants";
import { anvilWidgets } from "ee/modules/ui-builder/ui/wds/constants";
import type { LayoutProps } from "../anvilTypes";
import { all, call } from "redux-saga/effects";
import { addPastedWidgets } from "./utils";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { generateReactKey } from "utils/generators";
import type BaseLayoutComponent from "../layoutComponents/BaseLayoutComponent";
import LayoutFactory from "../layoutComponents/LayoutFactory";
import { defaultHighlightRenderInfo } from "../utils/constants";
import { anvilWidgets } from "modules/ui-builder/ui/wds/constants";
import { anvilWidgets } from "ee/modules/ui-builder/ui/wds/constants";
import { getUpdatedListOfWidgetsAfterAddingNewWidget } from "../integrations/sagas/anvilWidgetAdditionSagas";

/**
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/modules/ui-builder/ui/wds/Container.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { ReactNode } from "react";
import React from "react";
import styled from "styled-components";
import { generateClassName } from "utils/generators";
import type { Elevations } from "./constants";
import type { Elevations } from "../../../../ee/modules/ui-builder/ui/wds/constants";
import { useAnvilWidgetElevationSetter } from "layoutSystems/anvil/editor/canvas/hooks/useAnvilWidgetElevationSetter";

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import React from "react";
import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
import { SelectionRequestType } from "sagas/WidgetSelectUtils";
import { ModalBody } from "@appsmith/wds";
import { WDS_MODAL_WIDGET_CLASSNAME } from "modules/ui-builder/ui/wds/constants";
import { WDS_MODAL_WIDGET_CLASSNAME } from "ee/modules/ui-builder/ui/wds/constants";
import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
import type {
CopiedWidgetData,
Expand All @@ -21,7 +21,7 @@ import { ModalLayoutProvider } from "layoutSystems/anvil/layoutComponents/ModalL
import styles from "./styles.module.css";
import { getAnvilWidgetDOMId } from "layoutSystems/common/utils/LayoutElementPositionsObserver/utils";
import { widgetTypeClassname } from "widgets/WidgetUtils";
import { AnvilDataAttributes } from "modules/ui-builder/ui/wds/constants";
import { AnvilDataAttributes } from "ee/modules/ui-builder/ui/wds/constants";

class WDSModalWidget extends BaseWidget<ModalWidgetProps, WidgetState> {
static type = "WDS_MODAL_WIDGET";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ import type { ReactNode } from "react";
import React from "react";
import { ContainerComponent } from "modules/ui-builder/ui/wds/Container";
import { LayoutProvider } from "layoutSystems/anvil/layoutComponents/LayoutProvider";
import { Elevations, anvilWidgets } from "modules/ui-builder/ui/wds/constants";
import {
Elevations,
anvilWidgets,
} from "ee/modules/ui-builder/ui/wds/constants";
import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
import type {
CopiedWidgetData,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as config from "../config";
import { StatsComponent } from "../component";
import type { StatsWidgetProps } from "./types";
import type { AnvilConfig } from "WidgetProvider/constants";
import { Elevations } from "modules/ui-builder/ui/wds/constants";
import { Elevations } from "ee/modules/ui-builder/ui/wds/constants";
import { ContainerComponent } from "modules/ui-builder/ui/wds/Container";

class WDSStatsWidget extends BaseWidget<StatsWidgetProps, WidgetState> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ import type { LayoutProps } from "layoutSystems/anvil/utils/anvilTypes";
import type { ContainerWidgetProps } from "widgets/ContainerWidget/widget";
import { ContainerComponent } from "modules/ui-builder/ui/wds/Container";
import { LayoutProvider } from "layoutSystems/anvil/layoutComponents/LayoutProvider";
import { Elevations, anvilWidgets } from "modules/ui-builder/ui/wds/constants";
import {
Elevations,
anvilWidgets,
} from "ee/modules/ui-builder/ui/wds/constants";
import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
import type {
CopiedWidgetData,
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/pages/Editor/QueryEditor/BindDataButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
import { getHasManagePagePermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
import { getWidgets } from "sagas/selectors";
import type { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsStructureReducer";
import { WDS_V2_WIDGET_MAP } from "modules/ui-builder/ui/wds/constants";
import { WDS_V2_WIDGET_MAP } from "ee/modules/ui-builder/ui/wds/constants";
import { getNextWidgetName } from "sagas/WidgetOperationUtils";
import AnalyticsUtil from "ee/utils/AnalyticsUtil";
import { addSuggestedWidget } from "actions/widgetActions";
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/selectors/editorSelectors.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import { isAutoHeightEnabledForWidget } from "widgets/WidgetUtils";
import WidgetFactory from "WidgetProvider/factory";
import { isAirgapped } from "ee/utils/airgapHelpers";
import { getIsAnonymousDataPopupVisible } from "./onboardingSelectors";
import { WDS_V2_WIDGET_MAP } from "modules/ui-builder/ui/wds/constants";
import { WDS_V2_WIDGET_MAP } from "ee/modules/ui-builder/ui/wds/constants";
import { LayoutSystemTypes } from "layoutSystems/types";
import { getLayoutSystemType } from "./layoutSystemSelectors";
import { protectedModeSelector } from "./gitSyncSelectors";
Expand Down

0 comments on commit 5ad4756

Please sign in to comment.