Merge e5b834b into b1da791

app/views/albums/_filters.html.erb

@@ -1,5 +1,5 @@
 <% if filter_sort_params[:filter].present? %>
-  <%= link_to albums_path, class: "c-button c-button--outline c-button--small u-mr-small", data: {turbo_action: ("replace" if native_app?)} do %>
+  <%= link_to albums_path, class: "c-button c-button--outline c-button--small u-mr-small", data: {"turbo-action" => ("replace" if native_app?)} do %>
     <span class='o-flex o-flex--align-center'>
       <%= icon_tag "close" %>
       <%= t("label.clear_filters") %>

app/views/albums/show.html.erb

@@ -2,7 +2,7 @@
 
 <div class='o-container o-container--narrow' data-controller='playlist-songs playlist-songs-bridge'>
   <div class='c-card c-card--horizontal c-card--center@narrow u-my-large'>
-    <%= cover_image_tag @album, class: "c-card__image u-image-medium", data: {test_id: "album_image"} %>
+    <%= cover_image_tag @album, class: "c-card__image u-image-medium", data: {"test-id" => "album_image"} %>
     <div class='c-card__body'>
       <h1 class='c-card__body__title'><%= @album.name %></h1>
       <%= link_to @album.artist.name, artist_path(@album.artist), class: "c-card__body__text" %>
@@ -29,7 +29,7 @@
               }
             ) %>
         <% if is_admin? %>
-          <%= link_to t("label.edit"), edit_dialog_album_path(@album), data: {turbo_frame: ("turbo-dialog" unless native_app?)}, class: "c-button c-button--secondary u-ml-tiny" %>
+          <%= link_to t("label.edit"), edit_dialog_album_path(@album), data: {"turbo-frame" => ("turbo-dialog" unless native_app?)}, class: "c-button c-button--secondary u-ml-tiny" %>
         <% end %>
       </div>
     </div>
@@ -74,7 +74,7 @@
                 <%= link_to(
                       t("label.add_to_playlist"),
                       dialog_playlists_path(song_id: song.id, referer_url: current_url),
-                      data: {turbo_frame: ("turbo-dialog" unless native_app?)},
+                      data: {"turbo-frame" => ("turbo-dialog" unless native_app?)},
                       class: "c-dropdown__item"
                     ) %>
                 <%= button_to(

app/views/artists/show.html.erb

@@ -12,7 +12,7 @@
       </div>
       <% if is_admin? %>
         <div class='u-mt-large'>
-          <%= link_to t("label.edit"), edit_dialog_artist_path(@artist), data: {turbo_frame: ("turbo-dialog" unless native_app?)}, class: "c-button c-button--secondary u-mt-large" %>
+          <%= link_to t("label.edit"), edit_dialog_artist_path(@artist), data: {"turbo-frame" => ("turbo-dialog" unless native_app?)}, class: "c-button c-button--secondary u-mt-large" %>
         </div>
       <% end %>
     </div>

app/views/current_playlist/songs/_song.html.erb

@@ -25,9 +25,9 @@
     <details class='c-dropdown' data-controller="dropdown" data-test-id='current_playlist_song_menu'>
       <summary class="c-button c-button--icon" role="button"><%= icon_tag "more-vertical", size: "small", title: t("label.more") %></summary>
       <div class='c-dropdown__menu' data-dropdown-target="menu">
-        <%= link_to t("label.add_to_playlist"), dialog_playlists_path(song_id: song.id, referer_url: current_url), data: {turbo_frame: ("turbo-dialog" unless native_app?)}, class: "c-dropdown__item" %>
+        <%= link_to t("label.add_to_playlist"), dialog_playlists_path(song_id: song.id, referer_url: current_url), data: {"turbo-frame" => ("turbo-dialog" unless native_app?)}, class: "c-dropdown__item" %>
 
-        <%= button_to t("label.delete"), current_playlist_song_path(song), method: :delete, form_class: "c-dropdown__item", form: {data: {turbo_frame: "turbo-playlist"}} %>
+        <%= button_to t("label.delete"), current_playlist_song_path(song), method: :delete, form_class: "c-dropdown__item", form: {data: {"turbo-frame" => "turbo-playlist"}} %>
       </div>
     </details>
   </div>

app/views/dialog/albums/edit.html.erb

@@ -1,6 +1,6 @@
 <% page_title_tag t("label.edit_album") %>
 
-<%= form_with model: @album, data: {turbo_frame: "_top", turbo_action: ("replace" if native_app?), test_id: "album_edit_form"}, class: "c-form" do |form| %>
+<%= form_with model: @album, data: {"turbo-frame" => "_top", "turbo-action" => ("replace" if native_app?), "test-id" => "album_edit_form"}, class: "c-form" do |form| %>
   <div class='c-form__field'>
     <%= form.label :cover_image, t("label.album_cover") %>
     <%= form.file_field :cover_image, accept: "image/png, image/jpeg", class: "c-input" %>

app/views/dialog/artists/edit.html.erb

@@ -1,6 +1,6 @@
 <% page_title_tag t("label.edit_artist") %>
 
-<%= form_with model: @artist, data: {turbo_frame: "_top", turbo_action: ("replace" if native_app?), test_id: "artist_edit_form"}, class: "c-form" do |form| %>
+<%= form_with model: @artist, data: {"turbo-frame" => "_top", "turbo-action" => ("replace" if native_app?), "test-id" => "artist_edit_form"}, class: "c-form" do |form| %>
   <div class='c-form__field'>
     <%= form.label :cover_image, t("label.artist_cover") %>
     <%= form.file_field :cover_image, accept: "image/png, image/jpeg", class: "c-input" %>

app/views/dialog/playlists/edit.html.erb

@@ -1,6 +1,14 @@
 <% page_title_tag t("label.edit_playlist") %>
 
-<%= form_with model: @playlist, class: "c-form", data: {turbo_frame: "_top", turbo_action: ("replace" if native_app?), test_id: "playlist_edit_form"} do |form| %>
+<%= form_with(
+      model: @playlist,
+      class: "c-form",
+      data: {
+        "turbo-frame" => "_top",
+        "turbo-action" => ("replace" if native_app?),
+        "test-id" => "playlist_edit_form"
+      }
+    ) do |form| %>
   <div class='c-form__field'>
     <%= form.label :name, t("label.name") %>
     <%= form.text_field :name, class: "c-input" %>

app/views/dialog/playlists/new.html.erb

@@ -1,6 +1,6 @@
 <% page_title_tag t("label.create_playlist") %>
 
-<%= form_with model: @playlist, class: "c-form", data: {turbo_frame: "_top", turbo_action: ("replace" if native_app?)} do |form| %>
+<%= form_with model: @playlist, class: "c-form", data: {"turbo-frame" => "_top", "turbo-action" => ("replace" if native_app?)} do |form| %>
   <div class='c-form__field'>
     <%= form.label :name, t("label.name") %>
     <%= form.text_field :name, class: "c-input" %>

app/views/media_syncing/_button.html.erb

@@ -4,7 +4,7 @@
           t("label.syncing"),
           false,
           class: "c-button c-button--secondary",
-          data: {test_id: "media_sync_button"},
+          data: {"test-id" => "media_sync_button"},
           disabled: true
         ) %>
   <% else %>
@@ -13,8 +13,8 @@
         media_syncing_path,
         class: "c-button c-button--secondary",
         data: {
-          test_id: "media_sync_button",
-          turbo_submits_with: t("label.syncing")
+          "test-id" => "media_sync_button",
+          "turbo-submits-with" => t("label.syncing")
         }
       ) %>
   <% end %>

app/views/playlists/index.html.erb

@@ -6,7 +6,7 @@
       <% unless native_app? %>
         <h1 class='u-mb-0 u-mr-narrow'><%= t("label.playlists") %></h1>
       <% end %>
-      <%= link_to t("label.add"), new_dialog_playlist_path, data: {turbo_frame: ("turbo-dialog" unless native_app?)}, class: "c-button c-button--primary" %>
+      <%= link_to t("label.add"), new_dialog_playlist_path, data: {"turbo-frame" => ("turbo-dialog" unless native_app?)}, class: "c-button c-button--primary" %>
     </div>
 
     <div class='<%= "u-ml-auto" if native_app? %>'>

app/views/playlists/songs/_list.html.erb

@@ -1,4 +1,12 @@
-<%= turbo_frame_tag "#{dom_id(playlist)}-page-#{pagy.page}", class: "c-list", target: "_top", data: {controller: "playlist-sortable", playlist_id: playlist.id} do %>
+<%= turbo_frame_tag(
+      "#{dom_id(playlist)}-page-#{pagy.page}",
+      class: "c-list",
+      target: "_top",
+      data: {
+        "controller" => "playlist-sortable",
+        "playlist-id" => playlist.id
+      }
+    ) do %>
   <%= render partial: "playlists/songs/song", collection: songs, locals: {playlist: playlist} %>
 
   <% if pagy.next %>

app/views/playlists/songs/_song.html.erb

@@ -30,7 +30,7 @@
         <%= link_to(
               t("label.add_to_playlist"),
               dialog_playlists_path(song_id: song.id, referer_url: current_url),
-              data: {turbo_frame: ("turbo-dialog" unless native_app?)},
+              data: {"turbo-frame" => ("turbo-dialog" unless native_app?)},
               class: "c-dropdown__item"
             ) %>
         <%= button_to(

app/views/playlists/songs/index.html.erb

@@ -30,7 +30,7 @@
                   }
                 ) %>
           <% end %>
-          <%= link_to t("label.edit"), edit_dialog_playlist_path(@playlist), data: {turbo_frame: ("turbo-dialog" unless native_app?)}, class: "c-button c-button--secondary" %>
+          <%= link_to t("label.edit"), edit_dialog_playlist_path(@playlist), data: {"turbo-frame" => ("turbo-dialog" unless native_app?)}, class: "c-button c-button--secondary" %>
 
           <details class='c-dropdown' data-controller='dropdown' data-test-id='playlist_menu'>
             <summary class="c-button c-button--secondary">

app/views/settings/_form.html.erb

@@ -38,7 +38,7 @@
       <%= form.text_field :discogs_token, value: Setting.discogs_token, class: "c-input" %>
     </div>
     <div class='c-form__field c-form__field--submit'>
-      <%= form.submit t("label.save"), class: "c-button c-button--primary c-button--full-width", data: {test_id: "setting_discogs_token_save_button"} %>
+      <%= form.submit t("label.save"), class: "c-button c-button--primary c-button--full-width", data: {"test-id" => "setting_discogs_token_save_button"} %>
     </div>
   <% end %>
 

app/views/shared/_filter_options.html.erb

@@ -1,6 +1,13 @@
 <%= turbo_frame_tag "turbo-#{filter_name}-filter".dasherize do %>
   <% options.each do |option| %>
-    <%= link_to url_for(controller: filter_controller, **filter_sort_params(filter: {filter_name => option})), class: "c-dropdown__item", data: {turbo_frame: "_top", turbo_action: ("replace" if native_app?)}  do %>
+    <%= link_to(
+          url_for(controller: filter_controller, **filter_sort_params(filter: {filter_name => option})),
+          class: "c-dropdown__item",
+          data: {
+            "turbo-frame" => "_top",
+            "turbo-action" => ("replace" if native_app?)
+          }
+        ) do %>
         <span class='o-flex o-flex--justify-between o-flex--align-center'>
           <%= option %>
           <% if params[:filter]&.fetch(filter_name, nil) == option.to_s %>

app/views/shared/_search_bar.html.erb

@@ -6,7 +6,7 @@
         <%= icon_tag "search", size: "large" %>
       </div>
 
-      <%= text_field_tag "query", params[:query], class: "c-input", data: {search_target: "input", test_id: "search_input"}, autocomplete: "on" %>
+      <%= text_field_tag "query", params[:query], class: "c-input", data: {"search-target" => "input", "test-id" => "search_input"}, autocomplete: "on" %>
 
       <div class='c-input-group__icon'>
         <%= loader_tag size: "small" %>

app/views/shared/_sort_select.html.erb

@@ -4,7 +4,7 @@
   </summary>
   <div class='c-dropdown__menu' data-dropdown-target="menu">
     <% option.values.each do |sort_value| %>
-      <%= link_to url_for(controller: params[:controller], action: :index, **filter_sort_params(sort: sort_value)), class: "c-dropdown__item", data: {turbo_action: ("replace" if native_app?)} do %>
+      <%= link_to url_for(controller: params[:controller], action: :index, **filter_sort_params(sort: sort_value)), class: "c-dropdown__item", data: {"turbo-action" => ("replace" if native_app?)} do %>
         <span class='o-flex o-flex--justify-between o-flex--align-center'>
           <%= t("label.#{sort_value}") %>
           <% if params[:sort] == sort_value || (params[:sort].blank? && sort_value == option.default.name) %>
@@ -17,7 +17,7 @@
     <hr>
 
     <% %w[asc desc].each do |sort_direction| %>
-      <%= link_to url_for(controller: params[:controller], action: :index, **filter_sort_params(sort: params[:sort] || option.default.name, sort_direction: sort_direction)), class: "c-dropdown__item", data: {turbo_action: ("replace" if native_app?)} do %>
+      <%= link_to url_for(controller: params[:controller], action: :index, **filter_sort_params(sort: params[:sort] || option.default.name, sort_direction: sort_direction)), class: "c-dropdown__item", data: {"turbo-action" => ("replace" if native_app?)} do %>
         <span class='o-flex o-flex--justify-between o-flex--align-center'>
           <%= t("label.#{sort_direction}") %>
           <% if params[:sort_direction] == sort_direction || (params[:sort_direction].blank? && option.default.direction == sort_direction) %>

app/views/songs/_filters.html.erb

@@ -1,5 +1,5 @@
 <% if filter_sort_params[:filter].present? %>
-  <%= link_to songs_path, class: "c-button c-button--outline c-button--small u-mr-small", data: {turbo_action: ("replace" if native_app?)} do %>
+  <%= link_to songs_path, class: "c-button c-button--outline c-button--small u-mr-small", data: {"turbo-action" => ("replace" if native_app?)} do %>
     <span class='o-flex o-flex--align-center'>
       <%= icon_tag "close" %>
       <%= t("label.clear_filters") %>

app/views/songs/_song.html.erb

@@ -3,7 +3,7 @@
     <%= button_to(
           current_playlist_songs_path(song_id: song.id, should_play: true),
           class: "c-button c-button--link",
-          data: {test_id: "song_item"},
+          data: {"test-id" => "song_item"},
           form: {
             data: {
               "delegated-action" => "turbo:submit-start->playlist-songs#checkBeforePlay click->playlist-songs-bridge#playSong",
@@ -31,7 +31,7 @@
         <%= link_to(
               t("label.add_to_playlist"),
               dialog_playlists_path(song_id: song.id, referer_url: current_url),
-              data: {turbo_frame: ("turbo-dialog" unless native_app?)},
+              data: {"turbo-frame" => ("turbo-dialog" unless native_app?)},
               class: "c-dropdown__item"
             ) %>
         <%= button_to(

app/views/users/settings/_form.html.erb

@@ -10,6 +10,6 @@
     <% end %>
   </div>
   <div class='c-form__field c-form__field--submit'>
-    <%= form.submit t("label.save"), class: "c-button c-button--primary c-button--full-width", data: {test_id: "setting_theme_save_button"} %>
+    <%= form.submit t("label.save"), class: "c-button c-button--primary c-button--full-width", data: {"test-id" => "setting_theme_save_button"} %>
   </div>
 <% end %>