flipper-ui 0.22.1 → 0.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a619370e297b8fc379c57c8394cdfc798120ebfd9d4d091bc1902f3d9a2183be
-  data.tar.gz: a36c5d0a79836aec62188c04f5954a506d737e110a135028b3fc7d9d889a2579
+  metadata.gz: b17af1c2cd05d9026a457941c46e7c497460e4289bd8446b90d2f0342e53f34c
+  data.tar.gz: 4adae31beca41aebaae69c9c3a0efe51bb024d0acc54eadf3982ddfff4a16748
 SHA512:
-  metadata.gz: b02d0683b248297b59e6013f816a6f09bbde28889e38201e0f41c89d29118f06f16061749d55041a786daf81d2d67da8e88885033c4819233794dbd55df3ea8d
-  data.tar.gz: 425e485bc419c1ae45554298df69a2d6cfdb4d2169fa2b0dc1b3e5e32009e5bafd27372796ab8a1bf3ac68dbc2d1be6a2474cbd7855b1d245fd61c8940e1cb81
+  metadata.gz: a8e0d113cb89d77c9e8cd0ec83d8deb7a26f3f6e00452aa81ab6a308843dfe45e069b0e1303374ece24e4a5bd79718958e160249db9195ea22249bab2df66a5d
+  data.tar.gz: cc5f6567f690c2bd48b762083046b19e868f4885384885667f20d808cd09f0533df5d3df5239e4a21cc649babbe231e494af984b5c1261b4ef9358b68581784a

data/lib/flipper/ui/actions/actors_gate.rb

@@ -25,19 +25,22 @@ module Flipper
         def post
           feature = flipper[feature_name]
           value = params['value'].to_s.strip
+          values = value.split(UI.configuration.actors_separator).map(&:strip).uniq
 
-          if Util.blank?(value)
+          if values.empty?
             error = "#{value.inspect} is not a valid actor value."
             redirect_to("/features/#{feature.key}/actors?error=#{error}")
           end
 
-          actor = Flipper::Actor.new(value)
+          values.each do |value|
+            actor = Flipper::Actor.new(value)
 
-          case params['operation']
-          when 'enable'
-            feature.enable_actor actor
-          when 'disable'
-            feature.disable_actor actor
+            case params['operation']
+            when 'enable'
+              feature.enable_actor actor
+            when 'disable'
+              feature.disable_actor actor
+            end
           end
 
           redirect_to("/features/#{feature.key}")

data/lib/flipper/ui/configuration.rb

@@ -44,6 +44,11 @@ module Flipper
       # Default false. Only works when using descriptions.
       attr_accessor :show_feature_description_in_list
 
+      # Public: What should be used to denote you are trying to add multiple
+      # actors at once (instead of just a single actor).
+      # Default is comma ",".
+      attr_accessor :actors_separator
+
       VALID_BANNER_CLASS_VALUES = %w(
         danger
         dark
@@ -68,6 +73,7 @@ module Flipper
         @add_actor_placeholder = "a flipper id"
         @descriptions_source = DEFAULT_DESCRIPTIONS_SOURCE
         @show_feature_description_in_list = false
+        @actors_separator = ','
       end
 
       def using_descriptions?

data/lib/flipper/ui/views/add_actor.erb

@@ -8,7 +8,7 @@
   <h4 class="card-header">Enable Actor for <%= @feature.key %></h4>
   <div class="card-body">
     <p>
-      Turn on this feature for an individual actor.
+      Turn on this feature for actors.
     </p>
     <form action="<%= script_name %>/features/<%= @feature.key %>/actors" method="post" class="form-inline">
       <%== csrf_input_tag %>

data/lib/flipper/ui/views/feature.erb

@@ -130,8 +130,8 @@
                   <%== csrf_input_tag %>
                   <input type="hidden" name="operation" value="disable">
                   <input type="hidden" name="value" value="<%= item %>">
-                  <button type="submit" value="Disable" class="btn btn-link btn-sm text-danger" data-toggle="tooltip" title="Disable <%= item %>" data-placement="left">
-                    <span class="octicon octicon-trashcan"></span>
+                  <button type="submit" value="Disable" class="btn btn-outline-danger" data-toggle="tooltip" title="Disable <%= item %>" data-placement="left">
+                    Remove
                   </button>
                 </form>
               </div>

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = '0.22.1'.freeze
+  VERSION = '0.22.2'.freeze
 end

data/spec/flipper/ui/actions/actors_gate_spec.rb

@@ -45,6 +45,7 @@ RSpec.describe Flipper::UI::Actions::ActorsGate do
   describe 'POST /features/:feature/actors' do
     context 'enabling an actor' do
       let(:value) { 'User;6' }
+      let(:multi_value) { 'User;5, User;7, User;9, User;12' }
 
       before do
         post 'features/search/actors',
@@ -53,7 +54,18 @@ RSpec.describe Flipper::UI::Actions::ActorsGate do
       end
 
       it 'adds item to members' do
-        expect(flipper[:search].actors_value).to include('User;6')
+        expect(flipper[:search].actors_value).to include(value)
+      end
+
+      it 'adds item to multiple members' do
+        post 'features/search/actors',
+             { 'value' => multi_value, 'operation' => 'enable', 'authenticity_token' => token },
+             'rack.session' => session
+
+        expect(flipper[:search].actors_value).to include('User;5')
+        expect(flipper[:search].actors_value).to include('User;7')
+        expect(flipper[:search].actors_value).to include('User;9')
+        expect(flipper[:search].actors_value).to include('User;12')
       end
 
       it 'redirects back to feature' do
@@ -80,10 +92,22 @@ RSpec.describe Flipper::UI::Actions::ActorsGate do
 
       context 'value contains whitespace' do
         let(:value) { '  User;6  ' }
+        let(:multi_value) { '  User;5  ,  User;7   ,  User;9 ,  User;12 ' }
 
         it 'adds item without whitespace' do
           expect(flipper[:search].actors_value).to include('User;6')
         end
+
+        it 'adds item to multi members without whitespace' do
+          post 'features/search/actors',
+             { 'value' => multi_value, 'operation' => 'enable', 'authenticity_token' => token },
+             'rack.session' => session
+
+          expect(flipper[:search].actors_value).to include('User;5')
+          expect(flipper[:search].actors_value).to include('User;7')
+          expect(flipper[:search].actors_value).to include('User;9')
+          expect(flipper[:search].actors_value).to include('User;12')
+        end
       end
 
       context 'for an invalid actor value' do
@@ -109,16 +133,29 @@ RSpec.describe Flipper::UI::Actions::ActorsGate do
 
     context 'disabling an actor' do
       let(:value) { 'User;6' }
+      let(:multi_value) { 'User;5, User;7, User;9, User;12' }
 
       before do
-        flipper[:search].enable_actor Flipper::Actor.new('User;6')
+        flipper[:search].enable_actor Flipper::Actor.new(value)
         post 'features/search/actors',
              { 'value' => value, 'operation' => 'disable', 'authenticity_token' => token },
              'rack.session' => session
       end
 
       it 'removes item from members' do
-        expect(flipper[:search].actors_value).not_to include('User;6')
+        expect(flipper[:search].actors_value).not_to include(value)
+      end
+
+      it 'removes item from multi members' do
+        multi_value.split(',').map(&:strip).each do |value|
+          flipper[:search].enable_actor Flipper::Actor.new(value)
+        end
+
+        post 'features/search/actors',
+             { 'value' => multi_value, 'operation' => 'disable', 'authenticity_token' => token },
+             'rack.session' => session
+
+        expect(flipper[:search].actors_value).not_to eq(Set.new(multi_value.split(',').map(&:strip)))
       end
 
       it 'redirects back to feature' do
@@ -128,10 +165,21 @@ RSpec.describe Flipper::UI::Actions::ActorsGate do
 
       context 'value contains whitespace' do
         let(:value) { '  User;6  ' }
+        let(:multi_value) { '  User;5  ,  User;7   ,  User;9 ,  User;12 ' }
 
         it 'removes item without whitespace' do
           expect(flipper[:search].actors_value).not_to include('User;6')
         end
+
+        it 'removes item without whitespace' do
+          multi_value.split(',').map(&:strip).each do |value|
+            flipper[:search].enable_actor Flipper::Actor.new(value)
+          end
+          post 'features/search/actors',
+              { 'value' => multi_value, 'operation' => 'disable', 'authenticity_token' => token },
+              'rack.session' => session
+          expect(flipper[:search].actors_value).not_to eq(Set.new(multi_value.split(',').map(&:strip)))
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-ui
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.22.2
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-23 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -56,14 +56,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.1
+        version: 0.22.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.1
+        version: 0.22.2
 - !ruby/object:Gem::Dependency
   name: erubi
   requirement: !ruby/object:Gem::Requirement