Added opportunity to apply several scopes in relation form element

resources/js/controllers/relation_controller.js

@@ -49,7 +49,7 @@ export default class extends ApplicationController {
         const model = this.data.get('model');
         const name = this.data.get('name');
         const key = this.data.get('key');
-        const scope = this.data.get('scope');
+        const scopes = this.data.get('scopes');
         const append = this.data.get('append');
         const searchColumns = this.data.get('search-columns');
         const chunk = this.data.get('chunk');
@@ -59,7 +59,7 @@ export default class extends ApplicationController {
             model,
             name,
             key,
-            scope,
+            scopes: JSON.parse(scopes),
             append,
             searchColumns,
             chunk,

resources/views/fields/relation.blade.php

@@ -5,7 +5,7 @@
          data-relation-model="{{ $relationModel }}"
          data-relation-name="{{ $relationName }}"
          data-relation-key="{{ $relationKey }}"
-         data-relation-scope="{{ $relationScope }}"
+         data-relation-scopes="{{ json_encode($relationScopes) ?? '' }}"
          data-relation-search-columns="{{ $relationSearchColumns }}"
          data-relation-append="{{ $relationAppend }}"
          data-relation-chunk="{{ $chunk }}"

src/Platform/Http/Controllers/RelationController.php

@@ -22,7 +22,7 @@ public function view(RelationRequest $request)
             'model'         => $model,
             'name'          => $name,
             'key'           => $key,
-            'scope'         => $scope,
+            'scopes'         => $scopes,
             'append'        => $append,
             'searchColumns' => $searchColumns,
         ] = collect($request->all())
@@ -32,10 +32,16 @@ public function view(RelationRequest $request)
                     return null;
                 }
 
-                if ($key === 'scope' || $key === 'searchColumns') {
+                if ($key === 'searchColumns') {
                     return Crypt::decrypt($item);
                 }
 
+                if ($key === 'scopes') {
+                    return array_map(function ($scope) {
+                        return Crypt::decrypt($scope);
+                    }, $item);
+                }
+
                 return Crypt::decryptString($item);
             });
 
@@ -44,7 +50,7 @@ public function view(RelationRequest $request)
         $model = new $model;
         $search = $request->get('search', '');
 
-        $items = $this->buildersItems($model, $name, $key, $search, $scope, $append, $searchColumns, (int) $request->get('chunk', 10));
+        $items = $this->buildersItems($model, $name, $key, $search, $scopes, $append, $searchColumns, (int) $request->get('chunk', 10));
 
         return response()->json($items);
     }
@@ -53,18 +59,20 @@ public function view(RelationRequest $request)
      * @return mixed
      */
     private function buildersItems(
-        Model $model,
+        Model  $model,
         string $name,
         string $key,
         string $search = null,
-        ?array $scope = [],
+        ?array $scopes = [],
         string $append = null,
-        array $searchColumns = null,
-        ?int $chunk = 10
+        array  $searchColumns = null,
+        ?int   $chunk = 10
     ) {
-        if ($scope !== null) {
+        if ($scopes !== null) {
             /** @var Collection|array $model */
-            $model = $model->{$scope['name']}(...$scope['parameters']);
+            foreach ($scopes as $scope) {
+                $model = $model->{$scope['name']}(...$scope['parameters']);
+            }
         }
 
         if (is_array($model)) {

src/Platform/Http/Requests/RelationRequest.php

@@ -20,7 +20,7 @@ public function rules()
             'model'          => 'string|required',
             'key'            => 'string|required',
             'name'           => 'string|required',
-            'scope'          => 'string|nullable',
+            'scopes'          => 'array|nullable',
             'append'         => 'nullable',
             'searchColumns'  => 'string|nullable',
         ];

src/Screen/Field.php

@@ -163,6 +163,18 @@ public function set(string $key, $value = true): self
         return $this;
     }
 
+    /**
+     * @param mixed $value
+     *
+     * @return static
+     */
+    public function add(string $key, $value = true): self
+    {
+        $this->attributes[$key][] = $value;
+
+        return $this;
+    }
+
     /**
      * @throws Throwable
      *

src/Screen/Fields/Relation.php

@@ -45,7 +45,7 @@ class Relation extends Field
     protected $attributes = [
         'class'                 => 'form-control',
         'value'                 => [],
-        'relationScope'         => null,
+        'relationScopes'         => null,
         'relationAppend'        => null,
         'relationSearchColumns' => null,
         'chunk'                 => 10,
@@ -61,7 +61,7 @@ class Relation extends Field
         'relationModel',
         'relationName',
         'relationKey',
-        'relationScope',
+        'relationScopes',
         'relationAppend',
         'relationSearchColumns',
     ];
@@ -139,7 +139,7 @@ public function fromClass(string $class, string $name, string $key = 'id'): self
                 return $this->set('value', $value);
             }
 
-            $scope = $this->get('scope', 'handler');
+            $scopes = $this->get('scopes', 'handler');
             $class = resolve($class);
 
             if (! is_iterable($value)) {
@@ -150,7 +150,10 @@ public function fromClass(string $class, string $name, string $key = 'id'): self
                 $class->value = $value;
             }
 
-            $class = $class->{$scope['name']}(...$scope['parameters']);
+            foreach ($scopes as $scope) {
+                $class = $class->{$scope['name']}(...$scope['parameters']);
+            }
+
 
             $item = collect($class)
                 ->whereIn($key, $value)
@@ -179,8 +182,8 @@ public function applyScope(string $scope, ...$parameters): self
             'name'       => lcfirst($scope),
             'parameters' => $parameters,
         ];
-        $this->set('scope', $data);
-        $this->set('relationScope', Crypt::encrypt($data));
+        $this->add('scopes', $data);
+        $this->add('relationScopes', Crypt::encrypt($data));
 
         return $this;
     }

tests/Feature/Platform/RelationsTest.php

@@ -94,7 +94,7 @@ private function getScope(array $scope = null, string $append = null): TestRespo
         ];
 
         if ($scope !== null) {
-            $params['scope'] = Crypt::encrypt($scope);
+            $params['scopes'] = [Crypt::encrypt($scope)];
         }
 
         if ($append !== null) {
@@ -115,7 +115,7 @@ public function testSearchColumns()
             'name'          => Crypt::encryptString('name'),
             'key'           => Crypt::encryptString('id'),
             'searchColumns' => Crypt::encrypt(['email']),
-            'scope'         => null,
+            'scopes'         => null,
             'append'        => Crypt::encryptString('full'),
         ];
 
@@ -137,10 +137,12 @@ public function testSearchColumnsWithScopes()
             'name'          => Crypt::encryptString('email'),
             'key'           => Crypt::encryptString('id'),
             'searchColumns' => Crypt::encrypt(['id']),
-            'scope'         => Crypt::encrypt([
+            'scopes'         => [
+                Crypt::encrypt([
                 'name'       => 'asBuilder',
                 'parameters' => [],
-            ]),
+                ])
+            ],
             'append'        => Crypt::encryptString('full'),
         ];
 

tests/Unit/Screen/Fields/RelationTest.php

@@ -129,18 +129,18 @@ public function testNotScope(): void
 
         $view = self::renderField($select);
 
-        $this->assertStringContainsString('data-relation-scope=""', $view);
+        $this->assertStringContainsString('data-relation-scopes=""', $view);
     }
 
-    public function testScopeWithAttributes(): void
+    public function testScopesWithAttributes(): void
     {
         $select = Relation::make('users')
             ->fromModel(EmptyUserModel::class, 'name')
             ->applyScope('exampleScope', 1, 'string', ['foo', 'bar']);
 
         $view = self::renderField($select);
 
-        $crypt = Str::between($view, 'data-relation-scope="', '=="');
+        $crypt = Str::between($view, 'data-relation-scopes="', '=="');
 
         $this->assertEquals([
             'name'       => lcfirst('exampleScope'),
@@ -156,7 +156,7 @@ public function testScopeWithNotAttributes(): void
 
         $view = self::renderField($select);
 
-        $crypt = Str::between($view, 'data-relation-scope="', '=="');
+        $crypt = Str::between($view, 'data-relation-scopes="', '=="');
 
         $this->assertEquals([
             'name'       => lcfirst('exampleScope'),