Refactor: Make SongList view functionally return array with conditional/null... (e245b854) · Commits · Jakob Moser / karaokatalog-ui

frontend/components/pieces/SongList.mjs

+17 −30

Original line number	Diff line number	Diff line
		@@ -83,36 +83,23 @@ const SongList = {
		)
		}

		const elementsToRender = []
		if (messageElement) {
		elementsToRender.push(messageElement)
		}

		if (hasContentOnPage) {
		elementsToRender.push(
		artistsOnPage.map(artist =>
		return [
		messageElement,
		hasContentOnPage ? artistsOnPage.map(artist =>
		m(Artist, {
		artist,
		songs: groupedSongs[artist],
		currentView,
		query,
		currentPage,
		}),
		),
		)
		}

		if (totalPages > 1) {
		elementsToRender.push(
		m(PaginationControls, {
		})
		) : null,
		totalPages > 1 ? m(PaginationControls, {
		currentPage: currentPage,
		totalPages: totalPages,
		onPageChange: model.onPageChange.bind(model),
		}),
		)
		}

		return elementsToRender
		}) : null,
		]
		},
		}