develop merge commit

COmanage · Aug 15, 2023 · 4750ebc · 4750ebc
2 parents d7ea787 + 1155261
commit 4750ebc
Show file tree

Hide file tree

Showing 21 changed files with 290 additions and 206 deletions.
diff --git a/NOTICE b/NOTICE
@@ -84,10 +84,6 @@ files and utilities for further information:
  MIT License
  https://github.com/KnpLabs/php-github-api
 
- Select 2
- MIT License
- https://select2.org/
-
  Shibboleth Embedded Discovery Service (app/webroot/js/eds)
  Apache 2.0
  https://shibboleth.net/products/embedded-discovery-service.html

diff --git a/app/resources/locales/en_US/operation.po b/app/resources/locales/en_US/operation.po
@@ -42,6 +42,9 @@ msgstr "Are you sure you wish to generate a new API Key?"
 msgid "applySchema"
 msgstr "Apply Database Schema"
 
+msgid "assign"
+msgstr "Assign"
+
 msgid "cancel"
 msgstr "Cancel"
 
@@ -57,6 +60,9 @@ msgstr "Close"
 msgid "confirm"
 msgstr "Confirm"
 
+msgid "confirm.generic"
+msgstr "Are you sure you want to confirm this action?"
+
 msgid "configure.a"
 msgstr "Configure {0}"
 
@@ -99,6 +105,9 @@ msgstr "Go"
 msgid "identifiers.assign"
 msgstr "Assign Identifiers"
 
+msgid "identifiers.assign.confirm"
+msgstr "Are you sure you want to assign identifiers to this record ({0})?"
+
 msgid "last"
 msgstr "Last"
 
@@ -126,6 +135,9 @@ msgstr "Make Primary"
 msgid "provision"
 msgstr "Provision Now"
 
+msgid "provision.confirm"
+msgstr "Are you sure you want to run provisioning?"
+
 msgid "provisioning.status"
 msgstr "Provisioning Status"
 
@@ -135,6 +147,9 @@ msgstr "Add/Restore Default Types"
 msgid "reconcile"
 msgstr "Reconcile"
 
+msgid "reconcile.confirm"
+msgstr "Are you sure you want to reconcile this group ({0})?"
+
 msgid "remove"
 msgstr "Remove"
 

diff --git a/app/templates/Groups/columns.inc b/app/templates/Groups/columns.inc
@@ -64,15 +64,12 @@ $rowActions = [
     'action' => 'index',
     'icon' => 'history'
   ],
-  [
-    'controller' => 'identifiers',
-    'action' => 'index',
-    'icon' => 'label',
-    'if' => 'notAutomatic'
-  ],
   [
     'action' => 'reconcile',
-    'icon' => 'sync'
+    'icon' => 'sync',
+    'confirm' => [
+      'dg_confirm_btn' => __d('operation', 'reconcile')
+    ]
   ]
 ];
 

diff --git a/app/templates/Groups/fields-nav.inc b/app/templates/Groups/fields-nav.inc
@@ -48,6 +48,51 @@ $topLinks = [
       ]
     ],
     'class' => ''
+  ],
+  [
+    'icon' => 'cloud_sync',
+    'order' => 'Default',
+    'label' => __d('operation', 'provisioning.status'),
+    'link' => [
+      'controller' => 'provisioning_targets',
+      'action' => 'status',
+      '?' => [
+        'group_id' => $vv_obj->id
+      ]
+    ],
+    'class' => ''
+  ],
+  [
+    'icon' => 'badge',
+    'order' => 'Default',
+    'label' => __d('operation', 'identifiers.assign'),
+    'link' => [
+      'controller' => 'identifier_assignments',
+      'action' => 'assign',
+      '?' => [
+        'group_id' => $vv_obj->id
+      ]
+    ],
+    'if' => 'notAutomatic',
+    'confirm' => [
+      'dg_body_txt' => __d('operation', 'identifiers.assign.confirm',[$vv_obj->id]),
+      'dg_confirm_btn' => __d('operation', 'assign')
+    ],
+    'class' => ''
+  ],
+  [
+    'icon' => 'sync',
+    'order' => 'Default',
+    'label' => __d('operation', 'reconcile'),
+    'link' => [
+      'action' => 'reconcile',
+      $vv_obj->id
+    ],
+    'confirm' => [
+      'dg_body_txt' => __d('operation', 'reconcile.confirm', [$vv_obj->id]),
+      'dg_confirm_btn' => __d('operation', 'reconcile')
+    ],
+    'class' => ''
   ]
 ];
 

diff --git a/app/templates/IdentifierAssignments/columns.inc b/app/templates/IdentifierAssignments/columns.inc
@@ -57,8 +57,11 @@ $rowActions = [
     'icon'    => 'electrical_services'
   ]
 ];
-
-// TODO: develop $bulkActions. For now, use a placeholder. 
+
+/*
+// When the $bulkActions variable exists in a columns.inc config, the "Bulk edit" switch will appear in the index. 
 $bulkActions = [
+  // TODO: develop bulk actions. For now, use a placeholder.
   'delete' => true
-];
+];
+*/
diff --git a/app/templates/People/fields-nav.inc b/app/templates/People/fields-nav.inc
@@ -80,6 +80,10 @@ $topLinks = [
         'person_id' => $vv_obj->id
       ]
     ],
+    'confirm' => [
+      'dg_body_txt' => __d('operation', 'identifiers.assign.confirm', [$vv_obj->id]),
+      'dg_confirm_btn' => __d('operation', 'assign')
+    ],
     'class' => ''
   ]
 ];

diff --git a/app/templates/ProvisioningTargets/status.php b/app/templates/ProvisioningTargets/status.php
@@ -53,16 +53,10 @@
 
 <!-- Our view is similar to index.php -->
 <div class="table-container">
-  <?php
-    $indexTableClasses = 'index-table list-mode';
-    if (!empty($rowActions)) {
-      $indexTableClasses .= ' with-actions';
-    }
-  ?>
-  <table id="<?= 'provisioningstatus-table'; ?>" class="<?= $indexTableClasses; ?>">
+  <table id="provisioningstatus-table" class="index-table list-mode with-actions">
     <thead>
       <tr>
-        <th class="actions"></th>
+        <td class="actions"></td>
         <th><?= __d('controller', 'ProvisioningTargets', [1]); ?></th>
         <th><?= __d('field', 'status'); ?></th>
         <th><?= __d('field', 'comment'); ?></th>
@@ -74,34 +68,49 @@
     </tbody>
       <?php foreach($vv_provisioning_statuses as $p): ?>
       <tr>
-        <td>
-<!-- JIRA to merge this with menuActions, also to throw up "Are you sure?" -->
-          <a class="field-actions-menu" href="<?= 
-            $this->Url->build([
-              'controller' => $vv_primary_link_model,
-              'action' => 'provision',
-              $vv_primary_link_obj->id,
-              '?' => [
-                'provisioning_target_id' => $p['target']->id
+        <td class="actions">
+          <div class="field-actions">
+<!-- CFM-305 -- JIRA to throw up "Are you sure?" - also to simplify all the below -->
+          <?php
+            // Build the row actions
+            $action_args = array();
+            $action_args['vv_attr_id'] =  $p['target']->id;
+            $action_args['vv_actions'] = [
+              [
+                'order' => $this->Menu->getMenuOrder('Default'),
+                'icon' => 'start',
+                'url' => [
+                  'controller' => $vv_primary_link_model,
+                  'action' => 'provision',
+                  $vv_primary_link_obj->id,
+                  '?' => [
+                    'provisioning_target_id' => $p['target']->id
+                  ]
+                ],
+                'label' => __d('operation', 'provision'),
+                'confirm' => [
+                  'dg_body_txt' => __d('operation', 'provision.confirm'),
+                  'dg_confirm_btn' => __d('operation', 'provision')
+                ]
+              ],
+              [
+                'order' => $this->Menu->getMenuOrder('Default'),
+                'icon' => 'history',
+                'url' => [
+                  'controller' => 'provisioning_history_records',
+                  'action' => 'index',
+                  '?' => [
+                    'provisioning_target_id' => $p['target']->id,
+                    StringUtilities::entityToForeignKey($vv_primary_link_obj) => $vv_primary_link_obj->id
+                  ]
+                ],
+                'label' => __d('controller', 'ProvisioningHistoryRecords', [99])
               ]
-            ]);
-          ?>">
-            <em class="material-icons">start</em>
-          <?= __d('operation', 'provision'); ?>
-          </a>
-          <a class="field-actions-menu" href="<?= 
-            $this->Url->build([
-              'controller' => 'provisioning_history_records',
-              'action' => 'index',
-              '?' => [
-                'provisioning_target_id' => $p['target']->id,
-                StringUtilities::entityToForeignKey($vv_primary_link_obj) => $vv_primary_link_obj->id
-              ]
-            ]);
-          ?>">
-            <em class="material-icons">history</em>
-          <?= __d('controller', 'ProvisioningHistoryRecords', [99]); ?>
-          </a>
+            ];
+
+            print $this->element('menuAction', $action_args);
+          ?>
+          </div>
         </td>
         <td><?= $p['target']->description; ?></td>
         <td><?= __d('enumeration', 'ProvisioningStatusEnum.'.$p['status']); ?></td>

diff --git a/app/templates/Standard/add-edit-view.php b/app/templates/Standard/add-edit-view.php
@@ -125,32 +125,29 @@
         $action_args['vv_actions'][] = [
           'order' => $this->Menu->getMenuOrder($t['order']),
           'icon' => $this->Menu->getMenuIcon($t['icon']),
-          'url' => $this->Url->build($t['link']),
+          'url' => $t['link'],
           'label' => $t['label'],
+          'class' => !empty($t['class']) ? $t['class'] : '',
+          'confirm' => !empty($t['confirm']) ? $t['confirm'] : []
         ];
       }
     }
 
     // Delete
     if($vv_action != 'add' && !empty($vv_obj->id) && $vv_permissions['delete']) {
-      $actionPostBtnArray = ['action' => 'delete', $vv_obj->id];
-      $actionUrl = $this->Url->build(['action' => 'delete', $vv_obj->id]);
-      $action_args['vv_actions'][] = array(
+      $action_args['vv_actions'][] = [
         'order' => $this->Menu->getMenuOrder('Delete'),
         'icon' =>  $this->Menu->getMenuIcon('Delete'),
-        'url' => 'javascript:void(0);',
+        'url' => ['action' => 'delete', $vv_obj->id],
         'label' => __d('operation', 'delete'),
-        'class' => 'deletebutton nospin',
-        'onclick' => array(
-          'dg_bd_txt' => __d('operation', 'delete.confirm', [$vv_obj->id]),
-          'dg_post_btn_array' => $actionPostBtnArray,
-          'dg_url' => $actionUrl,
-          'dg_conf_btn' => __d('operation', 'remove'),
-          'dg_cancel_btn' => __d('operation', 'cancel'),
+        'class' => 'deletebutton',
+        'confirm' => [
+          'method' => 'post',
           'dg_title' => __d('operation', 'remove'),
-          'dg_bd_txt_repl_str' => ''
-        )
-      );
+          'dg_body_txt' => __d('operation', 'delete.confirm', [$vv_obj->id]),
+          'dg_confirm_btn' => __d('operation', 'remove')
+        ]
+      ];
     }
 
     if(!empty($action_args['vv_actions'])) {