From 3f9c3a8f449be17e054456aa012b0c3f6562b3a4 Mon Sep 17 00:00:00 2001 From: briri Date: Mon, 13 May 2024 09:16:30 -0700 Subject: [PATCH 1/2] removed deprecated version line from docker-compose --- db/schema.rb | 1 + docker-compose.yml | 2 -- react-client/src/models.js | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 6c8fd3fca6..77d31672b8 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -847,6 +847,7 @@ t.index ["user_id"], name: "index_users_perms_on_user_id" 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 "answers", "plans" add_foreign_key "answers", "questions" diff --git a/docker-compose.yml b/docker-compose.yml index 27d6d821bd..c3fe0f19f4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.4' - # NOTE:: # # The services, settings and environment setup in this compose file is diff --git a/react-client/src/models.js b/react-client/src/models.js index 6ac3380fe7..00a0d6e339 100644 --- a/react-client/src/models.js +++ b/react-client/src/models.js @@ -324,7 +324,7 @@ export class DataRepository extends Model { set title(val) { this.setData("host.title", val); } get url() { return this.getData("host.url", ""); } - set url(val) { this.setData("host.url", val); } + set url(val) { this.setData("host.url", val?.trim()); } get description() { return this.getData("host.description", ""); } set description(val) { this.setData("host.description", val); } From 2e1dfde9ea5223be776d8794469f5743cee82f03 Mon Sep 17 00:00:00 2001 From: briri Date: Mon, 13 May 2024 11:19:58 -0700 Subject: [PATCH 2/2] update to remove redundant optional chaining --- react-client/src/models.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/react-client/src/models.js b/react-client/src/models.js index 00a0d6e339..b7b926d21f 100644 --- a/react-client/src/models.js +++ b/react-client/src/models.js @@ -324,7 +324,7 @@ export class DataRepository extends Model { set title(val) { this.setData("host.title", val); } get url() { return this.getData("host.url", ""); } - set url(val) { this.setData("host.url", val?.trim()); } + set url(val) { this.setData("host.url", val.trim()); } get description() { return this.getData("host.description", ""); } set description(val) { this.setData("host.description", val); }