HOLD: Display labels in sentence case, rename Windows type to Windows audience

app/controllers/windows_types_controller.rb

@@ -33,7 +33,7 @@ def create
     @windows_type.categories = Category.where(id: selected_ids)
 
     if @windows_type.save
-      redirect_to @windows_type, notice: "Windows type was successfully created."
+      redirect_to @windows_type, notice: "Windows audience was successfully created."
     else
       set_form_variables
       render :new, status: :unprocessable_content
@@ -47,7 +47,7 @@ def update
     @windows_type.categories = Category.where(id: selected_ids)
 
     if @windows_type.update(windows_type_params)
-      redirect_to @windows_type, notice: "Windows type was successfully updated.", status: :see_other
+      redirect_to @windows_type, notice: "Windows audience was successfully updated.", status: :see_other
     else
       set_form_variables
       render :edit, status: :unprocessable_content
@@ -57,7 +57,7 @@ def update
   def destroy
     authorize! @windows_type
     @windows_type.destroy!
-    redirect_to windows_types_path, notice: "Windows type was successfully destroyed."
+    redirect_to windows_types_path, notice: "Windows audience was successfully destroyed."
   end
 
   # Optional hooks for setting variables for forms or index

app/decorators/category_type_decorator.rb

@@ -1,6 +1,6 @@
 class CategoryTypeDecorator < ApplicationDecorator
   def title
-    name.titleize
+    name.underscore.humanize
   end
 
   def detail(length: nil)

app/helpers/admin_cards_helper.rb

@@ -52,7 +52,7 @@ def reference_cards
                  intensity: 100,
                  title: "Sectors",
                  params: { published: true }),
-      custom_card("Windows types", windows_types_path, icon: "🪟")
+      custom_card("Windows audiences", windows_types_path, icon: "🪟")
     ]
   end
 

app/models/category_type.rb

@@ -14,6 +14,6 @@ class CategoryType < ApplicationRecord
   scope :profile_specific, -> { where(profile_specific: true) }
 
   def display_label
-    display_text.presence || name.titleize
+    display_text.presence || name.underscore.humanize
   end
 end

app/views/admin/ahoy_activities/charts.html.erb

@@ -139,7 +139,7 @@
             </div>
 
             <div class="bg-white border border-gray-200 rounded-xl shadow-sm p-6">
-              <%= bar_chart(@ws_windows_types, title: "Workshop Search: Windows Types") %>
+              <%= bar_chart(@ws_windows_types, title: "Workshop search: Windows audiences") %>
             </div>
 
             <div class="bg-white border border-gray-200 rounded-xl shadow-sm p-6">

app/views/bookmarks/_search_fields.html.erb

@@ -42,7 +42,7 @@
 
   <!-- Type Dropdown -->
   <div>
-    <%= label_tag :windows_type, "Windows type", class: "block text-sm font-medium text-gray-700 mb-1" %>
+    <%= label_tag :windows_type, "Windows audience", class: "block text-sm font-medium text-gray-700 mb-1" %>
     <div class="relative">
       <%= select_tag :windows_type,
                      options_for_select(@windows_types_array,

app/views/organizations/_form.html.erb

@@ -22,7 +22,7 @@
         </div>
       </div>
 
-      <!-- Sectors & Windows Type -->
+      <!-- Sectors & Windows audience -->
       <div class="grid grid-cols-1 md:grid-cols-[3fr_1fr] gap-4 items-start">
         <div class="form-group space-y-4">
           <div class="font-semibold text-gray-700 mb-2">
@@ -50,7 +50,7 @@
 
         <div>
           <%= f.association :windows_type,
-                            label: "Windows Type",
+                            label: "Windows audience",
                             include_blank: true,
                             required: false,
                             input_html: {

app/views/organizations/_search_boxes.html.erb

@@ -10,7 +10,7 @@
                                        focus:border-blue-500 focus:ring focus:ring-blue-200 focus:outline-none" %>
     </div>
     <div>
-      <%= label_tag :windows_type_name, "Windows type", class: "text-sm font-medium text-gray-700 mb-1 block" %>
+      <%= label_tag :windows_type_name, "Windows audience", class: "text-sm font-medium text-gray-700 mb-1 block" %>
       <%= select_tag :windows_type_name,
                      options_for_select(WindowsType::TYPES.map { |wt| [wt, wt] },
                                         params[:windows_type_name]),

app/views/stories/_story_results.html.erb

@@ -22,7 +22,7 @@
     <thead class="bg-gray-50">
       <tr>
         <th class="px-4 py-2 text-left text-sm font-medium text-gray-700"><%= sort_link.call("title", "Title") %></th>
-        <th class="px-4 py-2 text-left text-sm font-medium text-gray-700"><%= sort_link.call("windows_type", "Windows Type") %></th>
+        <th class="px-4 py-2 text-left text-sm font-medium text-gray-700"><%= sort_link.call("windows_type", "Windows audience") %></th>
         <th class="px-4 py-2 text-left text-sm font-medium text-gray-700"><%= sort_link.call("workshop", "Workshop") %></th>
         <th class="px-4 py-2 text-left text-sm font-medium text-gray-700"><%= sort_link.call("author", "Author") %></th>
         <th class="px-4 py-2 text-left text-sm font-medium text-gray-700"><%= sort_link.call("organization", "Organization") %></th>

app/views/story_ideas/index.html.erb

@@ -22,7 +22,7 @@
               <th class="px-4 py-2 text-left text-sm font-medium text-gray-700"><span class="pl-3">Image</span></th>
               <th class="px-4 py-2 text-left text-sm font-medium text-gray-700">Author</th>
               <th class="px-4 py-2 text-left text-sm font-medium text-gray-700">Name</th>
-              <th class="px-4 py-2 text-left text-sm font-medium text-gray-700">Windows Type</th>
+              <th class="px-4 py-2 text-left text-sm font-medium text-gray-700">Windows audience</th>
               <th class="px-4 py-2 text-left text-sm font-medium text-gray-700">Workshop</th>
               <th class="px-4 py-2 text-left text-sm font-medium text-gray-700">Organization</th>
               <th class="px-4 py-2 text-center text-sm font-medium text-gray-700">Updated At</th>

app/views/workshop_log_creation_wizard/_form.html.erb

@@ -9,7 +9,7 @@
   <%= f.hidden_field :id %>
   <%= f.hidden_field :log_id, value: @old_report ? @old_report.id : nil %>
   <% if @windows_types && !workshop.id %>
-    <%= f.label 'New Workshop Windows Type', class: 'bold' %>
+    <%= f.label 'New workshop windows audience', class: 'bold' %>
     <%= f.select :windows_type_id, @windows_types.map { |wtype| [wtype.name, wtype.id]} %>
   <% end %>
   <br>

app/views/workshops/_dropdown_filter.html.erb

@@ -41,7 +41,7 @@
           id: "#{param_name}_#{item.id}",
           class: "category-checkbox" %>
           <%= label_tag "#{param_name}_#{item.id}",
-          item.public_send(label_method).titleize,
+          item.public_send(label_method).humanize,
           class: "text-sm text-gray-700" %>
         </div>
       <% end %>

app/views/workshops/_filters.html.erb

@@ -26,7 +26,7 @@
 
   <%= render "dropdown_filter",
              dom_id_prefix: "windows-types",
-             label_text: "Windows Audience",
+             label_text: "Windows audience",
              items: @windows_types,
              label_method: :short_name,
              param_name: :windows_types %>

db/seeds.rb

@@ -283,10 +283,10 @@ def find_or_create_by_name!(klass, name, **attrs, &block)
 category_type_categories = [
   [ "AgeRange", "3-5" ],
   [ "AgeRange", "6-12" ],
-  [ "AgeRange", "Teen" ],
+  [ "AgeRange", "13-17" ],
   [ "AgeRange", "18+" ],
   [ "AgeRange", "Mixed-age groups" ],
-  [ "AgeRange", "Family Windows" ],
+  [ "AgeRange", "Family windows" ],
   # ["ArtType", "Boxes", 1],
   [ "ArtType", "Clay", 11 ],
   [ "ArtType", "Collage", 2 ],
@@ -399,6 +399,12 @@ def find_or_create_by_name!(klass, name, **attrs, &block)
   cat.update!(published: true) unless cat.published?
 end
 
+puts "Setting AgeRange category positions…"
+age_range_order = [ "3-5", "6-12", "13-17", "18+", "Mixed-age groups", "Family windows" ]
+age_range_order.each_with_index do |name, i|
+  Category.where("LOWER(name) = LOWER(?)", name).update_all(position: i + 1)
+end
+
 puts "Creating StoryPopulation CategoryType…"
 story_population_type = find_or_create_by_name!(CategoryType, "StoryPopulation") do |ct|
   ct.display_text = "Who is this story about?"

spec/decorators/category_type_decorator_spec.rb

@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+RSpec.describe CategoryTypeDecorator do
+  describe '#title' do
+    it 'returns the name in sentence case' do
+      category_type = build(:category_type, name: "art_type").decorate
+      expect(category_type.title).to eq("Art type")
+    end
+
+    it 'capitalizes only the first word' do
+      category_type = build(:category_type, name: "emotional_theme").decorate
+      expect(category_type.title).to eq("Emotional theme")
+    end
+  end
+end

spec/models/category_type_spec.rb

@@ -17,6 +17,18 @@
     it { should validate_presence_of(:name) }
   end
 
+  describe '#display_label' do
+    it 'returns display_text when present' do
+      category_type = build(:category_type, name: "art_type", display_text: "Custom Label")
+      expect(category_type.display_label).to eq("Custom Label")
+    end
+
+    it 'returns sentence-cased name when display_text is blank' do
+      category_type = build(:category_type, name: "art_type", display_text: nil)
+      expect(category_type.display_label).to eq("Art type")
+    end
+  end
+
   describe 'scopes' do
     let!(:published_category_type) { create(:category_type, :published) }
     let!(:unpublished_category_type) { create(:category_type) }

spec/system/person_filters_workshops_test.rb

@@ -41,7 +41,7 @@
         expect(page).to have_content('The best workshop in the world')
         expect(page).to have_content('oh hello!')
         expect(page).to have_content('The best workshop on mars')
-        expect(page).to have_content('Windows Type')
+        expect(page).to have_content('Windows audience')
         expect(page).to have_content('Sector')
         expect(page).to have_content('Visibility')
       end

spec/system/workshops_spec.rb

@@ -34,7 +34,7 @@
         fill_in 'query', with: 'best workshop'
 
         # Open the dropdown
-        click_on "Windows Audience"  # this clicks the <button> text/label
+        click_on "Windows audience"  # this clicks the <button> text/label
         check("windows_types_#{adult_window.id}")
 
         expect(page).to have_content(workshop_world.title)
@@ -74,7 +74,7 @@
         expect(page).to have_content(workshop_adult.title)
 
         # Also check a windows type checkbox
-        click_on "Windows Audience"
+        click_on "Windows audience"
         check("windows_types_#{adult_window.id}")
         expect(page).to have_content(workshop_adult.title)
 

spec/views/stories/new.html.erb_spec.rb

@@ -226,10 +226,10 @@
       expect(rendered).to include("Adults")
     end
 
-    it "displays general category type with titleized name" do
+    it "displays general category type with sentence-cased name" do
       render
 
-      expect(rendered).to include("Age Range")
+      expect(rendered).to include("Age range")
     end
 
     it "displays general category checkboxes" do
@@ -244,7 +244,7 @@
       render
 
       population_pos = rendered.index("Who is this story about?")
-      age_range_pos = rendered.index("Age Range")
+      age_range_pos = rendered.index("Age range")
       expect(population_pos).to be < age_range_pos
     end
   end