diff --git a/app/web/src/store/change_sets.store.ts b/app/web/src/store/change_sets.store.ts index 0e79ef0c91..2df7b9a7e4 100644 --- a/app/web/src/store/change_sets.store.ts +++ b/app/web/src/store/change_sets.store.ts @@ -567,7 +567,6 @@ export function useChangeSetsStore() { { eventType: "ChangeSetApplied", callback: (data) => { - // eslint-disable-next-line @typescript-eslint/no-explicit-any const { changeSetId, userPk, toRebaseChangeSetId } = data; const changeSet = this.changeSetsById[changeSetId]; if (changeSet) { diff --git a/app/web/src/store/views.store.ts b/app/web/src/store/views.store.ts index 55a67bbacd..06880efc5a 100644 --- a/app/web/src/store/views.store.ts +++ b/app/web/src/store/views.store.ts @@ -734,6 +734,12 @@ export const useViewsStore = (forceChangeSetId?: ChangeSetId) => { }, ); this.setGroupZIndex(); + + if (this.selectedViewId === view.id) { + this.components = view.components; + this.groups = view.groups; + this.viewNodes = view.viewNodes; + } }, }); },