From 2443b8ce9d4c64dc149e07d3fb313f912f545832 Mon Sep 17 00:00:00 2001 From: Aman Agarwal Date: Tue, 24 Sep 2024 18:12:48 +0530 Subject: [PATCH 01/17] fix: js library default export to a unique name instead of default key in self (#36483) --- .../handlers/__tests__/jsLibrary.test.ts | 36 ++++++++++++++++++- .../workers/Evaluation/handlers/jsLibrary.ts | 34 ++++++++++++++++-- 2 files changed, 67 insertions(+), 3 deletions(-) diff --git a/app/client/src/workers/Evaluation/handlers/__tests__/jsLibrary.test.ts b/app/client/src/workers/Evaluation/handlers/__tests__/jsLibrary.test.ts index 9727c496fb8..9b9a4c1b23d 100644 --- a/app/client/src/workers/Evaluation/handlers/__tests__/jsLibrary.test.ts +++ b/app/client/src/workers/Evaluation/handlers/__tests__/jsLibrary.test.ts @@ -11,7 +11,17 @@ declare const self: WorkerGlobalScope; describe("Tests to assert install/uninstall flows", function () { beforeAll(() => { - self.importScripts = jest.fn(() => { + self.importScripts = jest.fn((url: string) => { + if (url.includes("jspdf-autotable")) { + const defaultVar = function () {}; + + defaultVar.Cell = function () {}; + self.Cell = function () {}; + self.default = defaultVar; + + return; + } + self.lodash = {}; }); @@ -150,4 +160,28 @@ describe("Tests to assert install/uninstall flows", function () { method: "Hello", }); }); + + it("should install a library with default export", async function () { + const res = await installLibrary({ + data: { + url: "https://cdn.jsdelivr.net/npm/jspdf-autotable@3.5.28/dist/jspdf.plugin.autotable.js", + takenAccessors: [], + takenNamesMap: {}, + }, + method: EVAL_WORKER_ASYNC_ACTION.INSTALL_LIBRARY, + webworkerTelemetry: {}, + }); + + expect(self.importScripts).toHaveBeenCalled(); + expect(mod.makeTernDefs).toHaveBeenCalledWith({}); + + expect(res).toEqual({ + accessor: ["jspdf_plugin_autotable_js"], + defs: { + "!name": "LIB/jspdf_plugin_autotable_js", + jspdf_plugin_autotable_js: undefined, + }, + success: true, + }); + }); }); diff --git a/app/client/src/workers/Evaluation/handlers/jsLibrary.ts b/app/client/src/workers/Evaluation/handlers/jsLibrary.ts index 87d22747c32..bdf704f2bab 100644 --- a/app/client/src/workers/Evaluation/handlers/jsLibrary.ts +++ b/app/client/src/workers/Evaluation/handlers/jsLibrary.ts @@ -128,10 +128,40 @@ export async function installLibrary( // Find keys add that were installed to the global scope. const keysAfterInstallation = Object.keys(self); - accessors.push( - ...difference(keysAfterInstallation, envKeysBeforeInstallation), + const differentiatingKeys = difference( + keysAfterInstallation, + envKeysBeforeInstallation, ); + if ( + differentiatingKeys.length > 0 && + differentiatingKeys.includes("default") + ) { + // Changing default export to library specific name + const uniqueName = generateUniqueAccessor( + url, + takenAccessors, + takenNamesMap, + ); + + // mapping default functionality to library name accessor + self[uniqueName] = self["default"]; + // deleting the reference of default key from the self object + delete self["default"]; + // mapping all the references of differentiating keys from the self object to the self[uniqueName] key object + differentiatingKeys.map((key) => { + if (key !== "default") { + self[uniqueName][key] = self[key]; + // deleting the references from the self object + delete self[key]; + } + }); + // pushing the uniqueName to the accessor array + accessors.push(uniqueName); + } else { + accessors.push(...differentiatingKeys); + } + /** * Check the list of installed library to see if their values have changed. * This is to check if the newly installed library overwrites an already existing one From 368fdac46438b14514f7ed1f5b8bbefdeb2591ef Mon Sep 17 00:00:00 2001 From: Abhijeet <41686026+abhvsn@users.noreply.github.com> Date: Tue, 24 Sep 2024 18:19:12 +0530 Subject: [PATCH 02/17] chore: Add step to place server artifacts for `package-master` stage (#36513) ## Description > [!TIP] > _Add a TL;DR when the description is longer than 500 words or extremely technical (helps the content, marketing, and DevRel team)._ > > _Please also include relevant motivation and context. List any dependencies that are required for this change. Add links to Notion, Figma or any other documents that might be relevant to the PR._ Fixes #`Issue Number` _or_ Fixes `Issue URL` > [!WARNING] > _If no issue exists, please create an issue first, and check with the maintainers if the issue is valid._ ## Automation /ok-to-test tags="" ### :mag: Cypress test results > [!CAUTION] > If you modify the content in this section, you are likely to disrupt the CI result for your PR. ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [ ] No --- .github/workflows/test-build-docker-image.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/test-build-docker-image.yml b/.github/workflows/test-build-docker-image.yml index 71fe51a5cb8..f14c565e210 100644 --- a/.github/workflows/test-build-docker-image.yml +++ b/.github/workflows/test-build-docker-image.yml @@ -435,6 +435,12 @@ jobs: scripts/generate_info_json.sh fi + - name: Place server artifacts-es + run: | + if [[ -f scripts/prepare_server_artifacts.sh ]]; then + scripts/prepare_server_artifacts.sh + fi + - name: Set up Depot CLI uses: depot/setup-action@v1 From 4ea280311aecc40349e14dff643db9b9790b2577 Mon Sep 17 00:00:00 2001 From: Abhijeet <41686026+abhvsn@users.noreply.github.com> Date: Tue, 24 Sep 2024 19:20:13 +0530 Subject: [PATCH 03/17] chore: Add server artifacts for pg and mongodb for github release workflow (#36516) ## Description > [!TIP] > _Add a TL;DR when the description is longer than 500 words or extremely technical (helps the content, marketing, and DevRel team)._ > > _Please also include relevant motivation and context. List any dependencies that are required for this change. Add links to Notion, Figma or any other documents that might be relevant to the PR._ Fixes #`Issue Number` _or_ Fixes `Issue URL` > [!WARNING] > _If no issue exists, please create an issue first, and check with the maintainers if the issue is valid._ ## Automation /ok-to-test tags="" ### :mag: Cypress test results > [!CAUTION] > If you modify the content in this section, you are likely to disrupt the CI result for your PR. ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [ ] No ## Summary by CodeRabbit - **New Features** - Enhanced GitHub Actions workflow to conditionally prepare server artifacts based on the presence of a specific script. - **Chores** - Added a new job step in the GitHub Actions workflow for improved artifact management. --- .github/workflows/github-release.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index bf230d050ec..c4dd4001beb 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -247,6 +247,12 @@ jobs: run: | scripts/generate_info_json.sh + - name: Place server artifacts-es + run: | + if [[ -f scripts/prepare_server_artifacts.sh ]]; then + scripts/prepare_server_artifacts.sh + fi + - name: Login to DockerHub uses: docker/login-action@v1 with: From 199638229b6beba70602fe8d8e13824e2b895c1d Mon Sep 17 00:00:00 2001 From: Ilia Date: Tue, 24 Sep 2024 18:04:02 +0200 Subject: [PATCH 04/17] chore: move wds widgets to modules (#36511) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description Fixes #36510 _or_ Fixes `Issue URL` > [!WARNING] > _If no issue exists, please create an issue first, and check with the maintainers if the issue is valid._ ## Automation /ok-to-test tags="@tag.Sanity" ### :mag: Cypress test results > [!TIP] > ๐ŸŸข ๐ŸŸข ๐ŸŸข All cypress tests have passed! ๐ŸŽ‰ ๐ŸŽ‰ ๐ŸŽ‰ > Workflow run: > Commit: a5fae728c0f857b2ff62a4f6a3bc50b1b377c2bd > Cypress dashboard. > Tags: `@tag.Sanity` > Spec: >
Tue, 24 Sep 2024 14:30:02 UTC ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [ ] No ## Summary by CodeRabbit ## Summary by CodeRabbit - **Chores** - Updated import paths for various components and types to reflect a new directory structure, enhancing organization and maintainability. - Modified paths for multiple widgets including `WDSInputWidget`, `WDSBaseInputWidget`, `WDSModalWidget`, and `MenuButtonWidget`, ensuring consistent access to resources. --- .../support/Pages/Anvil/Locators/index.ts | 2 +- .../src/WidgetProvider/factory/helpers.ts | 2 +- .../anvil/common/AnvilFlexComponent.tsx | 2 +- .../hooks/useAnvilDnDListenerStates.ts | 2 +- .../canvasArenas/hooks/useAnvilWidgetDrop.ts | 2 +- .../anvil/editor/canvasArenas/utils/utils.ts | 2 +- .../editor/hooks/useAnvilWidgetStyles.ts | 2 +- .../anvilDraggingSagas.test.ts | 8 +-- .../sagas/anvilWidgetAdditionSagas/index.ts | 2 +- .../components/section/index.tsx | 2 +- .../anvil/utils/anvilChecksUtils.ts | 2 +- .../layoutSystems/anvil/utils/constants.ts | 2 +- .../layouts/update/mainCanvasLayoutUtils.ts | 2 +- .../utils/layouts/update/sectionUtils.ts | 2 +- .../anvil/utils/layouts/update/zoneUtils.ts | 2 +- .../anvil/utils/paste/sectionPasteUtils.ts | 2 +- .../anvil/utils/sectionOperationUtils.ts | 2 +- .../withLayoutSystemWidgetHOC.test.tsx | 4 +- .../ui-builder/ui}/wds/Container.tsx | 0 .../__tests__/helpers.test.ts | 0 .../wds/WDSBaseInputWidget/component/types.ts | 0 .../config/contentConfig.ts | 0 .../wds/WDSBaseInputWidget/config/index.ts | 0 .../ui}/wds/WDSBaseInputWidget/constants.ts | 0 .../ui}/wds/WDSBaseInputWidget/helpers.ts | 0 .../ui}/wds/WDSBaseInputWidget/index.ts | 0 .../ui}/wds/WDSBaseInputWidget/types.ts | 0 .../wds/WDSBaseInputWidget/widget/index.tsx | 0 .../wds/WDSBaseInputWidget/widget/types.ts | 0 .../WDSButtonWidget/component/Container.tsx | 0 .../WDSButtonWidget/component/RecaptchaV2.tsx | 0 .../WDSButtonWidget/component/RecaptchaV3.tsx | 0 .../wds/WDSButtonWidget/component/index.tsx | 0 .../component/useRecaptcha.tsx | 0 .../wds/WDSButtonWidget/config/anvilConfig.ts | 0 .../config/autocompleteConfig.ts | 0 .../WDSButtonWidget/config/defaultsConfig.ts | 0 .../ui}/wds/WDSButtonWidget/config/index.ts | 0 .../wds/WDSButtonWidget/config/metaConfig.ts | 0 .../WDSButtonWidget/config/methodsConfig.ts | 0 .../propertyPaneConfig/contentConfig.ts | 0 .../config/propertyPaneConfig/index.ts | 0 .../config/propertyPaneConfig/styleConfig.ts | 0 .../WDSButtonWidget/config/settersConfig.ts | 0 .../ui}/wds/WDSButtonWidget/index.tsx | 0 .../ui}/wds/WDSButtonWidget/widget/index.tsx | 0 .../ui}/wds/WDSButtonWidget/widget/types.ts | 0 .../config/anvilConfig.ts | 0 .../config/autocompleteConfig.ts | 0 .../config/defaultsConfig.ts | 0 .../config/featuresConfig.ts | 0 .../WDSCheckboxGroupWidget/config/index.ts | 0 .../config/metaConfig.ts | 0 .../config/methodsConfig.ts | 0 .../propertyPaneConfig/contentConfig.ts | 0 .../config/propertyPaneConfig/index.ts | 0 .../defaultSelectedValuesValidation.ts | 0 .../propertyPaneConfig/validations/index.ts | 0 .../config/settersConfig.ts | 0 .../ui}/wds/WDSCheckboxGroupWidget/index.ts | 0 .../WDSCheckboxGroupWidget/widget/helpers.ts | 2 +- .../WDSCheckboxGroupWidget/widget/index.tsx | 0 .../WDSCheckboxGroupWidget/widget/types.ts | 0 .../WDSCheckboxWidget/config/anvilConfig.ts | 0 .../config/autocompleteConfig.ts | 0 .../config/defaultsConfig.ts | 0 .../config/featuresConfig.ts | 0 .../ui}/wds/WDSCheckboxWidget/config/index.ts | 0 .../WDSCheckboxWidget/config/metaConfig.ts | 0 .../WDSCheckboxWidget/config/methodsConfig.ts | 0 .../propertyPaneConfig/contentConfig.ts | 0 .../config/propertyPaneConfig/index.ts | 0 .../WDSCheckboxWidget/config/settersConfig.ts | 0 .../ui}/wds/WDSCheckboxWidget/index.ts | 0 .../wds/WDSCheckboxWidget/widget/index.tsx | 0 .../ui}/wds/WDSCheckboxWidget/widget/types.ts | 0 .../WDSComboBoxWidget/config/anvilConfig.ts | 0 .../config/autocompleteConfig.ts | 0 .../config/defaultsConfig.ts | 0 .../ui}/wds/WDSComboBoxWidget/config/index.ts | 0 .../WDSComboBoxWidget/config/metaConfig.ts | 0 .../WDSComboBoxWidget/config/methodsConfig.ts | 0 .../propertyPaneConfig/contentConfig.test.ts | 2 +- .../propertyPaneConfig/contentConfig.ts | 4 +- .../config/propertyPaneConfig/index.ts | 0 .../propertyPaneConfig/validations/index.ts | 0 .../validations/optionsCustomValidation.ts | 2 +- .../WDSComboBoxWidget/config/settersConfig.ts | 0 .../ui}/wds/WDSComboBoxWidget/index.ts | 0 .../wds/WDSComboBoxWidget/widget/helpers.ts | 2 +- .../wds/WDSComboBoxWidget/widget/index.tsx | 0 .../ui}/wds/WDSComboBoxWidget/widget/types.ts | 0 .../component/index.tsx | 0 .../WDSCurrencyInputWidget/component/types.ts | 2 +- .../component/utilities.test.ts | 0 .../component/utilities.ts | 0 .../config/anvilConfig.ts | 0 .../config/autocompleteConfig.ts | 0 .../config/defaultsConfig.ts | 2 +- .../config/featuresConfig.ts | 0 .../WDSCurrencyInputWidget/config/index.ts | 0 .../config/metaConfig.ts | 0 .../config/methodsConfig.ts | 0 .../propertyPaneConfig/contentConfig.ts | 2 +- .../config/propertyPaneConfig/index.ts | 0 .../validations/defaultValueValidation.ts | 0 .../propertyPaneConfig/validations/index.ts | 0 .../config/settersConfig.ts | 0 .../wds/WDSCurrencyInputWidget/constants.ts | 0 .../ui}/wds/WDSCurrencyInputWidget/index.ts | 0 .../WDSCurrencyInputWidget/widget/derived.js | 0 .../widget/derived.test.ts | 0 .../widget/helpers.test.ts | 0 .../WDSCurrencyInputWidget/widget/helpers.ts | 0 .../widget/index.test.tsx | 0 .../WDSCurrencyInputWidget/widget/index.tsx | 4 +- .../widget/parsedDerivedProperties.ts | 0 .../WDSCurrencyInputWidget/widget/types.ts | 2 +- .../ui}/wds/WDSEmailInputWidget/index.ts | 0 .../wds/WDSEmailInputWidget/widget/index.tsx | 4 +- .../ui}/wds/WDSHeadingWidget/index.ts | 0 .../ui}/wds/WDSHeadingWidget/widget/index.tsx | 2 +- .../WDSIconButtonWidget/component/index.tsx | 0 .../WDSIconButtonWidget/component/types.ts | 0 .../WDSIconButtonWidget/config/anvilConfig.ts | 0 .../config/autocompleteConfig.ts | 0 .../config/defaultsConfig.ts | 0 .../wds/WDSIconButtonWidget/config/index.ts | 0 .../WDSIconButtonWidget/config/metaConfig.ts | 0 .../config/methodsConfig.ts | 0 .../propertyPaneConfig/contentConfig.ts | 0 .../config/propertyPaneConfig/index.ts | 0 .../config/propertyPaneConfig/styleConfig.ts | 0 .../config/settersConfig.ts | 0 .../ui}/wds/WDSIconButtonWidget/index.tsx | 0 .../wds/WDSIconButtonWidget/widget/index.tsx | 0 .../wds/WDSIconButtonWidget/widget/types.ts | 0 .../component/index.tsx | 0 .../WDSInlineButtonsWidget/component/types.ts | 0 .../config/anvilConfig.ts | 0 .../config/autocompleteConfig.ts | 0 .../config/defaultsConfig.ts | 0 .../WDSInlineButtonsWidget/config/index.ts | 0 .../config/metaConfig.ts | 0 .../config/methodsConfig.ts | 0 .../propertyPaneConfig/contentConfig.ts | 0 .../config/propertyPaneConfig/index.ts | 0 .../config/settersConfig.ts | 0 .../ui}/wds/WDSInlineButtonsWidget/index.tsx | 0 .../WDSInlineButtonsWidget/widget/index.tsx | 0 .../WDSInlineButtonsWidget/widget/types.ts | 0 .../wds/WDSInputWidget/component/index.tsx | 2 +- .../ui}/wds/WDSInputWidget/component/types.ts | 2 +- .../wds/WDSInputWidget/config/anvilConfig.ts | 0 .../config/autocompleteConfig.ts | 0 .../WDSInputWidget/config/defaultsConfig.ts | 0 .../ui}/wds/WDSInputWidget/config/index.ts | 0 .../wds/WDSInputWidget/config/metaConfig.ts | 0 .../WDSInputWidget/config/methodsConfig.ts | 0 .../propertyPaneConfig/contentConfig.ts | 0 .../config/propertyPaneConfig/index.ts | 0 .../config/propertyPaneConfig/styleConfig.ts | 0 .../validations/defaultValueValidation.ts | 0 .../validations/index.test.ts | 0 .../propertyPaneConfig/validations/index.ts | 0 .../validations/maxValueValidation.ts | 0 .../validations/minValueValidation.ts | 0 .../WDSInputWidget/config/settersConfig.ts | 0 .../ui}/wds/WDSInputWidget/index.ts | 0 .../ui}/wds/WDSInputWidget/widget/derived.js | 0 .../wds/WDSInputWidget/widget/derived.test.ts | 0 .../wds/WDSInputWidget/widget/helper.test.ts | 0 .../ui}/wds/WDSInputWidget/widget/helper.ts | 8 +-- .../ui}/wds/WDSInputWidget/widget/index.tsx | 4 +- .../widget/parsedDerivedProperties.ts | 0 .../ui}/wds/WDSInputWidget/widget/types.ts | 0 .../ui}/wds/WDSKeyValueWidget/index.ts | 0 .../wds/WDSKeyValueWidget/widget/index.tsx | 2 +- .../config/autocompleteConfig.ts | 0 .../config/defaultsConfig.ts | 0 .../wds/WDSMenuButtonWidget/config/helper.ts | 0 .../wds/WDSMenuButtonWidget/config/index.ts | 0 .../WDSMenuButtonWidget/config/metaConfig.ts | 0 .../config/methodsConfig.ts | 0 .../childPanels/configureMenuItemsConfig.ts | 2 +- .../propertyPaneConfig/childPanels/index.ts | 0 .../childPanels/menuItemsConfig.ts | 0 .../propertyPaneConfig/contentConfig.ts | 0 .../config/propertyPaneConfig/index.ts | 0 .../config/propertyPaneConfig/styleConfig.ts | 0 .../propertyPaneConfig/validations/index.ts | 0 .../validations/sourceDataArrayValidation.ts | 2 +- .../config/settersConfig.ts | 0 .../ui}/wds/WDSMenuButtonWidget/index.ts | 0 .../wds/WDSMenuButtonWidget/widget/index.tsx | 0 .../wds/WDSMenuButtonWidget/widget/types.ts | 0 .../wds/WDSModalWidget/config/anvilConfig.ts | 0 .../WDSModalWidget/config/defaultsConfig.ts | 0 .../ui}/wds/WDSModalWidget/config/index.ts | 0 .../wds/WDSModalWidget/config/metaConfig.ts | 0 .../WDSModalWidget/config/methodsConfig.ts | 0 .../propertyPaneConfig/contentConfig.ts | 0 .../config/propertyPaneConfig/index.ts | 0 .../config/propertyPaneConfig/styleConfig.ts | 0 .../ui}/wds/WDSModalWidget/index.ts | 0 .../ui}/wds/WDSModalWidget/widget/index.tsx | 4 +- .../WDSModalWidget/widget/styles.module.css | 0 .../ui}/wds/WDSModalWidget/widget/types.ts | 0 .../ui}/wds/WDSMultilineInputWidget/index.ts | 0 .../WDSMultilineInputWidget/widget/index.tsx | 4 +- .../ui}/wds/WDSNumberInputWidget/index.ts | 0 .../wds/WDSNumberInputWidget/widget/index.tsx | 4 +- .../__tests__/helpers.test.ts | 0 .../WDSParagraphWidget/config/anvilConfig.ts | 0 .../config/autocompleteConfig.ts | 0 .../config/defaultsConfig.ts | 0 .../config/featuresConfig.ts | 0 .../wds/WDSParagraphWidget/config/index.ts | 0 .../WDSParagraphWidget/config/metaConfig.ts | 0 .../config/methodsConfig.ts | 0 .../propertyPaneConfig/contentConfig.ts | 0 .../config/propertyPaneConfig/index.ts | 0 .../config/propertyPaneConfig/styleConfig.ts | 0 .../config/settersConfig.ts | 0 .../ui}/wds/WDSParagraphWidget/constants.ts | 0 .../ui}/wds/WDSParagraphWidget/helpers.ts | 0 .../ui}/wds/WDSParagraphWidget/index.ts | 0 .../wds/WDSParagraphWidget/widget/index.tsx | 0 .../wds/WDSParagraphWidget/widget/types.ts | 0 .../ui}/wds/WDSPasswordInputWidget/index.ts | 0 .../WDSPasswordInputWidget/widget/index.tsx | 4 +- .../WDSPhoneInputWidget/component/index.tsx | 0 .../WDSPhoneInputWidget/component/types.ts | 2 +- .../WDSPhoneInputWidget/config/anvilConfig.ts | 0 .../config/autocompleteConfig.ts | 0 .../config/defaultsConfig.ts | 2 +- .../config/featuresConfig.ts | 0 .../wds/WDSPhoneInputWidget/config/index.ts | 0 .../WDSPhoneInputWidget/config/metaConfig.ts | 0 .../config/methodsConfig.ts | 0 .../propertyPaneConfig/contentConfig.ts | 2 +- .../config/propertyPaneConfig/index.ts | 0 .../defaultValueValidation.test.ts | 0 .../validations/defaultValueValidation.ts | 0 .../propertyPaneConfig/validations/index.ts | 0 .../config/settersConfig.ts | 0 .../ui}/wds/WDSPhoneInputWidget/constants.ts | 0 .../ui}/wds/WDSPhoneInputWidget/index.ts | 0 .../widget/helpers.test.ts | 0 .../wds/WDSPhoneInputWidget/widget/helpers.ts | 0 .../wds/WDSPhoneInputWidget/widget/index.tsx | 6 +-- .../wds/WDSPhoneInputWidget/widget/types.ts | 2 +- .../WDSRadioGroupWidget/config/anvilConfig.ts | 0 .../config/autocompleteConfig.ts | 0 .../config/defaultsConfig.ts | 0 .../config/featuresConfig.ts | 0 .../wds/WDSRadioGroupWidget/config/index.ts | 0 .../WDSRadioGroupWidget/config/metaConfig.ts | 0 .../config/methodsConfig.ts | 0 .../propertyPaneConfig/contentConfig.ts | 0 .../config/propertyPaneConfig/index.ts | 0 .../validations/defaultOptionValidation.ts | 0 .../propertyPaneConfig/validations/index.ts | 0 .../validations/optionsCustomValidation.ts | 0 .../config/settersConfig.ts | 0 .../ui}/wds/WDSRadioGroupWidget/index.ts | 0 .../wds/WDSRadioGroupWidget/widget/helpers.ts | 2 +- .../wds/WDSRadioGroupWidget/widget/index.tsx | 0 .../wds/WDSRadioGroupWidget/widget/types.ts | 0 .../WDSSectionWidget/config/anvilConfig.ts | 0 .../config/autocompleteConfig.ts | 0 .../wds/WDSSectionWidget/config/baseConfig.ts | 0 .../WDSSectionWidget/config/defaultConfig.ts | 0 .../ui}/wds/WDSSectionWidget/config/index.ts | 0 .../WDSSectionWidget/config/methodsConfig.ts | 0 .../config/propertyPaneContent.ts | 0 .../config/propertyPaneStyle.ts | 0 .../ui}/wds/WDSSectionWidget/index.tsx | 0 .../ui}/wds/WDSSectionWidget/widget/index.tsx | 4 +- .../wds/WDSSelectWidget/config/anvilConfig.ts | 0 .../config/autocompleteConfig.ts | 0 .../WDSSelectWidget/config/defaultsConfig.ts | 0 .../ui}/wds/WDSSelectWidget/config/index.ts | 0 .../wds/WDSSelectWidget/config/metaConfig.ts | 0 .../WDSSelectWidget/config/methodsConfig.ts | 0 .../propertyPaneConfig/contentConfig.ts | 4 +- .../config/propertyPaneConfig/index.ts | 0 .../validations/defaultOptionValidation.ts | 2 +- .../propertyPaneConfig/validations/index.ts | 0 .../validations/optionsCustomValidation.ts | 2 +- .../WDSSelectWidget/config/settersConfig.ts | 0 .../ui}/wds/WDSSelectWidget/index.ts | 0 .../ui}/wds/WDSSelectWidget/widget/helpers.ts | 2 +- .../ui}/wds/WDSSelectWidget/widget/index.tsx | 0 .../ui}/wds/WDSSelectWidget/widget/types.ts | 0 .../wds/WDSStatsWidget/component/index.tsx | 0 .../component/styles.module.css | 0 .../ui}/wds/WDSStatsWidget/component/types.ts | 0 .../wds/WDSStatsWidget/config/anvilConfig.ts | 0 .../config/autocompleteConfig.ts | 0 .../WDSStatsWidget/config/defaultsConfig.ts | 0 .../ui}/wds/WDSStatsWidget/config/index.ts | 0 .../wds/WDSStatsWidget/config/metaConfig.ts | 0 .../WDSStatsWidget/config/methodsConfig.ts | 0 .../propertyPaneConfig/contentConfig.ts | 0 .../config/propertyPaneConfig/index.ts | 0 .../config/propertyPaneConfig/styleConfig.ts | 0 .../WDSStatsWidget/config/settersConfig.ts | 0 .../ui}/wds/WDSStatsWidget/index.tsx | 0 .../ui}/wds/WDSStatsWidget/widget/index.tsx | 4 +- .../ui}/wds/WDSStatsWidget/widget/types.ts | 0 .../config/anvilConfig.ts | 0 .../config/autocompleteConfig.ts | 0 .../config/defaultsConfig.ts | 0 .../config/featuresConfig.ts | 0 .../wds/WDSSwitchGroupWidget/config/index.ts | 0 .../WDSSwitchGroupWidget/config/metaConfig.ts | 0 .../config/methodsConfig.ts | 0 .../propertyPaneConfig/contentConfig.ts | 0 .../config/propertyPaneConfig/index.ts | 0 .../config/settersConfig.ts | 0 .../ui}/wds/WDSSwitchGroupWidget/index.ts | 0 .../wds/WDSSwitchGroupWidget/widget/index.tsx | 0 .../wds/WDSSwitchGroupWidget/widget/types.ts | 0 .../wds/WDSSwitchWidget/config/anvilConfig.ts | 0 .../config/autocompleteConfig.ts | 0 .../WDSSwitchWidget/config/defaultsConfig.ts | 0 .../WDSSwitchWidget/config/featuresConfig.ts | 0 .../ui}/wds/WDSSwitchWidget/config/index.ts | 0 .../wds/WDSSwitchWidget/config/metaConfig.ts | 0 .../WDSSwitchWidget/config/methodsConfig.ts | 0 .../propertyPaneConfig/contentConfig.ts | 0 .../config/propertyPaneConfig/index.ts | 0 .../WDSSwitchWidget/config/settersConfig.ts | 0 .../ui}/wds/WDSSwitchWidget/index.ts | 0 .../ui}/wds/WDSSwitchWidget/widget/index.tsx | 0 .../ui}/wds/WDSSwitchWidget/widget/types.ts | 0 .../component/Constants.test.ts | 0 .../wds/WDSTableWidget/component/Constants.ts | 0 .../WDSTableWidget/component/StaticTable.tsx | 0 .../wds/WDSTableWidget/component/Table.tsx | 0 .../component/TableBody/Row.tsx | 0 .../component/TableBody/StaticTableBody.tsx | 0 .../component/TableBody/context.ts | 0 .../component/TableBody/index.tsx | 0 .../component/TableHeader/PageNumberInput.tsx | 0 .../component/TableHeader/Pagination.tsx | 0 .../component/TableHeader/Search.tsx | 0 .../TableHeader/TableColumnHeader.tsx | 2 +- .../component/TableHeader/index.tsx | 0 .../component/TableHeader/styles.module.css | 0 .../component/TableStyledWrappers.tsx | 0 .../component/cellComponents/ButtonCell.tsx | 0 .../component/cellComponents/EmptyCell.tsx | 0 .../component/cellComponents/HeaderCell.tsx | 2 +- .../cellComponents/PlainTextCell.tsx | 0 .../component/cellComponents/URLCell.tsx | 0 .../component/cellComponents/index.ts | 0 .../wds/WDSTableWidget/component/index.tsx | 0 .../component/styles.module.css | 0 .../wds/WDSTableWidget/config/anvilConfig.ts | 0 .../config/autocompleteConfig.ts | 0 .../WDSTableWidget/config/defaultsConfig.ts | 0 .../ui}/wds/WDSTableWidget/config/index.ts | 0 .../wds/WDSTableWidget/config/metaConfig.ts | 0 .../WDSTableWidget/config/methodsConfig.ts | 0 .../propertyPaneConfig/PanelConfig/Basic.ts | 7 ++- .../propertyPaneConfig/PanelConfig/Color.ts | 4 +- .../propertyPaneConfig/PanelConfig/Data.ts | 4 +- .../PanelConfig/DateProperties.ts | 4 +- .../PanelConfig/DiscardButtonproperties.ts | 4 +- .../propertyPaneConfig/PanelConfig/Events.ts | 4 +- .../propertyPaneConfig/PanelConfig/General.ts | 4 +- .../PanelConfig/SaveButtonProperties.ts | 4 +- .../PanelConfig/TextFormatting.ts | 4 +- .../PanelConfig/Validation.ts | 2 +- .../PanelConfig/Validations/Common.ts | 6 +-- .../PanelConfig/Validations/Date.ts | 6 +-- .../PanelConfig/Validations/Number.ts | 6 +-- .../propertyPaneConfig/PanelConfig/index.ts | 0 .../propertyPaneConfig/contentConfig.ts | 4 +- .../config/propertyPaneConfig/index.ts | 0 .../config/propertyPaneConfig/styleConfig.ts | 0 .../WDSTableWidget/config/settersConfig.ts | 0 .../ui}/wds/WDSTableWidget/constants.ts | 0 .../ui}/wds/WDSTableWidget/constants/data.ts | 0 .../wds/WDSTableWidget/constants/messages.ts | 0 .../ui}/wds/WDSTableWidget/index.ts | 0 .../ui}/wds/WDSTableWidget/widget/derived.js | 0 .../wds/WDSTableWidget/widget/derived.test.js | 0 .../ui}/wds/WDSTableWidget/widget/index.tsx | 0 .../widget/parseDerivedProperties.ts | 0 .../widget/propertyUtils.test.ts | 0 .../WDSTableWidget/widget/propertyUtils.ts | 0 .../reactTableUtils/getColumnsPureFn.tsx | 0 .../reactTableUtils/transformDataPureFn.tsx | 0 .../WDSTableWidget/widget/utilities.test.ts | 0 .../wds/WDSTableWidget/widget/utilities.ts | 0 .../component/index.tsx | 0 .../component/types.ts | 0 .../config/anvilConfig.ts | 0 .../config/autocompleteConfig.ts | 0 .../config/defaultsConfig.ts | 0 .../WDSToolbarButtonsWidget/config/index.ts | 0 .../config/metaConfig.ts | 0 .../config/methodsConfig.ts | 0 .../propertyPaneConfig/contentConfig.ts | 0 .../config/propertyPaneConfig/index.ts | 0 .../config/propertyPaneConfig/styleConfig.ts | 0 .../config/settersConfig.ts | 0 .../ui}/wds/WDSToolbarButtonsWidget/index.tsx | 0 .../WDSToolbarButtonsWidget/widget/index.tsx | 0 .../WDSToolbarButtonsWidget/widget/types.ts | 0 .../ui}/wds/WDSZoneWidget/index.tsx | 0 .../widget/config/anvilConfig.ts | 0 .../widget/config/autocompleteConfig.ts | 0 .../WDSZoneWidget/widget/config/baseConfig.ts | 0 .../widget/config/defaultConfig.ts | 0 .../wds/WDSZoneWidget/widget/config/index.ts | 0 .../widget/config/methodsConfig.ts | 0 .../widget/config/propertyPaneContent.ts | 0 .../widget/config/propertyPaneStyle.ts | 0 .../ui}/wds/WDSZoneWidget/widget/index.tsx | 4 +- .../ui-builder/ui}/wds/constants.ts | 2 +- .../Editor/QueryEditor/BindDataButton.tsx | 2 +- app/client/src/selectors/editorSelectors.tsx | 2 +- app/client/src/widgets/index.ts | 54 +++++++++---------- 427 files changed, 140 insertions(+), 137 deletions(-) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/Container.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSBaseInputWidget/__tests__/helpers.test.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSBaseInputWidget/component/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSBaseInputWidget/config/contentConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSBaseInputWidget/config/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSBaseInputWidget/constants.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSBaseInputWidget/helpers.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSBaseInputWidget/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSBaseInputWidget/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSBaseInputWidget/widget/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSBaseInputWidget/widget/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSButtonWidget/component/Container.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSButtonWidget/component/RecaptchaV2.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSButtonWidget/component/RecaptchaV3.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSButtonWidget/component/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSButtonWidget/component/useRecaptcha.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSButtonWidget/config/anvilConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSButtonWidget/config/autocompleteConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSButtonWidget/config/defaultsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSButtonWidget/config/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSButtonWidget/config/metaConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSButtonWidget/config/methodsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSButtonWidget/config/propertyPaneConfig/contentConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSButtonWidget/config/propertyPaneConfig/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSButtonWidget/config/propertyPaneConfig/styleConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSButtonWidget/config/settersConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSButtonWidget/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSButtonWidget/widget/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSButtonWidget/widget/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxGroupWidget/config/anvilConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxGroupWidget/config/autocompleteConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxGroupWidget/config/defaultsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxGroupWidget/config/featuresConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxGroupWidget/config/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxGroupWidget/config/metaConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxGroupWidget/config/methodsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/contentConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/validations/defaultSelectedValuesValidation.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/validations/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxGroupWidget/config/settersConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxGroupWidget/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxGroupWidget/widget/helpers.ts (79%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxGroupWidget/widget/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxGroupWidget/widget/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxWidget/config/anvilConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxWidget/config/autocompleteConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxWidget/config/defaultsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxWidget/config/featuresConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxWidget/config/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxWidget/config/metaConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxWidget/config/methodsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxWidget/config/propertyPaneConfig/contentConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxWidget/config/propertyPaneConfig/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxWidget/config/settersConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxWidget/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxWidget/widget/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCheckboxWidget/widget/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSComboBoxWidget/config/anvilConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSComboBoxWidget/config/autocompleteConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSComboBoxWidget/config/defaultsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSComboBoxWidget/config/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSComboBoxWidget/config/metaConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSComboBoxWidget/config/methodsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.test.ts (94%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.ts (97%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSComboBoxWidget/config/propertyPaneConfig/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSComboBoxWidget/config/propertyPaneConfig/validations/index.ts (100%) rename app/client/src/{widgets/wds/WDSSelectWidget => modules/ui-builder/ui/wds/WDSComboBoxWidget}/config/propertyPaneConfig/validations/optionsCustomValidation.ts (98%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSComboBoxWidget/config/settersConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSComboBoxWidget/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSComboBoxWidget/widget/helpers.ts (78%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSComboBoxWidget/widget/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSComboBoxWidget/widget/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/component/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/component/types.ts (79%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/component/utilities.test.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/component/utilities.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/config/anvilConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/config/autocompleteConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/config/defaultsConfig.ts (86%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/config/featuresConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/config/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/config/metaConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/config/methodsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/contentConfig.ts (96%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/validations/defaultValueValidation.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/validations/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/config/settersConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/constants.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/widget/derived.js (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/widget/derived.test.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/widget/helpers.test.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/widget/helpers.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/widget/index.test.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/widget/index.tsx (98%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/widget/parsedDerivedProperties.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSCurrencyInputWidget/widget/types.ts (78%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSEmailInputWidget/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSEmailInputWidget/widget/index.tsx (84%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSHeadingWidget/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSHeadingWidget/widget/index.tsx (95%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSIconButtonWidget/component/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSIconButtonWidget/component/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSIconButtonWidget/config/anvilConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSIconButtonWidget/config/autocompleteConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSIconButtonWidget/config/defaultsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSIconButtonWidget/config/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSIconButtonWidget/config/metaConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSIconButtonWidget/config/methodsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSIconButtonWidget/config/propertyPaneConfig/contentConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSIconButtonWidget/config/propertyPaneConfig/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSIconButtonWidget/config/propertyPaneConfig/styleConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSIconButtonWidget/config/settersConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSIconButtonWidget/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSIconButtonWidget/widget/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSIconButtonWidget/widget/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInlineButtonsWidget/component/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInlineButtonsWidget/component/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInlineButtonsWidget/config/anvilConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInlineButtonsWidget/config/autocompleteConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInlineButtonsWidget/config/defaultsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInlineButtonsWidget/config/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInlineButtonsWidget/config/metaConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInlineButtonsWidget/config/methodsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInlineButtonsWidget/config/propertyPaneConfig/contentConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInlineButtonsWidget/config/propertyPaneConfig/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInlineButtonsWidget/config/settersConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInlineButtonsWidget/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInlineButtonsWidget/widget/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInlineButtonsWidget/widget/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/component/index.tsx (97%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/component/types.ts (84%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/config/anvilConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/config/autocompleteConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/config/defaultsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/config/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/config/metaConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/config/methodsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/config/propertyPaneConfig/contentConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/config/propertyPaneConfig/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/config/propertyPaneConfig/styleConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/config/propertyPaneConfig/validations/defaultValueValidation.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/config/propertyPaneConfig/validations/index.test.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/config/propertyPaneConfig/validations/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/config/propertyPaneConfig/validations/maxValueValidation.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/config/propertyPaneConfig/validations/minValueValidation.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/config/settersConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/widget/derived.js (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/widget/derived.test.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/widget/helper.test.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/widget/helper.ts (93%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/widget/index.tsx (97%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/widget/parsedDerivedProperties.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSInputWidget/widget/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSKeyValueWidget/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSKeyValueWidget/widget/index.tsx (91%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSMenuButtonWidget/config/autocompleteConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSMenuButtonWidget/config/defaultsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSMenuButtonWidget/config/helper.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSMenuButtonWidget/config/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSMenuButtonWidget/config/metaConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSMenuButtonWidget/config/methodsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSMenuButtonWidget/config/propertyPaneConfig/childPanels/configureMenuItemsConfig.ts (98%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSMenuButtonWidget/config/propertyPaneConfig/childPanels/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSMenuButtonWidget/config/propertyPaneConfig/childPanels/menuItemsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSMenuButtonWidget/config/propertyPaneConfig/contentConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSMenuButtonWidget/config/propertyPaneConfig/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSMenuButtonWidget/config/propertyPaneConfig/styleConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSMenuButtonWidget/config/propertyPaneConfig/validations/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSMenuButtonWidget/config/propertyPaneConfig/validations/sourceDataArrayValidation.ts (91%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSMenuButtonWidget/config/settersConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSMenuButtonWidget/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSMenuButtonWidget/widget/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSMenuButtonWidget/widget/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSModalWidget/config/anvilConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSModalWidget/config/defaultsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSModalWidget/config/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSModalWidget/config/metaConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSModalWidget/config/methodsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSModalWidget/config/propertyPaneConfig/contentConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSModalWidget/config/propertyPaneConfig/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSModalWidget/config/propertyPaneConfig/styleConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSModalWidget/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSModalWidget/widget/index.tsx (97%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSModalWidget/widget/styles.module.css (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSModalWidget/widget/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSMultilineInputWidget/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSMultilineInputWidget/widget/index.tsx (84%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSNumberInputWidget/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSNumberInputWidget/widget/index.tsx (83%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSParagraphWidget/__tests__/helpers.test.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSParagraphWidget/config/anvilConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSParagraphWidget/config/autocompleteConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSParagraphWidget/config/defaultsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSParagraphWidget/config/featuresConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSParagraphWidget/config/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSParagraphWidget/config/metaConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSParagraphWidget/config/methodsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSParagraphWidget/config/propertyPaneConfig/contentConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSParagraphWidget/config/propertyPaneConfig/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSParagraphWidget/config/propertyPaneConfig/styleConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSParagraphWidget/config/settersConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSParagraphWidget/constants.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSParagraphWidget/helpers.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSParagraphWidget/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSParagraphWidget/widget/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSParagraphWidget/widget/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPasswordInputWidget/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPasswordInputWidget/widget/index.tsx (84%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPhoneInputWidget/component/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPhoneInputWidget/component/types.ts (73%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPhoneInputWidget/config/anvilConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPhoneInputWidget/config/autocompleteConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPhoneInputWidget/config/defaultsConfig.ts (86%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPhoneInputWidget/config/featuresConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPhoneInputWidget/config/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPhoneInputWidget/config/metaConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPhoneInputWidget/config/methodsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPhoneInputWidget/config/propertyPaneConfig/contentConfig.ts (96%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPhoneInputWidget/config/propertyPaneConfig/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPhoneInputWidget/config/propertyPaneConfig/validations/defaultValueValidation.test.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPhoneInputWidget/config/propertyPaneConfig/validations/defaultValueValidation.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPhoneInputWidget/config/propertyPaneConfig/validations/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPhoneInputWidget/config/settersConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPhoneInputWidget/constants.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPhoneInputWidget/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPhoneInputWidget/widget/helpers.test.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPhoneInputWidget/widget/helpers.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPhoneInputWidget/widget/index.tsx (97%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSPhoneInputWidget/widget/types.ts (72%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSRadioGroupWidget/config/anvilConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSRadioGroupWidget/config/autocompleteConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSRadioGroupWidget/config/defaultsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSRadioGroupWidget/config/featuresConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSRadioGroupWidget/config/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSRadioGroupWidget/config/metaConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSRadioGroupWidget/config/methodsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSRadioGroupWidget/config/propertyPaneConfig/contentConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSRadioGroupWidget/config/propertyPaneConfig/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSRadioGroupWidget/config/propertyPaneConfig/validations/defaultOptionValidation.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSRadioGroupWidget/config/propertyPaneConfig/validations/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSRadioGroupWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSRadioGroupWidget/config/settersConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSRadioGroupWidget/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSRadioGroupWidget/widget/helpers.ts (78%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSRadioGroupWidget/widget/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSRadioGroupWidget/widget/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSectionWidget/config/anvilConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSectionWidget/config/autocompleteConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSectionWidget/config/baseConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSectionWidget/config/defaultConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSectionWidget/config/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSectionWidget/config/methodsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSectionWidget/config/propertyPaneContent.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSectionWidget/config/propertyPaneStyle.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSectionWidget/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSectionWidget/widget/index.tsx (96%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSelectWidget/config/anvilConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSelectWidget/config/autocompleteConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSelectWidget/config/defaultsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSelectWidget/config/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSelectWidget/config/metaConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSelectWidget/config/methodsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSelectWidget/config/propertyPaneConfig/contentConfig.ts (97%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSelectWidget/config/propertyPaneConfig/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSelectWidget/config/propertyPaneConfig/validations/defaultOptionValidation.ts (96%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSelectWidget/config/propertyPaneConfig/validations/index.ts (100%) rename app/client/src/{widgets/wds/WDSComboBoxWidget => modules/ui-builder/ui/wds/WDSSelectWidget}/config/propertyPaneConfig/validations/optionsCustomValidation.ts (98%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSelectWidget/config/settersConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSelectWidget/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSelectWidget/widget/helpers.ts (78%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSelectWidget/widget/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSelectWidget/widget/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSStatsWidget/component/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSStatsWidget/component/styles.module.css (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSStatsWidget/component/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSStatsWidget/config/anvilConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSStatsWidget/config/autocompleteConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSStatsWidget/config/defaultsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSStatsWidget/config/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSStatsWidget/config/metaConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSStatsWidget/config/methodsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSStatsWidget/config/propertyPaneConfig/contentConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSStatsWidget/config/propertyPaneConfig/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSStatsWidget/config/propertyPaneConfig/styleConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSStatsWidget/config/settersConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSStatsWidget/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSStatsWidget/widget/index.tsx (91%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSStatsWidget/widget/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchGroupWidget/config/anvilConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchGroupWidget/config/autocompleteConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchGroupWidget/config/defaultsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchGroupWidget/config/featuresConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchGroupWidget/config/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchGroupWidget/config/metaConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchGroupWidget/config/methodsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/contentConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchGroupWidget/config/settersConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchGroupWidget/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchGroupWidget/widget/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchGroupWidget/widget/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchWidget/config/anvilConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchWidget/config/autocompleteConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchWidget/config/defaultsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchWidget/config/featuresConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchWidget/config/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchWidget/config/metaConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchWidget/config/methodsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchWidget/config/propertyPaneConfig/contentConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchWidget/config/propertyPaneConfig/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchWidget/config/settersConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchWidget/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchWidget/widget/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSSwitchWidget/widget/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/Constants.test.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/Constants.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/StaticTable.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/Table.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/TableBody/Row.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/TableBody/StaticTableBody.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/TableBody/context.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/TableBody/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/TableHeader/PageNumberInput.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/TableHeader/Pagination.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/TableHeader/Search.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/TableHeader/TableColumnHeader.tsx (98%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/TableHeader/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/TableHeader/styles.module.css (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/TableStyledWrappers.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/cellComponents/ButtonCell.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/cellComponents/EmptyCell.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/cellComponents/HeaderCell.tsx (98%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/cellComponents/PlainTextCell.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/cellComponents/URLCell.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/cellComponents/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/component/styles.module.css (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/anvilConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/autocompleteConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/defaultsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/metaConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/methodsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Basic.ts (92%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Color.ts (92%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Data.ts (98%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/DateProperties.ts (90%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/DiscardButtonproperties.ts (97%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Events.ts (96%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/General.ts (94%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/SaveButtonProperties.ts (97%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/TextFormatting.ts (88%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validation.ts (90%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validations/Common.ts (90%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validations/Date.ts (80%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validations/Number.ts (85%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/propertyPaneConfig/contentConfig.ts (98%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/propertyPaneConfig/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/propertyPaneConfig/styleConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/config/settersConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/constants.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/constants/data.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/constants/messages.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/widget/derived.js (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/widget/derived.test.js (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/widget/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/widget/parseDerivedProperties.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/widget/propertyUtils.test.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/widget/propertyUtils.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/widget/reactTableUtils/getColumnsPureFn.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/widget/reactTableUtils/transformDataPureFn.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/widget/utilities.test.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSTableWidget/widget/utilities.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSToolbarButtonsWidget/component/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSToolbarButtonsWidget/component/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSToolbarButtonsWidget/config/anvilConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSToolbarButtonsWidget/config/autocompleteConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSToolbarButtonsWidget/config/defaultsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSToolbarButtonsWidget/config/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSToolbarButtonsWidget/config/metaConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSToolbarButtonsWidget/config/methodsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSToolbarButtonsWidget/config/propertyPaneConfig/contentConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSToolbarButtonsWidget/config/propertyPaneConfig/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSToolbarButtonsWidget/config/propertyPaneConfig/styleConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSToolbarButtonsWidget/config/settersConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSToolbarButtonsWidget/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSToolbarButtonsWidget/widget/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSToolbarButtonsWidget/widget/types.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSZoneWidget/index.tsx (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSZoneWidget/widget/config/anvilConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSZoneWidget/widget/config/autocompleteConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSZoneWidget/widget/config/baseConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSZoneWidget/widget/config/defaultConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSZoneWidget/widget/config/index.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSZoneWidget/widget/config/methodsConfig.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSZoneWidget/widget/config/propertyPaneContent.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSZoneWidget/widget/config/propertyPaneStyle.ts (100%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/WDSZoneWidget/widget/index.tsx (96%) rename app/client/src/{widgets => modules/ui-builder/ui}/wds/constants.ts (97%) diff --git a/app/client/cypress/support/Pages/Anvil/Locators/index.ts b/app/client/cypress/support/Pages/Anvil/Locators/index.ts index 21bf736b713..76f837e73c7 100644 --- a/app/client/cypress/support/Pages/Anvil/Locators/index.ts +++ b/app/client/cypress/support/Pages/Anvil/Locators/index.ts @@ -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/widgets/wds/constants"; +import { AnvilDataAttributes } from "../../../../../src/modules/ui-builder/ui/wds/constants"; // anvil widget based selectors const anvilWidgetSelector = "[data-testid=t--anvil-widget-wrapper]"; diff --git a/app/client/src/WidgetProvider/factory/helpers.ts b/app/client/src/WidgetProvider/factory/helpers.ts index 50cc4166a25..28731d7bc97 100644 --- a/app/client/src/WidgetProvider/factory/helpers.ts +++ b/app/client/src/WidgetProvider/factory/helpers.ts @@ -17,7 +17,7 @@ import { WidgetFeaturePropertyPaneEnhancements, } from "../../utils/WidgetFeatures"; import { generateReactKey } from "utils/generators"; -import { DEFAULT_WIDGET_ON_CANVAS_UI } from "widgets/wds/constants"; +import { DEFAULT_WIDGET_ON_CANVAS_UI } from "modules/ui-builder/ui/wds/constants"; import type { WidgetDefaultProps } from "WidgetProvider/constants"; export enum PropertyPaneConfigTypes { diff --git a/app/client/src/layoutSystems/anvil/common/AnvilFlexComponent.tsx b/app/client/src/layoutSystems/anvil/common/AnvilFlexComponent.tsx index f0d1f37c384..b59ee2bf8b3 100644 --- a/app/client/src/layoutSystems/anvil/common/AnvilFlexComponent.tsx +++ b/app/client/src/layoutSystems/anvil/common/AnvilFlexComponent.tsx @@ -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 "widgets/wds/constants"; +import { AnvilDataAttributes } from "modules/ui-builder/ui/wds/constants"; const anvilWidgetStyleProps: CSSProperties = { position: "relative", diff --git a/app/client/src/layoutSystems/anvil/editor/canvasArenas/hooks/useAnvilDnDListenerStates.ts b/app/client/src/layoutSystems/anvil/editor/canvasArenas/hooks/useAnvilDnDListenerStates.ts index 056c09f07ac..0b08fa248ba 100644 --- a/app/client/src/layoutSystems/anvil/editor/canvasArenas/hooks/useAnvilDnDListenerStates.ts +++ b/app/client/src/layoutSystems/anvil/editor/canvasArenas/hooks/useAnvilDnDListenerStates.ts @@ -15,7 +15,7 @@ import { getWidgetHierarchy } from "layoutSystems/anvil/utils/paste/utils"; import type { AnvilGlobalDnDStates } from "../../canvas/hooks/useAnvilGlobalDnDStates"; import { getWidgets } from "sagas/selectors"; import { useMemo } from "react"; -import { WDSZoneWidget } from "widgets/wds/WDSZoneWidget"; +import { WDSZoneWidget } from "modules/ui-builder/ui/wds/WDSZoneWidget"; import { useAnvilWidgetElevation } from "../../canvas/providers/AnvilWidgetElevationProvider"; interface AnvilDnDListenerStatesProps { diff --git a/app/client/src/layoutSystems/anvil/editor/canvasArenas/hooks/useAnvilWidgetDrop.ts b/app/client/src/layoutSystems/anvil/editor/canvasArenas/hooks/useAnvilWidgetDrop.ts index 8e39600bae3..9e36ffe8836 100644 --- a/app/client/src/layoutSystems/anvil/editor/canvasArenas/hooks/useAnvilWidgetDrop.ts +++ b/app/client/src/layoutSystems/anvil/editor/canvasArenas/hooks/useAnvilWidgetDrop.ts @@ -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 "widgets/wds/constants"; +import { anvilWidgets } from "modules/ui-builder/ui/wds/constants"; export const useAnvilWidgetDrop = ( canvasId: string, diff --git a/app/client/src/layoutSystems/anvil/editor/canvasArenas/utils/utils.ts b/app/client/src/layoutSystems/anvil/editor/canvasArenas/utils/utils.ts index e84c9ff65e1..f5e615b6f60 100644 --- a/app/client/src/layoutSystems/anvil/editor/canvasArenas/utils/utils.ts +++ b/app/client/src/layoutSystems/anvil/editor/canvasArenas/utils/utils.ts @@ -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 "widgets/wds/constants"; +import { anvilWidgets } from "modules/ui-builder/ui/wds/constants"; import { HIGHLIGHT_SIZE } from "layoutSystems/anvil/utils/constants"; import { getWidgetHierarchy } from "layoutSystems/anvil/utils/paste/utils"; diff --git a/app/client/src/layoutSystems/anvil/editor/hooks/useAnvilWidgetStyles.ts b/app/client/src/layoutSystems/anvil/editor/hooks/useAnvilWidgetStyles.ts index 65dd6ecb5eb..80bf9d9e235 100644 --- a/app/client/src/layoutSystems/anvil/editor/hooks/useAnvilWidgetStyles.ts +++ b/app/client/src/layoutSystems/anvil/editor/hooks/useAnvilWidgetStyles.ts @@ -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 "widgets/wds/constants"; +import { AnvilDataAttributes } from "modules/ui-builder/ui/wds/constants"; export const useAnvilWidgetStyles = ( widgetId: string, diff --git a/app/client/src/layoutSystems/anvil/integrations/sagas/anvilDraggingSagas/anvilDraggingSagas.test.ts b/app/client/src/layoutSystems/anvil/integrations/sagas/anvilDraggingSagas/anvilDraggingSagas.test.ts index f99eee1953f..c0db3545bf0 100644 --- a/app/client/src/layoutSystems/anvil/integrations/sagas/anvilDraggingSagas/anvilDraggingSagas.test.ts +++ b/app/client/src/layoutSystems/anvil/integrations/sagas/anvilDraggingSagas/anvilDraggingSagas.test.ts @@ -6,9 +6,9 @@ import { LayoutComponentTypes } from "layoutSystems/anvil/utils/anvilTypes"; import { expectSaga } from "redux-saga-test-plan"; import { getWidgets } from "sagas/selectors"; import { registerWidgets } from "WidgetProvider/factory/registrationHelper"; -import { WDSSectionWidget } from "widgets/wds/WDSSectionWidget"; -import { WDSZoneWidget } from "widgets/wds/WDSZoneWidget"; -import { WDSButtonWidget } from "widgets/wds/WDSButtonWidget"; +import { WDSSectionWidget } from "modules/ui-builder/ui/wds/WDSSectionWidget"; +import { WDSZoneWidget } from "modules/ui-builder/ui/wds/WDSZoneWidget"; +import { WDSButtonWidget } from "modules/ui-builder/ui/wds/WDSButtonWidget"; import { getCanvasWidth, getIsAutoLayoutMobileBreakPoint, @@ -20,7 +20,7 @@ import { registerLayoutComponents } from "layoutSystems/anvil/utils/layouts/layo import { getIsAnvilLayout } from "../../selectors"; import { selectWidgetInitAction } from "actions/widgetSelectionActions"; import { SelectionRequestType } from "sagas/WidgetSelectUtils"; -import { WDSModalWidget } from "widgets/wds/WDSModalWidget"; +import { WDSModalWidget } from "modules/ui-builder/ui/wds/WDSModalWidget"; import { generateMockDataWithTwoSections } from "./mockData.helper"; import type { AnvilMoveWidgetsPayload } from "../../actions/actionTypes"; import { diff --git a/app/client/src/layoutSystems/anvil/integrations/sagas/anvilWidgetAdditionSagas/index.ts b/app/client/src/layoutSystems/anvil/integrations/sagas/anvilWidgetAdditionSagas/index.ts index e57da857c10..c121a458358 100644 --- a/app/client/src/layoutSystems/anvil/integrations/sagas/anvilWidgetAdditionSagas/index.ts +++ b/app/client/src/layoutSystems/anvil/integrations/sagas/anvilWidgetAdditionSagas/index.ts @@ -11,7 +11,7 @@ import { type ReduxAction, } from "ee/constants/ReduxActionConstants"; import type { WidgetProps } from "widgets/BaseWidget"; -import { WDS_V2_WIDGET_MAP } from "widgets/wds/constants"; +import { WDS_V2_WIDGET_MAP } from "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"; diff --git a/app/client/src/layoutSystems/anvil/layoutComponents/components/section/index.tsx b/app/client/src/layoutSystems/anvil/layoutComponents/components/section/index.tsx index d3b9766adfe..4b30af0c6b3 100644 --- a/app/client/src/layoutSystems/anvil/layoutComponents/components/section/index.tsx +++ b/app/client/src/layoutSystems/anvil/layoutComponents/components/section/index.tsx @@ -7,7 +7,7 @@ import { import WidgetRow from "../WidgetRow"; import { SectionRow } from "./SectionRow"; import type { FlexLayoutProps } from "../FlexLayout"; -import { anvilWidgets } from "widgets/wds/constants"; +import { anvilWidgets } from "modules/ui-builder/ui/wds/constants"; import { SectionSpaceDistributor } from "layoutSystems/anvil/sectionSpaceDistributor/SectionSpaceDistributor"; class Section extends WidgetRow { diff --git a/app/client/src/layoutSystems/anvil/utils/anvilChecksUtils.ts b/app/client/src/layoutSystems/anvil/utils/anvilChecksUtils.ts index ebb3284f353..00bb19299d9 100644 --- a/app/client/src/layoutSystems/anvil/utils/anvilChecksUtils.ts +++ b/app/client/src/layoutSystems/anvil/utils/anvilChecksUtils.ts @@ -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 "widgets/wds/constants"; +import { anvilWidgets } from "modules/ui-builder/ui/wds/constants"; import { updateSectionWithDefaultSpaceDistribution, updateSectionsDistributedSpace, diff --git a/app/client/src/layoutSystems/anvil/utils/constants.ts b/app/client/src/layoutSystems/anvil/utils/constants.ts index ca127656209..e00c88b9fd8 100644 --- a/app/client/src/layoutSystems/anvil/utils/constants.ts +++ b/app/client/src/layoutSystems/anvil/utils/constants.ts @@ -1,6 +1,6 @@ import { FlexLayerAlignment } from "layoutSystems/common/utils/constants"; import type { HighlightPayload, HighlightRenderInfo } from "./anvilTypes"; -import { anvilWidgets } from "widgets/wds/constants"; +import { anvilWidgets } from "modules/ui-builder/ui/wds/constants"; export const MOBILE_BREAKPOINT = 480; diff --git a/app/client/src/layoutSystems/anvil/utils/layouts/update/mainCanvasLayoutUtils.ts b/app/client/src/layoutSystems/anvil/utils/layouts/update/mainCanvasLayoutUtils.ts index 73c01e719ae..0b389c9e68f 100644 --- a/app/client/src/layoutSystems/anvil/utils/layouts/update/mainCanvasLayoutUtils.ts +++ b/app/client/src/layoutSystems/anvil/utils/layouts/update/mainCanvasLayoutUtils.ts @@ -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 "widgets/wds/constants"; +import { anvilWidgets } from "modules/ui-builder/ui/wds/constants"; import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants"; import { addNewAnvilWidgetToDSL } from "layoutSystems/anvil/integrations/sagas/anvilWidgetAdditionSagas/helpers"; diff --git a/app/client/src/layoutSystems/anvil/utils/layouts/update/sectionUtils.ts b/app/client/src/layoutSystems/anvil/utils/layouts/update/sectionUtils.ts index 741af57edff..9a4f5df405e 100644 --- a/app/client/src/layoutSystems/anvil/utils/layouts/update/sectionUtils.ts +++ b/app/client/src/layoutSystems/anvil/utils/layouts/update/sectionUtils.ts @@ -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 "widgets/wds/constants"; +import { anvilWidgets } from "modules/ui-builder/ui/wds/constants"; import { addNewAnvilWidgetToDSL } from "layoutSystems/anvil/integrations/sagas/anvilWidgetAdditionSagas/helpers"; export function* createSectionAndAddWidget( diff --git a/app/client/src/layoutSystems/anvil/utils/layouts/update/zoneUtils.ts b/app/client/src/layoutSystems/anvil/utils/layouts/update/zoneUtils.ts index ca50e6bda37..acffc109491 100644 --- a/app/client/src/layoutSystems/anvil/utils/layouts/update/zoneUtils.ts +++ b/app/client/src/layoutSystems/anvil/utils/layouts/update/zoneUtils.ts @@ -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 "widgets/wds/constants"; +import { anvilWidgets } from "modules/ui-builder/ui/wds/constants"; import { moveWidgets, severTiesFromParents, diff --git a/app/client/src/layoutSystems/anvil/utils/paste/sectionPasteUtils.ts b/app/client/src/layoutSystems/anvil/utils/paste/sectionPasteUtils.ts index d6e5098140a..f0b7ee22d6c 100644 --- a/app/client/src/layoutSystems/anvil/utils/paste/sectionPasteUtils.ts +++ b/app/client/src/layoutSystems/anvil/utils/paste/sectionPasteUtils.ts @@ -6,7 +6,7 @@ import type { } from "./types"; import { getDestinedParent } from "./destinationUtils"; import type { FlattenedWidgetProps } from "WidgetProvider/constants"; -import { anvilWidgets } from "widgets/wds/constants"; +import { anvilWidgets } from "modules/ui-builder/ui/wds/constants"; import type { LayoutProps } from "../anvilTypes"; import { all, call } from "redux-saga/effects"; import { addPastedWidgets } from "./utils"; diff --git a/app/client/src/layoutSystems/anvil/utils/sectionOperationUtils.ts b/app/client/src/layoutSystems/anvil/utils/sectionOperationUtils.ts index 7716fafb96a..f7febdf4c76 100644 --- a/app/client/src/layoutSystems/anvil/utils/sectionOperationUtils.ts +++ b/app/client/src/layoutSystems/anvil/utils/sectionOperationUtils.ts @@ -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 "widgets/wds/constants"; +import { anvilWidgets } from "modules/ui-builder/ui/wds/constants"; import { getUpdatedListOfWidgetsAfterAddingNewWidget } from "../integrations/sagas/anvilWidgetAdditionSagas"; /** diff --git a/app/client/src/layoutSystems/withLayoutSystemWidgetHOC.test.tsx b/app/client/src/layoutSystems/withLayoutSystemWidgetHOC.test.tsx index 0d7e7218631..899c47c16cf 100644 --- a/app/client/src/layoutSystems/withLayoutSystemWidgetHOC.test.tsx +++ b/app/client/src/layoutSystems/withLayoutSystemWidgetHOC.test.tsx @@ -3,9 +3,9 @@ import React from "react"; import * as editorSelectors from "selectors/editorSelectors"; import { WidgetTypeFactories } from "test/factories/Widgets/WidgetTypeFactories"; import { render } from "test/testUtils"; -import InputWidget from "widgets/InputWidgetV2/widget"; +import InputWidget from "widgets/InputWidgetV2"; import { ModalWidget } from "widgets/ModalWidget/widget"; -import { WDSModalWidget } from "widgets/wds/WDSModalWidget/widget"; +import { WDSModalWidget } from "modules/ui-builder/ui/wds//WDSModalWidget/widget"; import { withLayoutSystemWidgetHOC } from "./withLayoutSystemWidgetHOC"; import { LayoutSystemTypes } from "./types"; import * as layoutSystemSelectors from "selectors/layoutSystemSelectors"; diff --git a/app/client/src/widgets/wds/Container.tsx b/app/client/src/modules/ui-builder/ui/wds/Container.tsx similarity index 100% rename from app/client/src/widgets/wds/Container.tsx rename to app/client/src/modules/ui-builder/ui/wds/Container.tsx diff --git a/app/client/src/widgets/wds/WDSBaseInputWidget/__tests__/helpers.test.ts b/app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/__tests__/helpers.test.ts similarity index 100% rename from app/client/src/widgets/wds/WDSBaseInputWidget/__tests__/helpers.test.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/__tests__/helpers.test.ts diff --git a/app/client/src/widgets/wds/WDSBaseInputWidget/component/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/component/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSBaseInputWidget/component/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/component/types.ts diff --git a/app/client/src/widgets/wds/WDSBaseInputWidget/config/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/config/contentConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSBaseInputWidget/config/contentConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/config/contentConfig.ts diff --git a/app/client/src/widgets/wds/WDSBaseInputWidget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/config/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSBaseInputWidget/config/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/config/index.ts diff --git a/app/client/src/widgets/wds/WDSBaseInputWidget/constants.ts b/app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/constants.ts similarity index 100% rename from app/client/src/widgets/wds/WDSBaseInputWidget/constants.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/constants.ts diff --git a/app/client/src/widgets/wds/WDSBaseInputWidget/helpers.ts b/app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/helpers.ts similarity index 100% rename from app/client/src/widgets/wds/WDSBaseInputWidget/helpers.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/helpers.ts diff --git a/app/client/src/widgets/wds/WDSBaseInputWidget/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSBaseInputWidget/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/index.ts diff --git a/app/client/src/widgets/wds/WDSBaseInputWidget/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSBaseInputWidget/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/types.ts diff --git a/app/client/src/widgets/wds/WDSBaseInputWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/widget/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSBaseInputWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/widget/index.tsx diff --git a/app/client/src/widgets/wds/WDSBaseInputWidget/widget/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/widget/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSBaseInputWidget/widget/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSBaseInputWidget/widget/types.ts diff --git a/app/client/src/widgets/wds/WDSButtonWidget/component/Container.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/component/Container.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSButtonWidget/component/Container.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/component/Container.tsx diff --git a/app/client/src/widgets/wds/WDSButtonWidget/component/RecaptchaV2.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/component/RecaptchaV2.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSButtonWidget/component/RecaptchaV2.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/component/RecaptchaV2.tsx diff --git a/app/client/src/widgets/wds/WDSButtonWidget/component/RecaptchaV3.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/component/RecaptchaV3.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSButtonWidget/component/RecaptchaV3.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/component/RecaptchaV3.tsx diff --git a/app/client/src/widgets/wds/WDSButtonWidget/component/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/component/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSButtonWidget/component/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/component/index.tsx diff --git a/app/client/src/widgets/wds/WDSButtonWidget/component/useRecaptcha.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/component/useRecaptcha.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSButtonWidget/component/useRecaptcha.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/component/useRecaptcha.tsx diff --git a/app/client/src/widgets/wds/WDSButtonWidget/config/anvilConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/config/anvilConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSButtonWidget/config/anvilConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/config/anvilConfig.ts diff --git a/app/client/src/widgets/wds/WDSButtonWidget/config/autocompleteConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/config/autocompleteConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSButtonWidget/config/autocompleteConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/config/autocompleteConfig.ts diff --git a/app/client/src/widgets/wds/WDSButtonWidget/config/defaultsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/config/defaultsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSButtonWidget/config/defaultsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/config/defaultsConfig.ts diff --git a/app/client/src/widgets/wds/WDSButtonWidget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/config/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSButtonWidget/config/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/config/index.ts diff --git a/app/client/src/widgets/wds/WDSButtonWidget/config/metaConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/config/metaConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSButtonWidget/config/metaConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/config/metaConfig.ts diff --git a/app/client/src/widgets/wds/WDSButtonWidget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/config/methodsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSButtonWidget/config/methodsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/config/methodsConfig.ts diff --git a/app/client/src/widgets/wds/WDSButtonWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/config/propertyPaneConfig/contentConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSButtonWidget/config/propertyPaneConfig/contentConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/config/propertyPaneConfig/contentConfig.ts diff --git a/app/client/src/widgets/wds/WDSButtonWidget/config/propertyPaneConfig/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/config/propertyPaneConfig/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSButtonWidget/config/propertyPaneConfig/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/config/propertyPaneConfig/index.ts diff --git a/app/client/src/widgets/wds/WDSButtonWidget/config/propertyPaneConfig/styleConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/config/propertyPaneConfig/styleConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSButtonWidget/config/propertyPaneConfig/styleConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/config/propertyPaneConfig/styleConfig.ts diff --git a/app/client/src/widgets/wds/WDSButtonWidget/config/settersConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/config/settersConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSButtonWidget/config/settersConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/config/settersConfig.ts diff --git a/app/client/src/widgets/wds/WDSButtonWidget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSButtonWidget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/index.tsx diff --git a/app/client/src/widgets/wds/WDSButtonWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/widget/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSButtonWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/widget/index.tsx diff --git a/app/client/src/widgets/wds/WDSButtonWidget/widget/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/widget/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSButtonWidget/widget/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSButtonWidget/widget/types.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/anvilConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/anvilConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/anvilConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/anvilConfig.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/autocompleteConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/autocompleteConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/autocompleteConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/autocompleteConfig.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/defaultsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/defaultsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/defaultsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/defaultsConfig.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/featuresConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/featuresConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/featuresConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/featuresConfig.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/index.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/metaConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/metaConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/metaConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/metaConfig.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/methodsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/methodsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/methodsConfig.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/contentConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/contentConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/contentConfig.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/index.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/validations/defaultSelectedValuesValidation.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/validations/defaultSelectedValuesValidation.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/validations/defaultSelectedValuesValidation.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/validations/defaultSelectedValuesValidation.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/validations/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/validations/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/validations/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/propertyPaneConfig/validations/index.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/settersConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/settersConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxGroupWidget/config/settersConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/config/settersConfig.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxGroupWidget/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/index.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/widget/helpers.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/widget/helpers.ts similarity index 79% rename from app/client/src/widgets/wds/WDSCheckboxGroupWidget/widget/helpers.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/widget/helpers.ts index 8437834c4e7..aa0f5fee748 100644 --- a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/widget/helpers.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/widget/helpers.ts @@ -1,4 +1,4 @@ -import type { Validation } from "widgets/wds/WDSInputWidget/widget/types"; +import type { Validation } from "modules/ui-builder/ui/wds/WDSInputWidget/widget/types"; import type { CheckboxGroupWidgetProps } from "./types"; diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/widget/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxGroupWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/widget/index.tsx diff --git a/app/client/src/widgets/wds/WDSCheckboxGroupWidget/widget/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/widget/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxGroupWidget/widget/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxGroupWidget/widget/types.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/config/anvilConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/config/anvilConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxWidget/config/anvilConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/config/anvilConfig.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/config/autocompleteConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/config/autocompleteConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxWidget/config/autocompleteConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/config/autocompleteConfig.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/config/defaultsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/config/defaultsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxWidget/config/defaultsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/config/defaultsConfig.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/config/featuresConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/config/featuresConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxWidget/config/featuresConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/config/featuresConfig.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/config/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxWidget/config/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/config/index.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/config/metaConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/config/metaConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxWidget/config/metaConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/config/metaConfig.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/config/methodsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxWidget/config/methodsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/config/methodsConfig.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/config/propertyPaneConfig/contentConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxWidget/config/propertyPaneConfig/contentConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/config/propertyPaneConfig/contentConfig.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/config/propertyPaneConfig/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/config/propertyPaneConfig/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxWidget/config/propertyPaneConfig/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/config/propertyPaneConfig/index.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/config/settersConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/config/settersConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxWidget/config/settersConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/config/settersConfig.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxWidget/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/index.ts diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/widget/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/widget/index.tsx diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/widget/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/widget/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCheckboxWidget/widget/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCheckboxWidget/widget/types.ts diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/anvilConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/anvilConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSComboBoxWidget/config/anvilConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/anvilConfig.ts diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/autocompleteConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/autocompleteConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSComboBoxWidget/config/autocompleteConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/autocompleteConfig.ts diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/defaultsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/defaultsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSComboBoxWidget/config/defaultsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/defaultsConfig.ts diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSComboBoxWidget/config/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/index.ts diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/metaConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/metaConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSComboBoxWidget/config/metaConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/metaConfig.ts diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/methodsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSComboBoxWidget/config/methodsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/methodsConfig.ts diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.test.ts b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.test.ts similarity index 94% rename from app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.test.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.test.ts index d53d00b39e5..2825bdf1270 100644 --- a/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.test.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.test.ts @@ -1,4 +1,4 @@ -import type { WidgetProps } from "../../../../BaseWidget"; +import type { WidgetProps } from "widgets/BaseWidget"; import { handleWidgetTypeUpdate } from "./contentConfig"; describe("handleWidgetTypeUpdate", () => { diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.ts similarity index 97% rename from app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.ts index 9e41483d389..48eb11ad003 100644 --- a/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.ts @@ -1,8 +1,8 @@ import { ValidationTypes } from "constants/WidgetValidation"; import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory"; import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType"; -import type { PropertyUpdates } from "../../../../../WidgetProvider/constants"; -import type { WidgetProps } from "../../../../BaseWidget"; +import type { PropertyUpdates } from "WidgetProvider/constants"; +import type { WidgetProps } from "widgets/BaseWidget"; import type { WDSComboBoxWidgetProps } from "../../widget/types"; import { optionsCustomValidation } from "./validations"; diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/propertyPaneConfig/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/propertyPaneConfig/index.ts diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/validations/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/propertyPaneConfig/validations/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/validations/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/propertyPaneConfig/validations/index.ts diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts similarity index 98% rename from app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts index 356d2155a85..331cf8dae83 100644 --- a/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts @@ -1,6 +1,6 @@ import type { ValidationResponse } from "constants/WidgetValidation"; import type { LoDashStatic } from "lodash"; -import type { WidgetProps } from "../../../../../BaseWidget"; +import type { WidgetProps } from "widgets/BaseWidget"; interface ValidationErrorMessage { name: string; diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/settersConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/settersConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSComboBoxWidget/config/settersConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/settersConfig.ts diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSComboBoxWidget/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/index.ts diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/widget/helpers.ts b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/widget/helpers.ts similarity index 78% rename from app/client/src/widgets/wds/WDSComboBoxWidget/widget/helpers.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/widget/helpers.ts index b50216697ad..175b9665e5d 100644 --- a/app/client/src/widgets/wds/WDSComboBoxWidget/widget/helpers.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/widget/helpers.ts @@ -1,4 +1,4 @@ -import type { Validation } from "widgets/wds/WDSInputWidget/widget/types"; +import type { Validation } from "modules/ui-builder/ui/wds/WDSInputWidget/widget/types"; import type { WDSComboBoxWidgetProps } from "./types"; export function validateInput(props: WDSComboBoxWidgetProps): Validation { diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/widget/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSComboBoxWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/widget/index.tsx diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/widget/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/widget/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSComboBoxWidget/widget/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/widget/types.ts diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/component/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/component/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/component/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/component/index.tsx diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/component/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/component/types.ts similarity index 79% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/component/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/component/types.ts index 4ce49a6e856..283223c9c71 100644 --- a/app/client/src/widgets/wds/WDSCurrencyInputWidget/component/types.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/component/types.ts @@ -1,5 +1,5 @@ import type { CurrencyTypeOptions } from "constants/Currency"; -import type { BaseInputComponentProps } from "widgets/wds/WDSBaseInputWidget"; +import type { BaseInputComponentProps } from "modules/ui-builder/ui/wds/WDSBaseInputWidget"; export interface CurrencyInputComponentProps extends BaseInputComponentProps { currencyCode?: string; diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/component/utilities.test.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/component/utilities.test.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/component/utilities.test.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/component/utilities.test.ts diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/component/utilities.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/component/utilities.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/component/utilities.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/component/utilities.ts diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/config/anvilConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/anvilConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/config/anvilConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/anvilConfig.ts diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/config/autocompleteConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/autocompleteConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/config/autocompleteConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/autocompleteConfig.ts diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/config/defaultsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/defaultsConfig.ts similarity index 86% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/config/defaultsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/defaultsConfig.ts index bb423d8bc9d..1efd682612b 100644 --- a/app/client/src/widgets/wds/WDSCurrencyInputWidget/config/defaultsConfig.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/defaultsConfig.ts @@ -1,4 +1,4 @@ -import { WDSBaseInputWidget } from "widgets/wds/WDSBaseInputWidget"; +import { WDSBaseInputWidget } from "modules/ui-builder/ui/wds/WDSBaseInputWidget"; import { ResponsiveBehavior } from "layoutSystems/common/utils/constants"; import type { WidgetDefaultProps } from "WidgetProvider/constants"; diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/config/featuresConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/featuresConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/config/featuresConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/featuresConfig.ts diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/config/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/index.ts diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/config/metaConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/metaConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/config/metaConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/metaConfig.ts diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/methodsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/config/methodsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/methodsConfig.ts diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/contentConfig.ts similarity index 96% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/contentConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/contentConfig.ts index 4df85db375a..da27a0d53b8 100644 --- a/app/client/src/widgets/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/contentConfig.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/contentConfig.ts @@ -1,7 +1,7 @@ import { CurrencyTypeOptions } from "constants/Currency"; import { ValidationTypes } from "constants/WidgetValidation"; import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType"; -import { propertyPaneContentConfig as WdsInputWidgetPropertyPaneContentConfig } from "widgets/wds/WDSInputWidget/config/propertyPaneConfig/contentConfig"; +import { propertyPaneContentConfig as WdsInputWidgetPropertyPaneContentConfig } from "modules/ui-builder/ui/wds/WDSInputWidget/config/propertyPaneConfig/contentConfig"; import * as validations from "./validations"; import { countryToFlag } from "../../widget/helpers"; diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/index.ts diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/validations/defaultValueValidation.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/validations/defaultValueValidation.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/validations/defaultValueValidation.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/validations/defaultValueValidation.ts diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/validations/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/validations/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/validations/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/propertyPaneConfig/validations/index.ts diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/config/settersConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/settersConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/config/settersConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/config/settersConfig.ts diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/constants.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/constants.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/constants.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/constants.ts diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/index.ts diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/derived.js b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/widget/derived.js similarity index 100% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/derived.js rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/widget/derived.js diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/derived.test.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/widget/derived.test.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/derived.test.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/widget/derived.test.ts diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/helpers.test.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/widget/helpers.test.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/helpers.test.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/widget/helpers.test.ts diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/helpers.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/widget/helpers.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/helpers.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/widget/helpers.ts diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/index.test.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/widget/index.test.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/index.test.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/widget/index.test.tsx diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/widget/index.tsx similarity index 98% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/widget/index.tsx index 1e16db14cf9..f9087571fc1 100644 --- a/app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/index.tsx +++ b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/widget/index.tsx @@ -27,9 +27,9 @@ import type { } from "WidgetProvider/constants"; import * as config from "../config"; import type { CurrencyInputWidgetProps } from "./types"; -import { WDSBaseInputWidget } from "widgets/wds/WDSBaseInputWidget"; +import { WDSBaseInputWidget } from "modules/ui-builder/ui/wds/WDSBaseInputWidget"; import { getCountryCodeFromCurrencyCode, validateInput } from "./helpers"; -import type { KeyDownEvent } from "widgets/wds/WDSBaseInputWidget/component/types"; +import type { KeyDownEvent } from "modules/ui-builder/ui/wds/WDSBaseInputWidget/component/types"; class WDSCurrencyInputWidget extends WDSBaseInputWidget< CurrencyInputWidgetProps, diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/parsedDerivedProperties.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/widget/parsedDerivedProperties.ts similarity index 100% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/parsedDerivedProperties.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/widget/parsedDerivedProperties.ts diff --git a/app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/widget/types.ts similarity index 78% rename from app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/widget/types.ts index fa307c6099b..7a18144f1b4 100644 --- a/app/client/src/widgets/wds/WDSCurrencyInputWidget/widget/types.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSCurrencyInputWidget/widget/types.ts @@ -1,5 +1,5 @@ import type { CurrencyTypeOptions } from "constants/Currency"; -import type { BaseInputWidgetProps } from "widgets/wds/WDSBaseInputWidget"; +import type { BaseInputWidgetProps } from "modules/ui-builder/ui/wds/WDSBaseInputWidget"; export interface CurrencyInputWidgetProps extends BaseInputWidgetProps { countryCode?: string; diff --git a/app/client/src/widgets/wds/WDSEmailInputWidget/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSEmailInputWidget/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSEmailInputWidget/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSEmailInputWidget/index.ts diff --git a/app/client/src/widgets/wds/WDSEmailInputWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSEmailInputWidget/widget/index.tsx similarity index 84% rename from app/client/src/widgets/wds/WDSEmailInputWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSEmailInputWidget/widget/index.tsx index 721bb9e0e6e..f2c8d6380cb 100644 --- a/app/client/src/widgets/wds/WDSEmailInputWidget/widget/index.tsx +++ b/app/client/src/modules/ui-builder/ui/wds/WDSEmailInputWidget/widget/index.tsx @@ -1,7 +1,7 @@ -import { WDSInputWidget } from "widgets/wds/WDSInputWidget"; +import { WDSInputWidget } from "modules/ui-builder/ui/wds/WDSInputWidget"; import { EmailInputIcon, EmailInputThumbnail } from "appsmith-icons"; import { WIDGET_TAGS } from "constants/WidgetConstants"; -import { INPUT_TYPES } from "widgets/wds/WDSBaseInputWidget"; +import { INPUT_TYPES } from "modules/ui-builder/ui/wds/WDSBaseInputWidget"; import type { WidgetBaseConfiguration } from "WidgetProvider/constants"; class WDSEmailInputWidget extends WDSInputWidget { diff --git a/app/client/src/widgets/wds/WDSHeadingWidget/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSHeadingWidget/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSHeadingWidget/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSHeadingWidget/index.ts diff --git a/app/client/src/widgets/wds/WDSHeadingWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSHeadingWidget/widget/index.tsx similarity index 95% rename from app/client/src/widgets/wds/WDSHeadingWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSHeadingWidget/widget/index.tsx index c044eedc467..0a6e0dbef3f 100644 --- a/app/client/src/widgets/wds/WDSHeadingWidget/widget/index.tsx +++ b/app/client/src/modules/ui-builder/ui/wds/WDSHeadingWidget/widget/index.tsx @@ -1,6 +1,6 @@ import { WIDGET_TAGS } from "constants/WidgetConstants"; import { ValidationTypes } from "constants/WidgetValidation"; -import { WDSParagraphWidget } from "widgets/wds/WDSParagraphWidget"; +import { WDSParagraphWidget } from "modules/ui-builder/ui/wds/WDSParagraphWidget"; import { HeadingIcon, HeadingThumbnail } from "appsmith-icons"; import { klonaRegularWithTelemetry } from "utils/helpers"; diff --git a/app/client/src/widgets/wds/WDSIconButtonWidget/component/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/component/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSIconButtonWidget/component/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/component/index.tsx diff --git a/app/client/src/widgets/wds/WDSIconButtonWidget/component/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/component/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSIconButtonWidget/component/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/component/types.ts diff --git a/app/client/src/widgets/wds/WDSIconButtonWidget/config/anvilConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/config/anvilConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSIconButtonWidget/config/anvilConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/config/anvilConfig.ts diff --git a/app/client/src/widgets/wds/WDSIconButtonWidget/config/autocompleteConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/config/autocompleteConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSIconButtonWidget/config/autocompleteConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/config/autocompleteConfig.ts diff --git a/app/client/src/widgets/wds/WDSIconButtonWidget/config/defaultsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/config/defaultsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSIconButtonWidget/config/defaultsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/config/defaultsConfig.ts diff --git a/app/client/src/widgets/wds/WDSIconButtonWidget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/config/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSIconButtonWidget/config/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/config/index.ts diff --git a/app/client/src/widgets/wds/WDSIconButtonWidget/config/metaConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/config/metaConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSIconButtonWidget/config/metaConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/config/metaConfig.ts diff --git a/app/client/src/widgets/wds/WDSIconButtonWidget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/config/methodsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSIconButtonWidget/config/methodsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/config/methodsConfig.ts diff --git a/app/client/src/widgets/wds/WDSIconButtonWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/config/propertyPaneConfig/contentConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSIconButtonWidget/config/propertyPaneConfig/contentConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/config/propertyPaneConfig/contentConfig.ts diff --git a/app/client/src/widgets/wds/WDSIconButtonWidget/config/propertyPaneConfig/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/config/propertyPaneConfig/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSIconButtonWidget/config/propertyPaneConfig/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/config/propertyPaneConfig/index.ts diff --git a/app/client/src/widgets/wds/WDSIconButtonWidget/config/propertyPaneConfig/styleConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/config/propertyPaneConfig/styleConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSIconButtonWidget/config/propertyPaneConfig/styleConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/config/propertyPaneConfig/styleConfig.ts diff --git a/app/client/src/widgets/wds/WDSIconButtonWidget/config/settersConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/config/settersConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSIconButtonWidget/config/settersConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/config/settersConfig.ts diff --git a/app/client/src/widgets/wds/WDSIconButtonWidget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSIconButtonWidget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/index.tsx diff --git a/app/client/src/widgets/wds/WDSIconButtonWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/widget/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSIconButtonWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/widget/index.tsx diff --git a/app/client/src/widgets/wds/WDSIconButtonWidget/widget/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/widget/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSIconButtonWidget/widget/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSIconButtonWidget/widget/types.ts diff --git a/app/client/src/widgets/wds/WDSInlineButtonsWidget/component/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/component/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSInlineButtonsWidget/component/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/component/index.tsx diff --git a/app/client/src/widgets/wds/WDSInlineButtonsWidget/component/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/component/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInlineButtonsWidget/component/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/component/types.ts diff --git a/app/client/src/widgets/wds/WDSInlineButtonsWidget/config/anvilConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/config/anvilConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInlineButtonsWidget/config/anvilConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/config/anvilConfig.ts diff --git a/app/client/src/widgets/wds/WDSInlineButtonsWidget/config/autocompleteConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/config/autocompleteConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInlineButtonsWidget/config/autocompleteConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/config/autocompleteConfig.ts diff --git a/app/client/src/widgets/wds/WDSInlineButtonsWidget/config/defaultsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/config/defaultsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInlineButtonsWidget/config/defaultsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/config/defaultsConfig.ts diff --git a/app/client/src/widgets/wds/WDSInlineButtonsWidget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/config/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInlineButtonsWidget/config/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/config/index.ts diff --git a/app/client/src/widgets/wds/WDSInlineButtonsWidget/config/metaConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/config/metaConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInlineButtonsWidget/config/metaConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/config/metaConfig.ts diff --git a/app/client/src/widgets/wds/WDSInlineButtonsWidget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/config/methodsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInlineButtonsWidget/config/methodsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/config/methodsConfig.ts diff --git a/app/client/src/widgets/wds/WDSInlineButtonsWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/config/propertyPaneConfig/contentConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInlineButtonsWidget/config/propertyPaneConfig/contentConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/config/propertyPaneConfig/contentConfig.ts diff --git a/app/client/src/widgets/wds/WDSInlineButtonsWidget/config/propertyPaneConfig/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/config/propertyPaneConfig/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInlineButtonsWidget/config/propertyPaneConfig/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/config/propertyPaneConfig/index.ts diff --git a/app/client/src/widgets/wds/WDSInlineButtonsWidget/config/settersConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/config/settersConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInlineButtonsWidget/config/settersConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/config/settersConfig.ts diff --git a/app/client/src/widgets/wds/WDSInlineButtonsWidget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSInlineButtonsWidget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/index.tsx diff --git a/app/client/src/widgets/wds/WDSInlineButtonsWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/widget/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSInlineButtonsWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/widget/index.tsx diff --git a/app/client/src/widgets/wds/WDSInlineButtonsWidget/widget/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/widget/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInlineButtonsWidget/widget/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInlineButtonsWidget/widget/types.ts diff --git a/app/client/src/widgets/wds/WDSInputWidget/component/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/component/index.tsx similarity index 97% rename from app/client/src/widgets/wds/WDSInputWidget/component/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/component/index.tsx index 2f01a175e88..0f91268297b 100644 --- a/app/client/src/widgets/wds/WDSInputWidget/component/index.tsx +++ b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/component/index.tsx @@ -3,7 +3,7 @@ import { isNil } from "lodash"; import { TextInput } from "@appsmith/wds"; import { Icon, TextArea } from "@appsmith/wds"; import { useDebouncedValue } from "@mantine/hooks"; -import { INPUT_TYPES } from "widgets/wds/WDSBaseInputWidget"; +import { INPUT_TYPES } from "modules/ui-builder/ui/wds/WDSBaseInputWidget"; import type { InputComponentProps } from "./types"; diff --git a/app/client/src/widgets/wds/WDSInputWidget/component/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/component/types.ts similarity index 84% rename from app/client/src/widgets/wds/WDSInputWidget/component/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/component/types.ts index 6a254d53fa0..4b37c20b948 100644 --- a/app/client/src/widgets/wds/WDSInputWidget/component/types.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/component/types.ts @@ -1,5 +1,5 @@ import type { IconProps } from "@appsmith/wds"; -import type { InputType } from "widgets/wds/WDSBaseInputWidget/types"; +import type { InputType } from "modules/ui-builder/ui/wds/WDSBaseInputWidget/types"; import type { BaseInputComponentProps } from "../../WDSBaseInputWidget"; diff --git a/app/client/src/widgets/wds/WDSInputWidget/config/anvilConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/anvilConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInputWidget/config/anvilConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/anvilConfig.ts diff --git a/app/client/src/widgets/wds/WDSInputWidget/config/autocompleteConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/autocompleteConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInputWidget/config/autocompleteConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/autocompleteConfig.ts diff --git a/app/client/src/widgets/wds/WDSInputWidget/config/defaultsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/defaultsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInputWidget/config/defaultsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/defaultsConfig.ts diff --git a/app/client/src/widgets/wds/WDSInputWidget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInputWidget/config/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/index.ts diff --git a/app/client/src/widgets/wds/WDSInputWidget/config/metaConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/metaConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInputWidget/config/metaConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/metaConfig.ts diff --git a/app/client/src/widgets/wds/WDSInputWidget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/methodsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInputWidget/config/methodsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/methodsConfig.ts diff --git a/app/client/src/widgets/wds/WDSInputWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/propertyPaneConfig/contentConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInputWidget/config/propertyPaneConfig/contentConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/propertyPaneConfig/contentConfig.ts diff --git a/app/client/src/widgets/wds/WDSInputWidget/config/propertyPaneConfig/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/propertyPaneConfig/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInputWidget/config/propertyPaneConfig/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/propertyPaneConfig/index.ts diff --git a/app/client/src/widgets/wds/WDSInputWidget/config/propertyPaneConfig/styleConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/propertyPaneConfig/styleConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInputWidget/config/propertyPaneConfig/styleConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/propertyPaneConfig/styleConfig.ts diff --git a/app/client/src/widgets/wds/WDSInputWidget/config/propertyPaneConfig/validations/defaultValueValidation.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/propertyPaneConfig/validations/defaultValueValidation.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInputWidget/config/propertyPaneConfig/validations/defaultValueValidation.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/propertyPaneConfig/validations/defaultValueValidation.ts diff --git a/app/client/src/widgets/wds/WDSInputWidget/config/propertyPaneConfig/validations/index.test.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/propertyPaneConfig/validations/index.test.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInputWidget/config/propertyPaneConfig/validations/index.test.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/propertyPaneConfig/validations/index.test.ts diff --git a/app/client/src/widgets/wds/WDSInputWidget/config/propertyPaneConfig/validations/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/propertyPaneConfig/validations/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInputWidget/config/propertyPaneConfig/validations/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/propertyPaneConfig/validations/index.ts diff --git a/app/client/src/widgets/wds/WDSInputWidget/config/propertyPaneConfig/validations/maxValueValidation.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/propertyPaneConfig/validations/maxValueValidation.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInputWidget/config/propertyPaneConfig/validations/maxValueValidation.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/propertyPaneConfig/validations/maxValueValidation.ts diff --git a/app/client/src/widgets/wds/WDSInputWidget/config/propertyPaneConfig/validations/minValueValidation.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/propertyPaneConfig/validations/minValueValidation.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInputWidget/config/propertyPaneConfig/validations/minValueValidation.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/propertyPaneConfig/validations/minValueValidation.ts diff --git a/app/client/src/widgets/wds/WDSInputWidget/config/settersConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/settersConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInputWidget/config/settersConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/config/settersConfig.ts diff --git a/app/client/src/widgets/wds/WDSInputWidget/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInputWidget/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/index.ts diff --git a/app/client/src/widgets/wds/WDSInputWidget/widget/derived.js b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/widget/derived.js similarity index 100% rename from app/client/src/widgets/wds/WDSInputWidget/widget/derived.js rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/widget/derived.js diff --git a/app/client/src/widgets/wds/WDSInputWidget/widget/derived.test.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/widget/derived.test.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInputWidget/widget/derived.test.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/widget/derived.test.ts diff --git a/app/client/src/widgets/wds/WDSInputWidget/widget/helper.test.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/widget/helper.test.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInputWidget/widget/helper.test.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/widget/helper.test.ts diff --git a/app/client/src/widgets/wds/WDSInputWidget/widget/helper.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/widget/helper.ts similarity index 93% rename from app/client/src/widgets/wds/WDSInputWidget/widget/helper.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/widget/helper.ts index 8bf1f2c2fe8..6d4e6cd3b3a 100644 --- a/app/client/src/widgets/wds/WDSInputWidget/widget/helper.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/widget/helper.ts @@ -8,17 +8,17 @@ import { INPUT_INVALID_TYPE_ERROR, INPUT_TEXT_MAX_CHAR_ERROR, } from "ee/constants/messages"; -import type { InputType } from "widgets/wds/WDSBaseInputWidget"; +import type { InputType } from "modules/ui-builder/ui/wds/WDSBaseInputWidget"; import type { WidgetProps } from "widgets/BaseWidget"; import type { InputWidgetProps, Validation } from "./types"; import { INPUT_TYPE_TO_WIDGET_TYPE_MAP, INPUT_TYPES, -} from "widgets/wds/WDSBaseInputWidget"; +} from "modules/ui-builder/ui/wds/WDSBaseInputWidget"; import type { PropertyUpdates } from "WidgetProvider/constants"; -import { getDefaultISDCode } from "widgets/wds/WDSPhoneInputWidget/constants"; -import { getDefaultCurrency } from "widgets/wds/WDSCurrencyInputWidget/constants"; +import { getDefaultISDCode } from "modules/ui-builder/ui/wds/WDSPhoneInputWidget/constants"; +import { getDefaultCurrency } from "modules/ui-builder/ui/wds/WDSCurrencyInputWidget/constants"; /** * parses text to number if inputType is number diff --git a/app/client/src/widgets/wds/WDSInputWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/widget/index.tsx similarity index 97% rename from app/client/src/widgets/wds/WDSInputWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/widget/index.tsx index 557c5ade3d5..5eec9a47efe 100644 --- a/app/client/src/widgets/wds/WDSInputWidget/widget/index.tsx +++ b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/widget/index.tsx @@ -11,9 +11,9 @@ import derivedProperties from "./parsedDerivedProperties"; import { WDSBaseInputWidget } from "../../WDSBaseInputWidget"; import type { DerivedPropertiesMap } from "WidgetProvider/factory"; import { EventType } from "constants/AppsmithActionConstants/ActionConstants"; -import type { KeyDownEvent } from "widgets/wds/WDSBaseInputWidget/component/types"; +import type { KeyDownEvent } from "modules/ui-builder/ui/wds/WDSBaseInputWidget/component/types"; import type { WidgetBaseConfiguration } from "WidgetProvider/constants"; -import { INPUT_TYPES } from "widgets/wds/WDSBaseInputWidget/constants"; +import { INPUT_TYPES } from "modules/ui-builder/ui/wds/WDSBaseInputWidget/constants"; class WDSInputWidget extends WDSBaseInputWidget { static type = "WDS_INPUT_WIDGET"; diff --git a/app/client/src/widgets/wds/WDSInputWidget/widget/parsedDerivedProperties.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/widget/parsedDerivedProperties.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInputWidget/widget/parsedDerivedProperties.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/widget/parsedDerivedProperties.ts diff --git a/app/client/src/widgets/wds/WDSInputWidget/widget/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/widget/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSInputWidget/widget/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSInputWidget/widget/types.ts diff --git a/app/client/src/widgets/wds/WDSKeyValueWidget/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSKeyValueWidget/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSKeyValueWidget/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSKeyValueWidget/index.ts diff --git a/app/client/src/widgets/wds/WDSKeyValueWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSKeyValueWidget/widget/index.tsx similarity index 91% rename from app/client/src/widgets/wds/WDSKeyValueWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSKeyValueWidget/widget/index.tsx index 492a94305d1..ddaf0dc7539 100644 --- a/app/client/src/widgets/wds/WDSKeyValueWidget/widget/index.tsx +++ b/app/client/src/modules/ui-builder/ui/wds/WDSKeyValueWidget/widget/index.tsx @@ -1,5 +1,5 @@ import { WIDGET_TAGS } from "constants/WidgetConstants"; -import { WDSInputWidget } from "widgets/wds/WDSInputWidget"; +import { WDSInputWidget } from "modules/ui-builder/ui/wds/WDSInputWidget"; import { KeyValueIcon, KeyValueThumbnail } from "appsmith-icons"; import type { WidgetBaseConfiguration } from "WidgetProvider/constants"; diff --git a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/autocompleteConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/autocompleteConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSMenuButtonWidget/config/autocompleteConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/autocompleteConfig.ts diff --git a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/defaultsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/defaultsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSMenuButtonWidget/config/defaultsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/defaultsConfig.ts diff --git a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/helper.ts b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/helper.ts similarity index 100% rename from app/client/src/widgets/wds/WDSMenuButtonWidget/config/helper.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/helper.ts diff --git a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSMenuButtonWidget/config/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/index.ts diff --git a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/metaConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/metaConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSMenuButtonWidget/config/metaConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/metaConfig.ts diff --git a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/methodsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSMenuButtonWidget/config/methodsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/methodsConfig.ts diff --git a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/childPanels/configureMenuItemsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/childPanels/configureMenuItemsConfig.ts similarity index 98% rename from app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/childPanels/configureMenuItemsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/childPanels/configureMenuItemsConfig.ts index 0e6686dfd5c..51a0ea072e7 100644 --- a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/childPanels/configureMenuItemsConfig.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/childPanels/configureMenuItemsConfig.ts @@ -1,6 +1,6 @@ import { ValidationTypes } from "constants/WidgetValidation"; import { getKeysFromSourceDataForEventAutocomplete } from "../../helper"; -import type { MenuButtonWidgetProps } from "widgets/wds/WDSMenuButtonWidget/widget/types"; +import type { MenuButtonWidgetProps } from "modules/ui-builder/ui/wds/WDSMenuButtonWidget/widget/types"; /** * This is for the configuration of menu items when diff --git a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/childPanels/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/childPanels/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/childPanels/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/childPanels/index.ts diff --git a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/childPanels/menuItemsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/childPanels/menuItemsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/childPanels/menuItemsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/childPanels/menuItemsConfig.ts diff --git a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/contentConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/contentConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/contentConfig.ts diff --git a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/index.ts diff --git a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/styleConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/styleConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/styleConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/styleConfig.ts diff --git a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/validations/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/validations/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/validations/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/validations/index.ts diff --git a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/validations/sourceDataArrayValidation.ts b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/validations/sourceDataArrayValidation.ts similarity index 91% rename from app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/validations/sourceDataArrayValidation.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/validations/sourceDataArrayValidation.ts index 1973e9f1ddb..875e77267b8 100644 --- a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/propertyPaneConfig/validations/sourceDataArrayValidation.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/propertyPaneConfig/validations/sourceDataArrayValidation.ts @@ -1,5 +1,5 @@ import type { ValidationResponse } from "constants/WidgetValidation"; -import type { MenuButtonWidgetProps } from "widgets/wds/WDSMenuButtonWidget/widget/types"; +import type { MenuButtonWidgetProps } from "modules/ui-builder/ui/wds/WDSMenuButtonWidget/widget/types"; /** * Checks if the source data array diff --git a/app/client/src/widgets/wds/WDSMenuButtonWidget/config/settersConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/settersConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSMenuButtonWidget/config/settersConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/config/settersConfig.ts diff --git a/app/client/src/widgets/wds/WDSMenuButtonWidget/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSMenuButtonWidget/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/index.ts diff --git a/app/client/src/widgets/wds/WDSMenuButtonWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/widget/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSMenuButtonWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/widget/index.tsx diff --git a/app/client/src/widgets/wds/WDSMenuButtonWidget/widget/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/widget/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSMenuButtonWidget/widget/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSMenuButtonWidget/widget/types.ts diff --git a/app/client/src/widgets/wds/WDSModalWidget/config/anvilConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/config/anvilConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSModalWidget/config/anvilConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/config/anvilConfig.ts diff --git a/app/client/src/widgets/wds/WDSModalWidget/config/defaultsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/config/defaultsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSModalWidget/config/defaultsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/config/defaultsConfig.ts diff --git a/app/client/src/widgets/wds/WDSModalWidget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/config/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSModalWidget/config/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/config/index.ts diff --git a/app/client/src/widgets/wds/WDSModalWidget/config/metaConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/config/metaConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSModalWidget/config/metaConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/config/metaConfig.ts diff --git a/app/client/src/widgets/wds/WDSModalWidget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/config/methodsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSModalWidget/config/methodsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/config/methodsConfig.ts diff --git a/app/client/src/widgets/wds/WDSModalWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/config/propertyPaneConfig/contentConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSModalWidget/config/propertyPaneConfig/contentConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/config/propertyPaneConfig/contentConfig.ts diff --git a/app/client/src/widgets/wds/WDSModalWidget/config/propertyPaneConfig/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/config/propertyPaneConfig/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSModalWidget/config/propertyPaneConfig/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/config/propertyPaneConfig/index.ts diff --git a/app/client/src/widgets/wds/WDSModalWidget/config/propertyPaneConfig/styleConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/config/propertyPaneConfig/styleConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSModalWidget/config/propertyPaneConfig/styleConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/config/propertyPaneConfig/styleConfig.ts diff --git a/app/client/src/widgets/wds/WDSModalWidget/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSModalWidget/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/index.ts diff --git a/app/client/src/widgets/wds/WDSModalWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/widget/index.tsx similarity index 97% rename from app/client/src/widgets/wds/WDSModalWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/widget/index.tsx index 39eb3399454..7af7d3e668c 100644 --- a/app/client/src/widgets/wds/WDSModalWidget/widget/index.tsx +++ b/app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/widget/index.tsx @@ -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 "widgets/wds/constants"; +import { WDS_MODAL_WIDGET_CLASSNAME } from "modules/ui-builder/ui/wds/constants"; import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer"; import type { CopiedWidgetData, @@ -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 "widgets/wds/constants"; +import { AnvilDataAttributes } from "modules/ui-builder/ui/wds/constants"; class WDSModalWidget extends BaseWidget { static type = "WDS_MODAL_WIDGET"; diff --git a/app/client/src/widgets/wds/WDSModalWidget/widget/styles.module.css b/app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/widget/styles.module.css similarity index 100% rename from app/client/src/widgets/wds/WDSModalWidget/widget/styles.module.css rename to app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/widget/styles.module.css diff --git a/app/client/src/widgets/wds/WDSModalWidget/widget/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/widget/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSModalWidget/widget/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSModalWidget/widget/types.ts diff --git a/app/client/src/widgets/wds/WDSMultilineInputWidget/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSMultilineInputWidget/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSMultilineInputWidget/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSMultilineInputWidget/index.ts diff --git a/app/client/src/widgets/wds/WDSMultilineInputWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSMultilineInputWidget/widget/index.tsx similarity index 84% rename from app/client/src/widgets/wds/WDSMultilineInputWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSMultilineInputWidget/widget/index.tsx index 413950312c4..1859e07df50 100644 --- a/app/client/src/widgets/wds/WDSMultilineInputWidget/widget/index.tsx +++ b/app/client/src/modules/ui-builder/ui/wds/WDSMultilineInputWidget/widget/index.tsx @@ -1,7 +1,7 @@ import { WIDGET_TAGS } from "constants/WidgetConstants"; -import { WDSInputWidget } from "widgets/wds/WDSInputWidget"; +import { WDSInputWidget } from "modules/ui-builder/ui/wds/WDSInputWidget"; import type { WidgetBaseConfiguration } from "WidgetProvider/constants"; -import { INPUT_TYPES } from "widgets/wds/WDSBaseInputWidget/constants"; +import { INPUT_TYPES } from "modules/ui-builder/ui/wds/WDSBaseInputWidget/constants"; import { MultilineInputIcon, MultilineInputThumbnail } from "appsmith-icons"; class WDSMultilineInputWidget extends WDSInputWidget { diff --git a/app/client/src/widgets/wds/WDSNumberInputWidget/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSNumberInputWidget/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSNumberInputWidget/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSNumberInputWidget/index.ts diff --git a/app/client/src/widgets/wds/WDSNumberInputWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSNumberInputWidget/widget/index.tsx similarity index 83% rename from app/client/src/widgets/wds/WDSNumberInputWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSNumberInputWidget/widget/index.tsx index 0f67165c9c9..7dac924d42a 100644 --- a/app/client/src/widgets/wds/WDSNumberInputWidget/widget/index.tsx +++ b/app/client/src/modules/ui-builder/ui/wds/WDSNumberInputWidget/widget/index.tsx @@ -1,8 +1,8 @@ import { WIDGET_TAGS } from "constants/WidgetConstants"; -import { WDSInputWidget } from "widgets/wds/WDSInputWidget"; +import { WDSInputWidget } from "modules/ui-builder/ui/wds/WDSInputWidget"; import { NumberInputIcon, NumberInputThumbnail } from "appsmith-icons"; import type { WidgetBaseConfiguration } from "WidgetProvider/constants"; -import { INPUT_TYPES } from "widgets/wds/WDSBaseInputWidget/constants"; +import { INPUT_TYPES } from "modules/ui-builder/ui/wds/WDSBaseInputWidget/constants"; class WDSNumberInputWidget extends WDSInputWidget { static type = "WDS_NUMBER_INPUT_WIDGET"; diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/__tests__/helpers.test.ts b/app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/__tests__/helpers.test.ts similarity index 100% rename from app/client/src/widgets/wds/WDSParagraphWidget/__tests__/helpers.test.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/__tests__/helpers.test.ts diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/config/anvilConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/config/anvilConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSParagraphWidget/config/anvilConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/config/anvilConfig.ts diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/config/autocompleteConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/config/autocompleteConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSParagraphWidget/config/autocompleteConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/config/autocompleteConfig.ts diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/config/defaultsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/config/defaultsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSParagraphWidget/config/defaultsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/config/defaultsConfig.ts diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/config/featuresConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/config/featuresConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSParagraphWidget/config/featuresConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/config/featuresConfig.ts diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/config/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSParagraphWidget/config/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/config/index.ts diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/config/metaConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/config/metaConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSParagraphWidget/config/metaConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/config/metaConfig.ts diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/config/methodsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSParagraphWidget/config/methodsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/config/methodsConfig.ts diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/config/propertyPaneConfig/contentConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSParagraphWidget/config/propertyPaneConfig/contentConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/config/propertyPaneConfig/contentConfig.ts diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/config/propertyPaneConfig/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/config/propertyPaneConfig/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSParagraphWidget/config/propertyPaneConfig/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/config/propertyPaneConfig/index.ts diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/config/propertyPaneConfig/styleConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/config/propertyPaneConfig/styleConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSParagraphWidget/config/propertyPaneConfig/styleConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/config/propertyPaneConfig/styleConfig.ts diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/config/settersConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/config/settersConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSParagraphWidget/config/settersConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/config/settersConfig.ts diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/constants.ts b/app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/constants.ts similarity index 100% rename from app/client/src/widgets/wds/WDSParagraphWidget/constants.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/constants.ts diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/helpers.ts b/app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/helpers.ts similarity index 100% rename from app/client/src/widgets/wds/WDSParagraphWidget/helpers.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/helpers.ts diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSParagraphWidget/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/index.ts diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/widget/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSParagraphWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/widget/index.tsx diff --git a/app/client/src/widgets/wds/WDSParagraphWidget/widget/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/widget/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSParagraphWidget/widget/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSParagraphWidget/widget/types.ts diff --git a/app/client/src/widgets/wds/WDSPasswordInputWidget/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSPasswordInputWidget/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSPasswordInputWidget/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSPasswordInputWidget/index.ts diff --git a/app/client/src/widgets/wds/WDSPasswordInputWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSPasswordInputWidget/widget/index.tsx similarity index 84% rename from app/client/src/widgets/wds/WDSPasswordInputWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSPasswordInputWidget/widget/index.tsx index a47776ab386..0c0e588dfbb 100644 --- a/app/client/src/widgets/wds/WDSPasswordInputWidget/widget/index.tsx +++ b/app/client/src/modules/ui-builder/ui/wds/WDSPasswordInputWidget/widget/index.tsx @@ -1,6 +1,6 @@ import { WIDGET_TAGS } from "constants/WidgetConstants"; -import { WDSInputWidget } from "widgets/wds/WDSInputWidget"; -import { INPUT_TYPES } from "widgets/wds/WDSBaseInputWidget/constants"; +import { WDSInputWidget } from "modules/ui-builder/ui/wds/WDSInputWidget"; +import { INPUT_TYPES } from "modules/ui-builder/ui/wds/WDSBaseInputWidget/constants"; import type { WidgetBaseConfiguration } from "WidgetProvider/constants"; import { PasswordInputIcon, PasswordInputThumbnail } from "appsmith-icons"; diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/component/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/component/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSPhoneInputWidget/component/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/component/index.tsx diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/component/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/component/types.ts similarity index 73% rename from app/client/src/widgets/wds/WDSPhoneInputWidget/component/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/component/types.ts index 77dc230cd11..dd9a9db896f 100644 --- a/app/client/src/widgets/wds/WDSPhoneInputWidget/component/types.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/component/types.ts @@ -1,5 +1,5 @@ import type { CountryCode } from "libphonenumber-js"; -import type { BaseInputComponentProps } from "widgets/wds/WDSBaseInputWidget"; +import type { BaseInputComponentProps } from "modules/ui-builder/ui/wds/WDSBaseInputWidget"; export interface PhoneInputComponentProps extends BaseInputComponentProps { dialCode?: string; diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/config/anvilConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/anvilConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSPhoneInputWidget/config/anvilConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/anvilConfig.ts diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/config/autocompleteConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/autocompleteConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSPhoneInputWidget/config/autocompleteConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/autocompleteConfig.ts diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/config/defaultsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/defaultsConfig.ts similarity index 86% rename from app/client/src/widgets/wds/WDSPhoneInputWidget/config/defaultsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/defaultsConfig.ts index ce46e464562..1d85047574a 100644 --- a/app/client/src/widgets/wds/WDSPhoneInputWidget/config/defaultsConfig.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/defaultsConfig.ts @@ -1,4 +1,4 @@ -import { WDSBaseInputWidget } from "widgets/wds/WDSBaseInputWidget"; +import { WDSBaseInputWidget } from "modules/ui-builder/ui/wds/WDSBaseInputWidget"; import { ResponsiveBehavior } from "layoutSystems/common/utils/constants"; import type { WidgetDefaultProps } from "WidgetProvider/constants"; diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/config/featuresConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/featuresConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSPhoneInputWidget/config/featuresConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/featuresConfig.ts diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSPhoneInputWidget/config/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/index.ts diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/config/metaConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/metaConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSPhoneInputWidget/config/metaConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/metaConfig.ts diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/methodsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSPhoneInputWidget/config/methodsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/methodsConfig.ts diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/propertyPaneConfig/contentConfig.ts similarity index 96% rename from app/client/src/widgets/wds/WDSPhoneInputWidget/config/propertyPaneConfig/contentConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/propertyPaneConfig/contentConfig.ts index 12446c69935..e8284dc2da7 100644 --- a/app/client/src/widgets/wds/WDSPhoneInputWidget/config/propertyPaneConfig/contentConfig.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/propertyPaneConfig/contentConfig.ts @@ -2,7 +2,7 @@ import { ISDCodeOptions } from "constants/ISDCodes_v2"; import type { ISDCodeProps } from "constants/ISDCodes_v2"; import { ValidationTypes } from "constants/WidgetValidation"; import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType"; -import { propertyPaneContentConfig as WdsInputWidgetPropertyPaneContentConfig } from "widgets/wds/WDSInputWidget/config/propertyPaneConfig/contentConfig"; +import { propertyPaneContentConfig as WdsInputWidgetPropertyPaneContentConfig } from "modules/ui-builder/ui/wds/WDSInputWidget/config/propertyPaneConfig/contentConfig"; import { countryToFlag } from "../../widget/helpers"; import { defaultValueValidation } from "./validations"; diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/config/propertyPaneConfig/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/propertyPaneConfig/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSPhoneInputWidget/config/propertyPaneConfig/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/propertyPaneConfig/index.ts diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/config/propertyPaneConfig/validations/defaultValueValidation.test.ts b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/propertyPaneConfig/validations/defaultValueValidation.test.ts similarity index 100% rename from app/client/src/widgets/wds/WDSPhoneInputWidget/config/propertyPaneConfig/validations/defaultValueValidation.test.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/propertyPaneConfig/validations/defaultValueValidation.test.ts diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/config/propertyPaneConfig/validations/defaultValueValidation.ts b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/propertyPaneConfig/validations/defaultValueValidation.ts similarity index 100% rename from app/client/src/widgets/wds/WDSPhoneInputWidget/config/propertyPaneConfig/validations/defaultValueValidation.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/propertyPaneConfig/validations/defaultValueValidation.ts diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/config/propertyPaneConfig/validations/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/propertyPaneConfig/validations/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSPhoneInputWidget/config/propertyPaneConfig/validations/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/propertyPaneConfig/validations/index.ts diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/config/settersConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/settersConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSPhoneInputWidget/config/settersConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/config/settersConfig.ts diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/constants.ts b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/constants.ts similarity index 100% rename from app/client/src/widgets/wds/WDSPhoneInputWidget/constants.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/constants.ts diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSPhoneInputWidget/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/index.ts diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/widget/helpers.test.ts b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/widget/helpers.test.ts similarity index 100% rename from app/client/src/widgets/wds/WDSPhoneInputWidget/widget/helpers.test.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/widget/helpers.test.ts diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/widget/helpers.ts b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/widget/helpers.ts similarity index 100% rename from app/client/src/widgets/wds/WDSPhoneInputWidget/widget/helpers.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/widget/helpers.ts diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/widget/index.tsx similarity index 97% rename from app/client/src/widgets/wds/WDSPhoneInputWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/widget/index.tsx index 09b1ad53dd8..dc39829aee0 100644 --- a/app/client/src/widgets/wds/WDSPhoneInputWidget/widget/index.tsx +++ b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/widget/index.tsx @@ -11,11 +11,11 @@ import type { AnvilConfig, AutocompletionDefinitions, } from "WidgetProvider/constants"; -import { WDSBaseInputWidget } from "widgets/wds/WDSBaseInputWidget"; +import { WDSBaseInputWidget } from "modules/ui-builder/ui/wds/WDSBaseInputWidget"; import { AsYouType, parseIncompletePhoneNumber } from "libphonenumber-js"; import { EventType } from "constants/AppsmithActionConstants/ActionConstants"; -import type { KeyDownEvent } from "widgets/wds/WDSBaseInputWidget/component/types"; -import derivedProperties from "widgets/wds/WDSCurrencyInputWidget/widget/parsedDerivedProperties"; +import type { KeyDownEvent } from "modules/ui-builder/ui/wds/WDSBaseInputWidget/component/types"; +import derivedProperties from "modules/ui-builder/ui/wds/WDSCurrencyInputWidget/widget/parsedDerivedProperties"; import * as config from "../config"; import { PhoneInputComponent } from "../component"; diff --git a/app/client/src/widgets/wds/WDSPhoneInputWidget/widget/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/widget/types.ts similarity index 72% rename from app/client/src/widgets/wds/WDSPhoneInputWidget/widget/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/widget/types.ts index cae023b078e..8f3fef1991c 100644 --- a/app/client/src/widgets/wds/WDSPhoneInputWidget/widget/types.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSPhoneInputWidget/widget/types.ts @@ -1,5 +1,5 @@ import type { CountryCode } from "libphonenumber-js"; -import type { BaseInputWidgetProps } from "widgets/wds/WDSBaseInputWidget"; +import type { BaseInputWidgetProps } from "modules/ui-builder/ui/wds/WDSBaseInputWidget"; export interface PhoneInputWidgetProps extends BaseInputWidgetProps { dialCode?: string; diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/config/anvilConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/anvilConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSRadioGroupWidget/config/anvilConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/anvilConfig.ts diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/config/autocompleteConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/autocompleteConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSRadioGroupWidget/config/autocompleteConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/autocompleteConfig.ts diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/config/defaultsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/defaultsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSRadioGroupWidget/config/defaultsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/defaultsConfig.ts diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/config/featuresConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/featuresConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSRadioGroupWidget/config/featuresConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/featuresConfig.ts diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSRadioGroupWidget/config/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/index.ts diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/config/metaConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/metaConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSRadioGroupWidget/config/metaConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/metaConfig.ts diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/methodsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSRadioGroupWidget/config/methodsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/methodsConfig.ts diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/propertyPaneConfig/contentConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSRadioGroupWidget/config/propertyPaneConfig/contentConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/propertyPaneConfig/contentConfig.ts diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/config/propertyPaneConfig/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/propertyPaneConfig/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSRadioGroupWidget/config/propertyPaneConfig/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/propertyPaneConfig/index.ts diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/config/propertyPaneConfig/validations/defaultOptionValidation.ts b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/propertyPaneConfig/validations/defaultOptionValidation.ts similarity index 100% rename from app/client/src/widgets/wds/WDSRadioGroupWidget/config/propertyPaneConfig/validations/defaultOptionValidation.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/propertyPaneConfig/validations/defaultOptionValidation.ts diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/config/propertyPaneConfig/validations/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/propertyPaneConfig/validations/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSRadioGroupWidget/config/propertyPaneConfig/validations/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/propertyPaneConfig/validations/index.ts diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts similarity index 100% rename from app/client/src/widgets/wds/WDSRadioGroupWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/config/settersConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/settersConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSRadioGroupWidget/config/settersConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/config/settersConfig.ts diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSRadioGroupWidget/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/index.ts diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/helpers.ts b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/widget/helpers.ts similarity index 78% rename from app/client/src/widgets/wds/WDSRadioGroupWidget/widget/helpers.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/widget/helpers.ts index 2144de3055f..d5e01dec022 100644 --- a/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/helpers.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/widget/helpers.ts @@ -1,4 +1,4 @@ -import type { Validation } from "widgets/wds/WDSInputWidget/widget/types"; +import type { Validation } from "modules/ui-builder/ui/wds/WDSInputWidget/widget/types"; import type { RadioGroupWidgetProps } from "./types"; export function validateInput(props: RadioGroupWidgetProps): Validation { diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/widget/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSRadioGroupWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/widget/index.tsx diff --git a/app/client/src/widgets/wds/WDSRadioGroupWidget/widget/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/widget/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSRadioGroupWidget/widget/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSRadioGroupWidget/widget/types.ts diff --git a/app/client/src/widgets/wds/WDSSectionWidget/config/anvilConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSectionWidget/config/anvilConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSectionWidget/config/anvilConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSectionWidget/config/anvilConfig.ts diff --git a/app/client/src/widgets/wds/WDSSectionWidget/config/autocompleteConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSectionWidget/config/autocompleteConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSectionWidget/config/autocompleteConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSectionWidget/config/autocompleteConfig.ts diff --git a/app/client/src/widgets/wds/WDSSectionWidget/config/baseConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSectionWidget/config/baseConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSectionWidget/config/baseConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSectionWidget/config/baseConfig.ts diff --git a/app/client/src/widgets/wds/WDSSectionWidget/config/defaultConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSectionWidget/config/defaultConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSectionWidget/config/defaultConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSectionWidget/config/defaultConfig.ts diff --git a/app/client/src/widgets/wds/WDSSectionWidget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSectionWidget/config/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSectionWidget/config/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSectionWidget/config/index.ts diff --git a/app/client/src/widgets/wds/WDSSectionWidget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSectionWidget/config/methodsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSectionWidget/config/methodsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSectionWidget/config/methodsConfig.ts diff --git a/app/client/src/widgets/wds/WDSSectionWidget/config/propertyPaneContent.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSectionWidget/config/propertyPaneContent.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSectionWidget/config/propertyPaneContent.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSectionWidget/config/propertyPaneContent.ts diff --git a/app/client/src/widgets/wds/WDSSectionWidget/config/propertyPaneStyle.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSectionWidget/config/propertyPaneStyle.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSectionWidget/config/propertyPaneStyle.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSectionWidget/config/propertyPaneStyle.ts diff --git a/app/client/src/widgets/wds/WDSSectionWidget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSSectionWidget/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSSectionWidget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSSectionWidget/index.tsx diff --git a/app/client/src/widgets/wds/WDSSectionWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSSectionWidget/widget/index.tsx similarity index 96% rename from app/client/src/widgets/wds/WDSSectionWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSSectionWidget/widget/index.tsx index 318c96c9d6b..0597440d9f4 100644 --- a/app/client/src/widgets/wds/WDSSectionWidget/widget/index.tsx +++ b/app/client/src/modules/ui-builder/ui/wds/WDSSectionWidget/widget/index.tsx @@ -23,9 +23,9 @@ import type { LayoutProps } from "layoutSystems/anvil/utils/anvilTypes"; import BaseWidget from "widgets/BaseWidget"; import type { ReactNode } from "react"; import React from "react"; -import { ContainerComponent } from "widgets/wds/Container"; +import { ContainerComponent } from "modules/ui-builder/ui/wds/Container"; import { LayoutProvider } from "layoutSystems/anvil/layoutComponents/LayoutProvider"; -import { Elevations, anvilWidgets } from "widgets/wds/constants"; +import { Elevations, anvilWidgets } from "modules/ui-builder/ui/wds/constants"; import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer"; import type { CopiedWidgetData, diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/anvilConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/anvilConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSelectWidget/config/anvilConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/anvilConfig.ts diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/autocompleteConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/autocompleteConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSelectWidget/config/autocompleteConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/autocompleteConfig.ts diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/defaultsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/defaultsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSelectWidget/config/defaultsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/defaultsConfig.ts diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSelectWidget/config/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/index.ts diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/metaConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/metaConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSelectWidget/config/metaConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/metaConfig.ts diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/methodsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSelectWidget/config/methodsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/methodsConfig.ts diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/propertyPaneConfig/contentConfig.ts similarity index 97% rename from app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/contentConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/propertyPaneConfig/contentConfig.ts index 9466f1c8a93..a31fbc12e0b 100644 --- a/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/contentConfig.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/propertyPaneConfig/contentConfig.ts @@ -6,8 +6,8 @@ import { defaultOptionValidation, optionsCustomValidation, } from "./validations"; -import type { WidgetProps } from "../../../../BaseWidget"; -import type { PropertyUpdates } from "../../../../../WidgetProvider/constants"; +import type { WidgetProps } from "widgets/BaseWidget"; +import type { PropertyUpdates } from "WidgetProvider/constants"; type WidgetTypeValue = "SELECT" | "COMBOBOX"; diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/propertyPaneConfig/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/propertyPaneConfig/index.ts diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/validations/defaultOptionValidation.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/propertyPaneConfig/validations/defaultOptionValidation.ts similarity index 96% rename from app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/validations/defaultOptionValidation.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/propertyPaneConfig/validations/defaultOptionValidation.ts index 463f49d9cc4..f5bf114adf5 100644 --- a/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/validations/defaultOptionValidation.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/propertyPaneConfig/validations/defaultOptionValidation.ts @@ -1,6 +1,6 @@ import type { ValidationResponse } from "constants/WidgetValidation"; import type { LoDashStatic } from "lodash"; -import type { WidgetProps } from "../../../../../BaseWidget"; +import type { WidgetProps } from "widgets/BaseWidget"; interface ValidationErrorMessage { name: string; diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/validations/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/propertyPaneConfig/validations/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSelectWidget/config/propertyPaneConfig/validations/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/propertyPaneConfig/validations/index.ts diff --git a/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts similarity index 98% rename from app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts index 356d2155a85..331cf8dae83 100644 --- a/app/client/src/widgets/wds/WDSComboBoxWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/propertyPaneConfig/validations/optionsCustomValidation.ts @@ -1,6 +1,6 @@ import type { ValidationResponse } from "constants/WidgetValidation"; import type { LoDashStatic } from "lodash"; -import type { WidgetProps } from "../../../../../BaseWidget"; +import type { WidgetProps } from "widgets/BaseWidget"; interface ValidationErrorMessage { name: string; diff --git a/app/client/src/widgets/wds/WDSSelectWidget/config/settersConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/settersConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSelectWidget/config/settersConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/config/settersConfig.ts diff --git a/app/client/src/widgets/wds/WDSSelectWidget/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSelectWidget/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/index.ts diff --git a/app/client/src/widgets/wds/WDSSelectWidget/widget/helpers.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/widget/helpers.ts similarity index 78% rename from app/client/src/widgets/wds/WDSSelectWidget/widget/helpers.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/widget/helpers.ts index 29a690d2845..c98beb7f15e 100644 --- a/app/client/src/widgets/wds/WDSSelectWidget/widget/helpers.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/widget/helpers.ts @@ -1,4 +1,4 @@ -import type { Validation } from "widgets/wds/WDSInputWidget/widget/types"; +import type { Validation } from "modules/ui-builder/ui/wds/WDSInputWidget/widget/types"; import type { WDSSelectWidgetProps } from "./types"; export function validateInput(props: WDSSelectWidgetProps): Validation { diff --git a/app/client/src/widgets/wds/WDSSelectWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/widget/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSSelectWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/widget/index.tsx diff --git a/app/client/src/widgets/wds/WDSSelectWidget/widget/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/widget/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSelectWidget/widget/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSelectWidget/widget/types.ts diff --git a/app/client/src/widgets/wds/WDSStatsWidget/component/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/component/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSStatsWidget/component/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/component/index.tsx diff --git a/app/client/src/widgets/wds/WDSStatsWidget/component/styles.module.css b/app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/component/styles.module.css similarity index 100% rename from app/client/src/widgets/wds/WDSStatsWidget/component/styles.module.css rename to app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/component/styles.module.css diff --git a/app/client/src/widgets/wds/WDSStatsWidget/component/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/component/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSStatsWidget/component/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/component/types.ts diff --git a/app/client/src/widgets/wds/WDSStatsWidget/config/anvilConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/config/anvilConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSStatsWidget/config/anvilConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/config/anvilConfig.ts diff --git a/app/client/src/widgets/wds/WDSStatsWidget/config/autocompleteConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/config/autocompleteConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSStatsWidget/config/autocompleteConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/config/autocompleteConfig.ts diff --git a/app/client/src/widgets/wds/WDSStatsWidget/config/defaultsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/config/defaultsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSStatsWidget/config/defaultsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/config/defaultsConfig.ts diff --git a/app/client/src/widgets/wds/WDSStatsWidget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/config/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSStatsWidget/config/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/config/index.ts diff --git a/app/client/src/widgets/wds/WDSStatsWidget/config/metaConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/config/metaConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSStatsWidget/config/metaConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/config/metaConfig.ts diff --git a/app/client/src/widgets/wds/WDSStatsWidget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/config/methodsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSStatsWidget/config/methodsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/config/methodsConfig.ts diff --git a/app/client/src/widgets/wds/WDSStatsWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/config/propertyPaneConfig/contentConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSStatsWidget/config/propertyPaneConfig/contentConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/config/propertyPaneConfig/contentConfig.ts diff --git a/app/client/src/widgets/wds/WDSStatsWidget/config/propertyPaneConfig/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/config/propertyPaneConfig/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSStatsWidget/config/propertyPaneConfig/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/config/propertyPaneConfig/index.ts diff --git a/app/client/src/widgets/wds/WDSStatsWidget/config/propertyPaneConfig/styleConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/config/propertyPaneConfig/styleConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSStatsWidget/config/propertyPaneConfig/styleConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/config/propertyPaneConfig/styleConfig.ts diff --git a/app/client/src/widgets/wds/WDSStatsWidget/config/settersConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/config/settersConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSStatsWidget/config/settersConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/config/settersConfig.ts diff --git a/app/client/src/widgets/wds/WDSStatsWidget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSStatsWidget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/index.tsx diff --git a/app/client/src/widgets/wds/WDSStatsWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/widget/index.tsx similarity index 91% rename from app/client/src/widgets/wds/WDSStatsWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/widget/index.tsx index 413c51ced05..dbc79ec87e8 100644 --- a/app/client/src/widgets/wds/WDSStatsWidget/widget/index.tsx +++ b/app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/widget/index.tsx @@ -7,8 +7,8 @@ import * as config from "../config"; import { StatsComponent } from "../component"; import type { StatsWidgetProps } from "./types"; import type { AnvilConfig } from "WidgetProvider/constants"; -import { Elevations } from "widgets/wds/constants"; -import { ContainerComponent } from "widgets/wds/Container"; +import { Elevations } from "modules/ui-builder/ui/wds/constants"; +import { ContainerComponent } from "modules/ui-builder/ui/wds/Container"; class WDSStatsWidget extends BaseWidget { constructor(props: StatsWidgetProps) { diff --git a/app/client/src/widgets/wds/WDSStatsWidget/widget/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/widget/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSStatsWidget/widget/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSStatsWidget/widget/types.ts diff --git a/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/anvilConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/anvilConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchGroupWidget/config/anvilConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/anvilConfig.ts diff --git a/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/autocompleteConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/autocompleteConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchGroupWidget/config/autocompleteConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/autocompleteConfig.ts diff --git a/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/defaultsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/defaultsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchGroupWidget/config/defaultsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/defaultsConfig.ts diff --git a/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/featuresConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/featuresConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchGroupWidget/config/featuresConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/featuresConfig.ts diff --git a/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchGroupWidget/config/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/index.ts diff --git a/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/metaConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/metaConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchGroupWidget/config/metaConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/metaConfig.ts diff --git a/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/methodsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchGroupWidget/config/methodsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/methodsConfig.ts diff --git a/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/contentConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/contentConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/contentConfig.ts diff --git a/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/propertyPaneConfig/index.ts diff --git a/app/client/src/widgets/wds/WDSSwitchGroupWidget/config/settersConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/settersConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchGroupWidget/config/settersConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/config/settersConfig.ts diff --git a/app/client/src/widgets/wds/WDSSwitchGroupWidget/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchGroupWidget/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/index.ts diff --git a/app/client/src/widgets/wds/WDSSwitchGroupWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/widget/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchGroupWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/widget/index.tsx diff --git a/app/client/src/widgets/wds/WDSSwitchGroupWidget/widget/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/widget/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchGroupWidget/widget/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchGroupWidget/widget/types.ts diff --git a/app/client/src/widgets/wds/WDSSwitchWidget/config/anvilConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/config/anvilConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchWidget/config/anvilConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/config/anvilConfig.ts diff --git a/app/client/src/widgets/wds/WDSSwitchWidget/config/autocompleteConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/config/autocompleteConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchWidget/config/autocompleteConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/config/autocompleteConfig.ts diff --git a/app/client/src/widgets/wds/WDSSwitchWidget/config/defaultsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/config/defaultsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchWidget/config/defaultsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/config/defaultsConfig.ts diff --git a/app/client/src/widgets/wds/WDSSwitchWidget/config/featuresConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/config/featuresConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchWidget/config/featuresConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/config/featuresConfig.ts diff --git a/app/client/src/widgets/wds/WDSSwitchWidget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/config/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchWidget/config/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/config/index.ts diff --git a/app/client/src/widgets/wds/WDSSwitchWidget/config/metaConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/config/metaConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchWidget/config/metaConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/config/metaConfig.ts diff --git a/app/client/src/widgets/wds/WDSSwitchWidget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/config/methodsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchWidget/config/methodsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/config/methodsConfig.ts diff --git a/app/client/src/widgets/wds/WDSSwitchWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/config/propertyPaneConfig/contentConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchWidget/config/propertyPaneConfig/contentConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/config/propertyPaneConfig/contentConfig.ts diff --git a/app/client/src/widgets/wds/WDSSwitchWidget/config/propertyPaneConfig/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/config/propertyPaneConfig/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchWidget/config/propertyPaneConfig/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/config/propertyPaneConfig/index.ts diff --git a/app/client/src/widgets/wds/WDSSwitchWidget/config/settersConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/config/settersConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchWidget/config/settersConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/config/settersConfig.ts diff --git a/app/client/src/widgets/wds/WDSSwitchWidget/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchWidget/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/index.ts diff --git a/app/client/src/widgets/wds/WDSSwitchWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/widget/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/widget/index.tsx diff --git a/app/client/src/widgets/wds/WDSSwitchWidget/widget/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/widget/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSSwitchWidget/widget/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSSwitchWidget/widget/types.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/Constants.test.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/Constants.test.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/component/Constants.test.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/Constants.test.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/Constants.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/Constants.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/component/Constants.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/Constants.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/StaticTable.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/StaticTable.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/component/StaticTable.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/StaticTable.tsx diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/Table.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/Table.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/component/Table.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/Table.tsx diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/TableBody/Row.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableBody/Row.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/component/TableBody/Row.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableBody/Row.tsx diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/TableBody/StaticTableBody.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableBody/StaticTableBody.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/component/TableBody/StaticTableBody.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableBody/StaticTableBody.tsx diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/TableBody/context.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableBody/context.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/component/TableBody/context.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableBody/context.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/TableBody/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableBody/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/component/TableBody/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableBody/index.tsx diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/TableHeader/PageNumberInput.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableHeader/PageNumberInput.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/component/TableHeader/PageNumberInput.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableHeader/PageNumberInput.tsx diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/TableHeader/Pagination.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableHeader/Pagination.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/component/TableHeader/Pagination.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableHeader/Pagination.tsx diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/TableHeader/Search.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableHeader/Search.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/component/TableHeader/Search.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableHeader/Search.tsx diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/TableHeader/TableColumnHeader.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableHeader/TableColumnHeader.tsx similarity index 98% rename from app/client/src/widgets/wds/WDSTableWidget/component/TableHeader/TableColumnHeader.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableHeader/TableColumnHeader.tsx index cd9d1776a7d..95e284d03b3 100644 --- a/app/client/src/widgets/wds/WDSTableWidget/component/TableHeader/TableColumnHeader.tsx +++ b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableHeader/TableColumnHeader.tsx @@ -1,6 +1,6 @@ import { Checkbox } from "@appsmith/wds"; import React, { memo } from "react"; -import { getDragHandlers } from "widgets/wds/WDSTableWidget/widget/utilities"; +import { getDragHandlers } from "modules/ui-builder/ui/wds/WDSTableWidget/widget/utilities"; import { HeaderCell } from "../cellComponents/HeaderCell"; import type { ReactTableColumnProps } from "../Constants"; import { CheckboxState, StickyType } from "../Constants"; diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/TableHeader/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableHeader/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/component/TableHeader/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableHeader/index.tsx diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/TableHeader/styles.module.css b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableHeader/styles.module.css similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/component/TableHeader/styles.module.css rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableHeader/styles.module.css diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/TableStyledWrappers.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableStyledWrappers.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/component/TableStyledWrappers.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/TableStyledWrappers.tsx diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/ButtonCell.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/cellComponents/ButtonCell.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/ButtonCell.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/cellComponents/ButtonCell.tsx diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/EmptyCell.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/cellComponents/EmptyCell.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/EmptyCell.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/cellComponents/EmptyCell.tsx diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/HeaderCell.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/cellComponents/HeaderCell.tsx similarity index 98% rename from app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/HeaderCell.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/cellComponents/HeaderCell.tsx index 3d7e4e03542..446a52ddec5 100644 --- a/app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/HeaderCell.tsx +++ b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/cellComponents/HeaderCell.tsx @@ -2,7 +2,7 @@ import type { Key } from "react"; import React, { useCallback, memo } from "react"; import { MULTISELECT_CHECKBOX_WIDTH, StickyType } from "../Constants"; -import { isColumnTypeEditable } from "widgets/wds/WDSTableWidget/widget/utilities"; +import { isColumnTypeEditable } from "modules/ui-builder/ui/wds/WDSTableWidget/widget/utilities"; import { Flex, Icon, IconButton, Menu, MenuTrigger, Text } from "@appsmith/wds"; interface HeaderProps { diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/PlainTextCell.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/cellComponents/PlainTextCell.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/PlainTextCell.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/cellComponents/PlainTextCell.tsx diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/URLCell.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/cellComponents/URLCell.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/URLCell.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/cellComponents/URLCell.tsx diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/cellComponents/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/cellComponents/index.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/component/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/index.tsx diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/styles.module.css b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/styles.module.css similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/component/styles.module.css rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/component/styles.module.css diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/anvilConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/anvilConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/config/anvilConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/anvilConfig.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/autocompleteConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/autocompleteConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/config/autocompleteConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/autocompleteConfig.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/defaultsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/defaultsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/config/defaultsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/defaultsConfig.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/config/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/index.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/metaConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/metaConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/config/metaConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/metaConfig.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/methodsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/config/methodsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/methodsConfig.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Basic.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Basic.ts similarity index 92% rename from app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Basic.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Basic.ts index 1002eb3496e..085a83c93e6 100644 --- a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Basic.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Basic.ts @@ -1,6 +1,9 @@ import { ValidationTypes } from "constants/WidgetValidation"; -import type { TableWidgetProps } from "widgets/wds/WDSTableWidget/constants"; -import { ColumnTypes, ICON_NAMES } from "widgets/wds/WDSTableWidget/constants"; +import type { TableWidgetProps } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; +import { + ColumnTypes, + ICON_NAMES, +} from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; import { hideByColumnType, updateIconAlignment, diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Color.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Color.ts similarity index 92% rename from app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Color.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Color.ts index 7f195322388..05f99a1f291 100644 --- a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Color.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Color.ts @@ -4,8 +4,8 @@ import capitalize from "lodash/capitalize"; import { ColumnTypes, type TableWidgetProps, -} from "widgets/wds/WDSTableWidget/constants"; -import { showByColumnType } from "widgets/wds/WDSTableWidget/widget/propertyUtils"; +} from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; +import { showByColumnType } from "modules/ui-builder/ui/wds/WDSTableWidget/widget/propertyUtils"; export default { sectionName: "Color", diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Data.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Data.ts similarity index 98% rename from app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Data.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Data.ts index 2a4f624497a..02ad9a96df7 100644 --- a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Data.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Data.ts @@ -1,9 +1,9 @@ import { ValidationTypes } from "constants/WidgetValidation"; -import type { TableWidgetProps } from "widgets/wds/WDSTableWidget/constants"; +import type { TableWidgetProps } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; import { ColumnTypes, DateInputFormat, -} from "widgets/wds/WDSTableWidget/constants"; +} from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; import { get } from "lodash"; import { getBasePropertyPath, diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/DateProperties.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/DateProperties.ts similarity index 90% rename from app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/DateProperties.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/DateProperties.ts index 03cc814701d..076c936117e 100644 --- a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/DateProperties.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/DateProperties.ts @@ -1,6 +1,6 @@ import { ValidationTypes } from "constants/WidgetValidation"; -import type { TableWidgetProps } from "widgets/wds/WDSTableWidget/constants"; -import { ColumnTypes } from "widgets/wds/WDSTableWidget/constants"; +import type { TableWidgetProps } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; +import { ColumnTypes } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; import { get } from "lodash"; import { allowedFirstDayOfWeekRange } from "../../../widget/propertyUtils"; import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType"; diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/DiscardButtonproperties.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/DiscardButtonproperties.ts similarity index 97% rename from app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/DiscardButtonproperties.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/DiscardButtonproperties.ts index ef60029c600..a8a983a6ac1 100644 --- a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/DiscardButtonproperties.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/DiscardButtonproperties.ts @@ -1,7 +1,7 @@ import { get } from "lodash"; import { ValidationTypes } from "constants/WidgetValidation"; -import type { TableWidgetProps } from "widgets/wds/WDSTableWidget/constants"; -import { ColumnTypes } from "widgets/wds/WDSTableWidget/constants"; +import type { TableWidgetProps } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; +import { ColumnTypes } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; import { hideByColumnType, getBasePropertyPath, diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Events.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Events.ts similarity index 96% rename from app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Events.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Events.ts index cfd62aa8d6c..a061dfa73d0 100644 --- a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Events.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Events.ts @@ -1,5 +1,5 @@ -import type { TableWidgetProps } from "widgets/wds/WDSTableWidget/constants"; -import { ColumnTypes } from "widgets/wds/WDSTableWidget/constants"; +import type { TableWidgetProps } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; +import { ColumnTypes } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; import { get } from "lodash"; import { getBasePropertyPath, diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/General.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/General.ts similarity index 94% rename from app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/General.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/General.ts index fdb04dc0e98..3f7ffca4cad 100644 --- a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/General.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/General.ts @@ -1,6 +1,6 @@ import { ValidationTypes } from "constants/WidgetValidation"; -import type { TableWidgetProps } from "widgets/wds/WDSTableWidget/constants"; -import { ColumnTypes } from "widgets/wds/WDSTableWidget/constants"; +import type { TableWidgetProps } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; +import { ColumnTypes } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; import { hideByColumnType } from "../../../widget/propertyUtils"; import { BUTTON_VARIANTS } from "@appsmith/wds"; import { objectKeys } from "@appsmith/utils"; diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/SaveButtonProperties.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/SaveButtonProperties.ts similarity index 97% rename from app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/SaveButtonProperties.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/SaveButtonProperties.ts index 1965074b923..ead2bafb7f2 100644 --- a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/SaveButtonProperties.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/SaveButtonProperties.ts @@ -1,13 +1,13 @@ import { get } from "lodash"; import { ValidationTypes } from "constants/WidgetValidation"; -import type { TableWidgetProps } from "widgets/wds/WDSTableWidget/constants"; +import type { TableWidgetProps } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; import { hideByColumnType, getBasePropertyPath, } from "../../../widget/propertyUtils"; import { ButtonVariantTypes } from "components/constants"; import { ICON_NAMES } from "WidgetProvider/constants"; -import { ColumnTypes } from "widgets/wds/WDSTableWidget/constants"; +import { ColumnTypes } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; export default { sectionName: "Save Button", diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/TextFormatting.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/TextFormatting.ts similarity index 88% rename from app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/TextFormatting.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/TextFormatting.ts index 89bea8b8bc6..d8e5ab771d5 100644 --- a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/TextFormatting.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/TextFormatting.ts @@ -1,10 +1,10 @@ import { ValidationTypes } from "constants/WidgetValidation"; -import type { TableWidgetProps } from "widgets/wds/WDSTableWidget/constants"; +import type { TableWidgetProps } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; import { hideByColumnType, showByColumnType, } from "../../../widget/propertyUtils"; -import { ColumnTypes } from "widgets/wds/WDSTableWidget/constants"; +import { ColumnTypes } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; export default { sectionName: "Text formatting", diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validation.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validation.ts similarity index 90% rename from app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validation.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validation.ts index 73fc0c137f5..ba52ff0cc8f 100644 --- a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validation.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validation.ts @@ -1,4 +1,4 @@ -import type { TableWidgetProps } from "widgets/wds/WDSTableWidget/constants"; +import type { TableWidgetProps } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; import { get } from "lodash"; import { hideByColumnType } from "../../../widget/propertyUtils"; import commonValidations from "./Validations/Common"; diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validations/Common.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validations/Common.ts similarity index 90% rename from app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validations/Common.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validations/Common.ts index 90e86b39fc4..8c4a9bbb861 100644 --- a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validations/Common.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validations/Common.ts @@ -1,10 +1,10 @@ import { ValidationTypes } from "constants/WidgetValidation"; -import type { TableWidgetProps } from "widgets/wds/WDSTableWidget/constants"; -import { ColumnTypes } from "widgets/wds/WDSTableWidget/constants"; +import type { TableWidgetProps } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; +import { ColumnTypes } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; import { showByColumnType, getColumnPath, -} from "widgets/wds/WDSTableWidget/widget/propertyUtils"; +} from "modules/ui-builder/ui/wds/WDSTableWidget/widget/propertyUtils"; export default [ { diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validations/Date.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validations/Date.ts similarity index 80% rename from app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validations/Date.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validations/Date.ts index 77a355147ba..9a90cc6e6a6 100644 --- a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validations/Date.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validations/Date.ts @@ -1,9 +1,9 @@ -import type { TableWidgetProps } from "widgets/wds/WDSTableWidget/constants"; -import { ColumnTypes } from "widgets/wds/WDSTableWidget/constants"; +import type { TableWidgetProps } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; +import { ColumnTypes } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; import { getColumnPath, hideByColumnType, -} from "widgets/wds/WDSTableWidget/widget/propertyUtils"; +} from "modules/ui-builder/ui/wds/WDSTableWidget/widget/propertyUtils"; export default [ { diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validations/Number.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validations/Number.ts similarity index 85% rename from app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validations/Number.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validations/Number.ts index a76da2d429c..a11b4be63be 100644 --- a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validations/Number.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/Validations/Number.ts @@ -1,10 +1,10 @@ import { ValidationTypes } from "constants/WidgetValidation"; -import type { TableWidgetProps } from "widgets/wds/WDSTableWidget/constants"; -import { ColumnTypes } from "widgets/wds/WDSTableWidget/constants"; +import type { TableWidgetProps } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; +import { ColumnTypes } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; import { hideByColumnType, getColumnPath, -} from "widgets/wds/WDSTableWidget/widget/propertyUtils"; +} from "modules/ui-builder/ui/wds/WDSTableWidget/widget/propertyUtils"; export default [ { diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/PanelConfig/index.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/contentConfig.ts similarity index 98% rename from app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/contentConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/contentConfig.ts index 6eb12b504b6..866ee8e5501 100644 --- a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/contentConfig.ts +++ b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/contentConfig.ts @@ -2,8 +2,8 @@ import type { PropertyPaneConfig } from "constants/PropertyControlConstants"; import { ValidationTypes } from "constants/WidgetValidation"; import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory"; import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType"; -import type { TableWidgetProps } from "widgets/wds/WDSTableWidget/constants"; -import { InlineEditingSaveOptions } from "widgets/wds/WDSTableWidget/constants"; +import type { TableWidgetProps } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; +import { InlineEditingSaveOptions } from "modules/ui-builder/ui/wds/WDSTableWidget/constants"; import { composePropertyUpdateHook } from "widgets/WidgetUtils"; import { tableDataValidation, diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/index.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/styleConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/styleConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/config/propertyPaneConfig/styleConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/propertyPaneConfig/styleConfig.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/config/settersConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/settersConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/config/settersConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/config/settersConfig.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/constants.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/constants.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/constants.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/constants.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/constants/data.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/constants/data.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/constants/data.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/constants/data.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/constants/messages.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/constants/messages.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/constants/messages.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/constants/messages.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/index.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/widget/derived.js b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/widget/derived.js similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/widget/derived.js rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/widget/derived.js diff --git a/app/client/src/widgets/wds/WDSTableWidget/widget/derived.test.js b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/widget/derived.test.js similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/widget/derived.test.js rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/widget/derived.test.js diff --git a/app/client/src/widgets/wds/WDSTableWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/widget/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/widget/index.tsx diff --git a/app/client/src/widgets/wds/WDSTableWidget/widget/parseDerivedProperties.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/widget/parseDerivedProperties.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/widget/parseDerivedProperties.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/widget/parseDerivedProperties.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/widget/propertyUtils.test.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/widget/propertyUtils.test.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/widget/propertyUtils.test.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/widget/propertyUtils.test.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/widget/propertyUtils.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/widget/propertyUtils.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/widget/propertyUtils.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/widget/propertyUtils.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/widget/reactTableUtils/getColumnsPureFn.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/widget/reactTableUtils/getColumnsPureFn.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/widget/reactTableUtils/getColumnsPureFn.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/widget/reactTableUtils/getColumnsPureFn.tsx diff --git a/app/client/src/widgets/wds/WDSTableWidget/widget/reactTableUtils/transformDataPureFn.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/widget/reactTableUtils/transformDataPureFn.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/widget/reactTableUtils/transformDataPureFn.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/widget/reactTableUtils/transformDataPureFn.tsx diff --git a/app/client/src/widgets/wds/WDSTableWidget/widget/utilities.test.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/widget/utilities.test.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/widget/utilities.test.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/widget/utilities.test.ts diff --git a/app/client/src/widgets/wds/WDSTableWidget/widget/utilities.ts b/app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/widget/utilities.ts similarity index 100% rename from app/client/src/widgets/wds/WDSTableWidget/widget/utilities.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/widget/utilities.ts diff --git a/app/client/src/widgets/wds/WDSToolbarButtonsWidget/component/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/component/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSToolbarButtonsWidget/component/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/component/index.tsx diff --git a/app/client/src/widgets/wds/WDSToolbarButtonsWidget/component/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/component/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSToolbarButtonsWidget/component/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/component/types.ts diff --git a/app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/anvilConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/config/anvilConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/anvilConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/config/anvilConfig.ts diff --git a/app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/autocompleteConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/config/autocompleteConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/autocompleteConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/config/autocompleteConfig.ts diff --git a/app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/defaultsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/config/defaultsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/defaultsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/config/defaultsConfig.ts diff --git a/app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/config/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/config/index.ts diff --git a/app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/metaConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/config/metaConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/metaConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/config/metaConfig.ts diff --git a/app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/config/methodsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/methodsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/config/methodsConfig.ts diff --git a/app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/config/propertyPaneConfig/contentConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/propertyPaneConfig/contentConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/config/propertyPaneConfig/contentConfig.ts diff --git a/app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/propertyPaneConfig/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/config/propertyPaneConfig/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/propertyPaneConfig/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/config/propertyPaneConfig/index.ts diff --git a/app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/propertyPaneConfig/styleConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/config/propertyPaneConfig/styleConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/propertyPaneConfig/styleConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/config/propertyPaneConfig/styleConfig.ts diff --git a/app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/settersConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/config/settersConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSToolbarButtonsWidget/config/settersConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/config/settersConfig.ts diff --git a/app/client/src/widgets/wds/WDSToolbarButtonsWidget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSToolbarButtonsWidget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/index.tsx diff --git a/app/client/src/widgets/wds/WDSToolbarButtonsWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/widget/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSToolbarButtonsWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/widget/index.tsx diff --git a/app/client/src/widgets/wds/WDSToolbarButtonsWidget/widget/types.ts b/app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/widget/types.ts similarity index 100% rename from app/client/src/widgets/wds/WDSToolbarButtonsWidget/widget/types.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSToolbarButtonsWidget/widget/types.ts diff --git a/app/client/src/widgets/wds/WDSZoneWidget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSZoneWidget/index.tsx similarity index 100% rename from app/client/src/widgets/wds/WDSZoneWidget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSZoneWidget/index.tsx diff --git a/app/client/src/widgets/wds/WDSZoneWidget/widget/config/anvilConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSZoneWidget/widget/config/anvilConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSZoneWidget/widget/config/anvilConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSZoneWidget/widget/config/anvilConfig.ts diff --git a/app/client/src/widgets/wds/WDSZoneWidget/widget/config/autocompleteConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSZoneWidget/widget/config/autocompleteConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSZoneWidget/widget/config/autocompleteConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSZoneWidget/widget/config/autocompleteConfig.ts diff --git a/app/client/src/widgets/wds/WDSZoneWidget/widget/config/baseConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSZoneWidget/widget/config/baseConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSZoneWidget/widget/config/baseConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSZoneWidget/widget/config/baseConfig.ts diff --git a/app/client/src/widgets/wds/WDSZoneWidget/widget/config/defaultConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSZoneWidget/widget/config/defaultConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSZoneWidget/widget/config/defaultConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSZoneWidget/widget/config/defaultConfig.ts diff --git a/app/client/src/widgets/wds/WDSZoneWidget/widget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSZoneWidget/widget/config/index.ts similarity index 100% rename from app/client/src/widgets/wds/WDSZoneWidget/widget/config/index.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSZoneWidget/widget/config/index.ts diff --git a/app/client/src/widgets/wds/WDSZoneWidget/widget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSZoneWidget/widget/config/methodsConfig.ts similarity index 100% rename from app/client/src/widgets/wds/WDSZoneWidget/widget/config/methodsConfig.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSZoneWidget/widget/config/methodsConfig.ts diff --git a/app/client/src/widgets/wds/WDSZoneWidget/widget/config/propertyPaneContent.ts b/app/client/src/modules/ui-builder/ui/wds/WDSZoneWidget/widget/config/propertyPaneContent.ts similarity index 100% rename from app/client/src/widgets/wds/WDSZoneWidget/widget/config/propertyPaneContent.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSZoneWidget/widget/config/propertyPaneContent.ts diff --git a/app/client/src/widgets/wds/WDSZoneWidget/widget/config/propertyPaneStyle.ts b/app/client/src/modules/ui-builder/ui/wds/WDSZoneWidget/widget/config/propertyPaneStyle.ts similarity index 100% rename from app/client/src/widgets/wds/WDSZoneWidget/widget/config/propertyPaneStyle.ts rename to app/client/src/modules/ui-builder/ui/wds/WDSZoneWidget/widget/config/propertyPaneStyle.ts diff --git a/app/client/src/widgets/wds/WDSZoneWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSZoneWidget/widget/index.tsx similarity index 96% rename from app/client/src/widgets/wds/WDSZoneWidget/widget/index.tsx rename to app/client/src/modules/ui-builder/ui/wds/WDSZoneWidget/widget/index.tsx index 1d71c311dfb..3c252e8d910 100644 --- a/app/client/src/widgets/wds/WDSZoneWidget/widget/index.tsx +++ b/app/client/src/modules/ui-builder/ui/wds/WDSZoneWidget/widget/index.tsx @@ -22,9 +22,9 @@ import BaseWidget from "widgets/BaseWidget"; import type { WidgetProps, WidgetState } from "widgets/BaseWidget"; import type { LayoutProps } from "layoutSystems/anvil/utils/anvilTypes"; import type { ContainerWidgetProps } from "widgets/ContainerWidget/widget"; -import { ContainerComponent } from "widgets/wds/Container"; +import { ContainerComponent } from "modules/ui-builder/ui/wds/Container"; import { LayoutProvider } from "layoutSystems/anvil/layoutComponents/LayoutProvider"; -import { Elevations, anvilWidgets } from "widgets/wds/constants"; +import { Elevations, anvilWidgets } from "modules/ui-builder/ui/wds/constants"; import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer"; import type { CopiedWidgetData, diff --git a/app/client/src/widgets/wds/constants.ts b/app/client/src/modules/ui-builder/ui/wds/constants.ts similarity index 97% rename from app/client/src/widgets/wds/constants.ts rename to app/client/src/modules/ui-builder/ui/wds/constants.ts index 6a540de37c9..94cd6d91555 100644 --- a/app/client/src/widgets/wds/constants.ts +++ b/app/client/src/modules/ui-builder/ui/wds/constants.ts @@ -1,4 +1,4 @@ -import { getCanvasClassName } from "../../utils/generators"; +import { getCanvasClassName } from "../../../../utils/generators"; export const anvilWidgets = { SECTION_WIDGET: "SECTION_WIDGET", diff --git a/app/client/src/pages/Editor/QueryEditor/BindDataButton.tsx b/app/client/src/pages/Editor/QueryEditor/BindDataButton.tsx index 64d6e8d5493..56271b6f31d 100644 --- a/app/client/src/pages/Editor/QueryEditor/BindDataButton.tsx +++ b/app/client/src/pages/Editor/QueryEditor/BindDataButton.tsx @@ -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 "widgets/wds/constants"; +import { WDS_V2_WIDGET_MAP } from "modules/ui-builder/ui/wds/constants"; import { getNextWidgetName } from "sagas/WidgetOperationUtils"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import { addSuggestedWidget } from "actions/widgetActions"; diff --git a/app/client/src/selectors/editorSelectors.tsx b/app/client/src/selectors/editorSelectors.tsx index 6eba29a8c8e..355a1197c3d 100644 --- a/app/client/src/selectors/editorSelectors.tsx +++ b/app/client/src/selectors/editorSelectors.tsx @@ -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 "widgets/wds/constants"; +import { WDS_V2_WIDGET_MAP } from "modules/ui-builder/ui/wds/constants"; import { LayoutSystemTypes } from "layoutSystems/types"; import { getLayoutSystemType } from "./layoutSystemSelectors"; import { protectedModeSelector } from "./gitSyncSelectors"; diff --git a/app/client/src/widgets/index.ts b/app/client/src/widgets/index.ts index 813c5e5f915..f3d09da26f1 100644 --- a/app/client/src/widgets/index.ts +++ b/app/client/src/widgets/index.ts @@ -57,36 +57,36 @@ import RangeSliderWidget from "./RangeSliderWidget"; import CategorySliderWidget from "./CategorySliderWidget"; import CodeScannerWidget from "./CodeScannerWidget"; import ListWidgetV2 from "./ListWidgetV2"; -import { WDSButtonWidget } from "./wds/WDSButtonWidget"; -import { WDSInputWidget } from "./wds/WDSInputWidget"; -import { WDSCheckboxWidget } from "./wds/WDSCheckboxWidget"; -import { WDSIconButtonWidget } from "./wds/WDSIconButtonWidget"; +import { WDSButtonWidget } from "modules/ui-builder/ui/wds/WDSButtonWidget"; +import { WDSInputWidget } from "modules/ui-builder/ui/wds/WDSInputWidget"; +import { WDSCheckboxWidget } from "modules/ui-builder/ui/wds/WDSCheckboxWidget"; +import { WDSIconButtonWidget } from "modules/ui-builder/ui/wds/WDSIconButtonWidget"; import type BaseWidget from "./BaseWidget"; import ExternalWidget from "./ExternalWidget"; -import { WDSTableWidget } from "./wds/WDSTableWidget"; -import { WDSCurrencyInputWidget } from "./wds/WDSCurrencyInputWidget"; -import { WDSToolbarButtonsWidget } from "./wds/WDSToolbarButtonsWidget"; -import { WDSPhoneInputWidget } from "./wds/WDSPhoneInputWidget"; -import { WDSCheckboxGroupWidget } from "./wds/WDSCheckboxGroupWidget"; -import { WDSComboBoxWidget } from "./wds/WDSComboBoxWidget"; -import { WDSSwitchWidget } from "./wds/WDSSwitchWidget"; -import { WDSSwitchGroupWidget } from "./wds/WDSSwitchGroupWidget"; -import { WDSRadioGroupWidget } from "./wds/WDSRadioGroupWidget"; -import { WDSMenuButtonWidget } from "./wds/WDSMenuButtonWidget"; +import { WDSTableWidget } from "modules/ui-builder/ui/wds/WDSTableWidget"; +import { WDSCurrencyInputWidget } from "modules/ui-builder/ui/wds/WDSCurrencyInputWidget"; +import { WDSToolbarButtonsWidget } from "modules/ui-builder/ui/wds/WDSToolbarButtonsWidget"; +import { WDSPhoneInputWidget } from "modules/ui-builder/ui/wds/WDSPhoneInputWidget"; +import { WDSCheckboxGroupWidget } from "modules/ui-builder/ui/wds/WDSCheckboxGroupWidget"; +import { WDSComboBoxWidget } from "modules/ui-builder/ui/wds/WDSComboBoxWidget"; +import { WDSSwitchWidget } from "modules/ui-builder/ui/wds/WDSSwitchWidget"; +import { WDSSwitchGroupWidget } from "modules/ui-builder/ui/wds/WDSSwitchGroupWidget"; +import { WDSRadioGroupWidget } from "modules/ui-builder/ui/wds/WDSRadioGroupWidget"; +import { WDSMenuButtonWidget } from "modules/ui-builder/ui/wds/WDSMenuButtonWidget"; import CustomWidget from "./CustomWidget"; -import { WDSSectionWidget } from "./wds/WDSSectionWidget"; -import { WDSZoneWidget } from "./wds/WDSZoneWidget"; -import { WDSHeadingWidget } from "./wds/WDSHeadingWidget"; -import { WDSParagraphWidget } from "./wds/WDSParagraphWidget"; -import { WDSModalWidget } from "./wds/WDSModalWidget"; -import { WDSStatsWidget } from "./wds/WDSStatsWidget"; -import { WDSKeyValueWidget } from "./wds/WDSKeyValueWidget"; -import { WDSInlineButtonsWidget } from "./wds/WDSInlineButtonsWidget"; -import { WDSEmailInputWidget } from "./wds/WDSEmailInputWidget"; -import { WDSPasswordInputWidget } from "./wds/WDSPasswordInputWidget"; -import { WDSNumberInputWidget } from "./wds/WDSNumberInputWidget"; -import { WDSMultilineInputWidget } from "./wds/WDSMultilineInputWidget"; -import { WDSSelectWidget } from "./wds/WDSSelectWidget"; +import { WDSSectionWidget } from "modules/ui-builder/ui/wds/WDSSectionWidget"; +import { WDSZoneWidget } from "modules/ui-builder/ui/wds/WDSZoneWidget"; +import { WDSHeadingWidget } from "modules/ui-builder/ui/wds/WDSHeadingWidget"; +import { WDSParagraphWidget } from "modules/ui-builder/ui/wds/WDSParagraphWidget"; +import { WDSModalWidget } from "modules/ui-builder/ui/wds/WDSModalWidget"; +import { WDSStatsWidget } from "modules/ui-builder/ui/wds/WDSStatsWidget"; +import { WDSKeyValueWidget } from "modules/ui-builder/ui/wds/WDSKeyValueWidget"; +import { WDSInlineButtonsWidget } from "modules/ui-builder/ui/wds/WDSInlineButtonsWidget"; +import { WDSEmailInputWidget } from "modules/ui-builder/ui/wds/WDSEmailInputWidget"; +import { WDSPasswordInputWidget } from "modules/ui-builder/ui/wds/WDSPasswordInputWidget"; +import { WDSNumberInputWidget } from "modules/ui-builder/ui/wds/WDSNumberInputWidget"; +import { WDSMultilineInputWidget } from "modules/ui-builder/ui/wds/WDSMultilineInputWidget"; +import { WDSSelectWidget } from "modules/ui-builder/ui/wds/WDSSelectWidget"; const LegacyWidgets = [ CanvasWidget, From 4743e96846ee39adcf049f99b9b95ac75f1de85d Mon Sep 17 00:00:00 2001 From: Diljit Date: Wed, 25 Sep 2024 11:01:18 +0530 Subject: [PATCH 05/17] chore: caddy: enable logging of static file requests (#36500) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description - Enable logs of static file requests in caddy. - Skip logging for CSS and JS source map files. These files are inconsequential for page rendering and therefore not worth tracking, as they only pollute the log files. Fixes #`Issue Number` _or_ Fixes `Issue URL` > [!WARNING] > _If no issue exists, please create an issue first, and check with the maintainers if the issue is valid._ ## Automation /ok-to-test tags="@tag.Sanity" ### :mag: Cypress test results > [!TIP] > ๐ŸŸข ๐ŸŸข ๐ŸŸข All cypress tests have passed! ๐ŸŽ‰ ๐ŸŽ‰ ๐ŸŽ‰ > Workflow run: > Commit: 97cfe307355f159a9cb80295fb566c406ffc056a > Cypress dashboard. > Tags: `@tag.Sanity` > Spec: >
Wed, 25 Sep 2024 05:08:51 UTC ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [x] No ## Summary by CodeRabbit - **New Features** - Enhanced logging configurations to improve performance by skipping logs for health check requests and JavaScript map files. - **Bug Fixes** - Adjusted existing logging behavior for file handling to ensure more accurate log processing. --- deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs b/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs index b5103011c42..f265b2da71e 100644 --- a/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs +++ b/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs @@ -72,8 +72,16 @@ parts.push(` log { output stdout } + + # skip logs for health check skip_log /api/v1/health + # skip logs for sourcemap files + @source-map-files { + path_regexp ^.*\.(js|css)\.map$ + } + skip_log @source-map-files + # The internal request ID header should never be accepted from an incoming request. request_header -X-Appsmith-Request-Id @@ -110,7 +118,6 @@ parts.push(` @file file handle @file { import file_server - skip_log } handle /static/* { From 20fa8de8033c614940a7f5009a4de615e466d622 Mon Sep 17 00:00:00 2001 From: NandanAnantharamu <67676905+NandanAnantharamu@users.noreply.github.com> Date: Wed, 25 Sep 2024 12:26:59 +0530 Subject: [PATCH 06/17] test: fix test in airgap for canvas context prop (#36519) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This test spec was working fine on EE/CE this fix will handle scenario in airgap environment /ok-to-test tags="@tag.Sanity" > [!TIP] > ๐ŸŸข ๐ŸŸข ๐ŸŸข All cypress tests have passed! ๐ŸŽ‰ ๐ŸŽ‰ ๐ŸŽ‰ > Workflow run: > Commit: f120b71d43a06123060ccfc3fcc0b3feb7b72d71 > Cypress dashboard. > Tags: `@tag.Sanity` > Spec: >
Wed, 25 Sep 2024 05:41:09 UTC --------- Co-authored-by: โ€œNandanAnantharamuโ€ <โ€œnandan@thinkify.ioโ€> --- .../IDE/Canvas_Context_Property_Pane_1_spec.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Property_Pane_1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Property_Pane_1_spec.js index 0913adcfa78..0940b777580 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Property_Pane_1_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Property_Pane_1_spec.js @@ -117,10 +117,16 @@ describe("Canvas context Property Pane", { tags: ["@tag.IDE"] }, function () { propertySectionState = { basic: false, general: true, - validation: false, - formsettings: true, }; + if (!Cypress.env("AIRGAPPED")) { + propertySectionState = { + ...propertySectionState, + validation: false, + formsettings: true, + }; + } + verifyPropertyPaneContext( () => { setPropertyPaneSectionState(propertySectionState); From 5ee7f83cdf44a68b975f6dbefe921ec0fee73c86 Mon Sep 17 00:00:00 2001 From: Hetu Nandu Date: Wed, 25 Sep 2024 13:14:26 +0530 Subject: [PATCH 07/17] chore: Init Plugin Action Response (#36485) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description Response Pane stuff - Move Api Response into its own component and sub components - Move Api Headers response into its own component and sub components - A lot of these are also used by queries and js so maybe we will create a common folder for that - Add a logic to render the bottom tabs in the module. Allows for extension via hook Fixes #36155 ## Automation /ok-to-test tags="@tag.Datasource" ### :mag: Cypress test results > [!TIP] > ๐ŸŸข ๐ŸŸข ๐ŸŸข All cypress tests have passed! ๐ŸŽ‰ ๐ŸŽ‰ ๐ŸŽ‰ > Workflow run: > Commit: c3b5b4b8f0e0668ff43adae1b22d320a5e6d347d > Cypress dashboard. > Tags: `@tag.Datasource` > Spec: >
Wed, 25 Sep 2024 05:04:24 UTC ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [x] No ## Summary by CodeRabbit - **New Features** - Introduced new components for displaying API responses, including `ApiFormatSegmentedResponse` and `ApiResponseHeaders`. - Enhanced user interaction with a segmented control for switching between different API response formats. - **Improvements** - Added utility functions for improved handling and validation of API response headers and HTML content. - **Bug Fixes** - Improved error handling for API response states to ensure accurate feedback during user interactions. - **Chores** - Added tests for new utility functions to validate their functionality and ensure reliability. --- .../PluginActionContext.tsx | 6 +- .../PluginActionEditor/PluginActionEditor.tsx | 6 + .../components/DatasourceConfig.tsx | 4 +- .../PluginActionResponse.tsx | 67 +++ .../components/ApiFormatSegmentedResponse.tsx | 126 +++++ .../components/ApiResponse.tsx | 170 +++++++ .../components/ApiResponseHeaders.tsx | 111 +++++ .../components/NoResponse.tsx | 65 +++ .../components/ResponseFormatTabs.tsx | 63 +++ .../PluginActionResponse/hooks/index.ts | 1 + .../components/PluginActionResponse/index.ts | 1 + .../utils/actionHasFailed.test.ts | 30 ++ .../utils/actionHasFailed.ts | 9 + .../PluginActionResponse/utils/index.ts | 2 + .../PluginActionResponse/utils/isHtml.test.ts | 39 ++ .../PluginActionResponse/utils/isHtml.ts | 25 + .../components/PluginActionResponsePane.tsx | 7 - app/client/src/PluginActionEditor/index.ts | 2 +- .../hooks/usePluginActionResponseTabs.tsx | 87 ++++ app/client/src/ce/constants/messages.ts | 2 + .../AppPluginActionEditor.tsx | 4 +- .../ActionExecutionInProgressView.tsx | 4 +- .../editorComponents/ApiResponseView.test.tsx | 14 +- .../editorComponents/ApiResponseView.tsx | 458 ++---------------- .../editorComponents/JSResponseView.tsx | 21 +- .../components/editorComponents/utils.test.ts | 3 +- .../src/components/editorComponents/utils.ts | 18 +- .../ApiEditorConstants/CommonApiConstants.ts | 19 +- .../hooks/usePluginActionResponseTabs.tsx | 1 + .../Editor/APIEditor/CommonEditorForm.tsx | 8 +- .../Editor/QueryEditor/QueryResponseTab.tsx | 37 +- 31 files changed, 906 insertions(+), 504 deletions(-) create mode 100644 app/client/src/PluginActionEditor/components/PluginActionResponse/PluginActionResponse.tsx create mode 100644 app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiFormatSegmentedResponse.tsx create mode 100644 app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiResponse.tsx create mode 100644 app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiResponseHeaders.tsx create mode 100644 app/client/src/PluginActionEditor/components/PluginActionResponse/components/NoResponse.tsx create mode 100644 app/client/src/PluginActionEditor/components/PluginActionResponse/components/ResponseFormatTabs.tsx create mode 100644 app/client/src/PluginActionEditor/components/PluginActionResponse/hooks/index.ts create mode 100644 app/client/src/PluginActionEditor/components/PluginActionResponse/index.ts create mode 100644 app/client/src/PluginActionEditor/components/PluginActionResponse/utils/actionHasFailed.test.ts create mode 100644 app/client/src/PluginActionEditor/components/PluginActionResponse/utils/actionHasFailed.ts create mode 100644 app/client/src/PluginActionEditor/components/PluginActionResponse/utils/index.ts create mode 100644 app/client/src/PluginActionEditor/components/PluginActionResponse/utils/isHtml.test.ts create mode 100644 app/client/src/PluginActionEditor/components/PluginActionResponse/utils/isHtml.ts delete mode 100644 app/client/src/PluginActionEditor/components/PluginActionResponsePane.tsx create mode 100644 app/client/src/ce/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx create mode 100644 app/client/src/ee/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx diff --git a/app/client/src/PluginActionEditor/PluginActionContext.tsx b/app/client/src/PluginActionEditor/PluginActionContext.tsx index 670efc34811..42c0d4e6745 100644 --- a/app/client/src/PluginActionEditor/PluginActionContext.tsx +++ b/app/client/src/PluginActionEditor/PluginActionContext.tsx @@ -6,14 +6,16 @@ import React, { } from "react"; import type { Action } from "entities/Action"; import type { Plugin } from "api/PluginApi"; -import type { Datasource } from "entities/Datasource"; +import type { Datasource, EmbeddedRestDatasource } from "entities/Datasource"; +import type { ActionResponse } from "api/ActionAPI"; interface PluginActionContextType { action: Action; + actionResponse?: ActionResponse; editorConfig: unknown[]; settingsConfig: unknown[]; plugin: Plugin; - datasource?: Datasource; + datasource?: EmbeddedRestDatasource | Datasource; } // No need to export this context to use it. Use the hook defined below instead diff --git a/app/client/src/PluginActionEditor/PluginActionEditor.tsx b/app/client/src/PluginActionEditor/PluginActionEditor.tsx index 5ffa8a4d777..8eaa3bc51ba 100644 --- a/app/client/src/PluginActionEditor/PluginActionEditor.tsx +++ b/app/client/src/PluginActionEditor/PluginActionEditor.tsx @@ -4,6 +4,7 @@ import { identifyEntityFromPath } from "../navigation/FocusEntity"; import { useSelector } from "react-redux"; import { getActionByBaseId, + getActionResponses, getDatasource, getEditorConfig, getPlugin, @@ -39,6 +40,8 @@ const PluginActionEditor = (props: ChildrenProps) => { const editorConfig = useSelector((state) => getEditorConfig(state, pluginId)); + const actionResponses = useSelector(getActionResponses); + if (!isEditorInitialized) { return ( @@ -71,9 +74,12 @@ const PluginActionEditor = (props: ChildrenProps) => { ); } + const actionResponse = actionResponses[action.id]; + return ( dispatch(setApiPaneDebuggerState({ open: !open })), + [dispatch, open], + ); + + const updateSelectedResponseTab = useCallback( + (tabKey: string) => { + if (tabKey === DEBUGGER_TAB_KEYS.ERROR_TAB) { + AnalyticsUtil.logEvent("OPEN_DEBUGGER", { + source: "API_PANE", + }); + } + + dispatch(setApiPaneDebuggerState({ open: true, selectedTab: tabKey })); + }, + [dispatch], + ); + + const updateResponsePaneHeight = useCallback( + (height: number) => { + dispatch(setApiPaneDebuggerState({ responseTabHeight: height })); + }, + [dispatch], + ); + + return ( + + ); +} + +export default PluginActionResponse; diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiFormatSegmentedResponse.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiFormatSegmentedResponse.tsx new file mode 100644 index 00000000000..4fe9f53b905 --- /dev/null +++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiFormatSegmentedResponse.tsx @@ -0,0 +1,126 @@ +import React, { useCallback, useMemo, useState } from "react"; +import { isArray, isString } from "lodash"; +import { isHtml } from "../utils"; +import ReadOnlyEditor from "components/editorComponents/ReadOnlyEditor"; +import { SegmentedControlContainer } from "pages/Editor/QueryEditor/EditorJSONtoForm"; +import { Flex, SegmentedControl } from "@appsmith/ads"; +import type { ActionResponse } from "api/ActionAPI"; +import { setActionResponseDisplayFormat } from "actions/pluginActionActions"; +import { actionResponseDisplayDataFormats } from "pages/Editor/utils"; +import { ResponseDisplayFormats } from "constants/ApiEditorConstants/CommonApiConstants"; +import { useDispatch } from "react-redux"; +import styled from "styled-components"; +import { ResponseFormatTabs } from "./ResponseFormatTabs"; + +const ResponseBodyContainer = styled.div` + overflow-y: clip; + height: 100%; + display: grid; +`; + +function ApiFormatSegmentedResponse(props: { + actionResponse: ActionResponse; + actionId: string; + responseTabHeight: number; +}) { + const dispatch = useDispatch(); + const onResponseTabSelect = useCallback( + (tab: string) => { + dispatch( + setActionResponseDisplayFormat({ + id: props.actionId, + field: "responseDisplayFormat", + value: tab, + }), + ); + }, + [dispatch, props.actionId], + ); + + const { responseDataTypes, responseDisplayFormat } = + actionResponseDisplayDataFormats(props.actionResponse); + + let filteredResponseDataTypes: { key: string; title: string }[] = [ + ...responseDataTypes, + ]; + + if (!!props.actionResponse.body && !isArray(props.actionResponse.body)) { + filteredResponseDataTypes = responseDataTypes.filter( + (item) => item.key !== ResponseDisplayFormats.TABLE, + ); + + if (responseDisplayFormat.title === ResponseDisplayFormats.TABLE) { + onResponseTabSelect(filteredResponseDataTypes[0]?.title); + } + } + + const responseTabs = filteredResponseDataTypes?.map((dataType, index) => ({ + index: index, + key: dataType.key, + title: dataType.title, + panelComponent: ( + []} + responseType={dataType.key} + tableBodyHeight={props.responseTabHeight} + /> + ), + })); + + const segmentedControlOptions = responseTabs?.map((item) => ({ + value: item.key, + label: item.title, + })); + + const onChange = useCallback( + (value: string) => { + setSelectedControl(value); + onResponseTabSelect(value); + }, + [onResponseTabSelect], + ); + + const [selectedControl, setSelectedControl] = useState( + segmentedControlOptions[0]?.value, + ); + + const selectedTabIndex = filteredResponseDataTypes?.findIndex( + (dataType) => dataType.title === responseDisplayFormat?.title, + ); + + const value = useMemo( + () => ({ value: props.actionResponse.body as string }), + [props.actionResponse.body], + ); + + return ( + + {isString(props.actionResponse?.body) && + isHtml(props.actionResponse?.body) ? ( + + ) : responseTabs && responseTabs.length > 0 && selectedTabIndex !== -1 ? ( + + + + + [] + } + responseType={selectedControl || segmentedControlOptions[0]?.value} + tableBodyHeight={props.responseTabHeight} + /> + + ) : null} + + ); +} + +export default ApiFormatSegmentedResponse; diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiResponse.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiResponse.tsx new file mode 100644 index 00000000000..bb32f43ad19 --- /dev/null +++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiResponse.tsx @@ -0,0 +1,170 @@ +import React, { useMemo } from "react"; +import ReactJson from "react-json-view"; +import { isEmpty, noop } from "lodash"; +import styled from "styled-components"; +import { Callout, Flex } from "@appsmith/ads"; +import { + JsonWrapper, + reactJsonProps, +} from "components/editorComponents/Debugger/ErrorLogs/components/LogCollapseData"; +import type { ActionResponse } from "api/ActionAPI"; +import type { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig"; +import type { SourceEntity } from "entities/AppsmithConsole"; +import ApiResponseMeta from "components/editorComponents/ApiResponseMeta"; +import ActionExecutionInProgressView from "components/editorComponents/ActionExecutionInProgressView"; +import LogAdditionalInfo from "components/editorComponents/Debugger/ErrorLogs/components/LogAdditionalInfo"; +import LogHelper from "components/editorComponents/Debugger/ErrorLogs/components/LogHelper"; +import LOG_TYPE from "entities/AppsmithConsole/logtype"; +import { type Action } from "entities/Action"; +import { hasFailed } from "../utils"; +import { getUpdateTimestamp } from "components/editorComponents/Debugger/ErrorLogs/ErrorLogItem"; +import { ENTITY_TYPE } from "ee/entities/AppsmithConsole/utils"; +import ApiFormatSegmentedResponse from "./ApiFormatSegmentedResponse"; +import { NoResponse } from "./NoResponse"; + +const HelpSection = styled.div` + padding-bottom: 5px; + padding-top: 10px; +`; + +const ResponseDataContainer = styled.div` + flex: 1; + overflow: auto; + display: flex; + flex-direction: column; + + & .CodeEditorTarget { + overflow: hidden; + } +`; + +export const ResponseTabErrorContainer = styled.div` + display: flex; + flex-direction: column; + padding: 8px 16px; + gap: 8px; + height: fit-content; + background: var(--ads-v2-color-bg-error); + border-bottom: 1px solid var(--ads-v2-color-border); +`; + +export const ResponseTabErrorContent = styled.div` + display: flex; + align-items: flex-start; + gap: 4px; + font-size: 12px; + line-height: 16px; +`; + +export const ResponseTabErrorDefaultMessage = styled.div` + flex-shrink: 0; +`; + +export const apiReactJsonProps = { ...reactJsonProps, collapsed: 0 }; + +export function ApiResponse(props: { + action: Action; + actionResponse?: ActionResponse; + isRunning: boolean; + isRunDisabled: boolean; + theme: EditorTheme; + onRunClick: () => void; + responseTabHeight: number; +}) { + const { id, name } = props.action; + const actionSource: SourceEntity = useMemo( + () => ({ + type: ENTITY_TYPE.ACTION, + name, + id, + }), + [name, id], + ); + + if (!props.actionResponse) { + return ( + + + + ); + } + + const { messages, pluginErrorDetails, request } = props.actionResponse; + + const runHasFailed = hasFailed(props.actionResponse); + const requestWithTimestamp = getUpdateTimestamp(request); + + return ( + + + {Array.isArray(messages) && messages.length > 0 && ( + + {messages.map((message, i) => ( + + {message} + + ))} + + )} + {props.isRunning && ( + + )} + {runHasFailed && !props.isRunning ? ( + + + + Your API failed to execute + {pluginErrorDetails && ":"} + + {pluginErrorDetails && ( + <> +
+ {pluginErrorDetails.downstreamErrorMessage} +
+ {pluginErrorDetails.downstreamErrorCode && ( + + )} + + )} + + + {requestWithTimestamp && ( + + + + )} + + ) : ( + + {isEmpty(props.actionResponse.statusCode) ? ( + + ) : ( + + )} + + )} + + ); +} diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiResponseHeaders.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiResponseHeaders.tsx new file mode 100644 index 00000000000..7f055d5bc4f --- /dev/null +++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ApiResponseHeaders.tsx @@ -0,0 +1,111 @@ +import React, { useMemo } from "react"; +import type { ActionResponse } from "api/ActionAPI"; +import { Callout, Flex } from "@appsmith/ads"; +import { CHECK_REQUEST_BODY, createMessage } from "ee/constants/messages"; +import { isArray, isEmpty } from "lodash"; +import ReadOnlyEditor from "components/editorComponents/ReadOnlyEditor"; +import { hasFailed } from "../utils"; +import styled from "styled-components"; +import { NoResponse } from "./NoResponse"; + +const ResponseDataContainer = styled.div` + flex: 1; + overflow: auto; + display: flex; + flex-direction: column; + + & .CodeEditorTarget { + overflow: hidden; + } +`; + +const headersTransformer = (headers: Record = {}) => { + let responseHeaders = {}; + + // if no headers are present in the response, use the default body text. + if (headers) { + Object.entries(headers).forEach(([key, value]) => { + if (isArray(value) && value.length < 2) { + responseHeaders = { + ...responseHeaders, + [key]: value[0], + }; + + return; + } + + responseHeaders = { + ...responseHeaders, + [key]: value, + }; + }); + } + + return responseHeaders; +}; + +export function ApiResponseHeaders(props: { + isRunning: boolean; + onDebugClick: () => void; + actionResponse?: ActionResponse; + isRunDisabled: boolean; + onRunClick: () => void; +}) { + const responseHeaders = useMemo(() => { + return headersTransformer(props.actionResponse?.headers); + }, [props.actionResponse?.headers]); + + const errorCalloutLinks = useMemo(() => { + return [ + { + children: "Debug", + endIcon: "bug", + onClick: props.onDebugClick, + to: "", + }, + ]; + }, [props.onDebugClick]); + + const headersInput = useMemo(() => { + return { + value: !isEmpty(responseHeaders) + ? JSON.stringify(responseHeaders, null, 2) + : "", + }; + }, [responseHeaders]); + + if (!props.actionResponse) { + return ( + + + + ); + } + + const runHasFailed = hasFailed(props.actionResponse); + + return ( + + {runHasFailed && !props.isRunning && ( + + {createMessage(CHECK_REQUEST_BODY)} + + )} + + {isEmpty(props.actionResponse.statusCode) ? ( + + ) : ( + + )} + + + ); +} diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/NoResponse.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/NoResponse.tsx new file mode 100644 index 00000000000..a133ec66556 --- /dev/null +++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/NoResponse.tsx @@ -0,0 +1,65 @@ +import NoResponseSVG from "assets/images/no-response.svg"; +import { Classes, Text, TextType } from "@appsmith/ads-old"; +import { + EMPTY_RESPONSE_FIRST_HALF, + EMPTY_RESPONSE_LAST_HALF, +} from "ee/constants/messages"; +import { Button } from "@appsmith/ads"; +import React from "react"; +import styled from "styled-components"; + +const StyledText = styled(Text)` + &&&& { + margin-top: 0; + } +`; + +const NoResponseContainer = styled.div` + flex: 1; + width: 100%; + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; + + .${Classes.ICON} { + margin-right: 0; + + svg { + width: 150px; + height: 150px; + } + } + + .${Classes.TEXT} { + margin-top: ${(props) => props.theme.spaces[9]}px; + } +`; + +interface NoResponseProps { + isRunDisabled: boolean; + isRunning: boolean; + onRunClick: () => void; +} + +export const NoResponse = ({ + isRunDisabled, + isRunning, + onRunClick, +}: NoResponseProps) => ( + + no-response-yet +
+ {EMPTY_RESPONSE_FIRST_HALF()} + + {EMPTY_RESPONSE_LAST_HALF()} +
+ +); diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ResponseFormatTabs.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ResponseFormatTabs.tsx new file mode 100644 index 00000000000..eb8dec8a7bf --- /dev/null +++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/ResponseFormatTabs.tsx @@ -0,0 +1,63 @@ +import React from "react"; +import { ResponseDisplayFormats } from "constants/ApiEditorConstants/CommonApiConstants"; +import ReadOnlyEditor from "components/editorComponents/ReadOnlyEditor"; +import { isString } from "lodash"; +import Table from "pages/Editor/QueryEditor/Table"; + +type ResponseData = string | Record[]; + +const inputValue = (data: ResponseData) => { + return { + value: isString(data) ? data : JSON.stringify(data, null, 2), + }; +}; + +const tableValue = (data: ResponseData): Record[] => { + if (isString(data)) { + return [{}]; + } + + return data; +}; + +export const ResponseFormatTabs = (props: { + responseType: string; + data: ResponseData; + tableBodyHeight?: number; +}) => { + switch (props.responseType) { + case ResponseDisplayFormats.JSON: + return ( + + ); + case ResponseDisplayFormats.TABLE: + return ( + + ); + case ResponseDisplayFormats.RAW: + return ( + + ); + default: + return ( + + ); + } +}; diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/hooks/index.ts b/app/client/src/PluginActionEditor/components/PluginActionResponse/hooks/index.ts new file mode 100644 index 00000000000..2ae6129b3bc --- /dev/null +++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/hooks/index.ts @@ -0,0 +1 @@ +export { default as usePluginActionResponseTabs } from "ee/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs"; diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/index.ts b/app/client/src/PluginActionEditor/components/PluginActionResponse/index.ts new file mode 100644 index 00000000000..34d4978ec70 --- /dev/null +++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/index.ts @@ -0,0 +1 @@ +export { default } from "./PluginActionResponse"; diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/utils/actionHasFailed.test.ts b/app/client/src/PluginActionEditor/components/PluginActionResponse/utils/actionHasFailed.test.ts new file mode 100644 index 00000000000..d28645ec5bc --- /dev/null +++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/utils/actionHasFailed.test.ts @@ -0,0 +1,30 @@ +import actionHasFailed from "./actionHasFailed"; +import type { ActionResponse } from "api/ActionAPI"; + +describe("actionHasFailed", () => { + it("Should only check the status code", () => { + const input: ActionResponse = { + body: "Success", + dataTypes: [], + duration: "200", + headers: {}, + size: "200", + statusCode: "404", + }; + + expect(actionHasFailed(input)).toBe(true); + }); + + it("Checks the 200 series of status code", () => { + const input: ActionResponse = { + body: "Success", + dataTypes: [], + duration: "200", + headers: {}, + size: "200", + statusCode: "201", + }; + + expect(actionHasFailed(input)).toBe(false); + }); +}); diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/utils/actionHasFailed.ts b/app/client/src/PluginActionEditor/components/PluginActionResponse/utils/actionHasFailed.ts new file mode 100644 index 00000000000..6352a8a0961 --- /dev/null +++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/utils/actionHasFailed.ts @@ -0,0 +1,9 @@ +import type { ActionResponse } from "api/ActionAPI"; + +function hasFailed(actionResponse: ActionResponse) { + return actionResponse.statusCode + ? actionResponse.statusCode[0] !== "2" + : false; +} + +export default hasFailed; diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/utils/index.ts b/app/client/src/PluginActionEditor/components/PluginActionResponse/utils/index.ts new file mode 100644 index 00000000000..62ec8938b3e --- /dev/null +++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/utils/index.ts @@ -0,0 +1,2 @@ +export { default as hasFailed } from "./actionHasFailed"; +export { default as isHtml } from "./isHtml"; diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/utils/isHtml.test.ts b/app/client/src/PluginActionEditor/components/PluginActionResponse/utils/isHtml.test.ts new file mode 100644 index 00000000000..6e014afafee --- /dev/null +++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/utils/isHtml.test.ts @@ -0,0 +1,39 @@ +import { isHtml } from "./index"; + +describe("isHtml", () => { + it("returns false for empty string", () => { + const input = ""; + + expect(isHtml(input)).toBe(false); + }); + + it("returns false for JSON", () => { + const input = `{"name": "test"}`; + + expect(isHtml(input)).toBe(false); + }); + + it("returns false for string", () => { + const input = "An error string returned"; + + expect(isHtml(input)).toBe(false); + }); + + it("returns false for invalid html", () => { + const input = " { + const input = "

This is incomplete"; + + expect(isHtml(input)).toBe(true); + }); + + it("returns true for HTML", () => { + const input = "

This is a html response

"; + + expect(isHtml(input)).toBe(true); + }); +}); diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/utils/isHtml.ts b/app/client/src/PluginActionEditor/components/PluginActionResponse/utils/isHtml.ts new file mode 100644 index 00000000000..551f1d66bfd --- /dev/null +++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/utils/isHtml.ts @@ -0,0 +1,25 @@ +import log from "loglevel"; + +const isHtml = (str: string): boolean => { + try { + const doc = new DOMParser().parseFromString(str, "text/html"); + + // Check for parsing errors + const parseError = doc.querySelector("parsererror"); + + if (parseError) { + return false; + } + + // Check for at least one element node in the body + return Array.from(doc.body.childNodes).some( + (node: ChildNode) => node.nodeType === 1, + ); + } catch (error) { + log.error("Error parsing HTML:", error); + + return false; + } +}; + +export default isHtml; diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponsePane.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponsePane.tsx deleted file mode 100644 index 5a0be861970..00000000000 --- a/app/client/src/PluginActionEditor/components/PluginActionResponsePane.tsx +++ /dev/null @@ -1,7 +0,0 @@ -import React from "react"; - -const PluginActionResponsePane = () => { - return
; -}; - -export default PluginActionResponsePane; diff --git a/app/client/src/PluginActionEditor/index.ts b/app/client/src/PluginActionEditor/index.ts index 0a58d00bdaa..20265c8bc5a 100644 --- a/app/client/src/PluginActionEditor/index.ts +++ b/app/client/src/PluginActionEditor/index.ts @@ -5,4 +5,4 @@ export { } from "./PluginActionContext"; export { default as PluginActionToolbar } from "./components/PluginActionToolbar"; export { default as PluginActionForm } from "./components/PluginActionForm"; -export { default as PluginActionResponsePane } from "./components/PluginActionResponsePane"; +export { default as PluginActionResponse } from "./components/PluginActionResponse"; diff --git a/app/client/src/ce/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx b/app/client/src/ce/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx new file mode 100644 index 00000000000..8e44395d5a0 --- /dev/null +++ b/app/client/src/ce/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx @@ -0,0 +1,87 @@ +import React from "react"; +import { usePluginActionContext } from "PluginActionEditor/PluginActionContext"; +import type { BottomTab } from "components/editorComponents/EntityBottomTabs"; +import { getIDEViewMode } from "selectors/ideSelectors"; +import { useSelector } from "react-redux"; +import { EditorViewMode } from "ee/entities/IDE/constants"; +import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/helpers"; +import { + createMessage, + DEBUGGER_ERRORS, + DEBUGGER_HEADERS, + DEBUGGER_LOGS, + DEBUGGER_RESPONSE, +} from "ee/constants/messages"; +import ErrorLogs from "components/editorComponents/Debugger/Errors"; +import DebuggerLogs from "components/editorComponents/Debugger/DebuggerLogs"; +import { PluginType } from "entities/Action"; +import { ApiResponse } from "PluginActionEditor/components/PluginActionResponse/components/ApiResponse"; +import { ApiResponseHeaders } from "PluginActionEditor/components/PluginActionResponse/components/ApiResponseHeaders"; +import { noop } from "lodash"; +import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig"; +import { getErrorCount } from "selectors/debuggerSelectors"; +import { getApiPaneDebuggerState } from "selectors/apiPaneSelectors"; + +function usePluginActionResponseTabs() { + const { action, actionResponse, plugin } = usePluginActionContext(); + + const IDEViewMode = useSelector(getIDEViewMode); + const errorCount = useSelector(getErrorCount); + + const { responseTabHeight } = useSelector(getApiPaneDebuggerState); + + const tabs: BottomTab[] = []; + + if (IDEViewMode === EditorViewMode.FullScreen) { + tabs.push( + { + key: DEBUGGER_TAB_KEYS.ERROR_TAB, + title: createMessage(DEBUGGER_ERRORS), + count: errorCount, + panelComponent: , + }, + { + key: DEBUGGER_TAB_KEYS.LOGS_TAB, + title: createMessage(DEBUGGER_LOGS), + panelComponent: , + }, + ); + } + + if (plugin.type === PluginType.API) { + return tabs.concat([ + { + key: DEBUGGER_TAB_KEYS.RESPONSE_TAB, + title: createMessage(DEBUGGER_RESPONSE), + panelComponent: ( + + ), + }, + { + key: DEBUGGER_TAB_KEYS.HEADER_TAB, + title: createMessage(DEBUGGER_HEADERS), + panelComponent: ( + + ), + }, + ]); + } + + return tabs; +} + +export default usePluginActionResponseTabs; diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts index ce9dd82b126..b9ca94d7ffd 100644 --- a/app/client/src/ce/constants/messages.ts +++ b/app/client/src/ce/constants/messages.ts @@ -555,7 +555,9 @@ export const NO_LOGS = () => "No logs to show"; export const NO_ERRORS = () => "No signs of trouble here!"; export const DEBUGGER_ERRORS = () => "Errors"; export const DEBUGGER_RESPONSE = () => "Response"; +export const DEBUGGER_HEADERS = () => "Headers"; export const DEBUGGER_LOGS = () => "Logs"; + export const INSPECT_ENTITY = () => "Inspect entity"; export const INSPECT_ENTITY_BLANK_STATE = () => "Select an entity to inspect"; export const VALUE_IS_INVALID = (propertyPath: string) => diff --git a/app/client/src/ce/pages/Editor/AppPluginActionEditor/AppPluginActionEditor.tsx b/app/client/src/ce/pages/Editor/AppPluginActionEditor/AppPluginActionEditor.tsx index e5f9366c05c..bad7cdba93c 100644 --- a/app/client/src/ce/pages/Editor/AppPluginActionEditor/AppPluginActionEditor.tsx +++ b/app/client/src/ce/pages/Editor/AppPluginActionEditor/AppPluginActionEditor.tsx @@ -2,7 +2,7 @@ import React from "react"; import { PluginActionEditor, PluginActionForm, - PluginActionResponsePane, + PluginActionResponse, } from "PluginActionEditor"; import { ConvertToModuleDisabler, @@ -17,7 +17,7 @@ const AppPluginActionEditor = () => { - + ); diff --git a/app/client/src/components/editorComponents/ActionExecutionInProgressView.tsx b/app/client/src/components/editorComponents/ActionExecutionInProgressView.tsx index 64af215f18a..627d1f1de39 100644 --- a/app/client/src/components/editorComponents/ActionExecutionInProgressView.tsx +++ b/app/client/src/components/editorComponents/ActionExecutionInProgressView.tsx @@ -63,9 +63,7 @@ const ActionExecutionInProgressView = ({
- ), - [API_RESPONSE_TYPE_OPTIONS.RAW]: ( - - ), - }[responseType]; -}; - -const StyledText = styled(Text)` - &&&& { - margin-top: 0; - } -`; - -interface NoResponseProps { - isButtonDisabled: boolean | undefined; - isQueryRunning: boolean; - onRunClick: () => void; -} -export const NoResponse = (props: NoResponseProps) => ( - - no-response-yet -
- {EMPTY_RESPONSE_FIRST_HALF()} - - {EMPTY_RESPONSE_LAST_HALF()} -
- -); - function ApiResponseView(props: Props) { const { actionResponse = EMPTY_RESPONSE, - apiName, currentActionConfig, disabled, isRunning, - responseDataTypes, - responseDisplayFormat, theme = EditorTheme.LIGHT, } = props; - const hasFailed = actionResponse.statusCode - ? actionResponse.statusCode[0] !== "2" - : false; const dispatch = useDispatch(); const errorCount = useSelector(getErrorCount); @@ -234,256 +63,55 @@ function ApiResponseView(props: Props) { }); }; - const messages = actionResponse?.messages; - let responseHeaders = {}; - - // if no headers are present in the response, use the default body text. - if (actionResponse.headers) { - Object.entries(actionResponse.headers).forEach(([key, value]) => { - if (isArray(value) && value.length < 2) - return (responseHeaders = { - ...responseHeaders, - [key]: value[0], + // update the selected tab in the response pane. + const updateSelectedResponseTab = useCallback( + (tabKey: string) => { + if (tabKey === DEBUGGER_TAB_KEYS.ERROR_TAB) { + AnalyticsUtil.logEvent("OPEN_DEBUGGER", { + source: "API_PANE", }); + } - return (responseHeaders = { - ...responseHeaders, - [key]: value, - }); - }); - } else { - // if the response headers is empty show an empty object. - responseHeaders = {}; - } - - const onResponseTabSelect = (tab: string) => { - dispatch( - setActionResponseDisplayFormat({ - id: currentActionConfig?.id || "", - field: "responseDisplayFormat", - value: tab, - }), - ); - }; - - let filteredResponseDataTypes: { key: string; title: string }[] = [ - ...responseDataTypes, - ]; - - if (!!actionResponse.body && !isArray(actionResponse.body)) { - filteredResponseDataTypes = responseDataTypes.filter( - (item) => item.key !== API_RESPONSE_TYPE_OPTIONS.TABLE, - ); - - if (responseDisplayFormat.title === API_RESPONSE_TYPE_OPTIONS.TABLE) { - onResponseTabSelect(filteredResponseDataTypes[0]?.title); - } - } - - const responseTabs = - filteredResponseDataTypes && - filteredResponseDataTypes.map((dataType, index) => { - return { - index: index, - key: dataType.key, - title: dataType.title, - panelComponent: responseTabComponent( - dataType.key, - actionResponse?.body, - responseTabHeight, - ), - }; - }); - - const segmentedControlOptions = - responseTabs && - responseTabs.map((item) => { - return { value: item.key, label: item.title }; - }); - - const [selectedControl, setSelectedControl] = useState( - segmentedControlOptions[0]?.value, + dispatch(setApiPaneDebuggerState({ open: true, selectedTab: tabKey })); + }, + [dispatch], ); - const selectedTabIndex = - filteredResponseDataTypes && - filteredResponseDataTypes.findIndex( - (dataType) => dataType.title === responseDisplayFormat?.title, - ); - - // update the selected tab in the response pane. - const updateSelectedResponseTab = useCallback((tabKey: string) => { - if (tabKey === DEBUGGER_TAB_KEYS.ERROR_TAB) { - AnalyticsUtil.logEvent("OPEN_DEBUGGER", { - source: "API_PANE", - }); - } - - dispatch(setApiPaneDebuggerState({ open: true, selectedTab: tabKey })); - }, []); - // update the height of the response pane on resize. - const updateResponsePaneHeight = useCallback((height: number) => { - dispatch(setApiPaneDebuggerState({ responseTabHeight: height })); - }, []); + const updateResponsePaneHeight = useCallback( + (height: number) => { + dispatch(setApiPaneDebuggerState({ responseTabHeight: height })); + }, + [dispatch], + ); - // get request timestamp formatted to human readable format. - const responseState = getUpdateTimestamp(actionResponse.request); - // action source for analytics. - const actionSource: SourceEntity = { - type: ENTITY_TYPE.ACTION, - name: currentActionConfig ? currentActionConfig.name : "API", - id: currentActionConfig?.id || "", - }; const tabs: BottomTab[] = [ { - key: "response", + key: DEBUGGER_TAB_KEYS.RESPONSE_TAB, title: createMessage(DEBUGGER_RESPONSE), panelComponent: ( - - - {Array.isArray(messages) && messages.length > 0 && ( - - {messages.map((msg, i) => ( - - {msg} - - ))} - - )} - {isRunning && ( - - )} - {hasFailed && !isRunning ? ( - - - - Your API failed to execute - {actionResponse.pluginErrorDetails && ":"} - - {actionResponse.pluginErrorDetails && ( - <> -
- {actionResponse.pluginErrorDetails.downstreamErrorMessage} -
- {actionResponse.pluginErrorDetails.downstreamErrorCode && ( - - )} - - )} - - - {actionResponse.request && ( - e.stopPropagation()} - > - - - )} - - ) : ( - - {isEmpty(actionResponse.statusCode) ? ( - - ) : ( - - {isString(actionResponse?.body) && - isHtml(actionResponse?.body) ? ( - - ) : responseTabs && - responseTabs.length > 0 && - selectedTabIndex !== -1 ? ( - - - { - setSelectedControl(value); - onResponseTabSelect(value); - }} - options={segmentedControlOptions} - value={selectedControl} - /> - - {responseTabComponent( - selectedControl || segmentedControlOptions[0]?.value, - actionResponse?.body, - responseTabHeight, - )} - - ) : null} - - )} - - )} - + ), }, { - key: "headers", - title: "Headers", + key: DEBUGGER_TAB_KEYS.HEADER_TAB, + title: createMessage(DEBUGGER_HEADERS), panelComponent: ( - - {hasFailed && !isRunning && ( - - {createMessage(CHECK_REQUEST_BODY)} - - )} - - {isEmpty(actionResponse.statusCode) ? ( - - ) : ( - - )} - - + ), }, ]; @@ -499,7 +127,7 @@ function ApiResponseView(props: Props) { { key: DEBUGGER_TAB_KEYS.LOGS_TAB, title: createMessage(DEBUGGER_LOGS), - panelComponent: , + panelComponent: , }, ); } @@ -508,7 +136,7 @@ function ApiResponseView(props: Props) { //TODO: move this to a common place const toggleHide = useCallback( () => dispatch(setApiPaneDebuggerState({ open: !open })), - [open], + [dispatch, open], ); return ( diff --git a/app/client/src/components/editorComponents/JSResponseView.tsx b/app/client/src/components/editorComponents/JSResponseView.tsx index 42543824be7..91d8519abe0 100644 --- a/app/client/src/components/editorComponents/JSResponseView.tsx +++ b/app/client/src/components/editorComponents/JSResponseView.tsx @@ -27,13 +27,13 @@ import { DEBUGGER_TAB_KEYS } from "./Debugger/helpers"; import type { BottomTab } from "./EntityBottomTabs"; import EntityBottomTabs from "./EntityBottomTabs"; import { getIsSavingEntity } from "selectors/editorSelectors"; -import { getJSResponseViewState } from "./utils"; +import { getJSResponseViewState, JSResponseState } from "./utils"; import { getFilteredErrors } from "selectors/debuggerSelectors"; +import { NoResponse } from "PluginActionEditor/components/PluginActionResponse/components/NoResponse"; import { - NoResponse, ResponseTabErrorContainer, ResponseTabErrorContent, -} from "./ApiResponseView"; +} from "PluginActionEditor/components/PluginActionResponse/components/ApiResponse"; import LogHelper from "./Debugger/ErrorLogs/components/LogHelper"; import LOG_TYPE from "entities/AppsmithConsole/logtype"; import type { Log, SourceEntity } from "entities/AppsmithConsole"; @@ -45,7 +45,7 @@ import { EditorViewMode } from "ee/entities/IDE/constants"; import ErrorLogs from "./Debugger/Errors"; import { isBrowserExecutionAllowed } from "ee/utils/actionExecutionUtils"; import JSRemoteExecutionView from "ee/components/JSRemoteExecutionView"; -import { IDEBottomView, ViewHideBehaviour } from "../../IDE"; +import { IDEBottomView, ViewHideBehaviour } from "IDE"; const ResponseTabWrapper = styled.div` display: flex; @@ -66,15 +66,6 @@ const NoReturnValueWrapper = styled.div` padding-top: ${(props) => props.theme.spaces[6]}px; `; -export enum JSResponseState { - IsExecuting = "IsExecuting", - IsDirty = "IsDirty", - IsUpdating = "IsUpdating", - NoResponse = "NoResponse", - ShowResponse = "ShowResponse", - NoReturnValue = "NoReturnValue", -} - interface ReduxStateProps { errorCount: number; } @@ -229,8 +220,8 @@ function JSResponseView(props: Props) { <> {responseStatus === JSResponseState.NoResponse && ( { - const doc = new DOMParser().parseFromString(str, "text/html"); - - return Array.from(doc.body.childNodes).some( - // TODO: Fix this the next time the file is edited - // eslint-disable-next-line @typescript-eslint/no-explicit-any - (node: any) => node.nodeType === 1, - ); -}; +export enum JSResponseState { + IsExecuting = "IsExecuting", + IsDirty = "IsDirty", + IsUpdating = "IsUpdating", + NoResponse = "NoResponse", + ShowResponse = "ShowResponse", + NoReturnValue = "NoReturnValue", +} /** * Returns state of the JSResponseview editor component diff --git a/app/client/src/constants/ApiEditorConstants/CommonApiConstants.ts b/app/client/src/constants/ApiEditorConstants/CommonApiConstants.ts index 978879ba5e5..eacd44f72e6 100644 --- a/app/client/src/constants/ApiEditorConstants/CommonApiConstants.ts +++ b/app/client/src/constants/ApiEditorConstants/CommonApiConstants.ts @@ -85,29 +85,14 @@ export const HTTP_METHODS_DEFAULT_FORMAT_TYPES: Record = { PATCH: POST_BODY_FORMAT_OPTIONS.JSON, }; -export const DEFAULT_PROVIDER_OPTION = "Business Software"; export const CONTENT_TYPE_HEADER_KEY = "content-type"; -export enum ApiResponseTypes { +export enum ResponseDisplayFormats { JSON = "JSON", TABLE = "TABLE", RAW = "RAW", } -// export const ApiResponseTypesOptions: -export const API_RESPONSE_TYPE_OPTIONS: { - [key in keyof typeof ApiResponseTypes]: string; -} = { - JSON: "JSON", - TABLE: "TABLE", - RAW: "RAW", -}; -export const POST_BODY_FORMATS = Object.values(POST_BODY_FORMAT_OPTIONS).map( - (option) => { - return option; - }, -); - export const POST_BODY_FORMAT_OPTIONS_ARRAY = Object.values( POST_BODY_FORMAT_OPTIONS, ); @@ -133,6 +118,4 @@ export interface MULTI_PART_DROPDOWN_OPTION { export const MULTI_PART_DROPDOWN_OPTIONS: MULTI_PART_DROPDOWN_OPTION[] = Object.values(MultiPartOptionTypes).map((value) => ({ label: value, value })); -export const DEFAULT_MULTI_PART_DROPDOWN_WIDTH = "77px"; -export const DEFAULT_MULTI_PART_DROPDOWN_HEIGHT = "100%"; export const DEFAULT_MULTI_PART_DROPDOWN_PLACEHOLDER = "Type"; diff --git a/app/client/src/ee/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx b/app/client/src/ee/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx new file mode 100644 index 00000000000..0e7b0e46546 --- /dev/null +++ b/app/client/src/ee/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs.tsx @@ -0,0 +1 @@ +export { default } from "ce/PluginActionEditor/components/PluginActionResponse/hooks/usePluginActionResponseTabs"; diff --git a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx index 3c7467e0718..1696f619724 100644 --- a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx +++ b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx @@ -212,7 +212,6 @@ function CommonEditorForm(props: CommonFormPropsWithExtraParams) { const { actionConfigurationHeaders, actionConfigurationParams, - actionName, actionResponse, autoGeneratedActionConfigHeaders, closeEditorLink, @@ -224,8 +223,6 @@ function CommonEditorForm(props: CommonFormPropsWithExtraParams) { onRunClick, paramsCount, pluginId, - responseDataTypes, - responseDisplayFormat, settingsConfig, } = props; @@ -256,6 +253,8 @@ function CommonEditorForm(props: CommonFormPropsWithExtraParams) { getPlugin(state, pluginId ?? ""), ); + if (!currentActionConfig) return null; + // this gets the url of the current action's datasource const actionDatasourceUrl = currentActionConfig?.datasource?.datasourceConfiguration?.url || ""; @@ -351,13 +350,10 @@ function CommonEditorForm(props: CommonFormPropsWithExtraParams) { diff --git a/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx b/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx index 1c366da805e..ba147dc5bb3 100644 --- a/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx +++ b/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx @@ -3,12 +3,12 @@ import { useDispatch, useSelector } from "react-redux"; import ReactJson from "react-json-view"; import { apiReactJsonProps, - NoResponse, - responseTabComponent, ResponseTabErrorContainer, ResponseTabErrorContent, ResponseTabErrorDefaultMessage, -} from "components/editorComponents/ApiResponseView"; +} from "PluginActionEditor/components/PluginActionResponse/components/ApiResponse"; +import { ResponseFormatTabs } from "PluginActionEditor/components/PluginActionResponse/components/ResponseFormatTabs"; +import { NoResponse } from "PluginActionEditor/components/PluginActionResponse/components/NoResponse"; import LogAdditionalInfo from "components/editorComponents/Debugger/ErrorLogs/components/LogAdditionalInfo"; import LogHelper from "components/editorComponents/Debugger/ErrorLogs/components/LogHelper"; import LOG_TYPE from "entities/AppsmithConsole/logtype"; @@ -102,6 +102,8 @@ const QueryResponseTab = (props: Props) => { const { responseDataTypes, responseDisplayFormat } = actionResponseDisplayDataFormats(actionResponse); + let output: Record[] | string = ""; + const responseBodyTabs = responseDataTypes && responseDataTypes.map((dataType, index) => { @@ -109,10 +111,12 @@ const QueryResponseTab = (props: Props) => { index: index, key: dataType.key, title: dataType.title, - panelComponent: responseTabComponent( - dataType.key, - output, - responseTabHeight, + panelComponent: ( + ), }; }); @@ -163,9 +167,6 @@ const QueryResponseTab = (props: Props) => { let error = runErrorMessage; let hintMessages: Array = []; let showPreparedStatementWarning = false; - // TODO: Fix this the next time the file is edited - // eslint-disable-next-line @typescript-eslint/no-explicit-any - let output: Record[] | null = null; // Query is executed even once during the session, show the response data. if (actionResponse) { @@ -326,17 +327,19 @@ const QueryResponseTab = (props: Props) => { suggestedWidgets={actionResponse?.suggestedWidgets} /> - {responseTabComponent( - selectedControl || segmentedControlOptions[0]?.value, - output, - responseTabHeight, - )} + )} {!output && !error && ( )} From a93e87ba189fd3f627bc2747c6b6d36741074d08 Mon Sep 17 00:00:00 2001 From: Hetu Nandu Date: Wed, 25 Sep 2024 13:31:38 +0530 Subject: [PATCH 08/17] chore: [Plugin Action Form] Common Editor State (#36512) ## Description Passes the correct states for the Common Editor form in the Plugin Action Form. - Uses a hook to pass the form states as already implemented - Uses helper functions to get the header and params count from the said state - As a side effect I can remove these from the original implementation since the invocation is now in the common `RequestTabs` components - Updates the `changeActionCall` hook to only be called if the action changes - Updates the tests to reflect this EE PR to track tests: https://github.com/appsmithorg/appsmith-ee/pull/5217 Parts of #36154 ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [x] No ## Summary by CodeRabbit ## Release Notes - **New Features** - Introduced a custom hook for streamlined retrieval of action-related values in forms. - Added utility functions for counting valid headers and parameters. - **Improvements** - Simplified component interfaces by removing unnecessary properties related to headers and parameters. - Enhanced type safety for header and parameter properties. - Refined tab rendering logic for better user experience. - **Bug Fixes** - Adjusted logic to ensure actions are dispatched only on changes to action IDs. - **Documentation** - Updated relevant documentation to reflect changes in component props and functionalities. --- .../components/APIEditorForm.tsx | 2 - .../CommonEditorForm/CommonEditorForm.tsx | 36 ++++----- .../CommonEditorForm/RequestTabs.tsx | 66 +++++++++------- .../hooks/useGetFormActionValues.ts | 78 +++++++++++++++++++ .../CommonEditorForm/utils/getHeadersCount.ts | 22 ++++++ .../CommonEditorForm/utils/getParamsCount.ts | 14 ++++ .../utils/getValidProperties.ts | 11 +++ .../CommonEditorForm/utils/index.ts | 2 + .../hooks/useChangeActionCall.test.tsx | 35 +++++++++ .../hooks/useChangeActionCall.ts | 6 +- .../Editor/APIEditor/CommonEditorForm.tsx | 6 -- .../APIEditor/GraphQL/GraphQLEditorForm.tsx | 44 ----------- .../pages/Editor/APIEditor/RestAPIForm.tsx | 51 ------------ 13 files changed, 216 insertions(+), 157 deletions(-) create mode 100644 app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/hooks/useGetFormActionValues.ts create mode 100644 app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/utils/getHeadersCount.ts create mode 100644 app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/utils/getParamsCount.ts create mode 100644 app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/utils/getValidProperties.ts create mode 100644 app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/utils/index.ts diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/APIEditorForm.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/APIEditorForm.tsx index f3a8d8ffd62..d8cbdd88eb2 100644 --- a/app/client/src/PluginActionEditor/components/PluginActionForm/components/APIEditorForm.tsx +++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/APIEditorForm.tsx @@ -34,7 +34,6 @@ const APIEditorForm = () => { /> } formName={FORM_NAME} - headersCount={0} httpMethodOptions={HTTP_METHOD_OPTIONS} isChangePermitted={isChangePermitted} paginationUiComponent={ @@ -45,7 +44,6 @@ const APIEditorForm = () => { theme={theme} /> } - paramsCount={0} /> ); }; diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/CommonEditorForm.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/CommonEditorForm.tsx index 881fdc56147..a9ae550c0ec 100644 --- a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/CommonEditorForm.tsx +++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/CommonEditorForm.tsx @@ -1,11 +1,11 @@ import React from "react"; import { type Action } from "entities/Action"; import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig"; -import type { AutoGeneratedHeader } from "pages/Editor/APIEditor/helpers"; import { InfoFields } from "./InfoFields"; import { RequestTabs } from "./RequestTabs"; import { HintMessages } from "./HintMessages"; import { Flex } from "@appsmith/ads"; +import useGetFormActionValues from "./hooks/useGetFormActionValues"; interface Props { httpMethodOptions: { value: string }[]; @@ -14,27 +14,19 @@ interface Props { isChangePermitted: boolean; bodyUIComponent: React.ReactNode; paginationUiComponent: React.ReactNode; - headersCount: number; - paramsCount: number; - // TODO: Fix this the next time the file is edited - // eslint-disable-next-line @typescript-eslint/no-explicit-any - datasourceHeaders?: any; - // TODO: Fix this the next time the file is edited - // eslint-disable-next-line @typescript-eslint/no-explicit-any - datasourceParams?: any; - // TODO: Fix this the next time the file is edited - // eslint-disable-next-line @typescript-eslint/no-explicit-any - actionConfigurationHeaders?: any; - // TODO: Fix this the next time the file is edited - // eslint-disable-next-line @typescript-eslint/no-explicit-any - actionConfigurationParams?: any; - autoGeneratedActionConfigHeaders?: AutoGeneratedHeader[]; } const CommonEditorForm = (props: Props) => { const { action } = props; const hintMessages = action.messages || []; const theme = EditorTheme.LIGHT; + const { + actionHeaders, + actionParams, + autoGeneratedHeaders, + datasourceHeaders, + datasourceParams, + } = useGetFormActionValues(); return ( @@ -48,17 +40,15 @@ const CommonEditorForm = (props: Props) => { /> - {Object.values(API_EDITOR_TABS).map((tab) => ( - - {createMessage(API_EDITOR_TAB_TITLES[tab])} - - ))} + {Object.values(API_EDITOR_TABS) + .filter((tab) => { + return !(!props.showSettings && tab === API_EDITOR_TABS.SETTINGS); + }) + .map((tab) => ( + + {createMessage(API_EDITOR_TAB_TITLES[tab])} + + ))} diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/hooks/useGetFormActionValues.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/hooks/useGetFormActionValues.ts new file mode 100644 index 00000000000..1078d18282d --- /dev/null +++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/hooks/useGetFormActionValues.ts @@ -0,0 +1,78 @@ +import { getFormValues } from "redux-form"; +import { API_EDITOR_FORM_NAME } from "ee/constants/forms"; +import { getCurrentEnvironmentId } from "ee/selectors/environmentSelectors"; +import get from "lodash/get"; +import { useSelector } from "react-redux"; +import { + type Action, + type ApiAction, + isAPIAction, + type Property, +} from "entities/Action"; +import { getDatasources } from "ee/selectors/entitiesSelector"; + +function useGetFormActionValues() { + const formValues = useSelector(getFormValues(API_EDITOR_FORM_NAME)) as Action; + const datasources = useSelector(getDatasources); + const currentEnvironment = useSelector(getCurrentEnvironmentId); + + // In an unlikely scenario where form is not initialised, + // return empty values to avoid form ui issues + if (!isAPIAction(formValues)) { + return { + actionHeaders: [], + actionParams: [], + autoGeneratedHeaders: [], + datasourceParams: [], + datasourceHeaders: [], + }; + } + + const actionHeaders = get( + formValues, + "actionConfiguration.headers", + [], + ) as Property[]; + + const autoGeneratedHeaders: ApiAction["actionConfiguration"]["autoGeneratedHeaders"] = + get(formValues, "actionConfiguration.autoGeneratedHeaders", []); + + const actionParams = get( + formValues, + "actionConfiguration.queryParameters", + [], + ) as Property[]; + + let datasourceFromAction: Action["datasource"] | undefined = get( + formValues, + "datasource", + ); + + if (datasourceFromAction && Object.hasOwn(datasourceFromAction, "id")) { + datasourceFromAction = datasources.find( + (d) => d.id === datasourceFromAction?.id, + ); + } + + const datasourceHeaders = get( + datasourceFromAction, + `datasourceStorages.${currentEnvironment}.datasourceConfiguration.headers`, + [], + ) as Property[]; + + const datasourceParams = get( + datasourceFromAction, + `datasourceStorages.${currentEnvironment}.datasourceConfiguration.queryParameters`, + [], + ) as Property[]; + + return { + actionHeaders, + autoGeneratedHeaders, + actionParams, + datasourceHeaders, + datasourceParams, + }; +} + +export default useGetFormActionValues; diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/utils/getHeadersCount.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/utils/getHeadersCount.ts new file mode 100644 index 00000000000..a0b124525b4 --- /dev/null +++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/utils/getHeadersCount.ts @@ -0,0 +1,22 @@ +import getValidProperties from "./getValidProperties"; +import type { Property } from "entities/Action"; + +function getHeadersCount( + actionHeaders?: Property[], + datasourceHeaders?: Property[], + autoGeneratedActionHeaders?: Property[], +): number { + const validActionHeaders = getValidProperties(actionHeaders); + const validDatasourceHeaders = getValidProperties(datasourceHeaders); + const validAutoGeneratedHeaders = getValidProperties( + autoGeneratedActionHeaders, + ); + + return ( + validActionHeaders.length + + validDatasourceHeaders.length + + validAutoGeneratedHeaders.length + ); +} + +export default getHeadersCount; diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/utils/getParamsCount.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/utils/getParamsCount.ts new file mode 100644 index 00000000000..3d91bf946cf --- /dev/null +++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/utils/getParamsCount.ts @@ -0,0 +1,14 @@ +import type { Property } from "entities/Action"; +import getValidProperties from "./getValidProperties"; + +function getParamsCount( + actionParams?: Property[], + datasourceParams?: Property[], +) { + const validActionParams = getValidProperties(actionParams); + const validDatasourceParams = getValidProperties(datasourceParams); + + return validActionParams.length + validDatasourceParams.length; +} + +export default getParamsCount; diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/utils/getValidProperties.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/utils/getValidProperties.ts new file mode 100644 index 00000000000..a2822433bd9 --- /dev/null +++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/utils/getValidProperties.ts @@ -0,0 +1,11 @@ +import type { Property } from "entities/Action"; + +function getValidProperties(value?: Property[]) { + if (!Array.isArray(value)) { + return []; + } + + return value.filter((v) => v.key && v.key !== ""); +} + +export default getValidProperties; diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/utils/index.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/utils/index.ts new file mode 100644 index 00000000000..76d68357ccc --- /dev/null +++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/utils/index.ts @@ -0,0 +1,2 @@ +export { default as getHeadersCount } from "./getHeadersCount"; +export { default as getParamsCount } from "./getParamsCount"; diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.test.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.test.tsx index c7af1a52bbb..98c144af91a 100644 --- a/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.test.tsx +++ b/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.test.tsx @@ -4,6 +4,7 @@ import { PluginType } from "entities/Action"; import { usePluginActionContext } from "PluginActionEditor"; import { changeApi } from "actions/apiPaneActions"; import { changeQuery } from "actions/queryPaneActions"; +import usePrevious from "utils/hooks/usePrevious"; import { useChangeActionCall } from "./useChangeActionCall"; jest.mock("react-redux", () => ({ @@ -22,6 +23,8 @@ jest.mock("PluginActionEditor", () => ({ usePluginActionContext: jest.fn(), })); +jest.mock("utils/hooks/usePrevious", () => jest.fn()); + describe("useChangeActionCall hook", () => { const dispatchMock = jest.fn(); @@ -105,4 +108,36 @@ describe("useChangeActionCall hook", () => { // Expect no action to be dispatched expect(dispatchMock).not.toHaveBeenCalled(); }); + + it("should not dispatch any action if the action Id has not changed", () => { + const actionMock = { id: "actionId" }; + const pluginMock = { id: "pluginId", type: PluginType.API }; + + // First we mount, so it should be called as previous action id was undefined + (usePluginActionContext as jest.Mock).mockReturnValueOnce({ + action: actionMock, + plugin: pluginMock, + }); + (usePrevious as jest.Mock).mockReturnValueOnce(undefined); + renderHook(() => useChangeActionCall()); + expect(changeApi).toHaveBeenCalledTimes(1); + + // Now we mock the action object to change but not the id. It should not be called again + (usePluginActionContext as jest.Mock).mockReturnValueOnce({ + action: { ...actionMock, testId: "test" }, + plugin: pluginMock, + }); + (usePrevious as jest.Mock).mockReturnValueOnce("actionId"); + renderHook(() => useChangeActionCall()); + expect(changeApi).toHaveBeenCalledTimes(1); + + // Now we change the action id, so it will be called the second time + (usePluginActionContext as jest.Mock).mockReturnValueOnce({ + action: { id: "actionId2", testId: "test" }, + plugin: pluginMock, + }); + (usePrevious as jest.Mock).mockReturnValueOnce("actionId"); + renderHook(() => useChangeActionCall()); + expect(changeApi).toHaveBeenCalledTimes(2); + }); }); diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.ts b/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.ts index 562bbad8679..88a56e14d90 100644 --- a/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.ts +++ b/app/client/src/PluginActionEditor/components/PluginActionForm/hooks/useChangeActionCall.ts @@ -4,14 +4,18 @@ import { changeApi } from "actions/apiPaneActions"; import { changeQuery } from "actions/queryPaneActions"; import { PluginType } from "entities/Action"; import { usePluginActionContext } from "PluginActionEditor"; +import usePrevious from "utils/hooks/usePrevious"; export const useChangeActionCall = () => { const { action, plugin } = usePluginActionContext(); + const prevActionId = usePrevious(action.id); const dispatch = useDispatch(); useEffect(() => { if (!plugin?.id || !action) return; + if (prevActionId === action.id) return; + switch (plugin?.type) { case PluginType.API: dispatch(changeApi(action?.id, false)); @@ -29,5 +33,5 @@ export const useChangeActionCall = () => { ); break; } - }, [action, plugin, dispatch]); + }, [action, plugin, dispatch, prevActionId]); }; diff --git a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx index 1696f619724..b542cdfbd04 100644 --- a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx +++ b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx @@ -147,8 +147,6 @@ export interface CommonFormProps { actionName: string; apiId: string; apiName: string; - headersCount: number; - paramsCount: number; // TODO: Fix this the next time the file is edited // eslint-disable-next-line @typescript-eslint/no-explicit-any settingsConfig: any; @@ -217,11 +215,9 @@ function CommonEditorForm(props: CommonFormPropsWithExtraParams) { closeEditorLink, formName, handleSubmit, - headersCount, hintMessages, isRunning, onRunClick, - paramsCount, pluginId, settingsConfig, } = props; @@ -340,9 +336,7 @@ function CommonEditorForm(props: CommonFormPropsWithExtraParams) { datasourceHeaders={props.datasourceHeaders} datasourceParams={props.datasourceParams} formName={formName} - headersCount={headersCount} paginationUiComponent={props.paginationUIComponent} - paramsCount={paramsCount} pushFields={isChangePermitted} showSettings theme={EditorTheme.LIGHT} diff --git a/app/client/src/pages/Editor/APIEditor/GraphQL/GraphQLEditorForm.tsx b/app/client/src/pages/Editor/APIEditor/GraphQL/GraphQLEditorForm.tsx index 91ee9aeb719..cc502267e6f 100644 --- a/app/client/src/pages/Editor/APIEditor/GraphQL/GraphQLEditorForm.tsx +++ b/app/client/src/pages/Editor/APIEditor/GraphQL/GraphQLEditorForm.tsx @@ -203,48 +203,6 @@ export default connect( const currentActionDatasourceId = selector(state, "datasource.id"); - const headers = selector(state, "actionConfiguration.headers"); - let headersCount = 0; - - if (Array.isArray(headers)) { - const validHeaders = headers.filter( - (value) => value.key && value.key !== "", - ); - - headersCount += validHeaders.length; - } - - if (Array.isArray(datasourceHeaders)) { - const validHeaders = datasourceHeaders.filter( - // TODO: Fix this the next time the file is edited - // eslint-disable-next-line @typescript-eslint/no-explicit-any - (value: any) => value.key && value.key !== "", - ); - - headersCount += validHeaders.length; - } - - const params = selector(state, "actionConfiguration.queryParameters"); - let paramsCount = 0; - - if (Array.isArray(params)) { - const validParams = params.filter( - (value) => value.key && value.key !== "", - ); - - paramsCount = validParams.length; - } - - if (Array.isArray(datasourceParams)) { - const validParams = datasourceParams.filter( - // TODO: Fix this the next time the file is edited - // eslint-disable-next-line @typescript-eslint/no-explicit-any - (value: any) => value.key && value.key !== "", - ); - - paramsCount += validParams.length; - } - const actionConfigurationBody = selector(state, "actionConfiguration.body") || ""; @@ -274,8 +232,6 @@ export default connect( currentActionDatasourceId, datasourceHeaders, datasourceParams, - headersCount, - paramsCount, hintMessages, datasources: state.entities.datasources.list.filter( (d) => d.pluginId === props.pluginId, diff --git a/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx b/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx index 80f1fe349c2..1435dca07e8 100644 --- a/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx +++ b/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx @@ -107,55 +107,6 @@ export default connect((state: AppState, props: { pluginId: string }) => { const currentActionDatasourceId = selector(state, "datasource.id"); const actionName = getApiName(state, apiId) || ""; - const headers = selector(state, "actionConfiguration.headers"); - let headersCount = 0; - - if (Array.isArray(headers)) { - const validHeaders = headers.filter( - (value) => value.key && value.key !== "", - ); - - headersCount += validHeaders.length; - } - - if (Array.isArray(datasourceHeaders)) { - const validHeaders = datasourceHeaders.filter( - // TODO: Fix this the next time the file is edited - // eslint-disable-next-line @typescript-eslint/no-explicit-any - (value: any) => value.key && value.key !== "", - ); - - headersCount += validHeaders.length; - } - - if (Array.isArray(autoGeneratedActionConfigHeaders)) { - const validHeaders = autoGeneratedActionConfigHeaders.filter( - // TODO: Fix this the next time the file is edited - // eslint-disable-next-line @typescript-eslint/no-explicit-any - (value: any) => value.key && value.key !== "", - ); - - headersCount += validHeaders.length; - } - - const params = selector(state, "actionConfiguration.queryParameters"); - let paramsCount = 0; - - if (Array.isArray(params)) { - const validParams = params.filter((value) => value.key && value.key !== ""); - - paramsCount = validParams.length; - } - - if (Array.isArray(datasourceParams)) { - const validParams = datasourceParams.filter( - // TODO: Fix this the next time the file is edited - // eslint-disable-next-line @typescript-eslint/no-explicit-any - (value: any) => value.key && value.key !== "", - ); - - paramsCount += validParams.length; - } const responses = getActionResponses(state); const actionResponse = responses[apiId]; @@ -184,8 +135,6 @@ export default connect((state: AppState, props: { pluginId: string }) => { currentActionDatasourceId, datasourceHeaders, datasourceParams, - headersCount, - paramsCount, hintMessages, datasources: state.entities.datasources.list.filter( (d) => d.pluginId === props.pluginId, From 842443c267b01b4c853a2adbf3c2e1ee1be4b0bd Mon Sep 17 00:00:00 2001 From: Manish Kumar <107841575+sondermanish@users.noreply.github.com> Date: Wed, 25 Sep 2024 14:32:01 +0530 Subject: [PATCH 09/17] chore: making autocommit GA (#36347) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description - Removal of release_git_autocommit_feature_enabled flag - Removal of fallback implementation to classes which was autocommit flag annotated - Removal of irrelevant test cases post removal of fallback implementation. Fixes #`Issue Number` _or_ Fixes `Issue URL` > [!WARNING] > _If no issue exists, please create an issue first, and check with the maintainers if the issue is valid._ ## Automation /ok-to-test tags="@tag.Git" ### :mag: Cypress test results > [!TIP] > ๐ŸŸข ๐ŸŸข ๐ŸŸข All cypress tests have passed! ๐ŸŽ‰ ๐ŸŽ‰ ๐ŸŽ‰ > Workflow run: > Commit: 42b43f19e4b47d70f8c9784ae1c4c67601d79412 > Cypress dashboard. > Tags: `@tag.Git` > Spec: >
Mon, 23 Sep 2024 12:53:01 UTC ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [ ] No ## Summary by CodeRabbit - **New Features** - Enhanced file operations for resource management in Git, including methods for saving, deleting, and reading resources. - Streamlined handling of auto-commit functionalities, making certain features universally accessible. - **Bug Fixes** - Removed outdated fallback implementations for auto-commit eligibility and Git auto-commit helpers. - **Refactor** - Simplified constructors and dependencies in file operation classes, improving maintainability. - Eliminated feature flag dependencies from various components, including tests, focusing on core functionality. - **Tests** - Removed tests related to feature flags, streamlining the testing process for auto-commit and migration functionalities. --------- Co-authored-by: brayn003 --- .../ClientSide/Git/GitAutocommit_spec.ts | 3 - app/client/src/ce/entities/FeatureFlag.ts | 3 - .../PartialExportModal/unitTestUtils.ts | 1 - .../TabGeneral/DangerZone.tsx | 20 +- .../Editor/gitSync/QuickGitActions/index.tsx | 37 +- app/client/src/sagas/GitSyncSagas.ts | 8 +- .../operations/FileOperationsCEImpl.java | 359 - .../operations/FileOperationsCEv2Impl.java | 174 +- .../files/operations/FileOperationsImpl.java | 16 +- .../git/helpers/FileUtilsImplTest.java | 4 +- .../external/enums/FeatureFlagEnum.java | 12 +- .../git/operations/FileOperationsCE.java | 2 - ...toCommitEligibilityHelperFallbackImpl.java | 37 - .../AutoCommitEligibilityHelperImpl.java | 3 +- .../GitAutoCommitHelperFallbackImpl.java | 33 - .../helpers/GitAutoCommitHelperImpl.java | 9 +- .../ServerSchemaMigrationEnforcerTest.java | 158 +- .../ApplicationPageServiceAutoCommitTest.java | 0 .../AutoCommitEventHandlerImplTest.java | 64 - .../git/autocommit/AutoCommitServiceTest.java | 32 - .../AutoCommitEligibilityHelperTest.java | 29 - .../helpers/GitAutoCommitHelperImplTest.java | 72 - .../migrations/JsonSchemaMigrationTest.java | 72 - .../migrations/JsonSchemaVersionsTest.java | 31 - .../com/appsmith/server/git/application.json | 27199 ++++++++++++++++ 25 files changed, 27482 insertions(+), 896 deletions(-) delete mode 100644 app/server/appsmith-git/src/main/java/com/appsmith/git/files/operations/FileOperationsCEImpl.java delete mode 100644 app/server/appsmith-server/src/main/java/com/appsmith/server/git/autocommit/helpers/AutoCommitEligibilityHelperFallbackImpl.java delete mode 100644 app/server/appsmith-server/src/main/java/com/appsmith/server/git/autocommit/helpers/GitAutoCommitHelperFallbackImpl.java delete mode 100644 app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/ApplicationPageServiceAutoCommitTest.java create mode 100644 app/server/appsmith-server/src/test/resources/com/appsmith/server/git/application.json diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitAutocommit_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/GitAutocommit_spec.ts index 56caa3725d9..9d38aa357dc 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitAutocommit_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitAutocommit_spec.ts @@ -21,9 +21,6 @@ describe( }, function () { it("Check if autocommit progress bar is visible and network requests are properly called", function () { - featureFlagIntercept({ - release_git_autocommit_feature_enabled: true, - }); agHelper.GenerateUUID(); cy.get("@guid").then((uid) => { wsName = "GitAC-" + uid; diff --git a/app/client/src/ce/entities/FeatureFlag.ts b/app/client/src/ce/entities/FeatureFlag.ts index 69ac4b7e9c6..63d49c89f77 100644 --- a/app/client/src/ce/entities/FeatureFlag.ts +++ b/app/client/src/ce/entities/FeatureFlag.ts @@ -21,8 +21,6 @@ export const FEATURE_FLAG = { "license_git_branch_protection_enabled", license_git_continuous_delivery_enabled: "license_git_continuous_delivery_enabled", - release_git_autocommit_feature_enabled: - "release_git_autocommit_feature_enabled", license_widget_rtl_support_enabled: "license_widget_rtl_support_enabled", ab_one_click_learning_popover_enabled: "ab_one_click_learning_popover_enabled", @@ -68,7 +66,6 @@ export const DEFAULT_FEATURE_FLAG_VALUE: FeatureFlags = { release_drag_drop_building_blocks_enabled: false, release_table_cell_label_value_enabled: false, license_git_branch_protection_enabled: false, - release_git_autocommit_feature_enabled: false, license_git_continuous_delivery_enabled: false, license_widget_rtl_support_enabled: false, ab_one_click_learning_popover_enabled: false, diff --git a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts index d75f566697a..a43305d93bd 100644 --- a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts +++ b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts @@ -12769,7 +12769,6 @@ export const defaultAppState = { release_anvil_enabled: false, release_app_sidebar_enabled: false, license_git_branch_protection_enabled: false, - release_git_autocommit_feature_enabled: true, license_widget_rtl_support_enabled: false, release_show_new_sidebar_announcement_enabled: false, rollout_app_sidebar_enabled: false, diff --git a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/DangerZone.tsx b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/DangerZone.tsx index d7f5a870147..c32b7ab5c23 100644 --- a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/DangerZone.tsx +++ b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/DangerZone.tsx @@ -15,9 +15,8 @@ import { setIsDisconnectGitModalOpen, setGitSettingsModalOpenAction, } from "actions/gitSyncActions"; -import { FEATURE_FLAG } from "ee/entities/FeatureFlag"; import { Button, Divider, Text } from "@appsmith/ads"; -import React from "react"; +import React, { useCallback } from "react"; import { useDispatch, useSelector } from "react-redux"; import { getAutocommitEnabledSelector, @@ -26,7 +25,6 @@ import { } from "selectors/gitSyncSelectors"; import styled from "styled-components"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; -import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; import { useHasConnectToGitPermission, useHasManageAutoCommitPermission, @@ -71,9 +69,6 @@ const StyledDivider = styled(Divider)` function DangerZone() { const isConnectToGitPermitted = useHasConnectToGitPermission(); const isManageAutoCommitPermitted = useHasManageAutoCommitPermission(); - const isAutocommitFeatureEnabled = useFeatureFlag( - FEATURE_FLAG.release_git_autocommit_feature_enabled, - ); const isAutocommitToggling = useSelector(getIsAutocommitToggling); const isAutocommitEnabled = useSelector(getAutocommitEnabledSelector); const gitMetadataLoading = useSelector(getGitMetadataLoadingSelector); @@ -82,7 +77,7 @@ function DangerZone() { const currentApp = useSelector(getCurrentApplication); - const handleDisconnect = () => { + const handleDisconnect = useCallback(() => { AnalyticsUtil.logEvent("GS_DISCONNECT_GIT_CLICK", { source: "GIT_CONNECTION_MODAL", }); @@ -94,9 +89,9 @@ function DangerZone() { }), ); dispatch(setIsDisconnectGitModalOpen(true)); - }; + }, [currentApp?.id, currentApp?.name, dispatch]); - const handleToggleAutocommit = () => { + const handleToggleAutocommit = useCallback(() => { if (isAutocommitEnabled) { dispatch(setGitSettingsModalOpenAction({ open: false })); dispatch(setIsAutocommitModalOpen(true)); @@ -104,10 +99,9 @@ function DangerZone() { dispatch(toggleAutocommitEnabledInit()); AnalyticsUtil.logEvent("GS_AUTO_COMMIT_ENABLED"); } - }; + }, [dispatch, isAutocommitEnabled]); - const showAutoCommit = - isAutocommitFeatureEnabled && isManageAutoCommitPermitted; + const showAutoCommit = isManageAutoCommitPermitted; const showDisconnect = isConnectToGitPermitted; const showDivider = showAutoCommit && showDisconnect; @@ -128,7 +122,7 @@ function DangerZone() { {createMessage(AUTOCOMMIT_MESSAGE)}