improve graph missing workspace error message

flash1293 · flash1293 · commit 9ec42ca269c0 · 2020-02-28T15:41:28.000+01:00
diff --git a/x-pack/legacy/plugins/graph/public/app.js b/x-pack/legacy/plugins/graph/public/app.js
@@ -132,14 +132,20 @@ export function initGraphApp(angularModule, deps) {
         template: appTemplate,
         badge: getReadonlyBadge,
         resolve: {
-          savedWorkspace: function($route) {
+          savedWorkspace: function($rootScope, $route, $location) {
             return $route.current.params.id
-              ? savedWorkspaceLoader.get($route.current.params.id).catch(function() {
-                  toastNotifications.addDanger(
-                    i18n.translate('xpack.graph.missingWorkspaceErrorMessage', {
-                      defaultMessage: 'Missing workspace',
-                    })
-                  );
+              ? savedWorkspaceLoader.get($route.current.params.id).catch(function(e) {
+                  toastNotifications.addError(e, {
+                    title: i18n.translate('xpack.graph.missingWorkspaceErrorMessage', {
+                      defaultMessage: "Couldn't load graph with ID",
+                    }),
+                  });
+                  $rootScope.$eval(() => {
+                    $location.path('/home');
+                    $location.replace();
+                  });
+                  // return promise that never returns to prevent the controller from loading
+                  return new Promise();
                 })
               : savedWorkspaceLoader.get();
           },
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -5734,7 +5734,6 @@
     "xpack.graph.listing.table.entityNamePlural": "グラフ",
     "xpack.graph.listing.table.titleColumnName": "タイトル",
     "xpack.graph.loadWorkspace.missingIndexPatternErrorMessage": "インデックスパターンが見つかりませんでした",
-    "xpack.graph.missingWorkspaceErrorMessage": "ワークスペースがありません",
     "xpack.graph.newGraphTitle": "保存されていないグラフ",
     "xpack.graph.noDataSourceNotificationMessageText": "データソースが見つかりませんでした。{managementIndexPatternsLink} に移動して Elasticsearch インデックスのインデックスパターンを作成してください。",
     "xpack.graph.noDataSourceNotificationMessageText.managementIndexPatternLinkText": "管理>インデックスパターン",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -5734,7 +5734,6 @@
     "xpack.graph.listing.table.entityNamePlural": "图表",
     "xpack.graph.listing.table.titleColumnName": "标题",
     "xpack.graph.loadWorkspace.missingIndexPatternErrorMessage": "未找到索引模式",
-    "xpack.graph.missingWorkspaceErrorMessage": "缺少工作空间",
     "xpack.graph.newGraphTitle": "未保存图表",
     "xpack.graph.noDataSourceNotificationMessageText": "未找到数据源。前往 {managementIndexPatternsLink}，为您的 Elasticsearch 索引创建索引模式。",
     "xpack.graph.noDataSourceNotificationMessageText.managementIndexPatternLinkText": "管理 > 索引模式",
