refactor to use new computed defaults

Author: edalzell

resources/blueprints/settings.yaml

@@ -7,28 +7,17 @@ tabs:
           -
             handle: collections
             field:
-              type: grid
+              type: collections
               display: Collections
-              sortable: false
-              add_row: 'Add Collection'
-              full_width_setting: true
-              fields:
-                -
-                  handle: collection
-                  field:
-                    type: collections
-                    display: Collection
-                    width: 50
-                    mode: select
-                    max_items: 1
-              default:
-                -
-                  collection: events
+              width: 50
+              mode: select
+              default: events
           -
             handle: timezone
             field:
               dictionary: timezones
               max_items: 1
               type: dictionary
               display: Timezone
-              full_width_setting: true
+              default: computed:default-events-timezone
+              width: 50

resources/fieldsets/event.yaml

@@ -19,9 +19,9 @@ fields:
     field:
       dictionary: timezones
       max_items: 1
-      default: UTC
       type: dictionary
       display: Timezone
+      default: computed:default-event-timezone
       width: 50
   -
     handle: specific_days

src/Events.php

@@ -48,7 +48,8 @@ class Events
 
     public static function defaultTimezone(): string
     {
-        return static::setting('timezone', config('statamic.system.display_timezone') ?? config('app.timezone', 'UTC'));
+        // return static::setting('timezone', config('statamic.system.display_timezone') ?? config('app.timezone', 'UTC'));
+        return static::setting('timezone');
     }
 
     public static function fromCollection(string $handle): self
@@ -174,7 +175,7 @@ private function output(callable $type): EntryCollection|LengthAwarePaginator
                 return $occurrence
                     ->setSupplement('start', $start)
                     ->setSupplement('end', $end)
-                    ->setSupplement('spansDay', !$start->isSameDay($end));
+                    ->setSupplement('spansDay', ! $start->isSameDay($end));
             });
         }
 

src/ServiceProvider.php

@@ -2,40 +2,28 @@
 
 namespace TransformStudios\Events;
 
-use Statamic\Entries\Entry;
 use Statamic\Facades\Collection;
-use Statamic\Fields\Field;
-use Statamic\Fields\Fields;
-use Statamic\Fields\Value;
-use Statamic\Fieldtypes\Dictionary;
+use Statamic\Facades\Field;
 use Statamic\Providers\AddonServiceProvider;
 use Statamic\Statamic;
 
 class ServiceProvider extends AddonServiceProvider
 {
     public function bootAddon()
     {
-        // Fields::default('events_timezone', fn () => Statamic::displayTimezone());
-        collect(Events::setting('collections', [['collection' => 'events']]))
-            ->each(fn (array $collection) => Collection::computed(
-                $collection['collection'],
-                'timezone',
-                $this->timezone(...)
-            ));
-    }
-
-    private function timezone(Entry $entry, $value): string|Value
-    {
-        $value ??= Events::defaultTimezone();
-
-        if ($entry->blueprint()->fields()->get('timezone')?->fieldtype() instanceof Dictionary) {
-            return $value;
-        }
+        Field::computedDefault('default-events-timezone', fn () => Statamic::displayTimezone());
+        Field::computedDefault('default-event-timezone', fn () => Events::defaultTimezone());
 
-        return (new Field('timezone', ['type' => 'timezones', 'max_items' => 1]))
-            ->setValue($value)
-            ->setParent($entry)
-            ->augment()
-            ->value();
+        collect(Events::setting('collections', ['events']))
+            ->each(function (string $collection) {
+                Collection::findByHandle($collection)->entryBlueprint()->ensureField(
+                    'timezone',
+                    [
+                        'dictionary' => 'timezones',
+                        'max_items' => '1',
+                        'type' => 'dictionary',
+                        'default' => 'computed:default-event-timezone',
+                    ]);
+            });
     }
 }