From d793d4fe54ea8687ddcbcc9bc9289d0522252f66 Mon Sep 17 00:00:00 2001 From: f Date: Fri, 5 Jul 2024 11:56:48 -0300 Subject: [PATCH 1/2] fix: poder mandar uuids de relaciones! --- app/javascript/controllers/array_controller.js | 2 +- app/views/posts/attributes/_new_belongs_to.haml | 2 +- app/views/posts/attributes/_new_has_and_belongs_to_many.haml | 2 +- app/views/posts/attributes/_new_has_many.haml | 2 +- app/views/targets/array/_item.haml | 3 +++ 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/javascript/controllers/array_controller.js b/app/javascript/controllers/array_controller.js index fb74a673..fea690d2 100644 --- a/app/javascript/controllers/array_controller.js +++ b/app/javascript/controllers/array_controller.js @@ -108,7 +108,7 @@ export default class extends Controller { if (!this.isChecked(itemTarget)) continue; this.originalValue.push(itemTarget.dataset.value); - this.newArrayValueURL.searchParams.set("value", itemTarget.dataset?.humanValue || itemTarget.dataset?.value); + this.newArrayValueURL.searchParams.set("value", itemTarget.dataset?.sendValue || itemTarget.dataset?.value); const placeholder = this.placeholderTarget.content.firstElementChild.cloneNode(true); diff --git a/app/views/posts/attributes/_new_belongs_to.haml b/app/views/posts/attributes/_new_belongs_to.haml index 20b40140..d23301d9 100644 --- a/app/views/posts/attributes/_new_belongs_to.haml +++ b/app/views/posts/attributes/_new_belongs_to.haml @@ -58,7 +58,7 @@ - content_for :"#{id}_body" do .form-group.mb-0{ id: value_list_id } - metadata.values.each_pair do |value, uuid| - = render 'targets/array/item', value: uuid, 'human-value': value, class: 'mb-2' do + = render 'targets/array/item', value: uuid, 'send-value': uuid, 'human-value': value, class: 'mb-2' do = render 'bootstrap/custom_checkbox', name: name, id: random_id, value: uuid, checked: metadata.value.include?(uuid), content: value, type: 'radio' -# diff --git a/app/views/posts/attributes/_new_has_and_belongs_to_many.haml b/app/views/posts/attributes/_new_has_and_belongs_to_many.haml index d70d9eb4..bf5e45e9 100644 --- a/app/views/posts/attributes/_new_has_and_belongs_to_many.haml +++ b/app/views/posts/attributes/_new_has_and_belongs_to_many.haml @@ -59,7 +59,7 @@ - content_for :"#{id}_body" do .form-group.mb-0{ id: value_list_id } - metadata.values.each_pair do |value, uuid| - = render 'targets/array/item', value: uuid, 'human-value': value, class: 'mb-2' do + = render 'targets/array/item', value: uuid, 'send-value': uuid, 'human-value': value, class: 'mb-2' do = render 'bootstrap/custom_checkbox', name: name, id: random_id, value: uuid, checked: metadata.value.include?(uuid), content: value, data: { action: 'required-checkbox#change', target: 'required-checkbox.checkbox' } -# diff --git a/app/views/posts/attributes/_new_has_many.haml b/app/views/posts/attributes/_new_has_many.haml index 601a7e38..39d4538d 100644 --- a/app/views/posts/attributes/_new_has_many.haml +++ b/app/views/posts/attributes/_new_has_many.haml @@ -59,7 +59,7 @@ - content_for :"#{id}_body" do .form-group.mb-0{ id: value_list_id } - metadata.values.each_pair do |value, uuid| - = render 'targets/array/item', value: uuid, 'human-value': value, class: 'mb-2' do + = render 'targets/array/item', value: uuid, 'send-value': uuid, 'human-value': value, class: 'mb-2' do = render 'bootstrap/custom_checkbox', name: name, id: random_id, value: uuid, checked: metadata.value.include?(uuid), content: value, data: { action: 'required-checkbox#change', target: 'required-checkbox.checkbox' } -# diff --git a/app/views/targets/array/_item.haml b/app/views/targets/array/_item.haml index f89a42e5..ead9f4e2 100644 --- a/app/views/targets/array/_item.haml +++ b/app/views/targets/array/_item.haml @@ -6,16 +6,19 @@ @param :value [String] El valor (requerido) @param :human-value [String] El valor legible por humanes (opcional) + @param :send-value [String] El valor que se envía al controlador (opcional) @param :searchable-value [String] El valor para usar en el filtro (opcional) :ruby local_assigns[:'human-value'] ||= value + local_assigns[:'send-value'] ||= local_assigns[:'human-value'] local_assigns[:'searchable-value'] ||= local_assigns[:'human-value'].remove_diacritics.downcase local_assigns.delete(:value) data = local_assigns.delete(:data) data ||= {} data[:'human-value'] = local_assigns.delete(:'human-value') + data[:'send-value'] = local_assigns.delete(:'send-value') data[:'searchable-value'] = local_assigns.delete(:'searchable-value') %div{ **local_assigns, data: { target: 'array.item', value: value, **data } }= yield From 2633cd444a0072466504852607190266127e128e Mon Sep 17 00:00:00 2001 From: f Date: Fri, 5 Jul 2024 11:59:38 -0300 Subject: [PATCH 2/2] ci: assets [skip ci] --- .../.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json | 2 +- .../{application-e0d66cef.css => application-5688882d.css} | 0 ...pplication-e0d66cef.css.br => application-5688882d.css.br} | 0 ...pplication-e0d66cef.css.gz => application-5688882d.css.gz} | 0 public/packs/js/application-b4baa487ab2bd8d1019a.js | 3 --- public/packs/js/application-b4baa487ab2bd8d1019a.js.br | 3 --- public/packs/js/application-b4baa487ab2bd8d1019a.js.gz | 3 --- public/packs/js/application-b4baa487ab2bd8d1019a.js.map | 3 --- public/packs/js/application-b4baa487ab2bd8d1019a.js.map.br | 3 --- public/packs/js/application-b4baa487ab2bd8d1019a.js.map.gz | 3 --- public/packs/js/application-f68840b38b1cfd7c6500.js | 3 +++ ...SE.txt => application-f68840b38b1cfd7c6500.js.LICENSE.txt} | 0 public/packs/js/application-f68840b38b1cfd7c6500.js.br | 3 +++ public/packs/js/application-f68840b38b1cfd7c6500.js.gz | 3 +++ public/packs/js/application-f68840b38b1cfd7c6500.js.map | 3 +++ public/packs/js/application-f68840b38b1cfd7c6500.js.map.br | 3 +++ public/packs/js/application-f68840b38b1cfd7c6500.js.map.gz | 3 +++ public/packs/manifest.json | 2 +- public/packs/manifest.json.br | 4 ++-- public/packs/manifest.json.gz | 4 ++-- 20 files changed, 24 insertions(+), 24 deletions(-) rename public/packs/css/{application-e0d66cef.css => application-5688882d.css} (100%) rename public/packs/css/{application-e0d66cef.css.br => application-5688882d.css.br} (100%) rename public/packs/css/{application-e0d66cef.css.gz => application-5688882d.css.gz} (100%) delete mode 100644 public/packs/js/application-b4baa487ab2bd8d1019a.js delete mode 100644 public/packs/js/application-b4baa487ab2bd8d1019a.js.br delete mode 100644 public/packs/js/application-b4baa487ab2bd8d1019a.js.gz delete mode 100644 public/packs/js/application-b4baa487ab2bd8d1019a.js.map delete mode 100644 public/packs/js/application-b4baa487ab2bd8d1019a.js.map.br delete mode 100644 public/packs/js/application-b4baa487ab2bd8d1019a.js.map.gz create mode 100644 public/packs/js/application-f68840b38b1cfd7c6500.js rename public/packs/js/{application-b4baa487ab2bd8d1019a.js.LICENSE.txt => application-f68840b38b1cfd7c6500.js.LICENSE.txt} (100%) create mode 100644 public/packs/js/application-f68840b38b1cfd7c6500.js.br create mode 100644 public/packs/js/application-f68840b38b1cfd7c6500.js.gz create mode 100644 public/packs/js/application-f68840b38b1cfd7c6500.js.map create mode 100644 public/packs/js/application-f68840b38b1cfd7c6500.js.map.br create mode 100644 public/packs/js/application-f68840b38b1cfd7c6500.js.map.gz diff --git a/public/assets/.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json b/public/assets/.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json index 3dd4cacc..02e6a28b 100644 --- a/public/assets/.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json +++ b/public/assets/.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3064b08aac06129b3c1258f031ce1ad74c9b645b9d3ca57f6760493c5d2bdbf +oid sha256:8af1de94a735716b08f764211a456dee79e1f4e230dd7f8a71c6ba67d2cbdb4c size 11449 diff --git a/public/packs/css/application-e0d66cef.css b/public/packs/css/application-5688882d.css similarity index 100% rename from public/packs/css/application-e0d66cef.css rename to public/packs/css/application-5688882d.css diff --git a/public/packs/css/application-e0d66cef.css.br b/public/packs/css/application-5688882d.css.br similarity index 100% rename from public/packs/css/application-e0d66cef.css.br rename to public/packs/css/application-5688882d.css.br diff --git a/public/packs/css/application-e0d66cef.css.gz b/public/packs/css/application-5688882d.css.gz similarity index 100% rename from public/packs/css/application-e0d66cef.css.gz rename to public/packs/css/application-5688882d.css.gz diff --git a/public/packs/js/application-b4baa487ab2bd8d1019a.js b/public/packs/js/application-b4baa487ab2bd8d1019a.js deleted file mode 100644 index d23bcf7c..00000000 --- a/public/packs/js/application-b4baa487ab2bd8d1019a.js +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5570cf8d82b589e8dd4a77d7f20e74fbbcf7721d984acaaf9fa2b63c26a2def5 -size 1669136 diff --git a/public/packs/js/application-b4baa487ab2bd8d1019a.js.br b/public/packs/js/application-b4baa487ab2bd8d1019a.js.br deleted file mode 100644 index 3416ea3f..00000000 --- a/public/packs/js/application-b4baa487ab2bd8d1019a.js.br +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7fe6aaef8a5f46abf666a70308a564bbd873bd5637c6caf1908bb0b78eea32e -size 368588 diff --git a/public/packs/js/application-b4baa487ab2bd8d1019a.js.gz b/public/packs/js/application-b4baa487ab2bd8d1019a.js.gz deleted file mode 100644 index 5f810b02..00000000 --- a/public/packs/js/application-b4baa487ab2bd8d1019a.js.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:69cc5ef71af5b657859e097b60a4a3fec58a0d5d6df411cdf8785c9bbeeb58ec -size 485768 diff --git a/public/packs/js/application-b4baa487ab2bd8d1019a.js.map b/public/packs/js/application-b4baa487ab2bd8d1019a.js.map deleted file mode 100644 index f1a6d06f..00000000 --- a/public/packs/js/application-b4baa487ab2bd8d1019a.js.map +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:931fd7332f4383a278c5d51784c983dd83ee6fc9153bffde7081cc9cabba9396 -size 6438113 diff --git a/public/packs/js/application-b4baa487ab2bd8d1019a.js.map.br b/public/packs/js/application-b4baa487ab2bd8d1019a.js.map.br deleted file mode 100644 index a1fdf7f9..00000000 --- a/public/packs/js/application-b4baa487ab2bd8d1019a.js.map.br +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5c47cc4c56239e504c606f1a913c04450b3159fa9885d52f8b1068e3346569b -size 1386215 diff --git a/public/packs/js/application-b4baa487ab2bd8d1019a.js.map.gz b/public/packs/js/application-b4baa487ab2bd8d1019a.js.map.gz deleted file mode 100644 index 4a2eeeaf..00000000 --- a/public/packs/js/application-b4baa487ab2bd8d1019a.js.map.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:59c537e654bd9498c93d2552bdc25827cb91c1dacc42e0e9d92f7969a2d81db2 -size 1714692 diff --git a/public/packs/js/application-f68840b38b1cfd7c6500.js b/public/packs/js/application-f68840b38b1cfd7c6500.js new file mode 100644 index 00000000..262e4a77 --- /dev/null +++ b/public/packs/js/application-f68840b38b1cfd7c6500.js @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ade2264f099ea53285e5507706f9f4c88aa2dc37320233c8ab36175cf0bff45 +size 1669135 diff --git a/public/packs/js/application-b4baa487ab2bd8d1019a.js.LICENSE.txt b/public/packs/js/application-f68840b38b1cfd7c6500.js.LICENSE.txt similarity index 100% rename from public/packs/js/application-b4baa487ab2bd8d1019a.js.LICENSE.txt rename to public/packs/js/application-f68840b38b1cfd7c6500.js.LICENSE.txt diff --git a/public/packs/js/application-f68840b38b1cfd7c6500.js.br b/public/packs/js/application-f68840b38b1cfd7c6500.js.br new file mode 100644 index 00000000..3050ded9 --- /dev/null +++ b/public/packs/js/application-f68840b38b1cfd7c6500.js.br @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70cb760094d9271ac292c6b4fdef7ee0f1d2608e4156dc0e2564f499364ac544 +size 368655 diff --git a/public/packs/js/application-f68840b38b1cfd7c6500.js.gz b/public/packs/js/application-f68840b38b1cfd7c6500.js.gz new file mode 100644 index 00000000..91368284 --- /dev/null +++ b/public/packs/js/application-f68840b38b1cfd7c6500.js.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5d89c2ee4b59ec062db749dac5e1f37a52eab5541b939b80c92fbfa111f1fe3 +size 485767 diff --git a/public/packs/js/application-f68840b38b1cfd7c6500.js.map b/public/packs/js/application-f68840b38b1cfd7c6500.js.map new file mode 100644 index 00000000..ea2f5b85 --- /dev/null +++ b/public/packs/js/application-f68840b38b1cfd7c6500.js.map @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b023d80a5cca6cc731b73c1a71b90606182c4ee73b5c672ad181f95875197331 +size 6413730 diff --git a/public/packs/js/application-f68840b38b1cfd7c6500.js.map.br b/public/packs/js/application-f68840b38b1cfd7c6500.js.map.br new file mode 100644 index 00000000..8538474d --- /dev/null +++ b/public/packs/js/application-f68840b38b1cfd7c6500.js.map.br @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:573eadf40d60c86142f64411bd123e8c7cf4d3c4fada3f1ab87218c235bdfbb4 +size 1383196 diff --git a/public/packs/js/application-f68840b38b1cfd7c6500.js.map.gz b/public/packs/js/application-f68840b38b1cfd7c6500.js.map.gz new file mode 100644 index 00000000..0b0f3de8 --- /dev/null +++ b/public/packs/js/application-f68840b38b1cfd7c6500.js.map.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38b751e8be3db1c8ffdbc53a1e9219d221e62f9d62384176472cc1293d4a14d9 +size 1709964 diff --git a/public/packs/manifest.json b/public/packs/manifest.json index 29ff8ea8..c8ab8864 100644 --- a/public/packs/manifest.json +++ b/public/packs/manifest.json @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c286d8875d29377f49bddd9a02dcbf5ce276435a37d359f91c00c796215f2aa +oid sha256:4df27cd25b0a9de891adf6d9bc2a5c7f7859d33b7af69e280a95ab599a7b327f size 1426 diff --git a/public/packs/manifest.json.br b/public/packs/manifest.json.br index 7b07b0ca..1fb550fd 100644 --- a/public/packs/manifest.json.br +++ b/public/packs/manifest.json.br @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cfd1a5608cedfc6bd75d4c582a8ac1597f4732a165dbc46d1fa05a0ff301aab5 -size 320 +oid sha256:eecaa899ac2c70933a807f5f57fb16f447fd423800f84a2a4573a853566b0372 +size 321 diff --git a/public/packs/manifest.json.gz b/public/packs/manifest.json.gz index a00ab9a8..e4cdce9a 100644 --- a/public/packs/manifest.json.gz +++ b/public/packs/manifest.json.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dda7bd33835b05e7d478a0ec8c952eaf5b32d064f6c148d24ef8853aebaeacff -size 365 +oid sha256:0d5c304d523ed085965cd912c6e53c50f6789988407b47e98d7306353d8bc6a3 +size 364