From 9a59cd383bc2c430db012430d5b69524e7b4736d Mon Sep 17 00:00:00 2001 From: fauno Date: Mon, 1 Jul 2024 18:55:24 +0000 Subject: [PATCH 1/6] ci: assets [skip ci] --- .../.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json | 2 +- .../{application-5688882d.css => application-e0d66cef.css} | 0 ...pplication-5688882d.css.br => application-e0d66cef.css.br} | 0 ...pplication-5688882d.css.gz => application-e0d66cef.css.gz} | 0 public/packs/js/application-259c401740dfed47822c.js | 3 +++ ...SE.txt => application-259c401740dfed47822c.js.LICENSE.txt} | 0 public/packs/js/application-259c401740dfed47822c.js.br | 3 +++ public/packs/js/application-259c401740dfed47822c.js.gz | 3 +++ public/packs/js/application-259c401740dfed47822c.js.map | 3 +++ public/packs/js/application-259c401740dfed47822c.js.map.br | 3 +++ public/packs/js/application-259c401740dfed47822c.js.map.gz | 3 +++ public/packs/js/application-ad620667f5fc36fddece.js | 3 --- public/packs/js/application-ad620667f5fc36fddece.js.br | 3 --- public/packs/js/application-ad620667f5fc36fddece.js.gz | 3 --- public/packs/js/application-ad620667f5fc36fddece.js.map | 3 --- public/packs/js/application-ad620667f5fc36fddece.js.map.br | 3 --- public/packs/js/application-ad620667f5fc36fddece.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-5688882d.css => application-e0d66cef.css} (100%) rename public/packs/css/{application-5688882d.css.br => application-e0d66cef.css.br} (100%) rename public/packs/css/{application-5688882d.css.gz => application-e0d66cef.css.gz} (100%) create mode 100644 public/packs/js/application-259c401740dfed47822c.js rename public/packs/js/{application-ad620667f5fc36fddece.js.LICENSE.txt => application-259c401740dfed47822c.js.LICENSE.txt} (100%) create mode 100644 public/packs/js/application-259c401740dfed47822c.js.br create mode 100644 public/packs/js/application-259c401740dfed47822c.js.gz create mode 100644 public/packs/js/application-259c401740dfed47822c.js.map create mode 100644 public/packs/js/application-259c401740dfed47822c.js.map.br create mode 100644 public/packs/js/application-259c401740dfed47822c.js.map.gz delete mode 100644 public/packs/js/application-ad620667f5fc36fddece.js delete mode 100644 public/packs/js/application-ad620667f5fc36fddece.js.br delete mode 100644 public/packs/js/application-ad620667f5fc36fddece.js.gz delete mode 100644 public/packs/js/application-ad620667f5fc36fddece.js.map delete mode 100644 public/packs/js/application-ad620667f5fc36fddece.js.map.br delete mode 100644 public/packs/js/application-ad620667f5fc36fddece.js.map.gz diff --git a/public/assets/.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json b/public/assets/.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json index 6d68c435..34bc1f5b 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:7fde3d8ce73c3a7b67b392f8589b110612a9905e3aef28a1ee730cc65d902d62 +oid sha256:88c1f1a739d34084f336007dde9c7f90ebbe91b704679428becd515344eb62d3 size 11449 diff --git a/public/packs/css/application-5688882d.css b/public/packs/css/application-e0d66cef.css similarity index 100% rename from public/packs/css/application-5688882d.css rename to public/packs/css/application-e0d66cef.css diff --git a/public/packs/css/application-5688882d.css.br b/public/packs/css/application-e0d66cef.css.br similarity index 100% rename from public/packs/css/application-5688882d.css.br rename to public/packs/css/application-e0d66cef.css.br diff --git a/public/packs/css/application-5688882d.css.gz b/public/packs/css/application-e0d66cef.css.gz similarity index 100% rename from public/packs/css/application-5688882d.css.gz rename to public/packs/css/application-e0d66cef.css.gz diff --git a/public/packs/js/application-259c401740dfed47822c.js b/public/packs/js/application-259c401740dfed47822c.js new file mode 100644 index 00000000..cb0eb957 --- /dev/null +++ b/public/packs/js/application-259c401740dfed47822c.js @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5b756828333dc54fe38ad3678c73d524861ebbaf5769c5ee8d08029de1d440a +size 1669027 diff --git a/public/packs/js/application-ad620667f5fc36fddece.js.LICENSE.txt b/public/packs/js/application-259c401740dfed47822c.js.LICENSE.txt similarity index 100% rename from public/packs/js/application-ad620667f5fc36fddece.js.LICENSE.txt rename to public/packs/js/application-259c401740dfed47822c.js.LICENSE.txt diff --git a/public/packs/js/application-259c401740dfed47822c.js.br b/public/packs/js/application-259c401740dfed47822c.js.br new file mode 100644 index 00000000..8dd982f1 --- /dev/null +++ b/public/packs/js/application-259c401740dfed47822c.js.br @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:705e0f848187878be1d60030522cb5a22c2ac9ba12a5cbe606f34ae595c01348 +size 368569 diff --git a/public/packs/js/application-259c401740dfed47822c.js.gz b/public/packs/js/application-259c401740dfed47822c.js.gz new file mode 100644 index 00000000..de8d598f --- /dev/null +++ b/public/packs/js/application-259c401740dfed47822c.js.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6478bcd675c7131936c8b364ca263a98fcecbba781b656e47d00dfd74e200893 +size 485739 diff --git a/public/packs/js/application-259c401740dfed47822c.js.map b/public/packs/js/application-259c401740dfed47822c.js.map new file mode 100644 index 00000000..c466c583 --- /dev/null +++ b/public/packs/js/application-259c401740dfed47822c.js.map @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5cbe23e77de63a2bff04cee1d72f11118ec5c471dc7417b239da0cb248da55ae +size 6438002 diff --git a/public/packs/js/application-259c401740dfed47822c.js.map.br b/public/packs/js/application-259c401740dfed47822c.js.map.br new file mode 100644 index 00000000..06322c48 --- /dev/null +++ b/public/packs/js/application-259c401740dfed47822c.js.map.br @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e01ac77f9e79769442ce155489cffd92b91f68baf5eead1a9a2d9e220041f99a +size 1386372 diff --git a/public/packs/js/application-259c401740dfed47822c.js.map.gz b/public/packs/js/application-259c401740dfed47822c.js.map.gz new file mode 100644 index 00000000..5852fea3 --- /dev/null +++ b/public/packs/js/application-259c401740dfed47822c.js.map.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0bca76541a1751d32f45d4346289b406dcfeef045d91b7e980812bec3d52b5b +size 1714681 diff --git a/public/packs/js/application-ad620667f5fc36fddece.js b/public/packs/js/application-ad620667f5fc36fddece.js deleted file mode 100644 index a70f96ac..00000000 --- a/public/packs/js/application-ad620667f5fc36fddece.js +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24f23edd740148c5d214c4d0bc8dd7b5d3aa427d24015bfc613750ea6351534a -size 1669027 diff --git a/public/packs/js/application-ad620667f5fc36fddece.js.br b/public/packs/js/application-ad620667f5fc36fddece.js.br deleted file mode 100644 index 3123a28e..00000000 --- a/public/packs/js/application-ad620667f5fc36fddece.js.br +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b01dea0cdd9972d471b246d2646e1cca9397ef368b18d32e842407e5b10cbd7 -size 368539 diff --git a/public/packs/js/application-ad620667f5fc36fddece.js.gz b/public/packs/js/application-ad620667f5fc36fddece.js.gz deleted file mode 100644 index f3b3a5ca..00000000 --- a/public/packs/js/application-ad620667f5fc36fddece.js.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc2c74681ae3526bccf98d8ee6873c3f1fc4789c426542ee869369361d39aeec -size 485739 diff --git a/public/packs/js/application-ad620667f5fc36fddece.js.map b/public/packs/js/application-ad620667f5fc36fddece.js.map deleted file mode 100644 index cf5f3864..00000000 --- a/public/packs/js/application-ad620667f5fc36fddece.js.map +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c19e48f790de355893180da4a3ff3d4c1b3355ed019078fff395849b310d4a86 -size 6413519 diff --git a/public/packs/js/application-ad620667f5fc36fddece.js.map.br b/public/packs/js/application-ad620667f5fc36fddece.js.map.br deleted file mode 100644 index bd37a967..00000000 --- a/public/packs/js/application-ad620667f5fc36fddece.js.map.br +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:985e532e26dc01d0e500d83e9ca1fe6c26c9d9c76c5fa76be2bd279e6106fa8a -size 1383006 diff --git a/public/packs/js/application-ad620667f5fc36fddece.js.map.gz b/public/packs/js/application-ad620667f5fc36fddece.js.map.gz deleted file mode 100644 index f43c14c4..00000000 --- a/public/packs/js/application-ad620667f5fc36fddece.js.map.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d38186b6884adbe8f558e897685f4663b20957ac79ba124c614444ec0cba3ea7 -size 1709752 diff --git a/public/packs/manifest.json b/public/packs/manifest.json index b61b2f38..5ccf8064 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:8a998e3347acd9a48d856d94ddec1f29900c03e71ac9d6d1eca651338c773dc1 +oid sha256:648a4dadfef23e3fe03acc6516ba71df923e5aba6e8f0b75cf1bded97fb34a17 size 1426 diff --git a/public/packs/manifest.json.br b/public/packs/manifest.json.br index 3e982e5d..b5185d85 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:c80437d3cd891cd951baa913aef9e373d3622f2e56f4d6cfcfe831151c88984a -size 320 +oid sha256:e01d7beb1f47c3855436e310fd644ff9f2bbc0cd64a626320664b3554f8dca07 +size 322 diff --git a/public/packs/manifest.json.gz b/public/packs/manifest.json.gz index 18738617..3d50c3a0 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:b7ff6bc5984d0d29d1e9e97ef5ac329193ce018959fe8253f28bfc9f6c38458a -size 364 +oid sha256:7b85747137fa8de98eaadf30c5abad212c14e44be2fbfc86ee9194304970d050 +size 365 From 91e9eab97574896d640d35b4fd74ef10e15915ab Mon Sep 17 00:00:00 2001 From: f Date: Tue, 2 Jul 2024 12:58:24 -0300 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20la=20descripci=C3=B3n=20del=20archiv?= =?UTF-8?q?o=20es=20parte=20del=20t=C3=ADtulo=20#16679?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/metadata_file.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/models/metadata_file.rb b/app/models/metadata_file.rb index 61aea897..fb5082f4 100644 --- a/app/models/metadata_file.rb +++ b/app/models/metadata_file.rb @@ -18,6 +18,18 @@ class MetadataFile < MetadataTemplate # XXX: Esto ayuda a deserializar en {Site#everything_of} def values; end + # Usar la descripción + def titleize? + true + end + + # Devolver la descripción + # + # @return [String] + def to_s + value['description'].to_s + end + def validate super From bd3df6c1863fcec19c98e79070360e7bd49588bc Mon Sep 17 00:00:00 2001 From: f Date: Tue, 2 Jul 2024 13:01:13 -0300 Subject: [PATCH 3/6] fix: new_predefined_array con valores legibles por humanes --- app/models/metadata_predefined_array.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/models/metadata_predefined_array.rb b/app/models/metadata_predefined_array.rb index b8e5050e..566a491b 100644 --- a/app/models/metadata_predefined_array.rb +++ b/app/models/metadata_predefined_array.rb @@ -7,4 +7,13 @@ class MetadataPredefinedArray < MetadataArray [v[I18n.locale.to_s], k] end&.to_h end + + # Devolver los valores legibles por humanes + # + # @todo Debería devolver los valores en el idioma del post, no de le + # usuarie + # @return [String] + def to_s + values.invert.select { |x, k| value.include?(x) }.values.join(', ') + end end From 100df4b157fdb7b8f0b00651d679d284a65440be Mon Sep 17 00:00:00 2001 From: f Date: Tue, 2 Jul 2024 13:01:27 -0300 Subject: [PATCH 4/6] fix: el titulo siempre se actualiza #16669 --- app/models/metadata_title.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/models/metadata_title.rb b/app/models/metadata_title.rb index 729a71fd..6d6b1bde 100644 --- a/app/models/metadata_title.rb +++ b/app/models/metadata_title.rb @@ -7,6 +7,11 @@ class MetadataTitle < MetadataString false end + # Siempre recalcular el título + def value + self[:value] = default_value + end + # Obtener todos los valores de texto del artículo y generar un título # en base a eso. # From a344c16f4d61366ea2dd44487bb6bfba77feb75a Mon Sep 17 00:00:00 2001 From: f Date: Tue, 2 Jul 2024 13:01:58 -0300 Subject: [PATCH 5/6] fix: cargar los valores actuales de new_predefined_array #16678 --- app/views/posts/attributes/_new_predefined_array.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/posts/attributes/_new_predefined_array.haml b/app/views/posts/attributes/_new_predefined_array.haml index d5f2110e..3b251bcb 100644 --- a/app/views/posts/attributes/_new_predefined_array.haml +++ b/app/views/posts/attributes/_new_predefined_array.haml @@ -34,7 +34,7 @@ Para poder cancelar, mantenemos el estado original y desactivamos o activamos los ítemes según estén incluidos en esa lista o no. %ul.placeholder-glow{ data: { target: 'array.current' } } - - metadata.values.slice(*metadata.value).each_key do |value| + - metadata.values.invert.slice(*metadata.value).each_value do |value| = render 'posts/new_array_value', value: value = render 'bootstrap/modal', id: id, modal_content_attributes: { class: 'h-100' }, hide_actions: ['array#cancel'], keydown_actions: %w[keydown->array#cancelWithEscape] do From 3a2005e54ac5916f767b840f3436adc225bd9e7a Mon Sep 17 00:00:00 2001 From: f Date: Tue, 2 Jul 2024 13:02:32 -0300 Subject: [PATCH 6/6] fix: no romper relaciones! --- app/views/posts/_htmx_form.haml | 8 +++++--- app/views/posts/attributes/_new_belongs_to.haml | 1 + .../posts/attributes/_new_has_and_belongs_to_many.haml | 1 + app/views/posts/attributes/_new_has_many.haml | 2 ++ app/views/posts/attributes/_new_has_one.haml | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/views/posts/_htmx_form.haml b/app/views/posts/_htmx_form.haml index 1a8c0597..f6704695 100644 --- a/app/views/posts/_htmx_form.haml +++ b/app/views/posts/_htmx_form.haml @@ -85,11 +85,13 @@ = hidden_field_tag "#{base}[layout]", post.layout.name - -# Dibuja cada atributo + -# Dibuja cada atributo, excepto algunos = render 'posts/attributes', site: site, post: post, dir: dir, base: base, locale: locale, except: except - -# Enviamos valores vacíos para los atributos ocultos + -# + Enviamos valores vacíos o arrastrados desde el formulario anterior + para los atributos ignorados - except.each do |attr| - %input{ type: 'hidden', name: "#{base}[#{attr}]", value: "" } + %input{ type: 'hidden', name: "#{base}[#{attr}]", value: params[attr].presence } = yield(:post_form) diff --git a/app/views/posts/attributes/_new_belongs_to.haml b/app/views/posts/attributes/_new_belongs_to.haml index b083e55e..a187e9ea 100644 --- a/app/views/posts/attributes/_new_belongs_to.haml +++ b/app/views/posts/attributes/_new_belongs_to.haml @@ -100,6 +100,7 @@ %input{ type: 'hidden', name: 'attribute', value: metadata.type } - if metadata.inverse? %input{ type: 'hidden', name: 'inverse', value: metadata.inverse } + %input{ type: 'hidden', name: metadata.inverse, value: post.uuid.value } %div{ id: post_modal_id, data: { controller: 'modal' } } = render 'bootstrap/modal', id: post_id, modal_content_attributes: { class: 'h-100' } do - content_for :"#{post_id}_body" do 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 1142c3b9..5dd1039b 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 @@ -101,6 +101,7 @@ %input{ type: 'hidden', name: 'attribute', value: metadata.type } - if metadata.inverse? %input{ type: 'hidden', name: 'inverse', value: metadata.inverse } + %input{ type: 'hidden', name: metadata.inverse, value: post.uuid.value } %div{ id: post_modal_id, data: { controller: 'modal' } } = render 'bootstrap/modal', id: post_id, modal_content_attributes: { class: 'h-100' } do - content_for :"#{post_id}_body" do diff --git a/app/views/posts/attributes/_new_has_many.haml b/app/views/posts/attributes/_new_has_many.haml index 9910e078..805636da 100644 --- a/app/views/posts/attributes/_new_has_many.haml +++ b/app/views/posts/attributes/_new_has_many.haml @@ -99,8 +99,10 @@ %input{ type: 'hidden', name: 'name', value: name } %input{ type: 'hidden', name: 'form', value: form_id } %input{ type: 'hidden', name: 'attribute', value: metadata.type } + -# @todo Forma genérica de arrastrar valores desde un formulario al siguiente - if metadata.inverse? %input{ type: 'hidden', name: 'inverse', value: metadata.inverse } + %input{ type: 'hidden', name: metadata.inverse, value: post.uuid.value } %div{ id: post_modal_id, data: { controller: 'modal' } } = render 'bootstrap/modal', id: post_id, modal_content_attributes: { class: 'h-100' } do - content_for :"#{post_id}_body" do diff --git a/app/views/posts/attributes/_new_has_one.haml b/app/views/posts/attributes/_new_has_one.haml index 1d0bb380..c082da6d 100644 --- a/app/views/posts/attributes/_new_has_one.haml +++ b/app/views/posts/attributes/_new_has_one.haml @@ -46,7 +46,7 @@ = render 'bootstrap/modal', id: id, modal_content_attributes: { class: 'h-100' } do - content_for :"#{id}_body" do -# @todo ocultar el modal después de guardar - .placeholder-glow{ 'hx-get': site_posts_form_path(site, layout: layout, base: id, name: name, form: form_id, swap: 'innerHTML', target: target_id, attribute: 'new_has_one', hide: modal_id, uuid: metadata.value, invalid: invalid_id, submitting: submitting_id, saved: saved_id), 'hx-trigger': 'load' } + .placeholder-glow{ 'hx-get': site_posts_form_path(site, layout: layout, base: id, name: name, form: form_id, swap: 'innerHTML', target: target_id, attribute: 'new_has_one', hide: modal_id, uuid: metadata.value, invalid: invalid_id, submitting: submitting_id, saved: saved_id, inverse: metadata.inverse, metadata.inverse => post.uuid.value), 'hx-trigger': 'load' } %span.placeholder.w-100.h-100 - content_for :"#{id}_footer" do