Merge pull request #7806 from mkllnk/feature-toggles

Remove custom feature toggles

app/views/home/index.html.haml

@@ -10,16 +10,8 @@
 
   #panes
     = render "home/brandstory"
-
-    - if feature? :connect_learn_homepage
-      = render "home/learn"
-      = render "home/connect"
-      = render "home/system"
-    - else
-      = render "home/system"
-      = render "home/cta"
-
+    = render "home/system"
+    = render "home/cta"
     = render "home/stats"
 
-
   = render "shared/footer"

config/locales/en.yml

@@ -1477,8 +1477,6 @@ en:
   label_producers: "Producers"
   label_groups: "Groups"
   label_about: "About"
-  label_connect: "Connect"
-  label_learn: "Learn"
   label_blog: "Blog"
   label_support: "Support"
   label_shopping: "Shopping"
@@ -1572,12 +1570,6 @@ en:
   brandstory_part5_strong: "We call it Open Food Network."
   brandstory_part6: "We all love food. Now we can love our food system too."
 
-  learn_body: "Explore models, stories and resources to support you to develop your fair food business or organisation.  Find training, events and other opportunities to learn from peers."
-  learn_cta: "Get Inspired"
-
-  connect_body: "Search our full directories of producers, hubs and groups to find fair food traders near you.  List your business or organisation on the OFN so buyers can find you.  Join the community to get advice and solve problems together."
-  connect_cta: "Go Exploring"
-
   system_headline: "Shopping - here's how it works."
   system_step1: "1. Search"
   system_step1_text: "Search our diverse, independent shops for seasonal local food. Search by neighbourhood and food category, or whether you prefer delivery or pickup."

lib/open_food_network/feature_toggle.rb

@@ -1,87 +1,17 @@
 # frozen_string_literal: true
 
 module OpenFoodNetwork
-  # This feature toggles implementation provides two mechanisms to conditionally enable features.
+  # Feature toggles are configured via Flipper.
   #
-  # You can provide an ENV var with the prefix `OFN_FEATURE_` and query it using the
-  # `ApplicationHelper#feature?` helper method. For instance, providing the ENV var
-  # `OFN_FEATURE_NEW_SHINNY_FEATURE` you could then query it from view as follows:
+  # We define features in the initializer and then it can be customised via the
+  # web interface on each server.
   #
-  #   - if feature? :new_shiny_feature
-  #     = render "new_shiny_feature"
-  #
-  # Alternatively, you can choose which users have the feature toggled on. To do that you need to
-  # register the feature and its users from an initializer like:
-  #
-  #   require 'open_food_network/feature_toggle'
-  #   OpenFoodNetwork::FeatureToggle.enable(:new_shiny_feature, ['ofn@example.com'])
-  #
-  # Note, however, that it'd be better to read the user emails from an ENV var provisioned with
-  # ofn-install:
-  #
-  #   require 'open_food_network/feature_toggle'
-  #   OpenFoodNetwork::FeatureToggle.enable(:new_shiny_feature, ENV['PRODUCT_TEAM'])
-  #
-  # You can then check it from a view like:
-  #
-  #   - if feature? :new_shiny_feature, spree_current_user
-  #     = render "new_shiny_feature"
+  # - config/initializers/flipper.rb
+  # - http://localhost:3000/admin/feature-toggle/features
   #
   module FeatureToggle
     def self.enabled?(feature_name, user = nil)
-      features = Thread.current[:features] || {}
-
-      if Flipper[feature_name].exist?
-        Flipper.enabled?(feature_name, user)
-      else
-        feature = features.fetch(feature_name, DefaultFeature.new(feature_name))
-        feature.enabled?(user)
-      end
-    end
-
-    def self.enable(feature_name, &block)
-      Thread.current[:features] ||= {}
-      Thread.current[:features][feature_name] = Feature.new(block)
-    end
-  end
-
-  class Feature
-    def initialize(block)
-      @block = block
-    end
-
-    def enabled?(user)
-      block.call(user)
-    end
-
-    private
-
-    attr_reader :block
-  end
-
-  class DefaultFeature
-    attr_reader :feature_name
-
-    def initialize(feature_name)
-      @feature_name = feature_name
-    end
-
-    def enabled?(_user)
-      true?(env_variable_value(feature_name))
-    end
-
-    private
-
-    def env_variable_value(feature_name)
-      ENV.fetch(env_variable_name(feature_name), nil)
-    end
-
-    def env_variable_name(feature_name)
-      "OFN_FEATURE_#{feature_name.to_s.upcase}"
-    end
-
-    def true?(value)
-      value.to_s.casecmp("true").zero?
+      Flipper.enabled?(feature_name, user)
     end
   end
 end

spec/lib/open_food_network/feature_toggle_spec.rb

@@ -5,21 +5,6 @@ require 'spec_helper'
 module OpenFoodNetwork
   describe FeatureToggle do
     context 'when users are not specified' do
-      it "returns true when feature is on" do
-        stub_foo("true")
-        expect(FeatureToggle.enabled?(:foo)).to be true
-      end
-
-      it "returns false when feature is off" do
-        stub_foo("false")
-        expect(FeatureToggle.enabled?(:foo)).to be false
-      end
-
-      it "returns false when feature is unspecified" do
-        stub_foo("maybe")
-        expect(FeatureToggle.enabled?(:foo)).to be false
-      end
-
       it "returns false when feature is undefined" do
         expect(FeatureToggle.enabled?(:foo)).to be false
       end
@@ -28,45 +13,6 @@ module OpenFoodNetwork
         Flipper.enable(:foo)
         expect(FeatureToggle.enabled?(:foo)).to be true
       end
-
-      it "uses Flipper over static config" do
-        Flipper.enable(:foo, false)
-        stub_foo("true")
-        expect(FeatureToggle.enabled?(:foo)).to be false
-      end
-
-      def stub_foo(value)
-        allow(ENV).to receive(:fetch).with("OFN_FEATURE_FOO", nil).and_return(value)
-      end
-    end
-
-    context 'when specifying users' do
-      let(:insider) { build(:user) }
-      let(:outsider) { build(:user, email: "different") }
-
-      context 'and the block does not specify arguments' do
-        before do
-          FeatureToggle.enable(:foo) { 'return value' }
-        end
-
-        it "returns the block's return value" do
-          expect(FeatureToggle.enabled?(:foo, insider)).to eq('return value')
-        end
-      end
-
-      context 'and the block specifies arguments' do
-        let(:users) { [insider.email] }
-
-        before do
-          FeatureToggle.enable(:foo) { |user| users.include?(user&.email) }
-        end
-
-        it "returns the block's return value" do
-          expect(FeatureToggle.enabled?(:foo, insider)).to eq(true)
-          expect(FeatureToggle.enabled?(:foo, outsider)).to eq(false)
-          expect(FeatureToggle.enabled?(:foo, nil)).to eq(false)
-        end
-      end
     end
   end
 end