1.1.5

Author: Kharg

files/client/custom/modules/manual-scheduled-job/src/manual-job-handler.js

@@ -1,39 +1,29 @@
-define('manual-scheduled-job:manual-job-handler', ['action-handler'], function (Dep) {
+define('manual-scheduled-job:manual-job-handler', ['action-handler'], (Dep) => {
 
-  return Dep.extend({
+  return class extends Dep {
 
-    actionRunManually: function () {
+    initManualScheduledJob() {}
+
+    runManually() {
       Espo.Ui.warning('Running...');
-      var data = {
+      const data = {
         id: this.view.model.id,
         name: this.view.model.attributes.name
       };
+    
+      Espo.Ajax.postRequest('ManualScheduledJob/action/RunManually', data)
+        .then(returnData => {
+          const message = this.view.translate('willRunNextRound', 'messages', 'ScheduledJob');
+          Espo.Ui.success(message);
+        })
+        .catch(() => {
+          const message = this.view.translate('cannotRunJob', 'messages', 'ScheduledJob');
+          Espo.Ui.error(message);
+        });
+    }
 
-      Espo.Ajax.postRequest('ManualScheduledJob/action/RunManually', data).then(returnData => {
-        let message = this.view.translate('willRunNextRound', 'messages', 'ScheduledJob');
-        Espo.Ui.success(message);
-      }).fail(() => {
-        let message = this.view.translate('cannotRunJob', 'messages', 'ScheduledJob');
-        Espo.Ui.error(message);
-      });
-    },
-
-    initManualScheduledJob: function () {
-      this.controlButtonVisibility();
-
-      this.view.listenTo(
-        this.view.model,
-        'change:status',
-        this.controlButtonVisibility.bind(this)
-      );
-    },
-
-    controlButtonVisibility: function () {
-      if (this.view.model.get('status') != 'Inactive') {
-        this.view.showHeaderActionItem('RunManually');
-      } else {
-        this.view.hideHeaderActionItem('RunManually');
-      }
-    },
-  });
+      isManualScheduledJobVisible() {
+        return this.view.model.get('status') !== 'Inactive';
+    }
+  }
 });

files/custom/Espo/Modules/ManualScheduledJob/Resources/metadata/clientDefs/ScheduledJob.json

@@ -6,15 +6,14 @@
                {
                    "label": "Run Manually",
                    "name": "RunManually",
-                   "action": "RunManually",
+                   "action": "runManually",
+                   "actionFunction": "runManually",
                    "style": "warning",
                    "iconHtml": "<span class='fas fa-business-time fa-sm'></span>",
-                   "acl": "admin",
+                   "acl": "read",
                    "aclScope": "ScheduledJob",
-                   "data": {
-                       "handler": "manual-scheduled-job:manual-job-handler"
-                   },
-                   "initFunction": "initManualScheduledJob"
+                   "handler": "manual-scheduled-job:manual-job-handler",
+                   "checkVisibilityFunction": "isManualScheduledJobVisible"
                 }
             ]
         }

files/custom/Espo/Modules/ManualScheduledJob/Services/ManualScheduledJob.php

@@ -19,7 +19,7 @@ class ManualScheduledJob extends Record
      */
     public function runJobManually(object $data): bool {
         $nextDate = date('Y-m-d H:i:s');
-        $jobEntity = $this->getEntityManager()->getEntity('Job');
+        $jobEntity = $this->entityManager->getEntity('Job');
 
         $jobEntity->set([
             'name' => $data->name,
@@ -30,7 +30,7 @@ public function runJobManually(object $data): bool {
 
         // Handle potential exceptions when saving the entity
         try {
-            return $this->getEntityManager()->saveEntity($jobEntity)? true : false;
+            return $this->entityManager->saveEntity($jobEntity)? true : false;
         } catch (\Exception $e) {
             // Log the error and re-throw it
             $GLOBALS['log']->error('Error while running ManualScheduledJob: ' . $e->getMessage());

manifest.json

@@ -1,6 +1,6 @@
 {
     "name": "Manual Scheduled Job",
-    "version": "1.1.1",
+    "version": "1.1.5",
     "type": "extension",
     "acceptableVersions": [
         ">=7.0.0"