[6.x] Multisite - Fix localization switch sending the browser to /entries/null (#15230)

Author: jaygeorge

resources/js/components/entries/PublishForm.vue

@@ -662,10 +662,6 @@ export default {
             } else {
                 this.createLocalization(localization);
             }
-
-            if (this.isBase) {
-                window.history.replaceState({}, '', localization.url + window.location.hash);
-            }
         },
 
         editLocalization(localization) {
@@ -694,6 +690,10 @@ export default {
                 this.initialPublished = data.values.published;
                 this.readOnly = data.readOnly;
 
+                if (this.isBase && localization.url) {
+                    window.history.replaceState({}, '', localization.url + window.location.hash);
+                }
+
                 this.trackDirtyStateTimeout = setTimeout(() => (this.trackDirtyState = true), 500); // after any fieldtypes do a debounced update
             });
         },

resources/js/components/globals/PublishForm.vue

@@ -290,10 +290,6 @@ export default {
         switchToLocalization(localization) {
             this.localizing = localization.handle;
 
-            if (this.publishContainer === 'base') {
-                window.history.replaceState({}, '', localization.url + window.location.hash);
-            }
-
             this.$axios.get(localization.url).then((response) => {
                 const data = response.data;
                 this.values = data.values;
@@ -309,6 +305,10 @@ export default {
                 this.localizing = false;
                 this.afterActionSuccessfullyCompleted(data);
                 this.$nextTick(() => this.$refs.container.clearDirtyState());
+
+                if (this.publishContainer === 'base' && localization.url) {
+                    window.history.replaceState({}, '', localization.url + window.location.hash);
+                }
             });
         },
 

resources/js/components/terms/PublishForm.vue

@@ -421,10 +421,6 @@ export default {
             } else {
                 this.createLocalization(localization);
             }
-
-            if (this.publishContainer === 'base') {
-                window.history.replaceState({}, '', localization.url + window.location.hash);
-            }
         },
 
         editLocalization(localization) {
@@ -445,6 +441,10 @@ export default {
                 this.reference = data.reference;
                 this.localizing = false;
                 this.$nextTick(() => this.$refs.container.clearDirtyState());
+
+                if (this.publishContainer === 'base' && localization.url) {
+                    window.history.replaceState({}, '', localization.url + window.location.hash);
+                }
             });
         },