fix: Updating logic for reactive actions to fix cyclic dependency issue with App templates and Generate page flow of a DB (#41144)

## Description

Updating logic for reactive actions to fix cyclic dependency issue with
App templates and Generate page flow of a DB. Currently, both flows were
leading to cyclic dependency errors which shouldn't show up.
App template used - Order Fulfilment Tracker
DB used - Mock DB Movies

Fixes [#41125](https://github.com/appsmithorg/appsmith/issues/41125)
[41113](https://github.com/appsmithorg/appsmith/issues/41113)

EE PR for tests: https://github.com/appsmithorg/appsmith-ee/pull/8029

## Automation

/ok-to-test tags="@tag.All"

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/16590882275>
> Commit: 907935727e70fac4dc1a8efe70cd8a3cd5da262b
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=16590882275&attempt=1"
target="_blank">Cypress dashboard</a>.
> Tags: `@tag.All`
> Spec:
> <hr>Tue, 29 Jul 2025 09:46:35 UTC
<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

## Summary by CodeRabbit

* **Refactor**
* Improved dependency detection logic for actions and JS actions,
refining how data paths are identified and handled.
* Unified data path detection by using a shared utility function across
the application.
* Enhanced filtering of entities during dependency calculations for
greater accuracy.

* **Bug Fixes**
* Corrected detection of reactive dependency misuse to reduce false
positives for certain entity types.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
Ankita Kinger 2025-07-29 15:22:20 +05:30 committed by GitHub
parent 9930224212
commit 38ae03bf17
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 38 additions and 35 deletions

View File

@ -1197,7 +1197,7 @@ export function getExternalChangedDependencies(
} }
export const isDataPath = ( export const isDataPath = (
entity: DataTreeEntity, entity: DataTreeEntity | Partial<DataTreeEntityConfig>,
fullPropertyPath: string, fullPropertyPath: string,
) => { ) => {
if (isWidget(entity)) { if (isWidget(entity)) {

View File

@ -132,16 +132,6 @@ export function getJSDependencies(
dependencies = { ...dependencies, [fullPropertyPath]: newDeps }; dependencies = { ...dependencies, [fullPropertyPath]: newDeps };
} }
for (const funcName of jsActionConfig.actionNames) {
const func = jsEntity[funcName];
if (func) {
dependencies[`${jsObjectName}.${funcName}.data`] = [
`${jsObjectName}.${funcName}`,
];
}
}
return dependencies; return dependencies;
} }
export function getActionDependencies( export function getActionDependencies(

View File

@ -5,7 +5,9 @@ import {
getEntityNameAndPropertyPath, getEntityNameAndPropertyPath,
IMMEDIATE_PARENT_REGEX, IMMEDIATE_PARENT_REGEX,
isActionConfig, isActionConfig,
isDataPath,
isJSActionConfig, isJSActionConfig,
isWidget,
} from "ee/workers/Evaluation/evaluationUtils"; } from "ee/workers/Evaluation/evaluationUtils";
import type { ConfigTree } from "entities/DataTree/dataTreeTypes"; import type { ConfigTree } from "entities/DataTree/dataTreeTypes";
import { isPathDynamicTrigger } from "utils/DynamicBindingUtils"; import { isPathDynamicTrigger } from "utils/DynamicBindingUtils";
@ -167,10 +169,6 @@ export class DependencyMapUtils {
return false; return false;
} }
static isDataPath(path: string) {
return path.endsWith(".data");
}
static detectReactiveDependencyMisuse( static detectReactiveDependencyMisuse(
dependencyMap: DependencyMap, dependencyMap: DependencyMap,
configTree: ConfigTree, configTree: ConfigTree,
@ -213,12 +211,18 @@ export class DependencyMapUtils {
); );
for (const dep of transitiveDeps) { for (const dep of transitiveDeps) {
const { entityName: depName } = getEntityNameAndPropertyPath(dep);
const entity = configTree[depName];
// to show cyclic dependency errors only for Action calls and not JSObject.body or JSObject
if (entity && entity.ENTITY_TYPE) {
if (this.isTriggerPath(dep, configTree)) { if (this.isTriggerPath(dep, configTree)) {
hasRun = true; hasRun = true;
runPath = dep; runPath = dep;
} }
if (this.isDataPath(dep)) { // using the isDataPath function from evalUtils to calculate data paths based on entity type
if (isDataPath(entity, dep)) {
hasData = true; hasData = true;
dataPath = dep; dataPath = dep;
} }
@ -238,6 +242,7 @@ export class DependencyMapUtils {
} }
} }
} }
}
/** /**
* Returns all transitive dependencies (direct and indirect, no duplicates) for a given node. * Returns all transitive dependencies (direct and indirect, no duplicates) for a given node.
@ -256,7 +261,15 @@ export class DependencyMapUtils {
if (!entityConfig) return; if (!entityConfig) return;
if (!isActionConfig(entityConfig) && !isJSActionConfig(entityConfig)) { if (isWidget(entityConfig)) {
return;
}
// to not calculate transitive dependencies for JSObject.body and JSObject
if (
isJSActionConfig(entityConfig) &&
(current.includes(".body") || !current.includes("."))
) {
return; return;
} }