Remove GeoData from active tab logic

Why these changes are being introduced:

With the implementation of the 'all' tab, which
includes a `valid_tab?` method, it's become
confusing as to how GeoData fits into the tab
system. We currently treat it as a tab, but it's
also treated as a feature.

Relevant ticket(s):

- [USE-176](https://mitlibraries.atlassian.net/browse/USE-176)
- [USE-177](https://mitlibraries.atlassian.net/browse/USE-177)

How this addresses that need:

This normalizes the GeoData feature flagging in
the controller, such that we only check for
`Feature.enabled?` when toggling GeoData, rather
than a combination of `active_tab` and the
`Feature` model.

Side effects of this change:

Remaining instances where 'GeoData/geodata' was
referred to as 'GDT/gdt' have been updated to use
the actual property name.

Author: jazairi

app/controllers/application_controller.rb

@@ -6,10 +6,10 @@ class ApplicationController < ActionController::Base
   # We set this in a session cookie to persist user preference across searches.
   # Clicking on a different tab will update the cookie.
   def set_active_tab
-    @active_tab = if Feature.enabled?(:geodata)
-                    # Determine which tab to load - default to primo unless gdt is enabled
-                    'geodata'
-                  elsif params[:tab].present? && valid_tab?(params[:tab])
+    # GeoData doesn't use the tab system.
+    return if Feature.enabled?(:geodata)
+    
+    @active_tab = if params[:tab].present? && valid_tab?(params[:tab])
                     # If params[:tab] is set and valid, use it and set session
                     cookies[:last_tab] = params[:tab]
                   elsif cookies[:last_tab].present? && valid_tab?(cookies[:last_tab])

app/controllers/search_controller.rb

@@ -17,6 +17,13 @@ def results
 
     @enhanced_query = Enhancer.new(params).enhanced_query
 
+    # Load GeoData results if applicable
+    if Feature.enabled?(:geodata)
+      load_geodata_results
+      render 'results_geo'
+      return
+    end
+    
     # Route to appropriate search based on active tab
     case @active_tab
     when 'primo'
@@ -25,9 +32,6 @@ def results
       load_timdex_results
     when 'all'
       load_all_results
-    when 'geodata'
-      load_gdt_results
-      render 'results_geo'
     end
   end
 
@@ -52,7 +56,7 @@ def sleep_if_too_fast
     sleep(1 - duration)
   end
 
-  def load_gdt_results
+  def load_geodata_results
     query = QueryBuilder.new(@enhanced_query).query
 
     response = query_timdex(query)
@@ -170,7 +174,7 @@ def query_timdex(query)
 
     # Builder hands off to wrapper which returns raw results here.
     Rails.cache.fetch("#{cache_key}/#{@active_tab}", expires_in: 12.hours) do
-      raw = if @active_tab == 'geodata'
+      raw = if Feature.enabled?(:geodata)
               execute_geospatial_query(query)
             elsif @active_tab == 'timdex' || @active_tab == 'all'
               TimdexBase::Client.query(TimdexSearch::BaseQuery, variables: query)

app/helpers/filter_helper.rb

@@ -33,7 +33,7 @@ def nice_labels
     }
   end
 
-  def gdt_sources(value, category)
+  def geodata_sources(value, category)
     return value if category != :sourceFilter
 
     return 'Non-MIT institutions' if value == 'opengeometadata gis resources'

app/javascript/search_form.js

@@ -57,7 +57,7 @@ function updateKeywordPlaceholder() {
   }
 }
 
-// Add event listeners for all panels in the DOM. For GDT, this is currently both geospatial panels and the advanced
+// Add event listeners for all panels in the DOM. For GeoData, this is currently both geospatial panels and the advanced
 // panel. In all other TIMDEX UI apps, it's just the advanced panel.
 if (Array.from(allPanels).includes(geoboxPanel && geodistancePanel)) {
   document.getElementById('geobox-summary').addEventListener('click', () => {

app/models/feature.rb

@@ -11,13 +11,13 @@
 #
 # @example Setting Flags in Environment
 #   # In local ENV or Heroku config:
-#   FEATURE_GEODATA=true             # Enables the GDT feature
+#   FEATURE_GEODATA=true             # Enables the GeoData feature
 #   FEATURE_BOOLEAN_PICKER=true      # Enables the boolean picker feature
 #
 #   # Any non-true value or not setting ENV does not enable the feature
-#   FEATURE_GEODATA=false            # Does not enable the GDT feature
-#   FEATURE_GEODATA=1                # Does not enable the GDT feature
-#   FEATURE_GEODATA=on               # Does not enable the GDT feature
+#   FEATURE_GEODATA=false            # Does not enable the GeoData feature
+#   FEATURE_GEODATA=1                # Does not enable the GeoData feature
+#   FEATURE_GEODATA=on               # Does not enable the GeoData feature
 #
 # @example Usage in Different Contexts
 #   # In models/controllers:

app/views/record/_record_geo.html.erb

@@ -41,7 +41,7 @@
         </ul>
     <% end %>
 
-    <!-- The publishers field also includes location and date subfields, but these are unused in GDT. -->
+    <!-- The publishers field also includes location and date subfields, but these are unused in GeoData. -->
     <% if @record['publishers'].present? %>
       <h3 class="section-title">Publishers</h3>
       <ul>

app/views/search/_filter.html.erb

@@ -16,7 +16,7 @@
           <span class="sr">Apply filter:</span>
         <% end %>
         <% if Feature.enabled?(:geodata) %>
-          <span class="name"><%= gdt_sources(term['key'], category) %></span>
+          <span class="name"><%= geodata_sources(term['key'], category) %></span>
         <% else %>
           <span class="name"><%= term['key'] %></span>
         <% end %>

app/views/search/_search_summary_geo.html.erb

@@ -51,7 +51,7 @@
              href="<%= results_path(remove_filter(@enhanced_query, filter.keys[0], filter.values[0])) %>">
             <%= "#{nice_labels[filter.keys[0]] || filter.keys[0]}:" %>
             <% if Feature.enabled?(:geodata) %>
-              <%= "#{gdt_sources(filter.values[0], filter.keys[0])}" %>
+              <%= "#{geodata_sources(filter.values[0], filter.keys[0])}" %>
             <% else %>
               <%= "#{filter.values[0]}" %>
             <% end %>

test/controllers/application_controller_test.rb

@@ -27,18 +27,6 @@ class ApplicationControllerTest < ActionDispatch::IntegrationTest
     end
   end
 
-  test 'set_active_tab sets to geodata when feature flag enabled even if param is passed' do
-    skip 'Geodata uses a different form'
-    ClimateControl.modify FEATURE_GEODATA: 'true' do
-      get root_path, params: { tab: 'primo' }
-      assert_select '#tab-to-target' do
-        refute_select '[value=?]', 'primo'
-        assert_select '[value=?]', 'all'
-        refute_select '[value=?]', 'timdex'
-      end
-    end
-  end
-
   test 'set_active_tab sets to param tab when provided' do
     get root_path, params: { tab: 'timdex' }
 

test/controllers/record_controller_geo_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class RecordControllerGeoTest < ActionDispatch::IntegrationTest
-  test 'no access button displays if GDT feature is disabled' do
+  test 'no access button displays if GeoData feature is disabled' do
     gis_record_id = 'gismit:CAMBRIDGEMEMPOLES09'
     VCR.use_cassette('gis record mit free',
                      allow_playback_repeats: true,