flipper-ui 0.18.0 → 0.20.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c1e364e1af2059e2eeb915be4ccacbc2a441429789bdd6a3241de011c5df2c5
-  data.tar.gz: 21fbdf1b0e4276203ed05e63b938db518f5e04f925940ae9188ffa24986a4f40
+  metadata.gz: 645df1fe39894233c06b885bc09187b0e373fffca9ad334189a6999ed2e67584
+  data.tar.gz: 38055ad94d2c83d6ea76ef53ea0fca079c3fd546aa91d3b6930d2b77bf3cdfb7
 SHA512:
-  metadata.gz: d958959d8acb5dd90bd73df0338676c89fa403fdbc71402307c91fdb3d33396bbbc3db158fb6cf0bdb6ed7054410f0f364e9df8a76720acd18092f7fe88c94ef
-  data.tar.gz: 1401fabdbf9c9e4a1c5f1600955d55ae3bc7cecfdfbc95ed901b1d137b1715b12d43830d40f3ef3350a9066f2755454cfa71f9be9260c536518f49a1ed67d626
+  metadata.gz: 0763ae8da582b62fb6eab3b1aa2f5a4cf555961b6c2d3a89a4c61b0bb5e5d1a5a3a22973e759e9d4ed3bbaead96f3eeb74ab85692ff3268c6df4426577cafb0f
+  data.tar.gz: 45a41c6acae29ede69bd540e6f298ae066903261cbb900da2067d313ff66dc55301d7b166b4223043c3976ef7d9992c73b76760d6cc6f433da45462f5b1d78c8

data/docs/ui/README.md

@@ -5,9 +5,11 @@ UI for the [Flipper](https://github.com/jnunemaker/flipper) gem.
 ## Screenshots
 
 Viewing list of features:
+
 ![features](images/features.png)
 
 Viewing an individual feature:
+
 ![feature](images/feature.png)
 
 ## Installation
@@ -127,28 +129,11 @@ See [examples/ui/basic.ru](https://github.com/jnunemaker/flipper/blob/master/exa
 
 ### Configuration
 
-Flipper UI can be customized via `configure`, which yields a configuration instance for setting the text on the five main sections of the UI feature view.
-
-* `config.actors`
-* `config.groups`
-* `config.percentage_of_actors`
-* `config.percentage_of_time`
-* `config.delete`
-
-Each of these methods returns a [Flipper::UI::Option](https://github.com/jnunemaker/flipper/blob/master/lib/flipper/ui/configuration/option.rb) that responds to `title=`, `description=` as seen below.
-
-*e.g. customzing the percentage_of_actors and delete sections' titles and descriptions*
-```ruby
-Flipper::UI.configure do |config|
-  config.percentage_of_actors.title = "My Custom Title"
-  config.percentage_of_actors.description = "My custom description"
+Flipper UI can be customized via `configure`, which yields a configuration instance.
 
-  config.delete.title = "BE VERY CAREFUL!"
-  config.delete.description = "YOU'VE BEEN WARNED!"
-end
-```
+#### Description
 
-We can also associate a `description` for each `feature` by providing a descriptions source:
+We can associate a `description` for each `feature` by providing a descriptions source:
 
 ```ruby
 Flipper::UI.configure do |config|
@@ -156,14 +141,18 @@ Flipper::UI.configure do |config|
     # descriptions loaded from YAML file or database (postgres, mysql, etc)
     # return has to be hash of {String key => String description}
   end
+
+  # Defaults to false. Set to true to show feature descriptions on the list
+  # page as well as the view page.
+  # config.show_feature_description_in_list = true
 end
 ```
 
-results in:
+Descriptions show up in the UI like so:
 
-![configure](images/configured-ui.png)
+![description](images/description.png)
 
-### Banner
+#### Banner
 
 Flipper UI can display a banner across the top of the page. The `banner_text` and `banner_class` can be configured by using the `Flipper::UI.configure` block as seen below.
 
@@ -178,9 +167,9 @@ By default the `environment` is set to an empty string so no banner will show. I
 
 The above configuration results in:
 
-![configure](images/environment-banner.png)
+![banner](images/banner.png)
 
-### Fun mode
+#### Fun mode
 
 By default, Flipper UI displays a videoclip when there are no flags. The `fun` mode can be configured by using the `Flipper::UI.configure` block as seen below.
 

data/examples/ui/basic.ru

@@ -39,6 +39,7 @@ Flipper::UI.configure do |config|
   # config.banner_class = 'danger'
   config.feature_creation_enabled = true
   config.feature_removal_enabled = true
+  # config.show_feature_description_in_list = true
   config.descriptions_source = lambda do |_keys|
     {
       "search_performance_another_long_thing" => "Just to test feature name length.",

data/flipper-ui.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.metadata      = Flipper::METADATA
 
   gem.add_dependency 'rack', '>= 1.4', '< 3'
-  gem.add_dependency 'rack-protection', '>= 1.5.3', '< 2.1.0'
+  gem.add_dependency 'rack-protection', '>= 1.5.3', '< 2.2.0'
   gem.add_dependency 'flipper', "~> #{Flipper::VERSION}"
   gem.add_dependency 'erubi', '>= 1.0.0', '< 2.0.0'
 end

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

@@ -11,8 +11,20 @@ module Flipper
         def get
           @page_title = 'Features'
           keys = flipper.features.map(&:key)
+          descriptions = if Flipper::UI.configuration.show_feature_description_in_list?
+            Flipper::UI.configuration.descriptions_source.call(keys)
+          else
+            {}
+          end
+
           @features = flipper.features.map do |feature|
-            Decorators::Feature.new(feature)
+            decorated_feature = Decorators::Feature.new(feature)
+
+            if Flipper::UI.configuration.show_feature_description_in_list?
+              decorated_feature.description = descriptions[feature.key]
+            end
+
+            decorated_feature
           end.sort
 
           @show_blank_slate = @features.empty?

data/lib/flipper/ui/configuration.rb

@@ -33,9 +33,13 @@ module Flipper
 
       # Public: If you set this, Flipper::UI will fetch descriptions
       # from your external source. Descriptions for `features` will be shown on `feature`
-      # and `features` pages. Defaults to empty block.
+      # page, and optionally the `features` pages. Defaults to empty block.
       attr_accessor :descriptions_source
 
+      # Public: Should feature descriptions be show on the `features` list page.
+      # Default false. Only works when using descriptions.
+      attr_accessor :show_feature_description_in_list
+
       VALID_BANNER_CLASS_VALUES = %w(
         danger
         dark
@@ -58,12 +62,17 @@ module Flipper
         @fun = true
         @add_actor_placeholder = "a flipper id"
         @descriptions_source = DEFAULT_DESCRIPTIONS_SOURCE
+        @show_feature_description_in_list = false
       end
 
       def using_descriptions?
         @descriptions_source != DEFAULT_DESCRIPTIONS_SOURCE
       end
 
+      def show_feature_description_in_list?
+        using_descriptions? && @show_feature_description_in_list
+      end
+
       def banner_class=(value)
         unless VALID_BANNER_CLASS_VALUES.include?(value)
           raise InvalidConfigurationValue, "The banner_class provided '#{value}' is " \

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

@@ -44,7 +44,12 @@
           </div>
           <div class="col-10">
             <a href="<%= "#{script_name}/features/#{feature.key}" %>" class="d-block px-0 py-3 btn text-left text-dark">
-              <div class="text-truncate"><%= feature.key %></div>
+              <div class="text-truncate" style="font-weight: 500"><%= feature.key %></div>
+              <% if Flipper::UI.configuration.show_feature_description_in_list? && Flipper::UI::Util.present?(feature.description) %>
+                <div class="text-muted font-weight-light" style="line-height: 1.4; white-space: initial; padding: 8px 0">
+                  <%= feature.description %>
+                </div>
+              <% end %>
               <div class="text-muted text-truncate">
                 <%== feature.gates_in_words %>
               </div>

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = '0.18.0'.freeze
+  VERSION = '0.20.0.beta3'.freeze
 end

data/spec/flipper/ui/configuration_spec.rb

@@ -100,4 +100,41 @@ RSpec.describe Flipper::UI::Configuration do
       end
     end
   end
+
+  describe "#show_feature_description_in_list" do
+    it "has default value" do
+      expect(configuration.show_feature_description_in_list).to eq(false)
+    end
+
+    it "can be updated" do
+      configuration.show_feature_description_in_list = true
+      expect(configuration.show_feature_description_in_list).to eq(true)
+    end
+  end
+
+  describe "#show_feature_description_in_list?" do
+    subject { configuration.show_feature_description_in_list? }
+
+    context 'when using_descriptions? is false and show_feature_description_in_list is false' do
+      it { is_expected.to eq(false) }
+    end
+
+    context 'when using_descriptions? is false and show_feature_description_in_list is true' do
+      before { configuration.show_feature_description_in_list = true }
+      it { is_expected.to eq(false) }
+    end
+
+    context 'when using_descriptions? is true and show_feature_description_in_list is false' do
+      before { allow(configuration).to receive(:using_descriptions?).and_return(true) }
+      it { is_expected.to eq(false) }
+    end
+
+    context 'when using_descriptions? is true and show_feature_description_in_list is true' do
+      before do
+        allow(configuration).to receive(:using_descriptions?).and_return(true)
+        configuration.show_feature_description_in_list = true
+      end
+      it { is_expected.to eq(true) }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-ui
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.20.0.beta3
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -39,7 +39,7 @@ dependencies:
         version: 1.5.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,21 +49,21 @@ dependencies:
         version: 1.5.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: flipper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.20.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.20.0.beta3
 - !ruby/object:Gem::Dependency
   name: erubi
   requirement: !ruby/object:Gem::Requirement
@@ -92,8 +92,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - docs/ui/README.md
-- docs/ui/images/configured-ui.png
-- docs/ui/images/environment-banner.png
+- docs/ui/images/banner.png
+- docs/ui/images/description.png
 - docs/ui/images/feature.png
 - docs/ui/images/features.png
 - examples/ui/basic.ru
@@ -172,9 +172,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: