From 4bf58e5b8c62078e0105ee72fc7bef876d4752fd Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 3 Jan 2024 18:21:17 +0530
Subject: [PATCH] fix: wait before routing after creating new/duplicating view

---
 frontend/src/components/Modals/ViewModal.vue |  2 +-
 frontend/src/components/ViewControls.vue     | 27 +++++++++-----------
 frontend/src/stores/views.js                 |  4 +--
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/frontend/src/components/Modals/ViewModal.vue b/frontend/src/components/Modals/ViewModal.vue
index a6e1a82d..ca9d5134 100644
--- a/frontend/src/components/Modals/ViewModal.vue
+++ b/frontend/src/components/Modals/ViewModal.vue
@@ -74,7 +74,7 @@ async function create() {
     { view: view.value }
   )
   show.value = false
-  props.options.afterCreate?.(v, view.value)
+  props.options.afterCreate?.(v)
 }
 
 async function update() {
diff --git a/frontend/src/components/ViewControls.vue b/frontend/src/components/ViewControls.vue
index 1ef52646..7e322886 100644
--- a/frontend/src/components/ViewControls.vue
+++ b/frontend/src/components/ViewControls.vue
@@ -51,7 +51,8 @@
   <ViewModal
     :doctype="doctype"
     :options="{
-      afterCreate: (v) => {
+      afterCreate: async (v) => {
+        await reloadView()
         viewUpdated = false
         router.push({ name: route.name, query: { view: v.name } })
       },
@@ -171,7 +172,16 @@ list.value = createResource({
   params: getParams(),
   cache: [props.doctype, route.query.view],
   onSuccess(data) {
-    setupDefaults(data)
+    let cv = getView(route.query.view)
+
+    defaultParams.value = {
+      doctype: props.doctype,
+      filters: list.value.params.filters,
+      order_by: list.value.params.order_by,
+      columns: data.columns,
+      rows: data.rows,
+      custom_view_name: cv?.name || '',
+    }
   },
 })
 
@@ -234,19 +244,6 @@ const viewsDropdownOptions = computed(() => {
   return _views
 })
 
-function setupDefaults(data) {
-  let cv = getView(route.query.view)
-
-  defaultParams.value = {
-    doctype: props.doctype,
-    filters: list.value.params.filters,
-    order_by: list.value.params.order_by,
-    columns: data.columns,
-    rows: data.rows,
-    custom_view_name: cv?.name || '',
-  }
-}
-
 function updateFilter(filters) {
   viewUpdated.value = true
   if (!defaultParams.value) {
diff --git a/frontend/src/stores/views.js b/frontend/src/stores/views.js
index 87a209a6..ad8e7aa9 100644
--- a/frontend/src/stores/views.js
+++ b/frontend/src/stores/views.js
@@ -37,8 +37,8 @@ export const viewsStore = defineStore('crm-views', () => {
     return pinnedViews.value
   }
 
-  function reload() {
-    views.reload()
+  async function reload(wait = false) {
+    await views.reload()
   }
 
   return {