diff --git a/app/views/workshop_variation_ideas/show.html.erb b/app/views/workshop_variation_ideas/show.html.erb
index d18322128..a2f301f9a 100644
--- a/app/views/workshop_variation_ideas/show.html.erb
+++ b/app/views/workshop_variation_ideas/show.html.erb
@@ -1,4 +1,4 @@
-<% content_for(:page_bg_class, "admin-only bg-blue-100") %>
+<% content_for(:page_bg_class, "admin-and-owner") %>
diff --git a/db/migrate/20260215000000_add_story_specific_and_display_text_to_category_types.rb b/db/migrate/20260215000000_add_story_specific_and_display_text_to_category_types.rb
new file mode 100644
index 000000000..b515a2a4c
--- /dev/null
+++ b/db/migrate/20260215000000_add_story_specific_and_display_text_to_category_types.rb
@@ -0,0 +1,6 @@
+class AddStorySpecificAndDisplayTextToCategoryTypes < ActiveRecord::Migration[8.1]
+ def change
+ add_column :category_types, :story_specific, :boolean, default: false
+ add_column :category_types, :display_text, :string
+ end
+end
diff --git a/db/seeds.rb b/db/seeds.rb
index 50862a25b..c8ae78b54 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,5 +1,16 @@
puts "Creating Users…"
+# Helper: case-insensitive find-or-create by name
+def find_or_create_by_name!(klass, name, **attrs, &block)
+ record = klass.where("LOWER(name) = LOWER(?)", name).first
+ return record if record
+
+ record = klass.new(name: name, **attrs)
+ block&.call(record)
+ record.save!
+ record
+end
+
# Admin
User.find_or_create_by!(email: "umberto.user@example.com") do |user|
user.first_name = "Umberto"
@@ -24,10 +35,10 @@
user.super_user = false
end
+# Only reset seed-user passwords, not every user in the database
+seed_emails = %w[umberto.user@example.com amy.user@example.com orphaned_reports@awbw.org]
user_password = Devise::Encryptor.digest(User, "password")
-User.in_batches do |batch|
- batch.update_all(encrypted_password: user_password)
-end
+User.where(email: seed_emails).update_all(encrypted_password: user_password)
puts "Creating WindowsTypes…"
adult_type = WindowsType.where(name: "ADULT WINDOWS")
@@ -46,8 +57,8 @@
FormBuilder.where(name: "Family Workshop Log", windows_type: combined_type).first_or_create!(id: 5)
puts "Creating OrganizationStatuses…"
-OrganizationStatus::ORGANIZATION_STATUSES.each_with_index do |status, idx|
- OrganizationStatus.where(name: status).first_or_create!(id: idx + 1)
+OrganizationStatus::ORGANIZATION_STATUSES.each do |status|
+ OrganizationStatus.where(name: status).first_or_create!
end
puts "Creating OrganizationObligations…"
@@ -57,7 +68,8 @@
puts "Creating Sectors…"
Sector::SECTOR_TYPES.each do |sector_type|
- Sector.where(name: sector_type, published: true).first_or_create!
+ sector = find_or_create_by_name!(Sector, sector_type)
+ sector.update!(published: true) unless sector.published?
end
puts "Creating CategoryTypes/Categories…"
@@ -163,9 +175,37 @@
# ["Service Population", "Substance Abuse"], # now a Sector
# ["Service Population", "Veterans & Military"], # now a Sector
]
-category_type_categories.each do |category_type_name, category_name, legacy_id|
- unless category_type_name.nil?
- metadata = CategoryType.find_or_create_by!(name: category_type_name)
- metadata.categories.find_or_create_by!(name: category_name)
+category_type_categories.each do |category_type_name, category_name, _legacy_id|
+ next if category_type_name.nil?
+
+ ct = find_or_create_by_name!(CategoryType, category_type_name, published: true)
+ ct.update!(published: true) unless ct.published?
+
+ # Category names are globally unique, so look up globally first
+ cat = Category.where("LOWER(name) = LOWER(?)", category_name).first
+ if cat
+ # Reassign to correct type if orphaned or misassigned
+ cat.update!(category_type: ct) unless cat.category_type_id == ct.id
+ else
+ cat = ct.categories.create!(name: category_name, published: true)
+ end
+ cat.update!(published: true) unless cat.published?
+end
+
+puts "Creating StoryPopulation CategoryType…"
+story_population_type = find_or_create_by_name!(CategoryType, "StoryPopulation") do |ct|
+ ct.display_text = "Who is your story about?"
+ ct.story_specific = true
+ ct.published = true
+end
+story_population_type.update!(display_text: "Who is your story about?", story_specific: true, published: true)
+
+%w[Adults Children Colleagues Community Families Self Teens].each do |name|
+ cat = Category.where("LOWER(name) = LOWER(?)", name).first
+ if cat
+ cat.update!(category_type: story_population_type) unless cat.category_type_id == story_population_type.id
+ else
+ cat = story_population_type.categories.create!(name: name, published: true)
end
+ cat.update!(published: true) unless cat.published?
end
diff --git a/spec/views/stories/new.html.erb_spec.rb b/spec/views/stories/new.html.erb_spec.rb
index ae242bc05..60a91d44a 100644
--- a/spec/views/stories/new.html.erb_spec.rb
+++ b/spec/views/stories/new.html.erb_spec.rb
@@ -4,36 +4,251 @@
let(:user) { create(:user) }
before(:each) do
- assign(:story, Story.new)
assign(:windows_types, [])
assign(:workshops, [])
assign(:organizations, [])
assign(:users, [])
assign(:sectors, [])
assign(:categories_grouped, [])
+ assign(:story_ideas, [])
allow(view).to receive(:current_user).and_return(user)
allow(view).to receive(:allowed_to?).and_return(false)
end
it "renders new story form" do
+ assign(:story, Story.new)
+
render
assert_select "form[action=?][method=?]", stories_path, "post" do
assert_select "select[name=?]", "story[windows_type_id]"
-
assert_select "select[name=?]", "story[organization_id]"
-
assert_select "select[name=?]", "story[workshop_id]"
-
assert_select "input[name=?][type=?]", "story[rhino_body]", "hidden"
-
assert_select "textarea[name=?]", "story[youtube_url]"
+ assert_select "select[name=?]", "story[created_by_id]"
+ end
+ end
- # assert_select "input[name=?]", "story[permission_given]"
- #
- # assert_select "input[name=?]", "story[publish_preferences]"
+ context "when promoted from a story idea" do
+ let(:story_idea) do
+ create(:story_idea,
+ created_by: user,
+ updated_by: user,
+ title: "Inspiring Journey",
+ body: "A powerful story about healing",
+ youtube_url: "https://youtube.com/watch?v=abc123")
+ end
- assert_select "select[name=?]", "story[created_by_id]"
+ let(:story) do
+ Story.new(
+ rhino_body: story_idea.body,
+ organization_id: story_idea.organization_id,
+ workshop_id: story_idea.workshop_id,
+ windows_type_id: story_idea.windows_type_id,
+ youtube_url: story_idea.youtube_url,
+ story_idea_id: story_idea.id
+ )
+ end
+
+ before do
+ assign(:story, story)
+ assign(:story_idea, story_idea)
+ assign(:story_ideas, StoryIdea.where(id: story_idea.id))
+ assign(:windows_types, WindowsType.where(id: story_idea.windows_type_id))
+ assign(:workshops, Workshop.where(id: story_idea.workshop_id))
+ assign(:organizations, Organization.where(id: story_idea.organization_id))
+ end
+
+ it "pre-fills windows_type_id from story idea" do
+ render
+
+ assert_select "form[action=?]", stories_path do
+ assert_select "select[name=?]", "story[windows_type_id]" do
+ assert_select "option[selected][value=?]", story_idea.windows_type_id.to_s
+ end
+ end
+ end
+
+ it "pre-fills workshop_id from story idea" do
+ render
+
+ assert_select "form[action=?]", stories_path do
+ assert_select "select[name=?]", "story[workshop_id]" do
+ assert_select "option[selected][value=?]", story_idea.workshop_id.to_s
+ end
+ end
+ end
+
+ it "pre-fills organization_id from story idea" do
+ render
+
+ assert_select "form[action=?]", stories_path do
+ assert_select "select[name=?]", "story[organization_id]" do
+ assert_select "option[selected][value=?]", story_idea.organization_id.to_s
+ end
+ end
+ end
+
+ it "pre-fills youtube_url from story idea" do
+ render
+
+ assert_select "form[action=?]", stories_path do
+ assert_select "textarea[name=?]", "story[youtube_url]", text: story_idea.youtube_url
+ end
+ end
+
+ it "pre-fills story_idea_id from story idea" do
+ render
+
+ assert_select "form[action=?]", stories_path do
+ assert_select "select[name=?]", "story[story_idea_id]" do
+ assert_select "option[selected][value=?]", story_idea.id.to_s
+ end
+ end
+ end
+
+ it "shows the promote idea assets checkbox when story idea has attachments" do
+ primary = story_idea.build_primary_asset
+ primary.file.attach(
+ io: StringIO.new("fake image data"),
+ filename: "test.png",
+ content_type: "image/png"
+ )
+ primary.save!
+ assign(:story_idea, story_idea.reload)
+
+ render
+
+ assert_select "input[name=?][type=checkbox]", "promote_idea_assets"
+ expect(rendered).to include("Story idea attachments")
+ end
+
+ it "displays story idea author credit" do
+ render
+
+ expect(rendered).to include("Story idea author credit")
+ expect(rendered).to include(story_idea.author_credit)
+ end
+
+ it "displays story idea publish preferences" do
+ render
+
+ expect(rendered).to include("publish preferences")
+ expect(rendered).to include(story_idea.publish_preferences)
+ end
+
+ context "with sectors and categories from story idea" do
+ let(:sector) { create(:sector, :published, name: "Domestic Violence") }
+ let(:category_type) { create(:category_type, :published, name: "StoryPopulation", story_specific: true, display_text: "Who is your story about?") }
+ let(:category) { create(:category, :published, name: "Adults", category_type: category_type) }
+
+ before do
+ story_idea.sectors << sector
+ story_idea.categories << category
+
+ assign(:story, story)
+ assign(:preselected_sector_ids, [ sector.id ])
+ assign(:preselected_category_ids, [ category.id ])
+ assign(:sectors, [ sector ])
+ assign(:categories_grouped, [ [ category_type, [ category ] ] ])
+ end
+
+ it "pre-checks sectors from story idea" do
+ render
+
+ assert_select "input[type=checkbox][name=?][value=?][checked]",
+ "story[sector_ids][]", sector.id.to_s
+ end
+
+ it "pre-checks categories from story idea" do
+ render
+
+ assert_select "input[type=checkbox][name=?][value=?][checked]",
+ "story[category_ids][]", category.id.to_s
+ end
+ end
+ end
+
+ context "tags display" do
+ let(:story_population_type) do
+ create(:category_type, :published,
+ name: "StoryPopulation",
+ story_specific: true,
+ display_text: "Who is your story about?")
+ end
+
+ let(:general_type) do
+ create(:category_type, :published, name: "AgeRange")
+ end
+
+ let(:population_category) do
+ create(:category, :published, name: "Adults", category_type: story_population_type)
+ end
+
+ let(:general_category) do
+ create(:category, :published, name: "Children 0-5", category_type: general_type)
+ end
+
+ let(:sector) { create(:sector, :published, name: "Domestic Violence") }
+
+ before do
+ assign(:story, Story.new)
+ assign(:sectors, [ sector ])
+ assign(:categories_grouped, [
+ [ story_population_type, [ population_category ] ],
+ [ general_type, [ general_category ] ]
+ ])
+ end
+
+ it "displays sector question text instead of just 'Sectors'" do
+ render
+
+ expect(rendered).to include(Sector::STORY_DISPLAY_TEXT)
+ end
+
+ it "displays sector checkboxes" do
+ render
+
+ assert_select "input[type=checkbox][name=?][value=?]",
+ "story[sector_ids][]", sector.id.to_s
+ expect(rendered).to include("Domestic Violence")
+ end
+
+ it "displays story-specific category type with display_label" do
+ render
+
+ expect(rendered).to include("Who is your story about?")
+ end
+
+ it "displays story-specific category checkboxes" do
+ render
+
+ assert_select "input[type=checkbox][name=?][value=?]",
+ "story[category_ids][]", population_category.id.to_s
+ expect(rendered).to include("Adults")
+ end
+
+ it "displays general category type with titleized name" do
+ render
+
+ expect(rendered).to include("Age Range")
+ end
+
+ it "displays general category checkboxes" do
+ render
+
+ assert_select "input[type=checkbox][name=?][value=?]",
+ "story[category_ids][]", general_category.id.to_s
+ expect(rendered).to include("Children 0-5")
+ end
+
+ it "shows story-specific types before general types" do
+ render
+
+ population_pos = rendered.index("Who is your story about?")
+ age_range_pos = rendered.index("Age Range")
+ expect(population_pos).to be < age_range_pos
end
end
end
diff --git a/spec/views/story_ideas/edit.html.erb_spec.rb b/spec/views/story_ideas/edit.html.erb_spec.rb
index 2a28a9207..212e6e6fd 100644
--- a/spec/views/story_ideas/edit.html.erb_spec.rb
+++ b/spec/views/story_ideas/edit.html.erb_spec.rb
@@ -11,6 +11,10 @@
assign(:workshops, [])
assign(:organizations, [])
assign(:users, [])
+ assign(:sectors, [])
+ assign(:story_population_categories, [])
+ assign(:story_population_type, nil)
+ assign(:categories_grouped, [])
allow(view).to receive(:current_user).and_return(user)
allow(view).to receive(:allowed_to?).and_return(false)
render
diff --git a/spec/views/story_ideas/new.html.erb_spec.rb b/spec/views/story_ideas/new.html.erb_spec.rb
index 3fa7689d2..071f9af17 100644
--- a/spec/views/story_ideas/new.html.erb_spec.rb
+++ b/spec/views/story_ideas/new.html.erb_spec.rb
@@ -10,6 +10,9 @@
assign(:workshops, [])
assign(:organizations, [])
assign(:users, [])
+ assign(:sectors, [])
+ assign(:story_population_categories, [])
+ assign(:story_population_type, nil)
end
context "when current_user is a regular user" do