[desk-tool] Remove publish confirmation (#750)

sanity-io · Apr 23, 2018 · c8c6a32 · c8c6a32
1 parent 70035ab
commit c8c6a32
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 105 deletions.
diff --git a/packages/@sanity/desk-tool/src/components/ConfirmPublish.js b/packages/@sanity/desk-tool/src/components/ConfirmPublish.js
diff --git a/packages/@sanity/desk-tool/src/pane/Editor.js b/packages/@sanity/desk-tool/src/pane/Editor.js
@@ -21,13 +21,13 @@ import Pane from 'part:@sanity/components/panes/default'
 import afterEditorComponents from 'all:part:@sanity/desk-tool/after-editor-component'
 import SyncIcon from 'part:@sanity/base/sync-icon'
 import CheckIcon from 'part:@sanity/base/check-icon'
+import CheckCircleIcon from 'part:@sanity/base/circle-check-icon'
 import Snackbar from 'part:@sanity/components/snackbar/default'
 import resolveProductionPreviewUrl from 'part:@sanity/transitional/production-preview/resolve-production-url?'
 import ValidationList from 'part:@sanity/components/validation/list'
 import {Tooltip} from '@sanity/react-tippy'
 import ChevronDown from 'part:@sanity/base/chevron-down-icon'
 import WarningIcon from 'part:@sanity/base/warning-icon'
-import ConfirmPublish from '../components/ConfirmPublish'
 import ConfirmDiscard from '../components/ConfirmDiscard'
 import ConfirmDelete from '../components/ConfirmDelete'
 import ConfirmUnpublish from '../components/ConfirmUnpublish'
@@ -36,6 +36,7 @@ import copyDocument from '../utils/copyDocument'
 import {getPublishedId, newDraftFrom} from '../utils/draftUtils'
 import TimeAgo from '../components/TimeAgo'
 import styles from './styles/Editor.css'
+import DocTitle from '../components/DocTitle'
 
 function navigateUrl(url) {
   window.open(url)
@@ -152,7 +153,6 @@ const INITIAL_STATE = {
   isMenuOpen: false,
   isCreatingDraft: false,
   showSavingStatus: false,
-  showConfirmPublish: false,
   showConfirmDiscard: false,
   showConfirmDelete: false,
   showConfirmUnpublish: false,
@@ -246,6 +246,8 @@ export default withRouterHOC(
     }
 
     componentWillReceiveProps(nextProps) {
+      this.setState({didPublish: this.props.isPublishing && !nextProps.isPublishing})
+
       if (this.props.isSaving && !nextProps.isSaving) {
         this.setState({
           showSavingStatus: true
@@ -314,7 +316,7 @@ export default withRouterHOC(
     }
 
     handlePublishRequested = () => {
-      const {markers, validationPending} = this.props
+      const {markers, validationPending, onPublish, draft} = this.props
       const errors = markers.filter(isValidationError)
       const hasErrors = errors.length > 0
 
@@ -325,11 +327,7 @@ export default withRouterHOC(
         return
       }
 
-      this.setState({showConfirmPublish: true})
-    }
-
-    handleCancelConfirmPublish = () => {
-      this.setState({showConfirmPublish: false})
+      onPublish(draft)
     }
 
     handleCancelUnpublish = () => {
@@ -344,12 +342,6 @@ export default withRouterHOC(
       this.setState({showConfirmDiscard: false})
     }
 
-    handleConfirmPublish = () => {
-      const {onPublish, draft} = this.props
-      onPublish(draft)
-      this.setState({showConfirmPublish: false})
-    }
-
     handleConfirmUnpublish = () => {
       const {onUnpublish} = this.props
       onUnpublish()
@@ -393,10 +385,6 @@ export default withRouterHOC(
         this.setState({showConfirmUnpublish: true})
       }
 
-      if (item.action === 'publish') {
-        this.setState({showConfirmPublish: true})
-      }
-
       if (item.action === 'duplicate') {
         this.handleCreateCopy()
       }
@@ -581,10 +569,10 @@ export default withRouterHOC(
       const {
         inspect,
         focusPath,
-        showConfirmPublish,
         showConfirmDelete,
         showConfirmDiscard,
-        showConfirmUnpublish
+        showConfirmUnpublish,
+        didPublish
       } = this.state
 
       const value = draft || published
@@ -669,14 +657,6 @@ export default withRouterHOC(
             ))}
 
             {inspect && <InspectView value={value} onClose={this.handleHideInspector} />}
-            {showConfirmPublish && (
-              <ConfirmPublish
-                draft={draft}
-                published={published}
-                onCancel={this.handleCancelConfirmPublish}
-                onConfirm={this.handleConfirmPublish}
-              />
-            )}
             {showConfirmDiscard && (
               <ConfirmDiscard
                 draft={draft}
@@ -706,6 +686,14 @@ export default withRouterHOC(
                 <WarningIcon /> Connection lost. Reconnecting…
               </Snackbar>
             )}
+            {didPublish && (
+              <Snackbar kind="success" timeout={4}>
+                <CheckCircleIcon /> You just published{' '}
+                <em>
+                  <DocTitle document={draft || published} />
+                </em>
+              </Snackbar>
+            )}
             {transactionResult &&
               transactionResult.type === 'error' && (
                 <Snackbar