Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions components/manifest-import/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
*/

import TPEN from '../../api/TPEN.js'
import { getUserFromToken } from '../iiif-tools/index.js'
import { escapeHtml } from '/js/utils.js'

class ManifestImport extends HTMLElement {
Expand All @@ -26,6 +25,11 @@ class ManifestImport extends HTMLElement {
this.load()
}

disconnectedCallback() {
// Cleanup - component uses innerHTML replacement for rendering,
// so no manual event listener cleanup needed
}

async load() {
this.#authToken = TPEN.getAuthorization()
if (!this.#authToken) {
Expand Down Expand Up @@ -89,8 +93,14 @@ class ManifestImport extends HTMLElement {
})

if (!response.ok) {
const errorData = await response.json()
throw new Error(errorData.message || `HTTP ${response.status}`)
let errorMessage = `HTTP ${response.status}`
try {
const errorData = await response.json()
errorMessage = errorData.message || errorMessage
} catch {
// Response was not JSON - use HTTP status
}
throw new Error(errorMessage)
}

return response.json()
Expand Down Expand Up @@ -536,8 +546,8 @@ class ManifestImport extends HTMLElement {
</div>
${failed.map(error => `
<div class="error-item">
<strong>${error.message}</strong>
<div class="error-url">${error.manifestUrl}</div>
<strong>${escapeHtml(error.message || '')}</strong>
<div class="error-url">${escapeHtml(error.manifestUrl || '')}</div>
</div>
`).join('')}
</div>
Expand Down