Merge pull request #5179 from systeminit/fix/BUG-724-need-to-reset-cu…

…rrent-view BUG-724: need to also set the current view
systeminit · Dec 20, 2024 · 34585a3 · 34585a3
2 parents 6910be4 + 412dced
commit 34585a3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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;
+              }
             },
           });
         },