[Graph] Save modal

src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx

@@ -33,7 +33,6 @@ import { FilterBarQueryFilterProvider } from 'ui/filter_manager/query_filter';
 
 import { docTitle } from 'ui/doc_title/doc_title';
 
-// @ts-ignore
 import { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
 
 import { showShareContextMenu, ShareContextMenuExtensionsRegistryProvider } from 'ui/share';

src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_factory.tsx

@@ -41,10 +41,6 @@ import 'uiExports/visualize';
 import { i18n } from '@kbn/i18n';
 
 import { capabilities } from 'ui/capabilities';
-// @ts-ignore
-import { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
-// @ts-ignore
-import { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal';
 
 import chrome from 'ui/chrome';
 import { getVisualizeLoader } from 'ui/visualize/loader';

src/legacy/ui/public/_index.scss

@@ -19,6 +19,7 @@
 @import './exit_full_screen/index';
 @import './field_editor/index';
 @import './notify/index';
+@import './saved_objects/index';
 @import './share/index';
 @import './style_compile/index';
 

src/legacy/ui/public/saved_objects/_index.scss

@@ -0,0 +1 @@
+@import '../../../../plugins/kibana_react/public/saved_objects/index';

src/legacy/ui/public/saved_objects/show_saved_object_save_modal.js → src/legacy/ui/public/saved_objects/show_saved_object_save_modal.tsx

@@ -21,7 +21,25 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { I18nContext } from 'ui/i18n';
 
-export function showSaveModal(saveModal) {
+/**
+ * Represents the result of trying to persist the saved object.
+ * Contains `error` prop if something unexpected happened (e.g. network error).
+ * Contains an `id` if persisting was successful. If `id` and
+ * `error` are undefined, persisting was not successful, but the
+ * modal can still recover (e.g. the name of the saved object was already taken).
+ */
+type SaveResult = { id?: string } | { error: Error };
+
+function isError(result: SaveResult): result is { error: Error } {
+  return 'error' in result;
+}
+
+interface MinimalSaveModalProps {
+  onSave: (...args: any[]) => Promise<SaveResult>;
+  onClose: () => void;
+}
+
+export function showSaveModal(saveModal: React.ReactElement<MinimalSaveModalProps>) {
   const container = document.createElement('div');
   const closeModal = () => {
     ReactDOM.unmountComponentAtNode(container);
@@ -30,21 +48,19 @@ export function showSaveModal(saveModal) {
 
   const onSave = saveModal.props.onSave;
 
-  const onSaveConfirmed = (...args) => {
-    onSave(...args).then(({ id, error }) => {
-      if (id || error) {
-        closeModal();
-      }
-    });
+  const onSaveConfirmed: MinimalSaveModalProps['onSave'] = async (...args) => {
+    const response = await onSave(...args);
+    // close modal if we either hit an error or the saved object got an id
+    if (Boolean(isError(response) ? response.error : response.id)) {
+      closeModal();
+    }
+    return response;
   };
   document.body.appendChild(container);
-  const element = React.cloneElement(
-    saveModal,
-    {
-      onSave: onSaveConfirmed,
-      onClose: closeModal
-    }
-  );
+  const element = React.cloneElement(saveModal, {
+    onSave: onSaveConfirmed,
+    onClose: closeModal,
+  });
 
   ReactDOM.render(<I18nContext>{element}</I18nContext>, container);
 }

src/plugins/kibana_react/public/saved_objects/_index.scss

@@ -0,0 +1 @@
+@import './saved_object_save_modal';

src/plugins/kibana_react/public/saved_objects/saved_object_save_modal.scss

@@ -0,0 +1,3 @@
+.saveModal {
+  width: $euiSizeXXL * 10;
+}

src/plugins/kibana_react/public/saved_objects/saved_object_save_modal.tsx

@@ -35,8 +35,9 @@ import {
 import { FormattedMessage } from '@kbn/i18n/react';
 import React from 'react';
 import { EuiText } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 
-interface OnSaveProps {
+export interface OnSaveProps {
   newTitle: string;
   newCopyOnSave: boolean;
   isTitleDuplicateConfirmed: boolean;
@@ -72,14 +73,14 @@ export class SavedObjectSaveModal extends React.Component<Props, State> {
   };
 
   public render() {
-    const { isTitleDuplicateConfirmed, hasTitleDuplicate, title, isLoading } = this.state;
+    const { isTitleDuplicateConfirmed, hasTitleDuplicate, title } = this.state;
 
     return (
       <EuiOverlayMask>
         <form onSubmit={this.onFormSubmit}>
           <EuiModal
             data-test-subj="savedObjectSaveModal"
-            className="dshSaveModal"
+            className="saveModal"
             onClose={this.props.onClose}
           >
             <EuiModalHeader>
@@ -136,22 +137,7 @@ export class SavedObjectSaveModal extends React.Component<Props, State> {
                 />
               </EuiButtonEmpty>
 
-              <EuiButton
-                fill
-                data-test-subj="confirmSaveSavedObjectButton"
-                isLoading={isLoading}
-                isDisabled={title.length === 0}
-                type="submit"
-              >
-                {this.props.confirmButtonLabel ? (
-                  this.props.confirmButtonLabel
-                ) : (
-                  <FormattedMessage
-                    id="kibana-react.savedObjects.saveModal.confirmSaveButtonLabel"
-                    defaultMessage="Confirm Save"
-                  />
-                )}
-              </EuiButton>
+              {this.renderConfirmButton()}
             </EuiModalFooter>
           </EuiModal>
         </form>
@@ -204,6 +190,34 @@ export class SavedObjectSaveModal extends React.Component<Props, State> {
     this.saveSavedObject();
   };
 
+  private renderConfirmButton = () => {
+    const { isLoading, title, hasTitleDuplicate } = this.state;
+
+    let confirmLabel: string | React.ReactNode = hasTitleDuplicate
+      ? i18n.translate('kibana-react.savedObjects.saveModal.confirmSaveButtonLabel', {
+          defaultMessage: 'Confirm save',
+        })
+      : i18n.translate('kibana-react.savedObjects.saveModal.saveButtonLabel', {
+          defaultMessage: 'Save',
+        });
+
+    if (this.props.confirmButtonLabel) {
+      confirmLabel = this.props.confirmButtonLabel;
+    }
+
+    return (
+      <EuiButton
+        fill
+        data-test-subj="confirmSaveSavedObjectButton"
+        isLoading={isLoading}
+        isDisabled={title.length === 0}
+        type="submit"
+      >
+        {confirmLabel}
+      </EuiButton>
+    );
+  };
+
   private renderDuplicateTitleCallout = () => {
     if (!this.state.hasTitleDuplicate) {
       return;
@@ -230,10 +244,14 @@ export class SavedObjectSaveModal extends React.Component<Props, State> {
                 objectType: this.props.objectType,
                 confirmSaveLabel: (
                   <strong>
-                    <FormattedMessage
-                      id="kibana-react.savedObjects.saveModal.duplicateTitleDescription.confirmSaveText"
-                      defaultMessage="Confirm Save"
-                    />
+                    {this.props.confirmButtonLabel
+                      ? this.props.confirmButtonLabel
+                      : i18n.translate(
+                          'kibana-react.savedObjects.saveModal.duplicateTitleDescription.confirmSaveText',
+                          {
+                            defaultMessage: 'Confirm save',
+                          }
+                        )}
                   </strong>
                 ),
               }}

x-pack/legacy/plugins/graph/public/angular/templates/index.html

@@ -3,8 +3,7 @@
   <kbn-top-nav name="workspacesTopNav" config="topNavMenu">
   </kbn-top-nav>
 
-  <div class="gphGraph__menus" ng-show="menus.showSave || menus.showSettings">
-    <graph-save ng-show="menus.showSave"></graph-save>
+  <div class="gphGraph__menus" ng-show="menus.showSettings">
     <graph-settings ng-show="menus.showSettings"></graph-settings>
   </div>