Bugfix CSP Headers

elements-at · Feb 23, 2024 · ea8c57c · ea8c57c
1 parent a6db467
commit ea8c57c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/Controller/MonitoringItemController.php b/src/Controller/MonitoringItemController.php
@@ -524,7 +524,6 @@ public function getByIdAction(Request $request): JsonResponse
 
         $item = MonitoringItem::getById($request->get('id'));
         $data = $item->getObjectVars();
-        $data['callbackSettings'] = json_decode((string)$data['callbackSettings'], null, 512, JSON_THROW_ON_ERROR);
         $data['executorSettings']['values'] = [];
 
         return $this->jsonResponse($data);

diff --git a/src/Resources/public/js/panel/monitoringItem.js b/src/Resources/public/js/panel/monitoringItem.js
@@ -332,11 +332,11 @@ pimcore.plugin.processmanager.panel.monitoringItem = Class.create({
                     if (record.get('retry')) {
                         let data =  '<a href="#" data-process-manager-trigger="monitoringItemRestart" data-process-manager-id="' + record.get('id') + '"><img src="/bundles/pimcoreadmin/img/flat-color-icons/refresh.svg" height="18" title="Restart" /></a>';
                         if(record.get('callbackSettingsString') != '[]'){
-                            data +=  '<a href="#" onClick="processmanagerPlugin.monitoringReopenCallback(\'' + record.get('configurationId') +'\',' + record.get('id')+ ')"><img src="/bundles/pimcoreadmin/img/flat-color-icons/go.svg" height="18" title="Reopen" /></a>';
+                            data +=  '<a href="#" data-process-manager-trigger="monitoringReopenCallback" data-process-manager-id="' + record.get('id') + '"><img src="/bundles/pimcoreadmin/img/flat-color-icons/go.svg" height="18" title="Reopen" /></a>';
                         }
                         return data;
                     } else {
-                        return '<a href="#" onClick="processmanagerPlugin.monitoringItemCancel(\'' + record.get('id') + '\')"><img src="/bundles/pimcoreadmin/img/flat-color-icons/cancel.svg" height="18" title="Stop"/></a>';
+                        return '<a href="#" data-process-manager-trigger="monitoringItemCancel" data-process-manager-id="' + record.get('id') + '"><img src="/bundles/pimcoreadmin/img/flat-color-icons/cancel.svg" height="18" title="Stop"/></a>';
                     }
                     return '';
                 }

diff --git a/src/Resources/public/js/startup.js b/src/Resources/public/js/startup.js
@@ -246,8 +246,12 @@ document.addEventListener('processManager.monitoringItemGrid', (e) => {
     let currentTarget = e.detail.sourceEvent.currentTarget;
 
     //print out the parameters of the event
-    if(e.detail.trigger === 'monitoringItemRestart'){
-        processmanagerPlugin.monitoringItemRestart(e.detail.monitoringId);
+    let trigger = e.detail.trigger;
+
+    if(e.detail.trigger === 'monitoringReopenCallback'){
+        processmanagerPlugin.monitoringReopenCallback(e.detail.monitoringItemData.configurationId,e.detail.monitoringId);
+    }else if(typeof processmanagerPlugin[trigger] == 'function'){
+        processmanagerPlugin[trigger](e.detail.monitoringId);
     }else if(e.detail.trigger === 'showLogs'){
         let tmpObject = new pimcore.plugin.processmanager.executor.logger.file();
         let actionIndex = e.detail.sourceEvent.currentTarget.getAttribute('data-process-manager-action-index');