Support non-revisable fields

src/Http/Controllers/CP/ResourceController.php

@@ -2,14 +2,18 @@
 
 namespace StatamicRadPack\Runway\Http\Controllers\CP;
 
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 use Statamic\CP\Breadcrumbs;
 use Statamic\CP\Column;
 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;
+use StatamicRadPack\Runway\Fieldtypes\HasManyFieldtype;
 use StatamicRadPack\Runway\Http\Requests\CP\CreateRequest;
 use StatamicRadPack\Runway\Http\Requests\CP\EditRequest;
 use StatamicRadPack\Runway\Http\Requests\CP\IndexRequest;
@@ -193,6 +197,8 @@ public function update(UpdateRequest $request, Resource $resource, $model)
                 ->save();
 
             $model = $model->fromWorkingCopy();
+
+            $this->saveNonRevisableFields($resource, $model);
         } else {
             $saved = DB::transaction(function () use ($model, $request) {
                 $model->save();
@@ -213,4 +219,20 @@ public function update(UpdateRequest $request, Resource $resource, $model)
             'saved' => $saved,
         ];
     }
+
+    private function saveNonRevisableFields(Resource $resource, Model $model): void
+    {
+        $dbVersion = $model->fresh();
+
+        $fields = $resource->blueprint()->fields()->all()
+            ->reject(fn (Field $field) => $field->isRevisable())
+            ->reject(fn (Field $field) => $field->fieldtype() instanceof BelongsToFieldtype)
+            ->reject(fn (Field $field) => $field->fieldtype() instanceof HasManyFieldtype);
+
+        if ($fields->isNotEmpty()) {
+            $fields->each(fn ($ignore, string $fieldHandle) => $dbVersion->setAttribute($fieldHandle, $model->{$fieldHandle}));
+
+            $dbVersion->save();
+        }
+    }
 }

src/Relationships.php

@@ -13,13 +13,20 @@
 
 class Relationships
 {
-    public function __construct(protected Model $model, protected array $values = []) {}
+    public function __construct(protected Model $model, protected array $values = [], protected array $except = []) {}
 
     public static function for(Model $model): self
     {
         return new static($model);
     }
 
+    public function except(array $except): self
+    {
+        $this->except = $except;
+
+        return $this;
+    }
+
     public function with(array $values): self
     {
         $this->values = $values;
@@ -31,6 +38,7 @@ public function save(): void
     {
         $this->model->runwayResource()->blueprint()->fields()->all()
             ->reject(fn (Field $field) => $field->visibility() === 'computed' || ! $field->get('save', true))
+            ->reject(fn (Field $field) => in_array($field->handle(), $this->except))
             ->filter(fn (Field $field) => $field->fieldtype() instanceof HasManyFieldtype)
             ->each(function (Field $field): void {
                 $relationshipName = $this->model->runwayResource()->eloquentRelationships()->get($field->handle());

src/Traits/HasRunwayResource.php

@@ -206,6 +206,7 @@ protected function revisionKey(): string
     protected function revisionAttributes(): array
     {
         $data = $this->runwayResource()->blueprint()->fields()->setParent($this)->all()
+            ->filter(fn (Field $field) => $field->isRevisable())
             ->reject(fn (Field $field) => $field->fieldtype() instanceof Section)
             ->reject(fn (Field $field) => $field->visibility() === 'computed')
             ->reject(fn (Field $field) => $field->get('save', true) === false)
@@ -285,7 +286,15 @@ public function publish($options = [])
         if ($this->revisionsEnabled()) {
             $model = $this->publishWorkingCopy($options);
 
-            Relationships::for($model)->with($model->runwayRelationships)->save();
+            // if there are non-revisable HasMany fields, don't save them
+            $except = $model->runwayResource()->blueprint()->fields()->all()
+                ->reject(fn (Field $field) => $field->isRevisable())
+                ->filter(fn (Field $field) => $field->fieldtype() instanceof HasManyFieldtype)
+                ->map(fn (Field $field) => $field->handle())
+                ->keys()
+                ->all();
+
+            Relationships::for($model)->with($model->runwayRelationships)->except($except)->save();
 
             return $model;
         }