From 012a69296cdf59cd7874941f94701d24da498b44 Mon Sep 17 00:00:00 2001 From: Trisha Anand Date: Thu, 7 Dec 2023 13:57:15 +0530 Subject: [PATCH] chore: Adding an auto generated datasource while creating js action (#29418) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit > Pull Request Template > > Use this template to quickly create a well written pull request. Delete all quotes before creating the pull request. > ## Description > Add a TL;DR when description is extra long (helps content team) > > Please include a summary of the changes and which issue has been fixed. Please also include relevant motivation > and context. List any dependencies that are required for this change > > Links to Notion, Figma or any other documents that might be relevant to the PR > > #### 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 - **Bug Fixes** - Improved the creation process for actions to ensure proper handling of data sources, enhancing reliability and preventing potential issues with action execution. --- .../base/ActionCollectionServiceCEImpl.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java index 12d3467b81..a613340e29 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java @@ -638,18 +638,29 @@ public class ActionCollectionServiceCEImpl extends BaseService createJsAction(ActionCollection actionCollection, ActionDTO action) { ActionCollectionDTO collectionDTO = actionCollection.getUnpublishedCollection(); - // Make sure that the proper values are used for the new action - // Scope the actions' fully qualified names by collection name + + /** + * If the Datasource is null, create one and set the autoGenerated flag to true. This is required because spring-data + * cannot add the createdAt and updatedAt properties for null embedded objects. At this juncture, we couldn't find + * a way to disable the auditing for nested objects. + * + */ + if (action.getDatasource() == null) { + action.autoGenerateDatasource(); + } action.getDatasource().setWorkspaceId(collectionDTO.getWorkspaceId()); action.getDatasource().setPluginId(collectionDTO.getPluginId()); action.getDatasource().setName(FieldName.UNUSED_DATASOURCE); + + // Make sure that the proper values are used for the new action + // Scope the actions' fully qualified names by collection name action.setFullyQualifiedName(collectionDTO.getName() + "." + action.getName()); action.setPageId(collectionDTO.getPageId()); action.setPluginType(collectionDTO.getPluginType()); action.setDefaultResources(collectionDTO.getDefaultResources()); action.setApplicationId(actionCollection.getApplicationId()); - // Action doesn't exist. Create now. + // Action doesn't exist. Create now. NewAction newAction = newActionService.generateActionDomain(action); newAction.setUnpublishedAction(action);