From 1dcc399cf5b310dcea827f49f44fa32701fb5522 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Thu, 10 Sep 2020 16:31:29 -0400
Subject: [PATCH 01/16] Add save and continue dropdown component.

---
 .../publish/SaveAndContinueOptions.vue        | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 resources/js/components/publish/SaveAndContinueOptions.vue

diff --git a/resources/js/components/publish/SaveAndContinueOptions.vue b/resources/js/components/publish/SaveAndContinueOptions.vue
new file mode 100644
index 0000000000..7daea7fbf0
--- /dev/null
+++ b/resources/js/components/publish/SaveAndContinueOptions.vue
@@ -0,0 +1,73 @@
+<template>
+
+    <div :class="{ 'btn-group': showOptions }">
+
+        <!-- Save button -->
+        <slot></slot>
+
+        <!-- Save and continue options dropdown -->
+        <dropdown-list v-if="showOptions" class="text-left">
+            <template v-slot:trigger>
+                <button :class="buttonClass" class="rounded-l-none">
+                    <svg-icon name="chevron-down-xs" class="w-2" />
+                </button>
+            </template>
+            <h6 v-text="__('After Saving')" class="p-1" />
+            <div class="publish-fields px-1">
+                <div class="publish-field save-and-continue-options">
+                    <radio-fieldtype
+                        handle="save_and_continue_options"
+                        :config="options"
+                        v-model="currentOption"
+                    />
+                </div>
+            </div>
+        </dropdown-list>
+
+    </div>
+
+</template>
+
+<script>
+export default {
+
+    props: {
+        showOptions: {
+            type: Boolean,
+            default: true
+        },
+        buttonClass: {
+            default: 'btn-primary',
+        },
+    },
+
+    data() {
+        return {
+            currentOption: 'listing',
+        };
+    },
+
+    computed: {
+        options() {
+            return {
+                options: {
+                    listing: __('Go To Listing'),
+                    continue: __('Continue Editing'),
+                    another: __('Create Another'),
+                },
+                default: 'listing',
+            };
+        },
+    },
+
+}
+</script>
+
+<style>
+    .save-and-continue-options input {
+        margin-bottom: 9px;
+    }
+    .save-and-continue-options input {
+        margin-right: 5px;
+    }
+</style>

From bbf3945ff6ae8e5c3a6af83373feb76506b2a5f6 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Thu, 10 Sep 2020 16:31:53 -0400
Subject: [PATCH 02/16] Add save and continue dropdown to entry publish form.

---
 .../js/components/entries/PublishForm.vue     | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/resources/js/components/entries/PublishForm.vue b/resources/js/components/entries/PublishForm.vue
index d53274946d..294839933c 100644
--- a/resources/js/components/entries/PublishForm.vue
+++ b/resources/js/components/entries/PublishForm.vue
@@ -20,15 +20,19 @@
             </div>
 
             <div class="hidden md:flex items-center">
-                <button
+
+                <save-and-continue-options
                     v-if="!readOnly"
-                    :class="{
-                        'btn': revisionsEnabled,
-                        'btn-primary': isCreating || !revisionsEnabled,
-                    }"
-                    :disabled="!canSave"
-                    @click.prevent="save"
-                    v-text="saveText" />
+                    :show-options="!revisionsEnabled"
+                    :button-class="saveButtonClass"
+                >
+                    <button
+                        :class="saveButtonClass"
+                        :disabled="!canSave"
+                        @click.prevent="save"
+                        v-text="saveText"
+                    />
+                </save-and-continue-options>
 
                 <button
                     v-if="revisionsEnabled && !isCreating"
@@ -248,13 +252,15 @@
 
 
 <script>
-import PublishActions from './PublishActions.vue';
-import RevisionHistory from '../revision-history/History.vue';
+import PublishActions from './PublishActions';
+import SaveAndContinueOptions from '../publish/SaveAndContinueOptions';
+import RevisionHistory from '../revision-history/History';
 
 export default {
 
     components: {
         PublishActions,
+        SaveAndContinueOptions,
         RevisionHistory,
     },
 
@@ -374,7 +380,14 @@ export default {
             if (!this.published && this.initialPublished) return __('Save & Unpublish');
 
             return __('Save');
-        }
+        },
+
+        saveButtonClass() {
+            return {
+                'btn': this.revisionsEnabled,
+                'btn-primary': this.isCreating || ! this.revisionsEnabled,
+            };
+        },
 
     },
 

From 14c9cc4accf770bd3e936bc3073ad76f648f7d8d Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Thu, 10 Sep 2020 17:11:38 -0400
Subject: [PATCH 03/16] Wire up save button option to user preferences.

---
 .../js/components/entries/PublishForm.vue     |  9 +++--
 ...tinueOptions.vue => SaveButtonOptions.vue} | 37 +++++++++++++++++--
 2 files changed, 38 insertions(+), 8 deletions(-)
 rename resources/js/components/publish/{SaveAndContinueOptions.vue => SaveButtonOptions.vue} (63%)

diff --git a/resources/js/components/entries/PublishForm.vue b/resources/js/components/entries/PublishForm.vue
index 294839933c..6cf7fa1b29 100644
--- a/resources/js/components/entries/PublishForm.vue
+++ b/resources/js/components/entries/PublishForm.vue
@@ -21,10 +21,11 @@
 
             <div class="hidden md:flex items-center">
 
-                <save-and-continue-options
+                <save-button-options
                     v-if="!readOnly"
                     :show-options="!revisionsEnabled"
                     :button-class="saveButtonClass"
+                    :preferences-prefix="`collections.${collectionHandle}`"
                 >
                     <button
                         :class="saveButtonClass"
@@ -32,7 +33,7 @@
                         @click.prevent="save"
                         v-text="saveText"
                     />
-                </save-and-continue-options>
+                </save-button-options>
 
                 <button
                     v-if="revisionsEnabled && !isCreating"
@@ -253,14 +254,14 @@
 
 <script>
 import PublishActions from './PublishActions';
-import SaveAndContinueOptions from '../publish/SaveAndContinueOptions';
+import SaveButtonOptions from '../publish/SaveButtonOptions';
 import RevisionHistory from '../revision-history/History';
 
 export default {
 
     components: {
         PublishActions,
-        SaveAndContinueOptions,
+        SaveButtonOptions,
         RevisionHistory,
     },
 
diff --git a/resources/js/components/publish/SaveAndContinueOptions.vue b/resources/js/components/publish/SaveButtonOptions.vue
similarity index 63%
rename from resources/js/components/publish/SaveAndContinueOptions.vue
rename to resources/js/components/publish/SaveButtonOptions.vue
index 7daea7fbf0..4d22173395 100644
--- a/resources/js/components/publish/SaveAndContinueOptions.vue
+++ b/resources/js/components/publish/SaveButtonOptions.vue
@@ -39,11 +39,15 @@ export default {
         buttonClass: {
             default: 'btn-primary',
         },
+        preferencesPrefix: {
+            type: String,
+            required: true,
+        },
     },
 
     data() {
         return {
-            currentOption: 'listing',
+            currentOption: null,
         };
     },
 
@@ -52,12 +56,37 @@ export default {
             return {
                 options: {
                     listing: __('Go To Listing'),
-                    continue: __('Continue Editing'),
-                    another: __('Create Another'),
+                    continue_editing: __('Continue Editing'),
+                    add_another: __('Create Another'),
                 },
-                default: 'listing',
             };
         },
+
+        preferencesKey() {
+            return `${this.preferencesPrefix}.after_save`;
+        },
+    },
+
+    watch: {
+        currentOption: 'setPreference',
+    },
+
+    mounted() {
+        this.setInitialValue();
+    },
+
+    methods: {
+        setInitialValue() {
+            this.currentOption = this.$preferences.get(this.preferencesKey) || 'listing';
+        },
+
+        setPreference(value) {
+            if (value === this.$preferences.get(this.preferencesKey)) return;
+
+            value === 'listing'
+                ? this.$preferences.remove(this.preferencesKey)
+                : this.$preferences.set(this.preferencesKey, value);
+        },
     },
 
 }

From b4120fc1f5f715e3aae6124cb8b7e42fe041a910 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Fri, 11 Sep 2020 10:28:18 -0400
Subject: [PATCH 04/16] Rename option key.

---
 resources/js/components/publish/SaveButtonOptions.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/publish/SaveButtonOptions.vue b/resources/js/components/publish/SaveButtonOptions.vue
index 4d22173395..638585ea81 100644
--- a/resources/js/components/publish/SaveButtonOptions.vue
+++ b/resources/js/components/publish/SaveButtonOptions.vue
@@ -57,7 +57,7 @@ export default {
                 options: {
                     listing: __('Go To Listing'),
                     continue_editing: __('Continue Editing'),
-                    add_another: __('Create Another'),
+                    create_another: __('Create Another'),
                 },
             };
         },

From d480e031efeabe5f004a6f6f62fcd3d8958283c9 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Fri, 11 Sep 2020 10:29:13 -0400
Subject: [PATCH 05/16] Clean up preference handling on publish form.

---
 resources/js/components/entries/PublishForm.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/entries/PublishForm.vue b/resources/js/components/entries/PublishForm.vue
index 6cf7fa1b29..344502cc5e 100644
--- a/resources/js/components/entries/PublishForm.vue
+++ b/resources/js/components/entries/PublishForm.vue
@@ -25,7 +25,7 @@
                     v-if="!readOnly"
                     :show-options="!revisionsEnabled"
                     :button-class="saveButtonClass"
-                    :preferences-prefix="`collections.${collectionHandle}`"
+                    :preferences-prefix="preferencesPrefix"
                 >
                     <button
                         :class="saveButtonClass"
@@ -256,9 +256,14 @@
 import PublishActions from './PublishActions';
 import SaveButtonOptions from '../publish/SaveButtonOptions';
 import RevisionHistory from '../revision-history/History';
+import HasPreferences from '../data-list/HasPreferences';
 
 export default {
 
+    mixins: [
+        HasPreferences,
+    ],
+
     components: {
         PublishActions,
         SaveButtonOptions,
@@ -316,6 +321,7 @@ export default {
             state: 'new',
             revisionMessage: null,
             showRevisionHistory: false,
+            preferencesPrefix: `collections.${this.collectionHandle}`,
 
             // Whether it was published the last time it was saved.
             // Successful publish actions (if using revisions) or just saving (if not) will update this.
@@ -390,6 +396,10 @@ export default {
             };
         },
 
+        afterSaveOption() {
+            return this.getPreference('after_save');
+        },
+
     },
 
     watch: {

From cc0c38986afbdeeb4768b9c28058fb96e7dd3bb2 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Fri, 11 Sep 2020 10:30:32 -0400
Subject: [PATCH 06/16] Pass `listingUrl` and `createAnotherUrl` to entry
 publish forms.

---
 resources/js/components/entries/BaseCreateForm.vue | 4 ++++
 resources/js/components/entries/PublishForm.vue    | 4 +++-
 resources/views/entries/create.blade.php           | 2 ++
 resources/views/entries/edit.blade.php             | 2 ++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/entries/BaseCreateForm.vue b/resources/js/components/entries/BaseCreateForm.vue
index ea47d8e507..358de8d486 100644
--- a/resources/js/components/entries/BaseCreateForm.vue
+++ b/resources/js/components/entries/BaseCreateForm.vue
@@ -17,6 +17,8 @@
         :revisions-enabled="revisions"
         :breadcrumbs="breadcrumbs"
         :initial-site="site"
+        :create-another-url="createAnotherUrl"
+        :listing-url="listingUrl"
         @saved="saved"
     ></entry-publish-form>
 
@@ -35,6 +37,8 @@ export default {
         'revisions',
         'breadcrumbs',
         'site',
+        'createAnotherUrl',
+        'listingUrl',
     ],
 
     methods: {
diff --git a/resources/js/components/entries/PublishForm.vue b/resources/js/components/entries/PublishForm.vue
index 344502cc5e..cb79dccb6b 100644
--- a/resources/js/components/entries/PublishForm.vue
+++ b/resources/js/components/entries/PublishForm.vue
@@ -295,7 +295,9 @@ export default {
         initialPermalink: String,
         revisionsEnabled: Boolean,
         preloadedAssets: Array,
-        canEditBlueprint: Boolean
+        canEditBlueprint: Boolean,
+        createAnotherUrl: String,
+        listingUrl: String,
     },
 
     data() {
diff --git a/resources/views/entries/create.blade.php b/resources/views/entries/create.blade.php
index db25fc8dc6..ea31be4c67 100644
--- a/resources/views/entries/create.blade.php
+++ b/resources/views/entries/create.blade.php
@@ -14,6 +14,8 @@
         :revisions="{{ Statamic\Support\Str::bool($revisionsEnabled ) }}"
         :breadcrumbs="{{ $breadcrumbs->toJson() }}"
         site="{{ $locale }}"
+        create-another-url="{{ cp_route('collections.entries.create', [$collection, $locale]) }}"
+        listing-url="{{ cp_route('collections.show', $collection) }}"
     ></base-entry-create-form>
 
 @endsection
diff --git a/resources/views/entries/edit.blade.php b/resources/views/entries/edit.blade.php
index 7d344b7449..c3640782df 100644
--- a/resources/views/entries/edit.blade.php
+++ b/resources/views/entries/edit.blade.php
@@ -30,6 +30,8 @@
         :preloaded-assets="{{ json_encode($preloadedAssets) }}"
         :breadcrumbs="{{ $breadcrumbs->toJson() }}"
         :can-edit-blueprint="{{ $str::bool($user->can('configure fields')) }}"
+        create-another-url="{{ cp_route('collections.entries.create', [$collection, $locale]) }}"
+        listing-url="{{ cp_route('collections.show', $collection) }}"
     ></entry-publish-form>
 
 @endsection

From bb058e699f0cb57db33d84d1f9a9ff7b79e30816 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Fri, 11 Sep 2020 10:30:46 -0400
Subject: [PATCH 07/16] Wire up redirect after save logic.

---
 .../js/components/entries/PublishForm.vue     | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/entries/PublishForm.vue b/resources/js/components/entries/PublishForm.vue
index cb79dccb6b..6d3b8bfa8c 100644
--- a/resources/js/components/entries/PublishForm.vue
+++ b/resources/js/components/entries/PublishForm.vue
@@ -476,9 +476,22 @@ export default {
                 .then(() => {
                     if (! this.revisionsEnabled) this.initialPublished = response.data.published;
 
-                    // Finally, we'll emit an event. We need to wait until after the hooks are resolved because
-                    // if this form is being shown in a stack, we only want to close it once everything's done.
-                    this.$nextTick(() => this.$emit('saved', response));
+                    // If the user has opted to create another entry, redirect them to create page.
+                    if (this.afterSaveOption === 'create_another') {
+                        window.location = this.createAnotherUrl;
+                    }
+
+                    // If the user has opted to go to listing (default/null option), redirect them there.
+                    else if (this.afterSaveOption === null) {
+                        window.location = this.listingUrl;
+                    }
+
+                    // Otherwise, leave them on the edit form and emit an event. We need to wait until after
+                    // the hooks are resolved because if this form is being shown in a stack, we only
+                    // want to close it once everything's done.
+                    else {
+                        this.$nextTick(() => this.$emit('saved', response));
+                    }
                 }).catch(e => {});
         },
 

From 7439e40cefd81523917d2c250fb4aeb863695a3d Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Fri, 11 Sep 2020 10:43:30 -0400
Subject: [PATCH 08/16] Guard when revisions are enabled.

---
 resources/js/components/entries/PublishForm.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/entries/PublishForm.vue b/resources/js/components/entries/PublishForm.vue
index 6d3b8bfa8c..e3ccb46568 100644
--- a/resources/js/components/entries/PublishForm.vue
+++ b/resources/js/components/entries/PublishForm.vue
@@ -474,7 +474,11 @@ export default {
                     response
                 })
                 .then(() => {
-                    if (! this.revisionsEnabled) this.initialPublished = response.data.published;
+                    // If revisions are enabled, just emit event.
+                    if (this.revisionsEnabled) {
+                        this.$nextTick(() => this.$emit('saved', response));
+                        return;
+                    }
 
                     // If the user has opted to create another entry, redirect them to create page.
                     if (this.afterSaveOption === 'create_another') {
@@ -490,6 +494,7 @@ export default {
                     // the hooks are resolved because if this form is being shown in a stack, we only
                     // want to close it once everything's done.
                     else {
+                        this.initialPublished = response.data.published;
                         this.$nextTick(() => this.$emit('saved', response));
                     }
                 }).catch(e => {});

From 7350cd433d93a330332b248d11cb1cba59991288 Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 11 Sep 2020 11:37:51 -0400
Subject: [PATCH 09/16] =?UTF-8?q?=F0=9F=93=9D=20Save=20button=20text=20now?=
 =?UTF-8?q?=20shows=20what=20happens=20next?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/components/entries/PublishForm.vue     | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/entries/PublishForm.vue b/resources/js/components/entries/PublishForm.vue
index e3ccb46568..6611c135a1 100644
--- a/resources/js/components/entries/PublishForm.vue
+++ b/resources/js/components/entries/PublishForm.vue
@@ -40,8 +40,7 @@
                     class="ml-2 btn-primary flex items-center"
                     :disabled="!canPublish"
                     @click="confirmingPublish = true">
-                    <span v-text="__('Publish')" />
-                    <svg-icon name="chevron-down-xs" class="ml-1 w-2" />
+                    <span>{{ __('Publish') }}…</span>
                 </button>
             </div>
 
@@ -384,13 +383,33 @@ export default {
         saveText() {
             if (this.revisionsEnabled) return __('Save Changes');
 
-            if (this.published) return __('Save & Publish');
+            if (this.isCreating && this.published && this.afterSaveOption === 'create_another') {
+                return __('Publish & Create Another')
+            }
+            if (this.isCreating && this.published && this.afterSaveOption === 'continue_editing') {
+                return __('Publish & Continue')
+            }
 
-            if (!this.published && this.initialPublished) return __('Save & Unpublish');
+            if (this.isCreating && this.published && ! this.afterSaveOption) {
+                return __('Publish')
+            }
+
+            if (this.published && this.afterSaveOption === 'create_another') {
+                return __('Save & Create Another')
+            }
+            if (this.published && this.afterSaveOption === 'continue_editing') {
+                return __('Save & Continue')
+            }
+
+            if (this.isUnpublishing) return __('Save & Unpublish');
 
             return __('Save');
         },
 
+        isUnpublishing() {
+            return !this.published && this.initialPublished;
+        },
+
         saveButtonClass() {
             return {
                 'btn': this.revisionsEnabled,

From d2571ac6bb81ec20a190a17114cbccdb1714605e Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 11 Sep 2020 11:46:05 -0400
Subject: [PATCH 10/16] =?UTF-8?q?=F0=9F=93=9D=20Continue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/js/components/entries/PublishForm.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/entries/PublishForm.vue b/resources/js/components/entries/PublishForm.vue
index 6611c135a1..7abb4749d1 100644
--- a/resources/js/components/entries/PublishForm.vue
+++ b/resources/js/components/entries/PublishForm.vue
@@ -387,7 +387,7 @@ export default {
                 return __('Publish & Create Another')
             }
             if (this.isCreating && this.published && this.afterSaveOption === 'continue_editing') {
-                return __('Publish & Continue')
+                return __('Publish & Continue Editing')
             }
 
             if (this.isCreating && this.published && ! this.afterSaveOption) {
@@ -398,7 +398,7 @@ export default {
                 return __('Save & Create Another')
             }
             if (this.published && this.afterSaveOption === 'continue_editing') {
-                return __('Save & Continue')
+                return __('Save & Continue Editing')
             }
 
             if (this.isUnpublishing) return __('Save & Unpublish');

From 5f0b8cafc9738a9b5bdde8c0551531cc28703a04 Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 11 Sep 2020 11:55:18 -0400
Subject: [PATCH 11/16] =?UTF-8?q?=F0=9F=93=9D=20I=20only=20missed=20half?=
 =?UTF-8?q?=20of=20the=20states.=20NBD.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/components/entries/PublishForm.vue     | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/entries/PublishForm.vue b/resources/js/components/entries/PublishForm.vue
index 7abb4749d1..17b0b96aaf 100644
--- a/resources/js/components/entries/PublishForm.vue
+++ b/resources/js/components/entries/PublishForm.vue
@@ -390,6 +390,18 @@ export default {
                 return __('Publish & Continue Editing')
             }
 
+            if (this.isCreating && ! this.published && this.afterSaveOption === 'create_another') {
+                return ('Save & Create Another');
+            }
+
+            if (this.isCreating && ! this.published && this.afterSaveOption === 'continue_editing') {
+                return ('Save & Continue Editing');
+            }
+
+            if (this.isCreating && ! this.published && ! this.afterSaveOption) {
+                return ('Save');
+            }
+
             if (this.isCreating && this.published && ! this.afterSaveOption) {
                 return __('Publish')
             }
@@ -401,7 +413,17 @@ export default {
                 return __('Save & Continue Editing')
             }
 
-            if (this.isUnpublishing) return __('Save & Unpublish');
+            if (this.isUnpublishing && this.afterSaveOption === 'create_another') {
+                return __('Unpublish & Create Another')
+            }
+
+            if (this.isUnpublishing && this.afterSaveOption === 'continue_editing') {
+                return __('Unpublish & Continue Editing')
+            }
+
+            if (this.isUnpublishing && ! this.afterSaveOption) {
+                return __('Unpublish')
+            }
 
             return __('Save');
         },

From 5a197ee5823b1fdd0dba724cf4c2ee6e764495bb Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 11 Sep 2020 13:21:34 -0400
Subject: [PATCH 12/16] =?UTF-8?q?=F0=9F=92=84=20Using=20buttons=20instead?=
 =?UTF-8?q?=20of=20text=20to=20convey=20next=20action?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/components/entries/PublishForm.vue     | 82 +++++++------------
 .../components/publish/SaveButtonOptions.vue  | 13 ++-
 resources/svg/micro-add-circle.svg            |  1 +
 resources/svg/micro-arrow-go-back.svg         |  1 +
 4 files changed, 43 insertions(+), 54 deletions(-)
 create mode 100644 resources/svg/micro-add-circle.svg
 create mode 100644 resources/svg/micro-arrow-go-back.svg

diff --git a/resources/js/components/entries/PublishForm.vue b/resources/js/components/entries/PublishForm.vue
index 17b0b96aaf..65ff5b5360 100644
--- a/resources/js/components/entries/PublishForm.vue
+++ b/resources/js/components/entries/PublishForm.vue
@@ -181,15 +181,16 @@
                 </div>
                 <template v-slot:buttons>
                    <button
-                    v-if="!readOnly"
-                    class="ml-2"
-                    :class="{
-                        'btn': revisionsEnabled,
-                        'btn-primary': isCreating || !revisionsEnabled,
-                    }"
-                    :disabled="!canSave"
-                    @click.prevent="save"
-                    v-text="saveText" />
+                        v-if="!readOnly"
+                        class="ml-2"
+                        :class="{
+                            'btn': revisionsEnabled,
+                            'btn-primary': isCreating || !revisionsEnabled,
+                        }"
+                        :disabled="!canSave"
+                        @click.prevent="save"
+                        v-text="saveText">
+                    </button>
 
                     <button
                         v-if="revisionsEnabled && !isCreating"
@@ -381,57 +382,32 @@ export default {
         },
 
         saveText() {
-            if (this.revisionsEnabled) return __('Save Changes');
-
-            if (this.isCreating && this.published && this.afterSaveOption === 'create_another') {
-                return __('Publish & Create Another')
-            }
-            if (this.isCreating && this.published && this.afterSaveOption === 'continue_editing') {
-                return __('Publish & Continue Editing')
-            }
-
-            if (this.isCreating && ! this.published && this.afterSaveOption === 'create_another') {
-                return ('Save & Create Another');
-            }
-
-            if (this.isCreating && ! this.published && this.afterSaveOption === 'continue_editing') {
-                return ('Save & Continue Editing');
-            }
-
-            if (this.isCreating && ! this.published && ! this.afterSaveOption) {
-                return ('Save');
-            }
-
-            if (this.isCreating && this.published && ! this.afterSaveOption) {
-                return __('Publish')
-            }
-
-            if (this.published && this.afterSaveOption === 'create_another') {
-                return __('Save & Create Another')
-            }
-            if (this.published && this.afterSaveOption === 'continue_editing') {
-                return __('Save & Continue Editing')
+            switch(true) {
+                case this.revisionsEnabled:
+                    return __('Save Changes')
+                case this.isUnpublishing:
+                    return __('Unpublish')
+                case this.isPublishingDraft:
+                    return __('Publish')
+                case this.isCreating && this.published:
+                    return __('Publish')
+                case this.published:
+                    return __('Save');
+                case this.isCreating && ! this.published:
+                    return ('Save')
+                default:
+                    return __('Save')
             }
-
-            if (this.isUnpublishing && this.afterSaveOption === 'create_another') {
-                return __('Unpublish & Create Another')
-            }
-
-            if (this.isUnpublishing && this.afterSaveOption === 'continue_editing') {
-                return __('Unpublish & Continue Editing')
-            }
-
-            if (this.isUnpublishing && ! this.afterSaveOption) {
-                return __('Unpublish')
-            }
-
-            return __('Save');
         },
 
         isUnpublishing() {
             return !this.published && this.initialPublished;
         },
 
+        isPublishingDraft() {
+            return this.published && ! this.initialPublished;
+        },
+
         saveButtonClass() {
             return {
                 'btn': this.revisionsEnabled,
diff --git a/resources/js/components/publish/SaveButtonOptions.vue b/resources/js/components/publish/SaveButtonOptions.vue
index 638585ea81..2cf710943a 100644
--- a/resources/js/components/publish/SaveButtonOptions.vue
+++ b/resources/js/components/publish/SaveButtonOptions.vue
@@ -9,7 +9,7 @@
         <dropdown-list v-if="showOptions" class="text-left">
             <template v-slot:trigger>
                 <button :class="buttonClass" class="rounded-l-none">
-                    <svg-icon name="chevron-down-xs" class="w-2" />
+                    <svg-icon v-if="buttonIcon" :name="buttonIcon.name" :class="buttonIcon.class" />
                 </button>
             </template>
             <h6 v-text="__('After Saving')" class="p-1" />
@@ -62,6 +62,17 @@ export default {
             };
         },
 
+        buttonIcon() {
+            switch(true) {
+                case this.currentOption === 'listing':
+                    return {name: 'micro-arrow-go-back', class: 'w-3'};
+                case this.currentOption === 'continue_editing':
+                    return {name: 'chevron-down-xs', class: 'w-2'};
+                case this.currentOption === 'create_another':
+                    return {name: 'micro-add-circle', class: 'w-3'};
+            }
+        },
+
         preferencesKey() {
             return `${this.preferencesPrefix}.after_save`;
         },
diff --git a/resources/svg/micro-add-circle.svg b/resources/svg/micro-add-circle.svg
new file mode 100644
index 0000000000..2be56fa470
--- /dev/null
+++ b/resources/svg/micro-add-circle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svgjs="http://svgjs.com/svgjs" viewBox="0 0 16 16" width="16" height="16"><g transform="matrix(1.6,0,0,1.6,0,0)"><path d="M0.500 5.000 A4.500 4.500 0 1 0 9.500 5.000 A4.500 4.500 0 1 0 0.500 5.000 Z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path><path d="M5 3L5 7" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path><path d="M3 5L7 5" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path></g></svg>
\ No newline at end of file
diff --git a/resources/svg/micro-arrow-go-back.svg b/resources/svg/micro-arrow-go-back.svg
new file mode 100644
index 0000000000..91e3e8e126
--- /dev/null
+++ b/resources/svg/micro-arrow-go-back.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svgjs="http://svgjs.com/svgjs" viewBox="0 0 16 16" width="16" height="16"><g transform="matrix(1.1428571428571428,0,0,1.1428571428571428,0,0)"><path d="M3.5 11.5L0.5 8.5 3.5 5.5" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path><path d="M13.5,2.5v2a4,4,0,0,1-4,4H.5" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path></g></svg>
\ No newline at end of file

From a095fcbb807171f618c9b9cb2d8be8810ca5872c Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Mon, 14 Sep 2020 12:47:29 -0400
Subject: [PATCH 13/16] Use same `breadcrumbs` prop on terms publish form as we
 do on entries publish form.

---
 .../js/components/terms/BaseCreateForm.vue    |  8 ++---
 resources/js/components/terms/PublishForm.vue |  6 ++--
 resources/views/terms/create.blade.php        |  6 ++--
 resources/views/terms/edit.blade.php          |  5 ++--
 .../CP/Taxonomies/TermsController.php         | 30 ++++++++++++-------
 5 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/resources/js/components/terms/BaseCreateForm.vue b/resources/js/components/terms/BaseCreateForm.vue
index 244439c26c..e1198b0025 100644
--- a/resources/js/components/terms/BaseCreateForm.vue
+++ b/resources/js/components/terms/BaseCreateForm.vue
@@ -6,8 +6,8 @@
         :initial-actions="actions"
         method="post"
         :initial-title="__('Create')"
-        :taxonomy-title="taxonomyTitle"
-        :taxonomy-url="taxonomyUrl"
+        :taxonomy-handle="taxonomyHandle"
+        :breadcrumbs="breadcrumbs"
         :initial-fieldset="fieldset"
         :initial-values="values"
         :initial-meta="meta"
@@ -26,8 +26,8 @@ export default {
 
     props: [
         'actions',
-        'taxonomyTitle',
-        'taxonomyUrl',
+        'taxonomyHandle',
+        'breadcrumbs',
         'fieldset',
         'values',
         'meta',
diff --git a/resources/js/components/terms/PublishForm.vue b/resources/js/components/terms/PublishForm.vue
index 737b941eb9..23724aec7e 100644
--- a/resources/js/components/terms/PublishForm.vue
+++ b/resources/js/components/terms/PublishForm.vue
@@ -1,7 +1,7 @@
 <template>
 
     <div>
-        <breadcrumb :url="taxonomyUrl" :title="taxonomyTitle" />
+        <breadcrumb v-if="breadcrumbs" :url="breadcrumbs[1].url" :title="breadcrumbs[1].text" />
 
         <div class="flex items-center mb-3">
             <h1 class="flex-1">
@@ -250,8 +250,8 @@ export default {
         initialOriginMeta: Object,
         initialSite: String,
         initialIsWorkingCopy: Boolean,
-        taxonomyTitle: String,
-        taxonomyUrl: String,
+        taxonomyHandle: String,
+        breadcrumbs: Array,
         initialActions: Object,
         method: String,
         amp: Boolean,
diff --git a/resources/views/terms/create.blade.php b/resources/views/terms/create.blade.php
index 946614c33a..e6bb49fab4 100644
--- a/resources/views/terms/create.blade.php
+++ b/resources/views/terms/create.blade.php
@@ -1,12 +1,12 @@
 @extends('statamic::layout')
-@section('title', Statamic::crumb('Create Term', $taxonomy['title']))
+@section('title', $breadcrumbs->title('Create Term'))
 @section('wrapper_class', 'max-w-3xl')
 
 @section('content')
     <base-term-create-form
         :actions="{{ json_encode($actions) }}"
-        taxonomy-title="{{ $taxonomy['title'] }}"
-        taxonomy-url="{{ $taxonomy['url'] }}"
+        taxonomy-handle="{{ $taxonomy }}"
+        :breadcrumbs="{{ $breadcrumbs->toJson() }}"
         :fieldset="{{ json_encode($blueprint) }}"
         :values="{{ json_encode($values) }}"
         :meta="{{ json_encode($meta) }}"
diff --git a/resources/views/terms/edit.blade.php b/resources/views/terms/edit.blade.php
index 1575e626a3..f5948f1a2c 100644
--- a/resources/views/terms/edit.blade.php
+++ b/resources/views/terms/edit.blade.php
@@ -9,8 +9,8 @@
         publish-container="base"
         :initial-actions="{{ json_encode($actions) }}"
         method="patch"
-        taxonomy-title="{{ $taxonomy['title'] }}"
-        taxonomy-url="{{ $taxonomy['url'] }}"
+        taxonomy-handle="{{ $taxonomy }}"
+        :breadcrumbs="{{ $breadcrumbs->toJson() }}"
         initial-title="{{ $title }}"
         initial-reference="{{ $reference }}"
         :initial-fieldset="{{ json_encode($blueprint) }}"
@@ -30,6 +30,7 @@
         {{-- :amp="{{ $str::bool($term->ampable()) }}" --}}
         :initial-read-only="{{ $str::bool($readOnly) }}"
         :preloaded-assets="{{ json_encode($preloadedAssets) }}"
+        :breadcrumbs="{{ $breadcrumbs->toJson() }}"
     ></term-publish-form>
 
 @endsection
diff --git a/src/Http/Controllers/CP/Taxonomies/TermsController.php b/src/Http/Controllers/CP/Taxonomies/TermsController.php
index df82cfbf24..2abfa9397c 100644
--- a/src/Http/Controllers/CP/Taxonomies/TermsController.php
+++ b/src/Http/Controllers/CP/Taxonomies/TermsController.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Http\Request;
 use Statamic\Contracts\Taxonomies\Term as TermContract;
+use Statamic\CP\Breadcrumbs;
 use Statamic\Facades\Asset;
 use Statamic\Facades\Site;
 use Statamic\Facades\Term;
@@ -97,7 +98,7 @@ public function edit(Request $request, $taxonomy, $term)
             ],
             'values' => array_merge($values, ['id' => $term->id()]),
             'meta' => $meta,
-            'taxonomy' => $this->taxonomyToArray($taxonomy),
+            'taxonomy' => $taxonomy->handle(),
             'blueprint' => $blueprint->toPublishArray(),
             'readOnly' => User::current()->cant('edit', $term),
             'published' => $term->published(),
@@ -126,6 +127,7 @@ public function edit(Request $request, $taxonomy, $term)
             'hasWorkingCopy' => $term->hasWorkingCopy(),
             'preloadedAssets' => $this->extractAssetsFromValues($values),
             'revisionsEnabled' => $term->revisionsEnabled(),
+            'breadcrumbs' => $this->breadcrumbs($taxonomy),
         ];
 
         if ($request->wantsJson()) {
@@ -215,7 +217,7 @@ public function create(Request $request, $taxonomy, $site)
             ],
             'values' => $values,
             'meta' => $fields->meta(),
-            'taxonomy' => $this->taxonomyToArray($taxonomy),
+            'taxonomy' => $taxonomy->handle(),
             'blueprint' => $blueprint->toPublishArray(),
             'published' => $taxonomy->defaultPublishState(),
             'localizations' => $taxonomy->sites()->map(function ($handle) use ($taxonomy, $site) {
@@ -229,6 +231,7 @@ public function create(Request $request, $taxonomy, $site)
                     'livePreviewUrl' => cp_route('taxonomies.terms.preview.create', [$taxonomy->handle(), $handle]),
                 ];
             })->all(),
+            'breadcrumbs' => $this->breadcrumbs($taxonomy),
         ];
 
         if ($request->wantsJson()) {
@@ -275,15 +278,6 @@ public function store(Request $request, $taxonomy, $site)
         return ['data' => ['redirect' => $term->editUrl()]];
     }
 
-    // TODO: Change to $taxonomy->toArray()
-    protected function taxonomyToArray($taxonomy)
-    {
-        return [
-            'title' => $taxonomy->title(),
-            'url' => cp_route('taxonomies.show', $taxonomy->handle()),
-        ];
-    }
-
     protected function extractFromFields($term, $blueprint)
     {
         // The values should only be data merged with the origin data.
@@ -324,4 +318,18 @@ protected function extractAssetsFromValues($values)
             ->filter()
             ->values();
     }
+
+    protected function breadcrumbs($taxonomy)
+    {
+        return new Breadcrumbs([
+            [
+                'text' => __('Taxonomies'),
+                'url' => cp_route('taxonomies.index'),
+            ],
+            [
+                'text' => $taxonomy->title(),
+                'url' => $taxonomy->showUrl(),
+            ],
+        ]);
+    }
 }

From ced898f4b97e0c5ba901b39cd8f902d4e8e3ec97 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Mon, 14 Sep 2020 15:01:39 -0400
Subject: [PATCH 14/16] Add save and continue, etc. logic to terms publish
 form.

---
 .../js/components/terms/BaseCreateForm.vue    |  4 ++
 resources/js/components/terms/PublishForm.vue | 65 +++++++++++++++----
 resources/views/terms/create.blade.php        |  2 +
 resources/views/terms/edit.blade.php          |  2 +
 .../CP/Taxonomies/TermsController.php         |  1 +
 5 files changed, 63 insertions(+), 11 deletions(-)

diff --git a/resources/js/components/terms/BaseCreateForm.vue b/resources/js/components/terms/BaseCreateForm.vue
index e1198b0025..ec2bc14756 100644
--- a/resources/js/components/terms/BaseCreateForm.vue
+++ b/resources/js/components/terms/BaseCreateForm.vue
@@ -16,6 +16,8 @@
         :initial-has-origin="false"
         :initial-is-root="true"
         :initial-origin-values="{}"
+        :create-another-url="createAnotherUrl"
+        :listing-url="listingUrl"
         @saved="saved"
     ></term-publish-form>
 
@@ -33,6 +35,8 @@ export default {
         'meta',
         'published',
         'localizations',
+        'createAnotherUrl',
+        'listingUrl',
     ],
 
     methods: {
diff --git a/resources/js/components/terms/PublishForm.vue b/resources/js/components/terms/PublishForm.vue
index 23724aec7e..db46c8fd95 100644
--- a/resources/js/components/terms/PublishForm.vue
+++ b/resources/js/components/terms/PublishForm.vue
@@ -18,15 +18,20 @@
             </div>
 
             <div class="hidden md:flex items-center">
-                <button
+
+                <save-button-options
                     v-if="!readOnly"
-                    :class="{
-                        'btn': revisionsEnabled,
-                        'btn-primary': ! revisionsEnabled,
-                    }"
-                    :disabled="!canSave"
-                    @click.prevent="save"
-                    v-text="saveText" />
+                    :show-options="!revisionsEnabled"
+                    :button-class="saveButtonClass"
+                    :preferences-prefix="preferencesPrefix"
+                >
+                    <button
+                        :class="saveButtonClass"
+                        :disabled="!canSave"
+                        @click.prevent="save"
+                        v-text="saveText"
+                    />
+                </save-button-options>
 
                 <button
                     v-if="revisionsEnabled"
@@ -227,12 +232,19 @@
 
 <script>
 import PublishActions from './PublishActions.vue';
+import SaveButtonOptions from '../publish/SaveButtonOptions';
 import RevisionHistory from '../revision-history/History.vue';
+import HasPreferences from '../data-list/HasPreferences';
 
 export default {
 
+    mixins: [
+        HasPreferences,
+    ],
+
     components: {
         PublishActions,
+        SaveButtonOptions,
         RevisionHistory,
     },
 
@@ -262,6 +274,8 @@ export default {
         initialPermalink: String,
         revisionsEnabled: Boolean,
         preloadedAssets: Array,
+        createAnotherUrl: String,
+        listingUrl: String,
     },
 
     data() {
@@ -291,7 +305,8 @@ export default {
             confirmingPublish: false,
             readOnly: this.initialReadOnly,
             isRoot: this.initialIsRoot,
-            permalink: this.initialPermalink
+            permalink: this.initialPermalink,
+            preferencesPrefix: `taxonomies.${this.taxonomyHandle}`,
         }
     },
 
@@ -339,7 +354,18 @@ export default {
             if (!this.published && this.initialPublished) return __('Save & Unpublish');
 
             return __('Save');
-        }
+        },
+
+        saveButtonClass() {
+            return {
+                'btn': this.revisionsEnabled,
+                'btn-primary': ! this.revisionsEnabled,
+            };
+        },
+
+        afterSaveOption() {
+            return this.getPreference('after_save');
+        },
 
     },
 
@@ -381,7 +407,7 @@ export default {
                 this.isWorkingCopy = true;
                 if (!this.isCreating) this.$toast.success(__('Saved'));
                 this.$refs.container.saved();
-                this.$nextTick(() => this.$emit('saved', response));
+                this.handleSuccess(response);
             }).catch(e => this.handleAxiosError(e));
         },
 
@@ -391,6 +417,23 @@ export default {
             }
         },
 
+        handleSuccess(response) {
+            // If the user has opted to create another entry, redirect them to create page.
+            if (! this.revisionsEnabled && this.afterSaveOption === 'create_another') {
+                window.location = this.createAnotherUrl;
+            }
+
+            // If the user has opted to go to listing (default/null option), redirect them there.
+            else if (! this.revisionsEnabled && this.afterSaveOption === null) {
+                window.location = this.listingUrl;
+            }
+
+            // Otherwise, leave them on the edit form and emit an event.
+            else {
+                this.$nextTick(() => this.$emit('saved', response));
+            }
+        },
+
         handleAxiosError(e) {
             this.saving = false;
             if (e.response && e.response.status === 422) {
diff --git a/resources/views/terms/create.blade.php b/resources/views/terms/create.blade.php
index e6bb49fab4..1bdf2f033d 100644
--- a/resources/views/terms/create.blade.php
+++ b/resources/views/terms/create.blade.php
@@ -12,6 +12,8 @@
         :meta="{{ json_encode($meta) }}"
         :published="{{ json_encode($published) }}"
         :localizations="{{ json_encode($localizations) }}"
+        create-another-url="{{ cp_route('taxonomies.terms.create', [$taxonomy, $locale]) }}"
+        listing-url="{{ cp_route('taxonomies.show', $taxonomy) }}"
     ></base-term-create-form>
 
 @endsection
diff --git a/resources/views/terms/edit.blade.php b/resources/views/terms/edit.blade.php
index f5948f1a2c..6d111d4431 100644
--- a/resources/views/terms/edit.blade.php
+++ b/resources/views/terms/edit.blade.php
@@ -31,6 +31,8 @@
         :initial-read-only="{{ $str::bool($readOnly) }}"
         :preloaded-assets="{{ json_encode($preloadedAssets) }}"
         :breadcrumbs="{{ $breadcrumbs->toJson() }}"
+        create-another-url="{{ cp_route('taxonomies.terms.create', [$taxonomy, $locale]) }}"
+        listing-url="{{ cp_route('taxonomies.show', $taxonomy) }}"
     ></term-publish-form>
 
 @endsection
diff --git a/src/Http/Controllers/CP/Taxonomies/TermsController.php b/src/Http/Controllers/CP/Taxonomies/TermsController.php
index 2abfa9397c..95068f3888 100644
--- a/src/Http/Controllers/CP/Taxonomies/TermsController.php
+++ b/src/Http/Controllers/CP/Taxonomies/TermsController.php
@@ -220,6 +220,7 @@ public function create(Request $request, $taxonomy, $site)
             'taxonomy' => $taxonomy->handle(),
             'blueprint' => $blueprint->toPublishArray(),
             'published' => $taxonomy->defaultPublishState(),
+            'locale' => $site->handle(),
             'localizations' => $taxonomy->sites()->map(function ($handle) use ($taxonomy, $site) {
                 return [
                     'handle' => $handle,

From 5851d795ef194d3170034939feb97c8a068b77f0 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Mon, 14 Sep 2020 15:44:17 -0400
Subject: [PATCH 15/16] Fix setting of `initialPublished` after saving.

---
 resources/js/components/entries/PublishForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/entries/PublishForm.vue b/resources/js/components/entries/PublishForm.vue
index 65ff5b5360..2e1f10362d 100644
--- a/resources/js/components/entries/PublishForm.vue
+++ b/resources/js/components/entries/PublishForm.vue
@@ -511,7 +511,7 @@ export default {
                     // the hooks are resolved because if this form is being shown in a stack, we only
                     // want to close it once everything's done.
                     else {
-                        this.initialPublished = response.data.published;
+                        this.initialPublished = response.data.data.published;
                         this.$nextTick(() => this.$emit('saved', response));
                     }
                 }).catch(e => {});

From 11317ac272512f260997e34820feea040e6feeb1 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Mon, 14 Sep 2020 15:44:37 -0400
Subject: [PATCH 16/16] Fix button text.

---
 .../js/components/entries/PublishForm.vue     | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/resources/js/components/entries/PublishForm.vue b/resources/js/components/entries/PublishForm.vue
index 2e1f10362d..d2105d6baa 100644
--- a/resources/js/components/entries/PublishForm.vue
+++ b/resources/js/components/entries/PublishForm.vue
@@ -384,28 +384,22 @@ export default {
         saveText() {
             switch(true) {
                 case this.revisionsEnabled:
-                    return __('Save Changes')
+                    return __('Save Changes');
                 case this.isUnpublishing:
-                    return __('Unpublish')
-                case this.isPublishingDraft:
-                    return __('Publish')
-                case this.isCreating && this.published:
-                    return __('Publish')
-                case this.published:
-                    return __('Save');
-                case this.isCreating && ! this.published:
-                    return ('Save')
+                    return __('Save & Unpublish');
+                case this.isDraft:
+                    return __('Save Draft');
                 default:
-                    return __('Save')
+                    return __('Save & Publish');
             }
         },
 
         isUnpublishing() {
-            return !this.published && this.initialPublished;
+            return this.initialPublished && ! this.published && ! this.isCreating;
         },
 
-        isPublishingDraft() {
-            return this.published && ! this.initialPublished;
+        isDraft() {
+            return ! this.published;
         },
 
         saveButtonClass() {