From 86c65b5f4a6bf499e28f7e298cf236babaae263c Mon Sep 17 00:00:00 2001 From: Apeksha Bhosale <7846888+ApekshaBhosale@users.noreply.github.com> Date: Wed, 13 Dec 2023 12:15:21 +0530 Subject: [PATCH] chore: added new selector for all js collections to be extended on ee (#29553) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description this is added to run all js functions from js editor #### PR fixes following issue(s) Fixes # (issue number) > if no issue exists, please create an issue and ask the maintainers about this first > > #### Media > A video or a GIF is preferred. when using Loom, don’t embed because it looks like it’s a GIF. instead, just link to the video > > #### Type of change > Please delete options that are not relevant. - Bug fix (non-breaking change which fixes an issue) - New feature (non-breaking change which adds functionality) - Breaking change (fix or feature that would cause existing functionality to not work as expected) - Chore (housekeeping or task changes that don't impact user perception) - This change requires a documentation update > > > ## Testing > #### How Has This Been Tested? > Please describe the tests that you ran to verify your changes. Also list any relevant details for your test configuration. > Delete anything that is not relevant - [ ] Manual - [ ] JUnit - [ ] Jest - [ ] Cypress > > #### Test Plan > Add Testsmith test cases links that relate to this PR > > #### Issues raised during DP testing > Link issues raised during DP testing for better visiblity and tracking (copy link from comments dropped on this PR) > > > ## Checklist: #### Dev activity - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] PR is being merged under a feature flag #### QA activity: - [ ] [Speedbreak features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-) have been covered - [ ] Test plan covers all impacted features and [areas of interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-) - [ ] Test plan has been peer reviewed by project stakeholders and other QA members - [ ] Manually tested functionality on DP - [ ] We had an implementation alignment call with stakeholders post QA Round 2 - [ ] Cypress test cases have been added and approved by SDET/manual QA - [ ] Added `Test Plan Approved` label after Cypress tests were reviewed - [ ] Added `Test Plan Approved` label after JUnit tests were reviewed ## Summary by CodeRabbit - **New Features** - Introduced a new function to aggregate JavaScript collections for enhanced data handling. - **Refactor** - Updated internal logic to utilize the new aggregation function for JavaScript collections, improving efficiency and maintainability. --- app/client/src/ce/selectors/entitiesSelector.ts | 8 ++++++++ app/client/src/workers/Evaluation/JSObject/utils.ts | 7 +++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/client/src/ce/selectors/entitiesSelector.ts b/app/client/src/ce/selectors/entitiesSelector.ts index 0b05cc4c21..f822666c6b 100644 --- a/app/client/src/ce/selectors/entitiesSelector.ts +++ b/app/client/src/ce/selectors/entitiesSelector.ts @@ -1405,3 +1405,11 @@ export const selectJSForPagespane = createSelector( export const getQueryModuleInstances = () => { return []; }; + +export const getAllJSCollections = createSelector( + getCurrentJSCollections, + getCurrentModuleJSCollections, + (currentContextJSCollections, moduleInstanceJSCollections) => { + return [...moduleInstanceJSCollections, ...currentContextJSCollections]; + }, +); diff --git a/app/client/src/workers/Evaluation/JSObject/utils.ts b/app/client/src/workers/Evaluation/JSObject/utils.ts index ee1aa042be..1555fda8ba 100644 --- a/app/client/src/workers/Evaluation/JSObject/utils.ts +++ b/app/client/src/workers/Evaluation/JSObject/utils.ts @@ -19,7 +19,7 @@ import type { } from "reducers/entityReducers/jsActionsReducer"; import { select } from "redux-saga/effects"; import type { JSAction } from "entities/JSCollection"; -import { getCurrentJSCollections } from "@appsmith/selectors/entitiesSelector"; +import { getAllJSCollections } from "@appsmith/selectors/entitiesSelector"; import { getEntityNameAndPropertyPath, isJSAction, @@ -325,9 +325,8 @@ export function* sortJSExecutionDataByCollectionId( // Sorted errors by collectionId const sortedErrors: BatchedJSExecutionErrors = {}; - const JSCollectionsForCurrentPage: JSCollectionData[] = yield select( - getCurrentJSCollections, - ); + const JSCollectionsForCurrentPage: JSCollectionData[] = + yield select(getAllJSCollections); for (const jsfuncFullName of Object.keys(data)) { const jsAction = getJSActionFromJSCollections(