From e6cc955c0af031bebb951f763283d2f7db1232f1 Mon Sep 17 00:00:00 2001
From: Davis McPhee <davis.mcphee@elastic.co>
Date: Wed, 21 Sep 2022 10:03:20 -0300
Subject: [PATCH] [Discover] Fix issue where workspace switches to
 uninitialized briefly when saving as copy in Graph

---
 .../workspace_layout/workspace_layout.tsx     |  6 +++-
 .../public/helpers/saved_workspace_utils.ts   | 28 ++++++++++---------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.tsx b/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.tsx
index 6cfbbcf7d9105..3eede479bd801 100644
--- a/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.tsx
+++ b/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.tsx
@@ -91,7 +91,11 @@ export const WorkspaceLayoutComponent = ({
   const search = useLocation().search;
   const urlQuery = new URLSearchParams(search).get('query');
 
-  const isInitialized = Boolean(workspaceInitialized || savedWorkspace.id);
+  // savedWorkspace.id gets set to null while saving a copy of an existing
+  // workspace, so we need to check for savedWorkspace.isSaving as well
+  const isInitialized = Boolean(
+    workspaceInitialized || savedWorkspace.id || savedWorkspace.isSaving
+  );
 
   const selectSelected = useCallback((node: WorkspaceNode) => {
     selectedNode.current = node;
diff --git a/x-pack/plugins/graph/public/helpers/saved_workspace_utils.ts b/x-pack/plugins/graph/public/helpers/saved_workspace_utils.ts
index 202d13f9cd539..03e377792f1ac 100644
--- a/x-pack/plugins/graph/public/helpers/saved_workspace_utils.ts
+++ b/x-pack/plugins/graph/public/helpers/saved_workspace_utils.ts
@@ -162,18 +162,6 @@ export async function saveSavedWorkspace(
     overlays: OverlayStart;
   }
 ) {
-  // Save the original id in case the save fails.
-  const originalId = savedObject.id;
-  // Read https://github.com/elastic/kibana/issues/9056 and
-  // https://github.com/elastic/kibana/issues/9012 for some background into why this copyOnSave variable
-  // exists.
-  // The goal is to move towards a better rename flow, but since our users have been conditioned
-  // to expect a 'save as' flow during a rename, we are keeping the logic the same until a better
-  // UI/UX can be worked out.
-  if (savedObject.copyOnSave) {
-    delete savedObject.id;
-  }
-
   let attributes: SavedObjectAttributes = {};
 
   forOwn(mapping, (fieldType, fieldName) => {
@@ -191,14 +179,28 @@ export async function saveSavedWorkspace(
     throw new Error('References not returned from extractReferences');
   }
 
+  // Save the original id in case the save fails.
+  const originalId = savedObject.id;
+
   try {
+    // Read https://github.com/elastic/kibana/issues/9056 and
+    // https://github.com/elastic/kibana/issues/9012 for some background into why this copyOnSave variable
+    // exists.
+    // The goal is to move towards a better rename flow, but since our users have been conditioned
+    // to expect a 'save as' flow during a rename, we are keeping the logic the same until a better
+    // UI/UX can be worked out.
+    if (savedObject.copyOnSave) {
+      delete savedObject.id;
+    }
+
+    savedObject.isSaving = true;
+
     await checkForDuplicateTitle(
       savedObject as any,
       isTitleDuplicateConfirmed,
       onTitleDuplicate,
       services
     );
-    savedObject.isSaving = true;
 
     const createOpt = {
       id: savedObject.id,