sort fields implemented.

Smoren · May 17, 2024 · 5055e8d · 5055e8d
1 parent 4a60577
commit 5055e8d
Show file tree

Hide file tree

Showing 20 changed files with 132 additions and 8 deletions.
diff --git a/src/controllers/ApiController.php b/src/controllers/ApiController.php
@@ -60,7 +60,7 @@ protected function userFilter(ActiveQuery $query, ?Model $form): ActiveQuery
      */
     protected function userOrder(ActiveQuery $query, ?Model $form): ActiveQuery
     {
-        return $query->orderBy(['title' => SORT_ASC]);
+        return $query->orderBy(['sort' => SORT_ASC, 'title' => SORT_ASC]);
     }
 
     /**

diff --git a/src/controllers/ApiGroupController.php b/src/controllers/ApiGroupController.php
@@ -61,7 +61,7 @@ protected function userFilter(ActiveQuery $query, ?Model $form): ActiveQuery
      */
     protected function userOrder(ActiveQuery $query, ?Model $form): ActiveQuery
     {
-        return $query->orderBy(['title' => SORT_ASC]);
+        return $query->orderBy(['sort' => SORT_ASC, 'title' => SORT_ASC]);
     }
 
     /**

diff --git a/src/controllers/RuleController.php b/src/controllers/RuleController.php
@@ -58,7 +58,7 @@ protected function userFilter(ActiveQuery $query, ?Model $form): ActiveQuery
      */
     protected function userOrder(ActiveQuery $query, ?Model $form): ActiveQuery
     {
-        return $query->orderBy(['title' => SORT_ASC]);
+        return $query->orderBy(['sort' => SORT_ASC, 'title' => SORT_ASC]);
     }
 
     /**

diff --git a/src/controllers/WorkerGroupController.php b/src/controllers/WorkerGroupController.php
@@ -60,7 +60,7 @@ protected function userFilter(ActiveQuery $query, ?Model $form): ActiveQuery
      */
     protected function userOrder(ActiveQuery $query, ?Model $form): ActiveQuery
     {
-        return $query->orderBy(['title' => SORT_ASC]);
+        return $query->orderBy(['sort' => SORT_ASC, 'title' => SORT_ASC]);
     }
 
     /**

diff --git a/src/forms/api/ApiCreateForm.php b/src/forms/api/ApiCreateForm.php
@@ -38,6 +38,15 @@ class ApiCreateForm extends Model
      * )
      */
     public $title;
+    /**
+     * @OA\Property(
+     *     property="sort",
+     *     type="integer",
+     *     example="0",
+     *     description="Sort index"
+     * )
+     */
+    public $sort;
     /**
      * @OA\Property(
      *     property="extra",
@@ -56,6 +65,8 @@ public function rules()
         return [
             [['method', 'path', 'title'], 'required'],
             [['method', 'path', 'title'], 'string'],
+            [['sort'], 'integer'],
+            [['sort'], 'integer', 'default' => 0],
             [['extra'], 'validateExtra'],
             [['path', 'title'], 'string', 'max' => 255],
             [['method'], 'string', 'max' => 10],

diff --git a/src/forms/api/ApiUpdateForm.php b/src/forms/api/ApiUpdateForm.php
@@ -25,6 +25,12 @@
  *     description="API name"
  * )
  * @OA\Property(
+ *     property="sort",
+ *     type="integer",
+ *     example="0",
+ *     description="Sort index"
+ * )
+ * @OA\Property(
  *     property="extra",
  *     type="object|null",
  *     example=null,
@@ -40,6 +46,8 @@ public function rules()
     {
         return [
             [['method', 'path', 'title'], 'string'],
+            [['sort'], 'integer'],
+            [['sort'], 'integer', 'default' => 0],
             [['extra'], 'validateExtra'],
             [['path', 'title'], 'string', 'max' => 255],
             [['method'], 'string', 'max' => 10],

diff --git a/src/forms/api_group/ApiGroupCreateForm.php b/src/forms/api_group/ApiGroupCreateForm.php
@@ -47,6 +47,15 @@ class ApiGroupCreateForm extends Model
      * )
      */
     public $is_secured;
+    /**
+     * @OA\Property(
+     *     property="sort",
+     *     type="integer",
+     *     example="0",
+     *     description="Sort index"
+     * )
+     */
+    public $sort;
     /**
      * @OA\Property(
      *     property="extra",
@@ -65,6 +74,8 @@ public function rules()
         return [
             [['alias', 'title'], 'required'],
             [['alias', 'title'], 'string'],
+            [['sort'], 'integer'],
+            [['sort'], 'integer', 'default' => 0],
             [['in_menu', 'is_secured'], 'boolean'],
             [['in_menu'], 'default', 'value' => false],
             [['is_secured'], 'default', 'value' => true],

diff --git a/src/forms/api_group/ApiGroupUpdateForm.php b/src/forms/api_group/ApiGroupUpdateForm.php
@@ -24,6 +24,12 @@
  *     example=false,
  *     description="Include to menu flag"
  * )
+ * @OA\Property(
+ *     property="sort",
+ *     type="integer",
+ *     example="0",
+ *     description="Sort index"
+ * )
  */
 class ApiGroupUpdateForm extends ApiGroupCreateForm
 {
@@ -37,6 +43,8 @@ public function rules()
             [['in_menu', 'is_secured'], 'boolean'],
             [['in_menu'], 'default', 'value' => false],
             [['is_secured'], 'default', 'value' => true],
+            [['sort'], 'integer'],
+            [['sort'], 'integer', 'default' => 0],
             [['extra'], 'validateExtra'],
             [['alias', 'title'], 'string', 'max' => 255],
         ];

diff --git a/src/forms/rule/RuleCreateForm.php b/src/forms/rule/RuleCreateForm.php
@@ -29,6 +29,15 @@ class RuleCreateForm extends Model
      * )
      */
     public $title;
+    /**
+     * @OA\Property(
+     *     property="sort",
+     *     type="integer",
+     *     example="0",
+     *     description="Sort index"
+     * )
+     */
+    public $sort;
     /**
      * @OA\Property(
      *     property="extra",
@@ -47,6 +56,8 @@ public function rules()
         return [
             [['alias', 'title'], 'required'],
             [['alias', 'title'], 'string'],
+            [['sort'], 'integer'],
+            [['sort'], 'integer', 'default' => 0],
             [['extra'], 'validateExtra'],
             [['alias', 'title'], 'string', 'max' => 255],
         ];

diff --git a/src/forms/rule/RuleUpdateForm.php b/src/forms/rule/RuleUpdateForm.php
@@ -24,6 +24,12 @@
  *     example=null,
  *     description="Extra data"
  * )
+ * @OA\Property(
+ *     property="sort",
+ *     type="integer",
+ *     example="0",
+ *     description="Sort index"
+ * )
  */
 class RuleUpdateForm extends RuleCreateForm
 {
@@ -34,6 +40,8 @@ public function rules()
     {
         return [
             [['alias', 'title'], 'string'],
+            [['sort'], 'integer'],
+            [['sort'], 'integer', 'default' => 0],
             [['extra'], 'validateExtra'],
             [['alias', 'title'], 'string', 'max' => 255],
         ];

diff --git a/src/forms/worker_group/WorkerGroupCreateForm.php b/src/forms/worker_group/WorkerGroupCreateForm.php
@@ -29,6 +29,15 @@ class WorkerGroupCreateForm extends Model
      * )
      */
     public $title;
+    /**
+     * @OA\Property(
+     *     property="sort",
+     *     type="integer",
+     *     example="0",
+     *     description="Sort index"
+     * )
+     */
+    public $sort;
     /**
      * @OA\Property(
      *     property="extra",
@@ -47,6 +56,8 @@ public function rules()
         return [
             [['alias', 'title'], 'required'],
             [['alias', 'title'], 'string'],
+            [['sort'], 'integer'],
+            [['sort'], 'integer', 'default' => 0],
             [['extra'], 'validateExtra'],
             [['alias', 'title'], 'string', 'max' => 255],
         ];

diff --git a/src/forms/worker_group/WorkerGroupUpdateForm.php b/src/forms/worker_group/WorkerGroupUpdateForm.php
@@ -19,6 +19,12 @@
  *     description="Worker group name"
  * )
  * @OA\Property(
+ *     property="sort",
+ *     type="integer",
+ *     example="0",
+ *     description="Sort index"
+ * )
+ * @OA\Property(
  *     property="extra",
  *     type="object|null",
  *     example=null,
@@ -34,6 +40,8 @@ public function rules()
     {
         return [
             [['alias', 'title'], 'string'],
+            [['sort'], 'integer'],
+            [['sort'], 'integer', 'default' => 0],
             [['extra'], 'validateExtra'],
             [['alias', 'title'], 'string', 'max' => 255],
         ];

diff --git a/src/models/Api.php b/src/models/Api.php
@@ -18,6 +18,7 @@
  * @property string $method
  * @property string $path
  * @property string $title
+ * @property int $sort
  * @property string|null $extra
  * @property int $created_at
  * @property int|null $updated_at
@@ -44,8 +45,9 @@ public function rules()
             ['id', UuidValidator::class],
             [['method', 'path', 'title'], 'required'],
             [['extra'], 'safe'],
+            [['sort'], 'default', 'value' => 0],
             [['created_at', 'updated_at'], 'default', 'value' => null],
-            [['created_at', 'updated_at'], 'integer'],
+            [['sort', 'created_at', 'updated_at'], 'integer'],
             [['method'], 'string', 'max' => 10],
             [['path', 'title'], 'string', 'max' => 255],
             [['method', 'path'], 'unique', 'targetAttribute' => ['method', 'path']],
@@ -63,6 +65,7 @@ public function attributeLabels()
             'method' => 'Method',
             'path' => 'Path',
             'title' => 'Title',
+            'sort' => 'Sort',
             'extra' => 'Extra',
             'created_at' => 'Created At',
             'updated_at' => 'Updated At',

diff --git a/src/models/ApiGroup.php b/src/models/ApiGroup.php
@@ -22,6 +22,7 @@
  * @property bool $in_menu
  * @property bool $is_system
  * @property bool $is_secured
+ * @property int $sort
  * @property string|null $extra
  * @property int $created_at
  * @property int|null $updated_at
@@ -51,8 +52,9 @@ public function rules()
             [['alias', 'title'], 'required'],
             [['in_menu', 'is_system', 'is_secured'], 'boolean'],
             [['extra'], 'safe'],
+            [['sort'], 'default', 'value' => 0],
             [['created_at', 'updated_at'], 'default', 'value' => null],
-            [['created_at', 'updated_at'], 'integer'],
+            [['sort', 'created_at', 'updated_at'], 'integer'],
             [['alias', 'title'], 'string', 'max' => 255],
             [['alias'], 'unique'],
             [['id'], 'unique'],
@@ -71,6 +73,7 @@ public function attributeLabels()
             'in_menu' => 'In Menu',
             'is_system' => 'Is System',
             'is_secured' => 'Is Secured',
+            'sort' => 'Sort',
             'extra' => 'Extra',
             'created_at' => 'Created At',
             'updated_at' => 'Updated At',

diff --git a/src/models/Rule.php b/src/models/Rule.php
@@ -18,6 +18,7 @@
  * @property string $alias
  * @property string $title
  * @property bool $is_system
+ * @property int $sort
  * @property string|null $extra
  * @property int $created_at
  * @property int|null $updated_at
@@ -45,8 +46,9 @@ public function rules()
             [['alias', 'title'], 'required'],
             [['is_system'], 'boolean'],
             [['extra'], 'safe'],
+            [['sort'], 'default', 'value' => 0],
             [['created_at', 'updated_at'], 'default', 'value' => null],
-            [['created_at', 'updated_at'], 'integer'],
+            [['sort', 'created_at', 'updated_at'], 'integer'],
             [['alias', 'title'], 'string', 'max' => 255],
             [['alias'], 'unique'],
             [['id'], 'unique'],
@@ -63,6 +65,7 @@ public function attributeLabels()
             'alias' => 'Alias',
             'title' => 'Title',
             'is_system' => 'Is System',
+            'sort' => 'Sort',
             'extra' => 'Extra',
             'created_at' => 'Created At',
             'updated_at' => 'Updated At',

diff --git a/src/models/WorkerGroup.php b/src/models/WorkerGroup.php
@@ -19,6 +19,7 @@
  * @property string $alias
  * @property string $title
  * @property bool $is_system
+ * @property int $sort
  * @property string|null $extra
  * @property int $created_at
  * @property int|null $updated_at
@@ -47,8 +48,9 @@ public function rules()
             [['alias', 'title'], 'required'],
             [['is_system'], 'boolean'],
             [['extra'], 'safe'],
+            [['sort'], 'default', 'value' => 0],
             [['created_at', 'updated_at'], 'default', 'value' => null],
-            [['created_at', 'updated_at'], 'integer'],
+            [['sort', 'created_at', 'updated_at'], 'integer'],
             [['alias', 'title'], 'string', 'max' => 255],
             [['alias'], 'unique'],
             [['id'], 'unique'],
@@ -65,6 +67,7 @@ public function attributeLabels()
             'alias' => 'Alias',
             'title' => 'Title',
             'is_system' => 'Is System',
+            'sort' => 'Sort',
             'extra' => 'Extra',
             'created_at' => 'Created At',
             'updated_at' => 'Updated At',

diff --git a/src/models/query/ApiGroupQuery.php b/src/models/query/ApiGroupQuery.php
@@ -87,6 +87,15 @@ public function byWorkerGroup($workerGroupId)
         return $this->andWhereExtended([$this->aliasColumn('id') => array_unique($apiGroupIds)]);
     }
 
+    /**
+     * @param int $direction
+     * @return self
+     */
+    public function sort(int $direction = SORT_ASC): self
+    {
+        return $this->orderBy(['sort' => $direction]);
+    }
+
     /**
      * @param Connection|null $db
      * @return array|ApiGroup

diff --git a/src/models/query/ApiQuery.php b/src/models/query/ApiQuery.php
@@ -67,6 +67,15 @@ public function byPath($path, bool $filter = false)
         return $this->andWhereExtended([$this->aliasColumn('path') => $path], $filter);
     }
 
+    /**
+     * @param int $direction
+     * @return self
+     */
+    public function sort(int $direction = SORT_ASC): self
+    {
+        return $this->orderBy(['sort' => $direction]);
+    }
+
     /**
      * @param Connection|null $db
      * @return array|Api

diff --git a/src/models/query/RuleQuery.php b/src/models/query/RuleQuery.php
@@ -34,6 +34,15 @@ public function byTitle($title, bool $filter = false)
         return $this->andWhereExtended([$this->aliasColumn('title') => $title], $filter);
     }
 
+    /**
+     * @param int $direction
+     * @return self
+     */
+    public function sort(int $direction = SORT_ASC): self
+    {
+        return $this->orderBy(['sort' => $direction]);
+    }
+
     /**
      * @param Connection|null $db
      * @return array|Rule

diff --git a/src/models/query/WorkerGroupQuery.php b/src/models/query/WorkerGroupQuery.php
@@ -76,6 +76,15 @@ public function byRule($ruleId)
         return $this->andWhereExtended([$this->aliasColumn('id') => $workerGroupIds]);
     }
 
+    /**
+     * @param int $direction
+     * @return self
+     */
+    public function sort(int $direction = SORT_ASC): self
+    {
+        return $this->orderBy(['sort' => $direction]);
+    }
+
     /**
      * @param Connection|null $db
      * @return array|WorkerGroup