From 2179bd5d86fccb6356cfff77cab66c933368c860 Mon Sep 17 00:00:00 2001 From: shibao Date: Fri, 12 May 2023 21:50:23 -0400 Subject: [PATCH] fix table component ids --- CHANGELOG.md | 3 +++ .../components/move_pack_component.ex | 2 +- .../components/pack_table_component.ex | 7 ++++++- .../components/shot_record_table_component.ex | 2 +- .../components/type_table_component.ex | 7 ++++++- .../live/container_live/index.html.heex | 2 +- .../live/container_live/show.html.heex | 2 +- lib/cannery_web/live/pack_live/show.html.heex | 2 +- .../live/range_live/index.html.heex | 2 +- lib/cannery_web/live/type_live/index.html.heex | 2 +- priv/gettext/de/LC_MESSAGES/default.po | 18 +++++++++--------- priv/gettext/default.pot | 18 +++++++++--------- priv/gettext/en/LC_MESSAGES/default.po | 18 +++++++++--------- priv/gettext/es/LC_MESSAGES/default.po | 18 +++++++++--------- priv/gettext/fr/LC_MESSAGES/default.po | 18 +++++++++--------- priv/gettext/ga/LC_MESSAGES/default.po | 18 +++++++++--------- 16 files changed, 76 insertions(+), 63 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa826da8..cfe2e5b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# v0.10.0 +- Code quality fixes + # v0.9.3 - Update dependencies - Add pack lot number to search diff --git a/lib/cannery_web/components/move_pack_component.ex b/lib/cannery_web/components/move_pack_component.ex index 17917672..592698d6 100644 --- a/lib/cannery_web/components/move_pack_component.ex +++ b/lib/cannery_web/components/move_pack_component.ex @@ -89,7 +89,7 @@ defmodule CanneryWeb.Components.MovePackComponent do <% else %> <.live_component module={CanneryWeb.Components.TableComponent} - id="move_pack_table" + id="move-pack-table" columns={@columns} rows={@rows} /> diff --git a/lib/cannery_web/components/pack_table_component.ex b/lib/cannery_web/components/pack_table_component.ex index 7b7643f3..df8c5dc1 100644 --- a/lib/cannery_web/components/pack_table_component.ex +++ b/lib/cannery_web/components/pack_table_component.ex @@ -141,7 +141,12 @@ defmodule CanneryWeb.Components.PackTableComponent do def render(assigns) do ~H"""
- <.live_component module={TableComponent} id={"table-#{@id}"} columns={@columns} rows={@rows} /> + <.live_component + module={TableComponent} + id={"pack-table-#{@id}"} + columns={@columns} + rows={@rows} + />
""" end diff --git a/lib/cannery_web/components/shot_record_table_component.ex b/lib/cannery_web/components/shot_record_table_component.ex index 34f9c386..c0e706ed 100644 --- a/lib/cannery_web/components/shot_record_table_component.ex +++ b/lib/cannery_web/components/shot_record_table_component.ex @@ -74,7 +74,7 @@ defmodule CanneryWeb.Components.ShotRecordTableComponent do
<.live_component module={CanneryWeb.Components.TableComponent} - id={"table-#{@id}"} + id={"shot-record-table-#{@id}"} columns={@columns} rows={@rows} initial_key={:date} diff --git a/lib/cannery_web/components/type_table_component.ex b/lib/cannery_web/components/type_table_component.ex index 373c6e58..adb1316d 100644 --- a/lib/cannery_web/components/type_table_component.ex +++ b/lib/cannery_web/components/type_table_component.ex @@ -192,7 +192,12 @@ defmodule CanneryWeb.Components.TypeTableComponent do def render(assigns) do ~H"""
- <.live_component module={TableComponent} id={"table-#{@id}"} columns={@columns} rows={@rows} /> + <.live_component + module={TableComponent} + id={"type-table-#{@id}"} + columns={@columns} + rows={@rows} + />
""" end diff --git a/lib/cannery_web/live/container_live/index.html.heex b/lib/cannery_web/live/container_live/index.html.heex index cc530cf9..b395dafa 100644 --- a/lib/cannery_web/live/container_live/index.html.heex +++ b/lib/cannery_web/live/container_live/index.html.heex @@ -51,7 +51,7 @@ <%= if @view_table do %> <.live_component module={CanneryWeb.Components.ContainerTableComponent} - id="containers_index_table" + id="containers-index-table" action={@live_action} containers={@containers} current_user={@current_user} diff --git a/lib/cannery_web/live/container_live/show.html.heex b/lib/cannery_web/live/container_live/show.html.heex index 14767b94..f8aecad7 100644 --- a/lib/cannery_web/live/container_live/show.html.heex +++ b/lib/cannery_web/live/container_live/show.html.heex @@ -120,7 +120,7 @@ <%= if @view_table do %> <.live_component module={CanneryWeb.Components.PackTableComponent} - id="type-show-table" + id="pack-show-table" packs={@packs} current_user={@current_user} show_used={false} diff --git a/lib/cannery_web/live/pack_live/show.html.heex b/lib/cannery_web/live/pack_live/show.html.heex index bd122648..aadd2d03 100644 --- a/lib/cannery_web/live/pack_live/show.html.heex +++ b/lib/cannery_web/live/pack_live/show.html.heex @@ -115,7 +115,7 @@ <.live_component module={CanneryWeb.Components.TableComponent} - id="pack_shot_records_table" + id="pack-shot-records-table" columns={@columns} rows={@rows} /> diff --git a/lib/cannery_web/live/range_live/index.html.heex b/lib/cannery_web/live/range_live/index.html.heex index 1905750c..d7c1e91c 100644 --- a/lib/cannery_web/live/range_live/index.html.heex +++ b/lib/cannery_web/live/range_live/index.html.heex @@ -122,7 +122,7 @@ <% else %> <.live_component module={CanneryWeb.Components.ShotRecordTableComponent} - id="shot_records_index_table" + id="shot-records-index-table" shot_records={@shot_records} current_user={@current_user} > diff --git a/lib/cannery_web/live/type_live/index.html.heex b/lib/cannery_web/live/type_live/index.html.heex index d739d67d..f310f687 100644 --- a/lib/cannery_web/live/type_live/index.html.heex +++ b/lib/cannery_web/live/type_live/index.html.heex @@ -74,7 +74,7 @@ <% else %> <.live_component module={CanneryWeb.Components.TypeTableComponent} - id="types_index_table" + id="types-index-table" action={@live_action} types={@types} current_user={@current_user} diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 7bb44c4c..1b8c9ad6 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -500,9 +500,9 @@ msgstr "Schießkladde" #: lib/cannery_web/components/core_components/pack_card.html.heex:42 #: lib/cannery_web/components/core_components/pack_card.html.heex:47 -#: lib/cannery_web/components/pack_table_component.ex:176 -#: lib/cannery_web/components/pack_table_component.ex:259 -#: lib/cannery_web/components/type_table_component.ex:260 +#: lib/cannery_web/components/pack_table_component.ex:181 +#: lib/cannery_web/components/pack_table_component.ex:264 +#: lib/cannery_web/components/type_table_component.ex:265 #: lib/cannery_web/live/pack_live/show.html.heex:37 #: lib/cannery_web/live/pack_live/show.html.heex:42 #: lib/cannery_web/live/type_live/show.html.heex:150 @@ -592,9 +592,9 @@ msgstr "Editiere %{name} Tags" msgid "Rounds:" msgstr "Patronen:" -#: lib/cannery_web/components/pack_table_component.ex:173 -#: lib/cannery_web/components/pack_table_component.ex:255 -#: lib/cannery_web/components/type_table_component.ex:259 +#: lib/cannery_web/components/pack_table_component.ex:178 +#: lib/cannery_web/components/pack_table_component.ex:260 +#: lib/cannery_web/components/type_table_component.ex:264 #: lib/cannery_web/live/type_live/show.html.heex:154 #, elixir-autogen, elixir-format msgid "No cost information" @@ -780,7 +780,7 @@ msgstr "Behälter" msgid "Show used" msgstr "" -#: lib/cannery_web/components/pack_table_component.ex:214 +#: lib/cannery_web/components/pack_table_component.ex:219 #: lib/cannery_web/live/pack_live/show.html.heex:19 #, elixir-autogen, elixir-format msgid "%{percentage}%" @@ -957,7 +957,7 @@ msgid "Average CPR" msgstr "" #: lib/cannery_web/components/core_components/pack_card.html.heex:17 -#: lib/cannery_web/components/pack_table_component.ex:263 +#: lib/cannery_web/components/pack_table_component.ex:268 #, elixir-autogen, elixir-format msgid "Empty" msgstr "" @@ -997,7 +997,7 @@ msgstr "" msgid "Last used on:" msgstr "" -#: lib/cannery_web/components/pack_table_component.ex:194 +#: lib/cannery_web/components/pack_table_component.ex:199 #, elixir-autogen, elixir-format msgid "Never used" msgstr "" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 68c38bab..d8949721 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -494,9 +494,9 @@ msgstr "" #: lib/cannery_web/components/core_components/pack_card.html.heex:42 #: lib/cannery_web/components/core_components/pack_card.html.heex:47 -#: lib/cannery_web/components/pack_table_component.ex:176 -#: lib/cannery_web/components/pack_table_component.ex:259 -#: lib/cannery_web/components/type_table_component.ex:260 +#: lib/cannery_web/components/pack_table_component.ex:181 +#: lib/cannery_web/components/pack_table_component.ex:264 +#: lib/cannery_web/components/type_table_component.ex:265 #: lib/cannery_web/live/pack_live/show.html.heex:37 #: lib/cannery_web/live/pack_live/show.html.heex:42 #: lib/cannery_web/live/type_live/show.html.heex:150 @@ -586,9 +586,9 @@ msgstr "" msgid "Rounds:" msgstr "" -#: lib/cannery_web/components/pack_table_component.ex:173 -#: lib/cannery_web/components/pack_table_component.ex:255 -#: lib/cannery_web/components/type_table_component.ex:259 +#: lib/cannery_web/components/pack_table_component.ex:178 +#: lib/cannery_web/components/pack_table_component.ex:260 +#: lib/cannery_web/components/type_table_component.ex:264 #: lib/cannery_web/live/type_live/show.html.heex:154 #, elixir-autogen, elixir-format msgid "No cost information" @@ -774,7 +774,7 @@ msgstr "" msgid "Show used" msgstr "" -#: lib/cannery_web/components/pack_table_component.ex:214 +#: lib/cannery_web/components/pack_table_component.ex:219 #: lib/cannery_web/live/pack_live/show.html.heex:19 #, elixir-autogen, elixir-format msgid "%{percentage}%" @@ -951,7 +951,7 @@ msgid "Average CPR" msgstr "" #: lib/cannery_web/components/core_components/pack_card.html.heex:17 -#: lib/cannery_web/components/pack_table_component.ex:263 +#: lib/cannery_web/components/pack_table_component.ex:268 #, elixir-autogen, elixir-format msgid "Empty" msgstr "" @@ -991,7 +991,7 @@ msgstr "" msgid "Last used on:" msgstr "" -#: lib/cannery_web/components/pack_table_component.ex:194 +#: lib/cannery_web/components/pack_table_component.ex:199 #, elixir-autogen, elixir-format msgid "Never used" msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index a92bd517..f7363a5e 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -494,9 +494,9 @@ msgstr "" #: lib/cannery_web/components/core_components/pack_card.html.heex:42 #: lib/cannery_web/components/core_components/pack_card.html.heex:47 -#: lib/cannery_web/components/pack_table_component.ex:176 -#: lib/cannery_web/components/pack_table_component.ex:259 -#: lib/cannery_web/components/type_table_component.ex:260 +#: lib/cannery_web/components/pack_table_component.ex:181 +#: lib/cannery_web/components/pack_table_component.ex:264 +#: lib/cannery_web/components/type_table_component.ex:265 #: lib/cannery_web/live/pack_live/show.html.heex:37 #: lib/cannery_web/live/pack_live/show.html.heex:42 #: lib/cannery_web/live/type_live/show.html.heex:150 @@ -586,9 +586,9 @@ msgstr "" msgid "Rounds:" msgstr "" -#: lib/cannery_web/components/pack_table_component.ex:173 -#: lib/cannery_web/components/pack_table_component.ex:255 -#: lib/cannery_web/components/type_table_component.ex:259 +#: lib/cannery_web/components/pack_table_component.ex:178 +#: lib/cannery_web/components/pack_table_component.ex:260 +#: lib/cannery_web/components/type_table_component.ex:264 #: lib/cannery_web/live/type_live/show.html.heex:154 #, elixir-autogen, elixir-format msgid "No cost information" @@ -774,7 +774,7 @@ msgstr "" msgid "Show used" msgstr "" -#: lib/cannery_web/components/pack_table_component.ex:214 +#: lib/cannery_web/components/pack_table_component.ex:219 #: lib/cannery_web/live/pack_live/show.html.heex:19 #, elixir-autogen, elixir-format msgid "%{percentage}%" @@ -951,7 +951,7 @@ msgid "Average CPR" msgstr "" #: lib/cannery_web/components/core_components/pack_card.html.heex:17 -#: lib/cannery_web/components/pack_table_component.ex:263 +#: lib/cannery_web/components/pack_table_component.ex:268 #, elixir-autogen, elixir-format msgid "Empty" msgstr "" @@ -991,7 +991,7 @@ msgstr "" msgid "Last used on:" msgstr "" -#: lib/cannery_web/components/pack_table_component.ex:194 +#: lib/cannery_web/components/pack_table_component.ex:199 #, elixir-autogen, elixir-format msgid "Never used" msgstr "" diff --git a/priv/gettext/es/LC_MESSAGES/default.po b/priv/gettext/es/LC_MESSAGES/default.po index 970dbf11..45cb726b 100644 --- a/priv/gettext/es/LC_MESSAGES/default.po +++ b/priv/gettext/es/LC_MESSAGES/default.po @@ -501,9 +501,9 @@ msgstr "Registro de tiros" #: lib/cannery_web/components/core_components/pack_card.html.heex:42 #: lib/cannery_web/components/core_components/pack_card.html.heex:47 -#: lib/cannery_web/components/pack_table_component.ex:176 -#: lib/cannery_web/components/pack_table_component.ex:259 -#: lib/cannery_web/components/type_table_component.ex:260 +#: lib/cannery_web/components/pack_table_component.ex:181 +#: lib/cannery_web/components/pack_table_component.ex:264 +#: lib/cannery_web/components/type_table_component.ex:265 #: lib/cannery_web/live/pack_live/show.html.heex:37 #: lib/cannery_web/live/pack_live/show.html.heex:42 #: lib/cannery_web/live/type_live/show.html.heex:150 @@ -593,9 +593,9 @@ msgstr "Editar etiquetas de %{name}" msgid "Rounds:" msgstr "Balas:" -#: lib/cannery_web/components/pack_table_component.ex:173 -#: lib/cannery_web/components/pack_table_component.ex:255 -#: lib/cannery_web/components/type_table_component.ex:259 +#: lib/cannery_web/components/pack_table_component.ex:178 +#: lib/cannery_web/components/pack_table_component.ex:260 +#: lib/cannery_web/components/type_table_component.ex:264 #: lib/cannery_web/live/type_live/show.html.heex:154 #, elixir-autogen, elixir-format msgid "No cost information" @@ -782,7 +782,7 @@ msgstr "Contenedor:" msgid "Show used" msgstr "Mostrar usadas" -#: lib/cannery_web/components/pack_table_component.ex:214 +#: lib/cannery_web/components/pack_table_component.ex:219 #: lib/cannery_web/live/pack_live/show.html.heex:19 #, elixir-autogen, elixir-format msgid "%{percentage}%" @@ -959,7 +959,7 @@ msgid "Average CPR" msgstr "" #: lib/cannery_web/components/core_components/pack_card.html.heex:17 -#: lib/cannery_web/components/pack_table_component.ex:263 +#: lib/cannery_web/components/pack_table_component.ex:268 #, elixir-autogen, elixir-format msgid "Empty" msgstr "Vacio" @@ -999,7 +999,7 @@ msgstr "Usada por última vez en" msgid "Last used on:" msgstr "Usada por última vez en:" -#: lib/cannery_web/components/pack_table_component.ex:194 +#: lib/cannery_web/components/pack_table_component.ex:199 #, elixir-autogen, elixir-format msgid "Never used" msgstr "Nunca usada" diff --git a/priv/gettext/fr/LC_MESSAGES/default.po b/priv/gettext/fr/LC_MESSAGES/default.po index acf671e6..e25dfc0e 100644 --- a/priv/gettext/fr/LC_MESSAGES/default.po +++ b/priv/gettext/fr/LC_MESSAGES/default.po @@ -502,9 +502,9 @@ msgstr "Évènements de tir" #: lib/cannery_web/components/core_components/pack_card.html.heex:42 #: lib/cannery_web/components/core_components/pack_card.html.heex:47 -#: lib/cannery_web/components/pack_table_component.ex:176 -#: lib/cannery_web/components/pack_table_component.ex:259 -#: lib/cannery_web/components/type_table_component.ex:260 +#: lib/cannery_web/components/pack_table_component.ex:181 +#: lib/cannery_web/components/pack_table_component.ex:264 +#: lib/cannery_web/components/type_table_component.ex:265 #: lib/cannery_web/live/pack_live/show.html.heex:37 #: lib/cannery_web/live/pack_live/show.html.heex:42 #: lib/cannery_web/live/type_live/show.html.heex:150 @@ -594,9 +594,9 @@ msgstr "Éditer les tags de %{name}" msgid "Rounds:" msgstr "Cartouches :" -#: lib/cannery_web/components/pack_table_component.ex:173 -#: lib/cannery_web/components/pack_table_component.ex:255 -#: lib/cannery_web/components/type_table_component.ex:259 +#: lib/cannery_web/components/pack_table_component.ex:178 +#: lib/cannery_web/components/pack_table_component.ex:260 +#: lib/cannery_web/components/type_table_component.ex:264 #: lib/cannery_web/live/type_live/show.html.heex:154 #, elixir-autogen, elixir-format msgid "No cost information" @@ -783,7 +783,7 @@ msgstr "Conteneur" msgid "Show used" msgstr "" -#: lib/cannery_web/components/pack_table_component.ex:214 +#: lib/cannery_web/components/pack_table_component.ex:219 #: lib/cannery_web/live/pack_live/show.html.heex:19 #, elixir-autogen, elixir-format msgid "%{percentage}%" @@ -960,7 +960,7 @@ msgid "Average CPR" msgstr "" #: lib/cannery_web/components/core_components/pack_card.html.heex:17 -#: lib/cannery_web/components/pack_table_component.ex:263 +#: lib/cannery_web/components/pack_table_component.ex:268 #, elixir-autogen, elixir-format msgid "Empty" msgstr "" @@ -1000,7 +1000,7 @@ msgstr "" msgid "Last used on:" msgstr "" -#: lib/cannery_web/components/pack_table_component.ex:194 +#: lib/cannery_web/components/pack_table_component.ex:199 #, elixir-autogen, elixir-format msgid "Never used" msgstr "" diff --git a/priv/gettext/ga/LC_MESSAGES/default.po b/priv/gettext/ga/LC_MESSAGES/default.po index 16402661..cab1ab7b 100644 --- a/priv/gettext/ga/LC_MESSAGES/default.po +++ b/priv/gettext/ga/LC_MESSAGES/default.po @@ -496,9 +496,9 @@ msgstr "" #: lib/cannery_web/components/core_components/pack_card.html.heex:42 #: lib/cannery_web/components/core_components/pack_card.html.heex:47 -#: lib/cannery_web/components/pack_table_component.ex:176 -#: lib/cannery_web/components/pack_table_component.ex:259 -#: lib/cannery_web/components/type_table_component.ex:260 +#: lib/cannery_web/components/pack_table_component.ex:181 +#: lib/cannery_web/components/pack_table_component.ex:264 +#: lib/cannery_web/components/type_table_component.ex:265 #: lib/cannery_web/live/pack_live/show.html.heex:37 #: lib/cannery_web/live/pack_live/show.html.heex:42 #: lib/cannery_web/live/type_live/show.html.heex:150 @@ -588,9 +588,9 @@ msgstr "" msgid "Rounds:" msgstr "" -#: lib/cannery_web/components/pack_table_component.ex:173 -#: lib/cannery_web/components/pack_table_component.ex:255 -#: lib/cannery_web/components/type_table_component.ex:259 +#: lib/cannery_web/components/pack_table_component.ex:178 +#: lib/cannery_web/components/pack_table_component.ex:260 +#: lib/cannery_web/components/type_table_component.ex:264 #: lib/cannery_web/live/type_live/show.html.heex:154 #, elixir-autogen, elixir-format msgid "No cost information" @@ -776,7 +776,7 @@ msgstr "" msgid "Show used" msgstr "" -#: lib/cannery_web/components/pack_table_component.ex:214 +#: lib/cannery_web/components/pack_table_component.ex:219 #: lib/cannery_web/live/pack_live/show.html.heex:19 #, elixir-autogen, elixir-format msgid "%{percentage}%" @@ -953,7 +953,7 @@ msgid "Average CPR" msgstr "" #: lib/cannery_web/components/core_components/pack_card.html.heex:17 -#: lib/cannery_web/components/pack_table_component.ex:263 +#: lib/cannery_web/components/pack_table_component.ex:268 #, elixir-autogen, elixir-format msgid "Empty" msgstr "" @@ -993,7 +993,7 @@ msgstr "" msgid "Last used on:" msgstr "" -#: lib/cannery_web/components/pack_table_component.ex:194 +#: lib/cannery_web/components/pack_table_component.ex:199 #, elixir-autogen, elixir-format msgid "Never used" msgstr ""