diff --git a/app/client/package.json b/app/client/package.json index 1bc85bdf8e..d856bd861a 100644 --- a/app/client/package.json +++ b/app/client/package.json @@ -99,6 +99,7 @@ "downloadjs": "^1.4.7", "echarts": "^5.4.2", "fast-deep-equal": "^3.1.3", + "fast-sort": "^3.4.0", "fast-xml-parser": "^3.17.5", "fastdom": "^1.0.11", "focus-trap-react": "^8.9.2", diff --git a/app/client/src/entities/DependencyMap/index.ts b/app/client/src/entities/DependencyMap/index.ts index ee500789e4..cd6363bba7 100644 --- a/app/client/src/entities/DependencyMap/index.ts +++ b/app/client/src/entities/DependencyMap/index.ts @@ -1,5 +1,6 @@ -import { difference, some } from "lodash"; +import { difference } from "lodash"; import { isChildPropertyPath } from "utils/DynamicBindingUtils"; +import { sort } from "fast-sort"; export type TDependencies = Map>; export default class DependencyMap { @@ -150,7 +151,10 @@ export default class DependencyMap { */ addNodes = (nodes: Record, strict = true) => { - const nodesToAdd = Object.keys(nodes); + const nodesToAdd = strict + ? Object.keys(nodes) + : sort(Object.keys(nodes)).desc((node) => node.split(".").length); + let didUpdateGraph = false; for (const newNode of nodesToAdd) { if (this.#nodes.has(newNode)) continue; @@ -168,14 +172,8 @@ export default class DependencyMap { for (const [invalidNode, dependants] of this .#invalidDependenciesInverse) { if ( - !nodesToAdd.includes(invalidNode) && - isChildPropertyPath(newNode, invalidNode, true) && - !some( - nodesToAdd, - (node) => - isChildPropertyPath(newNode, node, true) && - isChildPropertyPath(node, invalidNode, true), - ) + !nodes.hasOwnProperty(invalidNode) && + isChildPropertyPath(newNode, invalidNode, true) ) { dependants.forEach((dependant) => { nodesThatAlreadyDependedOnThis.add(dependant); diff --git a/app/client/yarn.lock b/app/client/yarn.lock index 01413a7b35..c43e3d86fc 100644 --- a/app/client/yarn.lock +++ b/app/client/yarn.lock @@ -9492,6 +9492,7 @@ __metadata: esm: ^3.2.25 factory.ts: ^0.5.1 fast-deep-equal: ^3.1.3 + fast-sort: ^3.4.0 fast-xml-parser: ^3.17.5 fastdom: ^1.0.11 focus-trap-react: ^8.9.2 @@ -15263,6 +15264,13 @@ __metadata: languageName: node linkType: hard +"fast-sort@npm:^3.4.0": + version: 3.4.0 + resolution: "fast-sort@npm:3.4.0" + checksum: b925d68438629b7176dc52c6f5bb88162675e88286b6e06041c6fb1095ec44af6aac3edd5b7e09ada044b90bced078a013683d2d75337ae6f5e7224f7e073019 + languageName: node + linkType: hard + "fast-xml-parser@npm:^3.17.5": version: 3.17.5 resolution: "fast-xml-parser@npm:3.17.5"