<%= render "collections/show/not_now", collection: collection %>
diff --git a/db/migrate/20251015204327_remove_closure_reasons.rb b/db/migrate/20251015204327_remove_closure_reasons.rb
new file mode 100644
index 000000000..6e376a222
--- /dev/null
+++ b/db/migrate/20251015204327_remove_closure_reasons.rb
@@ -0,0 +1,5 @@
+class RemoveClosureReasons < ActiveRecord::Migration[8.1]
+ def change
+ drop_table :closure_reasons
+ end
+end
diff --git a/db/migrate/20251015205212_remove_reason_from_closures.rb b/db/migrate/20251015205212_remove_reason_from_closures.rb
new file mode 100644
index 000000000..1ca3f465d
--- /dev/null
+++ b/db/migrate/20251015205212_remove_reason_from_closures.rb
@@ -0,0 +1,5 @@
+class RemoveReasonFromClosures < ActiveRecord::Migration[8.1]
+ def change
+ remove_column :closures, :reason
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2ae9fd73e..65e226b49 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[8.1].define(version: 2025_10_16_153034) do
+ActiveRecord::Schema[8.2].define(version: 2025_10_16_153034) do
create_table "accesses", force: :cascade do |t|
t.datetime "accessed_at"
t.integer "collection_id", null: false
@@ -29,6 +29,7 @@ ActiveRecord::Schema[8.1].define(version: 2025_10_16_153034) do
t.integer "external_account_id"
t.string "join_code"
t.string "name", null: false
+ t.string "setup_status"
t.datetime "updated_at", null: false
t.index ["external_account_id"], name: "index_accounts_on_external_account_id", unique: true
end
@@ -162,16 +163,9 @@ ActiveRecord::Schema[8.1].define(version: 2025_10_16_153034) do
t.index ["filter_id"], name: "index_closers_filters_on_filter_id"
end
- create_table "closure_reasons", force: :cascade do |t|
- t.datetime "created_at", null: false
- t.string "label"
- t.datetime "updated_at", null: false
- end
-
create_table "closures", force: :cascade do |t|
t.integer "card_id", null: false
t.datetime "created_at", null: false
- t.string "reason", null: false
t.datetime "updated_at", null: false
t.integer "user_id"
t.index ["card_id", "created_at"], name: "index_closures_on_card_id_and_created_at"
@@ -294,6 +288,15 @@ ActiveRecord::Schema[8.1].define(version: 2025_10_16_153034) do
t.index ["tag_id"], name: "index_filters_tags_on_tag_id"
end
+ create_table "integrations", force: :cascade do |t|
+ t.datetime "created_at", null: false
+ t.text "data"
+ t.integer "owner_id", null: false
+ t.string "type"
+ t.datetime "updated_at", null: false
+ t.index ["owner_id"], name: "index_integrations_on_owner_id"
+ end
+
create_table "mentions", force: :cascade do |t|
t.datetime "created_at", null: false
t.integer "mentionee_id", null: false
@@ -404,10 +407,6 @@ ActiveRecord::Schema[8.1].define(version: 2025_10_16_153034) do
t.index ["user_id"], name: "index_sessions_on_user_id"
end
-# Could not dump table "sqlite_stat1" because of following StandardError
-# Unknown type '' for column 'idx'
-
-
create_table "steps", force: :cascade do |t|
t.integer "card_id", null: false
t.boolean "completed", default: false, null: false
@@ -527,6 +526,7 @@ ActiveRecord::Schema[8.1].define(version: 2025_10_16_153034) do
add_foreign_key "conversation_messages", "conversations"
add_foreign_key "conversations", "users"
add_foreign_key "events", "collections"
+ add_foreign_key "integrations", "users", column: "owner_id"
add_foreign_key "mentions", "users", column: "mentionee_id"
add_foreign_key "mentions", "users", column: "mentioner_id"
add_foreign_key "notification_bundles", "users"
diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index b4e6b25f2..513cd51f3 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -133,6 +133,16 @@ columns:
default_function:
collation:
comment:
+ - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+ auto_increment:
+ name: setup_status
+ cast_type: *7
+ sql_type_metadata: *8
+ 'null': true
+ default:
+ default_function:
+ collation:
+ comment:
- *9
action_text_rich_texts:
- !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
@@ -474,12 +484,12 @@ columns:
- !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
auto_increment:
name: due_on
- cast_type: &40 !ruby/object:ActiveRecord::Type::Date
+ cast_type: &38 !ruby/object:ActiveRecord::Type::Date
precision:
scale:
limit:
timezone:
- sql_type_metadata: &41 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
+ sql_type_metadata: &39 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
sql_type: date
type: :date
limit:
@@ -511,7 +521,7 @@ columns:
default_function:
collation:
comment:
- - &39 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+ - &37 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
auto_increment:
name: title
cast_type: *7
@@ -534,34 +544,10 @@ columns:
collation:
comment:
- *20
- closure_reasons:
- - *5
- - *6
- - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
- auto_increment:
- name: label
- cast_type: *7
- sql_type_metadata: *8
- 'null': true
- default:
- default_function:
- collation:
- comment:
- - *9
closures:
- *23
- *5
- *6
- - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
- auto_increment:
- name: reason
- cast_type: *7
- sql_type_metadata: *8
- 'null': false
- default:
- default_function:
- collation:
- comment:
- *9
- *25
collection_publications:
@@ -583,11 +569,11 @@ columns:
- !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
auto_increment:
name: all_access
- cast_type: &35 !ruby/object:ActiveModel::Type::Boolean
+ cast_type: &33 !ruby/object:ActiveModel::Type::Boolean
precision:
scale:
limit:
- sql_type_metadata: &36 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
+ sql_type_metadata: &34 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
sql_type: boolean
type: :boolean
limit:
@@ -865,7 +851,7 @@ columns:
- *9
filters_tags:
- *20
- - &38 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+ - &36 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
auto_increment:
name: tag_id
cast_type: *3
@@ -875,6 +861,40 @@ columns:
default_function:
collation:
comment:
+ integrations:
+ - *5
+ - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+ auto_increment:
+ name: data
+ cast_type: *15
+ sql_type_metadata: *16
+ 'null': true
+ default:
+ default_function:
+ collation:
+ comment:
+ - *6
+ - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+ auto_increment:
+ name: owner_id
+ cast_type: *3
+ sql_type_metadata: *4
+ 'null': false
+ default:
+ default_function:
+ collation:
+ comment:
+ - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+ auto_increment:
+ name: type
+ cast_type: *7
+ sql_type_metadata: *8
+ 'null': true
+ default:
+ default_function:
+ collation:
+ comment:
+ - *9
mentions:
- *5
- *6
@@ -982,7 +1002,7 @@ columns:
- *9
- *18
period_highlights:
- - &37 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+ - &35 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
auto_increment:
name: content
cast_type: *15
@@ -1107,11 +1127,11 @@ columns:
- !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
auto_increment:
name: rowid
- cast_type: &33 !ruby/object:ActiveModel::Type::Value
+ cast_type: !ruby/object:ActiveModel::Type::Value
precision:
scale:
limit:
- sql_type_metadata: &34 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
+ sql_type_metadata: !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata
sql_type: ''
type:
limit:
@@ -1185,50 +1205,19 @@ columns:
- *9
- *32
- *18
- sqlite_stat1:
- - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
- auto_increment:
- name: idx
- cast_type: *33
- sql_type_metadata: *34
- 'null': true
- default:
- default_function:
- collation:
- comment:
- - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
- auto_increment:
- name: stat
- cast_type: *33
- sql_type_metadata: *34
- 'null': true
- default:
- default_function:
- collation:
- comment:
- - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
- auto_increment:
- name: tbl
- cast_type: *33
- sql_type_metadata: *34
- 'null': true
- default:
- default_function:
- collation:
- comment:
steps:
- *23
- !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
auto_increment:
name: completed
- cast_type: *35
- sql_type_metadata: *36
+ cast_type: *33
+ sql_type_metadata: *34
'null': false
default: false
default_function:
collation:
comment:
- - *37
+ - *35
- *5
- *6
- *9
@@ -1236,12 +1225,12 @@ columns:
- *23
- *5
- *6
- - *38
+ - *36
- *9
tags:
- *5
- *6
- - *39
+ - *37
- *9
user_settings:
- !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
@@ -1284,8 +1273,8 @@ columns:
- !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
auto_increment:
name: starts_at
- cast_type: *40
- sql_type_metadata: *41
+ cast_type: *38
+ sql_type_metadata: *39
'null': false
default:
default_function:
@@ -1294,11 +1283,11 @@ columns:
- *9
- *18
users:
- - &43 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+ - &41 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
auto_increment:
name: active
- cast_type: *35
- sql_type_metadata: *36
+ cast_type: *33
+ sql_type_metadata: *34
'null': false
default: true
default_function:
@@ -1347,8 +1336,8 @@ columns:
- !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
auto_increment:
name: watching
- cast_type: *35
- sql_type_metadata: *36
+ cast_type: *33
+ sql_type_metadata: *34
'null': false
default: true
default_function:
@@ -1378,7 +1367,7 @@ columns:
comment:
- *6
- *9
- - &42 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
+ - &40 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column
auto_increment:
name: webhook_id
cast_type: *3
@@ -1432,9 +1421,9 @@ columns:
collation:
comment:
- *9
- - *42
+ - *40
webhooks:
- - *43
+ - *41
- *24
- *5
- *6
@@ -1497,7 +1486,6 @@ primary_keys:
card_not_nows: id
cards: id
closers_filters:
- closure_reasons: id
closures: id
collection_publications: id
collections: id
@@ -1511,6 +1499,7 @@ primary_keys:
events: id
filters: id
filters_tags:
+ integrations: id
mentions: id
notification_bundles: id
notifications: id
@@ -1523,7 +1512,6 @@ primary_keys:
search_queries: id
search_results: id
sessions: id
- sqlite_stat1:
steps: id
taggings: id
tags: id
@@ -1552,7 +1540,6 @@ data_sources:
card_not_nows: true
cards: true
closers_filters: true
- closure_reasons: true
closures: true
collection_publications: true
collections: true
@@ -1566,6 +1553,7 @@ data_sources:
events: true
filters: true
filters_tags: true
+ integrations: true
mentions: true
notification_bundles: true
notifications: true
@@ -1578,7 +1566,6 @@ data_sources:
search_queries: true
search_results: true
sessions: true
- sqlite_stat1: true
steps: true
taggings: true
tags: true
@@ -2096,7 +2083,6 @@ indexes:
nulls_not_distinct:
comment:
valid: true
- closure_reasons: []
closures:
- !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
table: closures
@@ -2502,6 +2488,23 @@ indexes:
nulls_not_distinct:
comment:
valid: true
+ integrations:
+ - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+ table: integrations
+ name: index_integrations_on_owner_id
+ unique: false
+ columns:
+ - owner_id
+ lengths: {}
+ orders: {}
+ opclasses: {}
+ where:
+ type:
+ using:
+ include:
+ nulls_not_distinct:
+ comment:
+ valid: true
mentions:
- !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
table: mentions
@@ -2930,7 +2933,6 @@ indexes:
nulls_not_distinct:
comment:
valid: true
- sqlite_stat1: []
steps:
- !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
table: steps
diff --git a/db/untenanted_schema.rb b/db/untenanted_schema.rb
index d7f090873..1272ff070 100644
--- a/db/untenanted_schema.rb
+++ b/db/untenanted_schema.rb
@@ -10,12 +10,23 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[8.1].define(version: 2025_09_24_190729) do
+ActiveRecord::Schema[8.1].define(version: 2025_10_07_112917) do
create_table "identities", force: :cascade do |t|
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
+ create_table "magic_links", force: :cascade do |t|
+ t.string "code"
+ t.datetime "created_at", null: false
+ t.datetime "expires_at"
+ t.integer "membership_id", null: false
+ t.datetime "updated_at", null: false
+ t.index ["code"], name: "index_magic_links_on_code", unique: true
+ t.index ["expires_at"], name: "index_magic_links_on_expires_at"
+ t.index ["membership_id"], name: "index_magic_links_on_membership_id"
+ end
+
create_table "memberships", force: :cascade do |t|
t.string "account_name", null: false
t.datetime "created_at", null: false
@@ -29,5 +40,6 @@ ActiveRecord::Schema[8.1].define(version: 2025_09_24_190729) do
t.index ["user_tenant", "user_id"], name: "index_memberships_on_user_tenant_and_user_id"
end
+ add_foreign_key "magic_links", "memberships"
add_foreign_key "memberships", "identities"
end
diff --git a/script/create-account.rb b/script/create-account.rb
new file mode 100755
index 000000000..cb7c74416
--- /dev/null
+++ b/script/create-account.rb
@@ -0,0 +1,111 @@
+#!/usr/bin/env ruby
+# Usage: script/create-account "Company Name" "Owner Name" "owner@example.com"
+
+require_relative "../config/environment"
+
+# Parse arguments
+if ARGV.size != 3
+ puts "Usage: script/create-account
"
+ puts "Example: script/create-account 'Acme Corp' 'John Doe' 'john@acme.com'"
+ exit 1
+end
+
+company_name, owner_name, owner_email = ARGV
+password = SecureRandom.hex(16)
+
+# Create a minimal Current context for the signup
+Current.set(
+ ip_address: "127.0.0.1",
+ user_agent: "create-account script",
+ referrer: nil
+) do
+ puts "Creating account..."
+ puts " Company: #{company_name}"
+ puts " Owner: #{owner_name}"
+ puts " Email: #{owner_email}"
+ puts
+
+ # Step 1: Create the account in QueenBee
+ queenbee_account_attributes = {
+ skip_remote: true,
+ product_name: "fizzy",
+ name: company_name,
+ owner_name: owner_name,
+ owner_email: owner_email,
+ trial: true,
+ subscription: {
+ name: "FreeV1",
+ price: 0
+ },
+ remote_request: {
+ remote_address: Current.ip_address,
+ user_agent: Current.user_agent,
+ referrer: Current.referrer
+ }
+ }
+
+ begin
+ queenbee_account = Queenbee::Remote::Account.create!(queenbee_account_attributes)
+ puts "✓ Account created in QueenBee"
+ rescue => error
+ puts "Error creating QueenBee account:"
+ puts " - #{error.message}"
+ exit 1
+ end
+
+ # Step 2: Create tenant with the QueenBee account ID
+ tenant_id = queenbee_account.id.to_s
+
+ begin
+ ApplicationRecord.create_tenant(tenant_id) do
+ # Create account with admin user
+ account = Account.create_with_admin_user(
+ account: {
+ external_account_id: tenant_id,
+ name: company_name
+ },
+ owner: {
+ name: owner_name,
+ email_address: owner_email,
+ password: password
+ }
+ )
+
+ # Setup basic template
+ account.setup_basic_template
+ end
+
+ puts "✓ Tenant created"
+ puts "✓ Account setup completed"
+ rescue => error
+ # Clean up QueenBee account if tenant creation fails
+ queenbee_account&.cancel
+
+ puts "Error setting up tenant:"
+ puts " - #{error.message}"
+ exit 1
+ end
+
+ # Step 3: Get or create join code
+ ApplicationRecord.with_tenant(tenant_id) do
+ account = Account.sole
+ join_code = account.join_code
+
+ puts "✓ Join code ready"
+ puts
+ puts "Account created successfully!"
+ puts "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+ puts "Tenant: #{tenant_id}"
+ puts "Company: #{company_name}"
+ puts "Owner: #{owner_name}"
+ puts "Email: #{owner_email}"
+ puts "Password: #{password}"
+ puts "Join URL: #{Rails.application.routes.url_helpers.join_url(
+ join_code: join_code,
+ script_name: "/#{tenant_id}",
+ host: Rails.application.config.action_mailer.default_url_options[:host],
+ port: Rails.application.config.action_mailer.default_url_options[:port],
+ protocol: Rails.env.production? ? 'https' : 'http'
+ )}"
+ end
+end
diff --git a/test/controllers/cards/closures_controller_test.rb b/test/controllers/cards/closures_controller_test.rb
index 1e8f85871..73c1181e4 100644
--- a/test/controllers/cards/closures_controller_test.rb
+++ b/test/controllers/cards/closures_controller_test.rb
@@ -9,11 +9,9 @@ class Cards::ClosuresControllerTest < ActionDispatch::IntegrationTest
card = cards(:logo)
assert_changes -> { card.reload.closed? }, from: false, to: true do
- post card_closure_path(card, reason: "Scope too big")
+ post card_closure_path(card)
assert_card_container_rerendered(card)
end
-
- assert_equal "Scope too big", card.closure.reason
end
test "destroy" do
diff --git a/test/fixtures/closures.yml b/test/fixtures/closures.yml
index 8ddfbbe4c..cf9593601 100644
--- a/test/fixtures/closures.yml
+++ b/test/fixtures/closures.yml
@@ -1,4 +1,3 @@
shipping:
card: shipping
- user: kevin
- reason: Closed
+ user: kevin
\ No newline at end of file
diff --git a/test/models/card/eventable/system_commenter_test.rb b/test/models/card/eventable/system_commenter_test.rb
index 6f125f869..2008c031c 100644
--- a/test/models/card/eventable/system_commenter_test.rb
+++ b/test/models/card/eventable/system_commenter_test.rb
@@ -22,7 +22,7 @@ class Card::Eventable::SystemCommenterTest < ActiveSupport::TestCase
end
test "card_closed" do
- assert_system_comment "Closed as ‘Done’ by David" do
+ assert_system_comment "Marked as “Done” by David" do
@card.close
end
end
diff --git a/test/models/filter_test.rb b/test/models/filter_test.rb
index 56a627883..a47e4ccba 100644
--- a/test/models/filter_test.rb
+++ b/test/models/filter_test.rb
@@ -34,7 +34,7 @@ class FilterTest < ActiveSupport::TestCase
filter = users(:david).filters.new card_ids: [ cards(:logo, :layout).collect(&:id) ]
cards(:logo).drafted!
- assert_equal [ cards(:layout) ], filter.cards
+ assert_equal [ cards(:logo), cards(:layout) ], filter.cards
end
test "can't see cards in collections that aren't accessible" do