e33418f716
Resolves a batch of bugs and feature requests across songs, services, settings and export: Songs & sections - Every song now carries permanent, empty, locked PREFIX (COPYRIGHT) and POSTFIX (BLANK) sections, deduplicated on import; locked sections cannot be edited or deleted via UI or API. - Song edit modal: explicit Speichern/Schließen with dirty-tracking, editable section headline (combobox + custom values), and a fix for the 419 CSRF errors after CCLI "Importieren & Bearbeiten" (token read fresh per request). - CCLI bookmarklet "Importieren & Bearbeiten" now opens the edit dialog. Service schedule & arrangements - Fixed assigned songs showing no sections (slides loaded for all arrangements, not just the default). - Added "Song entfernen / neu zuordnen" to reassign an assigned song. - Worship-leader arrangement is created/selected lazily when the arrangement dialog opens (only when not user-overridden); the leader is resolved from the "Lobpreis" agenda item, and manual create/clone names are prefixed with the leader name. Navigation - "/" redirects to the next upcoming service's edit page (or the list). - Service titles link to the edit page. Settings - Renamed "Makro-Import"/"Label-Import" menu items; fixed drag-and-drop imports (were downloading the dropped file); added label-import hint; made the panel scrollable. - Nametag now uses a single MacroPicker; added song prefix/postfix label defaults (COPYRIGHT #24B34C / BLANK #000000); new "Export-Dateien" menu to upload prefix/postfix .pro files added to every export. Export - Filenames/playlist names are date-first ("YYYY-MM-DD <Title>"). - Keyvisual slide only for the first content-less item after real content; all other content-less items render as headlines. - New "Vorschau herunterladen" for non-finalized services (filename and import name prefixed "Vorschau" with export timestamp). - Uploaded prefix/postfix .pro files wrap every export. Tests updated to the new behavior; full suite green (569 passed).
80 lines
2.3 KiB
Vue
80 lines
2.3 KiB
Vue
<script setup>
|
|
import AuthenticatedLayout from '@/Layouts/AuthenticatedLayout.vue'
|
|
import CcliPasteDialog from '@/Components/CcliPasteDialog.vue'
|
|
import SongEditModal from '@/Components/SongEditModal.vue'
|
|
import { Head, router } from '@inertiajs/vue3'
|
|
import { ref } from 'vue'
|
|
|
|
const props = defineProps({
|
|
prefilledText: { type: String, default: null },
|
|
prefilledMetadata: { type: Object, default: null },
|
|
prefillError: { type: String, default: null },
|
|
})
|
|
|
|
const editSongId = ref(null)
|
|
|
|
function handleClose() {
|
|
// Don't navigate away if an edit is opening (import & edit flow).
|
|
if (editSongId.value !== null) return
|
|
|
|
router.visit(route('songs.index'))
|
|
}
|
|
|
|
function handleImported(songId, mode) {
|
|
if (mode === 'stay') {
|
|
router.visit(route('songs.index'))
|
|
}
|
|
}
|
|
|
|
function handleEditSong(id) {
|
|
editSongId.value = id
|
|
}
|
|
|
|
function handleEditClose() {
|
|
router.visit(route('songs.index'))
|
|
}
|
|
</script>
|
|
|
|
<template>
|
|
<Head title="Song aus SongSelect importieren" />
|
|
|
|
<AuthenticatedLayout>
|
|
<template #header>
|
|
<h2 class="text-xl font-semibold leading-tight text-gray-900">
|
|
Song aus SongSelect importieren
|
|
</h2>
|
|
</template>
|
|
|
|
<div class="py-8">
|
|
<div class="mx-auto max-w-2xl px-4 sm:px-6 lg:px-8">
|
|
|
|
<!-- Prefill error -->
|
|
<div
|
|
v-if="prefillError"
|
|
data-testid="ccli-prefill-error-message"
|
|
class="mb-4 rounded-lg border border-yellow-200 bg-yellow-50 p-4 text-sm text-yellow-800"
|
|
>
|
|
{{ prefillError }}
|
|
</div>
|
|
|
|
<!-- Always-open paste dialog on this page -->
|
|
<CcliPasteDialog
|
|
:open="editSongId === null"
|
|
mode="songdb"
|
|
:prefilled-text="prefilledText"
|
|
:auto-edit="prefilledText !== null"
|
|
@close="handleClose"
|
|
@imported="handleImported"
|
|
@edit-song="handleEditSong"
|
|
/>
|
|
|
|
<SongEditModal
|
|
:show="editSongId !== null"
|
|
:song-id="editSongId"
|
|
@close="handleEditClose"
|
|
/>
|
|
</div>
|
|
</div>
|
|
</AuthenticatedLayout>
|
|
</template>
|