Merge pull request #5172 from systeminit/jobelenus/new-changeset-keep…

…s-view Fix: when creating a new change set stay on the view you're on
systeminit · Dec 19, 2024 · a6021ae · a6021ae
2 parents dd0a007 + 83345b6
commit a6021ae
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/app/web/src/components/ApprovalPendingModalCard.vue b/app/web/src/components/ApprovalPendingModalCard.vue
@@ -70,7 +70,7 @@ defineProps({
 });
 
 const goToChangeSet = (id: ChangeSetId) => {
-  changeSetsStore.setActiveChangeset(id);
+  changeSetsStore.setActiveChangeset(id, true);
   emit("closeModal");
 };
 const rejectChangeSet = (id: ChangeSetId) => {

diff --git a/app/web/src/components/layout/navbar/ChangeSetPanel.vue b/app/web/src/components/layout/navbar/ChangeSetPanel.vue
@@ -238,8 +238,7 @@ function onSelectChangeSet(newVal: string) {
 
     // keep everything in the current route except the change set id
     // note - we use push here, so there is a new browser history entry
-    let name = route.name;
-    if (name === "workspace-compose-view") name = "workspace-compose";
+    const name = route.name;
     router.push({
       name,
       params: {

diff --git a/app/web/src/store/apis.ts b/app/web/src/store/apis.ts
@@ -50,6 +50,7 @@ async function handleForcedChangesetRedirection(response: AxiosResponse) {
     const changeSetsStore = useChangeSetsStore();
     await changeSetsStore.setActiveChangeset(
       response.headers.force_change_set_id,
+      true,
     );
   }
 

diff --git a/app/web/src/store/change_sets.store.ts b/app/web/src/store/change_sets.store.ts
@@ -121,7 +121,7 @@ export function useChangeSetsStore() {
         selectedWorkspacePk: () => workspacePk,
       },
       actions: {
-        async setActiveChangeset(changeSetId: string) {
+        async setActiveChangeset(changeSetId: string, stayOnView = false) {
           // We need to force refetch changesets since there's a race condition in which redirects
           // will be triggered but the frontend won't have refreshed the list of changesets
           if (!this.changeSetsById[changeSetId]) {
@@ -132,7 +132,7 @@ export function useChangeSetsStore() {
           const params = { ...route.params };
           let name = route.name;
           // if abandoning changeset and you were looking at view, it may not exist in HEAD
-          if (name === "workspace-compose-view") {
+          if (!stayOnView && name === "workspace-compose-view") {
             name = "workspace-compose";
             delete params.viewId;
           }
@@ -530,7 +530,7 @@ export function useChangeSetsStore() {
               const changeSetName = this.selectedChangeSet?.name;
               if (data.changeSetId === this.selectedChangeSetId) {
                 if (this.headChangeSetId) {
-                  await this.setActiveChangeset(this.headChangeSetId);
+                  await this.setActiveChangeset(this.headChangeSetId, false);
                   toast({
                     component: MovedToHead,
                     props: {
-Original file line number
+Diff line change
@@ Expand Up @@
         const changeSetsStore = useChangeSetsStore();
         await changeSetsStore.setActiveChangeset(
           response.headers.force_change_set_id,
+          true,
         );
       }
@@ Expand Down @@