Merge pull request #20 from loannis/CFM-143_DRY_Refactor_topLinks_and…

…_indexActions_make_use_of_an_element_or_MenuHelper CFM-143_DRY_Refactor_topLinks_and_indexActions_make_use_of_an_element_or_MenuHelper
COmanage · May 4, 2022 · 68b0e7c · 68b0e7c
2 parents 54f7680 + ca17e3c
commit 68b0e7c
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 35 deletions.
diff --git a/app/src/Lib/Traits/SearchFilterTrait.php b/app/src/Lib/Traits/SearchFilterTrait.php
@@ -29,6 +29,8 @@
 
 namespace App\Lib\Traits;
 
+use Cake\Utility\Inflector;
+
 trait SearchFilterTrait {
   // Array (and configuration) of permitted search filters
   private $searchFilters = array();
@@ -54,9 +56,9 @@ public function getLabel(string $attribute): string {
     if($l != $attribute) {
       return $l;
     }
-    
-    // If we make it here, just return $attribute
-    return $attribute;
+
+    // If we make it here, just return a pretty version of the $attribute name
+    return Inflector::humanize($attribute);
   }
 
   /**

diff --git a/app/src/View/Helper/MenuHelper.php b/app/src/View/Helper/MenuHelper.php
@@ -80,7 +80,8 @@ public function getMenuIcon($action) {
       'Delete'        =>  'delete'
     );
 
-    return $icon[$action];
+    // For the actions with Default order we can pass directly the name of the icon
+    return $icon[$action] ?? $action;
   }
 
 }
diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php
@@ -91,38 +91,52 @@ function _column_key($modelsName, $c, $tz=null) {
     <h1><?= $vv_title; ?></h1>
   </div>
 
-  <?php if($vv_permissions['add']): ?>
-    <ul id="topLinks">
-      <li>
-        <?= $this->Html->link('<em class="material-icons" aria-hidden="true">add_circle</em> ' .
-            __d('operation', 'add.a', __d('controller', $modelsName, [1])),
-          ['action' => 'add', '?' => $linkFilter],
-          ['escape' => false]); ?>
-      </li>
-      <?php
-        if(!empty($topLinks)) {
-          foreach($topLinks as $t) {
-            if($vv_permissions[ $t['link']['action'] ]) {
-              // We need to inject $linkFilter, but not overwrite any existing query params
-              if(!empty($t['link']['?'])) {
-                $t['link']['?'] = array_merge($t['link']['?'], $linkFilter);
-              } else {
-                $t['link']['?'] = $linkFilter;
-              }
-              
-              print '<li>' .
-                $this->Html->link(
-                  '<em class="material-icons" aria-hidden="true">' . $t['icon']. '</em> ' . $t['label'],
-                  $t['link'],
-                  ['escape' => false, 'class' => $t['class']]
-                ) . '
-              </li>';
-            }
-          }
+  <?php
+  // Action list for top menu dropdown / button listing
+  // Index view top link action item can be atomized using the user's identifier
+  // since there will not always be an object id available. Like the case of add action
+  if($vv_permissions['add']) {
+    $action_args = array();
+    $action_args['vv_attr_id'] =  $vv_user['username'];
+
+    $action_args['vv_actions'][] = [
+      'order' => $this->Menu->getMenuOrder('Add'),
+      'icon' => $this->Menu->getMenuIcon('Add'),
+      'url' => $this->Url->build(
+        [
+          'controller' => $modelsName,
+          'action' => 'add',
+          '?' => $linkFilter
+        ]
+      ),
+      'label' => __d('operation', 'add.a', __d('controller', $modelsName, [1])),
+    ];
+
+    foreach(($topLinks ?? []) as $t) {
+      if($vv_permissions[ $t['link']['action'] ]) {
+        // We need to inject $linkFilter, but not overwrite any existing query params
+        if(!empty($t['link']['?'])) {
+          $t['link']['?'] = array_merge($t['link']['?'], $linkFilter);
+        } else {
+          $t['link']['?'] = $linkFilter;
         }
-      ?>
-    </ul>
-  <?php endif; ?>
+
+        $action_args['vv_actions'][] = [
+          'order' => $this->Menu->getMenuOrder($t['order']),
+          'icon' => $this->Menu->getMenuIcon($t['icon']),
+          'url' => $this->Url->build($t['link']),
+          'label' => $t['label'],
+        ];
+      }
+    }
+  }
+
+  if(!empty($action_args['vv_actions'])) {
+  print '<div class="field-actions top-links">';
+    print $this->element('menuAction', $action_args);
+    print '</div>';
+  }
+  ?>
 </div>
 <?php if(!empty($indexBanners)): ?>
   <?php foreach($indexBanners as $b): ?>

diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
@@ -491,6 +491,7 @@ instead, reveal in user menu */
   display: flex;
   justify-content: space-between;
   margin: 1em 0 0.5em;
+  align-items: baseline;
 }
 .pageTitle {
   padding-bottom: 0.25em;