From 155c362662853556a8efba7969ac2222f21cadc8 Mon Sep 17 00:00:00 2001 From: Christopher Guess Date: Fri, 29 Mar 2024 10:15:07 -0400 Subject: [PATCH] Add feature flag for adhoc --- Gemfile | 4 ++++ Gemfile.lock | 7 ++++++ .../media_vault/archive_controller.rb | 2 +- .../layouts/media_vault/_header.html.erb | 2 +- app/views/media_vault/archive/index.html.erb | 2 ++ .../20240329133544_create_flipper_tables.rb | 22 +++++++++++++++++++ db/schema.rb | 18 ++++++++++++++- 7 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20240329133544_create_flipper_tables.rb diff --git a/Gemfile b/Gemfile index d949eaf3..c348fe04 100644 --- a/Gemfile +++ b/Gemfile @@ -232,3 +232,7 @@ gem "mechanize" # Better logging printing gem "amazing_print" # gem "rails_semantic_logger" + +gem "flipper", "~> 1.2" + +gem "flipper-active_record", "~> 1.2" diff --git a/Gemfile.lock b/Gemfile.lock index 5e527422..f2fa5715 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -256,6 +256,11 @@ GEM ffi (1.16.3) figaro (1.2.0) thor (>= 0.14.0, < 2) + flipper (1.2.2) + concurrent-ruby (< 2) + flipper-active_record (1.2.2) + activerecord (>= 4.2, < 8) + flipper (~> 1.2.2) globalid (1.1.0) activesupport (>= 5.0) hana (1.3.7) @@ -678,6 +683,8 @@ DEPENDENCIES eikon ferrum (~> 0.11) figaro + flipper (~> 1.2) + flipper-active_record (~> 1.2) forki! hiredis honeybadger (~> 5.2) diff --git a/app/controllers/media_vault/archive_controller.rb b/app/controllers/media_vault/archive_controller.rb index c2ebb892..ac09ea85 100644 --- a/app/controllers/media_vault/archive_controller.rb +++ b/app/controllers/media_vault/archive_controller.rb @@ -21,7 +21,7 @@ def index end # Here we need to see if we're on a personal archive page, and limit if so to the one's this person owns. - if params[:myvault].present? + if params[:myvault].present? && Flipper.enabled?(:adhoc, current_user) archive_items = current_user.archive_items @myvault = true else diff --git a/app/views/layouts/media_vault/_header.html.erb b/app/views/layouts/media_vault/_header.html.erb index 73e81197..eb743e82 100644 --- a/app/views/layouts/media_vault/_header.html.erb +++ b/app/views/layouts/media_vault/_header.html.erb @@ -19,7 +19,7 @@
    <% if current_user.can_access_media_vault? %>
  1. <%= link_to media_vault_dashboard_path, class: "btn btn--naked" do %>Dashboard<% end %>
    2. -
  2. <%= link_to media_vault_myvault_path, class: "btn btn--naked" do %>MyVault<% end %>
    3. + <% if Flipper.enabled?(:adhoc, current_user) %>
  3. <%= link_to media_vault_myvault_path, class: "btn btn--naked" do %>MyVault<% end %>
    4. <% end %>
  4. <%= link_to media_vault_guide_path, class: "btn btn--naked" do %>Guide to MediaVault<% end %>
  5. <%= render partial: "media_vault/search/search_box", locals: { myvault: @myvault } %> diff --git a/app/views/media_vault/archive/index.html.erb b/app/views/media_vault/archive/index.html.erb index 09d2bdf4..3c32123c 100644 --- a/app/views/media_vault/archive/index.html.erb +++ b/app/views/media_vault/archive/index.html.erb @@ -8,12 +8,14 @@

    <%= @myvault ? "MyVault:" : "Recently-archived media:" %>

    + <% if Flipper.enabled?(:adhoc, current_user) %>
    <%= link_to media_vault_archive_add_path, class: "btn btn--naked icon-prefixed", data: { turbo_stream: 'modal' } do %> <%= use_svg "plus", svg_attrs: { class: "icon icon--lg", aria: { hidden: true } } %> Save A Post <% end %>
    + <% end %> <% show = !@organization.nil? || !@from_date.nil? || !@to_date.nil? %> diff --git a/db/migrate/20240329133544_create_flipper_tables.rb b/db/migrate/20240329133544_create_flipper_tables.rb new file mode 100644 index 00000000..62b4e384 --- /dev/null +++ b/db/migrate/20240329133544_create_flipper_tables.rb @@ -0,0 +1,22 @@ +class CreateFlipperTables < ActiveRecord::Migration[7.0] + def up + create_table :flipper_features do |t| + t.string :key, null: false + t.timestamps null: false + end + add_index :flipper_features, :key, unique: true + + create_table :flipper_gates do |t| + t.string :feature_key, null: false + t.string :key, null: false + t.text :value + t.timestamps null: false + end + add_index :flipper_gates, [:feature_key, :key, :value], unique: true, length: { value: 255 } + end + + def down + drop_table :flipper_gates + drop_table :flipper_features + end +end diff --git a/db/schema.rb b/db/schema.rb index dfebe20c..35a2d211 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2024_03_29_114913) do +ActiveRecord::Schema[7.0].define(version: 2024_03_29_133544) do # These are extensions that must be enabled in order to support this database enable_extension "fuzzystrmatch" enable_extension "pgcrypto" @@ -164,6 +164,22 @@ t.datetime "updated_at", null: false end + create_table "flipper_features", force: :cascade do |t| + t.string "key", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["key"], name: "index_flipper_features_on_key", unique: true + end + + create_table "flipper_gates", force: :cascade do |t| + t.string "feature_key", null: false + t.string "key", null: false + t.text "value" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["feature_key", "key", "value"], name: "index_flipper_gates_on_feature_key_and_key_and_value", unique: true + end + create_table "image_hashes", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| t.string "dhash" t.uuid "archive_item_id"