diff --git a/app/assets/images/collection-add.svg b/app/assets/images/board-add.svg similarity index 100% rename from app/assets/images/collection-add.svg rename to app/assets/images/board-add.svg diff --git a/app/assets/images/collection.svg b/app/assets/images/board.svg similarity index 100% rename from app/assets/images/collection.svg rename to app/assets/images/board.svg diff --git a/app/assets/stylesheets/bubble.css b/app/assets/stylesheets/bubble.css index 3eb595b65..33dd732c2 100644 --- a/app/assets/stylesheets/bubble.css +++ b/app/assets/stylesheets/bubble.css @@ -45,7 +45,7 @@ .bubble__number { display: grid; - font-size: clamp(10px, 50cqi, var(--bubble-number-max)); /* FF bug: https://app.fizzy.do/5986089/collections/2/cards/1373 */ + font-size: clamp(10px, 50cqi, var(--bubble-number-max)); /* FF bug: https://app.fizzy.do/5986089/boards/2/cards/1373 */ font-weight: 900; inset: 0; place-content: center; diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css index eebbb74f9..a74e8e3f8 100644 --- a/app/assets/stylesheets/card-columns.css +++ b/app/assets/stylesheets/card-columns.css @@ -492,7 +492,7 @@ } } - .card__collection { + .card__board { background-color: transparent; color: var(--card-content-color); } @@ -519,10 +519,10 @@ } } - /* Collection tools + /* Board tools /* -------------------------------------------------------------------------- */ - .collection-tools.card { + .board-tools.card { --border-color: var(--color-selected-dark); --border-size: 1px; --card-padding-block: var(--block-space); @@ -560,7 +560,7 @@ } } - .collection-tools__watching { + .board-tools__watching { --btn-size: 32px; --gap: 0.5ch; @@ -572,7 +572,7 @@ position: relative; } - .collection-tools__watching-dialog { + .board-tools__watching-dialog { --panel-padding: 2ch; --panel-size: 100%; diff --git a/app/assets/stylesheets/card-perma.css b/app/assets/stylesheets/card-perma.css index d12e3eddc..0160fdaaf 100644 --- a/app/assets/stylesheets/card-perma.css +++ b/app/assets/stylesheets/card-perma.css @@ -85,7 +85,7 @@ } } - .collection-picker__button { + .board-picker__button { --btn-border-size: 0; font-size: 0.5em; diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index c32dc74c5..2b61ac4ce 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -55,7 +55,7 @@ } } - .card__collection { + .card__board { background-color: var(--card-color); border-radius: var(--border-radius) 0 var(--border-radius) 0; color: var(--color-ink-inverted); @@ -66,7 +66,7 @@ padding-block: 0.25lh; padding-inline: var(--card-padding-inline) 1ch; - &:has(.collection-picker__button) { + &:has(.board-picker__button) { cursor: pointer; transition: background-color 100ms ease-out; @@ -92,7 +92,7 @@ } } - .card__collection-name { + .card__board-name { border-inline-start: 1px solid color-mix(in hsl, transparent 75%, currentColor); color: currentColor; display: flex; @@ -404,7 +404,7 @@ padding-block-end: 0; } - .card__collection { + .card__board { font-size: var(--text-xx-small); padding-block: 0.5ch; padding-inline-start: var(--inline-space-double); @@ -487,7 +487,7 @@ } } - .card__collection-public-description { + .card__board-public-description { max-inline-size: 66ch; > *:first-child { margin-block-start: 0; } diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css index 2ff88e5eb..06eaaa15c 100644 --- a/app/assets/stylesheets/events.css +++ b/app/assets/stylesheets/events.css @@ -270,7 +270,7 @@ z-index: 0; } - .card__collection { + .card__board { background-color: transparent; color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink)); font-size: 0.7em; @@ -278,7 +278,7 @@ translate: 0 -0.3em; } - .card__collection-name { + .card__board-name { border-inline-start: 1px solid color-mix(in srgb, var(--color-ink) 33%, var(--color-canvas)); color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink)); margin: 0 0 0 calc(var(--inline-space) * 0.75); diff --git a/app/assets/stylesheets/icons.css b/app/assets/stylesheets/icons.css index e1c4df1d7..8575b72f2 100644 --- a/app/assets/stylesheets/icons.css +++ b/app/assets/stylesheets/icons.css @@ -42,8 +42,8 @@ .icon--clipboard { --svg: url("clipboard.svg "); } .icon--close { --svg: url("close.svg "); } .icon--close-circle { --svg: url("close-circle.svg "); } - .icon--collection { --svg: url("collection.svg "); } - .icon--collection-add { --svg: url("collection-add.svg "); } + .icon--board { --svg: url("board.svg "); } + .icon--board-add { --svg: url("board-add.svg "); } .icon--column-left { --svg: url("column-left.svg "); } .icon--column-right { --svg: url("column-right.svg "); } .icon--comment { --svg: url("comment.svg "); } diff --git a/app/assets/stylesheets/print.css b/app/assets/stylesheets/print.css index d3f849805..df7f8d3a8 100644 --- a/app/assets/stylesheets/print.css +++ b/app/assets/stylesheets/print.css @@ -63,7 +63,7 @@ } .card { - .card__collection { + .card__board { background: var(--color-canvas); border-block-end: var(--border-light); border-inline-end: var(--border-light); @@ -118,7 +118,7 @@ } } - /* Collections + /* Boards /* ------------------------------------------------------------------------ */ .filters, @@ -181,7 +181,7 @@ .card__meta-avatars--assignees > div > div:last-child, .steps > .step:last-child, div:has(> .tag-picker__button), - div:has(> .collection-picker__button), + div:has(> .board-picker__button), .delete-card, .header--card .header__title { display: none; diff --git a/app/assets/stylesheets/trays.css b/app/assets/stylesheets/trays.css index 519baca57..2352cb2b4 100644 --- a/app/assets/stylesheets/trays.css +++ b/app/assets/stylesheets/trays.css @@ -314,7 +314,7 @@ padding-block-end: 0; } - .card__collection { + .card__board { padding-block: 0.25ch; } diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 6c16b1906..dc70236ef 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -7,4 +7,6 @@ class ApplicationController < ActionController::Base stale_when_importmap_changes allow_browser versions: :modern + + etag { "v1" } # 2025-11-05 @todo: To invalidate HTTP cache after big renaming. To remove after a few days. end diff --git a/app/controllers/boards/columns/closeds_controller.rb b/app/controllers/boards/columns/closeds_controller.rb new file mode 100644 index 000000000..b9aad40b3 --- /dev/null +++ b/app/controllers/boards/columns/closeds_controller.rb @@ -0,0 +1,8 @@ +class Boards::Columns::ClosedsController < ApplicationController + include BoardScoped + + def show + set_page_and_extract_portion_from @board.cards.closed.recently_closed_first + fresh_when etag: @page.records + end +end diff --git a/app/controllers/boards/columns/not_nows_controller.rb b/app/controllers/boards/columns/not_nows_controller.rb new file mode 100644 index 000000000..a65f538c4 --- /dev/null +++ b/app/controllers/boards/columns/not_nows_controller.rb @@ -0,0 +1,8 @@ +class Boards::Columns::NotNowsController < ApplicationController + include BoardScoped + + def show + set_page_and_extract_portion_from @board.cards.postponed.reverse_chronologically.with_golden_first + fresh_when etag: @page.records + end +end diff --git a/app/controllers/boards/columns/streams_controller.rb b/app/controllers/boards/columns/streams_controller.rb new file mode 100644 index 000000000..03b48d900 --- /dev/null +++ b/app/controllers/boards/columns/streams_controller.rb @@ -0,0 +1,8 @@ +class Boards::Columns::StreamsController < ApplicationController + include BoardScoped + + def show + set_page_and_extract_portion_from @board.cards.awaiting_triage.latest.with_golden_first + fresh_when etag: @page.records + end +end diff --git a/app/controllers/collections/columns_controller.rb b/app/controllers/boards/columns_controller.rb similarity index 68% rename from app/controllers/collections/columns_controller.rb rename to app/controllers/boards/columns_controller.rb index a6c9103c5..1648da401 100644 --- a/app/controllers/collections/columns_controller.rb +++ b/app/controllers/boards/columns_controller.rb @@ -1,5 +1,5 @@ -class Collections::ColumnsController < ApplicationController - include CollectionScoped +class Boards::ColumnsController < ApplicationController + include BoardScoped before_action :set_column, only: %i[ show update destroy ] @@ -9,7 +9,7 @@ class Collections::ColumnsController < ApplicationController end def create - @column = @collection.columns.create!(column_params) + @column = @board.columns.create!(column_params) end def update @@ -22,7 +22,7 @@ class Collections::ColumnsController < ApplicationController private def set_column - @column = @collection.columns.find(params[:id]) + @column = @board.columns.find(params[:id]) end def column_params diff --git a/app/controllers/boards/entropies_controller.rb b/app/controllers/boards/entropies_controller.rb new file mode 100644 index 000000000..153dafe5f --- /dev/null +++ b/app/controllers/boards/entropies_controller.rb @@ -0,0 +1,12 @@ +class Boards::EntropiesController < ApplicationController + include BoardScoped + + def update + @board.entropy.update!(entropy_params) + end + + private + def entropy_params + params.expect(board: [ :auto_postpone_period ]) + end +end diff --git a/app/controllers/boards/involvements_controller.rb b/app/controllers/boards/involvements_controller.rb new file mode 100644 index 000000000..a904f2989 --- /dev/null +++ b/app/controllers/boards/involvements_controller.rb @@ -0,0 +1,7 @@ +class Boards::InvolvementsController < ApplicationController + include BoardScoped + + def update + @board.access_for(Current.user).update!(involvement: params[:involvement]) + end +end diff --git a/app/controllers/boards/publications_controller.rb b/app/controllers/boards/publications_controller.rb new file mode 100644 index 000000000..b7cda07ee --- /dev/null +++ b/app/controllers/boards/publications_controller.rb @@ -0,0 +1,12 @@ +class Boards::PublicationsController < ApplicationController + include BoardScoped + + def create + @board.publish + end + + def destroy + @board.unpublish + @board.reload + end +end diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb new file mode 100644 index 000000000..4bff8dde4 --- /dev/null +++ b/app/controllers/boards_controller.rb @@ -0,0 +1,94 @@ +class BoardsController < ApplicationController + include FilterScoped + + before_action :set_board, except: %i[ new create ] + before_action :ensure_permission_to_change_accesses, only: %i[ update ] + + def show + if @filter.used?(ignore_boards: true) + show_filtered_cards + else + show_columns + end + end + + def new + @board = Board.new + end + + def create + @board = Board.create! board_params.with_defaults(all_access: true) + redirect_to board_path(@board) + end + + def edit + selected_user_ids = @board.users.pluck :id + @selected_users, @unselected_users = \ + User.active.alphabetically.partition { |user| selected_user_ids.include? user.id } + end + + def update + @board.update! board_params + @board.accesses.revise granted: grantees, revoked: revokees if grantees_changed? + + if @board.accessible_to?(Current.user) + redirect_to edit_board_path(@board), notice: "Saved" + else + redirect_to root_path, notice: "Saved (you were removed from the board)" + end + end + + def destroy + @board.destroy + redirect_to root_path + end + + private + def set_board + @board = Current.user.boards.find params[:id] + end + + def ensure_permission_to_change_accesses + if trying_to_change_accesses? && !Current.user.can_administer_board?(@board) + head :forbidden + end + end + + def trying_to_change_accesses? + all_access_changed? || grantees_changed? + end + + def all_access_changed? + params[:board]&.key?(:all_access) + end + + def grantees_changed? + params.key?(:user_ids) + end + + def show_filtered_cards + @filter.board_ids = [ @board.id ] + set_page_and_extract_portion_from @filter.cards + end + + def show_columns + set_page_and_extract_portion_from @board.cards.awaiting_triage.latest.with_golden_first + fresh_when etag: [ @board, @page.records, @user_filtering ] + end + + def board_params + params.expect(board: [ :name, :all_access, :auto_postpone_period, :public_description ]) + end + + def grantees + User.active.where id: grantee_ids + end + + def revokees + @board.users.where.not id: grantee_ids + end + + def grantee_ids + params.fetch :user_ids, [] + end +end diff --git a/app/controllers/cards/assignments_controller.rb b/app/controllers/cards/assignments_controller.rb index d32696f11..cac32efde 100644 --- a/app/controllers/cards/assignments_controller.rb +++ b/app/controllers/cards/assignments_controller.rb @@ -2,11 +2,11 @@ class Cards::AssignmentsController < ApplicationController include CardScoped def new - @users = @collection.users.active.alphabetically + @users = @board.users.active.alphabetically fresh_when @users end def create - @card.toggle_assignment @collection.users.active.find(params[:assignee_id]) + @card.toggle_assignment @board.users.active.find(params[:assignee_id]) end end diff --git a/app/controllers/cards/boards_controller.rb b/app/controllers/cards/boards_controller.rb new file mode 100644 index 000000000..dfbc522a4 --- /dev/null +++ b/app/controllers/cards/boards_controller.rb @@ -0,0 +1,21 @@ +class Cards::BoardsController < ApplicationController + include BoardScoped + + skip_before_action :set_board, only: %i[ edit ] + before_action :set_card + + def edit + @boards = Current.user.boards.ordered_by_recently_accessed + fresh_when @boards + end + + def update + @card.move_to(@board) + redirect_to @card + end + + private + def set_card + @card = Current.user.accessible_cards.find(params[:card_id]) + end +end diff --git a/app/controllers/cards/collections_controller.rb b/app/controllers/cards/collections_controller.rb deleted file mode 100644 index 791fd945e..000000000 --- a/app/controllers/cards/collections_controller.rb +++ /dev/null @@ -1,21 +0,0 @@ -class Cards::CollectionsController < ApplicationController - include CollectionScoped - - skip_before_action :set_collection, only: %i[ edit ] - before_action :set_card - - def edit - @collections = Current.user.collections.ordered_by_recently_accessed - fresh_when @collections - end - - def update - @card.move_to(@collection) - redirect_to @card - end - - private - def set_card - @card = Current.user.accessible_cards.find(params[:card_id]) - end -end diff --git a/app/controllers/cards/columns_controller.rb b/app/controllers/cards/columns_controller.rb index e41225050..f250f2dd6 100644 --- a/app/controllers/cards/columns_controller.rb +++ b/app/controllers/cards/columns_controller.rb @@ -1,7 +1,7 @@ class Cards::ColumnsController < ApplicationController def edit @card = Current.user.accessible_cards.find(params[:card_id]) - @columns = @card.collection.columns + @columns = @card.board.columns fresh_when etag: [ @card, @columns ] end diff --git a/app/controllers/cards/publishes_controller.rb b/app/controllers/cards/publishes_controller.rb index 9aeab76ce..641f728cd 100644 --- a/app/controllers/cards/publishes_controller.rb +++ b/app/controllers/cards/publishes_controller.rb @@ -5,9 +5,9 @@ class Cards::PublishesController < ApplicationController @card.publish if add_another_param? - redirect_to @collection.cards.create!, notice: "Card added" + redirect_to @board.cards.create!, notice: "Card added" else - redirect_to @card.collection + redirect_to @card.board end end diff --git a/app/controllers/cards/readings_controller.rb b/app/controllers/cards/readings_controller.rb index d2e1bb8d1..e6a728829 100644 --- a/app/controllers/cards/readings_controller.rb +++ b/app/controllers/cards/readings_controller.rb @@ -5,11 +5,11 @@ class Cards::ReadingsController < ApplicationController def create @notifications = @card.read_by(Current.user) - record_collection_access + record_board_access end private - def record_collection_access - @card.collection.accessed_by(Current.user) + def record_board_access + @card.board.accessed_by(Current.user) end end diff --git a/app/controllers/cards/triages_controller.rb b/app/controllers/cards/triages_controller.rb index 10fb3df34..0c1a7bd1e 100644 --- a/app/controllers/cards/triages_controller.rb +++ b/app/controllers/cards/triages_controller.rb @@ -2,7 +2,7 @@ class Cards::TriagesController < ApplicationController include CardScoped def create - column = @card.collection.columns.find(params[:column_id]) + column = @card.board.columns.find(params[:column_id]) @card.triage_into(column) redirect_to @card diff --git a/app/controllers/cards_controller.rb b/app/controllers/cards_controller.rb index 7fcd7123e..3b9f0fcde 100644 --- a/app/controllers/cards_controller.rb +++ b/app/controllers/cards_controller.rb @@ -1,15 +1,16 @@ class CardsController < ApplicationController include FilterScoped - before_action :set_collection, only: %i[ create ] + before_action :set_board, only: %i[ create ] before_action :set_card, only: %i[ show edit update destroy ] + before_action :ensure_permission_to_administer_card, only: %i[ destroy ] def index set_page_and_extract_portion_from @filter.cards end def create - card = @collection.cards.find_or_create_by!(creator: Current.user, status: "drafted") + card = @board.cards.find_or_create_by!(creator: Current.user, status: "drafted") redirect_to card end @@ -30,23 +31,27 @@ class CardsController < ApplicationController def destroy @card.destroy! - redirect_to @card.collection, notice: "Card deleted" + redirect_to @card.board, notice: "Card deleted" end private - def set_collection - @collection = Current.user.collections.find params[:collection_id] + def set_board + @board = Current.user.boards.find params[:board_id] end def set_card @card = Current.user.accessible_cards.find params[:id] end + def ensure_permission_to_administer_card + head :forbidden unless Current.user.can_administer_card?(@card) + end + def suppressing_broadcasts_unless_published(card, &block) if card.published? yield else - Collection.suppressing_turbo_broadcasts(&block) + Board.suppressing_turbo_broadcasts(&block) end end diff --git a/app/controllers/collections/columns/closeds_controller.rb b/app/controllers/collections/columns/closeds_controller.rb deleted file mode 100644 index b5bf35953..000000000 --- a/app/controllers/collections/columns/closeds_controller.rb +++ /dev/null @@ -1,8 +0,0 @@ -class Collections::Columns::ClosedsController < ApplicationController - include CollectionScoped - - def show - set_page_and_extract_portion_from @collection.cards.closed.recently_closed_first - fresh_when etag: @page.records - end -end diff --git a/app/controllers/collections/columns/not_nows_controller.rb b/app/controllers/collections/columns/not_nows_controller.rb deleted file mode 100644 index 4c1a6796b..000000000 --- a/app/controllers/collections/columns/not_nows_controller.rb +++ /dev/null @@ -1,8 +0,0 @@ -class Collections::Columns::NotNowsController < ApplicationController - include CollectionScoped - - def show - set_page_and_extract_portion_from @collection.cards.postponed.reverse_chronologically.with_golden_first - fresh_when etag: @page.records - end -end diff --git a/app/controllers/collections/columns/streams_controller.rb b/app/controllers/collections/columns/streams_controller.rb deleted file mode 100644 index dccc9aa15..000000000 --- a/app/controllers/collections/columns/streams_controller.rb +++ /dev/null @@ -1,8 +0,0 @@ -class Collections::Columns::StreamsController < ApplicationController - include CollectionScoped - - def show - set_page_and_extract_portion_from @collection.cards.awaiting_triage.latest.with_golden_first - fresh_when etag: @page.records - end -end diff --git a/app/controllers/collections/entropies_controller.rb b/app/controllers/collections/entropies_controller.rb deleted file mode 100644 index 4affaf5af..000000000 --- a/app/controllers/collections/entropies_controller.rb +++ /dev/null @@ -1,12 +0,0 @@ -class Collections::EntropiesController < ApplicationController - include CollectionScoped - - def update - @collection.entropy.update!(entropy_params) - end - - private - def entropy_params - params.expect(collection: [ :auto_postpone_period ]) - end -end diff --git a/app/controllers/collections/involvements_controller.rb b/app/controllers/collections/involvements_controller.rb deleted file mode 100644 index 69f7f2fbc..000000000 --- a/app/controllers/collections/involvements_controller.rb +++ /dev/null @@ -1,7 +0,0 @@ -class Collections::InvolvementsController < ApplicationController - include CollectionScoped - - def update - @collection.access_for(Current.user).update!(involvement: params[:involvement]) - end -end diff --git a/app/controllers/collections/publications_controller.rb b/app/controllers/collections/publications_controller.rb deleted file mode 100644 index 78400dd3c..000000000 --- a/app/controllers/collections/publications_controller.rb +++ /dev/null @@ -1,12 +0,0 @@ -class Collections::PublicationsController < ApplicationController - include CollectionScoped - - def create - @collection.publish - end - - def destroy - @collection.unpublish - @collection.reload - end -end diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb deleted file mode 100644 index b7c722eca..000000000 --- a/app/controllers/collections_controller.rb +++ /dev/null @@ -1,79 +0,0 @@ -class CollectionsController < ApplicationController - include FilterScoped - - before_action :set_collection, except: %i[ new create ] - - def show - if @filter.used?(ignore_collections: true) - show_filtered_cards - else - show_columns - end - end - - def new - @collection = Collection.new - end - - def create - @collection = Collection.create! collection_params.with_defaults(all_access: true) - redirect_to collection_path(@collection) - end - - def edit - selected_user_ids = @collection.users.pluck :id - @selected_users, @unselected_users = \ - User.active.alphabetically.partition { |user| selected_user_ids.include? user.id } - end - - def update - @collection.update! collection_params - @collection.accesses.revise granted: grantees, revoked: revokees if grantees_changed? - - if @collection.accessible_to?(Current.user) - redirect_to edit_collection_path(@collection), notice: "Saved" - else - redirect_to root_path, notice: "Saved (you were removed from the collection)" - end - end - - def destroy - @collection.destroy - redirect_to root_path - end - - private - def set_collection - @collection = Current.user.collections.find params[:id] - end - - def show_filtered_cards - @filter.collection_ids = [ @collection.id ] - set_page_and_extract_portion_from @filter.cards - end - - def show_columns - set_page_and_extract_portion_from @collection.cards.awaiting_triage.latest.with_golden_first - fresh_when etag: [ @collection, @page.records, @user_filtering ] - end - - def collection_params - params.expect(collection: [ :name, :all_access, :auto_postpone_period, :public_description ]) - end - - def grantees - User.active.where id: grantee_ids - end - - def revokees - @collection.users.where.not id: grantee_ids - end - - def grantee_ids - params.fetch :user_ids, [] - end - - def grantees_changed? - params.key?(:user_ids) - end -end diff --git a/app/controllers/columns/cards/drops/columns_controller.rb b/app/controllers/columns/cards/drops/columns_controller.rb index 3de47992e..1d2bd8ce5 100644 --- a/app/controllers/columns/cards/drops/columns_controller.rb +++ b/app/controllers/columns/cards/drops/columns_controller.rb @@ -2,7 +2,7 @@ class Columns::Cards::Drops::ColumnsController < ApplicationController include CardScoped def create - @column = @card.collection.columns.find(params[:column_id]) + @column = @card.board.columns.find(params[:column_id]) @card.triage_into(@column) end end diff --git a/app/controllers/columns/cards/drops/streams_controller.rb b/app/controllers/columns/cards/drops/streams_controller.rb index d3ce8d1fa..fefdbb23f 100644 --- a/app/controllers/columns/cards/drops/streams_controller.rb +++ b/app/controllers/columns/cards/drops/streams_controller.rb @@ -3,6 +3,6 @@ class Columns::Cards::Drops::StreamsController < ApplicationController def create @card.send_back_to_triage - set_page_and_extract_portion_from @collection.cards.awaiting_triage.latest.with_golden_first + set_page_and_extract_portion_from @board.cards.awaiting_triage.latest.with_golden_first end end diff --git a/app/controllers/concerns/board_scoped.rb b/app/controllers/concerns/board_scoped.rb new file mode 100644 index 000000000..2772c7d01 --- /dev/null +++ b/app/controllers/concerns/board_scoped.rb @@ -0,0 +1,12 @@ +module BoardScoped + extend ActiveSupport::Concern + + included do + before_action :set_board + end + + private + def set_board + @board = Current.user.boards.find(params[:board_id]) + end +end diff --git a/app/controllers/concerns/card_scoped.rb b/app/controllers/concerns/card_scoped.rb index 5438871c1..77496e160 100644 --- a/app/controllers/concerns/card_scoped.rb +++ b/app/controllers/concerns/card_scoped.rb @@ -2,7 +2,7 @@ module CardScoped extend ActiveSupport::Concern included do - before_action :set_card, :set_collection + before_action :set_card, :set_board end private @@ -10,8 +10,8 @@ module CardScoped @card = Current.user.accessible_cards.find(params[:card_id]) end - def set_collection - @collection = @card.collection + def set_board + @board = @card.board end def render_card_replacement diff --git a/app/controllers/concerns/collection_scoped.rb b/app/controllers/concerns/collection_scoped.rb deleted file mode 100644 index 2ddde9531..000000000 --- a/app/controllers/concerns/collection_scoped.rb +++ /dev/null @@ -1,12 +0,0 @@ -module CollectionScoped - extend ActiveSupport::Concern - - included do - before_action :set_collection - end - - private - def set_collection - @collection = Current.user.collections.find(params[:collection_id]) - end -end diff --git a/app/controllers/landings_controller.rb b/app/controllers/landings_controller.rb index 5c2709a1f..f7f7558c4 100644 --- a/app/controllers/landings_controller.rb +++ b/app/controllers/landings_controller.rb @@ -1,7 +1,7 @@ class LandingsController < ApplicationController def show - if Current.user.collections.one? - redirect_to collection_path(Current.user.collections.first) + if Current.user.boards.one? + redirect_to board_path(Current.user.boards.first) else redirect_to events_path end diff --git a/app/controllers/notifications/settings_controller.rb b/app/controllers/notifications/settings_controller.rb index 42608b558..c4aab7f69 100644 --- a/app/controllers/notifications/settings_controller.rb +++ b/app/controllers/notifications/settings_controller.rb @@ -2,7 +2,7 @@ class Notifications::SettingsController < ApplicationController before_action :set_settings def show - @collections = Current.user.collections.alphabetically + @boards = Current.user.boards.alphabetically end def update diff --git a/app/controllers/prompts/boards/users_controller.rb b/app/controllers/prompts/boards/users_controller.rb new file mode 100644 index 000000000..e5f8775a6 --- /dev/null +++ b/app/controllers/prompts/boards/users_controller.rb @@ -0,0 +1,11 @@ +class Prompts::Boards::UsersController < ApplicationController + include BoardScoped + + def index + @users = @board.users.alphabetically + + if stale? etag: @users + render layout: false + end + end +end diff --git a/app/controllers/prompts/collections/users_controller.rb b/app/controllers/prompts/collections/users_controller.rb deleted file mode 100644 index 19edbbd5d..000000000 --- a/app/controllers/prompts/collections/users_controller.rb +++ /dev/null @@ -1,11 +0,0 @@ -class Prompts::Collections::UsersController < ApplicationController - include CollectionScoped - - def index - @users = @collection.users.alphabetically - - if stale? etag: @users - render layout: false - end - end -end diff --git a/app/controllers/public/base_controller.rb b/app/controllers/public/base_controller.rb index 7fa2e69fb..28a1bf463 100644 --- a/app/controllers/public/base_controller.rb +++ b/app/controllers/public/base_controller.rb @@ -1,17 +1,17 @@ class Public::BaseController < ApplicationController allow_unauthenticated_access - before_action :set_collection, :set_card, :set_public_cache_expiration + before_action :set_board, :set_card, :set_public_cache_expiration layout "public" private - def set_collection - @collection = Collection.find_by_published_key(params[:collection_id] || params[:id]) + def set_board + @board = Board.find_by_published_key(params[:board_id] || params[:id]) end def set_card - @card = @collection.cards.find(params[:id]) if params[:collection_id] && params[:id] + @card = @board.cards.find(params[:id]) if params[:board_id] && params[:id] end def set_public_cache_expiration diff --git a/app/controllers/public/boards/columns/closeds_controller.rb b/app/controllers/public/boards/columns/closeds_controller.rb new file mode 100644 index 000000000..63ca9de7b --- /dev/null +++ b/app/controllers/public/boards/columns/closeds_controller.rb @@ -0,0 +1,5 @@ +class Public::Boards::Columns::ClosedsController < Public::BaseController + def show + set_page_and_extract_portion_from @board.cards.closed.recently_closed_first + end +end diff --git a/app/controllers/public/boards/columns/not_nows_controller.rb b/app/controllers/public/boards/columns/not_nows_controller.rb new file mode 100644 index 000000000..d518fb8e0 --- /dev/null +++ b/app/controllers/public/boards/columns/not_nows_controller.rb @@ -0,0 +1,5 @@ +class Public::Boards::Columns::NotNowsController < Public::BaseController + def show + set_page_and_extract_portion_from @board.cards.postponed.reverse_chronologically.with_golden_first + end +end diff --git a/app/controllers/public/boards/columns/streams_controller.rb b/app/controllers/public/boards/columns/streams_controller.rb new file mode 100644 index 000000000..778817b3e --- /dev/null +++ b/app/controllers/public/boards/columns/streams_controller.rb @@ -0,0 +1,5 @@ +class Public::Boards::Columns::StreamsController < Public::BaseController + def show + set_page_and_extract_portion_from @board.cards.awaiting_triage.latest.with_golden_first + end +end diff --git a/app/controllers/public/collections/columns_controller.rb b/app/controllers/public/boards/columns_controller.rb similarity index 71% rename from app/controllers/public/collections/columns_controller.rb rename to app/controllers/public/boards/columns_controller.rb index 44262c545..5a5c23d5e 100644 --- a/app/controllers/public/collections/columns_controller.rb +++ b/app/controllers/public/boards/columns_controller.rb @@ -1,4 +1,4 @@ -class Public::Collections::ColumnsController < Public::BaseController +class Public::Boards::ColumnsController < Public::BaseController before_action :set_column def show @@ -11,6 +11,6 @@ class Public::Collections::ColumnsController < Public::BaseController end def set_column - @column = @collection.columns.find(params[:id]) + @column = @board.columns.find(params[:id]) end end diff --git a/app/controllers/public/boards_controller.rb b/app/controllers/public/boards_controller.rb new file mode 100644 index 000000000..d56a1f684 --- /dev/null +++ b/app/controllers/public/boards_controller.rb @@ -0,0 +1,5 @@ +class Public::BoardsController < Public::BaseController + def show + set_page_and_extract_portion_from @board.cards.awaiting_triage.latest.with_golden_first + end +end diff --git a/app/controllers/public/collections/columns/closeds_controller.rb b/app/controllers/public/collections/columns/closeds_controller.rb deleted file mode 100644 index f782fbc8f..000000000 --- a/app/controllers/public/collections/columns/closeds_controller.rb +++ /dev/null @@ -1,5 +0,0 @@ -class Public::Collections::Columns::ClosedsController < Public::BaseController - def show - set_page_and_extract_portion_from @collection.cards.closed.recently_closed_first - end -end diff --git a/app/controllers/public/collections/columns/not_nows_controller.rb b/app/controllers/public/collections/columns/not_nows_controller.rb deleted file mode 100644 index 6ee68e3e7..000000000 --- a/app/controllers/public/collections/columns/not_nows_controller.rb +++ /dev/null @@ -1,5 +0,0 @@ -class Public::Collections::Columns::NotNowsController < Public::BaseController - def show - set_page_and_extract_portion_from @collection.cards.postponed.reverse_chronologically.with_golden_first - end -end diff --git a/app/controllers/public/collections/columns/streams_controller.rb b/app/controllers/public/collections/columns/streams_controller.rb deleted file mode 100644 index 602b3d91d..000000000 --- a/app/controllers/public/collections/columns/streams_controller.rb +++ /dev/null @@ -1,5 +0,0 @@ -class Public::Collections::Columns::StreamsController < Public::BaseController - def show - set_page_and_extract_portion_from @collection.cards.awaiting_triage.latest.with_golden_first - end -end diff --git a/app/controllers/public/collections_controller.rb b/app/controllers/public/collections_controller.rb deleted file mode 100644 index d7e4977af..000000000 --- a/app/controllers/public/collections_controller.rb +++ /dev/null @@ -1,5 +0,0 @@ -class Public::CollectionsController < Public::BaseController - def show - set_page_and_extract_portion_from @collection.cards.awaiting_triage.latest.with_golden_first - end -end diff --git a/app/controllers/webhooks_controller.rb b/app/controllers/webhooks_controller.rb index b9ad06187..7d79c4587 100644 --- a/app/controllers/webhooks_controller.rb +++ b/app/controllers/webhooks_controller.rb @@ -1,22 +1,22 @@ class WebhooksController < ApplicationController - include CollectionScoped + include BoardScoped before_action :ensure_admin before_action :set_webhook, except: %i[ index new create ] def index - set_page_and_extract_portion_from @collection.webhooks.ordered + set_page_and_extract_portion_from @board.webhooks.ordered end def show end def new - @webhook = @collection.webhooks.new + @webhook = @board.webhooks.new end def create - webhook = @collection.webhooks.create!(webhook_params) + webhook = @board.webhooks.create!(webhook_params) redirect_to webhook end @@ -30,17 +30,17 @@ class WebhooksController < ApplicationController def destroy @webhook.destroy! - redirect_to collection_webhooks_path + redirect_to board_webhooks_path end private def set_webhook - @webhook = @collection.webhooks.find(params[:id]) + @webhook = @board.webhooks.find(params[:id]) end def webhook_params params .expect(webhook: [ :name, :url, subscribed_actions: [] ]) - .merge(collection_id: @collection.id) + .merge(board_id: @board.id) end end diff --git a/app/helpers/accesses_helper.rb b/app/helpers/accesses_helper.rb index ec98acc22..01aa57b7c 100644 --- a/app/helpers/accesses_helper.rb +++ b/app/helpers/accesses_helper.rb @@ -1,8 +1,8 @@ module AccessesHelper MAX_DISPLAYED_WATCHERS = 8 - def access_menu_tag(collection, **options, &) - tag.menu class: [ options[:class], { "toggler--toggled": collection.all_access? } ], data: { + def access_menu_tag(board, **options, &) + tag.menu class: [ options[:class], { "toggler--toggled": board.all_access? } ], data: { controller: "filter toggle-class navigable-list", action: "keydown->navigable-list#navigate filter:changed->navigable-list#reset", navigable_list_focus_on_selection_value: true, @@ -10,36 +10,36 @@ module AccessesHelper toggle_class_toggle_class: "toggler--toggled" }, & end - def access_toggles_for(users, selected:) - render partial: "collections/access_toggle", + def access_toggles_for(users, selected:, disabled: false) + render partial: "boards/access_toggle", collection: users, as: :user, - locals: { selected: selected }, + locals: { selected: selected, disabled: disabled }, cached: ->(user) { [ user, selected ] } end - def access_involvement_advance_button(collection, user, show_watchers: true, icon_only: false) - access = collection.access_for(user) + def access_involvement_advance_button(board, user, show_watchers: true, icon_only: false) + access = board.access_for(user) - turbo_frame_tag dom_id(collection, :involvement_button) do - concat collection_watchers_list(collection) if show_watchers - concat involvement_button(collection, access, show_watchers, icon_only) + turbo_frame_tag dom_id(board, :involvement_button) do + concat board_watchers_list(board) if show_watchers + concat involvement_button(board, access, show_watchers, icon_only) end end - def collection_watchers_list(collection) - watchers = collection.watchers + def board_watchers_list(board) + watchers = board.watchers displayed_watchers = watchers.limit(MAX_DISPLAYED_WATCHERS) overflow_count = watchers.count - MAX_DISPLAYED_WATCHERS safe_join([ tag.strong(displayed_watchers.any? ? "Watching for new cards" : "No one is watching for new cards", class: "txt-uppercase"), - tag.div(class: "collection-tools__watching") do + tag.div(class: "board-tools__watching") do safe_join([ safe_join(displayed_watchers.map { |watcher| avatar_tag(watcher) }), (tag.div(data: { controller: "dialog", action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside" }) do concat tag.button("+#{overflow_count}", class: "overflow-count btn btn--circle borderless", data: { action: "dialog#open" }, aria: { label: "Show #{overflow_count} more watchers" }) - concat(tag.dialog(class: "collection-tools__watching-dialog dialog panel", data: { dialog_target: "dialog" }, aria: { hidden: "true" }) do + concat(tag.dialog(class: "board-tools__watching-dialog dialog panel", data: { dialog_target: "dialog" }, aria: { hidden: "true" }) do safe_join(watchers.map { |watcher| avatar_tag(watcher) }) end) end if overflow_count > 0) @@ -48,11 +48,11 @@ module AccessesHelper ]) end - def involvement_button(collection, access, show_watchers, icon_only) - involvement_label_id = dom_id(collection, :involvement_label) + def involvement_button(board, access, show_watchers, icon_only) + involvement_label_id = dom_id(board, :involvement_label) button_to( - collection_involvement_path(collection), + board_involvement_path(board), method: :put, aria: { labelledby: involvement_label_id }, class: class_names("btn", { "btn--reversed": access.watching? && icon_only }), diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb new file mode 100644 index 000000000..ae8739d05 --- /dev/null +++ b/app/helpers/boards_helper.rb @@ -0,0 +1,14 @@ +module BoardsHelper + def link_back_to_board(board) + link_to board, class: "btn borderless txt-medium", + data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click click->turbo-navigation#backIfSamePath" } do + tag.span ("←" + tag.strong(board.name, class: "overflow-ellipsis")).html_safe + end + end + + def link_to_edit_board(board) + link_to edit_board_path(board), class: "btn", data: { controller: "tooltip" } do + icon_tag("settings") + tag.span("Settings for #{board.name}", class: "for-screen-reader") + end + end +end diff --git a/app/helpers/cards_helper.rb b/app/helpers/cards_helper.rb index 2b67f8750..56df2f54d 100644 --- a/app/helpers/cards_helper.rb +++ b/app/helpers/cards_helper.rb @@ -27,14 +27,14 @@ module CardsHelper title = [ card.title, "added by #{card.creator.name}", - "in #{card.collection.name}" + "in #{card.board.name}" ] title << "assigned to #{card.assignees.map(&:name).to_sentence}" if card.assignees.any? title.join(" ") end def card_social_tags(card) - tag.meta(property: "og:title", content: "#{card.title} | #{card.collection.name}") + + tag.meta(property: "og:title", content: "#{card.title} | #{card.board.name}") + tag.meta(property: "og:description", content: format_excerpt(@card&.description, length: 200)) + tag.meta(property: "og:image", content: @card.image.attached? ? "#{request.base_url}#{url_for(@card.image)}" : "#{request.base_url}/app-icon.png") + tag.meta(property: "og:url", content: card_url(@card)) diff --git a/app/helpers/collections_helper.rb b/app/helpers/collections_helper.rb deleted file mode 100644 index d10b00a4c..000000000 --- a/app/helpers/collections_helper.rb +++ /dev/null @@ -1,14 +0,0 @@ -module CollectionsHelper - def link_back_to_collection(collection) - link_to collection, class: "btn borderless txt-medium", - data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click click->turbo-navigation#backIfSamePath" } do - tag.span ("←" + tag.strong(collection.name, class: "overflow-ellipsis")).html_safe - end - end - - def link_to_edit_collection(collection) - link_to edit_collection_path(collection), class: "btn", data: { controller: "tooltip" } do - icon_tag("settings") + tag.span("Settings for #{collection.name}", class: "for-screen-reader") - end - end -end diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 7c55f857e..992463740 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -102,8 +102,8 @@ module EventsHelper "#{event_creator_name(event)} resumed #{event_card_title(card)}" when "card_title_changed" "#{event_creator_name(event)} renamed #{event_card_title(card)} (was: “#{h event.particulars.dig('particulars', 'old_title')}”)" - when "card_collection_changed" - "#{event_creator_name(event)} moved #{event_card_title(card)} to “#{h event.particulars.dig('particulars', 'new_collection')}”" + when "card_board_changed", "card_collection_changed" + "#{event_creator_name(event)} moved #{event_card_title(card)} to “#{h (event.particulars.dig('particulars', 'new_board') || event.particulars.dig('particulars', 'new_collection'))}”" when "card_triaged" "#{event_creator_name(event)} moved #{event_card_title(card)} to “#{h event.particulars.dig('particulars', 'column')}”" when "card_sent_back_to_triage" @@ -129,7 +129,7 @@ module EventsHelper "comment" when "card_title_changed" "rename" - when "card_collection_changed" + when "card_board_changed" "move" else "person" diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb index cfb634223..49f175067 100644 --- a/app/helpers/filters_helper.rb +++ b/app/helpers/filters_helper.rb @@ -11,8 +11,8 @@ module FiltersHelper hidden_field_tag name, value, id: nil end - def filter_selected_collections_title(user_filtering) - user_filtering.selected_collection_titles.collect { tag.strong it }.to_sentence.html_safe + def filter_selected_boards_title(user_filtering) + user_filtering.selected_board_titles.collect { tag.strong it }.to_sentence.html_safe end def filter_place_menu_item(path, label, icon, new_window: false, current: false) diff --git a/app/helpers/my/menu_helper.rb b/app/helpers/my/menu_helper.rb index a972a3408..2962a49ac 100644 --- a/app/helpers/my/menu_helper.rb +++ b/app/helpers/my/menu_helper.rb @@ -3,7 +3,7 @@ module My::MenuHelper text_field_tag :search, nil, type: "search", role: "combobox", - placeholder: "Type to jump to a collection, person, place, or tag…", + placeholder: "Type to jump to a board, person, place, or tag…", class: "input input--transparent txt-small", autofocus: true, autocorrect: "off", diff --git a/app/helpers/rich_text_helper.rb b/app/helpers/rich_text_helper.rb index 752af1075..c1bc2232a 100644 --- a/app/helpers/rich_text_helper.rb +++ b/app/helpers/rich_text_helper.rb @@ -1,6 +1,6 @@ module RichTextHelper - def mentions_prompt(collection) - content_tag "lexxy-prompt", "", trigger: "@", src: prompts_collection_users_path(collection), name: "mention" + def mentions_prompt(board) + content_tag "lexxy-prompt", "", trigger: "@", src: prompts_board_users_path(board), name: "mention" end def global_mentions_prompt @@ -19,7 +19,7 @@ module RichTextHelper content_tag "lexxy-code-language-picker" end - def general_prompts(collection) - safe_join([ mentions_prompt(collection), cards_prompt, code_language_picker ]) + def general_prompts(board) + safe_join([ mentions_prompt(board), cards_prompt, code_language_picker ]) end end diff --git a/app/helpers/webhooks_helper.rb b/app/helpers/webhooks_helper.rb index c809ac6ef..e0e0e3387 100644 --- a/app/helpers/webhooks_helper.rb +++ b/app/helpers/webhooks_helper.rb @@ -2,7 +2,7 @@ module WebhooksHelper ACTION_LABELS = { card_published: "Card added", card_title_changed: "Card title changed", - card_collection_changed: "Card collection changed", + card_board_changed: "Card board changed", comment_created: "Comment added", card_assigned: "Card assigned", card_unassigned: "Card unassigned", @@ -22,9 +22,9 @@ module WebhooksHelper ACTION_LABELS[action] || action.to_s.humanize end - def link_to_webhooks(collection, &) - link_to collection_webhooks_path(collection_id: collection), - class: [ "btn", { "btn--reversed": collection.webhooks.any? } ], + def link_to_webhooks(board, &) + link_to board_webhooks_path(board_id: board), + class: [ "btn", { "btn--reversed": board.webhooks.any? } ], data: { controller: "tooltip" } do icon_tag("world") + tag.span("Webhooks", class: "for-screen-reader") end diff --git a/app/javascript/controllers/collections_form_controller.js b/app/javascript/controllers/boards_form_controller.js similarity index 100% rename from app/javascript/controllers/collections_form_controller.js rename to app/javascript/controllers/boards_form_controller.js diff --git a/app/javascript/controllers/collapsible_columns_controller.js b/app/javascript/controllers/collapsible_columns_controller.js index 0a87e47d5..74dd1ff65 100644 --- a/app/javascript/controllers/collapsible_columns_controller.js +++ b/app/javascript/controllers/collapsible_columns_controller.js @@ -5,7 +5,7 @@ export default class extends Controller { static classes = [ "collapsed", "noTransitions" ] static targets = [ "column", "button" ] static values = { - collection: String + board: String } initialize() { @@ -104,6 +104,6 @@ export default class extends Controller { } #localStorageKeyFor(column) { - return `expand-${this.collectionValue}-${column.getAttribute("id")}` + return `expand-${this.boardValue}-${column.getAttribute("id")}` } } diff --git a/app/javascript/controllers/toggle_class_controller.js b/app/javascript/controllers/toggle_class_controller.js index 357525f67..04969aee2 100644 --- a/app/javascript/controllers/toggle_class_controller.js +++ b/app/javascript/controllers/toggle_class_controller.js @@ -24,7 +24,7 @@ export default class extends Controller { checkNone() { this.checkboxTargets.forEach(checkbox => { - if (checkbox.dataset.collectionsFormTarget === "meCheckbox") return + if (checkbox.dataset.boardsFormTarget === "meCheckbox") return checkbox.checked = false }) } diff --git a/app/jobs/board/clean_inaccessible_data_job.rb b/app/jobs/board/clean_inaccessible_data_job.rb new file mode 100644 index 000000000..b2cdff085 --- /dev/null +++ b/app/jobs/board/clean_inaccessible_data_job.rb @@ -0,0 +1,5 @@ +class Board::CleanInaccessibleDataJob < ApplicationJob + def perform(user, board) + board.clean_inaccessible_data_for(user) + end +end diff --git a/app/jobs/collection/clean_inaccessible_data_job.rb b/app/jobs/collection/clean_inaccessible_data_job.rb deleted file mode 100644 index 16ff1b90f..000000000 --- a/app/jobs/collection/clean_inaccessible_data_job.rb +++ /dev/null @@ -1,5 +0,0 @@ -class Collection::CleanInaccessibleDataJob < ApplicationJob - def perform(user, collection) - collection.clean_inaccessible_data_for(user) - end -end diff --git a/app/models/access.rb b/app/models/access.rb index fe4efe590..27026fb87 100644 --- a/app/models/access.rb +++ b/app/models/access.rb @@ -1,5 +1,5 @@ class Access < ApplicationRecord - belongs_to :collection, touch: true + belongs_to :board, touch: true belongs_to :user, touch: true enum :involvement, %i[ access_only watching ].index_by(&:itself), default: :access_only @@ -18,6 +18,6 @@ class Access < ApplicationRecord end def clean_inaccessible_data_later - Collection::CleanInaccessibleDataJob.perform_later(user, collection) + Board::CleanInaccessibleDataJob.perform_later(user, board) end end diff --git a/app/models/account/seeder.rb b/app/models/account/seeder.rb index 624f4abd1..991877833 100644 --- a/app/models/account/seeder.rb +++ b/app/models/account/seeder.rb @@ -26,9 +26,9 @@ class Account::Seeder def populate # --------------- - # Playground Collection + # Playground Board # --------------- - playground = Collection.create! name: "Playground", creator: creator, all_access: true + playground = Board.create! name: "Playground", creator: creator, all_access: true # Cards playground.cards.create! creator: creator, title: "Watch this: Fizzy orientation video", status: "published", description: <<~HTML @@ -105,7 +105,7 @@ class Account::Seeder def delete_everything Current.set session: session do - Collection.destroy_all + Board.destroy_all end end end diff --git a/app/models/collection.rb b/app/models/board.rb similarity index 72% rename from app/models/collection.rb rename to app/models/board.rb index ae09d9471..9e259d652 100644 --- a/app/models/collection.rb +++ b/app/models/board.rb @@ -1,5 +1,5 @@ -class Collection < ApplicationRecord - include AutoClosing, Accessible, Broadcastable, Cards, Entropic, Filterable, Publishable, Triageable +class Board < ApplicationRecord + include AutoPostponing, Accessible, Broadcastable, Cards, Entropic, Filterable, Publishable, Triageable belongs_to :creator, class_name: "User", default: -> { Current.user } diff --git a/app/models/collection/accessible.rb b/app/models/board/accessible.rb similarity index 86% rename from app/models/collection/accessible.rb rename to app/models/board/accessible.rb index 2d6aee476..6d62c0b21 100644 --- a/app/models/collection/accessible.rb +++ b/app/models/board/accessible.rb @@ -1,4 +1,4 @@ -module Collection::Accessible +module Board::Accessible extend ActiveSupport::Concern included do @@ -11,7 +11,7 @@ module Collection::Accessible end def grant_to(users) - Access.insert_all Array(users).collect { |user| { collection_id: proxy_association.owner.id, user_id: user.id } } + Access.insert_all Array(users).collect { |user| { board_id: proxy_association.owner.id, user_id: user.id } } end def revoke_from(users) @@ -69,7 +69,7 @@ module Collection::Accessible .joins("LEFT JOIN cards ON mentions.source_id = cards.id AND mentions.source_type = 'Card'") .joins("LEFT JOIN comments ON mentions.source_id = comments.id AND mentions.source_type = 'Comment'") .joins("LEFT JOIN cards AS comment_cards ON comments.card_id = comment_cards.id") - .where("(mentions.source_type = 'Card' AND cards.collection_id = ?) OR (mentions.source_type = 'Comment' AND comment_cards.collection_id = ?)", id, id) + .where("(mentions.source_type = 'Card' AND cards.board_id = ?) OR (mentions.source_type = 'Comment' AND comment_cards.board_id = ?)", id, id) end def notifications_for_user(user) @@ -85,8 +85,8 @@ module Collection::Accessible .joins("LEFT JOIN cards AS event_cards ON events.eventable_id = event_cards.id AND events.eventable_type = 'Card'") .joins("LEFT JOIN comments AS event_comments ON events.eventable_id = event_comments.id AND events.eventable_type = 'Comment'") .joins("LEFT JOIN cards AS event_comment_cards ON event_comments.card_id = event_comment_cards.id") - .where("(notifications.source_type = 'Event' AND events.eventable_type = 'Card' AND event_cards.collection_id = ?) OR - (notifications.source_type = 'Event' AND events.eventable_type = 'Comment' AND event_comment_cards.collection_id = ?)", + .where("(notifications.source_type = 'Event' AND events.eventable_type = 'Card' AND event_cards.board_id = ?) OR + (notifications.source_type = 'Event' AND events.eventable_type = 'Comment' AND event_comment_cards.board_id = ?)", id, id) end end diff --git a/app/models/collection/auto_closing.rb b/app/models/board/auto_postponing.rb similarity index 61% rename from app/models/collection/auto_closing.rb rename to app/models/board/auto_postponing.rb index 98cf21385..4911c5e33 100644 --- a/app/models/collection/auto_closing.rb +++ b/app/models/board/auto_postponing.rb @@ -1,4 +1,4 @@ -module Collection::AutoClosing +module Board::AutoPostponing extend ActiveSupport::Concern included do @@ -6,9 +6,9 @@ module Collection::AutoClosing end private - DEFAULT_auto_postpone_period = 30.days + DEFAULT_AUTO_POSTPONE_PERIOD = 30.days def set_default_auto_postpone_period - self.auto_postpone_period ||= DEFAULT_auto_postpone_period unless attribute_present?(:auto_postpone_period) + self.auto_postpone_period ||= DEFAULT_AUTO_POSTPONE_PERIOD unless attribute_present?(:auto_postpone_period) end end diff --git a/app/models/board/broadcastable.rb b/app/models/board/broadcastable.rb new file mode 100644 index 000000000..177509800 --- /dev/null +++ b/app/models/board/broadcastable.rb @@ -0,0 +1,8 @@ +module Board::Broadcastable + extend ActiveSupport::Concern + + included do + broadcasts_refreshes + broadcasts_refreshes_to ->(_) { :all_boards } + end +end diff --git a/app/models/collection/cards.rb b/app/models/board/cards.rb similarity index 87% rename from app/models/collection/cards.rb rename to app/models/board/cards.rb index 105f4912b..096400957 100644 --- a/app/models/collection/cards.rb +++ b/app/models/board/cards.rb @@ -1,4 +1,4 @@ -module Collection::Cards +module Board::Cards extend ActiveSupport::Concern included do diff --git a/app/models/collection/entropic.rb b/app/models/board/entropic.rb similarity index 93% rename from app/models/collection/entropic.rb rename to app/models/board/entropic.rb index a84e7eb62..b29d5ea42 100644 --- a/app/models/collection/entropic.rb +++ b/app/models/board/entropic.rb @@ -1,4 +1,4 @@ -module Collection::Entropic +module Board::Entropic extend ActiveSupport::Concern included do diff --git a/app/models/board/publication.rb b/app/models/board/publication.rb new file mode 100644 index 000000000..a21fb00b6 --- /dev/null +++ b/app/models/board/publication.rb @@ -0,0 +1,5 @@ +class Board::Publication < ApplicationRecord + belongs_to :board + + has_secure_token :key +end diff --git a/app/models/collection/publishable.rb b/app/models/board/publishable.rb similarity index 65% rename from app/models/collection/publishable.rb rename to app/models/board/publishable.rb index 25b7f3fc7..6c1ce47d4 100644 --- a/app/models/collection/publishable.rb +++ b/app/models/board/publishable.rb @@ -1,14 +1,14 @@ -module Collection::Publishable +module Board::Publishable extend ActiveSupport::Concern included do - has_one :publication, class_name: "Collection::Publication", dependent: :destroy + has_one :publication, class_name: "Board::Publication", dependent: :destroy scope :published, -> { joins(:publication) } end class_methods do def find_by_published_key(key) - Collection::Publication.find_by!(key: key).collection + Board::Publication.find_by!(key: key).board end end diff --git a/app/models/collection/triageable.rb b/app/models/board/triageable.rb similarity index 76% rename from app/models/collection/triageable.rb rename to app/models/board/triageable.rb index a314868c8..3e922b4a2 100644 --- a/app/models/collection/triageable.rb +++ b/app/models/board/triageable.rb @@ -1,4 +1,4 @@ -module Collection::Triageable +module Board::Triageable extend ActiveSupport::Concern included do diff --git a/app/models/card.rb b/app/models/card.rb index 7ac40ca09..65c7cab18 100644 --- a/app/models/card.rb +++ b/app/models/card.rb @@ -3,7 +3,7 @@ class Card < ApplicationRecord Eventable, Golden, Mentions, Multistep, Pinnable, Postponable, Promptable, Readable, Searchable, Stallable, Statuses, Taggable, Triageable, Watchable - belongs_to :collection, touch: true + belongs_to :board, touch: true belongs_to :creator, class_name: "User", default: -> { Current.user } has_many :comments, dependent: :destroy @@ -12,7 +12,7 @@ class Card < ApplicationRecord has_rich_text :description before_save :set_default_title, if: :published? - after_update :handle_collection_change, if: :saved_change_to_collection_id? + after_update :handle_board_change, if: :saved_change_to_board_id? scope :reverse_chronologically, -> { order created_at: :desc, id: :desc } scope :chronologically, -> { order created_at: :asc, id: :asc } @@ -39,16 +39,16 @@ class Card < ApplicationRecord end end - delegate :accessible_to?, to: :collection + delegate :accessible_to?, to: :board def card self end - def move_to(new_collection) + def move_to(new_board) transaction do - card.update!(collection: new_collection) - card.events.update_all(collection_id: new_collection.id) + card.update!(board: new_board) + card.events.update_all(board_id: new_board.id) end end @@ -61,23 +61,23 @@ class Card < ApplicationRecord self.title = "Untitled" if title.blank? end - def handle_collection_change - old_collection = Collection.find_by(id: collection_id_before_last_save) + def handle_board_change + old_board = Board.find_by(id: board_id_before_last_save) transaction do update! column: nil - track_collection_change_event(old_collection.name) - grant_access_to_assignees unless collection.all_access? + track_board_change_event(old_board.name) + grant_access_to_assignees unless board.all_access? end remove_inaccessible_notifications_later end - def track_collection_change_event(old_collection_name) - track_event "collection_changed", particulars: { old_collection: old_collection_name, new_collection: collection.name } + def track_board_change_event(old_board_name) + track_event "board_changed", particulars: { old_board: old_board_name, new_board: board.name } end def grant_access_to_assignees - collection.accesses.grant_to(assignees) + board.accesses.grant_to(assignees) end end diff --git a/app/models/card/entropic.rb b/app/models/card/entropic.rb index 68c0c6aa1..478d4bc52 100644 --- a/app/models/card/entropic.rb +++ b/app/models/card/entropic.rb @@ -4,19 +4,19 @@ module Card::Entropic included do scope :due_to_be_postponed, -> do active - .left_outer_joins(collection: :entropy) + .left_outer_joins(board: :entropy) .where("last_active_at <= DATETIME('now', '-' || COALESCE(entropies.auto_postpone_period, ?) || ' seconds')", Account.sole.entropy.auto_postpone_period) end scope :postponing_soon, -> do active - .left_outer_joins(collection: :entropy) + .left_outer_joins(board: :entropy) .where("last_active_at > DATETIME('now', '-' || COALESCE(entropies.auto_postpone_period, ?) || ' seconds')", Account.sole.entropy.auto_postpone_period) .where("last_active_at <= DATETIME('now', '-' || CAST(COALESCE(entropies.auto_postpone_period, ?) * 0.75 AS INTEGER) || ' seconds')", Account.sole.entropy.auto_postpone_period) end - delegate :auto_postpone_period, to: :collection + delegate :auto_postpone_period, to: :board end class_methods do diff --git a/app/models/card/eventable/system_commenter.rb b/app/models/card/eventable/system_commenter.rb index e74475c79..ace5701bf 100644 --- a/app/models/card/eventable/system_commenter.rb +++ b/app/models/card/eventable/system_commenter.rb @@ -28,8 +28,8 @@ class Card::Eventable::SystemCommenter "Closed as “Not Now” due to inactivity" when "card_title_changed" "#{event.creator.name} changed the title from “#{event.particulars.dig('particulars', 'old_title')}” to “#{event.particulars.dig('particulars', 'new_title')}”." - when "card_collection_changed" - "#{event.creator.name} moved this from “#{event.particulars.dig('particulars', 'old_collection')}” to “#{event.particulars.dig('particulars', 'new_collection')}”." + when "card_board_changed" + "#{event.creator.name} moved this from “#{event.particulars.dig('particulars', 'old_board')}” to “#{event.particulars.dig('particulars', 'new_board')}”." when "card_triaged" "#{event.creator.name} moved this to “#{event.particulars.dig('particulars', 'column')}”" when "card_sent_back_to_triage" diff --git a/app/models/card/promptable.rb b/app/models/card/promptable.rb index efbcd64db..e30816023 100644 --- a/app/models/card/promptable.rb +++ b/app/models/card/promptable.rb @@ -21,8 +21,8 @@ module Card::Promptable * Assigned to: #{assignees.map(&:name).join(", ")} * Column: #{column_prompt_label} * Created at: #{created_at}} - * Collection id: #{collection_id} - * Collection name: #{collection.name} + * Board id: #{board_id} + * Board name: #{board.name} * Number of comments: #{comments.count} * Path: #{card_path(self, script_name: Account.sole.slug)} diff --git a/app/models/card/triageable.rb b/app/models/card/triageable.rb index c324c709b..d15663902 100644 --- a/app/models/card/triageable.rb +++ b/app/models/card/triageable.rb @@ -17,7 +17,7 @@ module Card::Triageable end def triage_into(column) - raise "The column must belong to the card collection" unless collection == column.collection + raise "The column must belong to the card board" unless board == column.board transaction do resume diff --git a/app/models/collection/broadcastable.rb b/app/models/collection/broadcastable.rb deleted file mode 100644 index e44adc0ac..000000000 --- a/app/models/collection/broadcastable.rb +++ /dev/null @@ -1,8 +0,0 @@ -module Collection::Broadcastable - extend ActiveSupport::Concern - - included do - broadcasts_refreshes - broadcasts_refreshes_to ->(_) { :all_collections } - end -end diff --git a/app/models/collection/publication.rb b/app/models/collection/publication.rb deleted file mode 100644 index fbbc68741..000000000 --- a/app/models/collection/publication.rb +++ /dev/null @@ -1,5 +0,0 @@ -class Collection::Publication < ApplicationRecord - belongs_to :collection - - has_secure_token :key -end diff --git a/app/models/column.rb b/app/models/column.rb index 87772367f..ec5fd6217 100644 --- a/app/models/column.rb +++ b/app/models/column.rb @@ -1,10 +1,10 @@ class Column < ApplicationRecord include Positioned - belongs_to :collection, touch: true + belongs_to :board, touch: true has_many :cards, dependent: :nullify before_validation -> { self.color ||= Card::DEFAULT_COLOR } after_save_commit -> { cards.touch_all }, if: -> { saved_change_to_name? || saved_change_to_color? } - after_destroy_commit -> { collection.cards.touch_all } + after_destroy_commit -> { board.cards.touch_all } end diff --git a/app/models/column/positioned.rb b/app/models/column/positioned.rb index 333882e36..8518172de 100644 --- a/app/models/column/positioned.rb +++ b/app/models/column/positioned.rb @@ -16,11 +16,11 @@ module Column::Positioned end def left_column - collection.columns.where("position < ?", position).sorted.last + board.columns.where("position < ?", position).sorted.last end def right_column - collection.columns.where("position > ?", position).sorted.first + board.columns.where("position > ?", position).sorted.first end def leftmost? @@ -33,7 +33,7 @@ module Column::Positioned private def set_position - max_position = collection.columns.maximum(:position) || 0 + max_position = board.columns.maximum(:position) || 0 self.position = max_position + 1 end diff --git a/app/models/comment.rb b/app/models/comment.rb index 703c3e6a9..4428c8e48 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -14,7 +14,7 @@ class Comment < ApplicationRecord after_create_commit :watch_card_by_creator - delegate :collection, :watch_by, to: :card + delegate :board, :watch_by, to: :card def to_partial_path "cards/#{super}" diff --git a/app/models/comment/eventable.rb b/app/models/comment/eventable.rb index 0b30c0504..7fe7abebb 100644 --- a/app/models/comment/eventable.rb +++ b/app/models/comment/eventable.rb @@ -17,6 +17,6 @@ module Comment::Eventable end def track_creation - track_event("created", collection: card.collection, creator: creator) + track_event("created", board: card.board, creator: creator) end end diff --git a/app/models/concerns/mentions.rb b/app/models/concerns/mentions.rb index fa50de543..055c114fc 100644 --- a/app/models/concerns/mentions.rb +++ b/app/models/concerns/mentions.rb @@ -41,7 +41,7 @@ module Mentions end def mentionable_users - collection.users + board.users end def rich_text_associations diff --git a/app/models/event.rb b/app/models/event.rb index c45702833..ad77d3492 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -1,7 +1,7 @@ class Event < ApplicationRecord include Notifiable, Particulars, Promptable - belongs_to :collection + belongs_to :board belongs_to :creator, class_name: "User" belongs_to :eventable, polymorphic: true diff --git a/app/models/eventable.rb b/app/models/eventable.rb index e14803f09..c5e58cc08 100644 --- a/app/models/eventable.rb +++ b/app/models/eventable.rb @@ -5,9 +5,9 @@ module Eventable has_many :events, as: :eventable, dependent: :destroy end - def track_event(action, creator: Current.user, collection: self.collection, **particulars) + def track_event(action, creator: Current.user, board: self.board, **particulars) if should_track_event? - collection.events.create!(action: "#{eventable_prefix}_#{action}", creator:, collection:, eventable: self, particulars:) + board.events.create!(action: "#{eventable_prefix}_#{action}", creator:, board:, eventable: self, particulars:) end end diff --git a/app/models/filter.rb b/app/models/filter.rb index 903007c9f..459d18621 100644 --- a/app/models/filter.rb +++ b/app/models/filter.rb @@ -27,7 +27,7 @@ class Filter < ApplicationRecord result = result.unassigned if assignment_status.unassigned? result = result.assigned_to(assignees.ids) if assignees.present? result = result.where(creator_id: creators.ids) if creators.present? - result = result.where(collection: collections.ids) if collections.present? + result = result.where(board: boards.ids) if boards.present? result = result.tagged_with(tags.ids) if tags.present? result = result.where("cards.created_at": creation_window) if creation_window result = result.closed_at_window(closure_window) if closure_window @@ -44,16 +44,16 @@ class Filter < ApplicationRecord self.class.normalize_params(as_params).blank? end - def single_collection - collections.first if collections.one? + def single_board + boards.first if boards.one? end def single_workflow - collections.first.workflow if collections.pluck(:workflow_id).uniq.one? + boards.first.workflow if boards.pluck(:workflow_id).uniq.one? end def cacheable? - collections.exists? + boards.exists? end def cache_key diff --git a/app/models/filter/params.rb b/app/models/filter/params.rb index 166436e4b..586a75885 100644 --- a/app/models/filter/params.rb +++ b/app/models/filter/params.rb @@ -11,7 +11,7 @@ module Filter::Params assignee_ids: [], creator_ids: [], closer_ids: [], - collection_ids: [], + board_ids: [], tag_ids: [], terms: [] ] @@ -40,9 +40,9 @@ module Filter::Params before_save { self.params_digest = self.class.digest_params(as_params) } end - def used?(ignore_collections: false) + def used?(ignore_boards: false) tags.any? || assignees.any? || creators.any? || closers.any? || - terms.any? || card_ids&.any? || (!ignore_collections && collections.present?) || + terms.any? || card_ids&.any? || (!ignore_boards && boards.present?) || assignment_status.unassigned? || !indexed_by.all? || !sorted_by.latest? end @@ -57,7 +57,7 @@ module Filter::Params params[:assignment_status] = assignment_status params[:terms] = terms params[:tag_ids] = tags.ids - params[:collection_ids] = collections.ids + params[:board_ids] = boards.ids params[:card_ids] = card_ids params[:assignee_ids] = assignees.ids params[:creator_ids] = creators.ids diff --git a/app/models/filter/resources.rb b/app/models/filter/resources.rb index 3dc777b2f..f7045f38e 100644 --- a/app/models/filter/resources.rb +++ b/app/models/filter/resources.rb @@ -3,7 +3,7 @@ module Filter::Resources included do has_and_belongs_to_many :tags - has_and_belongs_to_many :collections + has_and_belongs_to_many :boards has_and_belongs_to_many :assignees, class_name: "User", join_table: "assignees_filters", association_foreign_key: "assignee_id" has_and_belongs_to_many :creators, class_name: "User", join_table: "creators_filters", association_foreign_key: "creator_id" has_and_belongs_to_many :closers, class_name: "User", join_table: "closers_filters", association_foreign_key: "closer_id" @@ -17,19 +17,19 @@ module Filter::Resources destroy! end - def collections - creator.collections.where id: super.ids + def boards + creator.boards.where id: super.ids end - def collection_titles - if collections.none? - Collection.one? ? [ Collection.first.name ] : [ "all boards" ] + def board_titles + if boards.none? + Board.one? ? [ Board.first.name ] : [ "all boards" ] else - collections.map(&:name) + boards.map(&:name) end end - def collections_label - collection_titles.to_sentence + def boards_label + board_titles.to_sentence end end diff --git a/app/models/notifier/card_event_notifier.rb b/app/models/notifier/card_event_notifier.rb index f6801d7ec..570989566 100644 --- a/app/models/notifier/card_event_notifier.rb +++ b/app/models/notifier/card_event_notifier.rb @@ -1,6 +1,6 @@ class Notifier::CardEventNotifier < Notifier delegate :creator, to: :source - delegate :collection, to: :card + delegate :board, to: :card private def recipients @@ -8,11 +8,11 @@ class Notifier::CardEventNotifier < Notifier when "card_assigned" source.assignees.excluding(creator) when "card_published" - collection.watchers.without(creator, *card.mentionees) + board.watchers.without(creator, *card.mentionees) when "comment_created" card.watchers.without(creator, *source.eventable.mentionees) else - collection.watchers.without(creator) + board.watchers.without(creator) end end diff --git a/app/models/search.rb b/app/models/search.rb index a51e757f6..518462094 100644 --- a/app/models/search.rb +++ b/app/models/search.rb @@ -21,7 +21,7 @@ class Search "highlight(cards_search_index, 0, '#{HIGHLIGHT_OPENING_MARK}', '#{HIGHLIGHT_CLOSING_MARK}') AS card_title", "snippet(cards_search_index, 1, '#{HIGHLIGHT_OPENING_MARK}', '#{HIGHLIGHT_CLOSING_MARK}', '...', 20) AS card_description", "null as comment_body", - "collections.name as collection_name", + "boards.name as board_name", "cards.creator_id", "cards.created_at", "bm25(cards_search_index, 10.0, 2.0) AS score" @@ -34,7 +34,7 @@ class Search "cards.title AS card_title", "null AS card_description", "snippet(comments_search_index, 0, '#{HIGHLIGHT_OPENING_MARK}', '#{HIGHLIGHT_CLOSING_MARK}', '...', 20) AS comment_body", - "collections.name as collection_name", + "boards.name as board_name", "comments.creator_id", "comments.created_at", "bm25(comments_search_index, 1.0) AS score" diff --git a/app/models/user/accessor.rb b/app/models/user/accessor.rb index c538c87a4..a7826b0b4 100644 --- a/app/models/user/accessor.rb +++ b/app/models/user/accessor.rb @@ -3,15 +3,15 @@ module User::Accessor included do has_many :accesses, dependent: :destroy - has_many :collections, through: :accesses - has_many :accessible_cards, through: :collections, source: :cards + has_many :boards, through: :accesses + has_many :accessible_cards, through: :boards, source: :cards has_many :accessible_comments, through: :accessible_cards, source: :comments - after_create_commit :grant_access_to_collections, unless: :system? + after_create_commit :grant_access_to_boards, unless: :system? end private - def grant_access_to_collections - Access.insert_all Collection.all_access.pluck(:id).collect { |collection_id| { collection_id: collection_id, user_id: id } } + def grant_access_to_boards + Access.insert_all Board.all_access.pluck(:id).collect { |board_id| { board_id: board_id, user_id: id } } end end diff --git a/app/models/user/day_timeline.rb b/app/models/user/day_timeline.rb index ec3d53760..367eccdcb 100644 --- a/app/models/user/day_timeline.rb +++ b/app/models/user/day_timeline.rb @@ -41,6 +41,7 @@ class User::DayTimeline card_closed card_reopened card_collection_changed + card_board_changed card_postponed card_triaged card_sent_back_to_triage @@ -57,12 +58,12 @@ class User::DayTimeline def timelineable_events Event - .where(collection: collections) + .where(board: boards) .where(action: TIMELINEABLE_ACTIONS) end - def collections - filter.collections.presence || user.collections + def boards + filter.boards.presence || user.boards end def latest_event_before diff --git a/app/models/user/filtering.rb b/app/models/user/filtering.rb index fdc7f2bcb..4ac9cf86a 100644 --- a/app/models/user/filtering.rb +++ b/app/models/user/filtering.rb @@ -1,23 +1,23 @@ class User::Filtering attr_reader :user, :filter, :expanded - delegate :as_params, :single_collection, to: :filter + delegate :as_params, :single_board, to: :filter delegate :only_closed?, to: :filter def initialize(user, filter, expanded: false) @user, @filter, @expanded = user, filter, expanded end - def collections - @collections ||= user.collections.ordered_by_recently_accessed + def boards + @boards ||= user.boards.ordered_by_recently_accessed end - def selected_collection_titles - filter.collection_titles + def selected_board_titles + filter.board_titles end - def selected_collections_label - filter.collections_label + def selected_boards_label + filter.boards_label end def tags @@ -37,7 +37,7 @@ class User::Filtering end def any? - filter.used?(ignore_collections: true) + filter.used?(ignore_boards: true) end def show_indexed_by? @@ -65,16 +65,16 @@ class User::Filtering filter.closers.any? end - def show_collections? - filter.collections.any? + def show_boards? + filter.boards.any? end - def single_collection_or_first + def single_board_or_first # Default to the first selected or, when no selection, to the first one - filter.collections.first || collections.first + filter.boards.first || boards.first end def cache_key - ActiveSupport::Cache.expand_cache_key([ user, filter, expanded?, collections, tags, users, filters ], "user-filtering") + ActiveSupport::Cache.expand_cache_key([ user, filter, expanded?, boards, tags, users, filters ], "user-filtering") end end diff --git a/app/models/user/role.rb b/app/models/user/role.rb index aaa4bd5ff..a327ffcf6 100644 --- a/app/models/user/role.rb +++ b/app/models/user/role.rb @@ -21,4 +21,12 @@ module User::Role def can_administer?(other = nil) admin? && other != self end + + def can_administer_board?(board) + admin? || board.creator == self + end + + def can_administer_card?(card) + admin? || card.creator == self + end end diff --git a/app/models/user/timelined.rb b/app/models/user/timelined.rb index 1f5f2c8fe..2cd808a44 100644 --- a/app/models/user/timelined.rb +++ b/app/models/user/timelined.rb @@ -2,7 +2,7 @@ module User::Timelined extend ActiveSupport::Concern included do - has_many :accessible_events, through: :collections, source: :events + has_many :accessible_events, through: :boards, source: :events end def timeline_for(day, filter:) diff --git a/app/models/webhook.rb b/app/models/webhook.rb index 1af19cd47..f66cc6942 100644 --- a/app/models/webhook.rb +++ b/app/models/webhook.rb @@ -11,7 +11,7 @@ class Webhook < ApplicationRecord card_closed card_postponed card_auto_postponed - card_collection_changed + card_board_changed card_published card_reopened card_sent_back_to_triage @@ -25,7 +25,7 @@ class Webhook < ApplicationRecord has_many :deliveries, dependent: :delete_all has_one :delinquency_tracker, dependent: :delete - belongs_to :collection + belongs_to :board serialize :subscribed_actions, type: Array, coder: JSON diff --git a/app/models/webhook/triggerable.rb b/app/models/webhook/triggerable.rb index a2f5ea186..443c801fd 100644 --- a/app/models/webhook/triggerable.rb +++ b/app/models/webhook/triggerable.rb @@ -2,7 +2,7 @@ module Webhook::Triggerable extend ActiveSupport::Concern included do - scope :triggered_by, ->(event) { where(collection: event.collection).triggered_by_action(event.action) } + scope :triggered_by, ->(event) { where(board: event.board).triggered_by_action(event.action) } scope :triggered_by_action, ->(action) { where("subscribed_actions LIKE ?", "%\"#{action}\"%") } end diff --git a/app/views/collections/_access_toggle.erb b/app/views/boards/_access_toggle.erb similarity index 86% rename from app/views/collections/_access_toggle.erb rename to app/views/boards/_access_toggle.erb index 829efa05e..6d9541f3a 100644 --- a/app/views/collections/_access_toggle.erb +++ b/app/views/boards/_access_toggle.erb @@ -13,8 +13,8 @@ diff --git a/app/views/boards/_board.json.jbuilder b/app/views/boards/_board.json.jbuilder new file mode 100644 index 000000000..ce2ef0451 --- /dev/null +++ b/app/views/boards/_board.json.jbuilder @@ -0,0 +1,8 @@ +json.cache! board do + json.(board, :id, :name, :all_access) + json.created_at board.created_at.utc + + json.creator do + json.partial! "users/user", user: board.creator + end +end diff --git a/app/views/collections/columns/_list.html.erb b/app/views/boards/columns/_list.html.erb similarity index 100% rename from app/views/collections/columns/_list.html.erb rename to app/views/boards/columns/_list.html.erb diff --git a/app/views/collections/columns/closeds/show.html.erb b/app/views/boards/columns/closeds/show.html.erb similarity index 74% rename from app/views/collections/columns/closeds/show.html.erb rename to app/views/boards/columns/closeds/show.html.erb index 853e02087..9aeb21044 100644 --- a/app/views/collections/columns/closeds/show.html.erb +++ b/app/views/boards/columns/closeds/show.html.erb @@ -2,10 +2,10 @@ <% content_for :header do %>
- <%= link_to @collection, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> + <%= link_to @board, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> ← - <%= @collection.name %> + <%= @board.name %> <% end %>
@@ -19,7 +19,7 @@ <%= turbo_frame_tag :closed_column do %> <% if @page.used? %> <%= with_automatic_pagination :closed_column, @page do %> - <%= render "collections/columns/list", cards: @page.records, draggable: true %> + <%= render "boards/columns/list", cards: @page.records, draggable: true %> <% end %> <% else %>
diff --git a/app/views/boards/columns/create.turbo_stream.erb b/app/views/boards/columns/create.turbo_stream.erb new file mode 100644 index 000000000..957547c09 --- /dev/null +++ b/app/views/boards/columns/create.turbo_stream.erb @@ -0,0 +1 @@ +<%= turbo_stream.before("closed-cards", partial: "boards/show/column", method: :morph, locals: { column: @column }) %> diff --git a/app/views/collections/columns/destroy.turbo_stream.erb b/app/views/boards/columns/destroy.turbo_stream.erb similarity index 100% rename from app/views/collections/columns/destroy.turbo_stream.erb rename to app/views/boards/columns/destroy.turbo_stream.erb diff --git a/app/views/collections/columns/not_nows/show.html.erb b/app/views/boards/columns/not_nows/show.html.erb similarity index 74% rename from app/views/collections/columns/not_nows/show.html.erb rename to app/views/boards/columns/not_nows/show.html.erb index 4b0bed5e7..4bd6a0524 100644 --- a/app/views/collections/columns/not_nows/show.html.erb +++ b/app/views/boards/columns/not_nows/show.html.erb @@ -2,10 +2,10 @@ <% content_for :header do %>
- <%= link_to @collection, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> + <%= link_to @board, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> ← - <%= @collection.name %> + <%= @board.name %> <% end %>
@@ -19,7 +19,7 @@ <%= turbo_frame_tag :not_now_column do %> <% if @page.used? %> <%= with_automatic_pagination :not_now_column, @page do %> - <%= render "collections/columns/list", cards: @page.records, draggable: true %> + <%= render "boards/columns/list", cards: @page.records, draggable: true %> <% end %> <% else %>
diff --git a/app/views/collections/columns/show.html.erb b/app/views/boards/columns/show.html.erb similarity index 74% rename from app/views/collections/columns/show.html.erb rename to app/views/boards/columns/show.html.erb index 989965939..4c29f5099 100644 --- a/app/views/collections/columns/show.html.erb +++ b/app/views/boards/columns/show.html.erb @@ -2,10 +2,10 @@ <% content_for :header do %>
- <%= link_to @column.collection, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> + <%= link_to @column.board, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> ← - <%= @column.collection.name %> + <%= @column.board.name %> <% end %>
@@ -19,7 +19,7 @@ <%= turbo_frame_tag dom_id(@column, :cards) do %> <% if @page.used? %> <%= with_automatic_pagination dom_id(@column, :cards), @page do %> - <%= render "collections/columns/list", cards: @page.records, draggable: true %> + <%= render "boards/columns/list", cards: @page.records, draggable: true %> <% end %> <% else %>
diff --git a/app/views/collections/columns/streams/show.html.erb b/app/views/boards/columns/streams/show.html.erb similarity index 72% rename from app/views/collections/columns/streams/show.html.erb rename to app/views/boards/columns/streams/show.html.erb index 0be3bdde1..59e929464 100644 --- a/app/views/collections/columns/streams/show.html.erb +++ b/app/views/boards/columns/streams/show.html.erb @@ -2,10 +2,10 @@ <% content_for :header do %>
- <%= link_to @collection, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> + <%= link_to @board, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> ← - <%= @collection.name %> + <%= @board.name %> <% end %>
@@ -19,7 +19,7 @@ <%= turbo_frame_tag :stream_column do %> <% if @page.used? %> <%= with_automatic_pagination :stream_column, @page do %> - <%= render "collections/columns/list", cards: @page.records, draggable: true %> + <%= render "boards/columns/list", cards: @page.records, draggable: true %> <% end %> <% else %>
diff --git a/app/views/boards/columns/update.turbo_stream.erb b/app/views/boards/columns/update.turbo_stream.erb new file mode 100644 index 000000000..88cd716d1 --- /dev/null +++ b/app/views/boards/columns/update.turbo_stream.erb @@ -0,0 +1 @@ +<%= turbo_stream.replace(dom_id(@column), partial: "boards/show/column", method: :morph, locals: { column: @column }) %> diff --git a/app/views/boards/edit.html.erb b/app/views/boards/edit.html.erb new file mode 100644 index 000000000..206bc5ed5 --- /dev/null +++ b/app/views/boards/edit.html.erb @@ -0,0 +1,38 @@ +<% @page_title = "Board Settings" %> + +<% content_for :header do %> +
+ <%= link_to @board, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> + + ← + <%= @board.name %> + + <% end %> +
+ +

<%= @page_title %>

+<% end %> + +
+
+ <%= form_with model: @board, class: "display-contents", data: { + controller: "form boards-form", + boards_form_self_removal_prompt_message_value: "Are you sure you want to remove yourself from this board? You won’t be able to get back in unless someone invites you.", + action: "turbo:submit-start->boards-form#submitWithWarning" } do |form| %> + <%= render "boards/edit/name", form: form %> + <%= render "boards/edit/users", board: @board, selected_users: @selected_users, unselected_users: @unselected_users, form: form %> + + + + <%= link_to "Cancel and go back", @board, data: { form_target: "cancel", turbo_frame: "_top" }, hidden: true %> + <% end %> +
+ +
+ <%= render "boards/edit/auto_close", board: @board %> + <%= render "boards/edit/publication", board: @board %> + <%= render "boards/edit/delete", board: @board %> +
+
diff --git a/app/views/collections/edit/_auto_close.html.erb b/app/views/boards/edit/_auto_close.html.erb similarity index 66% rename from app/views/collections/edit/_auto_close.html.erb rename to app/views/boards/edit/_auto_close.html.erb index e7e135d8d..d903ddacd 100644 --- a/app/views/collections/edit/_auto_close.html.erb +++ b/app/views/boards/edit/_auto_close.html.erb @@ -1,7 +1,7 @@ -<%= turbo_frame_tag @collection, :entropy do %> +<%= turbo_frame_tag @board, :entropy do %>

Auto close

Fizzy doesn’t let stale cards stick around forever. Cards automatically close as “Not now” if no one updates, comments, or moves a card for…

- <%= render "entropy/auto_close", model: collection, url: collection_entropy_path(collection) %> + <%= render "entropy/auto_close", model: board, url: board_entropy_path(board) %>
<% end %> diff --git a/app/views/collections/edit/_delete.html.erb b/app/views/boards/edit/_delete.html.erb similarity index 68% rename from app/views/collections/edit/_delete.html.erb rename to app/views/boards/edit/_delete.html.erb index 627bfd1bd..7da3ee6c8 100644 --- a/app/views/collections/edit/_delete.html.erb +++ b/app/views/boards/edit/_delete.html.erb @@ -1,4 +1,4 @@ -<%= form_with model: collection, class: "txt-align-center margin-block-start-auto", method: :delete do |form| %> +<%= form_with model: board, 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 board?" } do %> <%= icon_tag "trash" %> Delete this board diff --git a/app/views/collections/edit/_knob.html.erb b/app/views/boards/edit/_knob.html.erb similarity index 100% rename from app/views/collections/edit/_knob.html.erb rename to app/views/boards/edit/_knob.html.erb diff --git a/app/views/collections/edit/_name.html.erb b/app/views/boards/edit/_name.html.erb similarity index 71% rename from app/views/collections/edit/_name.html.erb rename to app/views/boards/edit/_name.html.erb index 1ff825380..e238a838e 100644 --- a/app/views/collections/edit/_name.html.erb +++ b/app/views/boards/edit/_name.html.erb @@ -1,6 +1,6 @@
diff --git a/app/views/collections/edit/_publication.html.erb b/app/views/boards/edit/_publication.html.erb similarity index 75% rename from app/views/collections/edit/_publication.html.erb rename to app/views/boards/edit/_publication.html.erb index 0673bd043..68902e19e 100644 --- a/app/views/collections/edit/_publication.html.erb +++ b/app/views/boards/edit/_publication.html.erb @@ -1,15 +1,15 @@ -<%= turbo_frame_tag @collection, :publication do %> +<%= turbo_frame_tag @board, :publication do %>

Public link

Turn on the Public link to share this board with anyone in the world. They won’t need to log in and they won’t be able to see anything else in Fizzy.
- <% if collection.published? %> + <% if board.published? %>
<%= icon_tag "lock" %>
- <%= text_field_tag :publication_url, published_collection_url(collection), readonly: true, class: "full-width input fill-white" %> + <%= text_field_tag :publication_url, published_board_url(board), readonly: true, class: "full-width input fill-white" %>
- <%= button_to_copy_to_clipboard(published_collection_url(collection)) do %> + <%= button_to_copy_to_clipboard(published_board_url(board)) do %> <%= icon_tag "copy-paste" %> Copy public link <% end %> @@ -29,9 +29,9 @@
Add an optional description to the public page
- <%= form_with model: collection, class: "txt-align-start", data: { controller: "form", turbo_frame: "_top" } do |form| %> + <%= form_with model: board, class: "txt-align-start", data: { controller: "form", turbo_frame: "_top" } do |form| %> <%= form.rich_textarea :public_description, class: "rich-text-content txt-small", - placeholder: "Add a public note about this collection…", + placeholder: "Add a public note about this board…", data: { action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop" } %> <%= form.button "Save changes", type: :submit, class: "btn txt-small" %> <% end %> @@ -42,7 +42,7 @@
<%= icon_tag "lock" %>
    - <%= access_toggles_for selected_users, selected: true %> - <%= access_toggles_for unselected_users, selected: false %> + <%= access_toggles_for selected_users, selected: true, disabled: !Current.user.can_administer_board?(board) %> + <%= access_toggles_for unselected_users, selected: false, disabled: !Current.user.can_administer_board?(board) %>
<% end %> diff --git a/app/views/boards/entropies/update.turbo_stream.erb b/app/views/boards/entropies/update.turbo_stream.erb new file mode 100644 index 000000000..ad6fc204a --- /dev/null +++ b/app/views/boards/entropies/update.turbo_stream.erb @@ -0,0 +1,2 @@ +<%= turbo_stream.replace([ @board, :entropy ], partial: "boards/edit/auto_close", locals:{ board: @board }) %> +<%= turbo_stream_flash(notice: "Saved") %> diff --git a/app/views/boards/involvements/update.html.erb b/app/views/boards/involvements/update.html.erb new file mode 100644 index 000000000..9ebd0cdf7 --- /dev/null +++ b/app/views/boards/involvements/update.html.erb @@ -0,0 +1 @@ +<%= access_involvement_advance_button(@board, Current.user, show_watchers: params[:show_watchers] == "true", icon_only: params[:icon_only] == "true") %> diff --git a/app/views/collections/new.html.erb b/app/views/boards/new.html.erb similarity index 85% rename from app/views/collections/new.html.erb rename to app/views/boards/new.html.erb index 05ffb3b8c..57c809b17 100644 --- a/app/views/collections/new.html.erb +++ b/app/views/boards/new.html.erb @@ -1,7 +1,7 @@ <% @page_title = "Create a new board" %>
- <%= form_with model: @collection, class: "flex flex-column gap", data: { controller: "form" } do |form| %> + <%= form_with model: @board, class: "flex flex-column gap", data: { controller: "form" } do |form| %>

<%= @page_title %>

<%= form.text_field :name, required: true, class: "input full-width", autofocus: true, autocomplete: "off",placeholder: "Name it…", data: { action: "keydown.esc@document->form#cancel" } %> diff --git a/app/views/boards/publications/create.turbo_stream.erb b/app/views/boards/publications/create.turbo_stream.erb new file mode 100644 index 000000000..01e60d4c4 --- /dev/null +++ b/app/views/boards/publications/create.turbo_stream.erb @@ -0,0 +1,2 @@ +<%= turbo_stream.replace([ @board, :publication ], partial: "boards/edit/publication", locals:{ board: @board }) %> +<%= turbo_stream_flash(notice: "Saved") %> diff --git a/app/views/boards/publications/destroy.turbo_stream.erb b/app/views/boards/publications/destroy.turbo_stream.erb new file mode 100644 index 000000000..01e60d4c4 --- /dev/null +++ b/app/views/boards/publications/destroy.turbo_stream.erb @@ -0,0 +1,2 @@ +<%= turbo_stream.replace([ @board, :publication ], partial: "boards/edit/publication", locals:{ board: @board }) %> +<%= turbo_stream_flash(notice: "Saved") %> diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb new file mode 100644 index 000000000..bd3266ac3 --- /dev/null +++ b/app/views/boards/show.html.erb @@ -0,0 +1,30 @@ +<% @page_title = @board.name %> +<% turbo_exempts_page_from_cache %> + +<%= turbo_stream_from @board %> + +<% content_for :header do %> +
+ <%= link_to_webhooks(@board) if Current.user.admin? %> +
+ +

+ <%= @board.name %> +

+ +
+ <%= link_to_edit_board @board %> +
+<% end %> + +<%= render "filters/settings", filter_url: board_path(@board), user_filtering: @user_filtering, no_filtering_url: board_path(@board) do |form| %> + <%= hidden_field_tag "board_ids[]", @board.id %> +<% end %> + +<%= turbo_frame_tag :cards_container do %> + <% if @filter.used?(ignore_boards: true) %> + <%= render "boards/show/filtered_cards", page: @page %> + <% else %> + <%= render "boards/show/columns", page: @page, board: @board %> + <% end %> +<% end %> diff --git a/app/views/collections/show/_closed.html.erb b/app/views/boards/show/_closed.html.erb similarity index 56% rename from app/views/collections/show/_closed.html.erb rename to app/views/boards/show/_closed.html.erb index 383bba6db..0b1d8c863 100644 --- a/app/views/collections/show/_closed.html.erb +++ b/app/views/boards/show/_closed.html.erb @@ -6,9 +6,9 @@ data-drag-and-drop-url="<%= columns_card_drops_closure_path("__id__") %>" > - <%= render "collections/show/expander", title: "Done", count: collection.cards.closed.count, column_id: "closed-cards" do %> - <%= render "collections/show/menu/expand", column_path: collection_columns_closed_path(collection) %> + <%= render "boards/show/expander", title: "Done", count: board.cards.closed.count, column_id: "closed-cards" do %> + <%= render "boards/show/menu/expand", column_path: board_columns_closed_path(board) %> <% end %> - <%= column_frame_tag :closed_column, src: collection_columns_closed_path(collection) %> + <%= column_frame_tag :closed_column, src: board_columns_closed_path(board) %> diff --git a/app/views/collections/show/_column.html.erb b/app/views/boards/show/_column.html.erb similarity index 58% rename from app/views/collections/show/_column.html.erb rename to app/views/boards/show/_column.html.erb index 3a6084b0c..7630ce3fe 100644 --- a/app/views/collections/show/_column.html.erb +++ b/app/views/boards/show/_column.html.erb @@ -7,14 +7,14 @@ data-action="turbo:before-morph-attribute->collapsible-columns#preventToggle turbo:before-stream-render@document->collapsible-columns#restoreState" data-drag-and-drop-url="<%= columns_card_drops_column_path("__id__", column_id: column.id) %>" > - <%= render "collections/show/expander", title: column.name, count: column.cards.active.count, column_id: dom_id(column) do %> - <%= render "collections/show/menu/column", column: column %> + <%= render "boards/show/expander", title: column.name, count: column.cards.active.count, column_id: dom_id(column) do %> + <%= render "boards/show/menu/column", column: column %> <% end %> - <%= link_to collection_column_path(column.collection, column), class: "cards__expander-button btn btn--circle txt-x-small borderless", data: { turbo_frame: "_top" } do %> + <%= link_to board_column_path(column.board, column), class: "cards__expander-button btn btn--circle txt-x-small borderless", data: { turbo_frame: "_top" } do %> <%= icon_tag "expand", class: "translucent" %> Expand column <% end %> - <%= column_frame_tag dom_id(column, :cards), src: collection_column_path(column.collection, column) %> + <%= column_frame_tag dom_id(column, :cards), src: board_column_path(column.board, column) %> diff --git a/app/views/boards/show/_columns.html.erb b/app/views/boards/show/_columns.html.erb new file mode 100644 index 000000000..a2a406aff --- /dev/null +++ b/app/views/boards/show/_columns.html.erb @@ -0,0 +1,26 @@ +<%= tag.div data: { + controller: "drag-and-drop drag-and-strum", + drag_and_drop_dragged_item_class: "drag-and-drop__dragged-item", + drag_and_drop_hover_container_class: "drag-and-drop__hover-container", + action: " + dragstart->drag-and-drop#dragStart + dragover->drag-and-drop#dragOver + dragenter->drag-and-strum#dragEnter + drop->drag-and-drop#drop + dragend->drag-and-drop#dragEnd" } do %> +
+
+ <%= render "boards/show/not_now", board: board %> +
+ + <%= render "boards/show/stream", board: board, page: page %> + +
+ <%= render partial: "boards/show/column", collection: board.columns.sorted, cached: ->(column){ [ column, column.leftmost?, column.rightmost? ] } %> + <%= render "boards/show/closed", board: board %> + + <%= render "boards/show/menu/columns", board: board %> +
+
+<% end %> + diff --git a/app/views/collections/show/_expander.html.erb b/app/views/boards/show/_expander.html.erb similarity index 100% rename from app/views/collections/show/_expander.html.erb rename to app/views/boards/show/_expander.html.erb diff --git a/app/views/collections/show/_filtered_cards.html.erb b/app/views/boards/show/_filtered_cards.html.erb similarity index 100% rename from app/views/collections/show/_filtered_cards.html.erb rename to app/views/boards/show/_filtered_cards.html.erb diff --git a/app/views/collections/show/_not_now.html.erb b/app/views/boards/show/_not_now.html.erb similarity index 56% rename from app/views/collections/show/_not_now.html.erb rename to app/views/boards/show/_not_now.html.erb index c99b9b3af..cdb40fe79 100644 --- a/app/views/collections/show/_not_now.html.erb +++ b/app/views/boards/show/_not_now.html.erb @@ -6,9 +6,9 @@ data-drag-and-drop-url="<%= columns_card_drops_not_now_path("__id__") %>" > - <%= render "collections/show/expander", title: "Not Now", count: collection.cards.postponed.count, column_id: "not-now" do %> - <%= render "collections/show/menu/expand", column_path: collection_columns_not_now_path(collection) %> + <%= render "boards/show/expander", title: "Not Now", count: board.cards.postponed.count, column_id: "not-now" do %> + <%= render "boards/show/menu/expand", column_path: board_columns_not_now_path(board) %> <% end %> - <%= column_frame_tag :not_now_column, src: collection_columns_not_now_path(collection) %> + <%= column_frame_tag :not_now_column, src: board_columns_not_now_path(board) %> diff --git a/app/views/collections/show/_stream.html.erb b/app/views/boards/show/_stream.html.erb similarity index 65% rename from app/views/collections/show/_stream.html.erb rename to app/views/boards/show/_stream.html.erb index a1985a3f2..f8b9cd81f 100644 --- a/app/views/collections/show/_stream.html.erb +++ b/app/views/boards/show/_stream.html.erb @@ -4,17 +4,17 @@ data-drag-and-drop-url="<%= columns_card_drops_stream_path("__id__") %>">

Maybe?

- <%= link_to collection_columns_stream_path(collection), class: "cards__expander-button btn btn--circle txt-x-small borderless", data: { turbo_frame: "_top" } do %> + <%= link_to board_columns_stream_path(board), class: "cards__expander-button btn btn--circle txt-x-small borderless", data: { turbo_frame: "_top" } do %> <%= icon_tag "expand", class: "translucent" %> Expand column <% end %>
- <%= render "columns/show/add_card_button", collection: collection %> + <%= render "columns/show/add_card_button", board: board %> <% if page.used? %> <%= with_automatic_pagination "the-stream", @page do %> - <%= render "collections/columns/list", cards: page.records, draggable: true %> + <%= render "boards/columns/list", cards: page.records, draggable: true %> <% end %> <% end %> diff --git a/app/views/collections/show/menu/_column.html.erb b/app/views/boards/show/menu/_column.html.erb similarity index 92% rename from app/views/collections/show/menu/_column.html.erb rename to app/views/boards/show/menu/_column.html.erb index 25c6085a4..52637cce4 100644 --- a/app/views/collections/show/menu/_column.html.erb +++ b/app/views/boards/show/menu/_column.html.erb @@ -33,7 +33,7 @@
  • - <%= button_to collection_column_path(column.collection, column), + <%= button_to board_column_path(column.board, column), method: :delete, class: "popup__btn btn txt-negative", form_class: "display-contents", @@ -48,7 +48,7 @@
    - <%= render "collections/show/menu/column_form", collection: column.collection, column: column, label: "Save changes" %> + <%= render "boards/show/menu/column_form", board: column.board, column: column, label: "Save changes" %>
    • diff --git a/app/views/collections/show/menu/_column_form.html.erb b/app/views/boards/show/menu/_column_form.html.erb similarity index 83% rename from app/views/collections/show/menu/_column_form.html.erb rename to app/views/boards/show/menu/_column_form.html.erb index 7b7ee4c44..b42549d3c 100644 --- a/app/views/collections/show/menu/_column_form.html.erb +++ b/app/views/boards/show/menu/_column_form.html.erb @@ -1,4 +1,4 @@ -<%= form_with model: [collection, column], data: { controller: "form", action: "turbo:submit-end->dialog#close turbo:submit-end->form#reset" } do |form| %> +<%= form_with model: [board, column], data: { controller: "form", action: "turbo:submit-end->dialog#close turbo:submit-end->form#reset" } do |form| %> <%= form.text_field :name, class: "input", placeholder: "Name this column", value: column.name, required: true, autocomplete: "off", pattern: ".*\\S.*", title: "Column name cannot be blank", data: { action: "focus->form#select" } %> diff --git a/app/views/collections/show/menu/_columns.html.erb b/app/views/boards/show/menu/_columns.html.erb similarity index 81% rename from app/views/collections/show/menu/_columns.html.erb rename to app/views/boards/show/menu/_columns.html.erb index a02b23742..6d0ab0c90 100644 --- a/app/views/collections/show/menu/_columns.html.erb +++ b/app/views/boards/show/menu/_columns.html.erb @@ -3,6 +3,6 @@ <%= icon_tag "add", class: "translucent" %> - <%= render "collections/show/menu/column_form", collection: collection, column: Column.new, label: "Add column" %> + <%= render "boards/show/menu/column_form", board: board, column: Column.new, label: "Add column" %>
    diff --git a/app/views/collections/show/menu/_expand.html.erb b/app/views/boards/show/menu/_expand.html.erb similarity index 100% rename from app/views/collections/show/menu/_expand.html.erb rename to app/views/boards/show/menu/_expand.html.erb diff --git a/app/views/cards/_broadcasts.html.erb b/app/views/cards/_broadcasts.html.erb index e3a285f05..87c21e05d 100644 --- a/app/views/cards/_broadcasts.html.erb +++ b/app/views/cards/_broadcasts.html.erb @@ -1,7 +1,7 @@ -<% if filter.collections.any? %> - <% filter.collections.each do |collection| %> - <%= turbo_stream_from collection %> +<% if filter.boards.any? %> + <% filter.boards.each do |board| %> + <%= turbo_stream_from board %> <% end %> <% else %> - <%= turbo_stream_from :all_collections %> + <%= turbo_stream_from :all_boards %> <% end %> diff --git a/app/views/cards/_card.json.jbuilder b/app/views/cards/_card.json.jbuilder index 8bb61330c..1fa339328 100644 --- a/app/views/cards/_card.json.jbuilder +++ b/app/views/cards/_card.json.jbuilder @@ -8,8 +8,8 @@ json.cache! [ card, card.column&.color ] do json.url card_url(card) - json.collection do - json.partial! "collections/collection", locals: { collection: card.collection } + json.board do + json.partial! "boards/board", locals: { board: card.board } end json.column do diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb index 935bd05ec..821211be9 100644 --- a/app/views/cards/_container.html.erb +++ b/app/views/cards/_container.html.erb @@ -8,7 +8,7 @@
    <%= card_article_tag card, class: "card" do %>
    - <%= render "cards/display/perma/collection", card: card %> + <%= render "cards/display/perma/board", card: card %> <%= render "cards/display/perma/tags", card: card %>
    diff --git a/app/views/cards/_messages.html.erb b/app/views/cards/_messages.html.erb index 144be94cc..c92c94f7c 100644 --- a/app/views/cards/_messages.html.erb +++ b/app/views/cards/_messages.html.erb @@ -6,8 +6,10 @@ <%= render "cards/comments/watchers", card: card %> <% end %> -
    -
    - <%= button_to_delete_card(@card) %> -
    + <% if Current.user.can_administer_card?(card) %> +
    +
    + <%= button_to_delete_card(card) %> +
    + <% end %> <% end %> diff --git a/app/views/cards/collections/edit.html.erb b/app/views/cards/boards/edit.html.erb similarity index 77% rename from app/views/cards/collections/edit.html.erb rename to app/views/cards/boards/edit.html.erb index 9a9ef4130..265dc0a9e 100644 --- a/app/views/cards/collections/edit.html.erb +++ b/app/views/cards/boards/edit.html.erb @@ -1,4 +1,4 @@ -<%= turbo_frame_tag "collection_picker" do %> +<%= turbo_frame_tag "board_picker" do %> <%= tag.div class: "max-width full-width", data: { action: "turbo:before-cache@document->dialog#close dialog:show@document->navigable-list#reset keydown->navigable-list#navigate filter:changed->navigable-list#reset", controller: "filter navigable-list", @@ -11,12 +11,12 @@ type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %>
      - <% @collections.each do |collection| %> -
    • - <%= button_to card_collection_path(@card, params: { collection_id: collection.id }), method: :patch, + <% @boards.each do |board| %> +
    • + <%= button_to card_board_path(@card, params: { board_id: board.id }), method: :patch, class: "popup__btn btn", form_class: "max-width flex-item-grow" do %> - <%= collection.name %> + <%= board.name %> <%= icon_tag "check", size: 18, class: "checked flex-item-no-shrink flex-item-justify-end", style: "--icon-size: 1em" %> <% end %>
      • diff --git a/app/views/cards/comments/_new.html.erb b/app/views/cards/comments/_new.html.erb index e2b51ffe3..ca5e731b8 100644 --- a/app/views/cards/comments/_new.html.erb +++ b/app/views/cards/comments/_new.html.erb @@ -11,7 +11,7 @@ action: "turbo:submit-end->local-save#submit keydown.ctrl+enter->form#debouncedSubmit:prevent keydown.meta+enter->form#debouncedSubmit:prevent keydown.esc->form#cancel:stop" } do |form| %> <%= form.rich_textarea :body, required: true, placeholder: new_comment_placeholder(card), data: { local_save_target: "input", action: "lexxy:change->form#disableSubmitWhenInvalid lexxy:change->local-save#save turbo:morph-element->local-save#restoreContent" } do %> - <%= general_prompts(@card.collection) %> + <%= general_prompts(@card.board) %> <% end %> <%= form.button class: "comment__submit btn btn--reversed flex-item-justify-start", data: { form_target: "submit" }, disabled: true do %> Post this comment diff --git a/app/views/cards/comments/edit.html.erb b/app/views/cards/comments/edit.html.erb index cb3011a37..731046f50 100644 --- a/app/views/cards/comments/edit.html.erb +++ b/app/views/cards/comments/edit.html.erb @@ -9,7 +9,7 @@ <%= form_with model: [ @card, @comment ], class: "flex flex-column gap full-width", data: { controller: "form", action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop" } do |form| %> <%= form.rich_textarea :body, required: true, autofocus: true, placeholder: new_comment_placeholder(@card) do %> - <%= general_prompts(@card.collection) %> + <%= general_prompts(@card.board) %> <% end %>
      <%= form.button class: "btn btn--reversed", type: :submit do %> diff --git a/app/views/cards/container/_title.html.erb b/app/views/cards/container/_title.html.erb index e4c7ec15e..ee18dec9f 100644 --- a/app/views/cards/container/_title.html.erb +++ b/app/views/cards/container/_title.html.erb @@ -22,7 +22,7 @@ <%= form.rich_textarea :description, class: "card-field__description rich-text-content", placeholder: "Add some notes, context, pictures, or video about this…", data: { action: "lexxy:change->auto-save#change focusout->auto-save#submit" } do %> - <%= general_prompts(card.collection) %> + <%= general_prompts(card.board) %> <% end %> <% end %> <% end %> diff --git a/app/views/cards/display/_preview.html.erb b/app/views/cards/display/_preview.html.erb index 85497dba5..5f6d37eb1 100644 --- a/app/views/cards/display/_preview.html.erb +++ b/app/views/cards/display/_preview.html.erb @@ -3,7 +3,7 @@ <%= card_article_tag card, class: "card", draggable: draggable, data: { id: card.id, drag_and_drop_target: "item" } do %>
      - <%= render "cards/display/preview/collection", card: card %> + <%= render "cards/display/preview/board", card: card %> <%= render "cards/display/preview/tags", card: card %> <%= render "cards/display/preview/steps", card: card %> <%= icon_tag "attachment", class: "card__attachments-indicator translucent" if card.has_attachments? %> diff --git a/app/views/cards/display/_public_preview.html.erb b/app/views/cards/display/_public_preview.html.erb index f3e534008..d3b36e229 100644 --- a/app/views/cards/display/_public_preview.html.erb +++ b/app/views/cards/display/_public_preview.html.erb @@ -1,13 +1,13 @@ <%= card_article_tag card, class: "card" do %>
      -
      +
      Card number <%= card.id %> - - <%= card.collection.name %> + + <%= card.board.name %>
      @@ -37,6 +37,6 @@ <% if card.entropic? %> <%= render "cards/display/preview/bubble", card: card %> - + <% end %> <% end %> diff --git a/app/views/cards/display/common/_collection.html.erb b/app/views/cards/display/common/_board.html.erb similarity index 50% rename from app/views/cards/display/common/_collection.html.erb rename to app/views/cards/display/common/_board.html.erb index ef1fe3a5e..96c2e191d 100644 --- a/app/views/cards/display/common/_collection.html.erb +++ b/app/views/cards/display/common/_board.html.erb @@ -1,10 +1,10 @@ -
      <% unless @webhook.active? %>
      - <%= button_to "Reactivate", collection_webhook_activation_path(@webhook), method: :post %> + <%= button_to "Reactivate", board_webhook_activation_path(@webhook), method: :post %>
      <% end %> diff --git a/config/routes.rb b/config/routes.rb index af7b9c383..0ac566f2b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -17,8 +17,8 @@ Rails.application.routes.draw do resource :landing - resources :collections do - scope module: :collections do + resources :boards do + scope module: :boards do resource :subscriptions resource :involvement resource :publication @@ -75,7 +75,7 @@ Rails.application.routes.draw do resource :publish resource :reading resource :watch - resource :collection + resource :board resource :column resources :assignments @@ -88,8 +88,10 @@ Rails.application.routes.draw do end end - # Redirect old card URLs from /collections/:collection_id/cards/:id to /cards/:id + # Support for legacy URLs get "/collections/:collection_id/cards/:id", to: redirect { |params, request| "#{request.script_name}/cards/#{params[:id]}" } + get "/collections/:id", to: redirect { |params, request| "#{request.script_name}/boards/#{params[:id]}" } + get "/public/collections/:id", to: redirect { |params, request| "#{request.script_name}/public/boards/#{params[:id]}" } namespace :notifications do resource :settings @@ -169,16 +171,16 @@ Rails.application.routes.draw do resources :users resources :tags - resources :collections do - scope module: :collections do + resources :boards do + scope module: :boards do resources :users end end end namespace :public do - resources :collections do - scope module: :collections do + resources :boards do + scope module: :boards do namespace :columns do resource :not_now, only: :show resource :stream, only: :show @@ -195,12 +197,12 @@ Rails.application.routes.draw do namespace :admin do end - direct :published_collection do |collection, options| - route_for :public_collection, collection.publication.key + direct :published_board do |board, options| + route_for :public_board, board.publication.key end direct :published_card do |card, options| - route_for :public_collection_card, card.collection.publication.key, card + route_for :public_board_card, card.board.publication.key, card end resolve "Comment" do |comment, options| @@ -221,7 +223,7 @@ Rails.application.routes.draw do end resolve "Webhook" do |webhook, options| - route_for :collection_webhook, webhook.collection, webhook, options + route_for :board_webhook, webhook.board, webhook, options end get "up", to: "rails/health#show", as: :rails_health_check diff --git a/db/migrate/20251105122933_rename_collection_to_board.rb b/db/migrate/20251105122933_rename_collection_to_board.rb new file mode 100644 index 000000000..bc9824903 --- /dev/null +++ b/db/migrate/20251105122933_rename_collection_to_board.rb @@ -0,0 +1,21 @@ +class RenameCollectionToBoard < ActiveRecord::Migration[8.2] + def change + # Rename the main collections table to boards + rename_table :collections, :boards + + # Rename collection_publications to board_publications + rename_table :collection_publications, :board_publications + + # Rename the join table + rename_table :collections_filters, :boards_filters + + # Rename collection_id columns to board_id in all tables + rename_column :accesses, :collection_id, :board_id + rename_column :cards, :collection_id, :board_id + rename_column :board_publications, :collection_id, :board_id + rename_column :columns, :collection_id, :board_id + rename_column :events, :collection_id, :board_id + rename_column :webhooks, :collection_id, :board_id + rename_column :boards_filters, :collection_id, :board_id + end +end diff --git a/db/schema.rb b/db/schema.rb index 4c6901d26..fbf5f98df 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,17 +10,17 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[8.2].define(version: 2025_11_03_125353) do +ActiveRecord::Schema[8.2].define(version: 2025_11_05_122933) do create_table "accesses", force: :cascade do |t| t.datetime "accessed_at" - t.integer "collection_id", null: false + t.integer "board_id", null: false t.datetime "created_at", null: false t.string "involvement", default: "access_only", null: false t.datetime "updated_at", null: false t.integer "user_id", null: false t.index ["accessed_at"], name: "index_accesses_on_accessed_at", order: :desc - t.index ["collection_id", "user_id"], name: "index_accesses_on_collection_id_and_user_id", unique: true - t.index ["collection_id"], name: "index_accesses_on_collection_id" + t.index ["board_id", "user_id"], name: "index_accesses_on_board_id_and_user_id", unique: true + t.index ["board_id"], name: "index_accesses_on_board_id" t.index ["user_id"], name: "index_accesses_on_user_id" end @@ -105,6 +105,31 @@ ActiveRecord::Schema[8.2].define(version: 2025_11_03_125353) do t.index ["card_id"], name: "index_assignments_on_card_id" end + create_table "board_publications", force: :cascade do |t| + t.integer "board_id", null: false + t.datetime "created_at", null: false + t.string "key" + t.datetime "updated_at", null: false + t.index ["board_id"], name: "index_board_publications_on_board_id" + t.index ["key"], name: "index_board_publications_on_key", unique: true + end + + create_table "boards", force: :cascade do |t| + t.boolean "all_access", default: false, null: false + t.datetime "created_at", null: false + t.integer "creator_id", null: false + t.string "name", null: false + t.datetime "updated_at", null: false + t.index ["creator_id"], name: "index_boards_on_creator_id" + end + + create_table "boards_filters", id: false, force: :cascade do |t| + t.integer "board_id", null: false + t.integer "filter_id", null: false + t.index ["board_id"], name: "index_boards_filters_on_board_id" + t.index ["filter_id"], name: "index_boards_filters_on_filter_id" + end + create_table "card_activity_spikes", force: :cascade do |t| t.integer "card_id", null: false t.datetime "created_at", null: false @@ -138,7 +163,7 @@ ActiveRecord::Schema[8.2].define(version: 2025_11_03_125353) do end create_table "cards", force: :cascade do |t| - t.integer "collection_id", null: false + t.integer "board_id", null: false t.integer "column_id" t.datetime "created_at", null: false t.integer "creator_id", null: false @@ -147,7 +172,7 @@ ActiveRecord::Schema[8.2].define(version: 2025_11_03_125353) do t.text "status", default: "drafted", null: false t.string "title" t.datetime "updated_at", null: false - t.index ["collection_id"], name: "index_cards_on_collection_id" + t.index ["board_id"], name: "index_cards_on_board_id" t.index ["column_id"], name: "index_cards_on_column_id" t.index ["last_active_at", "status"], name: "index_cards_on_last_active_at_and_status" end @@ -169,40 +194,15 @@ ActiveRecord::Schema[8.2].define(version: 2025_11_03_125353) do t.index ["user_id"], name: "index_closures_on_user_id" end - create_table "collection_publications", force: :cascade do |t| - t.integer "collection_id", null: false - t.datetime "created_at", null: false - t.string "key" - t.datetime "updated_at", null: false - t.index ["collection_id"], name: "index_collection_publications_on_collection_id" - t.index ["key"], name: "index_collection_publications_on_key", unique: true - end - - create_table "collections", force: :cascade do |t| - t.boolean "all_access", default: false, null: false - t.datetime "created_at", null: false - t.integer "creator_id", null: false - t.string "name", null: false - t.datetime "updated_at", null: false - t.index ["creator_id"], name: "index_collections_on_creator_id" - end - - create_table "collections_filters", id: false, force: :cascade do |t| - t.integer "collection_id", null: false - t.integer "filter_id", null: false - t.index ["collection_id"], name: "index_collections_filters_on_collection_id" - t.index ["filter_id"], name: "index_collections_filters_on_filter_id" - end - create_table "columns", force: :cascade do |t| - t.integer "collection_id", null: false + t.integer "board_id", null: false t.string "color", null: false t.datetime "created_at", null: false t.string "name", null: false t.integer "position", default: 0, null: false t.datetime "updated_at", null: false - t.index ["collection_id", "position"], name: "index_columns_on_collection_id_and_position" - t.index ["collection_id"], name: "index_columns_on_collection_id" + t.index ["board_id", "position"], name: "index_columns_on_board_id_and_position" + t.index ["board_id"], name: "index_columns_on_board_id" end create_table "comments", force: :cascade do |t| @@ -232,7 +232,7 @@ ActiveRecord::Schema[8.2].define(version: 2025_11_03_125353) do create_table "events", force: :cascade do |t| t.string "action", null: false - t.integer "collection_id", null: false + t.integer "board_id", null: false t.datetime "created_at", null: false t.integer "creator_id", null: false t.integer "eventable_id", null: false @@ -240,8 +240,8 @@ ActiveRecord::Schema[8.2].define(version: 2025_11_03_125353) do t.json "particulars", default: {} t.datetime "updated_at", null: false t.index ["action"], name: "index_events_on_summary_id_and_action" - t.index ["collection_id", "action", "created_at"], name: "index_events_on_collection_id_and_action_and_created_at" - t.index ["collection_id"], name: "index_events_on_collection_id" + t.index ["board_id", "action", "created_at"], name: "index_events_on_board_id_and_action_and_created_at" + t.index ["board_id"], name: "index_events_on_board_id" t.index ["creator_id"], name: "index_events_on_creator_id" t.index ["eventable_type", "eventable_id"], name: "index_events_on_eventable" end @@ -430,19 +430,20 @@ ActiveRecord::Schema[8.2].define(version: 2025_11_03_125353) do create_table "webhooks", force: :cascade do |t| t.boolean "active", default: true, null: false - t.integer "collection_id", null: false + t.integer "board_id", null: false t.datetime "created_at", null: false t.string "name" t.string "signing_secret", null: false t.text "subscribed_actions" t.datetime "updated_at", null: false t.text "url", null: false - t.index ["collection_id"], name: "index_webhooks_on_collection_id" + t.index ["board_id"], name: "index_webhooks_on_board_id" t.index ["subscribed_actions"], name: "index_webhooks_on_subscribed_actions" end add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id" add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id" + add_foreign_key "board_publications", "boards" add_foreign_key "card_activity_spikes", "cards" add_foreign_key "card_goldnesses", "cards" add_foreign_key "card_not_nows", "cards" @@ -450,10 +451,9 @@ ActiveRecord::Schema[8.2].define(version: 2025_11_03_125353) do add_foreign_key "cards", "columns" add_foreign_key "closures", "cards" add_foreign_key "closures", "users" - add_foreign_key "collection_publications", "collections" - add_foreign_key "columns", "collections" + add_foreign_key "columns", "boards" add_foreign_key "comments", "cards" - add_foreign_key "events", "collections" + add_foreign_key "events", "boards" add_foreign_key "mentions", "users", column: "mentionee_id" add_foreign_key "mentions", "users", column: "mentioner_id" add_foreign_key "notification_bundles", "users" @@ -472,7 +472,7 @@ ActiveRecord::Schema[8.2].define(version: 2025_11_03_125353) do add_foreign_key "webhook_delinquency_trackers", "webhooks" add_foreign_key "webhook_deliveries", "events" add_foreign_key "webhook_deliveries", "webhooks" - add_foreign_key "webhooks", "collections" + add_foreign_key "webhooks", "boards" # Virtual tables defined in this database. # Note that virtual tables may not work with other database engines. Be careful if changing database. diff --git a/db/schema_cache.yml b/db/schema_cache.yml index 78c8e718f..60b8b29da 100644 --- a/db/schema_cache.yml +++ b/db/schema_cache.yml @@ -20,9 +20,9 @@ columns: default_function: collation: comment: - - &23 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column + - &22 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: - name: collection_id + name: board_id cast_type: &3 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3Adapter::SQLite3Integer precision: scale: @@ -375,7 +375,7 @@ columns: assignments: - *20 - *21 - - &22 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column + - &23 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: name: card_id cast_type: *3 @@ -388,10 +388,61 @@ columns: - *7 - *8 - *9 - card_activity_spikes: + board_publications: - *22 - *7 - *8 + - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column + auto_increment: + name: key + cast_type: *5 + sql_type_metadata: *6 + 'null': true + default: + default_function: + collation: + comment: + - *9 + boards: + - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column + auto_increment: + name: all_access + cast_type: &31 !ruby/object:ActiveModel::Type::Boolean + precision: + scale: + limit: + sql_type_metadata: &32 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata + sql_type: boolean + type: :boolean + limit: + precision: + scale: + 'null': false + default: false + default_function: + collation: + comment: + - *7 + - &24 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column + auto_increment: + name: creator_id + cast_type: *3 + sql_type_metadata: *4 + 'null': false + default: + default_function: + collation: + comment: + - *8 + - *10 + - *9 + boards_filters: + - *22 + - *19 + card_activity_spikes: + - *23 + - *7 + - *8 - *9 card_engagements: - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column @@ -418,16 +469,16 @@ columns: comment: - *9 card_goldnesses: - - *22 + - *23 - *7 - *8 - *9 card_not_nows: - - *22 + - *23 - *7 - *8 - *9 - - &24 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column + - &25 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: name: user_id cast_type: *3 @@ -438,7 +489,7 @@ columns: collation: comment: cards: - - *23 + - *22 - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: name: column_id @@ -450,16 +501,7 @@ columns: collation: comment: - *7 - - &25 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column - auto_increment: - name: creator_id - cast_type: *3 - sql_type_metadata: *4 - 'null': false - default: - default_function: - collation: - comment: + - *24 - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: name: due_on @@ -524,55 +566,13 @@ columns: comment: - *19 closures: - - *22 - - *7 - - *8 - - *9 - - *24 - collection_publications: - *23 - *7 - *8 - - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column - auto_increment: - name: key - cast_type: *5 - sql_type_metadata: *6 - 'null': true - default: - default_function: - collation: - comment: - *9 - collections: - - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column - auto_increment: - name: all_access - cast_type: &31 !ruby/object:ActiveModel::Type::Boolean - precision: - scale: - limit: - sql_type_metadata: &32 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata - sql_type: boolean - type: :boolean - limit: - precision: - scale: - 'null': false - default: false - default_function: - collation: - comment: - - *7 - *25 - - *8 - - *10 - - *9 - collections_filters: - - *23 - - *19 columns: - - *23 + - *22 - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: name: color @@ -598,13 +598,13 @@ columns: comment: - *9 comments: - - *22 + - *23 - *7 - - *25 + - *24 - *8 - *9 creators_filters: - - *25 + - *24 - *19 entropies: - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column @@ -651,9 +651,9 @@ columns: default_function: collation: comment: - - *23 + - *22 - *7 - - *25 + - *24 - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: name: eventable_id @@ -696,7 +696,7 @@ columns: - *9 filters: - *7 - - *25 + - *24 - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: name: fields @@ -838,7 +838,7 @@ columns: - *9 - *28 pins: - - *22 + - *23 - *7 - *8 - *9 @@ -973,7 +973,7 @@ columns: - *8 - *9 steps: - - *22 + - *23 - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: name: completed @@ -998,7 +998,7 @@ columns: - *8 - *9 taggings: - - *22 + - *23 - *7 - *8 - *33 @@ -1069,7 +1069,7 @@ columns: comment: - *9 watches: - - *22 + - *23 - *7 - *8 - *9 @@ -1165,7 +1165,7 @@ columns: - *35 webhooks: - *36 - - *23 + - *22 - *7 - *8 - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column @@ -1221,6 +1221,9 @@ primary_keys: assignees_filters: assigners_filters: assignments: id + board_publications: id + boards: id + boards_filters: card_activity_spikes: id card_engagements: id card_goldnesses: id @@ -1228,9 +1231,6 @@ primary_keys: cards: id closers_filters: closures: id - collection_publications: id - collections: id - collections_filters: columns: id comments: id creators_filters: @@ -1268,6 +1268,9 @@ data_sources: assignees_filters: true assigners_filters: true assignments: true + board_publications: true + boards: true + boards_filters: true card_activity_spikes: true card_engagements: true card_goldnesses: true @@ -1275,9 +1278,6 @@ data_sources: cards: true closers_filters: true closures: true - collection_publications: true - collections: true - collections_filters: true columns: true comments: true creators_filters: true @@ -1323,10 +1323,10 @@ indexes: valid: true - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition table: accesses - name: index_accesses_on_collection_id + name: index_accesses_on_board_id unique: false columns: - - collection_id + - board_id lengths: {} orders: {} opclasses: {} @@ -1339,10 +1339,10 @@ indexes: valid: true - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition table: accesses - name: index_accesses_on_collection_id_and_user_id + name: index_accesses_on_board_id_and_user_id unique: true columns: - - collection_id + - board_id - user_id lengths: {} orders: {} @@ -1611,6 +1611,89 @@ indexes: nulls_not_distinct: comment: valid: true + board_publications: + - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition + table: board_publications + name: index_board_publications_on_board_id + unique: false + columns: + - board_id + lengths: {} + orders: {} + opclasses: {} + where: + type: + using: + include: + nulls_not_distinct: + comment: + valid: true + - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition + table: board_publications + name: index_board_publications_on_key + unique: true + columns: + - key + lengths: {} + orders: {} + opclasses: {} + where: + type: + using: + include: + nulls_not_distinct: + comment: + valid: true + boards: + - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition + table: boards + name: index_boards_on_creator_id + unique: false + columns: + - creator_id + lengths: {} + orders: {} + opclasses: {} + where: + type: + using: + include: + nulls_not_distinct: + comment: + valid: true + boards_filters: + - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition + table: boards_filters + name: index_boards_filters_on_board_id + unique: false + columns: + - board_id + lengths: {} + orders: {} + opclasses: {} + where: + type: + using: + include: + nulls_not_distinct: + comment: + valid: true + - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition + table: boards_filters + name: index_boards_filters_on_filter_id + unique: false + columns: + - filter_id + lengths: {} + orders: {} + opclasses: {} + where: + type: + using: + include: + nulls_not_distinct: + comment: + valid: true card_activity_spikes: - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition table: card_activity_spikes @@ -1714,10 +1797,10 @@ indexes: cards: - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition table: cards - name: index_cards_on_collection_id + name: index_cards_on_board_id unique: false columns: - - collection_id + - board_id lengths: {} orders: {} opclasses: {} @@ -1844,96 +1927,13 @@ indexes: nulls_not_distinct: comment: valid: true - collection_publications: - - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition - table: collection_publications - name: index_collection_publications_on_collection_id - unique: false - columns: - - collection_id - lengths: {} - orders: {} - opclasses: {} - where: - type: - using: - include: - nulls_not_distinct: - comment: - valid: true - - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition - table: collection_publications - name: index_collection_publications_on_key - unique: true - columns: - - key - lengths: {} - orders: {} - opclasses: {} - where: - type: - using: - include: - nulls_not_distinct: - comment: - valid: true - collections: - - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition - table: collections - name: index_collections_on_creator_id - unique: false - columns: - - creator_id - lengths: {} - orders: {} - opclasses: {} - where: - type: - using: - include: - nulls_not_distinct: - comment: - valid: true - collections_filters: - - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition - table: collections_filters - name: index_collections_filters_on_collection_id - unique: false - columns: - - collection_id - lengths: {} - orders: {} - opclasses: {} - where: - type: - using: - include: - nulls_not_distinct: - comment: - valid: true - - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition - table: collections_filters - name: index_collections_filters_on_filter_id - unique: false - columns: - - filter_id - lengths: {} - orders: {} - opclasses: {} - where: - type: - using: - include: - nulls_not_distinct: - comment: - valid: true columns: - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition table: columns - name: index_columns_on_collection_id + name: index_columns_on_board_id unique: false columns: - - collection_id + - board_id lengths: {} orders: {} opclasses: {} @@ -1946,10 +1946,10 @@ indexes: valid: true - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition table: columns - name: index_columns_on_collection_id_and_position + name: index_columns_on_board_id_and_position unique: false columns: - - collection_id + - board_id - position lengths: {} orders: {} @@ -2050,10 +2050,10 @@ indexes: events: - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition table: events - name: index_events_on_collection_id + name: index_events_on_board_id unique: false columns: - - collection_id + - board_id lengths: {} orders: {} opclasses: {} @@ -2066,10 +2066,10 @@ indexes: valid: true - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition table: events - name: index_events_on_collection_id_and_action_and_created_at + name: index_events_on_board_id_and_action_and_created_at unique: false columns: - - collection_id + - board_id - action - created_at lengths: {} @@ -2813,10 +2813,10 @@ indexes: webhooks: - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition table: webhooks - name: index_webhooks_on_collection_id + name: index_webhooks_on_board_id unique: false columns: - - collection_id + - board_id lengths: {} orders: {} opclasses: {} @@ -2843,4 +2843,4 @@ indexes: nulls_not_distinct: comment: valid: true -version: 20251103125353 +version: 20251105122933 diff --git a/db/seeds.rb b/db/seeds.rb index bf40aaf0a..76ce2091b 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -51,12 +51,12 @@ def login_as(user) Current.session = user.identity.sessions.create end -def create_collection(name, creator: Current.user, all_access: true, access_to: []) - Collection.create!(name:, creator:, all_access:).tap { it.accesses.grant_to(access_to) } +def create_board(name, creator: Current.user, all_access: true, access_to: []) + Board.create!(name:, creator:, all_access:).tap { it.accesses.grant_to(access_to) } end -def create_card(title, collection:, description: nil, status: :published, creator: Current.user) - collection.cards.create!(title:, description:, creator:, status:) +def create_card(title, board:, description: nil, status: :published, creator: Current.user) + board.cards.create!(title:, description:, creator:, status:) end # Seed accounts diff --git a/db/seeds/37signals.rb b/db/seeds/37signals.rb index cbb5ebeab..3512288dd 100644 --- a/db/seeds/37signals.rb +++ b/db/seeds/37signals.rb @@ -7,17 +7,17 @@ kevin = find_or_create_user "Kevin Mcconnell", "kevin@37signals.com" login_as david -create_collection("Fizzy", access_to: [ jason, jz, kevin ]).tap do |fizzy| - create_card("Prepare sign-up page", description: "We need to do this before the launch.", collection: fizzy) +create_board("Fizzy", access_to: [ jason, jz, kevin ]).tap do |fizzy| + create_card("Prepare sign-up page", description: "We need to do this before the launch.", board: fizzy) - create_card("Prepare sign-up page", description: "We need to do this before the launch.", collection: fizzy).tap do |card| + create_card("Prepare sign-up page", description: "We need to do this before the launch.", board: fizzy).tap do |card| card.toggle_assignment(kevin) - if column = card.collection&.columns&.sample + if column = card.board&.columns&.sample card.triage_into(column) end end - create_card("Plain text mentions", description: "We'll support plain text mentions first.", collection: fizzy).tap do |card| + create_card("Plain text mentions", description: "We'll support plain text mentions first.", board: fizzy).tap do |card| card.toggle_assignment(david) card.close end diff --git a/db/seeds/honcho.rb b/db/seeds/honcho.rb index bba0f378b..ff15bfbee 100644 --- a/db/seeds/honcho.rb +++ b/db/seeds/honcho.rb @@ -24,7 +24,7 @@ card_titles = [ "Set up CI/CD" ] -collections = [ +boards = [ "Project Launch", "Frontend Dev", "Backend Dev", @@ -34,13 +34,13 @@ collections = [ time_range = (60 .. 30.days.in_minutes) -collections.each_with_index do |collection_name, index| - create_collection(collection_name, access_to: authors.sample(3)).tap do |collection| +boards.each_with_index do |board_name, index| + create_board(board_name, access_to: authors.sample(3)).tap do |board| card_titles.each do |title| travel(-rand(time_range).minutes) do card = create_card title, - description: "#{title} for #{collection_name} phase #{index + 1}.", - collection: collection, + description: "#{title} for #{board_name} phase #{index + 1}.", + board: board, creator: authors.sample # Randomly assign to 1-2 authors @@ -56,7 +56,7 @@ collections.each_with_index do |collection_name, index| travel rand(0..20).minutes case rand(3) when 0 - if column = card.collection&.columns&.sample + if column = card.board&.columns&.sample card.triage_into(column) end when 1 diff --git a/script/load-prod-db-in-dev.rb b/script/load-prod-db-in-dev.rb index 167b60c46..d9ca56dbe 100755 --- a/script/load-prod-db-in-dev.rb +++ b/script/load-prod-db-in-dev.rb @@ -44,8 +44,8 @@ ApplicationRecord.with_tenant(tenant) do |tenant| user = User.find_by(role: :admin) identity = Identity.find_or_create_by(email_address: user.email_address) identity.link_to(user.tenant) - Collection.find_each do |collection| - collection.accesses.grant_to(user) + Board.find_each do |board| + board.accesses.grant_to(user) end url = Rails.application.routes.url_helpers.root_url(Rails.application.config.action_controller.default_url_options.merge(script_name: Account.sole.slug)) diff --git a/script/migrations/20251029-populate-column-positions.rb b/script/migrations/20251029-populate-column-positions.rb index b47f5eccf..8fadb6481 100755 --- a/script/migrations/20251029-populate-column-positions.rb +++ b/script/migrations/20251029-populate-column-positions.rb @@ -5,10 +5,10 @@ require_relative "../../config/environment" ApplicationRecord.with_each_tenant do |tenant| puts "Processing tenant: #{tenant}" - Collection.find_each do |collection| - puts " Processing collection: #{collection.name} (ID: #{collection.id})" + Board.find_each do |board| + puts " Processing board: #{board.name} (ID: #{board.id})" - columns = collection.columns.order(:id) + columns = board.columns.order(:id) columns.each_with_index do |column, index| column.update_column(:position, index) diff --git a/script/migrations/migrate-content-to-slugged-urls.rb b/script/migrations/migrate-content-to-slugged-urls.rb index 06cab3652..1309499d3 100755 --- a/script/migrations/migrate-content-to-slugged-urls.rb +++ b/script/migrations/migrate-content-to-slugged-urls.rb @@ -41,13 +41,13 @@ ApplicationRecord.with_each_tenant do |tenant| puts Card.find_each do |card| - puts "### Processing card #{card.id} in #{Rails.application.routes.url_helpers.collection_card_path(card.collection, card)}" + puts "### Processing card #{card.id} in #{Rails.application.routes.url_helpers.board_card_path(card.board, card)}" fix_attachments(card.description) card.reload old_body = card.description.body.to_s if match = regex.match(old_body) - puts "URL found in card #{card.id} in #{Rails.application.routes.url_helpers.collection_card_path(card.collection, card)}" + puts "URL found in card #{card.id} in #{Rails.application.routes.url_helpers.board_card_path(card.board, card)}" new_body = old_body.gsub(regex, "://#{domain}/#{account_id}/") card.description.update(body: new_body) || raise("Failed to update card description for card #{card.id}") @@ -55,13 +55,13 @@ ApplicationRecord.with_each_tenant do |tenant| end Comment.find_each do |comment| - puts "### Processing comment #{comment.id} in #{Rails.application.routes.url_helpers.collection_card_path(comment.card.collection, comment.card)}" + puts "### Processing comment #{comment.id} in #{Rails.application.routes.url_helpers.board_card_path(comment.card.board, comment.card)}" fix_attachments(comment.body) comment.reload old_body = comment.body.body.to_s if match = regex.match(old_body) - puts "URL found in comment #{comment.id} in #{Rails.application.routes.url_helpers.collection_card_path(comment.card.collection, comment.card)}" + puts "URL found in comment #{comment.id} in #{Rails.application.routes.url_helpers.board_card_path(comment.card.board, comment.card)}" new_body = old_body.gsub(regex, "://#{domain}/#{account_id}/") comment.body.update(body: new_body) || raise("Failed to update comment body for comment #{comment.id}") diff --git a/script/migrations/migrate_to_flat_card_urls.rb b/script/migrations/migrate_to_flat_card_urls.rb index dc6bdb1cc..4a3e0d396 100755 --- a/script/migrations/migrate_to_flat_card_urls.rb +++ b/script/migrations/migrate_to_flat_card_urls.rb @@ -3,7 +3,7 @@ require_relative "../config/environment" def replace_url(string) - string.gsub(%r{/collections/\d+/cards/(\d+)}) do + string.gsub(%r{/boards/\d+/cards/(\d+)}) do "/cards/#{$1}" end end diff --git a/script/migrations/migrate_to_new_cards_url_scheme.rb b/script/migrations/migrate_to_new_cards_url_scheme.rb index f5053dac1..86b250052 100755 --- a/script/migrations/migrate_to_new_cards_url_scheme.rb +++ b/script/migrations/migrate_to_new_cards_url_scheme.rb @@ -4,7 +4,7 @@ require_relative "../config/environment" def replace_url(string) string.gsub(%r{/buckets/(\d+)/bubbles/(\d+)}) do - "/collections/#{$1}/cards/#{$2}" + "/boards/#{$1}/cards/#{$2}" end end diff --git a/script/migrations/populate_columns_from_workflow_stages.rb b/script/migrations/populate_columns_from_workflow_stages.rb index 27625164b..12c821449 100755 --- a/script/migrations/populate_columns_from_workflow_stages.rb +++ b/script/migrations/populate_columns_from_workflow_stages.rb @@ -23,28 +23,28 @@ ApplicationRecord.with_each_tenant do |tenant| Column.destroy_all - Collection.find_each do |collection| - next unless collection.workflow.present? + Board.find_each do |board| + next unless board.workflow.present? # Map to track stage_id -> column columns_by_stage = {} # Create columns from workflow stages - collection.workflow.stages.find_each do |stage| - column = collection.columns.create!( + board.workflow.stages.find_each do |stage| + column = board.columns.create!( name: stage.name, color: stage.color || Card::Colored::COLORS.first ) columns_by_stage[stage] = column - puts "Created column '#{column.name}' for collection '#{collection.name}'" + puts "Created column '#{column.name}' for board '#{board.name}'" end # Associate cards with their corresponding columns based on stages - collection.cards.includes(:stage).find_each do |card| + board.cards.includes(:stage).find_each do |card| next if !card.doing? || card.stage.blank? - unless card.stage.workflow.collections.include?(collection) - puts "Corrupt data: the card with id #{card.id} has the stage #{card.stage.name} with id #{card.stage.id} that belongs to a workflow not asociated ot its collection" + unless card.stage.workflow.boards.include?(board) + puts "Corrupt data: the card with id #{card.id} has the stage #{card.stage.name} with id #{card.stage.id} that belongs to a workflow not asociated ot its board" next end diff --git a/script/migrations/renaming/content.rb b/script/migrations/renaming/content.rb index ee95ec350..08dde69c2 100644 --- a/script/migrations/renaming/content.rb +++ b/script/migrations/renaming/content.rb @@ -8,7 +8,7 @@ RENAME_RULES = { "closed" => "closed", "poppable" => "closeable", "pop" => "closure", - "bucket" => "collection" + "bucket" => "board" } EXTENSIONS = %w[.rb .yml .html .js .css .erb] diff --git a/script/migrations/renaming/files.rb b/script/migrations/renaming/files.rb index 86b7d3421..26edb7ccb 100644 --- a/script/migrations/renaming/files.rb +++ b/script/migrations/renaming/files.rb @@ -11,7 +11,7 @@ RENAMES = { "poppable" => "closeable", "closed" => "closed", "pop" => "closure", - "bucket" => "collection" + "bucket" => "board" }.freeze FILE_EXTENSIONS = %w[rb yml html css js jpg jpeg png gif svg erb].freeze diff --git a/script/migrations/reset_collections_ids.rb b/script/migrations/reset_boards_ids.rb similarity index 56% rename from script/migrations/reset_collections_ids.rb rename to script/migrations/reset_boards_ids.rb index cf1d84028..a0621a19c 100644 --- a/script/migrations/reset_collections_ids.rb +++ b/script/migrations/reset_boards_ids.rb @@ -11,95 +11,95 @@ ApplicationRecord.with_each_tenant do |tenant| ApplicationRecord.connection.execute("PRAGMA foreign_keys = OFF;") begin - # Get all collections ordered by ID - collections = Collection.order(:id).to_a + # Get all boards ordered by ID + boards = Board.order(:id).to_a # Create mapping of old IDs to new IDs - collections.each_with_index do |collection, index| - id_mapping[collection.id] = index + 1 + boards.each_with_index do |board, index| + id_mapping[board.id] = index + 1 end # Update foreign keys in related tables puts "Updating foreign keys in related tables..." # Update accesses table - Access.where.not(collection_id: nil).find_each do |access| - if id_mapping[access.collection_id] - access.update_column(:collection_id, id_mapping[access.collection_id]) + Access.where.not(board_id: nil).find_each do |access| + if id_mapping[access.board_id] + access.update_column(:board_id, id_mapping[access.board_id]) end end # Update cards table - Card.where.not(collection_id: nil).find_each do |card| - if id_mapping[card.collection_id] - card.update_column(:collection_id, id_mapping[card.collection_id]) + Card.where.not(board_id: nil).find_each do |card| + if id_mapping[card.board_id] + card.update_column(:board_id, id_mapping[card.board_id]) end end - # Update collections_filters table (join table) - ApplicationRecord.connection.execute("SELECT collection_id FROM collections_filters").each do |row| + # Update boards_filters table (join table) + ApplicationRecord.connection.execute("SELECT board_id FROM boards_filters").each do |row| old_id = row[0] if id_mapping[old_id] - ApplicationRecord.connection.execute("UPDATE collections_filters SET collection_id = #{id_mapping[old_id]} WHERE collection_id = #{old_id}") + ApplicationRecord.connection.execute("UPDATE boards_filters SET board_id = #{id_mapping[old_id]} WHERE board_id = #{old_id}") end end # Update events table - Event.where.not(collection_id: nil).find_each do |event| - if id_mapping[event.collection_id] - event.update_column(:collection_id, id_mapping[event.collection_id]) + Event.where.not(board_id: nil).find_each do |event| + if id_mapping[event.board_id] + event.update_column(:board_id, id_mapping[event.board_id]) end end # Update events table (polymorphic relationship) - Event.where(eventable_type: "Collection").find_each do |event| + Event.where(eventable_type: "Board").find_each do |event| if id_mapping[event.eventable_id] event.update_column(:eventable_id, id_mapping[event.eventable_id]) end end # Update mentions table (polymorphic relationship) - Mention.where(source_type: "Collection").find_each do |mention| + Mention.where(source_type: "Board").find_each do |mention| if id_mapping[mention.source_id] mention.update_column(:source_id, id_mapping[mention.source_id]) end end # Update notifications table (polymorphic relationship) - Notification.where(source_type: "Collection").find_each do |notification| + Notification.where(source_type: "Board").find_each do |notification| if id_mapping[notification.source_id] notification.update_column(:source_id, id_mapping[notification.source_id]) end end # Update action_text_markdowns table (polymorphic relationship) - ActionText::RichText.where(record_type: "Collection").find_each do |rich_text| + ActionText::RichText.where(record_type: "Board").find_each do |rich_text| if id_mapping[rich_text.record_id] rich_text.update_column(:record_id, id_mapping[rich_text.record_id]) end end # Update active_storage_attachments table (polymorphic relationship) - ActiveStorage::Attachment.where(record_type: "Collection").find_each do |attachment| + ActiveStorage::Attachment.where(record_type: "Board").find_each do |attachment| if id_mapping[attachment.record_id] attachment.update_column(:record_id, id_mapping[attachment.record_id]) end end - # Reset the collections table IDs - puts "Resetting collection IDs..." - collections.each do |collection| - new_id = id_mapping[collection.id] + # Reset the boards table IDs + puts "Resetting board IDs..." + boards.each do |board| + new_id = id_mapping[board.id] # Use direct SQL to update the ID to avoid ActiveRecord validations - ApplicationRecord.connection.execute("UPDATE collections SET id = #{new_id} WHERE id = #{collection.id}") + ApplicationRecord.connection.execute("UPDATE boards SET id = #{new_id} WHERE id = #{board.id}") end - # Reset the SQLite sequence for the collections table - ApplicationRecord.connection.execute("DELETE FROM sqlite_sequence WHERE name = 'collections'") - max_id = Collection.maximum(:id) || 0 - ApplicationRecord.connection.execute("INSERT INTO sqlite_sequence (name, seq) VALUES ('collections', #{max_id})") + # Reset the SQLite sequence for the boards table + ApplicationRecord.connection.execute("DELETE FROM sqlite_sequence WHERE name = 'boards'") + max_id = Board.maximum(:id) || 0 + ApplicationRecord.connection.execute("INSERT INTO sqlite_sequence (name, seq) VALUES ('boards', #{max_id})") - puts "Collection IDs have been reset successfully!" + puts "Board IDs have been reset successfully!" rescue => e puts "Error: #{e.message}" puts e.backtrace @@ -112,11 +112,11 @@ ApplicationRecord.with_each_tenant do |tenant| Card.find_each do |card| description = card.description.content.dup - description.gsub!(/collections\/(\d+)\//) do |match| + description.gsub!(/boards\/(\d+)\//) do |match| old_id = $1.to_i new_id = id_mapping[old_id] - new_id ? "collections/#{new_id}/" : match + new_id ? "boards/#{new_id}/" : match end if description != card.description.content @@ -128,10 +128,10 @@ ApplicationRecord.with_each_tenant do |tenant| Comment.find_each do |comment| body = comment.body.content.dup - body.gsub!(/collections\/(\d+)\//) do |match| + body.gsub!(/boards\/(\d+)\//) do |match| old_id = $1.to_i new_id = id_mapping[old_id] - new_id ? "collections/#{new_id}/" : match + new_id ? "boards/#{new_id}/" : match end if body != comment.body.content diff --git a/script/populate.rb b/script/populate.rb index f0c563c4d..d19f75f84 100644 --- a/script/populate.rb +++ b/script/populate.rb @@ -2,20 +2,20 @@ require_relative "../config/environment" require "faker" CARDS_COUNT = ARGV.first&.to_i || 10_000 -COLLECTIONS_COUNT = ARGV.second&.to_i || 1 +BOARDS_COUNT = ARGV.second&.to_i || 1 ApplicationRecord.current_tenant = ApplicationRecord.tenants.first Current.session = Session.first -puts "Creating #{CARDS_COUNT} cards across #{COLLECTIONS_COUNT} collection(s)" +puts "Creating #{CARDS_COUNT} cards across #{BOARDS_COUNT} board(s)" -COLLECTIONS_COUNT.times do - Collection.create! name: Faker::Company.buzzword, all_access: true +BOARDS_COUNT.times do + Board.create! name: Faker::Company.buzzword, all_access: true print "." end CARDS_COUNT.times do - card = Collection.take.cards.create! \ + card = Board.take.cards.create! \ title: Faker::Company.bs, description: Faker::Hacker.say_something_smart, status: :published print "." diff --git a/test/controllers/boards/columns/closeds_controller_test.rb b/test/controllers/boards/columns/closeds_controller_test.rb new file mode 100644 index 000000000..f147a2106 --- /dev/null +++ b/test/controllers/boards/columns/closeds_controller_test.rb @@ -0,0 +1,12 @@ +require "test_helper" + +class Boards::Columns::ClosedsControllerTest < ActionDispatch::IntegrationTest + setup do + sign_in_as :kevin + end + + test "show" do + get board_columns_closed_path(boards(:writebook)) + assert_response :success + end +end diff --git a/test/controllers/boards/columns/not_nows_controller_test.rb b/test/controllers/boards/columns/not_nows_controller_test.rb new file mode 100644 index 000000000..29088728c --- /dev/null +++ b/test/controllers/boards/columns/not_nows_controller_test.rb @@ -0,0 +1,12 @@ +require "test_helper" + +class Boards::Columns::NotNowsControllerTest < ActionDispatch::IntegrationTest + setup do + sign_in_as :kevin + end + + test "show" do + get board_columns_not_now_path(boards(:writebook)) + assert_response :success + end +end diff --git a/test/controllers/boards/columns/streams_controller_test.rb b/test/controllers/boards/columns/streams_controller_test.rb new file mode 100644 index 000000000..fec9603cc --- /dev/null +++ b/test/controllers/boards/columns/streams_controller_test.rb @@ -0,0 +1,12 @@ +require "test_helper" + +class Boards::Columns::StreamsControllerTest < ActionDispatch::IntegrationTest + setup do + sign_in_as :kevin + end + + test "show" do + get board_columns_stream_path(boards(:writebook)) + assert_response :success + end +end diff --git a/test/controllers/boards/columns_controller_test.rb b/test/controllers/boards/columns_controller_test.rb new file mode 100644 index 000000000..7c6e7f525 --- /dev/null +++ b/test/controllers/boards/columns_controller_test.rb @@ -0,0 +1,39 @@ +require "test_helper" + +class Boards::ColumnsControllerTest < ActionDispatch::IntegrationTest + setup do + sign_in_as :kevin + end + + test "show" do + get board_column_path(boards(:writebook), columns(:writebook_in_progress)) + assert_response :success + end + + test "create" do + assert_difference -> { boards(:writebook).columns.count }, +1 do + post board_columns_path(boards(:writebook)), params: { column: { name: "New Column" } }, as: :turbo_stream + assert_response :success + end + + assert_equal "New Column", boards(:writebook).columns.last.name + end + + test "update" do + column = columns(:writebook_in_progress) + + assert_changes -> { column.reload.name }, from: "In progress", to: "Updated Name" do + put board_column_path(boards(:writebook), column), params: { column: { name: "Updated Name" } }, as: :turbo_stream + assert_response :success + end + end + + test "destroy" do + column = columns(:writebook_on_hold) + + assert_difference -> { boards(:writebook).columns.count }, -1 do + delete board_column_path(boards(:writebook), column), as: :turbo_stream + assert_response :success + end + end +end diff --git a/test/controllers/boards/entropies_controller_test.rb b/test/controllers/boards/entropies_controller_test.rb new file mode 100644 index 000000000..02338f393 --- /dev/null +++ b/test/controllers/boards/entropies_controller_test.rb @@ -0,0 +1,16 @@ +require "test_helper" + +class Boards::EntropiesControllerTest < ActionDispatch::IntegrationTest + setup do + sign_in_as :kevin + @board = boards(:writebook) + end + + test "update" do + put board_entropy_path(@board, format: :turbo_stream), params: { board: { auto_postpone_period: 1.day } } + + assert_equal 1.day, @board.entropy.reload.auto_postpone_period + + assert_turbo_stream action: :replace, target: dom_id(@board, :entropy) + end +end diff --git a/test/controllers/boards/involvements_controller_test.rb b/test/controllers/boards/involvements_controller_test.rb new file mode 100644 index 000000000..45587176a --- /dev/null +++ b/test/controllers/boards/involvements_controller_test.rb @@ -0,0 +1,18 @@ +require "test_helper" + +class Boards::InvolvementsControllerTest < ActionDispatch::IntegrationTest + setup do + sign_in_as :kevin + end + + test "update" do + board = boards(:writebook) + board.access_for(users(:kevin)).access_only! + + assert_changes -> { board.access_for(users(:kevin)).involvement }, from: "access_only", to: "watching" do + put board_involvement_path(board, involvement: "watching") + end + + assert_response :success + end +end diff --git a/test/controllers/boards/publications_controller_test.rb b/test/controllers/boards/publications_controller_test.rb new file mode 100644 index 000000000..6ce770858 --- /dev/null +++ b/test/controllers/boards/publications_controller_test.rb @@ -0,0 +1,29 @@ +require "test_helper" + +class Boards::PublicationsControllerTest < ActionDispatch::IntegrationTest + setup do + sign_in_as :kevin + @board = boards(:writebook) + end + + test "publish a board" do + assert_not @board.published? + + assert_changes -> { @board.reload.published? }, from: false, to: true do + post board_publication_path(@board, format: :turbo_stream) + end + + assert_turbo_stream action: :replace, target: dom_id(@board, :publication) + end + + test "unpublish a board" do + @board.publish + assert @board.published? + + assert_changes -> { @board.reload.published? }, from: true, to: false do + delete board_publication_path(@board, format: :turbo_streamn) + end + + assert_turbo_stream action: :replace, target: dom_id(@board, :publication) + end +end diff --git a/test/controllers/boards_controller_test.rb b/test/controllers/boards_controller_test.rb new file mode 100644 index 000000000..14f573780 --- /dev/null +++ b/test/controllers/boards_controller_test.rb @@ -0,0 +1,125 @@ +require "test_helper" + +class BoardsControllerTest < ActionDispatch::IntegrationTest + setup do + sign_in_as :kevin + end + + test "new" do + get new_board_path + assert_response :success + end + + test "show" do + get board_path(boards(:writebook)) + assert_response :success + end + + test "create" do + assert_difference -> { Board.count }, +1 do + post boards_path, params: { board: { name: "Remodel Punch List" } } + end + + board = Board.last + assert_redirected_to board_path(board) + assert_includes board.users, users(:kevin) + assert_equal "Remodel Punch List", board.name + end + + test "edit" do + get edit_board_path(boards(:writebook)) + assert_response :success + end + + test "update" do + patch board_path(boards(:writebook)), params: { + board: { + name: "Writebook bugs", + all_access: false, + auto_postpone_period: 1.day + }, + user_ids: users(:kevin, :jz).pluck(:id) + } + + assert_redirected_to edit_board_path(boards(:writebook)) + assert_equal "Writebook bugs", boards(:writebook).reload.name + assert_equal users(:kevin, :jz).sort, boards(:writebook).users.sort + assert_equal 1.day, entropies(:writebook_board).auto_postpone_period + assert_not boards(:writebook).all_access? + end + + test "update redirects to root when user removes themselves from board" do + board = boards(:writebook) + + patch board_path(board), params: { + board: { name: "Updated name", all_access: false }, + user_ids: users(:david, :jz).pluck(:id) + } + + assert_redirected_to root_path + assert_not board.reload.users.include?(users(:kevin)) + end + + test "update board with granular permissions, submitting no user ids" do + assert_not boards(:private).all_access? + + boards(:private).users = [ users(:kevin) ] + boards(:private).save! + + patch board_path(boards(:private)), params: { + board: { name: "Renamed" } + } + + assert_redirected_to edit_board_path(boards(:private)) + assert_equal "Renamed", boards(:private).reload.name + assert_equal [ users(:kevin) ], boards(:private).users + assert_not boards(:private).all_access? + end + + test "update all access" do + board = Current.set(session: sessions(:kevin)) do + Board.create! name: "New board", all_access: false + end + assert_equal [ users(:kevin) ], board.users + + patch board_path(board), params: { board: { name: "Bugs", all_access: true } } + + assert_redirected_to edit_board_path(board) + assert board.reload.all_access? + assert_equal User.active.sort, board.users.sort + end + + test "destroy" do + board = boards(:writebook) + delete board_path(board) + assert_redirected_to root_path + assert_raises(ActiveRecord::RecordNotFound) { board.reload } + end + + test "non-admin cannot change all_access on board they don't own" do + logout_and_sign_in_as :jz + + board = boards(:writebook) + original_all_access = board.all_access + + patch board_path(board), params: { board: { all_access: !original_all_access } } + + assert_response :forbidden + assert_equal original_all_access, board.reload.all_access + end + + test "non-admin cannot change individual user accesses on board they don't own" do + logout_and_sign_in_as :jz + + board = boards(:writebook) + original_users = board.users.sort + + patch board_path(board), params: { + board: { name: board.name }, + user_ids: [ users(:jz).id ] + } + + assert_response :forbidden + assert_equal original_users, board.reload.users.sort + end +end diff --git a/test/controllers/cards/boards_controller_test.rb b/test/controllers/cards/boards_controller_test.rb new file mode 100644 index 000000000..7f2b15c97 --- /dev/null +++ b/test/controllers/cards/boards_controller_test.rb @@ -0,0 +1,20 @@ +require "test_helper" + +class Cards::BoardsControllerTest < ActionDispatch::IntegrationTest + setup do + sign_in_as :kevin + end + + test "update changes card board" do + card = cards(:logo) + new_board = boards(:private) + + assert_not_equal new_board, card.board + + assert_changes -> { card.reload.board }, from: card.board, to: new_board do + put card_board_path(card), params: { board_id: new_board.id } + end + + assert_redirected_to card + end +end diff --git a/test/controllers/cards/collections_controller_test.rb b/test/controllers/cards/collections_controller_test.rb deleted file mode 100644 index 7013e6c76..000000000 --- a/test/controllers/cards/collections_controller_test.rb +++ /dev/null @@ -1,20 +0,0 @@ -require "test_helper" - -class Cards::CollectionsControllerTest < ActionDispatch::IntegrationTest - setup do - sign_in_as :kevin - end - - test "update changes card collection" do - card = cards(:logo) - new_collection = collections(:private) - - assert_not_equal new_collection, card.collection - - assert_changes -> { card.reload.collection }, from: card.collection, to: new_collection do - put card_collection_path(card), params: { collection_id: new_collection.id } - end - - assert_redirected_to card - end -end diff --git a/test/controllers/cards/publishes_controller_test.rb b/test/controllers/cards/publishes_controller_test.rb index c2129d161..2a7c16363 100644 --- a/test/controllers/cards/publishes_controller_test.rb +++ b/test/controllers/cards/publishes_controller_test.rb @@ -13,7 +13,7 @@ class Cards::PublishesControllerTest < ActionDispatch::IntegrationTest post card_publish_path(card) end - assert_redirected_to card.collection + assert_redirected_to card.board end test "create and add another" do diff --git a/test/controllers/cards_controller_test.rb b/test/controllers/cards_controller_test.rb index 507aac5ed..bc1a82e4b 100644 --- a/test/controllers/cards_controller_test.rb +++ b/test/controllers/cards_controller_test.rb @@ -17,7 +17,7 @@ class CardsControllerTest < ActionDispatch::IntegrationTest test "create a new draft" do assert_difference -> { Card.count }, 1 do - post collection_cards_path(collections(:writebook)) + post board_cards_path(boards(:writebook)) end assert Card.last.drafted? @@ -25,10 +25,10 @@ class CardsControllerTest < ActionDispatch::IntegrationTest end test "create resumes existing draft if it exists" do - draft = collections(:writebook).cards.create!(creator: users(:kevin), status: :drafted) + draft = boards(:writebook).cards.create!(creator: users(:kevin), status: :drafted) assert_no_difference -> { Card.count } do - post collection_cards_path(collections(:writebook)) + post board_cards_path(boards(:writebook)) end assert_redirected_to draft @@ -61,13 +61,63 @@ class CardsControllerTest < ActionDispatch::IntegrationTest assert_equal "Something more in-depth", card.description.to_plain_text.strip end - test "users can only see cards in collections they have access to" do + test "users can only see cards in boards they have access to" do get card_path(cards(:logo)) assert_response :success - collections(:writebook).update! all_access: false - collections(:writebook).accesses.revoke_from users(:kevin) + boards(:writebook).update! all_access: false + boards(:writebook).accesses.revoke_from users(:kevin) get card_path(cards(:logo)) assert_response :not_found end + + test "admins can see delete button on any card" do + get card_path(cards(:logo)) + assert_response :success + assert_match "Delete this card", response.body + end + + test "card creators can see delete button on their own cards" do + logout_and_sign_in_as :david + + get card_path(cards(:logo)) + assert_response :success + assert_match "Delete this card", response.body + end + + test "non-admins cannot see delete button on cards they did not create" do + logout_and_sign_in_as :jz + + get card_path(cards(:logo)) + assert_response :success + assert_no_match "Delete this card", response.body + end + + test "non-admins cannot delete cards they did not create" do + logout_and_sign_in_as :jz + + assert_no_difference -> { Card.count } do + delete card_path(cards(:logo)) + end + + assert_response :forbidden + end + + test "card creators can delete their own cards" do + logout_and_sign_in_as :david + + assert_difference -> { Card.count }, -1 do + delete card_path(cards(:logo)) + end + + assert_redirected_to boards(:writebook) + end + + test "admins can delete any card" do + assert_difference -> { Card.count }, -1 do + delete card_path(cards(:logo)) + end + + assert_redirected_to boards(:writebook) + end end diff --git a/test/controllers/collections/columns/closeds_controller_test.rb b/test/controllers/collections/columns/closeds_controller_test.rb deleted file mode 100644 index ceda24a32..000000000 --- a/test/controllers/collections/columns/closeds_controller_test.rb +++ /dev/null @@ -1,12 +0,0 @@ -require "test_helper" - -class Collections::Columns::ClosedsControllerTest < ActionDispatch::IntegrationTest - setup do - sign_in_as :kevin - end - - test "show" do - get collection_columns_closed_path(collections(:writebook)) - assert_response :success - end -end diff --git a/test/controllers/collections/columns/not_nows_controller_test.rb b/test/controllers/collections/columns/not_nows_controller_test.rb deleted file mode 100644 index 01c8d4950..000000000 --- a/test/controllers/collections/columns/not_nows_controller_test.rb +++ /dev/null @@ -1,12 +0,0 @@ -require "test_helper" - -class Collections::Columns::NotNowsControllerTest < ActionDispatch::IntegrationTest - setup do - sign_in_as :kevin - end - - test "show" do - get collection_columns_not_now_path(collections(:writebook)) - assert_response :success - end -end diff --git a/test/controllers/collections/columns/streams_controller_test.rb b/test/controllers/collections/columns/streams_controller_test.rb deleted file mode 100644 index 1bf76e55a..000000000 --- a/test/controllers/collections/columns/streams_controller_test.rb +++ /dev/null @@ -1,12 +0,0 @@ -require "test_helper" - -class Collections::Columns::StreamsControllerTest < ActionDispatch::IntegrationTest - setup do - sign_in_as :kevin - end - - test "show" do - get collection_columns_stream_path(collections(:writebook)) - assert_response :success - end -end diff --git a/test/controllers/collections/columns_controller_test.rb b/test/controllers/collections/columns_controller_test.rb deleted file mode 100644 index 1c830ee4a..000000000 --- a/test/controllers/collections/columns_controller_test.rb +++ /dev/null @@ -1,39 +0,0 @@ -require "test_helper" - -class Collections::ColumnsControllerTest < ActionDispatch::IntegrationTest - setup do - sign_in_as :kevin - end - - test "show" do - get collection_column_path(collections(:writebook), columns(:writebook_in_progress)) - assert_response :success - end - - test "create" do - assert_difference -> { collections(:writebook).columns.count }, +1 do - post collection_columns_path(collections(:writebook)), params: { column: { name: "New Column" } }, as: :turbo_stream - assert_response :success - end - - assert_equal "New Column", collections(:writebook).columns.last.name - end - - test "update" do - column = columns(:writebook_in_progress) - - assert_changes -> { column.reload.name }, from: "In progress", to: "Updated Name" do - put collection_column_path(collections(:writebook), column), params: { column: { name: "Updated Name" } }, as: :turbo_stream - assert_response :success - end - end - - test "destroy" do - column = columns(:writebook_on_hold) - - assert_difference -> { collections(:writebook).columns.count }, -1 do - delete collection_column_path(collections(:writebook), column), as: :turbo_stream - assert_response :success - end - end -end diff --git a/test/controllers/collections/entropies_controller_test.rb b/test/controllers/collections/entropies_controller_test.rb deleted file mode 100644 index 1f24a0f3f..000000000 --- a/test/controllers/collections/entropies_controller_test.rb +++ /dev/null @@ -1,16 +0,0 @@ -require "test_helper" - -class Collections::EntropiesControllerTest < ActionDispatch::IntegrationTest - setup do - sign_in_as :kevin - @collection = collections(:writebook) - end - - test "update" do - put collection_entropy_path(@collection, format: :turbo_stream), params: { collection: { auto_postpone_period: 1.day } } - - assert_equal 1.day, @collection.entropy.reload.auto_postpone_period - - assert_turbo_stream action: :replace, target: dom_id(@collection, :entropy) - end -end diff --git a/test/controllers/collections/involvements_controller_test.rb b/test/controllers/collections/involvements_controller_test.rb deleted file mode 100644 index 561d6951f..000000000 --- a/test/controllers/collections/involvements_controller_test.rb +++ /dev/null @@ -1,18 +0,0 @@ -require "test_helper" - -class Collections::InvolvementsControllerTest < ActionDispatch::IntegrationTest - setup do - sign_in_as :kevin - end - - test "update" do - collection = collections(:writebook) - collection.access_for(users(:kevin)).access_only! - - assert_changes -> { collection.access_for(users(:kevin)).involvement }, from: "access_only", to: "watching" do - put collection_involvement_path(collection, involvement: "watching") - end - - assert_response :success - end -end diff --git a/test/controllers/collections/publications_controller_test.rb b/test/controllers/collections/publications_controller_test.rb deleted file mode 100644 index 159ccd5bc..000000000 --- a/test/controllers/collections/publications_controller_test.rb +++ /dev/null @@ -1,29 +0,0 @@ -require "test_helper" - -class Collections::PublicationsControllerTest < ActionDispatch::IntegrationTest - setup do - sign_in_as :kevin - @collection = collections(:writebook) - end - - test "publish a collection" do - assert_not @collection.published? - - assert_changes -> { @collection.reload.published? }, from: false, to: true do - post collection_publication_path(@collection, format: :turbo_stream) - end - - assert_turbo_stream action: :replace, target: dom_id(@collection, :publication) - end - - test "unpublish a collection" do - @collection.publish - assert @collection.published? - - assert_changes -> { @collection.reload.published? }, from: true, to: false do - delete collection_publication_path(@collection, format: :turbo_streamn) - end - - assert_turbo_stream action: :replace, target: dom_id(@collection, :publication) - end -end diff --git a/test/controllers/collections_controller_test.rb b/test/controllers/collections_controller_test.rb deleted file mode 100644 index 4839ceaab..000000000 --- a/test/controllers/collections_controller_test.rb +++ /dev/null @@ -1,98 +0,0 @@ -require "test_helper" - -class CollectionsControllerTest < ActionDispatch::IntegrationTest - setup do - sign_in_as :kevin - end - - test "new" do - get new_collection_path - assert_response :success - end - - test "show" do - get collection_path(collections(:writebook)) - assert_response :success - end - - test "create" do - assert_difference -> { Collection.count }, +1 do - post collections_path, params: { collection: { name: "Remodel Punch List" } } - end - - collection = Collection.last - assert_redirected_to collection_path(collection) - assert_includes collection.users, users(:kevin) - assert_equal "Remodel Punch List", collection.name - end - - test "edit" do - get edit_collection_path(collections(:writebook)) - assert_response :success - end - - test "update" do - patch collection_path(collections(:writebook)), params: { - collection: { - name: "Writebook bugs", - all_access: false, - auto_postpone_period: 1.day - }, - user_ids: users(:kevin, :jz).pluck(:id) - } - - assert_redirected_to edit_collection_path(collections(:writebook)) - assert_equal "Writebook bugs", collections(:writebook).reload.name - assert_equal users(:kevin, :jz).sort, collections(:writebook).users.sort - assert_equal 1.day, entropies(:writebook_collection).auto_postpone_period - assert_not collections(:writebook).all_access? - end - - test "update redirects to root when user removes themselves from collection" do - collection = collections(:writebook) - - patch collection_path(collection), params: { - collection: { name: "Updated name", all_access: false }, - user_ids: users(:david, :jz).pluck(:id) - } - - assert_redirected_to root_path - assert_not collection.reload.users.include?(users(:kevin)) - end - - test "update collection with granular permissions, submitting no user ids" do - assert_not collections(:private).all_access? - - collections(:private).users = [ users(:kevin) ] - collections(:private).save! - - patch collection_path(collections(:private)), params: { - collection: { name: "Renamed" } - } - - assert_redirected_to edit_collection_path(collections(:private)) - assert_equal "Renamed", collections(:private).reload.name - assert_equal [ users(:kevin) ], collections(:private).users - assert_not collections(:private).all_access? - end - - test "update all access" do - collection = Current.set(session: sessions(:kevin)) do - Collection.create! name: "New collection", all_access: false - end - assert_equal [ users(:kevin) ], collection.users - - patch collection_path(collection), params: { collection: { name: "Bugs", all_access: true } } - - assert_redirected_to edit_collection_path(collection) - assert collection.reload.all_access? - assert_equal User.active.sort, collection.users.sort - end - - test "destroy" do - collection = collections(:writebook) - delete collection_path(collection) - assert_redirected_to root_path - assert_raises(ActiveRecord::RecordNotFound) { collection.reload } - end -end diff --git a/test/controllers/columns/left_positions_controller_test.rb b/test/controllers/columns/left_positions_controller_test.rb index 1f1570b18..74cb49dc6 100644 --- a/test/controllers/columns/left_positions_controller_test.rb +++ b/test/controllers/columns/left_positions_controller_test.rb @@ -6,8 +6,8 @@ class Columns::LeftPositionsControllerTest < ActionDispatch::IntegrationTest end test "move column left" do - collection = collections(:writebook) - columns = collection.columns.sorted.to_a + board = boards(:writebook) + columns = board.columns.sorted.to_a column_a = columns[0] column_b = columns[1] diff --git a/test/controllers/columns/right_positions_controller_test.rb b/test/controllers/columns/right_positions_controller_test.rb index 572a56383..69dc0bfb6 100644 --- a/test/controllers/columns/right_positions_controller_test.rb +++ b/test/controllers/columns/right_positions_controller_test.rb @@ -6,8 +6,8 @@ class Columns::RightPositionsControllerTest < ActionDispatch::IntegrationTest end test "move column right" do - collection = collections(:writebook) - columns = collection.columns.sorted.to_a + board = boards(:writebook) + columns = board.columns.sorted.to_a column_a = columns[0] column_b = columns[1] diff --git a/test/controllers/events_controller_test.rb b/test/controllers/events_controller_test.rb index 38affbac9..2d22876c0 100644 --- a/test/controllers/events_controller_test.rb +++ b/test/controllers/events_controller_test.rb @@ -26,15 +26,15 @@ class EventsControllerTest < ActionDispatch::IntegrationTest end end - test "only displays events from filtered collections" do - get events_path(collection_ids: [ collections(:writebook).id ]) + test "only displays events from filtered boards" do + get events_path(board_ids: [ boards(:writebook).id ]) assert_response :success events_shown = css_select(".event").count assert events_shown > 0, "Should show some events" css_select(".event").each do |event| - assert_includes event.text, collections(:writebook).name + assert_includes event.text, boards(:writebook).name end end end diff --git a/test/controllers/filters_controller_test.rb b/test/controllers/filters_controller_test.rb index c1717b898..48dab9d75 100644 --- a/test/controllers/filters_controller_test.rb +++ b/test/controllers/filters_controller_test.rb @@ -12,7 +12,7 @@ class FiltersControllerTest < ActionDispatch::IntegrationTest assignment_status: "unassigned", tag_ids: [ tags(:mobile).id ], assignee_ids: [ users(:jz).id ], - collection_ids: [ collections(:writebook).id ] }, as: :turbo_stream + board_ids: [ boards(:writebook).id ] }, as: :turbo_stream end assert_response :success @@ -21,7 +21,7 @@ class FiltersControllerTest < ActionDispatch::IntegrationTest assert_predicate filter.assignment_status, :unassigned? assert_equal [ tags(:mobile) ], filter.tags assert_equal [ users(:jz) ], filter.assignees - assert_equal [ collections(:writebook) ], filter.collections + assert_equal [ boards(:writebook) ], filter.boards end test "destroy" do diff --git a/test/controllers/landings_controller_test.rb b/test/controllers/landings_controller_test.rb index 4358355f6..7495bd57d 100644 --- a/test/controllers/landings_controller_test.rb +++ b/test/controllers/landings_controller_test.rb @@ -5,22 +5,22 @@ class LandingsControllerTest < ActionDispatch::IntegrationTest sign_in_as :kevin end - test "redirects to the timeline when many collections" do + test "redirects to the timeline when many boards" do get landing_path assert_redirected_to events_path end - test "redirects to the timeline when no collections" do - Collection.destroy_all + test "redirects to the timeline when no boards" do + Board.destroy_all get landing_path assert_redirected_to events_path end - test "redirects to collections when only one collection" do - sole_collection, *collections_to_delete = users(:kevin).collections.to_a - collections_to_delete.each(&:destroy) + test "redirects to boards when only one board" do + sole_board, *boards_to_delete = users(:kevin).boards.to_a + boards_to_delete.each(&:destroy) get landing_path - assert_redirected_to collection_path(sole_collection) + assert_redirected_to board_path(sole_board) end end diff --git a/test/controllers/prompts/boards/users_controller_test.rb b/test/controllers/prompts/boards/users_controller_test.rb new file mode 100644 index 000000000..2254bf432 --- /dev/null +++ b/test/controllers/prompts/boards/users_controller_test.rb @@ -0,0 +1,13 @@ +require "test_helper" + +class Prompts::Boards::UsersControllerTest < ActionDispatch::IntegrationTest + setup do + sign_in_as :kevin + @board = boards(:writebook) + end + + test "index" do + get prompts_board_users_path(@board) + assert_response :success + end +end diff --git a/test/controllers/prompts/collections/users_controller_test.rb b/test/controllers/prompts/collections/users_controller_test.rb deleted file mode 100644 index 905e99f0e..000000000 --- a/test/controllers/prompts/collections/users_controller_test.rb +++ /dev/null @@ -1,13 +0,0 @@ -require "test_helper" - -class Prompts::Collections::UsersControllerTest < ActionDispatch::IntegrationTest - setup do - sign_in_as :kevin - @collection = collections(:writebook) - end - - test "index" do - get prompts_collection_users_path(@collection) - assert_response :success - end -end diff --git a/test/controllers/public/boards/columns/closeds_controller_test.rb b/test/controllers/public/boards/columns/closeds_controller_test.rb new file mode 100644 index 000000000..71e58e08b --- /dev/null +++ b/test/controllers/public/boards/columns/closeds_controller_test.rb @@ -0,0 +1,12 @@ +require "test_helper" + +class Public::Boards::Columns::ClosedsControllerTest < ActionDispatch::IntegrationTest + setup do + boards(:writebook).publish + end + + test "show" do + get public_board_columns_closed_path(boards(:writebook).publication.key) + assert_response :success + end +end diff --git a/test/controllers/public/boards/columns/not_nows_controller_test.rb b/test/controllers/public/boards/columns/not_nows_controller_test.rb new file mode 100644 index 000000000..96d96c1f6 --- /dev/null +++ b/test/controllers/public/boards/columns/not_nows_controller_test.rb @@ -0,0 +1,12 @@ +require "test_helper" + +class Public::Boards::Columns::NotNowsControllerTest < ActionDispatch::IntegrationTest + setup do + boards(:writebook).publish + end + + test "show" do + get public_board_columns_not_now_path(boards(:writebook).publication.key) + assert_response :success + end +end diff --git a/test/controllers/public/boards/columns/streams_controller_test.rb b/test/controllers/public/boards/columns/streams_controller_test.rb new file mode 100644 index 000000000..1cb95ae5a --- /dev/null +++ b/test/controllers/public/boards/columns/streams_controller_test.rb @@ -0,0 +1,12 @@ +require "test_helper" + +class Public::Boards::Columns::StreamsControllerTest < ActionDispatch::IntegrationTest + setup do + boards(:writebook).publish + end + + test "show" do + get public_board_columns_stream_path(boards(:writebook).publication.key) + assert_response :success + end +end diff --git a/test/controllers/public/boards/columns_controller_test.rb b/test/controllers/public/boards/columns_controller_test.rb new file mode 100644 index 000000000..d52c8d7b0 --- /dev/null +++ b/test/controllers/public/boards/columns_controller_test.rb @@ -0,0 +1,13 @@ +require "test_helper" + +class Public::Boards::ColumnsControllerTest < ActionDispatch::IntegrationTest + setup do + boards(:writebook).publish + end + + test "show" do + column = columns(:writebook_in_progress) + get public_board_column_path(boards(:writebook).publication.key, column) + assert_response :success + end +end diff --git a/test/controllers/public/boards_controller_test.rb b/test/controllers/public/boards_controller_test.rb new file mode 100644 index 000000000..510ac7f6a --- /dev/null +++ b/test/controllers/public/boards_controller_test.rb @@ -0,0 +1,29 @@ +require "test_helper" + +class Public::BoardsControllerTest < ActionDispatch::IntegrationTest + setup do + sign_in_as :kevin + + boards(:writebook).publish + end + + test "show" do + get published_board_path(boards(:writebook)) + assert_response :success + end + + test "not found if the board is not published" do + key = boards(:writebook).publication.key + + boards(:writebook).unpublish + get public_board_path(key) + + assert_response :not_found + end + + test "show works without authentication" do + sign_out + get published_board_path(boards(:writebook)) + assert_response :success + end +end diff --git a/test/controllers/public/cards_controller_test.rb b/test/controllers/public/cards_controller_test.rb index ed3805367..652da3e8a 100644 --- a/test/controllers/public/cards_controller_test.rb +++ b/test/controllers/public/cards_controller_test.rb @@ -3,19 +3,19 @@ require "test_helper" class Public::CardsControllerTest < ActionDispatch::IntegrationTest setup do sign_in_as :kevin - @collection = collections(:writebook) + @board = boards(:writebook) @card = cards(:logo) - @collection.publish + @board.publish end test "show" do - get public_collection_card_path(@collection.publication.key, @card) + get public_board_card_path(@board.publication.key, @card) assert_response :success end - test "not found if the collection is not published" do - @collection.unpublish - get public_collection_card_path(@collection.publication.key, @card) + test "not found if the board is not published" do + @board.unpublish + get public_board_card_path(@board.publication.key, @card) assert_response :not_found end end diff --git a/test/controllers/public/collections/columns/closeds_controller_test.rb b/test/controllers/public/collections/columns/closeds_controller_test.rb deleted file mode 100644 index f65e5f48c..000000000 --- a/test/controllers/public/collections/columns/closeds_controller_test.rb +++ /dev/null @@ -1,12 +0,0 @@ -require "test_helper" - -class Public::Collections::Columns::ClosedsControllerTest < ActionDispatch::IntegrationTest - setup do - collections(:writebook).publish - end - - test "show" do - get public_collection_columns_closed_path(collections(:writebook).publication.key) - assert_response :success - end -end diff --git a/test/controllers/public/collections/columns/not_nows_controller_test.rb b/test/controllers/public/collections/columns/not_nows_controller_test.rb deleted file mode 100644 index ea9935d61..000000000 --- a/test/controllers/public/collections/columns/not_nows_controller_test.rb +++ /dev/null @@ -1,12 +0,0 @@ -require "test_helper" - -class Public::Collections::Columns::NotNowsControllerTest < ActionDispatch::IntegrationTest - setup do - collections(:writebook).publish - end - - test "show" do - get public_collection_columns_not_now_path(collections(:writebook).publication.key) - assert_response :success - end -end diff --git a/test/controllers/public/collections/columns/streams_controller_test.rb b/test/controllers/public/collections/columns/streams_controller_test.rb deleted file mode 100644 index 5840e0ade..000000000 --- a/test/controllers/public/collections/columns/streams_controller_test.rb +++ /dev/null @@ -1,12 +0,0 @@ -require "test_helper" - -class Public::Collections::Columns::StreamsControllerTest < ActionDispatch::IntegrationTest - setup do - collections(:writebook).publish - end - - test "show" do - get public_collection_columns_stream_path(collections(:writebook).publication.key) - assert_response :success - end -end diff --git a/test/controllers/public/collections/columns_controller_test.rb b/test/controllers/public/collections/columns_controller_test.rb deleted file mode 100644 index 6ff9b398b..000000000 --- a/test/controllers/public/collections/columns_controller_test.rb +++ /dev/null @@ -1,13 +0,0 @@ -require "test_helper" - -class Public::Collections::ColumnsControllerTest < ActionDispatch::IntegrationTest - setup do - collections(:writebook).publish - end - - test "show" do - column = columns(:writebook_in_progress) - get public_collection_column_path(collections(:writebook).publication.key, column) - assert_response :success - end -end diff --git a/test/controllers/public/collections_controller_test.rb b/test/controllers/public/collections_controller_test.rb deleted file mode 100644 index 0a685c0c6..000000000 --- a/test/controllers/public/collections_controller_test.rb +++ /dev/null @@ -1,29 +0,0 @@ -require "test_helper" - -class Public::CollectionsControllerTest < ActionDispatch::IntegrationTest - setup do - sign_in_as :kevin - - collections(:writebook).publish - end - - test "show" do - get published_collection_path(collections(:writebook)) - assert_response :success - end - - test "not found if the collection is not published" do - key = collections(:writebook).publication.key - - collections(:writebook).unpublish - get public_collection_path(key) - - assert_response :not_found - end - - test "show works without authentication" do - sign_out - get published_collection_path(collections(:writebook)) - assert_response :success - end -end diff --git a/test/controllers/webhooks/activations_controller_test.rb b/test/controllers/webhooks/activations_controller_test.rb index 0144f0bd9..65c85d635 100644 --- a/test/controllers/webhooks/activations_controller_test.rb +++ b/test/controllers/webhooks/activations_controller_test.rb @@ -11,9 +11,9 @@ class Webhooks::ActivationsControllerTest < ActionDispatch::IntegrationTest assert_not webhook.active? assert_changes -> { webhook.reload.active? }, from: false, to: true do - post collection_webhook_activation_path(webhook.collection, webhook) + post board_webhook_activation_path(webhook.board, webhook) end - assert_redirected_to collection_webhook_path(webhook.collection, webhook) + assert_redirected_to board_webhook_path(webhook.board, webhook) end end diff --git a/test/controllers/webhooks_controller_test.rb b/test/controllers/webhooks_controller_test.rb index 80b4f5869..f88615f43 100644 --- a/test/controllers/webhooks_controller_test.rb +++ b/test/controllers/webhooks_controller_test.rb @@ -6,27 +6,27 @@ class WebhooksControllerTest < ActionDispatch::IntegrationTest end test "index" do - get collection_webhooks_path(collections(:writebook)) + get board_webhooks_path(boards(:writebook)) assert_response :success end test "show" do webhook = webhooks(:active) - get collection_webhook_path(webhook.collection, webhook) + get board_webhook_path(webhook.board, webhook) assert_response :success end test "new" do - get new_collection_webhook_path(collections(:writebook)) + get new_board_webhook_path(boards(:writebook)) assert_response :success assert_select "form" end test "create with valid params" do - collection = collections(:writebook) + board = boards(:writebook) assert_difference "Webhook.count", 1 do - post collection_webhooks_path(collection), params: { + post board_webhooks_path(board), params: { webhook: { name: "Test Webhook", url: "https://example.com/webhook", @@ -37,17 +37,17 @@ class WebhooksControllerTest < ActionDispatch::IntegrationTest webhook = Webhook.order(id: :desc).first - assert_redirected_to collection_webhook_path(webhook.collection, webhook) - assert_equal collection, webhook.collection + assert_redirected_to board_webhook_path(webhook.board, webhook) + assert_equal board, webhook.board assert_equal "Test Webhook", webhook.name assert_equal "https://example.com/webhook", webhook.url assert_equal [ "card_published", "card_closed" ], webhook.subscribed_actions end test "create with invalid params" do - collection = collections(:writebook) + board = boards(:writebook) assert_no_difference "Webhook.count" do - post collection_webhooks_path(collection), params: { + post board_webhooks_path(board), params: { webhook: { name: "", url: "invalid-url" @@ -60,14 +60,14 @@ class WebhooksControllerTest < ActionDispatch::IntegrationTest test "edit" do webhook = webhooks(:active) - get edit_collection_webhook_path(webhook.collection, webhook) + get edit_board_webhook_path(webhook.board, webhook) assert_response :success assert_select "form" end test "update with valid params" do webhook = webhooks(:active) - patch collection_webhook_path(webhook.collection, webhook), params: { + patch board_webhook_path(webhook.board, webhook), params: { webhook: { name: "Updated Webhook", subscribed_actions: [ "card_published" ] @@ -76,14 +76,14 @@ class WebhooksControllerTest < ActionDispatch::IntegrationTest webhook.reload - assert_redirected_to collection_webhook_path(webhook.collection, webhook) + assert_redirected_to board_webhook_path(webhook.board, webhook) assert_equal "Updated Webhook", webhook.name assert_equal [ "card_published" ], webhook.subscribed_actions end test "update with invalid params" do webhook = webhooks(:active) - patch collection_webhook_path(webhook.collection, webhook), params: { + patch board_webhook_path(webhook.board, webhook), params: { webhook: { name: "" } @@ -92,7 +92,7 @@ class WebhooksControllerTest < ActionDispatch::IntegrationTest assert_response :unprocessable_entity assert_no_changes -> { webhook.reload.url } do - patch collection_webhook_path(webhook.collection, webhook), params: { + patch board_webhook_path(webhook.board, webhook), params: { webhook: { name: "Updated Webhook", url: "https://different.com/webhook" @@ -100,16 +100,16 @@ class WebhooksControllerTest < ActionDispatch::IntegrationTest } end - assert_redirected_to collection_webhook_path(webhook.collection, webhook) + assert_redirected_to board_webhook_path(webhook.board, webhook) end test "destroy" do webhook = webhooks(:active) assert_difference "Webhook.count", -1 do - delete collection_webhook_path(webhook.collection, webhook) + delete board_webhook_path(webhook.board, webhook) end - assert_redirected_to collection_webhooks_path(webhook.collection) + assert_redirected_to board_webhooks_path(webhook.board) end end diff --git a/test/fixtures/accesses.yml b/test/fixtures/accesses.yml index 75e6fdf02..bdf523630 100644 --- a/test/fixtures/accesses.yml +++ b/test/fixtures/accesses.yml @@ -1,15 +1,15 @@ writebook_david: - collection: writebook + board: writebook user: david writebook_jz: - collection: writebook + board: writebook user: jz writebook_kevin: - collection: writebook + board: writebook user: kevin private_kevin: - collection: private + board: private user: kevin diff --git a/test/fixtures/collections.yml b/test/fixtures/boards.yml similarity index 80% rename from test/fixtures/collections.yml rename to test/fixtures/boards.yml index eda825746..d66e9b964 100644 --- a/test/fixtures/collections.yml +++ b/test/fixtures/boards.yml @@ -4,6 +4,6 @@ writebook: all_access: true private: - name: Private collection + name: Private board creator: kevin all_access: false diff --git a/test/fixtures/cards.yml b/test/fixtures/cards.yml index 00b10e2e2..94ef3e0ad 100644 --- a/test/fixtures/cards.yml +++ b/test/fixtures/cards.yml @@ -1,5 +1,5 @@ logo: - collection: writebook + board: writebook creator: david column: writebook_triage title: The logo isn't big enough @@ -9,7 +9,7 @@ logo: last_active_at: <%= 1.week.ago %> layout: - collection: writebook + board: writebook creator: david column: writebook_triage title: Layout is broken @@ -18,7 +18,7 @@ layout: last_active_at: <%= 1.week.ago %> text: - collection: writebook + board: writebook creator: kevin column: writebook_in_progress title: The text is too small @@ -27,7 +27,7 @@ text: last_active_at: <%= 1.week.ago %> shipping: - collection: writebook + board: writebook creator: kevin column: writebook_triage title: We need to ship the app @@ -36,7 +36,7 @@ shipping: last_active_at: <%= 1.week.ago %> buy_domain: - collection: writebook + board: writebook creator: david title: Buy domain created_at: <%= 1.week.ago %> diff --git a/test/fixtures/columns.yml b/test/fixtures/columns.yml index 9c3269637..6e7d372d2 100644 --- a/test/fixtures/columns.yml +++ b/test/fixtures/columns.yml @@ -1,24 +1,24 @@ -# Columns for writebook collection (which has qa workflow) +# Columns for writebook board (which has qa workflow) writebook_triage: name: Triage color: "#000000" - collection: writebook + board: writebook position: 0 writebook_in_progress: name: In progress color: "#3b3633" - collection: writebook + board: writebook position: 1 writebook_on_hold: name: On Hold color: "#67695e" - collection: writebook + board: writebook position: 2 writebook_review: name: Review color: "#eb7a32" - collection: writebook - position: 3 \ No newline at end of file + board: writebook + position: 3 diff --git a/test/fixtures/entropies.yml b/test/fixtures/entropies.yml index dd86ce273..712214176 100644 --- a/test/fixtures/entropies.yml +++ b/test/fixtures/entropies.yml @@ -2,10 +2,10 @@ container: 37s (Account) auto_postpone_period: <%= 30.days.to_i %> -writebook_collection: - container: writebook (Collection) +writebook_board: + container: writebook (Board) auto_postpone_period: <%= 90.days.to_i %> -private_collection: - container: private (Collection) +private_board: + container: private (Board) auto_postpone_period: <%= 30.days.to_i %> diff --git a/test/fixtures/events.yml b/test/fixtures/events.yml index 8fb8dde4f..f8dc7dc38 100644 --- a/test/fixtures/events.yml +++ b/test/fixtures/events.yml @@ -1,13 +1,13 @@ logo_published: creator: david - collection: writebook + board: writebook eventable: logo (Card) action: card_published created_at: <%= 1.week.ago %> logo_assignment_jz: creator: david - collection: writebook + board: writebook eventable: logo (Card) action: card_assigned particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify(:jz) ] }.to_json %> @@ -15,7 +15,7 @@ logo_assignment_jz: logo_assignment_david: creator: david - collection: writebook + board: writebook eventable: logo (Card) action: card_assigned particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify(:david) ] }.to_json %> @@ -23,7 +23,7 @@ logo_assignment_david: logo_assignment_km: creator: david - collection: writebook + board: writebook eventable: logo (Card) action: card_assigned particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify(:kevin) ] }.to_json %> @@ -31,21 +31,21 @@ logo_assignment_km: layout_published: creator: david - collection: writebook + board: writebook eventable: layout (Card) action: card_published created_at: <%= 1.week.ago %> layout_commented: creator: david - collection: writebook + board: writebook eventable: layout_overflowing_david (Comment) action: comment_created created_at: <%= 1.week.ago %> layout_assignment_jz: creator: david - collection: writebook + board: writebook eventable: layout (Card) action: card_assigned particulars: <%= { assignee_ids: [ ActiveRecord::FixtureSet.identify(:jz) ] }.to_json %> @@ -53,21 +53,21 @@ layout_assignment_jz: text_published: creator: kevin - collection: writebook + board: writebook eventable: text (Card) action: card_published created_at: <%= 1.week.ago %> shipping_published: creator: kevin - collection: writebook + board: writebook eventable: shipping (Card) action: card_published created_at: <%= 1.week.ago %> shipping_closed: creator: kevin - collection: writebook + board: writebook eventable: shipping (Card) action: card_closed created_at: <%= 2.days.ago %> diff --git a/test/fixtures/webhooks.yml b/test/fixtures/webhooks.yml index 4184eb577..d70c919f4 100644 --- a/test/fixtures/webhooks.yml +++ b/test/fixtures/webhooks.yml @@ -4,7 +4,7 @@ active: url: https://api.example.com/webhooks signing_secret: p94Bx2HjempCdYB4DTyZkY1b subscribed_actions: '<%= %w[ card_published card_assigned card_closed ].to_json %>' - collection: writebook + board: writebook inactive: active: false @@ -12,4 +12,4 @@ inactive: url: https://test.example.com/webhooks signing_secret: H8ms8ADcV92v2x17hnLEiL5m subscribed_actions: '<%= %w[ card_published card_assigned card_closed ].to_json %>' - collection: private + board: private diff --git a/test/models/access_test.rb b/test/models/access_test.rb index 9a7581674..0ea14a250 100644 --- a/test/models/access_test.rb +++ b/test/models/access_test.rb @@ -17,24 +17,24 @@ class AccessTest < ActiveSupport::TestCase test "event notifications are destroyed when access is lost" do kevin = users(:kevin) - collection = collections(:writebook) + board = boards(:writebook) # make sure we have test coverage for both cards and comments assert kevin.notifications.map(&:source).map(&:eventable_type).uniq.sort == [ "Card", "Comment" ] notifications_to_be_destroyed = kevin.notifications.select do |notification| - notification.card&.collection == collection + notification.card&.board == board end assert notifications_to_be_destroyed.any? kevin_access = accesses(:writebook_kevin) - perform_enqueued_jobs only: Collection::CleanInaccessibleDataJob do + perform_enqueued_jobs only: Board::CleanInaccessibleDataJob do kevin_access.destroy end remaining_notifications = kevin.notifications.reload.select do |notification| - notification.card&.collection == collection + notification.card&.board == board end assert_empty remaining_notifications @@ -42,24 +42,24 @@ class AccessTest < ActiveSupport::TestCase test "mentions are destroyed when access is lost" do david = users(:david) - collection = collections(:writebook) + board = boards(:writebook) # make sure we have test coverage for both cards and comments assert david.mentions.map(&:source_type).uniq.sort == [ "Card", "Comment" ] mentions_to_be_destroyed = david.mentions.select do |mention| - mention.card&.collection == collection + mention.card&.board == board end assert mentions_to_be_destroyed.any? david_access = accesses(:writebook_david) - perform_enqueued_jobs only: Collection::CleanInaccessibleDataJob do + perform_enqueued_jobs only: Board::CleanInaccessibleDataJob do david_access.destroy end remaining_mentions = david.mentions.reload.select do |mention| - mention.card&.collection == collection + mention.card&.board == board end assert_empty remaining_mentions diff --git a/test/models/account/seedeable_test.rb b/test/models/account/seedeable_test.rb index aba88a2a5..961db2f41 100644 --- a/test/models/account/seedeable_test.rb +++ b/test/models/account/seedeable_test.rb @@ -5,8 +5,8 @@ class Account::SedeableTest < ActiveSupport::TestCase @account = Account.sole end - test "setup_customer_template adds collections, cards, and comments" do - assert_changes -> { Collection.count } do + test "setup_customer_template adds boards, cards, and comments" do + assert_changes -> { Board.count } do assert_changes -> { Card.count } do @account.setup_customer_template end diff --git a/test/models/board/accessible_test.rb b/test/models/board/accessible_test.rb new file mode 100644 index 000000000..a384efad3 --- /dev/null +++ b/test/models/board/accessible_test.rb @@ -0,0 +1,41 @@ +require "test_helper" + +class Board::AccessibleTest < ActiveSupport::TestCase + test "revising access" do + boards(:writebook).update! all_access: false + + boards(:writebook).accesses.revise granted: users(:david, :jz), revoked: users(:kevin) + assert_equal users(:david, :jz), boards(:writebook).users + + boards(:writebook).accesses.grant_to users(:kevin) + assert_includes boards(:writebook).users.reload, users(:kevin) + + boards(:writebook).accesses.revoke_from users(:kevin) + assert_not_includes boards(:writebook).users.reload, users(:kevin) + end + + test "grants access to everyone after creation" do + board = Current.set(session: sessions(:david)) do + Board.create! name: "New board", all_access: true + end + assert_equal User.active.sort, board.users.sort + end + + test "grants access to everyone after update" do + board = Current.set(session: sessions(:david)) do + Board.create! name: "New board" + end + assert_equal [ users(:david) ], board.users + + board.update! all_access: true + assert_equal User.active.sort, board.users.reload.sort + end + + test "board watchers" do + boards(:writebook).access_for(users(:kevin)).watching! + assert_includes boards(:writebook).watchers, users(:kevin) + + boards(:writebook).access_for(users(:kevin)).access_only! + assert_not_includes boards(:writebook).reload.watchers, users(:kevin) + end +end diff --git a/test/models/board/cards_test.rb b/test/models/board/cards_test.rb new file mode 100644 index 000000000..59c1cdb7f --- /dev/null +++ b/test/models/board/cards_test.rb @@ -0,0 +1,15 @@ +require "test_helper" + +class Board::CardsTest < ActiveSupport::TestCase + test "touch cards when the name changes" do + board = boards(:writebook) + + assert_changes -> { board.cards.first.updated_at } do + board.update!(name: "New Name") + end + + assert_no_changes -> { board.cards.first.updated_at } do + board.update!(updated_at: 1.hour.from_now) + end + end +end diff --git a/test/models/board/publishable_test.rb b/test/models/board/publishable_test.rb new file mode 100644 index 000000000..e05f19bd2 --- /dev/null +++ b/test/models/board/publishable_test.rb @@ -0,0 +1,55 @@ +require "test_helper" + +class Board::PublishableTest < ActiveSupport::TestCase + setup do + Current.session = sessions(:david) + end + + test "published scope" do + boards(:writebook).publish + assert_includes Board.published, boards(:writebook) + assert_not_includes Board.published, boards(:private) + end + + test "published?" do + assert_not boards(:writebook).published? + boards(:writebook).publish + assert boards(:writebook).published? + end + + test "publish and unpublish" do + assert_not boards(:writebook).published? + + assert_difference -> { Board::Publication.count }, +1 do + boards(:writebook).publish + end + + assert boards(:writebook).published? + + assert_difference -> { Board::Publication.count }, -1 do + boards(:writebook).unpublish + end + + assert_not boards(:writebook).reload.published? + end + + test "find board by publication key" do + boards(:writebook).publish + assert_equal boards(:writebook), Board.find_by_published_key(boards(:writebook).publication.key) + + assert_raise ActiveRecord::RecordNotFound do + Board.find_by_published_key("invalid") + end + end + + test "publish doesn't create duplicate publications" do + boards(:writebook).publish + original_publication = boards(:writebook).publication + + assert_no_difference -> { Board::Publication.count } do + boards(:writebook).publish + end + + assert_equal original_publication, boards(:writebook).reload.publication + end +end diff --git a/test/models/card/commentable_test.rb b/test/models/card/commentable_test.rb index 1f82f4ccc..179828b3b 100644 --- a/test/models/card/commentable_test.rb +++ b/test/models/card/commentable_test.rb @@ -2,7 +2,7 @@ require "test_helper" class Card::CommentableTest < ActiveSupport::TestCase test "creating a comment on a card makes the creator watch the card" do - collections(:writebook).access_for(users(:kevin)).access_only! + boards(:writebook).access_for(users(:kevin)).access_only! assert_not cards(:text).watched_by?(users(:kevin)) with_current_user(:kevin) do diff --git a/test/models/card/entropic_test.rb b/test/models/card/entropic_test.rb index 0512b1c2b..524efc340 100644 --- a/test/models/card/entropic_test.rb +++ b/test/models/card/entropic_test.rb @@ -8,22 +8,22 @@ class Card::EntropicTest < ActiveSupport::TestCase test "auto_postpone_at uses the period defined in the account by default" do freeze_time - entropies(:writebook_collection).destroy + entropies(:writebook_board).destroy entropies("37s_account").reload.update! auto_postpone_period: 456.days cards(:layout).update! last_active_at: 2.day.ago assert_equal (456 - 2).days.from_now, cards(:layout).entropy.auto_clean_at end - test "auto_postpone_at infers the period from the collection when present" do + test "auto_postpone_at infers the period from the board when present" do freeze_time - entropies(:writebook_collection).update! auto_postpone_period: 123.days + entropies(:writebook_board).update! auto_postpone_period: 123.days cards(:layout).update! last_active_at: 2.day.ago assert_equal (123 - 2).days.from_now, cards(:layout).entropy.auto_clean_at end test "auto postpone all due using the default account entropy" do - entropies(:writebook_collection).destroy + entropies(:writebook_board).destroy cards(:logo).update!(last_active_at: 1.day.ago - entropies("37s_account").auto_postpone_period) cards(:shipping).update!(last_active_at: 1.day.from_now - entropies("37s_account").auto_postpone_period) @@ -37,9 +37,9 @@ class Card::EntropicTest < ActiveSupport::TestCase assert_not cards(:shipping).reload.postponed? end - test "auto postpone all due using entropy defined at the collection level" do - cards(:logo).update!(last_active_at: 1.day.ago - entropies(:writebook_collection).auto_postpone_period) - cards(:shipping).update!(last_active_at: 1.day.from_now - entropies(:writebook_collection).auto_postpone_period) + test "auto postpone all due using entropy defined at the board level" do + cards(:logo).update!(last_active_at: 1.day.ago - entropies(:writebook_board).auto_postpone_period) + cards(:shipping).update!(last_active_at: 1.day.from_now - entropies(:writebook_board).auto_postpone_period) assert_difference -> { Card.postponed.count }, +1 do Card.auto_postpone_all_due @@ -52,8 +52,8 @@ class Card::EntropicTest < ActiveSupport::TestCase test "postponing soon scope" do cards(:logo, :shipping).each(&:published!) - cards(:logo).update!(last_active_at: entropies(:writebook_collection).auto_postpone_period.seconds.ago + 2.days) - cards(:shipping).update!(last_active_at: entropies(:writebook_collection).auto_postpone_period.seconds.ago - 2.days) + cards(:logo).update!(last_active_at: entropies(:writebook_board).auto_postpone_period.seconds.ago + 2.days) + cards(:shipping).update!(last_active_at: entropies(:writebook_board).auto_postpone_period.seconds.ago - 2.days) assert_includes Card.postponing_soon, cards(:logo) assert_not_includes Card.postponing_soon, cards(:shipping) diff --git a/test/models/card/eventable_test.rb b/test/models/card/eventable_test.rb index 2eb0a7f35..0c39ffc91 100644 --- a/test/models/card/eventable_test.rb +++ b/test/models/card/eventable_test.rb @@ -8,7 +8,7 @@ class Card::EventableTest < ActiveSupport::TestCase test "new cards get the current time as the last activity time" do freeze_time - card = collections(:writebook).cards.create!(title: "Some card card", creator: users(:david)) + card = boards(:writebook).cards.create!(title: "Some card card", creator: users(:david)) assert_equal Time.current, card.last_active_at end diff --git a/test/models/card/messages_test.rb b/test/models/card/messages_test.rb index fc8bc3509..0bd646fe6 100644 --- a/test/models/card/messages_test.rb +++ b/test/models/card/messages_test.rb @@ -2,7 +2,7 @@ require "test_helper" class Card::MessagesTest < ActiveSupport::TestCase test "creating a card does not create a message by default" do - card = collections(:writebook).cards.create! creator: users(:kevin), title: "New" + card = boards(:writebook).cards.create! creator: users(:kevin), title: "New" assert_empty card.comments end diff --git a/test/models/card/readable_test.rb b/test/models/card/readable_test.rb index ff4a44662..565a31e2b 100644 --- a/test/models/card/readable_test.rb +++ b/test/models/card/readable_test.rb @@ -37,7 +37,7 @@ class Card::ReadableTest < ActiveSupport::TestCase david_notifications = [ notifications(:logo_card_david_mention_by_jz), notifications(:logo_comment_david_mention_by_jz) ] # Kevin loses access - card.collection.accesses.find_by(user: kevin).destroy + card.board.accesses.find_by(user: kevin).destroy assert_not card.accessible_to?(kevin) assert card.accessible_to?(david) diff --git a/test/models/card/stallable_test.rb b/test/models/card/stallable_test.rb index 13ae49972..35995e7ee 100644 --- a/test/models/card/stallable_test.rb +++ b/test/models/card/stallable_test.rb @@ -28,7 +28,7 @@ class Card::StallableTest < ActiveSupport::TestCase test "a card with an old activity spike is not stalled after being postponed" do card = cards(:logo) - card.update!(last_active_at: 1.day.ago - card.collection.entropy.auto_postpone_period) + card.update!(last_active_at: 1.day.ago - card.board.entropy.auto_postpone_period) card.create_activity_spike!(updated_at: 3.months.ago) assert card.stalled? @@ -57,7 +57,7 @@ class Card::StallableTest < ActiveSupport::TestCase test "don't detect activity spikes when creating new cards" do assert_no_enqueued_jobs only: Card::ActivitySpike::DetectionJob do - collections(:writebook).cards.create! title: "A new card", creator: users(:kevin) + boards(:writebook).cards.create! title: "A new card", creator: users(:kevin) end end end diff --git a/test/models/card/statuses_test.rb b/test/models/card/statuses_test.rb index 2ad983790..4b3e41c51 100644 --- a/test/models/card/statuses_test.rb +++ b/test/models/card/statuses_test.rb @@ -2,13 +2,13 @@ require "test_helper" class Card::StatusesTest < ActiveSupport::TestCase test "cards start out in a `drafted` state" do - card = collections(:writebook).cards.create! creator: users(:kevin), title: "Newly created card" + card = boards(:writebook).cards.create! creator: users(:kevin), title: "Newly created card" assert card.drafted? end test "cards are only visible to the creator when drafted" do - card = collections(:writebook).cards.create! creator: users(:kevin), title: "Drafted Card" + card = boards(:writebook).cards.create! creator: users(:kevin), title: "Drafted Card" card.drafted! assert_includes Card.published_or_drafted_by(users(:kevin)), card @@ -16,7 +16,7 @@ class Card::StatusesTest < ActiveSupport::TestCase end test "cards are visible to everyone when published" do - card = collections(:writebook).cards.create! creator: users(:kevin), title: "Published Card" + card = boards(:writebook).cards.create! creator: users(:kevin), title: "Published Card" card.published! assert_includes Card.published_or_drafted_by(users(:kevin)), card @@ -27,11 +27,11 @@ class Card::StatusesTest < ActiveSupport::TestCase Current.session = sessions(:david) assert_no_difference(-> { Event.count }) do - collections(:writebook).cards.create! creator: users(:kevin), title: "Draft Card" + boards(:writebook).cards.create! creator: users(:kevin), title: "Draft Card" end assert_difference(-> { Event.count } => +1) do - @card = collections(:writebook).cards.create! creator: users(:kevin), title: "Published Card", status: :published + @card = boards(:writebook).cards.create! creator: users(:kevin), title: "Published Card", status: :published end assert_equal @card, Event.last.eventable @@ -41,7 +41,7 @@ class Card::StatusesTest < ActiveSupport::TestCase test "an event is created when a card is published" do Current.session = sessions(:david) - card = collections(:writebook).cards.create! creator: users(:kevin), title: "Published Card" + card = boards(:writebook).cards.create! creator: users(:kevin), title: "Published Card" assert_difference(-> { Event.count } => +1) do card.publish end diff --git a/test/models/card/triageable_test.rb b/test/models/card/triageable_test.rb index 50836e821..ca88385e9 100644 --- a/test/models/card/triageable_test.rb +++ b/test/models/card/triageable_test.rb @@ -32,16 +32,16 @@ class Card::TriageableTest < ActiveSupport::TestCase assert card.triaged? end - test "cannot triage into a column from a different collection" do + test "cannot triage into a column from a different board" do card = cards(:buy_domain) - other_collection_column = Column.create!( + other_board_column = Column.create!( name: "Other", color: "#000000", - collection: collections(:private) + board: boards(:private) ) - assert_raises(RuntimeError, "The column must belong to the card collection") do - card.triage_into(other_collection_column) + assert_raises(RuntimeError, "The column must belong to the card board") do + card.triage_into(other_board_column) end end diff --git a/test/models/card/watchable_test.rb b/test/models/card/watchable_test.rb index 7dba084da..a83f4cc99 100644 --- a/test/models/card/watchable_test.rb +++ b/test/models/card/watchable_test.rb @@ -17,14 +17,14 @@ class Card::WatchableTest < ActiveSupport::TestCase end test "cards are initially watched by their creator" do - card = collections(:writebook).cards.create!(creator: users(:kevin)) + card = boards(:writebook).cards.create!(creator: users(:kevin)) assert card.watched_by?(users(:kevin)) end test "watchers" do - collections(:writebook).access_for(users(:kevin)).watching! - collections(:writebook).access_for(users(:jz)).watching! + boards(:writebook).access_for(users(:kevin)).watching! + boards(:writebook).access_for(users(:jz)).watching! cards(:logo).watch_by users(:kevin) cards(:logo).unwatch_by users(:jz) diff --git a/test/models/card_test.rb b/test/models/card_test.rb index 635d5a581..4d995100c 100644 --- a/test/models/card_test.rb +++ b/test/models/card_test.rb @@ -61,7 +61,7 @@ class CardTest < ActiveSupport::TestCase end test "searchable by title" do - card = collections(:writebook).cards.create! title: "Insufficient haggis", creator: users(:kevin) + card = boards(:writebook).cards.create! title: "Insufficient haggis", creator: users(:kevin) assert_includes Card.search("haggis"), card end @@ -86,10 +86,10 @@ class CardTest < ActiveSupport::TestCase assert_equal cards(:layout, :logo), Card.assigned_by(users(:david)) end - test "in collection" do - new_collection = Collection.create! name: "New Collection", creator: users(:david) - assert_equal cards(:logo, :shipping, :layout, :text, :buy_domain), Card.where(collection: collections(:writebook)) - assert_empty Card.where(collection: new_collection) + test "in board" do + new_board = Board.create! name: "New Board", creator: users(:david) + assert_equal cards(:logo, :shipping, :layout, :text, :buy_domain), Card.where(board: boards(:writebook)) + assert_empty Card.where(board: new_board) end test "tagged with" do @@ -97,7 +97,7 @@ class CardTest < ActiveSupport::TestCase end test "mentioning" do - card = collections(:writebook).cards.create! title: "Insufficient haggis", creator: users(:kevin) + card = boards(:writebook).cards.create! title: "Insufficient haggis", creator: users(:kevin) cards(:logo).comments.create!(body: "I hate haggis") cards(:text).comments.create!(body: "I love haggis") @@ -111,54 +111,54 @@ class CardTest < ActiveSupport::TestCase end test "for published cards, it should set the default title 'Untitiled' when not provided" do - card = collections(:writebook).cards.create! + card = boards(:writebook).cards.create! assert_nil card.title card.publish assert_equal "Untitled", card.reload.title end - test "send back to triage when moved to a new collection" do + test "send back to triage when moved to a new board" do cards(:logo).update! column: columns(:writebook_in_progress) assert_changes -> { cards(:logo).reload.triaged? }, from: true, to: false do - cards(:logo).update! collection: collections(:private) + cards(:logo).update! board: boards(:private) end end - test "grants access to assignees when moved to a new collection" do + test "grants access to assignees when moved to a new board" do card = cards(:logo) assignee = users(:david) card.toggle_assignment(assignee) - collection = collections(:private) - assert_not_includes collection.users, assignee + board = boards(:private) + assert_not_includes board.users, assignee - card.update!(collection: collection) - assert_includes collection.users.reload, assignee + card.update!(board: board) + assert_includes board.users.reload, assignee end - test "move cards to a different collection" do + test "move cards to a different board" do card = cards(:logo) - old_collection = collections(:writebook) - new_collection = collections(:private) + old_board = boards(:writebook) + new_board = boards(:private) - assert_equal old_collection, card.collection + assert_equal old_board, card.board - assert card.events.where(collection: old_collection).exists? + assert card.events.where(board: old_board).exists? - card.move_to(new_collection) + card.move_to(new_board) - assert_equal new_collection, card.reload.collection + assert_equal new_board, card.reload.board - events_in_old_collection = card.events.where(collection: old_collection) - events_in_new_collection = card.events.where(collection: new_collection) + events_in_old_board = card.events.where(board: old_board) + events_in_new_board = card.events.where(board: new_board) - assert_empty events_in_old_collection - assert events_in_new_collection.exists? + assert_empty events_in_old_board + assert events_in_new_board.exists? - collection_changed_event = events_in_new_collection.find { |event| event.action == "card_collection_changed" } - assert collection_changed_event + board_changed_event = events_in_new_board.find { |event| event.action == "card_board_changed" } + assert board_changed_event end test "a card is filled if it has either the title or the description set" do diff --git a/test/models/collection/accessible_test.rb b/test/models/collection/accessible_test.rb deleted file mode 100644 index 96e33f460..000000000 --- a/test/models/collection/accessible_test.rb +++ /dev/null @@ -1,41 +0,0 @@ -require "test_helper" - -class Collection::AccessibleTest < ActiveSupport::TestCase - test "revising access" do - collections(:writebook).update! all_access: false - - collections(:writebook).accesses.revise granted: users(:david, :jz), revoked: users(:kevin) - assert_equal users(:david, :jz), collections(:writebook).users - - collections(:writebook).accesses.grant_to users(:kevin) - assert_includes collections(:writebook).users.reload, users(:kevin) - - collections(:writebook).accesses.revoke_from users(:kevin) - assert_not_includes collections(:writebook).users.reload, users(:kevin) - end - - test "grants access to everyone after creation" do - collection = Current.set(session: sessions(:david)) do - Collection.create! name: "New collection", all_access: true - end - assert_equal User.active.sort, collection.users.sort - end - - test "grants access to everyone after update" do - collection = Current.set(session: sessions(:david)) do - Collection.create! name: "New collection" - end - assert_equal [ users(:david) ], collection.users - - collection.update! all_access: true - assert_equal User.active.sort, collection.users.reload.sort - end - - test "collection watchers" do - collections(:writebook).access_for(users(:kevin)).watching! - assert_includes collections(:writebook).watchers, users(:kevin) - - collections(:writebook).access_for(users(:kevin)).access_only! - assert_not_includes collections(:writebook).reload.watchers, users(:kevin) - end -end diff --git a/test/models/collection/cards_test.rb b/test/models/collection/cards_test.rb deleted file mode 100644 index 34bed8d8c..000000000 --- a/test/models/collection/cards_test.rb +++ /dev/null @@ -1,15 +0,0 @@ -require "test_helper" - -class Collection::CardsTest < ActiveSupport::TestCase - test "touch cards when the name changes" do - collection = collections(:writebook) - - assert_changes -> { collection.cards.first.updated_at } do - collection.update!(name: "New Name") - end - - assert_no_changes -> { collection.cards.first.updated_at } do - collection.update!(updated_at: 1.hour.from_now) - end - end -end diff --git a/test/models/collection/publishable_test.rb b/test/models/collection/publishable_test.rb deleted file mode 100644 index ff6424104..000000000 --- a/test/models/collection/publishable_test.rb +++ /dev/null @@ -1,55 +0,0 @@ -require "test_helper" - -class Collection::PublishableTest < ActiveSupport::TestCase - setup do - Current.session = sessions(:david) - end - - test "published scope" do - collections(:writebook).publish - assert_includes Collection.published, collections(:writebook) - assert_not_includes Collection.published, collections(:private) - end - - test "published?" do - assert_not collections(:writebook).published? - collections(:writebook).publish - assert collections(:writebook).published? - end - - test "publish and unpublish" do - assert_not collections(:writebook).published? - - assert_difference -> { Collection::Publication.count }, +1 do - collections(:writebook).publish - end - - assert collections(:writebook).published? - - assert_difference -> { Collection::Publication.count }, -1 do - collections(:writebook).unpublish - end - - assert_not collections(:writebook).reload.published? - end - - test "find collection by publication key" do - collections(:writebook).publish - assert_equal collections(:writebook), Collection.find_by_published_key(collections(:writebook).publication.key) - - assert_raise ActiveRecord::RecordNotFound do - Collection.find_by_published_key("invalid") - end - end - - test "publish doesn't create duplicate publications" do - collections(:writebook).publish - original_publication = collections(:writebook).publication - - assert_no_difference -> { Collection::Publication.count } do - collections(:writebook).publish - end - - assert_equal original_publication, collections(:writebook).reload.publication - end -end diff --git a/test/models/column/positioned_test.rb b/test/models/column/positioned_test.rb index 4d4355cfc..3cd66e314 100644 --- a/test/models/column/positioned_test.rb +++ b/test/models/column/positioned_test.rb @@ -2,17 +2,17 @@ require "test_helper" class Column::PositionedTest < ActiveSupport::TestCase test "auto position new columns" do - collection = collections(:writebook) - max_position = collection.columns.maximum(:position) + board = boards(:writebook) + max_position = board.columns.maximum(:position) - new_column = collection.columns.create!(name: "New Column", color: "#000000") + new_column = board.columns.create!(name: "New Column", color: "#000000") assert_equal max_position + 1, new_column.position end test "move column to the left" do - collection = collections(:writebook) - columns = collection.columns.sorted.to_a + board = boards(:writebook) + columns = board.columns.sorted.to_a column_a = columns[0] column_b = columns[1] @@ -26,8 +26,8 @@ class Column::PositionedTest < ActiveSupport::TestCase end test "move left when already at leftmost position" do - collection = collections(:writebook) - leftmost_column = collection.columns.sorted.first + board = boards(:writebook) + leftmost_column = board.columns.sorted.first original_position = leftmost_column.position leftmost_column.move_left @@ -36,8 +36,8 @@ class Column::PositionedTest < ActiveSupport::TestCase end test "move column to the right" do - collection = collections(:writebook) - columns = collection.columns.sorted.to_a + board = boards(:writebook) + columns = board.columns.sorted.to_a column_a = columns[0] column_b = columns[1] @@ -51,8 +51,8 @@ class Column::PositionedTest < ActiveSupport::TestCase end test "move right when already at rightmost position" do - collection = collections(:writebook) - rightmost_column = collection.columns.sorted.last + board = boards(:writebook) + rightmost_column = board.columns.sorted.last original_position = rightmost_column.position rightmost_column.move_right diff --git a/test/models/column_test.rb b/test/models/column_test.rb index e4786abfb..6bc9e5210 100644 --- a/test/models/column_test.rb +++ b/test/models/column_test.rb @@ -2,7 +2,7 @@ require "test_helper" class ColumnTest < ActiveSupport::TestCase test "creates column with default color when color not provided" do - column = collections(:writebook).columns.create!(name: "New Column") + column = boards(:writebook).columns.create!(name: "New Column") assert_equal Card::DEFAULT_COLOR, column.color end @@ -23,10 +23,10 @@ class ColumnTest < ActiveSupport::TestCase end end - test "touch all collection cards when column is destroyed" do + test "touch all board cards when column is destroyed" do column = columns(:writebook_triage) - assert_changes -> { column.collection.cards.first.updated_at } do + assert_changes -> { column.board.cards.first.updated_at } do column.destroy end end diff --git a/test/models/concerns/mentions_test.rb b/test/models/concerns/mentions_test.rb index 941aed171..d2edb073a 100644 --- a/test/models/concerns/mentions_test.rb +++ b/test/models/concerns/mentions_test.rb @@ -8,7 +8,7 @@ class MentionsTest < ActiveSupport::TestCase test "don't create mentions when creating or updating drafts" do assert_no_difference -> { Mention.count } do perform_enqueued_jobs only: Mention::CreateJob do - card = collections(:writebook).cards.create title: "Cleanup", description: "Did you finish up with the cleanup, @david?" + card = boards(:writebook).cards.create title: "Cleanup", description: "Did you finish up with the cleanup, @david?" card.update description: "Any thoughts here @jz" end end @@ -17,7 +17,7 @@ class MentionsTest < ActiveSupport::TestCase test "create mentions from plain text mentions when publishing cards" do perform_enqueued_jobs only: Mention::CreateJob do card = assert_no_difference -> { Mention.count } do - collections(:writebook).cards.create title: "Cleanup", description: "Did you finish up with the cleanup, @david?" + boards(:writebook).cards.create title: "Cleanup", description: "Did you finish up with the cleanup, @david?" end assert_difference -> { Mention.count }, +1 do @@ -30,7 +30,7 @@ class MentionsTest < ActiveSupport::TestCase perform_enqueued_jobs only: Mention::CreateJob do card = assert_no_difference -> { Mention.count } do attachment = ActionText::Attachment.from_attachable(users(:david)) - collections(:writebook).cards.create title: "Cleanup", description: "Did you finish up with the cleanup, #{attachment.to_html}?" + boards(:writebook).cards.create title: "Cleanup", description: "Did you finish up with the cleanup, #{attachment.to_html}?" end assert_difference -> { Mention.count }, +1 do @@ -41,7 +41,7 @@ class MentionsTest < ActiveSupport::TestCase test "don't create repeated mentions when updating cards" do perform_enqueued_jobs only: Mention::CreateJob do - card = collections(:writebook).cards.create title: "Cleanup", description: "Did you finish up with the cleanup, @david?" + card = boards(:writebook).cards.create title: "Cleanup", description: "Did you finish up with the cleanup, @david?" assert_difference -> { Mention.count }, +1 do card.published! @@ -59,7 +59,7 @@ class MentionsTest < ActiveSupport::TestCase test "create mentions from plain text mentions when posting comments" do perform_enqueued_jobs only: Mention::CreateJob do - card = collections(:writebook).cards.create title: "Cleanup", description: "Some initial content", status: :published + card = boards(:writebook).cards.create title: "Cleanup", description: "Some initial content", status: :published assert_difference -> { Mention.count }, +1 do card.comments.create!(body: "Great work on this @david!") @@ -69,7 +69,7 @@ class MentionsTest < ActiveSupport::TestCase test "don't create mentions from comments when belonging to unpublished cards" do perform_enqueued_jobs only: Mention::CreateJob do - card = collections(:writebook).cards.create title: "Cleanup", description: "Some initial content" + card = boards(:writebook).cards.create title: "Cleanup", description: "Some initial content" assert_no_difference -> { Mention.count } do card.comments.create!(body: "Great work on this @david!") @@ -77,21 +77,21 @@ class MentionsTest < ActiveSupport::TestCase end end - test "can't mention users that don't have access to the collection" do - collections(:writebook).update! all_access: false - collections(:writebook).accesses.revoke_from(users(:david)) + test "can't mention users that don't have access to the board" do + boards(:writebook).update! all_access: false + boards(:writebook).accesses.revoke_from(users(:david)) assert_no_difference -> { Mention.count }, +1 do perform_enqueued_jobs only: Mention::CreateJob do attachment = ActionText::Attachment.from_attachable(users(:david)) - collections(:writebook).cards.create title: "Cleanup", description: "Did you finish up with the cleanup, #{attachment.to_html}?" + boards(:writebook).cards.create title: "Cleanup", description: "Did you finish up with the cleanup, #{attachment.to_html}?" end end end test "mentionees are added as watchers of the card" do perform_enqueued_jobs only: Mention::CreateJob do - card = collections(:writebook).cards.create title: "Cleanup", description: "Did you finish up with the cleanup @kevin?" + card = boards(:writebook).cards.create title: "Cleanup", description: "Did you finish up with the cleanup @kevin?" card.published! assert card.watchers.include?(users(:kevin)) end diff --git a/test/models/entropy_test.rb b/test/models/entropy_test.rb index f5056cf76..9a3ddd577 100644 --- a/test/models/entropy_test.rb +++ b/test/models/entropy_test.rb @@ -1,9 +1,9 @@ require "test_helper" class Entropy::Test < ActiveSupport::TestCase - test "touch cards when entropy changes for collection" do - assert_changes -> { collections(:writebook).cards.first.updated_at } do - collections(:writebook).entropy.update!(auto_postpone_period: 15.days) + test "touch cards when entropy changes for board" do + assert_changes -> { boards(:writebook).cards.first.updated_at } do + boards(:writebook).entropy.update!(auto_postpone_period: 15.days) end end @@ -11,7 +11,7 @@ class Entropy::Test < ActiveSupport::TestCase account = Account.sole assert_changes -> { account.cards.first.updated_at } do - collections(:writebook).entropy.update!(auto_postpone_period: 15.days) + boards(:writebook).entropy.update!(auto_postpone_period: 15.days) end end end diff --git a/test/models/filter_test.rb b/test/models/filter_test.rb index ceda6943c..091580ec3 100644 --- a/test/models/filter_test.rb +++ b/test/models/filter_test.rb @@ -7,8 +7,8 @@ class FilterTest < ActiveSupport::TestCase test "cards" do Current.set session: sessions(:david) do - @new_collection = Collection.create! name: "Inaccessible Collection" - @new_card = @new_collection.cards.create!(status: "published") + @new_board = Board.create! name: "Inaccessible Board" + @new_card = @new_board.cards.create!(status: "published") cards(:layout).comments.create!(body: "I hate haggis") cards(:logo).comments.create!(body: "I love haggis") @@ -19,7 +19,7 @@ class FilterTest < ActiveSupport::TestCase filter = users(:david).filters.new creator_ids: [ users(:david).id ], tag_ids: [ tags(:mobile).id ] assert_equal [ cards(:layout) ], filter.cards - filter = users(:david).filters.new assignment_status: "unassigned", collection_ids: [ @new_collection.id ] + filter = users(:david).filters.new assignment_status: "unassigned", board_ids: [ @new_board.id ] assert_equal [ @new_card ], filter.cards filter = users(:david).filters.new indexed_by: "closed" @@ -33,18 +33,18 @@ class FilterTest < ActiveSupport::TestCase assert_equal [ cards(:logo), cards(:layout) ], filter.cards end - test "can't see cards in collections that aren't accessible" do - collections(:writebook).update! all_access: false - collections(:writebook).accesses.revoke_from users(:david) + test "can't see cards in boards that aren't accessible" do + boards(:writebook).update! all_access: false + boards(:writebook).accesses.revoke_from users(:david) - assert_empty users(:david).filters.new(collection_ids: [ collections(:writebook).id ]).cards + assert_empty users(:david).filters.new(board_ids: [ boards(:writebook).id ]).cards end - test "can't see collections that aren't accessible" do - collections(:writebook).update! all_access: false - collections(:writebook).accesses.revoke_from users(:david) + test "can't see boards that aren't accessible" do + boards(:writebook).update! all_access: false + boards(:writebook).accesses.revoke_from users(:david) - assert_empty users(:david).filters.new(collection_ids: [ collections(:writebook).id ]).collections + assert_empty users(:david).filters.new(board_ids: [ boards(:writebook).id ]).boards end test "remembering equivalent filters" do @@ -65,14 +65,14 @@ class FilterTest < ActiveSupport::TestCase end test "turning into params" do - filter = users(:david).filters.new sorted_by: "latest", tag_ids: "", assignee_ids: [ users(:jz).id ], collection_ids: [ collections(:writebook).id ] - expected = { assignee_ids: [ users(:jz).id ], collection_ids: [ collections(:writebook).id ] } + filter = users(:david).filters.new sorted_by: "latest", tag_ids: "", assignee_ids: [ users(:jz).id ], board_ids: [ boards(:writebook).id ] + expected = { assignee_ids: [ users(:jz).id ], board_ids: [ boards(:writebook).id ] } assert_equal expected, filter.as_params end test "cacheability" do assert_not filters(:jz_assignments).cacheable? - assert users(:david).filters.create!(collection_ids: [ collections(:writebook).id ]).cacheable? + assert users(:david).filters.create!(board_ids: [ boards(:writebook).id ]).cacheable? end test "terms" do @@ -81,12 +81,12 @@ class FilterTest < ActiveSupport::TestCase end test "resource removal" do - filter = users(:david).filters.create! tag_ids: [ tags(:mobile).id ], collection_ids: [ collections(:writebook).id ] + filter = users(:david).filters.create! tag_ids: [ tags(:mobile).id ], board_ids: [ boards(:writebook).id ] assert_includes filter.as_params[:tag_ids], tags(:mobile).id assert_includes filter.tags, tags(:mobile) - assert_includes filter.as_params[:collection_ids], collections(:writebook).id - assert_includes filter.collections, collections(:writebook) + assert_includes filter.as_params[:board_ids], boards(:writebook).id + assert_includes filter.boards, boards(:writebook) assert_changes "filter.reload.updated_at" do tags(:mobile).destroy! @@ -95,14 +95,14 @@ class FilterTest < ActiveSupport::TestCase Current.set session: sessions(:david) do assert_changes "Filter.exists?(filter.id)" do - collections(:writebook).destroy! + boards(:writebook).destroy! end end end test "duplicate filters are removed after a resource is destroyed" do - users(:david).filters.create! tag_ids: [ tags(:mobile).id ], collection_ids: [ collections(:writebook).id ] - users(:david).filters.create! tag_ids: [ tags(:mobile).id, tags(:web).id ], collection_ids: [ collections(:writebook).id ] + users(:david).filters.create! tag_ids: [ tags(:mobile).id ], board_ids: [ boards(:writebook).id ] + users(:david).filters.create! tag_ids: [ tags(:mobile).id, tags(:web).id ], board_ids: [ boards(:writebook).id ] assert_difference "Filter.count", -1 do tags(:web).destroy! @@ -112,7 +112,7 @@ class FilterTest < ActiveSupport::TestCase test "summary" do assert_equal "Newest, #mobile, and assigned to JZ", filters(:jz_assignments).summary - filters(:jz_assignments).update!(assignees: [], tags: [], collections: [ collections(:writebook) ]) + filters(:jz_assignments).update!(assignees: [], tags: [], boards: [ boards(:writebook) ]) assert_equal "Newest", filters(:jz_assignments).summary filters(:jz_assignments).update!(indexed_by: "stalled", sorted_by: "latest") @@ -166,7 +166,7 @@ class FilterTest < ActiveSupport::TestCase assert users(:david).filters.new(creator_ids: [ users(:david).id ]).used? assert_not users(:david).filters.new.used? - assert users(:david).filters.new(collection_ids: [ collections(:writebook).id ]).used? - assert_not users(:david).filters.new(collection_ids: [ collections(:writebook).id ]).used?(ignore_collections: true) + assert users(:david).filters.new(board_ids: [ boards(:writebook).id ]).used? + assert_not users(:david).filters.new(board_ids: [ boards(:writebook).id ]).used?(ignore_boards: true) end end diff --git a/test/models/notifier/event_notifier_test.rb b/test/models/notifier/event_notifier_test.rb index 263c0153f..886551efa 100644 --- a/test/models/notifier/event_notifier_test.rb +++ b/test/models/notifier/event_notifier_test.rb @@ -27,7 +27,7 @@ class Notifier::EventNotifierTest < ActiveSupport::TestCase end test "does not create a notification for access-only users" do - collections(:writebook).access_for(users(:kevin)).access_only! + boards(:writebook).access_for(users(:kevin)).access_only! notifications = Notifier.for(events(:layout_commented)).notify @@ -35,7 +35,7 @@ class Notifier::EventNotifierTest < ActiveSupport::TestCase end test "links to the card" do - collections(:writebook).access_for(users(:kevin)).watching! + boards(:writebook).access_for(users(:kevin)).watching! Notifier.for(events(:logo_published)).notify @@ -43,16 +43,16 @@ class Notifier::EventNotifierTest < ActiveSupport::TestCase end test "assignment events only create a notification for the assignee" do - collections(:writebook).access_for(users(:jz)).watching! - collections(:writebook).access_for(users(:kevin)).watching! + boards(:writebook).access_for(users(:jz)).watching! + boards(:writebook).access_for(users(:kevin)).watching! notifications = Notifier.for(events(:logo_assignment_jz)).notify assert_equal [ users(:jz) ], notifications.map(&:user) end - test "assignment events do not notify users who are access-only for the collection" do - collections(:writebook).access_for(users(:jz)).watching! + test "assignment events do not notify users who are access-only for the board" do + boards(:writebook).access_for(users(:jz)).watching! events(:logo_assignment_jz).update! creator: users(:jz) notifications = Notifier.for(events(:logo_assignment_jz)).notify @@ -61,7 +61,7 @@ class Notifier::EventNotifierTest < ActiveSupport::TestCase end test "assignment events do not notify you if you assigned yourself" do - collections(:writebook).access_for(users(:david)).watching! + boards(:writebook).access_for(users(:david)).watching! notifications = Notifier.for(events(:logo_assignment_david)).notify @@ -85,7 +85,7 @@ class Notifier::EventNotifierTest < ActiveSupport::TestCase end test "assignment events notify assignees regardless of involvement level" do - collections(:writebook).access_for(users(:jz)).access_only! + boards(:writebook).access_for(users(:jz)).access_only! notifications = Notifier.for(events(:logo_assignment_jz)).notify diff --git a/test/models/search_test.rb b/test/models/search_test.rb index 83890945f..c62764584 100644 --- a/test/models/search_test.rb +++ b/test/models/search_test.rb @@ -14,8 +14,8 @@ class SearchTest < ActiveSupport::TestCase end test "don't include innaccessible" do - collections(:writebook).update! all_access: false - collections(:writebook).accesses.revoke_from(@user) + boards(:writebook).update! all_access: false + boards(:writebook).accesses.revoke_from(@user) assert_not @user.search("layout").find { it.card == cards(:layout) } assert_not @user.search("overflowing").find { it.comment == comments(:layout_overflowing_david) } diff --git a/test/models/user/accessor_test.rb b/test/models/user/accessor_test.rb index 3305c37c9..f83935883 100644 --- a/test/models/user/accessor_test.rb +++ b/test/models/user/accessor_test.rb @@ -1,15 +1,15 @@ require "test_helper" class User::AccessorTest < ActiveSupport::TestCase - test "new users get added to all_access collections on creation" do + test "new users get added to all_access boards on creation" do user = User.create!(name: "Jorge") - assert_includes user.collections, collections(:writebook) - assert_equal Collection.all_access.count, user.collections.count + assert_includes user.boards, boards(:writebook) + assert_equal Board.all_access.count, user.boards.count end - test "system user does not get added to collections on creation" do + test "system user does not get added to boards on creation" do system_user = User.create!(role: "system", name: "Test System User") - assert_empty system_user.collections + assert_empty system_user.boards end end diff --git a/test/models/user/role_test.rb b/test/models/user/role_test.rb index 4f3ad0177..9f0889f9e 100644 --- a/test/models/user/role_test.rb +++ b/test/models/user/role_test.rb @@ -7,4 +7,42 @@ class User::RoleTest < ActiveSupport::TestCase assert_not users(:kevin).can_administer?(users(:kevin)) assert_not users(:jz).can_administer?(users(:kevin)) end + + test "can administer board?" do + writebook_board = boards(:writebook) + private_board = boards(:private) + + # Admin can administer any board + assert users(:kevin).can_administer_board?(writebook_board) + assert users(:kevin).can_administer_board?(private_board) + + # Creator can administer their own board + assert users(:david).can_administer_board?(writebook_board) + + # Regular user cannot administer boards they didn't create + assert_not users(:jz).can_administer_board?(writebook_board) + assert_not users(:jz).can_administer_board?(private_board) + + # Creator cannot administer other people's boards + assert_not users(:david).can_administer_board?(private_board) + end + + test "can administer card?" do + logo_card = cards(:logo) + text_card = cards(:text) + + # Admin can administer any card + assert users(:kevin).can_administer_card?(logo_card) + assert users(:kevin).can_administer_card?(text_card) + + # Creator can administer their own card + assert users(:david).can_administer_card?(logo_card) + + # Regular user cannot administer cards they didn't create + assert_not users(:jz).can_administer_card?(logo_card) + assert_not users(:jz).can_administer_card?(text_card) + + # Creator cannot administer other people's cards + assert_not users(:david).can_administer_card?(text_card) + end end diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 2f3e71dca..e074e01f5 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -6,16 +6,16 @@ class UserTest < ActiveSupport::TestCase role: "member", name: "Victor Cooper" - assert_equal [ collections(:writebook) ], user.collections + assert_equal [ boards(:writebook) ], user.boards assert user.settings.present? end - test "creation gives access to all_access collections" do + test "creation gives access to all_access boards" do user = User.create! \ role: "member", name: "Victor Cooper" - assert_equal [ collections(:writebook) ], user.collections + assert_equal [ boards(:writebook) ], user.boards end test "deactivate" do diff --git a/test/models/webhook/delivery_test.rb b/test/models/webhook/delivery_test.rb index 54530bafb..244a9a2cc 100644 --- a/test/models/webhook/delivery_test.rb +++ b/test/models/webhook/delivery_test.rb @@ -117,7 +117,7 @@ class Webhook::DeliveryTest < ActiveSupport::TestCase test "deliver with basecamp webhook format" do webhook = Webhook.create!( - collection: collections(:writebook), + board: boards(:writebook), name: "Basecamp", url: "https://3.basecamp.com/123/integrations/webhook/buckets/456/chats/789/lines" ) @@ -140,7 +140,7 @@ class Webhook::DeliveryTest < ActiveSupport::TestCase test "deliver with campfire webhook format" do webhook = Webhook.create!( - collection: collections(:writebook), + board: boards(:writebook), name: "Campfire", url: "https://example.com/rooms/123/456-room-name/messages" ) @@ -162,7 +162,7 @@ class Webhook::DeliveryTest < ActiveSupport::TestCase test "deliver with slack webhook format" do webhook = Webhook.create!( - collection: collections(:writebook), + board: boards(:writebook), name: "Slack", url: "https://hooks.slack.com/services/T12345678/B12345678/abcdefghijklmnopqrstuvwx" ) @@ -185,7 +185,7 @@ class Webhook::DeliveryTest < ActiveSupport::TestCase test "deliver with generic webhook format" do webhook = Webhook.create!( - collection: collections(:writebook), + board: boards(:writebook), name: "Generic", url: "https://example.com/webhook" ) diff --git a/test/models/webhook_test.rb b/test/models/webhook_test.rb index fe5a92cac..107cbb2d8 100644 --- a/test/models/webhook_test.rb +++ b/test/models/webhook_test.rb @@ -2,7 +2,7 @@ require "test_helper" class WebhookTest < ActiveSupport::TestCase test "create" do - webhook = Webhook.create! name: "Test", url: "https://example.com/webhook", collection: collections(:writebook) + webhook = Webhook.create! name: "Test", url: "https://example.com/webhook", board: boards(:writebook) assert webhook.persisted? assert webhook.active? assert webhook.signing_secret.present? @@ -10,30 +10,30 @@ class WebhookTest < ActiveSupport::TestCase end test "validates the url" do - webhook = Webhook.new name: "Test", collection: collections(:writebook) + webhook = Webhook.new name: "Test", board: boards(:writebook) assert_not webhook.valid? assert_includes webhook.errors[:url], "not a URL" - webhook = Webhook.new name: "Test", collection: collections(:writebook), url: "not a url" + webhook = Webhook.new name: "Test", board: boards(:writebook), url: "not a url" assert_not webhook.valid? assert_includes webhook.errors[:url], "not a URL" - webhook = Webhook.new name: "NOTHING", collection: collections(:writebook), url: "example.com/webhook" + webhook = Webhook.new name: "NOTHING", board: boards(:writebook), url: "example.com/webhook" assert_not webhook.valid? assert_includes webhook.errors[:url], "must use http or https" - webhook = Webhook.new name: "BLANK", collection: collections(:writebook), url: "//example.com/webhook" + webhook = Webhook.new name: "BLANK", board: boards(:writebook), url: "//example.com/webhook" assert_not webhook.valid? assert_includes webhook.errors[:url], "must use http or https" - webhook = Webhook.new name: "GOPHER", collection: collections(:writebook), url: "gopher://example.com/webhook" + webhook = Webhook.new name: "GOPHER", board: boards(:writebook), url: "gopher://example.com/webhook" assert_not webhook.valid? assert_includes webhook.errors[:url], "must use http or https" - webhook = Webhook.new name: "HTTP", collection: collections(:writebook), url: "http://example.com/webhook" + webhook = Webhook.new name: "HTTP", board: boards(:writebook), url: "http://example.com/webhook" assert webhook.valid? - webhook = Webhook.new name: "HTTPS", collection: collections(:writebook), url: "https://example.com/webhook" + webhook = Webhook.new name: "HTTPS", board: boards(:writebook), url: "https://example.com/webhook" assert webhook.valid? end diff --git a/test/system/smoke_test.rb b/test/system/smoke_test.rb index e9c875825..76c601024 100644 --- a/test/system/smoke_test.rb +++ b/test/system/smoke_test.rb @@ -4,7 +4,7 @@ class SmokeTest < ApplicationSystemTestCase test "create a card" do sign_in_as(users(:david)) - visit collection_url(collections(:writebook)) + visit board_url(boards(:writebook)) click_on "Add a card" fill_in "card_title", with: "Hello, world!" fill_in_lexxy with: "I am editing this thing" diff --git a/test/test_helpers/session_test_helper.rb b/test/test_helpers/session_test_helper.rb index dc8f89d55..8936b3548 100644 --- a/test/test_helpers/session_test_helper.rb +++ b/test/test_helpers/session_test_helper.rb @@ -27,6 +27,11 @@ module SessionTestHelper assert_not_nil cookie, "Expected session_token cookie to be set after sign in" end + def logout_and_sign_in_as(identity) + Session.delete_all + sign_in_as identity + end + def sign_out untenanted do delete session_path