Merge pull request #959 from flippercloud/clicky-fixy

Fixes confirmation trigger for disable

Author: jnunemaker

examples/ui/basic.ru

@@ -25,6 +25,7 @@ Flipper::UI.configure do |config|
   config.feature_removal_enabled = true
   config.cloud_recommendation = true
   config.confirm_fully_enable = false
+  config.confirm_disable = false
   config.read_only = false
   # config.show_feature_description_in_list = true
   config.descriptions_source = lambda do |_keys|

lib/flipper/ui/public/js/application.js

@@ -12,8 +12,8 @@ document.addEventListener("DOMContentLoaded", function () {
 
   document.querySelectorAll("*[data-confirmation-text]").forEach(function (element) {
     element.addEventListener("click", function (e) {
-      var expected = e.target.getAttribute("data-confirmation-text");
-      var actual = prompt(e.target.getAttribute("data-confirmation-prompt"));
+      var expected = element.getAttribute("data-confirmation-text");
+      var actual = prompt(element.getAttribute("data-confirmation-prompt"));
 
       if (expected !== actual) {
         e.preventDefault();

lib/flipper/ui/views/feature.erb

@@ -255,14 +255,13 @@
             <div class="row">
               <% unless @feature.boolean_value %>
                 <div class="col d-grid">
-                  <button type="submit" name="action" value="Enable" class="btn btn-outline-success">
-                    <span class="d-block" data-bs-toggle="tooltip"
-                      <% if Flipper::UI.configuration.confirm_fully_enable %>
-                        data-confirmation-prompt="Are you sure you want to fully enable this feature for everyone? Please enter the name of the feature to confirm it: <%= feature_name %>"
-                        data-confirmation-text="<%= feature_name %>"
-                      <% end %>
-                        title="Enable for everyone"
-                      >
+                  <button type="submit" name="action" value="Enable" class="btn btn-outline-success"
+                    <% if Flipper::UI.configuration.confirm_fully_enable %>
+                      data-confirmation-prompt="Are you sure you want to fully enable this feature for everyone? Please enter the name of the feature to confirm it: <%= feature_name %>"
+                      data-confirmation-text="<%= feature_name %>"
+                    <% end %>
+                  >
+                    <span class="d-block" data-bs-toggle="tooltip" title="Enable for everyone">
                       Fully Enable
                     </span>
                   </button>
@@ -271,14 +270,13 @@
 
               <% unless @feature.off? %>
                 <div class="col d-grid">
-                  <button type="submit" name="action" value="Disable" class="btn btn-outline-danger">
-                    <span class="d-block" data-bs-toggle="tooltip"
-                      <% if Flipper::UI.configuration.confirm_disable %>
-                        data-confirmation-prompt="Are you sure you want to disable this feature for everyone? Please enter the name of the feature to confirm it: <%= feature_name %>"
-                        data-confirmation-text="<%= feature_name %>"
-                      <% end %>
-                        title="Disable for everyone by clearing all percentages, groups and actors."
-                      >
+                  <button type="submit" name="action" value="Disable" class="btn btn-outline-danger"
+                    <% if Flipper::UI.configuration.confirm_disable %>
+                      data-confirmation-prompt="Are you sure you want to disable this feature for everyone? Please enter the name of the feature to confirm it: <%= feature_name %>"
+                      data-confirmation-text="<%= feature_name %>"
+                    <% end %>
+                  >
+                    <span class="d-block" data-bs-toggle="tooltip" title="Disable for everyone by clearing all percentages, groups and actors.">
                       Disable
                     </span>
                   </button>