ToggleDetail Row Rule

Power-Components · May 19, 2024 · 969aed4 · 969aed4
1 parent 38443fd
commit 969aed4
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 18 deletions.
diff --git a/resources/views/components/frameworks/bootstrap5/no-toggle-detail.blade.php b/resources/views/components/frameworks/bootstrap5/no-toggle-detail.blade.php
@@ -0,0 +1,4 @@
+<td
+    class="{{ data_get($theme, 'tdBodyClass') }}"
+    style="{{  data_get($theme, 'tdBodyStyle') }}"
+></td>
diff --git a/resources/views/components/frameworks/tailwind/no-toggle-detail.blade.php b/resources/views/components/frameworks/tailwind/no-toggle-detail.blade.php
@@ -0,0 +1,4 @@
+<td
+    class="{{ data_get($theme, 'tdBodyClass') }}"
+    style="{{  data_get($theme, 'tdBodyStyle') }}"
+></td>
diff --git a/resources/views/components/row.blade.php b/resources/views/components/row.blade.php
@@ -12,10 +12,32 @@
 ])
 
 @php
-    $ruleDetailView = data_get($rulesValues, 'detailView');
+    // =============* Get Rules *=====================
+    $rowRules = $actionRulesClass->recoverFromAction($row, RuleManager::TYPE_ROWS);
+
+    // =============* Toggle Detail Rules *=====================
+    $showToggleDetail = data_get($setUp, 'detail.showCollapseIcon');
+
+    $toggleDetailVisibilityRowRules = collect(data_get($rowRules, 'ToggleDetailVisibility', []));
+
+    if ($toggleDetailVisibilityRowRules) {
+        // Has permission, but Row Action Rule is changing to hide
+        if ($showToggleDetail && $toggleDetailVisibilityRowRules->last() == 'hide')
+        {
+            $showToggleDetail = false;
+        }
+
+        // No permission, but Row Action Rule is forcing to show
+        if (!$showToggleDetail && $toggleDetailVisibilityRowRules->last() == 'show')
+        {
+            $showToggleDetail = true;
+        }
+    }
+
+    $toggleDetailView = powerGridThemeRoot() . ($showToggleDetail ? '.toggle-detail' : '.no-toggle-detail');
 @endphp
 
-@includeWhen(data_get($setUp, 'detail.showCollapseIcon'), powerGridThemeRoot() . '.toggle-detail', [
+@includeWhen(data_get($setUp, 'detail.showCollapseIcon'), $toggleDetailView, [
     'theme' => data_get($theme, 'table'),
     'view' => data_get($setUp, 'detail.viewIcon') ?? null,
 ])
@@ -65,15 +87,11 @@
                 @endforeach
             @endif
         </div>
-
-        {{-- =============* Get Rules *===================== --}}
-        @php
-            $rowRules = $actionRulesClass->recoverFromAction($row, RuleManager::TYPE_ROWS);
-            $hasFieldRules = $actionRulesClass->recoverActionForField($row, $field);
-        @endphp
-
-        {{-- =============* Edit On Click *===================== --}}
         @php
+        // =============* Get Field Rules *=====================
+        $hasFieldRules = $actionRulesClass->recoverActionForField($row, $field);
+
+        // =============* Edit On Click *=====================
         
         $showEditOnClick = false;
 

diff --git a/src/Components/Rules/RuleManager.php b/src/Components/Rules/RuleManager.php
@@ -20,10 +20,9 @@ class RuleManager
 
     public static function applicableModifiers(): array
     {
-        return ['bladeComponent', 'detailView', 'disable', 'dispatch', 'dispatchTo', 'emit', 'hide', 'loop', 'redirect', 'rowClasses', 'setAttribute', 'slot', 'ToggleableVisibility', 'DetailButtonVisibility', 'EditOnClickVisibility', 'field_hide_editonclick', 'field_hide_toggleable'];
+        return ['bladeComponent', 'detailView', 'disable', 'dispatch', 'dispatchTo', 'emit', 'hide', 'loop', 'redirect', 'rowClasses', 'setAttribute', 'slot', 'ToggleableVisibility', 'ToggleDetailVisibility', 'EditOnClickVisibility', 'field_hide_editonclick', 'field_hide_toggleable'];
     }
 
-    //@TODO DetailButtonVisibility
     public function button(string $button): RuleActions
     {
         return new RuleActions($button);

diff --git a/src/Components/Rules/RuleRows.php b/src/Components/Rules/RuleRows.php
@@ -74,21 +74,21 @@ public function disableEditOnClick(): self
     }
 
     /**
-     * Show the Detail button in current row.
+     * Show the Detail toggle in current row.
      */
-    public function showDetailButton(): self
+    public function showToggleDetail(): self
     {
-        $this->setModifier('DetailButtonVisibility', 'show');
+        $this->setModifier('ToggleDetailVisibility', 'show');
 
         return $this;
     }
 
     /**
-     * Hide the Detail button in current row.
+     * Hide the Detail toggle in current row.
      */
-    public function hideDetailButton(): self
+    public function hideToggleDetail(): self
     {
-        $this->setModifier('DetailButtonVisibility', 'hide');
+        $this->setModifier('ToggleDetailVisibility', 'hide');
 
         return $this;
     }