From 65c61c4bab4e1e56ba723fba11401beaf7bcd38e Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Wed, 27 Aug 2025 13:48:36 -0500 Subject: [PATCH 01/12] Rename engagement columns --- app/views/cards/container/_engagement.html.erb | 4 ++-- app/views/cards/index/_workflow_filter.html.erb | 4 ++-- app/views/cards/index/engagement/_doing.html.erb | 2 +- app/views/cards/index/engagement/_on_deck.html.erb | 2 +- app/views/entropy/_auto_close.html.erb | 2 +- app/views/public/collections/show/_doing.html.erb | 2 +- app/views/public/collections/show/_on_deck.html.erb | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/cards/container/_engagement.html.erb b/app/views/cards/container/_engagement.html.erb index ed6fdda32..b59aff454 100644 --- a/app/views/cards/container/_engagement.html.erb +++ b/app/views/cards/container/_engagement.html.erb @@ -5,7 +5,7 @@ <%= form.hidden_field :engagement, value: "on_deck" %> <%= form.label :engagement, value: "on_deck", class: "btn", aria: { label: "Move to On Deck"} do %> <%= form.radio_button :engagement, "on_deck", checked: @card.on_deck?, class: "for-screen-reader", data: { action: "change->form#submit" } %> - Maybe? + On Deck <% end %> <% end %> @@ -20,7 +20,7 @@ <%= form.hidden_field :engagement, value: "doing" %> <%= form.label :engagement, value: "doing", class: "btn", aria: { label: "Move to Doing"} do %> <%= form.radio_button :engagement, "doing", checked: @card.doing?, class: "for-screen-reader", data: { action: "change->form#submit" } %> - Yes! + Working On <% end %> <% end %> diff --git a/app/views/cards/index/_workflow_filter.html.erb b/app/views/cards/index/_workflow_filter.html.erb index c5a610e70..d48ba88e0 100644 --- a/app/views/cards/index/_workflow_filter.html.erb +++ b/app/views/cards/index/_workflow_filter.html.erb @@ -1,9 +1,9 @@
diff --git a/app/views/cards/index/engagement/_doing.html.erb b/app/views/cards/index/engagement/_doing.html.erb index cf54fc057..8598d7963 100644 --- a/app/views/cards/index/engagement/_doing.html.erb +++ b/app/views/cards/index/engagement/_doing.html.erb @@ -3,7 +3,7 @@ <%= render "cards/index/workflow_filter", workflow: workflow, filter: filter %> <% else %>

- Yes! + Working On

<% end %> diff --git a/app/views/cards/index/engagement/_on_deck.html.erb b/app/views/cards/index/engagement/_on_deck.html.erb index 4814dd817..cd50efed4 100644 --- a/app/views/cards/index/engagement/_on_deck.html.erb +++ b/app/views/cards/index/engagement/_on_deck.html.erb @@ -1,5 +1,5 @@
-

Maybe?

+

On Deck

<% if page.used? %> <%= render partial: "cards/display/preview", collection: page.records, as: :card, locals: { draggable: true }, cached: true %> diff --git a/app/views/entropy/_auto_close.html.erb b/app/views/entropy/_auto_close.html.erb index f25b4cc5f..c7ce89d34 100644 --- a/app/views/entropy/_auto_close.html.erb +++ b/app/views/entropy/_auto_close.html.erb @@ -16,7 +16,7 @@
- Cards in Maybe?/Yes! + Cards in On Deck/Working On

Back to The Stream after…

<%= form_with model: model, url: url, data: { controller: "form" } do |form| %> <%= render "entropy/knob", diff --git a/app/views/public/collections/show/_doing.html.erb b/app/views/public/collections/show/_doing.html.erb index 557dbd7ff..7e19195ed 100644 --- a/app/views/public/collections/show/_doing.html.erb +++ b/app/views/public/collections/show/_doing.html.erb @@ -1,6 +1,6 @@

- Yes! + Working On

<% if page.used? %> diff --git a/app/views/public/collections/show/_on_deck.html.erb b/app/views/public/collections/show/_on_deck.html.erb index 127e0cf50..5494a2917 100644 --- a/app/views/public/collections/show/_on_deck.html.erb +++ b/app/views/public/collections/show/_on_deck.html.erb @@ -1,6 +1,6 @@

- Maybe? + On Deck

<% if page.used? %> From d8a3397c70487b18e3a1fb6d56dda1ca7d047998 Mon Sep 17 00:00:00 2001 From: Andy Smith Date: Wed, 27 Aug 2025 14:45:03 -0500 Subject: [PATCH 02/12] Don't show "All collections" when there's only the default collection --- app/views/filters/menu/collections/_all_option.html.erb | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/app/views/filters/menu/collections/_all_option.html.erb b/app/views/filters/menu/collections/_all_option.html.erb index b499eb0eb..d5b5ade05 100644 --- a/app/views/filters/menu/collections/_all_option.html.erb +++ b/app/views/filters/menu/collections/_all_option.html.erb @@ -1,13 +1,6 @@ <% clear_url_path = user_filtering.self_filter_path(user_filtering.as_params.except(:collection_ids)) %> -<% if Current.user.collections.one? %> - <%= link_to clear_url_path, class: "popup__group", id: "filter-collection-init", data: { filter_target: "item", navigable_list_target: "item" } do %> - <%= tag.div class: "popup__item btn" do %> - <%= Current.user.collections.first.name %> - GO TO › - <% end %> - <% end %> -<% elsif Current.user.collections.many? %> +<% if Current.user.collections.many? %>
  • <%= link_to clear_url_path, class: "btn txt-xx-small flex-item-no-shrink" do %> <%= check_box_tag "filter_collections", nil, user_filtering.collections.blank?, class: "form-checkbox" %> From bb15e5aba1a6185ce08b2a32fc79a119de8add3c Mon Sep 17 00:00:00 2001 From: Andy Smith Date: Wed, 27 Aug 2025 14:48:20 -0500 Subject: [PATCH 03/12] Prevent deleting the last collection --- app/views/collections/edit/_delete.html.erb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/views/collections/edit/_delete.html.erb b/app/views/collections/edit/_delete.html.erb index 28952d515..a3d6eab5a 100644 --- a/app/views/collections/edit/_delete.html.erb +++ b/app/views/collections/edit/_delete.html.erb @@ -1,6 +1,8 @@ -<%= form_with model: collection, class: "txt-align-center margin-block-start-auto", method: :delete do |form| %> - <%= form.button class: "btn txt-negative borderless txt-small", data: { turbo_confirm: "Are you sure you want to permanently delete this Collection?" } do %> - <%= icon_tag "trash" %> - Delete this Collection +<% if Current.user.collections.many? %> + <%= form_with model: collection, class: "txt-align-center margin-block-start-auto", method: :delete do |form| %> + <%= form.button class: "btn txt-negative borderless txt-small", data: { turbo_confirm: "Are you sure you want to permanently delete this Collection?" } do %> + <%= icon_tag "trash" %> + Delete this Collection + <% end %> <% end %> <% end %> From f54ee090b89218011df30a057263b46d4a29a78c Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Wed, 27 Aug 2025 18:49:51 -0500 Subject: [PATCH 04/12] Add clearer labels for sorting options --- app/helpers/filters_helper.rb | 13 +++++++++++++ app/views/filters/settings/_sorted_by.html.erb | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb index abb1e7947..b6b95418b 100644 --- a/app/helpers/filters_helper.rb +++ b/app/helpers/filters_helper.rb @@ -43,4 +43,17 @@ module FiltersHelper concat tag.kbd(key) end end + + def sorted_by_label(sort_value) + case sort_value + when "newest" + "Newest to oldest" + when "oldest" + "Oldest to newest" + when "latest" + "Recently updated" + else + sort_value.humanize + end + end end diff --git a/app/views/filters/settings/_sorted_by.html.erb b/app/views/filters/settings/_sorted_by.html.erb index d2fe0b247..ccd7ef853 100644 --- a/app/views/filters/settings/_sorted_by.html.erb +++ b/app/views/filters/settings/_sorted_by.html.erb @@ -4,7 +4,7 @@
    " data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside"> @@ -26,7 +26,7 @@ <% end %> <%= form.button type: "submit", class: "popup__item btn" do %> - <%= sort.humanize %> + <%= sorted_by_label(sort) %> <% if filter.sorted_by == sort %> <%= icon_tag "check", class: "checked flex-item-justify-end" %> <% end %> From 2cb98a2e317a5e992e50c8490c325b2f0508d535 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Wed, 27 Aug 2025 18:56:06 -0500 Subject: [PATCH 05/12] Don't show the filter if there aren't any tags --- app/models/user/filtering.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/user/filtering.rb b/app/models/user/filtering.rb index 448445c0b..065e3bfb0 100644 --- a/app/models/user/filtering.rb +++ b/app/models/user/filtering.rb @@ -56,6 +56,7 @@ class User::Filtering end def show_tags? + return unless Tag.any? expanded? || filter.tags.any? end From ff130401b11d67e4ad8db1ddffcf4920dffa4690 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Wed, 27 Aug 2025 19:03:58 -0500 Subject: [PATCH 06/12] Copy --- app/views/accounts/settings/_entropy_configuration.html.erb | 2 +- app/views/collections/edit/_auto_close.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/accounts/settings/_entropy_configuration.html.erb b/app/views/accounts/settings/_entropy_configuration.html.erb index 12dea2bbc..53992b1c4 100644 --- a/app/views/accounts/settings/_entropy_configuration.html.erb +++ b/app/views/accounts/settings/_entropy_configuration.html.erb @@ -1,5 +1,5 @@
    -

    Do or Die

    +

    Sink or Swim

    Choose default settings for this account. You can override them in individual collections.

    <%= render "entropy/auto_close", model: account.default_entropy_configuration, url: account_entropy_configuration_path %>
    diff --git a/app/views/collections/edit/_auto_close.html.erb b/app/views/collections/edit/_auto_close.html.erb index 127aab427..33c975269 100644 --- a/app/views/collections/edit/_auto_close.html.erb +++ b/app/views/collections/edit/_auto_close.html.erb @@ -1,4 +1,4 @@ <%= turbo_frame_tag @collection, :entropy_configuration do %> -

    Do or Die

    +

    Sink or Swim

    <%= render "entropy/auto_close", model: collection, url: collection_entropy_configuration_path(collection) %> <% end %> From 41edfae2b5a0ef9d64618daf57a71a94b70ac078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanko=20Krtali=C4=87?= Date: Thu, 28 Aug 2025 11:07:56 +0200 Subject: [PATCH 07/12] Alphabetically order concerns (#992) --- app/models/user.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index af3ff9315..6c2cc14b8 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,6 +1,6 @@ class User < ApplicationRecord - include Accessor, Attachable, Assignee, Mentionable, Named, Role, Searcher, - SignalUser, Staff, Transferable, Conversational, AiQuota + include Accessor, AiQuota, Assignee, Attachable, Mentionable, Named, Role, + Searcher, SignalUser, Staff, Transferable, Conversational include Timelined # Depends on Accessor has_one_attached :avatar From e26c1db5c5d496923c6332a3e03d608e07863f65 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Thu, 28 Aug 2025 11:01:52 -0400 Subject: [PATCH 08/12] test: backfill account route tests to prepare for refactor --- test/routes_test.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 test/routes_test.rb diff --git a/test/routes_test.rb b/test/routes_test.rb new file mode 100644 index 000000000..a270d2498 --- /dev/null +++ b/test/routes_test.rb @@ -0,0 +1,15 @@ +require "test_helper" + +class RouteTest < ActionDispatch::IntegrationTest + test "account/join_code" do + assert_recognizes({ controller: "accounts/join_codes", action: "show" }, "/account/join_code") + end + + test "account/settings" do + assert_recognizes({ controller: "accounts/settings", action: "show" }, "/account/settings") + end + + test "account/entropy_configuration" do + assert_recognizes({ controller: "accounts/entropy_configurations", action: "show" }, "/account/entropy_configuration") + end +end From 87d81e608b1519411558aab7410de7dcce6e11dd Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Thu, 28 Aug 2025 11:11:11 -0400 Subject: [PATCH 09/12] refactor: remove unused routes associated with "resource :account" - Drop from 313 unused routes to 306 unused routes - Use a namespace for the account-related resource routes - Controllers are nested under the "Account" module now - Move views from "accounts/" to "account/" --- .../entropy_configurations_controller.rb | 2 +- .../{accounts => account}/join_codes_controller.rb | 2 +- .../{accounts => account}/settings_controller.rb | 2 +- app/views/{accounts => account}/_invite.html.erb | 0 app/views/{accounts => account}/_user.html.erb | 0 .../settings/_entropy_configuration.html.erb | 0 .../{accounts => account}/settings/_users.html.erb | 4 ++-- .../{accounts => account}/settings/show.html.erb | 4 ++-- config/routes.rb | 11 ++++------- .../entropy_configurations_controller_test.rb | 2 +- test/controllers/accounts/settings_controller_test.rb | 2 +- test/routes_test.rb | 6 +++--- 12 files changed, 16 insertions(+), 19 deletions(-) rename app/controllers/{accounts => account}/entropy_configurations_controller.rb (81%) rename app/controllers/{accounts => account}/join_codes_controller.rb (78%) rename app/controllers/{accounts => account}/settings_controller.rb (55%) rename app/views/{accounts => account}/_invite.html.erb (100%) rename app/views/{accounts => account}/_user.html.erb (100%) rename app/views/{accounts => account}/settings/_entropy_configuration.html.erb (100%) rename app/views/{accounts => account}/settings/_users.html.erb (83%) rename app/views/{accounts => account}/settings/show.html.erb (80%) diff --git a/app/controllers/accounts/entropy_configurations_controller.rb b/app/controllers/account/entropy_configurations_controller.rb similarity index 81% rename from app/controllers/accounts/entropy_configurations_controller.rb rename to app/controllers/account/entropy_configurations_controller.rb index 07e828242..f3e1b7ebd 100644 --- a/app/controllers/accounts/entropy_configurations_controller.rb +++ b/app/controllers/account/entropy_configurations_controller.rb @@ -1,4 +1,4 @@ -class Accounts::EntropyConfigurationsController < ApplicationController +class Account::EntropyConfigurationsController < ApplicationController def update Entropy::Configuration.default.update!(entropy_configuration_params) diff --git a/app/controllers/accounts/join_codes_controller.rb b/app/controllers/account/join_codes_controller.rb similarity index 78% rename from app/controllers/accounts/join_codes_controller.rb rename to app/controllers/account/join_codes_controller.rb index b6f08bf3c..5c981a2ba 100644 --- a/app/controllers/accounts/join_codes_controller.rb +++ b/app/controllers/account/join_codes_controller.rb @@ -1,4 +1,4 @@ -class Accounts::JoinCodesController < ApplicationController +class Account::JoinCodesController < ApplicationController def show render svg: RQRCode::QRCode.new(join_url(Account.sole.join_code)).as_svg(viewbox: true, fill: :white, color: :black) end diff --git a/app/controllers/accounts/settings_controller.rb b/app/controllers/account/settings_controller.rb similarity index 55% rename from app/controllers/accounts/settings_controller.rb rename to app/controllers/account/settings_controller.rb index 60e60ceaf..2ad289342 100644 --- a/app/controllers/accounts/settings_controller.rb +++ b/app/controllers/account/settings_controller.rb @@ -1,4 +1,4 @@ -class Accounts::SettingsController < ApplicationController +class Account::SettingsController < ApplicationController def show @account = Account.sole @users = User.active diff --git a/app/views/accounts/_invite.html.erb b/app/views/account/_invite.html.erb similarity index 100% rename from app/views/accounts/_invite.html.erb rename to app/views/account/_invite.html.erb diff --git a/app/views/accounts/_user.html.erb b/app/views/account/_user.html.erb similarity index 100% rename from app/views/accounts/_user.html.erb rename to app/views/account/_user.html.erb diff --git a/app/views/accounts/settings/_entropy_configuration.html.erb b/app/views/account/settings/_entropy_configuration.html.erb similarity index 100% rename from app/views/accounts/settings/_entropy_configuration.html.erb rename to app/views/account/settings/_entropy_configuration.html.erb diff --git a/app/views/accounts/settings/_users.html.erb b/app/views/account/settings/_users.html.erb similarity index 83% rename from app/views/accounts/settings/_users.html.erb rename to app/views/account/settings/_users.html.erb index 6c834f0e6..cbcbaee50 100644 --- a/app/views/accounts/settings/_users.html.erb +++ b/app/views/account/settings/_users.html.erb @@ -5,13 +5,13 @@ navigable_list_actionable_items_value: true } do %>

    People on the account

    - <%#= render "accounts/invite" # Scheduled work in https://3.basecamp.com/2914079/buckets/37331921/todos/8746162337 %> + <%#= render "account/invite" # Scheduled work in https://3.basecamp.com/2914079/buckets/37331921/todos/8746162337 %>
      - <%= render partial: "accounts/user", collection: users %> + <%= render partial: "account/user", collection: users %>