Skip to content

Commit 98fc2fc

Browse files
committed
1 parent 5478181 commit 98fc2fc

File tree

11 files changed

+18
-61
lines changed

11 files changed

+18
-61
lines changed

.env.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ALMA_OPENURL=https://na06.alma.exlibrisgroup.com/view/uresolver/01MIT_INST/openurl?
2-
GDT=false
2+
FEATURE_GEODATA=false
33
MIT_PRIMO_URL=https://mit.primo.exlibrisgroup.com
44
PRIMO_API_KEY=FAKE_PRIMO_API_KEY
55
PRIMO_API_URL=https://api-na.hosted.exlibrisgroup.com/primo/v1
@@ -12,4 +12,4 @@ TACOS_URL=http://FAKE_TACOS_HOST/graphql
1212
TACOS_SOURCE=FAKE_TACOS_SOURCE
1313
TIMDEX_GRAPHQL=https://FAKE_TIMDEX_HOST/graphql
1414
TIMDEX_HOST=FAKE_TIMDEX_HOST
15-
TIMDEX_INDEX=FAKE_TIMDEX_INDEX
15+
TIMDEX_INDEX=FAKE_TIMDEX_INDEX

Gemfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,3 @@ group :test do
5252
gem 'vcr'
5353
gem 'webmock'
5454
end
55-
56-
gem 'flipflop', '~> 2.7'

Gemfile.lock

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,6 @@ GEM
139139
ffi (>= 1.15.5)
140140
rake
141141
fiber-storage (1.0.1)
142-
flipflop (2.8.0)
143-
activesupport (>= 4.0)
144-
terminal-table (>= 1.8)
145142
globalid (1.3.0)
146143
activesupport (>= 6.1)
147144
graphql (2.5.14)
@@ -359,8 +356,6 @@ GEM
359356
stimulus-rails (1.3.4)
360357
railties (>= 6.0.0)
361358
stringio (3.1.7)
362-
terminal-table (4.0.0)
363-
unicode-display_width (>= 1.1.1, < 4)
364359
thor (1.4.0)
365360
tilt (2.6.0)
366361
timeout (0.4.3)
@@ -415,7 +410,6 @@ DEPENDENCIES
415410
climate_control
416411
debug
417412
dotenv-rails
418-
flipflop (~> 2.7)
419413
graphql
420414
graphql-client
421415
http

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ requires testing against an index that contains geospatial records.)
6363
3. Confirm that filters from multiple categories can be applied and removed, both on the sidebar
6464
and the panel beneath the search form.
6565

66-
If the `flipflop` gem has been updated, check that the `:gdt` feature is working by ensuring that
66+
Check that the `:geodata` feature is working by ensuring that
6767
UI elements specific to GDT (e.g., geospatial search fields or the 'Ask GIS' link) appear with the
6868
feature flag enabled, and do not when it is disabled.
6969

@@ -91,8 +91,11 @@ See `Optional Environment Variables` for more information.
9191
`basic_search#index`.
9292
- `ACTIVE_FILTERS`: If populated, this list of strings defines which filters are shown to the user, and the order in which they appear. Values are case sensitive, and must match the corresponding aggregations used in the TIMDEX GraphQL query. Extraneous values will be ignored. If not populated, all filters will be shown.
9393
- `BOOLEAN_OPTIONS`: comma separated list of values to present to testers on instances where `BOOLEAN_PICKER` feature is enabled.
94-
- `BOOLEAN_PICKER`: feature to allow users to select their preferred boolean type. If set, feature is enabled. This feature is only intended for internal team
94+
- `FEATURE_BOOLEAN_PICKER`: feature to allow users to select their preferred boolean type. If set to `true`, feature is enabled. This feature is only intended for internal team
9595
testing and should never be enabled in production (mostly because the UI is a mess more than it would cause harm).
96+
- `FEATURE_GDT`: Enables features related to geospatial data discovery. Setting this variable to `true` will trigger geodata
97+
mode. Note that this is currently intended _only_ for the geodata app and
98+
may have unexpected consequences if applied to other TIMDEX UI apps.
9699
- `FILTER_ACCESS_TO_FILES`: The name to use instead of "Access to files" for that filter / aggregation.
97100
- `FILTER_CONTENT_TYPE`: The name to use instead of "Content type" for that filter / aggregation.
98101
- `FILTER_CONTRIBUTOR`: The name to use instead of "Contributor" for that filter / aggregation.
@@ -102,9 +105,6 @@ See `Optional Environment Variables` for more information.
102105
- `FILTER_PLACE`: The name to use instead of "Place" for that filter / aggregation.
103106
- `FILTER_SOURCE`: The name to use instead of "Source" for that filter / aggregation.
104107
- `FILTER_SUBJECT`: The name to use instead of "Subject" for that filter / aggregation.
105-
- `GDT`: Enables features related to geospatial data discovery. Setting this variable with any value will trigger GDT
106-
mode (e.g., `GDT=false` will still enable GDT features). Note that this is currently intended _only_ for the GDT app and
107-
may have unexpected consequences if applied to other TIMDEX UI apps.
108108
- `GLOBAL_ALERT`: The main functionality for this comes from our theme gem, but when set the value will be rendered as
109109
safe html above the main header of the site.
110110
- `ORIGINS`: sets origins for CORS (currently used only for TACOS API calls).

config/application.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,6 @@
1111

1212
module TimdexUi
1313
class Application < Rails::Application
14-
# Before filter for Flipflop dashboard. Replace with a lambda or method name
15-
# defined in ApplicationController to implement access control.
16-
config.flipflop.dashboard_access_filter = -> { head :forbidden }
17-
18-
# By default, when set to `nil`, strategy loading errors are suppressed in test
19-
# mode. Set to `true` to always raise errors, or `false` to always warn.
20-
config.flipflop.raise_strategy_errors = nil
21-
2214
# Initialize configuration defaults for originally generated Rails version.
2315
config.load_defaults 7.2
2416

config/environments/development.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
require "active_support/core_ext/integer/time"
22

33
Rails.application.configure do
4-
# Before filter for Flipflop dashboard. Replace with a lambda or method name
5-
# defined in ApplicationController to implement access control.
6-
config.flipflop.dashboard_access_filter = nil
7-
8-
# By default, when set to `nil`, strategy loading errors are suppressed in test
9-
# mode. Set to `true` to always raise errors, or `false` to always warn.
10-
config.flipflop.raise_strategy_errors = nil
11-
124
# Settings specified here will take precedence over those in config/application.rb.
135

146
# In the development environment your application's code is reloaded any time

config/environments/test.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,6 @@
66
# and recreated between test runs. Don't rely on the data there!
77

88
Rails.application.configure do
9-
# Before filter for Flipflop dashboard. Replace with a lambda or method name
10-
# defined in ApplicationController to implement access control.
11-
config.flipflop.dashboard_access_filter = nil
12-
13-
# By default, when set to `nil`, strategy loading errors are suppressed in test
14-
# mode. Set to `true` to always raise errors, or `false` to always warn.
15-
config.flipflop.raise_strategy_errors = nil
16-
179
# Settings specified here will take precedence over those in config/application.rb.
1810

1911
# While tests run files are not watched, reloading is not necessary.

config/features.rb

Lines changed: 0 additions & 13 deletions
This file was deleted.

config/routes.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
Rails.application.routes.draw do
2-
mount Flipflop::Engine => "/flipflop"
32
root "basic_search#index"
43

54
get 'analyze', to: 'tacos#analyze'
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
class DropFlipflipFeatures < ActiveRecord::Migration[7.2]
2+
def change
3+
drop_table :flipflop_features do |t|
4+
t.string :key, null: false
5+
t.boolean :enabled, null: false, default: false
6+
7+
t.timestamps null: false
8+
end
9+
end
10+
end

0 commit comments

Comments
 (0)