Merge pull request #684 from favicode/fix/real-time-logging-v2

Real-Time Log streaming fix #682

Author: vvuksan

Controller/Adminhtml/FastlyCdn/Logging/CreateEndpoint.php

@@ -29,12 +29,11 @@
 use Magento\Framework\Controller\Result\JsonFactory;
 
 /**
- * Class CreateEndpoint
- * @package Fastly\Cdn\Controller\Adminhtml\FastlyCdn\Logging
+ * Class CreateEndpoint for Logging
  */
 class CreateEndpoint extends Action
 {
-    const ADMIN_RESOURCE = 'Magento_Config::config';
+    public const ADMIN_RESOURCE = 'Magento_Config::config';
 
     /**
      * @var Http
@@ -113,6 +112,11 @@ public function execute()
                 $this->getRequest()->getParam('condition_priority')
             );
 
+            $selectedConditions = $this->getRequest()->getParam('conditions', '');
+            if (!$condition) {
+                $condition = $selectedConditions;
+            }
+
             $params = array_merge(
                 $this->getRequest()->getParam('log_endpoint'),
                 ['response_condition' => $condition]
@@ -152,17 +156,18 @@ public function execute()
     }
 
     /**
+     *
      * @param $clone
      * @param $conditionName
      * @param $applyIf
      * @param $conditionPriority
-     * @return string|null
+     * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function createCondition($clone, $conditionName, $applyIf, $conditionPriority)
     {
         if (!$conditionName || !$applyIf || !$conditionPriority) {
-            return null;
+            return '';
         }
         $condition = [
             'name'      => $conditionName,

Controller/Adminhtml/FastlyCdn/Logging/UpdateEndpoint.php

@@ -29,12 +29,11 @@
 use Magento\Framework\Controller\Result\JsonFactory;
 
 /**
- * Class UpdateEndpoint
- * @package Fastly\Cdn\Controller\Adminhtml\FastlyCdn\Logging
+ * Class UpdateEndpoint for Logging
  */
 class UpdateEndpoint extends Action
 {
-    const ADMIN_RESOURCE = 'Magento_Config::config';
+    public const ADMIN_RESOURCE = 'Magento_Config::config';
 
     /**
      * @var Http
@@ -84,6 +83,7 @@ public function __construct(
     }
 
     /**
+     *
      * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\Result\Json|\Magento\Framework\Controller\ResultInterface
      */
     public function execute()
@@ -114,14 +114,15 @@ public function execute()
                 $this->getRequest()->getParam('condition_priority')
             );
 
-            $params = array_merge(
-                $this->getRequest()->getParam('log_endpoint'),
-                ['response_condition' => $condition]
-            );
-
+            $selectedConditions = $this->getRequest()->getParam('conditions', '');
+            if (!$condition) {
+                $condition = $selectedConditions;
+            }
+            $params = $this->getRequest()->getParam('log_endpoint');
             $params = array_filter($params);
-            //Array filter removes empty strings, but empty compression_codec param turns off compression formats
-            if (!isset($params['compression_codec'])){
+            $params['response_condition'] = $condition;
+
+            if (!isset($params['compression_codec'])) {
                 $params['compression_codec'] = "";
             }
             $endpoint = $this->api->updateLogEndpoint($clone->number, $endpointType, $params, $oldName);
@@ -157,17 +158,18 @@ public function execute()
     }
 
     /**
+     *
      * @param $clone
      * @param $conditionName
      * @param $applyIf
      * @param $conditionPriority
-     * @return string|null
+     * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function createCondition($clone, $conditionName, $applyIf, $conditionPriority)
     {
         if (!$conditionName || !$applyIf || !$conditionPriority) {
-            return null;
+            return '';
         }
         $condition = [
             'name'      => $conditionName,

view/adminhtml/web/js/log-endpoints.js

@@ -96,14 +96,20 @@ define([
             $('#condition_priority').val('');
             return getResponseConditions(active_version, loaderVisibility)
                 .done(function (response) {
-                    let html = '';
                     $('#attach_span').hide();
                     if (response !== false) {
+                        let conditionElement = document.getElementById('conditions');
                         conditions = response.conditions;
-                        html += '<option value="">no condition</option>';
+                        let option = document.createElement("option");
+                        option.text = 'no condition';
+                        option.value = '';
+                        conditionElement.add(option);
                         $.each(conditions, function (index, condition) {
-                            if (condition.type === "REQUEST") {
-                                html += '<option value="'+_.escape(condition.name)+'">'+_.escape(condition.name)+' ('+condition.type+') '+_.escape(condition.statement)+'</option>';
+                            if (condition.type === "RESPONSE") {
+                                let option = document.createElement("option");
+                                option.text = _.escape(condition.name) +' ('+condition.type+') ' + _.escape(condition.statement);
+                                option.value = _.escape(condition.name);
+                                conditionElement.add(option);
                             }
                         });
                     }
@@ -112,7 +118,6 @@ define([
                     $('#detach').show();
                     $('#create-response-condition').show();
                     $('#sep').show();
-                    $('#conditions').html(html);
                 })
         }