From 4dea412d5c1be9607de9f51aae870d6ab0569a58 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Tue, 4 Jun 2024 11:20:46 +0100
Subject: [PATCH 1/4] Update our publish form, to better match Statamic's.

---
 .../js/components/Publish/PublishForm.vue     |  85 +++++++++-----
 .../js/components/statamic/HasPreferences.js  |  37 ------
 .../components/statamic/SaveButtonOptions.vue | 110 ------------------
 3 files changed, 59 insertions(+), 173 deletions(-)
 delete mode 100644 resources/js/components/statamic/HasPreferences.js
 delete mode 100644 resources/js/components/statamic/SaveButtonOptions.vue

diff --git a/resources/js/components/Publish/PublishForm.vue b/resources/js/components/Publish/PublishForm.vue
index 2551b4d4..99c41516 100644
--- a/resources/js/components/Publish/PublishForm.vue
+++ b/resources/js/components/Publish/PublishForm.vue
@@ -1,19 +1,15 @@
 <template>
     <div>
-        <breadcrumb
-            v-if="breadcrumbs"
-            :url="breadcrumbs[0].url"
-            :title="breadcrumbs[0].text"
-        />
+        <breadcrumb v-if="breadcrumbs" :url="breadcrumbs[0].url" :title="breadcrumbs[0].text" />
 
         <div class="flex items-center mb-6">
             <h1 class="flex-1">
                 <div class="flex items-center">
-                    <span v-html="title" />
+                    <span v-html="$options.filters.striptags(__(title))" />
                 </div>
             </h1>
 
-            <dropdown-list class="mr-4" v-if="canEditBlueprint">
+            <dropdown-list class="rtl:ml-4 ltr:mr-4" v-if="canEditBlueprint">
                 <dropdown-item :text="__('Edit Blueprint')" :redirect="actions.editBlueprint" />
                 <li class="divider" />
                 <data-list-inline-actions
@@ -27,22 +23,23 @@
                 />
             </dropdown-list>
 
-            <div class="pt-px text-2xs text-gray-600 flex mr-4" v-if="readOnly">
-                <svg-icon name="light/lock" class="w-4 mr-1 -mt-1" /> {{ __('Read Only') }}
+            <div class="pt-px text-2xs text-gray-600 flex rtl:ml-4 ltr:mr-4" v-if="readOnly">
+                <svg-icon name="light/lock" class="w-4 rtl:ml-1 ltr:mr-1 -mt-1" /> {{ __('Read Only') }}
             </div>
 
             <div v-if="!readOnly" class="hidden md:flex items-center">
                 <save-button-options
                     v-if="!readOnly"
                     :show-options="!isInline"
+                    :button-class="saveButtonClass"
                     :preferences-prefix="preferencesPrefix"
                 >
                     <button
-                        class="btn-primary"
-                        :disabled="isSaving"
+                        :class="saveButtonClass"
+                        :disabled="!canSave"
                         @click.prevent="save"
+                        v-text="saveText"
                     >
-                        {{ __('Save') }}
                     </button>
                 </save-button-options>
             </div>
@@ -53,9 +50,9 @@
         <publish-container
             ref="container"
             :name="publishContainer"
-            :reference="initialReference"
             :blueprint="blueprint"
             :values="values"
+            :reference="initialReference"
             :meta="meta"
             :errors="errors"
             @updated="values = $event"
@@ -72,7 +69,6 @@
 
                 <publish-tabs
                     :read-only="readOnly"
-                    :enable-sidebar="shouldShowSidebar"
                     @updated="setFieldValue"
                     @meta-updated="setFieldMeta"
                     @focus="$refs.container.$emit('focus', $event)"
@@ -106,8 +102,28 @@
                     </template>
                 </publish-tabs>
             </div>
+
+            <template v-slot:buttons>
+                <button
+                    v-if="!readOnly"
+                    class="rtl:mr-4 ltr:ml-4"
+                    :class="saveButtonClass"
+                    :disabled="!canSave"
+                    @click.prevent="save"
+                    v-text="saveText">
+                </button>
+            </template>
         </publish-container>
 
+        <div class="md:hidden mt-6 flex items-center">
+            <button
+                v-if="!readOnly"
+                class="btn-lg btn-primary w-full"
+                :disabled="!canSave"
+                @click.prevent="save"
+                v-text="__('Save')" />
+        </div>
+
         <div class="md:hidden mt-3 flex items-center">
             <button
                 v-if="!readOnly"
@@ -122,8 +138,8 @@
 </template>
 
 <script>
-import SaveButtonOptions from '../statamic/SaveButtonOptions.vue'
-import HasPreferences from '../statamic/HasPreferences.js'
+import SaveButtonOptions from '../../../../vendor/statamic/cms/resources/js/components/publish/SaveButtonOptions.vue'
+import HasPreferences from '../../../../vendor/statamic/cms/resources/js/components/data-list/HasPreferences.js'
 import HasHiddenFields from '../../../../vendor/statamic/cms/resources/js/components/publish/HasHiddenFields.js'
 import HasActions from '../../../../vendor/statamic/cms/resources/js/components/publish/HasActions.js'
 
@@ -189,28 +205,35 @@ export default {
     },
 
     computed: {
-        enableSidebar() {
-            return this.blueprint.tabs
-                .map((section) => section.handle)
-                .includes('sidebar')
+        somethingIsLoading() {
+            return ! this.$progress.isComplete();
         },
 
-        shouldShowSidebar() {
-            return this.enableSidebar
+        canSave() {
+            return !this.readOnly && !this.somethingIsLoading;
         },
 
         showVisitUrlButton() {
             return !!this.permalink;
         },
 
-        afterSaveOption() {
-            return this.getPreference('after_save')
-        },
-
         published() {
             return this.values[this.publishedColumn];
         },
 
+        saveText() {
+            switch(true) {
+                case this.isUnpublishing:
+                    return __('Save & Unpublish');
+                case this.isDraft:
+                    return __('Save Draft');
+                default:
+                    return this.canManagePublishState
+                        ? __('Save & Publish')
+                        : __('Save');
+            }
+        },
+
         isUnpublishing() {
             return this.initialPublished && ! this.published && ! this.isCreating;
         },
@@ -218,6 +241,16 @@ export default {
         isDraft() {
             return ! this.published;
         },
+
+        saveButtonClass() {
+            return {
+                'btn-primary': this.isCreating || true,
+            };
+        },
+
+        afterSaveOption() {
+            return this.getPreference('after_save')
+        },
     },
 
     mounted() {
diff --git a/resources/js/components/statamic/HasPreferences.js b/resources/js/components/statamic/HasPreferences.js
deleted file mode 100644
index 73f1c3da..00000000
--- a/resources/js/components/statamic/HasPreferences.js
+++ /dev/null
@@ -1,37 +0,0 @@
-export default {
-
-    data() {
-        return {
-            preferencesPrefix: null,
-        }
-    },
-
-    computed: {
-
-        hasPreferences() {
-            return this.preferencesPrefix !== null;
-        }
-
-    },
-
-    methods: {
-
-        preferencesKey(type) {
-            return `${this.preferencesPrefix}.${type}`;
-        },
-
-        getPreference(type) {
-            return this.$preferences.get(this.preferencesKey(type));
-        },
-
-        setPreference(type, value) {
-            return this.$preferences.set(this.preferencesKey(type), value);
-        },
-
-        removePreference(type, value=null) {
-            return this.$preferences.remove(this.preferencesKey(type), value);
-        }
-
-    }
-
-}
diff --git a/resources/js/components/statamic/SaveButtonOptions.vue b/resources/js/components/statamic/SaveButtonOptions.vue
deleted file mode 100644
index 0077303f..00000000
--- a/resources/js/components/statamic/SaveButtonOptions.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<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
-                        v-if="buttonIcon"
-                        :name="buttonIcon.name"
-                        :class="buttonIcon.class"
-                    />
-                </button>
-            </template>
-            <h6 v-text="__('After Saving')" class="p-2" />
-            <div class="publish-fields px-2">
-                <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',
-        },
-        preferencesPrefix: {
-            type: String,
-            required: true,
-        },
-    },
-
-    data() {
-        return {
-            currentOption: null,
-        }
-    },
-
-    computed: {
-        options() {
-            return {
-                options: {
-                    listing: __('Go To Listing'),
-                    continue_editing: __('Continue Editing'),
-                    create_another: __('Create Another'),
-                },
-            }
-        },
-
-        buttonIcon() {
-            switch (true) {
-                case this.currentOption === 'listing':
-                    return { name: 'micro/arrow-go-back', class: 'w-3' }
-                case this.currentOption === 'continue_editing':
-                    return { name: 'micro/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`
-        },
-    },
-
-    mounted() {
-        this.setInitialValue()
-
-        this.$watch('currentOption', (value) => this.setPreference(value))
-    },
-
-    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)
-        },
-    },
-}
-</script>
-
-<style>
-.save-and-continue-options input {
-    margin-bottom: 9px;
-}
-.save-and-continue-options input {
-    margin-right: 5px;
-}
-</style>

From 93193eaad131034599edc041496568d7864243b6 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Tue, 4 Jun 2024 13:07:31 +0100
Subject: [PATCH 2/4] Tidy up publish forms

---
 .../js/components/Publish/PublishForm.vue     | 302 +++++++++++-------
 resources/views/create.blade.php              |  20 +-
 resources/views/edit.blade.php                |  28 +-
 src/Fieldtypes/BaseFieldtype.php              |  11 +-
 .../Controllers/CP/ResourceController.php     |  46 +--
 src/Http/Resources/CP/Model.php               |  30 ++
 src/Resource.php                              |   2 +
 7 files changed, 270 insertions(+), 169 deletions(-)
 create mode 100644 src/Http/Resources/CP/Model.php

diff --git a/resources/js/components/Publish/PublishForm.vue b/resources/js/components/Publish/PublishForm.vue
index 99c41516..4fc2ce85 100644
--- a/resources/js/components/Publish/PublishForm.vue
+++ b/resources/js/components/Publish/PublishForm.vue
@@ -76,7 +76,7 @@
                 >
                     <template #actions="{ shouldShowSidebar }">
                         <div class="card p-0 mb-5">
-                            <div v-if="resourceHasRoutes" :class="{ 'hi': resourceHasRoutes && permalink }">
+                            <div v-if="resourceHasRoutes">
                                 <div class="p-3 flex items-center space-x-2" v-if="showVisitUrlButton">
                                     <a
                                         class="flex items-center justify-center btn w-full"
@@ -89,13 +89,13 @@
                                 </div>
                             </div>
 
-                            <div v-if="canManagePublishState">
+                            <div v-if="resource.has_publish_states">
                                 <div
                                     class="flex items-center justify-between px-4 py-2"
                                     :class="{ 'border-t dark:border-dark-900': resourceHasRoutes && permalink }"
                                 >
                                     <label v-text="__('Published')" class="publish-field-label font-medium" />
-                                    <toggle-input :value="published" :read-only="!canManagePublishState" @input="setFieldValue(publishedColumn, $event)" />
+                                    <toggle-input :value="published" :read-only="!canManagePublishState" @input="setFieldValue(resource.published_column, $event)" />
                                 </div>
                             </div>
                         </div>
@@ -138,6 +138,7 @@
 </template>
 
 <script>
+import axios from 'axios'
 import SaveButtonOptions from '../../../../vendor/statamic/cms/resources/js/components/publish/SaveButtonOptions.vue'
 import HasPreferences from '../../../../vendor/statamic/cms/resources/js/components/data-list/HasPreferences.js'
 import HasHiddenFields from '../../../../vendor/statamic/cms/resources/js/components/publish/HasHiddenFields.js'
@@ -151,56 +152,57 @@ export default {
     mixins: [HasPreferences, HasHiddenFields, HasActions],
 
     props: {
-        breadcrumbs: Array,
+        publishContainer: String,
         initialReference: String,
-        initialActions: Object,
         initialBlueprint: Object,
         initialValues: Object,
         initialMeta: Object,
         initialTitle: String,
+        resource: Object,
+        breadcrumbs: Array,
+        initialActions: Object,
         method: String,
-        resourceHasRoutes: Boolean,
-        permalink: String,
-        isCreating: {
-            type: Boolean,
-            default: false,
-        },
-        isInline: {
-            type: Boolean,
-            default: false,
-        },
-        publishContainer: String,
-        readOnly: Boolean,
-        resource: {
-            type: Object,
-            required: true,
-        },
-        createAnotherUrl: String,
-        listingUrl: String,
+        isCreating: Boolean,
+        isInline: Boolean,
+        initialReadOnly: Boolean,
+        initialPermalink: String,
+        // revisionsEnabled: Boolean,
         canEditBlueprint: Boolean,
         canManagePublishState: Boolean,
-        publishedColumn: String,
+        createAnotherUrl: String,
+        initialListingUrl: String,
+        resourceHasRoutes: Boolean,
     },
 
     data() {
         return {
             actions: this.initialActions,
+            saving: false,
+            trackDirtyState: true,
             blueprint: this.initialBlueprint,
-            values: this.initialValues,
-            meta: this.initialMeta,
             title: this.initialTitle,
-            preferencesPrefix: `runway.${this.resource.handle}`,
-
+            values: _.clone(this.initialValues),
+            meta: _.clone(this.initialMeta),
+            // isWorkingCopy: this.initialWorkingCopy,
+            error: null,
             errors: {},
-            saving: false,
-            containerWidth: null,
-            saveKeyBinding: null,
-            quickSave: false,
+            state: 'new',
+            // revisionMessage: null,
+            // showRevisionHistory: null,
+            preferencesPrefix: `runway.${this.resource.handle}`,
 
             // Whether it was published the last time it was saved.
             // Successful publish actions (if using revisions) or just saving (if not) will update this.
             // The current published value is inside the "values" object, and also accessible as a computed.
-            initialPublished: this.initialValues[this.publishedColumn],
+            initialPublished: this.initialValues[this.resource.published_column],
+
+            // confirmingPublish: false,
+            readOnly: this.initialReadOnly,
+            permalink: this.initialPermalink,
+
+            saveKeyBinding: null,
+            quickSaveKeyBinding: null,
+            quickSave: false,
         }
     },
 
@@ -213,32 +215,50 @@ export default {
             return !this.readOnly && !this.somethingIsLoading;
         },
 
+        published() {
+            if (! this.resource.has_publish_states) return false;
+
+            return this.values[this.resource.published_column];
+        },
+
+        listingUrl() {
+            return `${this.initialListingUrl}`;
+        },
+
         showVisitUrlButton() {
             return !!this.permalink;
         },
 
-        published() {
-            return this.values[this.publishedColumn];
+        isBase() {
+            return this.publishContainer === 'base';
+        },
+
+        isDirty() {
+            return this.$dirty.has(this.publishContainer);
         },
 
         saveText() {
             switch(true) {
                 case this.isUnpublishing:
                     return __('Save & Unpublish');
-                case this.isDraft:
+                case this.resource.has_publish_states && this.isDraft:
                     return __('Save Draft');
                 default:
-                    return this.canManagePublishState
+                    return this.resource.has_publish_states
                         ? __('Save & Publish')
                         : __('Save');
             }
         },
 
         isUnpublishing() {
+            if (! this.resource.has_publish_states) return false;
+
             return this.initialPublished && ! this.published && ! this.isCreating;
         },
 
         isDraft() {
+            if (! this.resource.has_publish_states) return false;
+
             return ! this.published;
         },
 
@@ -251,93 +271,135 @@ export default {
         afterSaveOption() {
             return this.getPreference('after_save')
         },
-    },
 
-    mounted() {
-        this.saveKeyBinding = this.$keys.bindGlobal(
-            ['mod+s', 'mod+return'],
-            (e) => {
-                e.preventDefault()
-                this.quickSave = true
-                this.save()
-            }
-        )
+        direction() {
+            return this.$config.get('direction', 'ltr');
+        },
     },
 
-    created() {
-        if (this.publishContainer.includes('relate-fieldtype-inline')) {
-            this.prefillBelongsToField()
-        }
+    watch: {
+        saving(saving) {
+            this.$progress.loading(`runway-publish-form`, saving)
+        },
     },
 
     methods: {
+        clearErrors() {
+            this.error = null
+            this.errors = {}
+        },
+
         save() {
-            this.saving = true
-            this.clearErrors()
+            if (! this.canSave) {
+                this.quickSave = false;
+                return;
+            }
+
+            this.saving = true;
+            this.clearErrors();
+
+            setTimeout(() => this.runBeforeSaveHook(), 151); // 150ms is the debounce time for fieldtype updates
+        },
+
+        runBeforeSaveHook() {
+            this.$refs.container.saving();
+
+            Statamic.$hooks.run('runway.saving', {
+                resource: this.resource,
+                values: this.values,
+                container: this.$refs.container,
+                storeName: this.publishContainer,
+            })
+                .then(this.performSaveRequest)
+                .catch(error => {
+                    this.saving = false;
+                    this.$toast.error(error || 'Something went wrong');
+                });
+        },
 
-            this.$axios({
+        performSaveRequest() {
+            // Once the hook has completed, we need to make the actual request.
+            // We build the payload here because the before hook may have modified values.
+            const payload = { ...this.visibleValues};
+
+            axios({
                 method: this.method,
                 url: this.actions.save,
-                data: this.values,
-            })
-                .then((response) => {
-                    this.saving = false
-                    this.$refs.container.saved()
-                    this.$emit('saved', response)
+                data: payload,
+            }).then(response => {
+                this.saving = false;
+                if (! response.data.saved) {
+                    return this.$toast.error(__(`Couldn't save entry`));
+                }
+                this.title = response.data.data.title;
+                // this.isWorkingCopy = true;
+                // if (!this.revisionsEnabled) this.permalink = response.data.data.permalink;
+                if (!this.isCreating) this.$toast.success(__('Saved'));
+                this.$refs.container.saved();
+                this.runAfterSaveHook(response);
+            }).catch(error => this.handleAxiosError(error));
+        },
+
+        runAfterSaveHook(response) {
+            // Once the save request has completed, we want to run the "after" hook.
+            // Devs can do what they need and we'll wait for them, but they can't cancel anything.
+            Statamic.$hooks
+                .run('runway.saved', {
+                    resource: this.resource,
+                    reference: this.initialReference,
+                    response
+                })
+                .then(() => {
+                    let nextAction = this.quickSave ? 'continue_editing' : this.afterSaveOption;
 
-                    let nextAction = this.quickSave
-                        ? 'continue_editing'
-                        : this.afterSaveOption
+                    console.log(nextAction)
 
                     // If the user has opted to create another entry, redirect them to create page.
                     if (!this.isInline && nextAction === 'create_another') {
-                        this.$nextTick(() => {
-                            window.location = this.createAnotherUrl
-                        })
-
-                        return
+                        window.location = this.createAnotherUrl;
                     }
 
                     // If the user has opted to go to listing (default/null option), redirect them there.
-                    if (!this.isInline && nextAction === null) {
-                        this.$nextTick(() => {
-                            window.location = this.listingUrl
-                        })
-
-                        return
+                    else if (!this.isInline && nextAction === null) {
+                        window.location = this.listingUrl;
                     }
 
-                    // Otherwise, leave them on the edit form (or redirect them to the edit form if they're creating a new model).
-                    if (this.isCreating && this.publishContainer === 'base') {
-                        this.$nextTick(() => {
-                            window.location.href = response.data.redirect
-                        })
-                    } else {
-                        this.quickSave = false
-                        this.$toast.success(__('Saved'))
+                    // 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 {
+                        clearTimeout(this.trackDirtyStateTimeout);
+                        this.trackDirtyState = false;
+                        this.values = this.resetValuesFromResponse(response.data.data.values);
+                        this.trackDirtyStateTimeout = setTimeout(() => (this.trackDirtyState = true), 350);
+
+                        if (this.resource.has_publish_states) {
+                            this.initialPublished = response.data.data.published;
+                        }
+
                         this.$nextTick(() => this.$emit('saved', response));
+
+                        if (this.isCreating) {
+                            window.location = response.data.data.edit_url + '?created=true';
+                        }
                     }
-                })
-                .catch((error) => this.handleAxiosError(error))
-        },
 
-        clearErrors() {
-            this.error = null
-            this.errors = {}
+                    this.quickSave = false;
+                }).catch(e => console.error(e));
         },
 
         handleAxiosError(e) {
-            this.saving = false
-
+            this.saving = false;
             if (e.response && e.response.status === 422) {
-                const { message, errors } = e.response.data
-                this.error = message
-                this.errors = errors
-                this.$toast.error(message)
+                const { message, errors } = e.response.data;
+                this.error = message;
+                this.errors = errors;
+                this.$toast.error(message);
+                this.$reveal.invalid();
             } else if (e.response) {
-                this.$toast.error(e.response.data.message)
+                this.$toast.error(e.response.data.message);
             } else {
-                this.$toast.error(e || 'Something went wrong')
+                this.$toast.error(e || 'Something went wrong');
             }
         },
 
@@ -346,14 +408,11 @@ export default {
         },
 
         setFieldMeta(handle, value) {
-            this.$store.dispatch(
-                `publish/${this.publishContainer}/setFieldMeta`,
-                {
-                    handle,
-                    value,
-                    user: Statamic.user.id,
-                }
-            )
+            this.$store.dispatch(`publish/${this.publishContainer}/setFieldMeta`, {
+                handle,
+                value,
+                user: Statamic.user.id,
+            })
         },
 
         /**
@@ -383,21 +442,44 @@ export default {
         afterActionSuccessfullyCompleted(response) {
             if (response.data) {
                 this.title = response.data.title;
+                // if (!this.revisionsEnabled) this.permalink = response.data.permalink;
                 this.values = this.resetValuesFromResponse(response.data.values);
-                this.initialPublished = response.data[this.publishedColumn];
+                if (this.resource.has_publish_states) {
+                    this.initialPublished = response.data.published;
+                }
                 this.itemActions = response.data.itemActions;
             }
         },
     },
 
-    watch: {
-        saving(saving) {
-            this.$progress.loading(`runway-publish-form`, saving)
-        },
+    mounted() {
+        this.saveKeyBinding = this.$keys.bindGlobal(['mod+return'], e => {
+            e.preventDefault();
+            if (this.confirmingPublish) return;
+            this.save();
+        });
+
+        this.quickSaveKeyBinding = this.$keys.bindGlobal(['mod+s'], e => {
+            e.preventDefault();
+            if (this.confirmingPublish) return;
+            this.quickSave = true;
+            this.save();
+        });
+    },
+
+    created() {
+        if (this.publishContainer.includes('relate-fieldtype-inline')) {
+            this.prefillBelongsToField()
+        }
+    },
+
+    unmounted() {
+        clearTimeout(this.trackDirtyStateTimeout);
     },
 
     destroyed() {
-        this.saveKeyBinding.destroy()
+        this.saveKeyBinding.destroy();
+        this.quickSaveKeyBinding.destroy();
     },
 }
 </script>
diff --git a/resources/views/create.blade.php b/resources/views/create.blade.php
index 103dd2b5..059e6fe5 100644
--- a/resources/views/create.blade.php
+++ b/resources/views/create.blade.php
@@ -7,20 +7,20 @@
 
 @section('content')
     <runway-publish-form
-        :breadcrumbs="{{ $breadcrumbs->toJson() }}"
-        :initial-actions="{{ json_encode($actions) }}"
-        :initial-blueprint='@json($blueprint)'
-        :initial-meta='@json($meta)'
-        :initial-values='@json($values)'
-        initial-title="{{ $title }}"
-        method="{{ $method }}"
-        :resource-has-routes="{{ $resourceHasRoutes ? 'true' : 'false' }}"
         :is-creating="true"
         publish-container="base"
+        :initial-actions='@json($actions)'
+        method="post"
         :resource='@json($resource->toArray())'
+        :resource-has-routes="{{ $str::bool($resourceHasRoutes) }}"
+        initial-title="{{ $title }}"
+        :initial-blueprint='@json($blueprint)'
+        :initial-values='@json($values)'
+        :initial-meta='@json($meta)'
+        :breadcrumbs='{{ $breadcrumbs->toJson() }}'
+        :can-manage-publish-state="{{ $str::bool($canManagePublishState) }}"
         create-another-url="{{ cp_route('runway.create', ['resource' => $resource->handle()]) }}"
-        listing-url="{{ cp_route('runway.index', ['resource' => $resource->handle()]) }}"
+        initial-listing-url="{{ cp_route('runway.index', ['resource' => $resource->handle()]) }}"
         :can-manage-publish-state="{{ $str::bool($canManagePublishState) }}"
-        published-column="{{ $publishedColumn }}"
     ></runway-publish-form>
 @endsection
diff --git a/resources/views/edit.blade.php b/resources/views/edit.blade.php
index 09dd6bf1..5019fdc1 100644
--- a/resources/views/edit.blade.php
+++ b/resources/views/edit.blade.php
@@ -7,27 +7,25 @@
 
 @section('content')
     <runway-publish-form
-        :breadcrumbs="{{ $breadcrumbs->toJson() }}"
-        initial-reference="{{ $currentModel['reference'] }}"
-        :initial-actions="{{ json_encode($actions) }}"
-        :initial-blueprint='@json($blueprint)'
-        :initial-meta='@json($meta)'
-        :initial-values='@json($values)'
-        initial-title="{{ $title }}"
-        method="{{ $method }}"
-        :resource-has-routes="{{ $resourceHasRoutes ? 'true' : 'false' }}"
-        permalink="{{ $permalink }}"
-        :is-creating="false"
         publish-container="base"
-        :read-only="{{ $resource->readOnly() ? 'true' : 'false' }}"
+        :initial-actions='@json($actions)'
+        method="patch"
         :resource='@json($resource->toArray())'
-        create-another-url="{{ cp_route('runway.create', ['resource' => $resource->handle()]) }}"
-        listing-url="{{ cp_route('runway.index', ['resource' => $resource->handle()]) }}"
+        :resource-has-routes="{{ $str::bool($resourceHasRoutes) }}"
+        initial-title="{{ $title }}"
+        initial-reference="{{ $reference }}"
+        :initial-blueprint='@json($blueprint)'
+        :initial-values='@json($values)'
+        :initial-meta='@json($meta)'
+        initial-permalink="{{ $permalink }}"
+        :initial-read-only="{{ $str::bool($readOnly) }}"
+        :breadcrumbs="{{ $breadcrumbs->toJson() }}"
         :can-edit-blueprint="{{ Auth::user()->can('configure fields') ? 'true' : 'false' }}"
         :can-manage-publish-state="{{ $str::bool($canManagePublishState) }}"
+        create-another-url="{{ cp_route('runway.create', ['resource' => $resource->handle()]) }}"
+        initial-listing-url="{{ cp_route('runway.index', ['resource' => $resource->handle()]) }}"
         :initial-item-actions="{{ json_encode($itemActions) }}"
         item-action-url="{{ cp_route('runway.actions.run', ['resource' => $resource->handle()]) }}"
-        published-column="{{ $publishedColumn }}"
     ></runway-publish-form>
 
     <script>
diff --git a/src/Fieldtypes/BaseFieldtype.php b/src/Fieldtypes/BaseFieldtype.php
index 6d66369a..94d85276 100644
--- a/src/Fieldtypes/BaseFieldtype.php
+++ b/src/Fieldtypes/BaseFieldtype.php
@@ -27,18 +27,19 @@ class BaseFieldtype extends Relationship
     protected $formComponent = 'runway-publish-form';
 
     protected $formComponentProps = [
+        'initialReference' => 'reference',
         'initialBlueprint' => 'blueprint',
         'initialValues' => 'values',
         'initialMeta' => 'meta',
         'initialTitle' => 'title',
-        'initialActions' => 'actions',
-        'method' => 'method',
-        'resourceHasRoutes' => 'resourceHasRoutes',
-        'permalink' => 'permalink',
         'resource' => 'resource',
         'breadcrumbs' => 'breadcrumbs',
+        'initialActions' => 'actions',
+        'method' => 'method',
+        'initialReadOnly' => 'readOnly',
+        'initialPermalink' => 'permalink',
         'canManagePublishState' => 'canManagePublishState',
-        'publishedColumn' => 'publishedColumn',
+        'resourceHasRoutes' => 'resourceHasRoutes',
     ];
 
     protected function configFieldItems(): array
diff --git a/src/Http/Controllers/CP/ResourceController.php b/src/Http/Controllers/CP/ResourceController.php
index e5de0517..05d66706 100644
--- a/src/Http/Controllers/CP/ResourceController.php
+++ b/src/Http/Controllers/CP/ResourceController.php
@@ -8,6 +8,7 @@
 use Statamic\Exceptions\NotFoundHttpException;
 use Statamic\Facades\Action;
 use Statamic\Facades\Scope;
+use Statamic\Facades\User;
 use Statamic\Fields\Field;
 use Statamic\Http\Controllers\CP\CpController;
 use StatamicRadPack\Runway\Fieldtypes\BelongsToFieldtype;
@@ -19,6 +20,7 @@
 use StatamicRadPack\Runway\Http\Requests\CP\UpdateRequest;
 use StatamicRadPack\Runway\Resource;
 use StatamicRadPack\Runway\Runway;
+use StatamicRadPack\Runway\Http\Resources\CP\Model as ModelResource;
 
 class ResourceController extends CpController
 {
@@ -63,7 +65,6 @@ public function create(CreateRequest $request, Resource $resource)
 
         $viewData = [
             'title' => __('Create :resource', ['resource' => $resource->singular()]),
-            'method' => 'POST',
             'breadcrumbs' => new Breadcrumbs([[
                 'text' => $resource->plural(),
                 'url' => cp_route('runway.index', [
@@ -79,10 +80,8 @@ public function create(CreateRequest $request, Resource $resource)
                 $resource->publishedColumn() => true,
             ])->all(),
             'meta' => $fields->meta(),
-            'permalink' => null,
             'resourceHasRoutes' => $resource->hasRouting(),
-            'canManagePublishState' => $resource->hasPublishStates(),
-            'publishedColumn' => $resource->publishedColumn(),
+            'canManagePublishState' => User::current()->can('edit', $resource),
         ];
 
         if ($request->wantsJson()) {
@@ -110,18 +109,15 @@ public function store(StoreRequest $request, Resource $resource)
 
         $this->prepareModelForSaving($resource, $model, $request);
 
-        $model->save();
+        $saved = $model->save();
 
         // Runs anything in the $postCreatedHooks array. See HasManyFieldtype@process for an example
         // of where this is used.
         $postCreatedHooks->each(fn ($postCreatedHook) => $postCreatedHook($resource, $model));
 
         return [
-            'data' => $this->getReturnData($resource, $model),
-            'redirect' => cp_route('runway.edit', [
-                'resource' => $resource->handle(),
-                'model' => $model->{$resource->routeKey()},
-            ]),
+            'data' => (new ModelResource($model->fresh()))->resolve()['data'],
+            'saved' => $saved,
         ];
     }
 
@@ -141,7 +137,8 @@ public function edit(EditRequest $request, Resource $resource, $model)
 
         $viewData = [
             'title' => $model->getAttribute($resource->titleField()),
-            'method' => 'PATCH',
+            'reference' => $model->reference(),
+            'method' => 'patch',
             'breadcrumbs' => new Breadcrumbs([[
                 'text' => $resource->plural(),
                 'url' => cp_route('runway.index', [
@@ -156,6 +153,7 @@ public function edit(EditRequest $request, Resource $resource, $model)
             'blueprint' => $blueprint->toPublishArray(),
             'values' => $values,
             'meta' => $meta,
+            'readOnly' => $resource->readOnly(),
             'permalink' => $resource->hasRouting() ? $model->uri() : null,
             'resourceHasRoutes' => $resource->hasRouting(),
             'currentModel' => [
@@ -164,8 +162,7 @@ public function edit(EditRequest $request, Resource $resource, $model)
                 'title' => $model->{$resource->titleField()},
                 'edit_url' => $request->url(),
             ],
-            'canManagePublishState' => $resource->hasPublishStates(),
-            'publishedColumn' => $resource->publishedColumn(),
+            'canManagePublishState' => User::current()->can('edit', $resource),
             'itemActions' => Action::for($model, ['resource' => $resource->handle(), 'view' => 'form']),
         ];
 
@@ -184,29 +181,20 @@ public function update(UpdateRequest $request, Resource $resource, $model)
 
         $this->prepareModelForSaving($resource, $model, $request);
 
-        $model->save();
+        $saved = $model->save();
 
         if ($request->get('from_inline_publish_form')) {
             $this->handleInlinePublishForm($resource, $model);
         }
 
-        return ['data' => $this->getReturnData($resource, $model)];
-    }
+        [$values] = $this->extractFromFields($model, $resource, $resource->blueprint());
 
-    /**
-     * Build an array with the correct return data for the inline publish forms.
-     */
-    protected function getReturnData(Resource $resource, Model $model): array
-    {
-        return array_merge($model->toArray(), [
-            'title' => $model->{$resource->titleField()},
-            'published' => $model->{$resource->publishedColumn()},
-            'status' => $model->publishedStatus(),
-            'edit_url' => cp_route('runway.edit', [
-                'resource' => $resource->handle(),
-                'model' => $model->{$resource->routeKey()},
+        return [
+            'data' => array_merge((new ModelResource($model->fresh()))->resolve()['data'], [
+                'values' => $values,
             ]),
-        ]);
+            'saved' => $saved,
+        ];
     }
 
     /**
diff --git a/src/Http/Resources/CP/Model.php b/src/Http/Resources/CP/Model.php
new file mode 100644
index 00000000..89c0af35
--- /dev/null
+++ b/src/Http/Resources/CP/Model.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace StatamicRadPack\Runway\Http\Resources\CP;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class Model extends JsonResource
+{
+    public function toArray($request)
+    {
+        $runwayResource = $this->resource->runwayResource();
+
+        $data = [
+            'id' => $this->resource->getKey(),
+            'reference' => $this->resource->reference(),
+            'title' => $this->resource->{$runwayResource->titleField()},
+            'permalink' => $runwayResource->hasRouting() ? $this->resource->absoluteUrl() : null,
+            'published' => $this->resource->publishedStatus(),
+            'edit_url' => cp_route('runway.edit', [
+                'resource' => $runwayResource->handle(),
+                'model' => $this->resource->{$runwayResource->routeKey()},
+            ]),
+            'resource' => [
+                'handle' => $runwayResource->handle(),
+            ],
+        ];
+
+        return ['data' => $data];
+    }
+}
diff --git a/src/Resource.php b/src/Resource.php
index e84911ce..f4cae334 100644
--- a/src/Resource.php
+++ b/src/Resource.php
@@ -242,6 +242,8 @@ public function toArray(): array
             'cp_icon' => $this->cpIcon(),
             'hidden' => $this->hidden(),
             'route' => $this->route(),
+            'has_publish_states' => $this->hasPublishStates(),
+            'published_column' => $this->publishedColumn(),
         ];
     }
 

From c62e5b2640028f8e12d980fcbf19f2c92be9a11f Mon Sep 17 00:00:00 2001
From: duncanmcclean <duncanmcclean@users.noreply.github.com>
Date: Tue, 4 Jun 2024 12:07:58 +0000
Subject: [PATCH 3/4] Fix styling

---
 src/Http/Controllers/CP/ResourceController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/Controllers/CP/ResourceController.php b/src/Http/Controllers/CP/ResourceController.php
index 05d66706..9350ecad 100644
--- a/src/Http/Controllers/CP/ResourceController.php
+++ b/src/Http/Controllers/CP/ResourceController.php
@@ -18,9 +18,9 @@
 use StatamicRadPack\Runway\Http\Requests\CP\IndexRequest;
 use StatamicRadPack\Runway\Http\Requests\CP\StoreRequest;
 use StatamicRadPack\Runway\Http\Requests\CP\UpdateRequest;
+use StatamicRadPack\Runway\Http\Resources\CP\Model as ModelResource;
 use StatamicRadPack\Runway\Resource;
 use StatamicRadPack\Runway\Runway;
-use StatamicRadPack\Runway\Http\Resources\CP\Model as ModelResource;
 
 class ResourceController extends CpController
 {

From 837e6d5b904ea91b09fc1571a45d54afade89425 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Tue, 4 Jun 2024 13:17:57 +0100
Subject: [PATCH 4/4] Fix tests

---
 .../Controllers/CP/ResourceControllerTest.php | 48 +++++--------------
 1 file changed, 12 insertions(+), 36 deletions(-)

diff --git a/tests/Http/Controllers/CP/ResourceControllerTest.php b/tests/Http/Controllers/CP/ResourceControllerTest.php
index 95d7eedb..883f363d 100644
--- a/tests/Http/Controllers/CP/ResourceControllerTest.php
+++ b/tests/Http/Controllers/CP/ResourceControllerTest.php
@@ -75,9 +75,7 @@ public function can_store_resource()
                 'author_id' => [$author->id],
             ])
             ->assertOk()
-            ->assertJsonStructure([
-                'redirect',
-            ]);
+            ->assertJsonStructure(['data', 'saved']);
 
         $this->assertDatabaseHas('posts', [
             'title' => 'Jingle Bells',
@@ -129,9 +127,7 @@ public function can_store_resource_and_ensure_computed_field_isnt_saved_to_datab
                 'age' => 25, // This is the computed field
             ])
             ->assertOk()
-            ->assertJsonStructure([
-                'redirect',
-            ]);
+            ->assertJsonStructure(['data', 'saved']);
 
         $this->assertDatabaseHas('posts', [
             'title' => 'Jingle Bells',
@@ -158,9 +154,7 @@ public function can_store_resource_and_ensure_field_isnt_saved_to_database()
                 'dont_save' => 25,
             ])
             ->assertOk()
-            ->assertJsonStructure([
-                'redirect',
-            ]);
+            ->assertJsonStructure(['data', 'saved']);
 
         $this->assertDatabaseHas('posts', [
             'title' => 'Jingle Bells',
@@ -187,9 +181,7 @@ public function can_store_resource_and_ensure_appended_attribute_doesnt_attempt_
                 'author_id' => [$author->id],
             ])
             ->assertOk()
-            ->assertJsonStructure([
-                'redirect',
-            ]);
+            ->assertJsonStructure(['data', 'saved']);
 
         $this->assertDatabaseHas('posts', [
             'title' => 'Jingle Bells',
@@ -216,9 +208,7 @@ public function can_store_resource_with_nested_field()
                 'author_id' => [$author->id],
             ])
             ->assertOk()
-            ->assertJsonStructure([
-                'redirect',
-            ]);
+            ->assertJsonStructure(['data', 'saved']);
 
         $this->assertDatabaseHas('posts', [
             'values->alt_title' => 'Batman Smells',
@@ -509,9 +499,7 @@ public function can_update_resource()
                 'author_id' => [$post->author_id],
             ])
             ->assertOk()
-            ->assertJsonStructure([
-                'data',
-            ]);
+            ->assertJsonStructure(['data', 'saved']);
 
         $post->refresh();
 
@@ -538,9 +526,7 @@ public function can_update_resource_when_being_updated_from_inline_publish_form(
                 'from_inline_publish_form' => true,
             ])
             ->assertOk()
-            ->assertJsonStructure([
-                'data',
-            ]);
+            ->assertJsonStructure(['data', 'saved']);
 
         $post->refresh();
 
@@ -589,9 +575,7 @@ public function can_update_resource_and_ensure_computed_field_isnt_saved_to_data
                 'age' => 19, // This is the computed field
             ])
             ->assertOk()
-            ->assertJsonStructure([
-                'data',
-            ]);
+            ->assertJsonStructure(['data', 'saved']);
 
         $post->refresh();
 
@@ -618,9 +602,7 @@ public function can_update_resource_and_ensure__field_isnt_saved_to_database()
                 'dont_save' => 19,
             ])
             ->assertOk()
-            ->assertJsonStructure([
-                'data',
-            ]);
+            ->assertJsonStructure(['data', 'saved']);
 
         $post->refresh();
 
@@ -647,9 +629,7 @@ public function can_update_resource_and_ensure_appended_attribute_doesnt_attempt
                 'author_id' => [$post->author_id],
             ])
             ->assertOk()
-            ->assertJsonStructure([
-                'data',
-            ]);
+            ->assertJsonStructure(['data', 'saved']);
 
         $post->refresh();
 
@@ -676,9 +656,7 @@ public function can_update_resource_with_nested_field()
                 'author_id' => [$post->author_id],
             ])
             ->assertOk()
-            ->assertJsonStructure([
-                'data',
-            ]);
+            ->assertJsonStructure(['data', 'saved']);
 
         $post->refresh();
 
@@ -707,9 +685,7 @@ public function can_update_resource_if_model_is_user_model()
                 'groups' => ['admins'],
             ])
             ->assertOk()
-            ->assertJsonStructure([
-                'data',
-            ]);
+            ->assertJsonStructure(['data', 'saved']);
 
         $user->refresh();