diff --git a/app/client/src/pages/Editor/gitSync/components/GitChangesList/NewChangesList/PageChanges.tsx b/app/client/src/pages/Editor/gitSync/components/GitChangesList/NewChangesList/PageChanges.tsx index 931c7a1b16..0a088a6553 100644 --- a/app/client/src/pages/Editor/gitSync/components/GitChangesList/NewChangesList/PageChanges.tsx +++ b/app/client/src/pages/Editor/gitSync/components/GitChangesList/NewChangesList/PageChanges.tsx @@ -148,23 +148,35 @@ export default function PageChanges({ status }: PageChangesProps) { queriesRemoved, } = status; - const allPagesChangedSet = new Set([ + const staticPageChangeSet = new Set([ + ...pagesModified, + ...pagesAdded, + ...pagesRemoved, + ]); + + const staticPageChanges = Array.from(staticPageChangeSet).sort(); + + const expandablePageChangeSet = new Set([ ...jsObjectsModified.map((jsObject) => jsObject.split("/")[0]), ...jsObjectsAdded.map((jsObject) => jsObject.split("/")[0]), ...jsObjectsRemoved.map((jsObject) => jsObject.split("/")[0]), ...queriesModified.map((query) => query.split("/")[0]), ...queriesAdded.map((query) => query.split("/")[0]), ...queriesRemoved.map((query) => query.split("/")[0]), - ...pagesModified, - ...pagesAdded, - ...pagesRemoved, ]); - if (allPagesChangedSet.size === 0) return null; + const expandablePageChanges = Array.from(expandablePageChangeSet).sort(); + + const allPagesChangeSet = new Set([ + ...staticPageChanges, + ...expandablePageChanges, + ]); + + if (allPagesChangeSet.size === 0) return null; return ( <> - {Array.from(allPagesChangedSet).map((page) => { + {Array.from(allPagesChangeSet).map((page) => { return ; })}