diff --git a/app/controllers/current_playlist/songs/albums_controller.rb b/app/controllers/current_playlist/songs/albums_controller.rb index 84b7953c..e07060ee 100644 --- a/app/controllers/current_playlist/songs/albums_controller.rb +++ b/app/controllers/current_playlist/songs/albums_controller.rb @@ -7,7 +7,11 @@ class CurrentPlaylist::Songs::AlbumsController < ApplicationController def update @current_playlist.replace(@album.song_ids) - redirect_to current_playlist_songs_path(should_play_all: true) + + redirect_to current_playlist_songs_path( + should_play: params[:should_play], + song_id: params[:song_id] + ) end private diff --git a/app/controllers/current_playlist/songs/playlists_controller.rb b/app/controllers/current_playlist/songs/playlists_controller.rb index 00f4998a..f6fb54c9 100644 --- a/app/controllers/current_playlist/songs/playlists_controller.rb +++ b/app/controllers/current_playlist/songs/playlists_controller.rb @@ -6,7 +6,10 @@ class CurrentPlaylist::Songs::PlaylistsController < ApplicationController def update @current_playlist.replace(@playlist.song_ids) - redirect_to current_playlist_songs_path(should_play_all: true) + redirect_to current_playlist_songs_path( + should_play: params[:should_play], + song_id: params[:song_id] + ) end private diff --git a/app/controllers/current_playlist/songs_controller.rb b/app/controllers/current_playlist/songs_controller.rb index b3e0d8d5..9c1744fe 100644 --- a/app/controllers/current_playlist/songs_controller.rb +++ b/app/controllers/current_playlist/songs_controller.rb @@ -7,6 +7,8 @@ class CurrentPlaylist::SongsController < Playlists::SongsController def index @songs = @playlist.songs_with_favorite + @should_play = params[:should_play] == "true" + @should_play_song_id = params[:song_id].to_i if @should_play end def create @@ -21,7 +23,7 @@ def create flash.now[:success] = t("notice.added_to_playlist") - redirect_to action: "index", should_play_all: params[:should_play] if @playlist.songs.count == 1 + redirect_to action: "index", should_play: params[:should_play] if @playlist.songs.count == 1 rescue ActiveRecord::RecordNotUnique flash.now[:error] = t("error.already_in_playlist") render turbo_stream: render_flash diff --git a/app/javascript/controllers/album_bridge_controller.js b/app/javascript/controllers/album_bridge_controller.js new file mode 100644 index 00000000..1942f9c9 --- /dev/null +++ b/app/javascript/controllers/album_bridge_controller.js @@ -0,0 +1,34 @@ +import { Controller } from '@hotwired/stimulus' +import { installEventHandler } from './mixins/event_handler' +import { isNativeApp } from '../helper' + +export default class extends Controller { + static get shouldLoad () { + return isNativeApp() + } + + static values = { + id: Number + } + + initialize () { + installEventHandler(this) + } + + connect () { + this.handleEvent('click', { + on: this.element, + with: this.playBeginWith, + delegation: true + }) + } + + play () { + App.nativeBridge.playAlbum(this.idValue) + } + + playBeginWith = (event) => { + const { songId } = event.target.closest('[data-song-id]').dataset + App.nativeBridge.playAlbumBeginWith(this.idValue, songId) + } +} diff --git a/app/javascript/controllers/current_playlist_songs_controller.js b/app/javascript/controllers/current_playlist_songs_controller.js index 8ce612fa..2f01982a 100644 --- a/app/javascript/controllers/current_playlist_songs_controller.js +++ b/app/javascript/controllers/current_playlist_songs_controller.js @@ -6,7 +6,7 @@ export default class extends Controller { static targets = ['item'] static values = { - shouldPlayAll: Boolean + shouldPlay: Boolean } initialize () { @@ -16,21 +16,24 @@ export default class extends Controller { itemTargetConnected (target) { const song = JSON.parse(target.dataset.songJson) - const shouldPlay = target.dataset.shouldPlay === 'true' + const songShouldPlay = target.dataset.shouldPlay === 'true' const targetIndex = this.itemTargets.indexOf(target) this.playlist.insert(targetIndex, song) - if (shouldPlay) { + if (songShouldPlay) { this.player.skipTo(targetIndex) + delete target.dataset.shouldPlay + this.shouldPlayValue = false } } connect () { - if (this.shouldPlayAllValue) { + if (this.shouldPlayValue) { + // If no particular song is set to play, play the first song this.player.skipTo(0) - this.shouldPlayAllValue = false + this.shouldPlayValue = false } this.handleEvent('click', { diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js index 82423948..c1f5de05 100644 --- a/app/javascript/controllers/index.js +++ b/app/javascript/controllers/index.js @@ -18,7 +18,7 @@ import MiniPlayerController from './mini_player_controller.js' import PlayerController from './player_controller.js' -import PlaylistSongsController from './playlist_songs_controller.js' +import SongsController from './songs_controller.js' import CurrentPlaylistSongsController from './current_playlist_songs_controller.js' @@ -26,7 +26,11 @@ import PlaylistSortableController from './playlist_sortable_controller.js' import SearchController from './search_controller.js' -import PlaylistSongsBridgeController from './playlist_songs_bridge_controller.js' +import SongsBridgeController from './songs_bridge_controller.js' + +import AlbumBridgeController from './album_bridge_controller.js' + +import PlaylistBridgeController from './playlist_bridge_controller.js' import FlashBridgeController from './flash_bridge_controller.js' @@ -52,7 +56,7 @@ application.register('mini-player', MiniPlayerController) application.register('player', PlayerController) -application.register('playlist-songs', PlaylistSongsController) +application.register('songs', SongsController) application.register('current-playlist-songs', CurrentPlaylistSongsController) @@ -60,7 +64,11 @@ application.register('playlist-sortable', PlaylistSortableController) application.register('search', SearchController) -application.register('playlist-songs-bridge', PlaylistSongsBridgeController) +application.register('songs-bridge', SongsBridgeController) + +application.register('album-bridge', AlbumBridgeController) + +application.register('playlist-bridge', PlaylistBridgeController) application.register('flash-bridge', FlashBridgeController) diff --git a/app/javascript/controllers/mixins/playing_song_indicator.js b/app/javascript/controllers/mixins/playing_song_indicator.js index 223dcb4c..0d64dd36 100644 --- a/app/javascript/controllers/mixins/playing_song_indicator.js +++ b/app/javascript/controllers/mixins/playing_song_indicator.js @@ -11,13 +11,13 @@ export const installPlayingSongIndicator = (controller, getSongElements = () => } const addPlayingSongIndicatorEventListener = () => { - document.addEventListener('playlistSongs:showPlaying', showPlayingSong) - document.addEventListener('playlistSongs:hidePlaying', hidePlayingSong) + document.addEventListener('songs:showPlaying', showPlayingSong) + document.addEventListener('songs:hidePlaying', hidePlayingSong) } const removePlayingSongIndicatorEventListener = () => { - document.removeEventListener('playlistSongs:showPlaying', showPlayingSong) - document.removeEventListener('playlistSongs:hidePlaying', hidePlayingSong) + document.removeEventListener('songs:showPlaying', showPlayingSong) + document.removeEventListener('songs:hidePlaying', hidePlayingSong) } const controllerConnectCallback = controller.connect.bind(controller) diff --git a/app/javascript/controllers/player_controller.js b/app/javascript/controllers/player_controller.js index 6522bcd5..4bfd89ce 100644 --- a/app/javascript/controllers/player_controller.js +++ b/app/javascript/controllers/player_controller.js @@ -147,7 +147,7 @@ export default class extends Controller { this.timerInterval = setInterval(this.#setTimer.bind(this), 1000) // let playlist can show current playing song - dispatchEvent(document, 'playlistSongs:showPlaying') + dispatchEvent(document, 'songs:showPlaying') } #setPauseStatus = () => { @@ -162,7 +162,7 @@ export default class extends Controller { if (!this.currentSong.id) { this.headerTarget.classList.remove('is-expanded') - dispatchEvent(document, 'playlistSongs:hidePlaying') + dispatchEvent(document, 'songs:hidePlaying') } } diff --git a/app/javascript/controllers/playlist_bridge_controller.js b/app/javascript/controllers/playlist_bridge_controller.js new file mode 100644 index 00000000..10d67ba3 --- /dev/null +++ b/app/javascript/controllers/playlist_bridge_controller.js @@ -0,0 +1,34 @@ +import { Controller } from '@hotwired/stimulus' +import { installEventHandler } from './mixins/event_handler' +import { isNativeApp } from '../helper' + +export default class extends Controller { + static get shouldLoad () { + return isNativeApp() + } + + static values = { + id: Number + } + + initialize () { + installEventHandler(this) + } + + connect () { + this.handleEvent('click', { + on: this.element, + with: this.playBeginWith, + delegation: true + }) + } + + play () { + App.nativeBridge.playPlaylist(this.idValue) + } + + playBeginWith = (event) => { + const { songId } = event.target.closest('[data-song-id]').dataset + App.nativeBridge.playPlaylistBeginWith(this.idValue, songId) + } +} diff --git a/app/javascript/controllers/playlist_songs_bridge_controller.js b/app/javascript/controllers/songs_bridge_controller.js similarity index 84% rename from app/javascript/controllers/playlist_songs_bridge_controller.js rename to app/javascript/controllers/songs_bridge_controller.js index ee943f6b..4e47e81b 100644 --- a/app/javascript/controllers/playlist_songs_bridge_controller.js +++ b/app/javascript/controllers/songs_bridge_controller.js @@ -14,7 +14,7 @@ export default class extends Controller { connect () { this.handleEvent('click', { on: this.element, - with: this.playSong, + with: this.playNow, delegation: true }) @@ -31,13 +31,9 @@ export default class extends Controller { }) } - playAll ({ params }) { - App.nativeBridge.playAll(params.resourceType, params.resourceId) - } - - playSong (event) { + playNow (event) { const { songId } = event.target.closest('[data-song-id]').dataset - App.nativeBridge.playSong(songId) + App.nativeBridge.playNow(songId) } playNext (event) { diff --git a/app/javascript/controllers/playlist_songs_controller.js b/app/javascript/controllers/songs_controller.js similarity index 100% rename from app/javascript/controllers/playlist_songs_controller.js rename to app/javascript/controllers/songs_controller.js diff --git a/app/javascript/native_bridge.js b/app/javascript/native_bridge.js index 3a9c9752..99b80a5b 100644 --- a/app/javascript/native_bridge.js +++ b/app/javascript/native_bridge.js @@ -1,30 +1,70 @@ import { isAndroidApp, isiOSApp } from './helper' class NativeBridge { - playAll (resourceType, resourceId) { + playAlbum (albumId) { if (isiOSApp()) { window.webkit.messageHandlers.nativeApp.postMessage({ - name: 'playAll', - resourceType, - resourceId: Number(resourceId) + name: 'playAlbum', + albumId: Number(albumId) }) } if (isAndroidApp()) { - window.NativeBridge.playAll(resourceType, Number(resourceId)) + window.NativeBridge.playAlbum(Number(albumId)) } } - playSong (songId) { + playAlbumBeginWith (albumId, songId) { if (isiOSApp()) { window.webkit.messageHandlers.nativeApp.postMessage({ - name: 'playSong', + name: 'playAlbumBeginWith', + albumId: Number(albumId), songId: Number(songId) }) } if (isAndroidApp()) { - window.NativeBridge.playSong(Number(songId)) + window.NativeBridge.playAlbumBeginWith(Number(albumId), Number(songId)) + } + } + + playPlaylist (playlistId) { + if (isiOSApp()) { + window.webkit.messageHandlers.nativeApp.postMessage({ + name: 'playPlaylist', + playlistId: Number(playlistId) + }) + } + + if (isAndroidApp()) { + window.NativeBridge.playPlaylist(Number(playlistId)) + } + } + + playPlaylistBeginWith (playlistId, songId) { + if (isiOSApp()) { + window.webkit.messageHandlers.nativeApp.postMessage({ + name: 'playPlaylistBeginWith', + playlistId: Number(playlistId), + songId: Number(songId) + }) + } + + if (isAndroidApp()) { + window.NativeBridge.playPlaylistBeginWith(Number(playlistId), Number(songId)) + } + } + + playNow (songId) { + if (isiOSApp()) { + window.webkit.messageHandlers.nativeApp.postMessage({ + name: 'playNow', + songId: Number(songId) + }) + } + + if (isAndroidApp()) { + window.NativeBridge.playNow(Number(songId)) } } diff --git a/app/views/albums/show.html.erb b/app/views/albums/show.html.erb index 1f4dadcf..c782ee1c 100644 --- a/app/views/albums/show.html.erb +++ b/app/views/albums/show.html.erb @@ -1,6 +1,6 @@ <% page_title_tag @album.name %> -
+
<%= cover_image_tag @album, class: "c-card__image u-image-medium", data: {"test-id" => "album_image"} %>
@@ -13,8 +13,8 @@
<%= button_to( - t("button.play_all"), - current_playlist_album_path(@album), + t("button.play"), + current_playlist_album_path(@album, should_play: true), method: :put, form_class: "u-display-inline-block", class: "c-button c-button--primary", @@ -22,9 +22,7 @@ data: { "disabled-on-native" => "true", "turbo-frame" => "turbo-playlist", - "action" => "playlist-songs-bridge#playAll", - "playlist-songs-bridge-resource-type-param" => "album", - "playlist-songs-bridge-resource-id-param" => @album.id + "action" => "album-bridge#play" } } ) %> @@ -41,15 +39,16 @@ <% end %> <% songs.each do |song| %> -
  • +
  • <%= button_to( - current_playlist_songs_path(song_id: song.id, should_play: true), + current_playlist_album_path(@album, should_play: true, song_id: song.id), + method: :put, class: "c-button c-button--link u-w-100", form_class: "o-flex__item--grow-1", form: { data: { - "delegated-action" => "turbo:submit-start->playlist-songs#checkBeforePlay click->playlist-songs-bridge#playSong", + "delegated-action" => "turbo:submit-start->songs#checkBeforePlay click->album-bridge#playBeginWith", "turbo-frame" => "turbo-playlist", "disabled-on-native" => "true" } @@ -75,16 +74,17 @@ <%= icon_tag "more-vertical", size: "small", title: t("label.more") %>
    - <%= link_to( - t("label.go_to_artist"), - artist_path(song.artist), - 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("button.play_now"), + current_playlist_songs_path(song_id: song.id, should_play: true), + form_class: "c-dropdown__item", + form: { + data: { + "turbo-frame" => "turbo-playlist", + "delegated-action" => "turbo:submit-start->songs#checkBeforePlay click->songs-bridge#playNow", + "disabled-on-native" => "true" + } + } ) %> <%= button_to( t("button.play_next"), @@ -93,7 +93,7 @@ form: { data: { "turbo-frame" => "turbo-playlist", - "delegated-action" => "turbo:submit-start->playlist-songs#checkBeforePlayNext click->playlist-songs-bridge#playNext", + "delegated-action" => "turbo:submit-start->songs#checkBeforePlayNext click->songs-bridge#playNext", "disabled-on-native" => "true" } } @@ -105,11 +105,22 @@ form: { data: { "turbo-frame" => "turbo-playlist", - "delegated-action" => "click->playlist-songs-bridge#playLast", + "delegated-action" => "click->songs-bridge#playLast", "disabled-on-native" => "true" } } ) %> + <%= 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.go_to_artist"), + artist_path(song.artist), + class: "c-dropdown__item" + ) %>
    diff --git a/app/views/current_playlist/songs/_list.html.erb b/app/views/current_playlist/songs/_list.html.erb deleted file mode 100644 index c4f4392f..00000000 --- a/app/views/current_playlist/songs/_list.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -
      - <%= render partial: "current_playlist/songs/song", collection: songs, locals: {playlist: playlist} %> -
    diff --git a/app/views/current_playlist/songs/_song.html.erb b/app/views/current_playlist/songs/_song.html.erb index 538f0ff1..38e09afb 100644 --- a/app/views/current_playlist/songs/_song.html.erb +++ b/app/views/current_playlist/songs/_song.html.erb @@ -3,7 +3,7 @@ data-current-playlist-songs-target='item' data-song-id='<%= song.id %>' data-song-json='<%= song_json_builder(song).target! %>' - data-should-play='<%= params[:should_play] %>' + data-should-play='<%= local_assigns[:should_play] ? should_play : false %>' draggable='true' data-test-id='current_playlist_song'> diff --git a/app/views/current_playlist/songs/create.turbo_stream.erb b/app/views/current_playlist/songs/create.turbo_stream.erb index 7bfa3352..cfe2c788 100644 --- a/app/views/current_playlist/songs/create.turbo_stream.erb +++ b/app/views/current_playlist/songs/create.turbo_stream.erb @@ -2,10 +2,10 @@ <%= turbo_stream.after "#{dom_id(@playlist)}_#{dom_id(@playlist.songs.second_to_last)}", partial: 'current_playlist/songs/song', locals: { song: @song, playlist: @playlist } %> <% else %> <% if @current_song_position.zero? %> - <%= turbo_stream.before "#{dom_id(@playlist)}_#{dom_id(@playlist.songs.second)}", partial: 'current_playlist/songs/song', locals: { song: @song, playlist: @playlist } %> + <%= turbo_stream.before "#{dom_id(@playlist)}_#{dom_id(@playlist.songs.second)}", partial: 'current_playlist/songs/song', locals: { song: @song, playlist: @playlist, should_play: params[:should_play] } %> <% else %> <%# add song next to the current_song %> - <%= turbo_stream.after "#{dom_id(@playlist)}_song_#{params[:current_song_id]}", partial: 'current_playlist/songs/song', locals: { song: @song, playlist: @playlist } %> + <%= turbo_stream.after "#{dom_id(@playlist)}_song_#{params[:current_song_id]}", partial: 'current_playlist/songs/song', locals: { song: @song, playlist: @playlist, should_play: params[:should_play] } %> <% end %> <% end %> diff --git a/app/views/current_playlist/songs/index.html.erb b/app/views/current_playlist/songs/index.html.erb index d8226e40..9d62fb99 100644 --- a/app/views/current_playlist/songs/index.html.erb +++ b/app/views/current_playlist/songs/index.html.erb @@ -1,7 +1,7 @@
    + data-current-playlist-songs-should-play-value='<%= @should_play %>'> <% if @songs.empty? %> <%= empty_alert_tag %> <% else %> @@ -17,6 +17,10 @@
    • - <%= render partial: "current_playlist/songs/list", locals: {playlist: @playlist, songs: @songs} %> +
      + <% @songs.each do |song| %> + <%= render partial: "current_playlist/songs/song", locals: {song: song, playlist: @playlist, should_play: @should_play_song_id == song.id} %> + <% end %> +
    <% end %>
    diff --git a/app/views/favorite_playlist/songs/index.html.erb b/app/views/favorite_playlist/songs/index.html.erb index eab17eb1..0fe1fa31 100644 --- a/app/views/favorite_playlist/songs/index.html.erb +++ b/app/views/favorite_playlist/songs/index.html.erb @@ -1,5 +1,5 @@
    -
    +

    <%= @playlist.name %>

    @@ -12,8 +12,8 @@
    <% unless @songs.blank? %> <%= button_to( - t("button.play_all"), - current_playlist_playlist_path(@playlist), + t("button.play"), + current_playlist_playlist_path(@playlist, should_play: true), method: :put, class: "c-button c-button--primary", form_class: "u-display-inline-block", @@ -21,9 +21,7 @@ data: { "disabled-on-native" => "true", "turbo-frame" => "turbo-playlist", - "action" => "playlist-songs-bridge#playAll", - "playlist-songs-bridge-resource-type-param" => "playlist", - "playlist-songs-bridge-resource-id-param" => @playlist.id + "action" => "playlist-bridge#play" } } ) %> diff --git a/app/views/playlists/songs/_song.html.erb b/app/views/playlists/songs/_song.html.erb index 4f0e44e2..3cc945d0 100644 --- a/app/views/playlists/songs/_song.html.erb +++ b/app/views/playlists/songs/_song.html.erb @@ -1,16 +1,17 @@ -
  • +
  • <% unless mobile? %> <% end %> <%= button_to( - current_playlist_songs_path(song_id: song.id, should_play: true), + current_playlist_playlist_path(playlist, should_play: true, song_id: song.id), + method: :put, class: "c-button c-button--link u-w-100", form_class: "o-flex__item--grow-1", form: { data: { - "delegated-action" => "turbo:submit-start->playlist-songs#checkBeforePlay click->playlist-songs-bridge#playSong", + "delegated-action" => "turbo:submit-start->songs#checkBeforePlay click->playlist-bridge#playBeginWith", "turbo-frame" => "turbo-playlist", "disabled-on-native" => "true" } @@ -31,16 +32,17 @@
    <%= icon_tag "more-vertical", size: "small", title: t("label.more") %>
    - <%= link_to( - t("label.go_to_artist"), - artist_path(song.artist), - 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("button.play_now"), + current_playlist_songs_path(song_id: song.id, should_play: true), + form_class: "c-dropdown__item", + form: { + data: { + "turbo-frame" => "turbo-playlist", + "delegated-action" => "turbo:submit-start->songs#checkBeforePlay click->songs-bridge#playNow", + "disabled-on-native" => "true" + } + } ) %> <%= button_to( t("button.play_next"), @@ -49,7 +51,7 @@ form: { data: { "turbo-frame" => "turbo-playlist", - "delegated-action" => "turbo:submit-start->playlist-songs#checkBeforePlayNext click->playlist-songs-bridge#playNext", + "delegated-action" => "turbo:submit-start->songs#checkBeforePlayNext click->songs-bridge#playNext", "disabled-on-native" => "true" } } @@ -61,7 +63,7 @@ form: { data: { "turbo-frame" => "turbo-playlist", - "delegated-action" => "click->playlist-songs-bridge#playLast", + "delegated-action" => "click->songs-bridge#playLast", "disabled-on-native" => "true" } } @@ -72,6 +74,17 @@ method: :delete, form_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" + ) %> + <%= link_to( + t("label.go_to_artist"), + artist_path(song.artist), + class: "c-dropdown__item" + ) %>
    diff --git a/app/views/playlists/songs/index.html.erb b/app/views/playlists/songs/index.html.erb index 6733c230..05edc912 100644 --- a/app/views/playlists/songs/index.html.erb +++ b/app/views/playlists/songs/index.html.erb @@ -1,7 +1,7 @@ <% page_title_tag @playlist.name %>
    -
    +

    <%= @playlist.name %>

    @@ -14,8 +14,8 @@
    <% unless @songs.blank? %> <%= button_to( - t("button.play_all"), - current_playlist_playlist_path(@playlist), + t("button.play"), + current_playlist_playlist_path(@playlist, should_play: true), method: :put, class: "c-button c-button--primary", form_class: "u-display-inline-block", @@ -23,9 +23,7 @@ data: { "disabled-on-native" => "true", "turbo-frame" => "turbo-playlist", - "action" => "playlist-songs-bridge#playAll", - "playlist-songs-bridge-resource-type-param" => "playlist", - "playlist-songs-bridge-resource-id-param" => @playlist.id + "action" => "playlist-bridge#play" } } ) %> diff --git a/app/views/search/songs/_table.html.erb b/app/views/search/songs/_table.html.erb index 9f03601a..bdc2c112 100644 --- a/app/views/search/songs/_table.html.erb +++ b/app/views/search/songs/_table.html.erb @@ -1,4 +1,4 @@ -
    +
    <%= t("field.name") %>
    diff --git a/app/views/songs/_song.html.erb b/app/views/songs/_song.html.erb index 71cd8295..19318879 100644 --- a/app/views/songs/_song.html.erb +++ b/app/views/songs/_song.html.erb @@ -1,12 +1,12 @@
    -
    +
    <%= button_to( current_playlist_songs_path(song_id: song.id, should_play: true), class: "c-button c-button--link", data: {"test-id" => "song_item"}, form: { data: { - "delegated-action" => "turbo:submit-start->playlist-songs#checkBeforePlay click->playlist-songs-bridge#playSong", + "delegated-action" => "turbo:submit-start-songs#checkBeforePlay click->songs-bridge#playNow", "turbo-frame" => "turbo-playlist", "disabled-on-native" => "true" } @@ -41,7 +41,7 @@ form: { data: { "turbo-frame" => "turbo-playlist", - "delegated-action" => "turbo:submit-start->playlist-songs#checkBeforePlayNext click->playlist-songs-bridge#playNext", + "delegated-action" => "turbo:submit-start->songs#checkBeforePlayNext click->songs-bridge#playNext", "disabled-on-native" => "true" } } @@ -53,7 +53,7 @@ form: { data: { "turbo-frame" => "turbo-playlist", - "delegated-action" => "click->playlist-songs-bridge#playLast", + "delegated-action" => "click->songs-bridge#playLast", "disabled-on-native" => "true" } } diff --git a/app/views/songs/_table.html.erb b/app/views/songs/_table.html.erb index 2ae23cde..de71f310 100644 --- a/app/views/songs/_table.html.erb +++ b/app/views/songs/_table.html.erb @@ -2,7 +2,7 @@ <%# So I can't use table element here to implement infinite scroll. %> <%# If turbo frame support built-in elements later https://github.com/hotwired/turbo/pull/131,%> <%# this view can use table element to refactor. %> -
    +
    <%= t("field.name") %>
    diff --git a/config/locales/en.yml b/config/locales/en.yml index 4afea2e3..033e1c68 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -60,12 +60,13 @@ en: button: login: 'Login' logout: 'Logout' - play_all: 'Play All' + play: 'Play' clear: 'Clear' delete: 'Delete' save: 'Save' sync: 'Sync' syncing: 'Syncing...' + play_now: 'Play Now' play_next: 'Play Next' play_last: 'Play Last' diff --git a/test/controllers/current_playlist/songs/albums_controller_test.rb b/test/controllers/current_playlist/songs/albums_controller_test.rb index 6bb009ff..c9b6b6af 100644 --- a/test/controllers/current_playlist/songs/albums_controller_test.rb +++ b/test/controllers/current_playlist/songs/albums_controller_test.rb @@ -9,9 +9,9 @@ class CurrentPlaylist::Songs::AlbumControllerTest < ActionDispatch::IntegrationT end test "should replace all songs with album songs" do - put current_playlist_album_url(albums(:album1)) + put current_playlist_album_url(albums(:album1), should_play: true) - assert_redirected_to current_playlist_songs_url(should_play_all: true) + assert_redirected_to current_playlist_songs_url(should_play: true) assert_equal albums(:album1).song_ids, @playlist.song_ids end diff --git a/test/controllers/current_playlist/songs/playlists_controller_test.rb b/test/controllers/current_playlist/songs/playlists_controller_test.rb index 3706558d..6836296a 100644 --- a/test/controllers/current_playlist/songs/playlists_controller_test.rb +++ b/test/controllers/current_playlist/songs/playlists_controller_test.rb @@ -11,9 +11,9 @@ class CurrentPlaylist::Songs::PlaylistsControllerTest < ActionDispatch::Integrat test "should replace all songs with playlist songs" do playlist = @user.playlists.create(name: "test", song_ids: [1, 2, 3]) - put current_playlist_playlist_url(playlist) + put current_playlist_playlist_url(playlist, should_play: true) - assert_redirected_to current_playlist_songs_url(should_play_all: true) + assert_redirected_to current_playlist_songs_url(should_play: true) assert_equal playlist.song_ids, @current_playlist.song_ids end diff --git a/test/system/album_test.rb b/test/system/album_test.rb index f1f49bd0..e64dfb5a 100644 --- a/test/system/album_test.rb +++ b/test/system/album_test.rb @@ -23,7 +23,7 @@ class AlbumSystemTest < ApplicationSystemTestCase login_as users(:visitor1) visit album_url(@album) - click_on "Play All" + click_on "Play" # assert current playlist have all songs in album @album.songs.each do |song| diff --git a/test/system/favorite_playlist_test.rb b/test/system/favorite_playlist_test.rb index cc9fe29c..530c1fe8 100644 --- a/test/system/favorite_playlist_test.rb +++ b/test/system/favorite_playlist_test.rb @@ -19,7 +19,7 @@ class FavoritePlaylistSystemTest < ApplicationSystemTestCase end test "play all songs in playlist" do - click_on "Play All" + click_on "Play" # assert current playlist have all songs in playlist assert_selector(:test_id, "current_playlist", visible: true) diff --git a/test/system/playlist_test.rb b/test/system/playlist_test.rb index 16f73f7c..12848386 100644 --- a/test/system/playlist_test.rb +++ b/test/system/playlist_test.rb @@ -16,7 +16,7 @@ class PlaylistSystemTest < ApplicationSystemTestCase end test "play all songs in playlist" do - click_on "Play All" + click_on "Play" # assert current playlist have all songs in playlist assert_selector(:test_id, "current_playlist", visible: true)