fix: [UI] Auth Key index and view changes and fixes

app/Controller/AuthKeysController.php

@@ -50,9 +50,12 @@ class AuthKeysController extends AppController
         if ($this->IndexFilter->isRest()) {
             return $this->restResponsePayload;
         }
+        $this->set('title_for_layout', __('Auth Keys'));
         $this->set('keyUsageEnabled', $keyUsageEnabled);
-        $this->set('metaGroup', $this->_isAdmin ? 'admin' : 'globalActions');
-        $this->set('metaAction', 'authkeys_index');
+        $this->set('menuData', [
+            'menuList' => $this->_isSiteAdmin() ? 'admin' : 'globalActions',
+            'menuItem' => 'authkeys_index',
+        ]);
     }
 
     public function delete($id)
@@ -131,6 +134,7 @@ class AuthKeysController extends AppController
             $this->set('uniqueIps', $uniqueIps);
         }
 
+        $this->set('title_for_layout', __('Auth Key'));
         $this->set('menuData', [
             'menuList' => $this->_isSiteAdmin() ? 'admin' : 'globalActions',
             'menuItem' => 'authKeyView',

app/View/AuthKeys/index.ctp

@@ -28,7 +28,6 @@
                         'type' => 'search',
                         'button' => __('Filter'),
                         'placeholder' => __('Enter value to search'),
-                        'data' => '',
                         'searchKey' => 'value'
                     ]
                 ]
@@ -43,9 +42,12 @@
                     'name' => __('User'),
                     'sort' => 'User.email',
                     'data_path' => 'User.email',
+                    'element' => empty($user_id) ? 'links' : 'generic_field',
+                    'url' => $baseurl . '/users/view',
+                    'url_params_data_paths' => ['User.id'],
                 ],
                 [
-                    'name' => __('Auth key'),
+                    'name' => __('Auth Key'),
                     'sort' => 'AuthKey.authkey_start',
                     'element' => 'authkey',
                     'data_path' => 'AuthKey',
@@ -94,19 +96,14 @@
     ]);
     echo '</div>';
     if (empty($ajax)) {
-        echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => $metaGroup, 'menuItem' => $this->action));
+        echo $this->element('/genericElements/SideMenu/side_menu', $menuData);
     }
 ?>
 <script type="text/javascript">
     var passedArgsArray = <?php echo $passedArgs; ?>;
-    $(document).ready(function() {
+    $(function() {
         $('#quickFilterButton').click(function() {
             runIndexQuickFilter();
         });
-        $('#quickFilterField').on('keypress', function (e) {
-            if(e.which === 13) {
-                runIndexQuickFilter();
-            }
-        });
     });
 </script>

app/View/AuthKeys/view.ctp

@@ -27,20 +27,10 @@ echo $this->element(
                 'path' => 'AuthKey.uuid',
             ],
             [
-                'key' => __('Auth key'),
+                'key' => __('Auth Key'),
                 'path' => 'AuthKey',
                 'type' => 'authkey'
             ],
-            [
-                'key' => __('Created'),
-                'path' => 'AuthKey.created',
-                'type' => 'datetime'
-            ],
-            [
-                'key' => __('Expiration'),
-                'path' => 'AuthKey.expiration',
-                'type' => 'expiration'
-            ],
             [
                 'key' => __('User'),
                 'path' => 'User.id',
@@ -52,6 +42,16 @@ echo $this->element(
                 'key' => __('Comment'),
                 'path' => 'AuthKey.comment'
             ],
+            [
+                'key' => __('Created'),
+                'path' => 'AuthKey.created',
+                'type' => 'datetime'
+            ],
+            [
+                'key' => __('Expiration'),
+                'path' => 'AuthKey.expiration',
+                'type' => 'expiration'
+            ],
             [
                 'key' => __('Key usage'),
                 'type' => 'sparkline',

app/View/genericTemplates/delete.ctp

@@ -1,12 +1,15 @@
+<?php
+$title = Inflector::singularize(Inflector::humanize(Inflector::underscore($this->params['controller'])));
+?>
 <div id="genericModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="genericModalLabel" aria-hidden="true">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
             <span aria-hidden="true">&times;</span>
         </button>
-        <h3 id="genericModalLabel"><?= __('Delete %s', Inflector::singularize(Inflector::humanize($this->params['controller']))) ?></h3>
+        <h3 id="genericModalLabel"><?= __('Delete %s', h($title)) ?></h3>
     </div>
     <div class="modal-body modal-body-long">
-        <p><?= __('Are you sure you want to delete %s #%s?', h(Inflector::singularize($this->params['controller'])), h($id)) ?></p>
+        <p><?= __('Are you sure you want to delete %s #%s?', h($title), h($id)) ?></p>
     </div>
     <div class="modal-footer">
         <?= $this->Form->postLink(
@@ -20,7 +23,7 @@
 </div>
 <script type="text/javascript">
     $(document).keydown(function(e) {
-        if(e.which === 13 && e.ctrlKey) {
+        if (e.which === 13 && e.ctrlKey) {
             $('.button-execute').click();
         }
     });