add isBadge() for table badge & pagainte() to base

queents · Sep 16, 2022 · 97825d8 · 97825d8
1 parent a23767d
commit 97825d8
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 15 deletions.
diff --git a/Services/Concerns/HasColor.php b/Services/Concerns/HasColor.php
@@ -8,7 +8,7 @@ trait HasColor
      * @var ?string
      * @example 12
      */
-    public ?string $color = "green";
+    public ?string $color = null;
 
     public function color($color): static
     {

diff --git a/Services/Concerns/IsReactive.php b/Services/Concerns/IsReactive.php
@@ -16,10 +16,10 @@ trait IsReactive
     public ?string $reactiveRow = null;
 
     /**
-     * @var ?string
+     * @var string|bool|array|int|null
      * @example 'name'
      */
-    public ?string $reactiveWhere = null;
+    public string|bool|array|int|null|object  $reactiveWhere = null;
 
 
     /**
@@ -42,10 +42,10 @@ public function reactiveRow(string $reactiveRow): static
     }
 
     /**
-     * @param string $reactiveWhere
+     * @param string|bool|array|int|object  $reactiveWhere
      * @return $this
      */
-    public function reactiveWhere(string $reactiveWhere): static
+    public function reactiveWhere(string|bool|array|int|object $reactiveWhere): static
     {
         $this->reactiveWhere = $reactiveWhere;
         return $this;

diff --git a/Services/Concerns/IsUrl.php b/Services/Concerns/IsUrl.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Modules\Base\Services\Concerns;
+
+trait IsUrl
+{
+    /**
+     * @var ?bool
+     */
+    public ?bool $url = false;
+
+    /**
+     * @return $this
+     */
+    public function url(bool $url = true): static
+    {
+        $this->url = $url;
+        return $this;
+    }
+}
diff --git a/Services/Resource/Concerns/Actions/Show.php b/Services/Resource/Concerns/Actions/Show.php
@@ -31,11 +31,6 @@ public  function show(Request $request, $id): JsonResponse | \Inertia\Response
          */
         $query->find($id);
 
-        /*
-         * Set JOIN to relation
-         */
-        $this->filterRelation($query);
-
         /*
          * Make a Hook before get Query
          */
@@ -47,12 +42,19 @@ public  function show(Request $request, $id): JsonResponse | \Inertia\Response
         /*
          * Get Query
          */
-        $record = $query->select(collect($this->rows())->where('view', true)
+        $query->select(collect($this->rows())->where('view', true)
             ->where('vue', '!=', 'ViltMedia.vue')
             ->where('vue', '!=', 'ViltRelation.vue')
             ->where('over', '!=', true)
             ->pluck('name')->toArray())->first();
 
+        /*
+         * Set JOIN to relation
+         */
+        $this->filterRelation($query);
+
+        $record = $query->first();
+
         /*
          * Make a Hook after get Query
          */
@@ -111,9 +113,9 @@ public  function show(Request $request, $id): JsonResponse | \Inertia\Response
     public function unsetShowData($record): void
     {
         foreach($this->rows() as $row) {
-            if (($row->vue === 'ViltHasOne.vue' || $row->vue === 'ViltRelation.vue') && !empty($row->relation)) {
+            if (($row->vue === 'ViltHasOne.vue') && !empty($row->relation)) {
                 $record->{$row->name} = $record->{$row->relation};
-                unset($record->{$row->relation});
+                unset($record->{$row->name});
             }
         }
     }

diff --git a/Services/Resource/Concerns/Filters/Query.php b/Services/Resource/Concerns/Filters/Query.php
@@ -9,7 +9,7 @@ trait Query
     public function filterQuery(array $rows, LengthAwarePaginator $data, bool $isAPI): LengthAwarePaginator
     {
         foreach ($rows as $row) {
-            if (($row->vue === 'ViltHasOne.vue' || $row->vue === 'ViltRelation.vue') && $row->list && !empty($row->relation)) {
+            if (($row->vue === 'ViltHasOne.vue') && $row->list && !empty($row->relation)) {
                 foreach($data as $i=>$item){
                     $item->{$row->name} = $item->{$row->relation};
                     unset($item->{$row->relation});

diff --git a/Services/Resource/Concerns/Handlers/Query.php b/Services/Resource/Concerns/Handlers/Query.php
@@ -48,7 +48,7 @@ public function modifyQuery($query, Request $request, bool $isAPI, array $rows):
              */
             if ($isAPI) {
                 if (($row->vue === 'ViltRelation.vue') ) {
-                    $query->with($row->name);
+                    $query->with($row->relation);
                 }
                 if (($row->vue === 'ViltHasOne.vue')) {
                     $query->with($row->relation);

diff --git a/Services/Rows/Abstracts/Base.php b/Services/Rows/Abstracts/Base.php
@@ -34,6 +34,7 @@
 use Modules\Base\Services\Concerns\IsSearchable;
 use Modules\Base\Services\Concerns\IsSortable;
 use Modules\Base\Services\Concerns\IsUnique;
+use Modules\Base\Services\Concerns\IsUrl;
 use Modules\Base\Services\Rows\Interfaces\Component;
 
 abstract class Base implements Component
@@ -61,6 +62,7 @@ abstract class Base implements Component
     use HasOptions;
     use HasTrack;
     use HasValidation;
+    use IsUrl;
     use IsMulti;
     use IsOver;
     use IsDisabled;