Settings without group

visual-ideas · Dec 11, 2022 · ac0d153 · ac0d153
1 parent 0232ec2
commit ac0d153
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 18 deletions.
diff --git a/database/migrations/2022_12_11_111047_create_settings_groups_table.php b/database/migrations/2022_12_11_111047_create_settings_groups_table.php
@@ -16,11 +16,9 @@ public function up()
         Schema::create('setting_groups', function (Blueprint $table) {
             $table->id();
             $table->string('slug', 190)->unique();
-            $table->string('name', 190)->nullable();
+            $table->string('hint', 190)->nullable();
             $table->timestamps();
         });
-
-        \VI\LaravelSiteSettings\Models\SettingGroup::create(['slug' =>'default', 'name' =>'Default']);
     }
 
     /**

diff --git a/database/migrations/2022_12_11_121047_create_settings_table.php b/database/migrations/2022_12_11_121047_create_settings_table.php
@@ -16,12 +16,13 @@ public function up()
             $table->id();
 
             $table->foreignId('setting_group_id')
+                ->nullable()
                 ->constrained()
                 ->cascadeOnDelete()
                 ->cascadeOnUpdate();
 
             $table->string('slug', 190);
-            $table->string('name', 190)->nullable();
+            $table->string('hint', 190)->nullable();
             $table->string('value', 190);
             $table->timestamps();
 

diff --git a/src/LaravelSiteSettings.php b/src/LaravelSiteSettings.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Contracts\Config\Repository as ConfigContract;
 use Illuminate\Support\Arr;
+use VI\LaravelSiteSettings\Models\Setting;
 use VI\LaravelSiteSettings\Models\SettingGroup;
 
 class LaravelSiteSettings implements ConfigContract
@@ -15,13 +16,18 @@ public function __construct()
     {
 
         $this->items = cache()->rememberForever(config('laravelsitesettings.cache_key'), function () {
-            return SettingGroup::all()
+            $withGroup = SettingGroup::all()
                 ->load('settings')
                 ->keyBy('slug')
                 ->map(function ($group) {
                     return $group->settings->pluck('value', 'slug');
                 })
                 ->toArray();
+            $withoutGroup = Setting::whereNull('setting_group_id')->get()
+                ->pluck('value', 'slug')
+                ->toArray();
+
+            return array_merge($withGroup, $withoutGroup);
         });
 
     }

diff --git a/src/Models/Setting.php b/src/Models/Setting.php
@@ -12,7 +12,7 @@ class Setting extends Model
     protected $fillable = [
         'setting_group_id',
         'slug',
-        'name',
+        'hint',
         'value',
     ];
 

diff --git a/src/Models/SettingGroup.php b/src/Models/SettingGroup.php
@@ -11,7 +11,7 @@ class SettingGroup extends Model
 
     protected $fillable = [
         'slug',
-        'name',
+        'hint',
     ];
 
     public function settings(): HasMany

diff --git a/stubs/MoonShine/Resources/SettingGroupResource.php.stub b/stubs/MoonShine/Resources/SettingGroupResource.php.stub
@@ -24,7 +24,7 @@ class SettingGroupResource extends Resource
         return [
             ID::make()->sortable(),
             Text::make('Slug', 'slug')->required()->sortable()->hint('a-z, 0-9, -'),
-            Text::make('Hint', 'name')->nullable()->sortable()->hint('Не используется на сайте, только для удобства администрирования!'),
+            Text::make('Hint', 'hint')->nullable()->sortable()->hint('Не используется на сайте, только для удобства администрирования!'),
             Date::make('Updated at', 'updated_at')->sortable()->hideOnForm(),
         ];
     }
@@ -33,13 +33,13 @@ class SettingGroupResource extends Resource
     {
         return [
             'slug' => 'required|max:190|regex:/^([a-z0-9\-]+)$/i|unique:laravel_site_setting_groups,slug,' . $item->getKey(),
-            'name' => 'nullable|max:190',
+            'hint' => 'nullable|max:190',
         ];
     }
 
     public function search(): array
     {
-        return ['id', 'slug', 'name'];
+        return ['id', 'slug', 'hint'];
     }
 
     public function filters(): array

diff --git a/stubs/MoonShine/Resources/SettingResource.php.stub b/stubs/MoonShine/Resources/SettingResource.php.stub
@@ -26,11 +26,10 @@ class SettingResource extends Resource
             ID::make()->sortable(),
             BelongsTo::make(
                 'Group',
-                'setting_group_id',
-                fn($item) => $item->name_human
+                'setting_group_id'
             )->nullable()->sortable(),
             Text::make('Slug', 'slug')->required()->sortable()->hint('a-z, 0-9, -'),
-            Text::make('Hint', 'name')->nullable()->sortable()->hint('Не используется на сайте, только для удобства администрирования!'),
+            Text::make('Hint', 'hint')->nullable()->sortable()->hint('Не используется на сайте, только для удобства администрирования!'),
             Text::make('Value', 'value')->required()->sortable(),
             Date::make('Updated at', 'updated_at')->sortable()->hideOnForm(),
         ];
@@ -39,25 +38,24 @@ class SettingResource extends Resource
     public function rules(Model $item): array
     {
         return [
-            'setting_group_id' => 'required|exists:setting_groups,id',
+            'setting_group_id' => 'nullable|exists:setting_groups,id',
             'slug'  => 'required|max:190|regex:/^([a-z0-9\-]+)$/i|unique:laravel_site_setting_groups,slug,' . $item->getKey(),
-            'name'  => 'nullable|max:190',
+            'hint'  => 'nullable|max:190',
             'value' => 'required|max:190',
         ];
     }
 
     public function search(): array
     {
-        return ['id', 'slug', 'name', 'value'];
+        return ['id', 'slug', 'hint', 'value'];
     }
 
     public function filters(): array
     {
         return [
             BelongsTo::make(
                 'Group',
-                'setting_group_id',
-                fn($item) => $item->name_human
+                'setting_group_id'
             )->nullable(),
         ];
     }