Afform - Use apiBatch for process action

Before: Processing form submissions glitchy in the UI After: Uses standard batch runner
civicrm · Jan 28, 2025 · 4c05e0e · 4c05e0e
1 parent bec03a7
commit 4c05e0e
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 84 deletions.
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
@@ -687,9 +687,24 @@ function afform_shortcode_content($content, $atts, $args, $context) {
  */
 function afform_civicrm_searchKitTasks(array &$tasks, bool $checkPermissions, ?int $userID) {
   $tasks['AfformSubmission']['process'] = [
-    'module' => 'afSearchTasks',
     'title' => E::ts('Process Submissions'),
     'icon' => 'fa-check-square-o',
-    'uiDialog' => ['templateUrl' => '~/afSearchTasks/afformSubmissionProcessTask.html'],
+    'apiBatch' => [
+      'action' => 'get',
+      'params' => [
+        'select' => ['id', 'afform_name'],
+        'where' => [['status_id:name', '=', 'Pending']],
+        'chain' => [
+          ['Afform', 'process', ['submissionId' => '$id', 'name' => '$afform_name']],
+        ],
+      ],
+      'conditions' => [
+        ['check user permission', '=', ['administer afform']],
+      ],
+      'confirmMsg' => E::ts('Confirm processing %1 %2.'),
+      'runMsg' => E::ts('Processing %1 %2...'),
+      'successMsg' => E::ts('Successfully processed %1 %2.'),
+      'errorMsg' => E::ts('An error occurred while attempting to process %1 %2.'),
+    ],
   ];
 }
diff --git a/ext/afform/core/ang/afSearchTasks.ang.php b/ext/afform/core/ang/afSearchTasks.ang.php
diff --git a/ext/afform/core/ang/afSearchTasks.module.js b/ext/afform/core/ang/afSearchTasks.module.js
diff --git a/ext/afform/core/ang/afSearchTasks/afformSubmissionProcessTask.ctrl..js b/ext/afform/core/ang/afSearchTasks/afformSubmissionProcessTask.ctrl..js
diff --git a/ext/afform/core/ang/afSearchTasks/afformSubmissionProcessTask.html b/ext/afform/core/ang/afSearchTasks/afformSubmissionProcessTask.html
diff --git a/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php b/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
@@ -705,7 +705,7 @@ private function checkLinkAccess(array $link, array $data): bool {
     if (empty($link['path']) && empty($link['task'])) {
       return FALSE;
     }
-    if (!empty($link['entity']) && !empty($link['action']) && !in_array($link['action'], ['view', 'preview'], TRUE) && $this->getCheckPermissions()) {
+    if (!empty($link['entity']) && !empty($link['action']) && !in_array($link['action'], ['view', 'preview', 'get'], TRUE) && $this->getCheckPermissions()) {
       $actionName = $this->getPermittedLinkAction($link['entity'], $link['action']);
       if (!$actionName) {
         return FALSE;