From 5140deb6f682026594f1be847a643466829bbb96 Mon Sep 17 00:00:00 2001 From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com> Date: Wed, 9 Jul 2025 22:21:25 +0530 Subject: [PATCH 1/4] feat: Captain settings header component (#11912) --- .../settings/SettingsHeader.story.vue | 28 +++++++++++++++++++ .../settings/SettingsHeader.vue | 19 +++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 app/javascript/dashboard/components-next/captain/pageComponents/settings/SettingsHeader.story.vue create mode 100644 app/javascript/dashboard/components-next/captain/pageComponents/settings/SettingsHeader.vue diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/settings/SettingsHeader.story.vue b/app/javascript/dashboard/components-next/captain/pageComponents/settings/SettingsHeader.story.vue new file mode 100644 index 000000000..654e5ab16 --- /dev/null +++ b/app/javascript/dashboard/components-next/captain/pageComponents/settings/SettingsHeader.story.vue @@ -0,0 +1,28 @@ + + + diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/settings/SettingsHeader.vue b/app/javascript/dashboard/components-next/captain/pageComponents/settings/SettingsHeader.vue new file mode 100644 index 000000000..dc6b7dda9 --- /dev/null +++ b/app/javascript/dashboard/components-next/captain/pageComponents/settings/SettingsHeader.vue @@ -0,0 +1,19 @@ + + + From 408cc4dd3f5e8832261ec092069152b8552b0cd3 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 10 Jul 2025 08:21:19 +0530 Subject: [PATCH 2/4] feat: remove foreign key --- db/migrate/20250709075622_create_captain_scenarios.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20250709075622_create_captain_scenarios.rb b/db/migrate/20250709075622_create_captain_scenarios.rb index 2416c929c..a922bd478 100644 --- a/db/migrate/20250709075622_create_captain_scenarios.rb +++ b/db/migrate/20250709075622_create_captain_scenarios.rb @@ -6,7 +6,7 @@ class CreateCaptainScenarios < ActiveRecord::Migration[7.1] t.text :instruction t.jsonb :tools, default: [] t.boolean :enabled, default: true, null: false - t.references :assistant, null: false, foreign_key: { to_table: :captain_assistants } + t.references :assistant, null: false t.references :account, null: false t.timestamps From bda09cc06439e7fa131a064f0cfc82a5130cad5a Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 10 Jul 2025 08:23:05 +0530 Subject: [PATCH 3/4] feat: remove foeign key --- db/schema.rb | 1 - enterprise/app/models/captain/scenario.rb | 4 ---- 2 files changed, 5 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index ad606550c..b46badafc 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1130,7 +1130,6 @@ ActiveRecord::Schema[7.1].define(version: 2025_07_09_075622) do 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 "captain_scenarios", "captain_assistants", column: "assistant_id" add_foreign_key "inboxes", "portals" create_trigger("accounts_after_insert_row_tr", :generated => true, :compatibility => 1). on("accounts"). diff --git a/enterprise/app/models/captain/scenario.rb b/enterprise/app/models/captain/scenario.rb index 0878ab2e9..ff8e63c64 100644 --- a/enterprise/app/models/captain/scenario.rb +++ b/enterprise/app/models/captain/scenario.rb @@ -20,10 +20,6 @@ # index_captain_scenarios_on_assistant_id_and_enabled (assistant_id,enabled) # index_captain_scenarios_on_enabled (enabled) # -# Foreign Keys -# -# fk_rails_... (assistant_id => captain_assistants.id) -# class Captain::Scenario < ApplicationRecord self.table_name = 'captain_scenarios' From 9165cab1ecc76a8559f631d5f35a400d3588a5c7 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 10 Jul 2025 20:29:23 +0530 Subject: [PATCH 4/4] refactor: update migration --- ..._scenarios.rb => 20250710145708_create_captain_scenarios.rb} | 0 db/schema.rb | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename db/migrate/{20250709075622_create_captain_scenarios.rb => 20250710145708_create_captain_scenarios.rb} (100%) diff --git a/db/migrate/20250709075622_create_captain_scenarios.rb b/db/migrate/20250710145708_create_captain_scenarios.rb similarity index 100% rename from db/migrate/20250709075622_create_captain_scenarios.rb rename to db/migrate/20250710145708_create_captain_scenarios.rb diff --git a/db/schema.rb b/db/schema.rb index b46badafc..837eb58bd 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[7.1].define(version: 2025_07_09_075622) do +ActiveRecord::Schema[7.1].define(version: 2025_07_10_145708) do # These extensions should be enabled to support this database enable_extension "pg_stat_statements" enable_extension "pg_trgm"