Fixes bug with copy button when in proxy mode

Signed-off-by: Daniel Kastl <[email protected]>
gtt-project · Jun 11, 2024 · ae20bbd · ae20bbd
1 parent 065e254
commit ae20bbd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/app/views/subscription_templates/_list.html.erb b/app/views/subscription_templates/_list.html.erb
@@ -40,8 +40,12 @@
           var detail = event.detail;
           var data = detail[0], status = detail[1], xhr = detail[2];
 
-          // Update the subscription templates list with the response data
-          document.getElementById('subscriptionTemplateList').innerHTML = xhr.responseText;
+          // Check if event.target has the class 'copy-command-link'
+          if (!event.target.classList.contains('copy-command-link')) {
+            // Update the subscription templates list with the response data
+            document.getElementById('subscriptionTemplateList').innerHTML = xhr.responseText;
+          }
+
           showNotification(xhr.getResponseHeader('X-Redmine-Message'));
         });
 

diff --git a/app/views/subscription_templates/copy.js.erb b/app/views/subscription_templates/copy.js.erb
@@ -1,4 +1,7 @@
 // Build the cURL command with line breaks and formatted JSON
+var jsonPayload = JSON.parse('<%= @json_payload.html_safe %>');
+var prettifiedJson = JSON.stringify(jsonPayload, null, 2);
+
 var command = "curl -i -X POST '<%= @broker_url %>' \\\n" +
                 "-H 'Content-Type: application/json' \\\n" +
                 <% if @subscription_template&.fiware_service&.present? %>
@@ -7,7 +10,7 @@ var command = "curl -i -X POST '<%= @broker_url %>' \\\n" +
                 <% if @subscription_template&.fiware_servicepath&.present? %>
                 "-H 'Fiware-ServicePath: <%= @subscription_template.fiware_servicepath %>' \\\n" +
                 <% end %>
-                "--data-binary '" + '<%= @json_payload.html_safe %>' + "'";
+                "--data-binary '" + prettifiedJson + "'";
 
 var authToken = document.getElementById('subscription_auth_token').value;
 if (authToken) {