From 22abf0ba46c6b294258c3dacc6318a0651e0031d Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 22 Apr 2025 11:56:41 +0200 Subject: [PATCH] Remove anemic concern Colors are a card concern. --- app/helpers/workflows_helper.rb | 2 +- app/models/card/colored.rb | 5 ++++- app/models/colorable.rb | 6 ------ app/views/workflows/stages/_color.html.erb | 2 +- test/models/card/colored_test.rb | 4 ++-- 5 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 app/models/colorable.rb diff --git a/app/helpers/workflows_helper.rb b/app/helpers/workflows_helper.rb index 1bbed5c32..43d0d5973 100644 --- a/app/helpers/workflows_helper.rb +++ b/app/helpers/workflows_helper.rb @@ -10,6 +10,6 @@ module WorkflowsHelper end def stage_color(stage) - stage.color.presence || Colorable::DEFAULT_COLOR + stage.color.presence || Card::DEFAULT_COLOR end end diff --git a/app/models/card/colored.rb b/app/models/card/colored.rb index 99e934a94..9a16ee4a4 100644 --- a/app/models/card/colored.rb +++ b/app/models/card/colored.rb @@ -1,8 +1,11 @@ module Card::Colored extend ActiveSupport::Concern + COLORS = %w[ #3b3633 #67695e #eb7a32 #bf7c2b #c09c6f #746b1e #2c6da8 #5d618f #663251 #ff63a8 ] + DEFAULT_COLOR = "#2c6da8" + def color - color_from_stage || Colorable::DEFAULT_COLOR + color_from_stage || DEFAULT_COLOR end private diff --git a/app/models/colorable.rb b/app/models/colorable.rb deleted file mode 100644 index e774fd946..000000000 --- a/app/models/colorable.rb +++ /dev/null @@ -1,6 +0,0 @@ -module Colorable - extend ActiveSupport::Concern - - COLORS = %w[ #3b3633 #67695e #eb7a32 #bf7c2b #c09c6f #746b1e #2c6da8 #5d618f #663251 #ff63a8 ] - DEFAULT_COLOR = "#2c6da8" -end diff --git a/app/views/workflows/stages/_color.html.erb b/app/views/workflows/stages/_color.html.erb index 04a9e12a3..f2b6e3160 100644 --- a/app/views/workflows/stages/_color.html.erb +++ b/app/views/workflows/stages/_color.html.erb @@ -6,7 +6,7 @@ <%= form_with model: stage, url: workflow_stage_path(stage.workflow, stage), class: "flex gap-half", data: { controller: "form", action: "change->form#submit" } do |form| %> - <% Colorable::COLORS.each do |color| %> + <% Card::COLORS.each do |color| %>