Last june issues before i take my leave (#139)

resolves #136 resolves #137 resolves #138 --------- Co-authored-by: Robin Kaggl <[email protected]>
acdh-oeaw · Jun 24, 2024 · e557f10 · e557f10
1 parent b4e33d7
commit e557f10
Show file tree

Hide file tree

Showing 11 changed files with 100 additions and 81 deletions.
diff --git a/.npmrc b/.npmrc
@@ -4,3 +4,4 @@ engine-strict=true
 shamefully-hoist=true
 shell-emulator=true
 use-node-version=20.10.0
+package-manager-strict=false
diff --git a/components/tooltip.vue b/components/tooltip.vue
diff --git a/lib/helpers.ts b/lib/helpers.ts
@@ -13,6 +13,6 @@ export function detectURLsAddLinks(content: string) {
 		/(https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|www\.[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9]+\.[^\s]{2,}|www\.[a-zA-Z0-9]+\.[^\s]{2,})/;
 	return content.replace(
 		urlRegex,
-		'<a style="text-decoration: underline; font-weight: 600" href="$1" target="_blank">$1</a>',
+		'<a style="text-decoration: underline; font-weight: 600;" href="$1" target="_blank">$1&#8599;</a>',
 	);
 }
diff --git a/locales/de.json b/locales/de.json
@@ -164,7 +164,10 @@
 			"allowance": "Zahlungen",
 			"same_as": "Onlineressourcen",
 			"confession": "Konfession",
-			"no-notes": "Keine Notizen vorhanden."
+			"no-notes": "Keine Notizen vorhanden.",
+			"notes": "Redaktioneller Hinweis",
+			"hierarchy": "Hierarchievisualisierung",
+			"citations": "Zitationsvorschlag"
 		},
 		"viecpro_courts": {
 			"model": "Modell",

diff --git a/locales/en.json b/locales/en.json
@@ -163,7 +163,10 @@
 			"allowance": "Allowance",
 			"same_as": "Online resources",
 			"confession": "Confession",
-			"no-notes": "No notes provided."
+			"no-notes": "No notes provided.",
+			"notes": "Editor's note",
+			"hierarchy": "Hierarchy visualisation",
+			"citations": "Proposal for citation "
 		},
 		"viecpro_courts": {
 			"model": "Model",

diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
 		"node": "20.x",
 		"pnpm": "8.x"
 	},
-	"packageManager": "pnpm@8.10.5",
+	"packageManager": "pnpm@8.15.8",
 	"scripts": {
 		"build": "nuxt build",
 		"dev": "nuxt dev",

diff --git a/pages/detail/courts/[id].vue b/pages/detail/courts/[id].vue
@@ -42,7 +42,7 @@ definePageMeta({
 });
 
 const title = computed(() => {
-	if (data.value.entity.data?.name)
+	if (data.value.entity.data.name)
 		return `${data.value.entity.data.name} - ${t("pages.searchviews.courts.sing")}`;
 	return t("pages.searchviews.courts.sing");
 });
@@ -74,15 +74,23 @@ useHead({
 						{{ data.entity.data?.name }}
 					</h1>
 					<div class="flex items-center gap-2">
-						<Indicator class="w-24" :status="data.details.data?.ampel" />
+						<Indicator
+							class="w-24"
+							:status="data.details.data?.ampel"
+							:title="t('collection-keys.viecpro_persons.ampel')"
+						/>
 						<HierarchyLinkButton
 							:id="String(data.entity.data?.object_id)"
 							model="Institution"
 							:label="data.entity.data?.name"
+							:title="t('collection-keys.viecpro_persons.hierarchy')"
 						/>
 						<InfoMenu>
 							<template #button>
-								<button class="rounded-full hover:bg-slate-200 active:bg-slate-300">
+								<button
+									class="rounded-full hover:bg-slate-200 active:bg-slate-300"
+									:title="t('collection-keys.viecpro_persons.citations')"
+								>
 									<span class="sr-only">Show Infos</span>
 									<Info class="m-2 h-6 w-6 shrink-0" />
 								</button>
@@ -100,7 +108,7 @@ useHead({
 								</div>
 							</template>
 						</InfoMenu>
-						<DownloadMenu detail :data="data" :collection="collection" />
+						<DownloadMenu detail :data="data" :collection="collection" title="Download" />
 					</div>
 				</div>
 				<span v-else class="animate-pulse">{{ t("ui.loading") }}</span>

diff --git a/pages/detail/institutions/[id].vue b/pages/detail/institutions/[id].vue
@@ -34,9 +34,11 @@ const data = ref({
 
 const fetchCourts = computed(() => {
 	if (
-		data.value.details.error?.httpStatus &&
+		data.value.details.error &&
+		data.value.entity.error &&
+		data.value.details.error.httpStatus &&
 		data.value.details.error.httpStatus === 404 &&
-		data.value.entity.error?.httpStatus &&
+		data.value.entity.error.httpStatus &&
 		data.value.entity.error.httpStatus === 404
 	)
 		return true;
@@ -79,7 +81,7 @@ definePageMeta({
 });
 
 const title = computed(() => {
-	if (data.value.entity.data?.name) return `${data.value.entity.data.name} - Institution`;
+	if (data.value.entity.data.name) return `${data.value.entity.data.name} - Institution`;
 	return "Institution";
 });
 
@@ -113,15 +115,23 @@ useHead({
 						{{ data.entity.data?.name }}
 					</h1>
 					<div class="flex items-center gap-2">
-						<Indicator class="w-24" :status="data.entity.data?.ampel" />
+						<Indicator
+							class="w-24"
+							:status="data.entity.data?.ampel"
+							:title="t('collection-keys.viecpro_persons.ampel')"
+						/>
 						<HierarchyLinkButton
 							:id="String(data.entity.data?.object_id)"
 							model="Institution"
 							:label="data.entity.data?.name"
+							:title="t('collection-keys.viecpro_persons.hierarchy')"
 						/>
 						<InfoMenu>
 							<template #button>
-								<button class="rounded-full hover:bg-slate-200 active:bg-slate-300">
+								<button
+									class="rounded-full hover:bg-slate-200 active:bg-slate-300"
+									:title="t('collection-keys.viecpro_persons.citations')"
+								>
 									<span class="sr-only">Show Infos</span>
 									<Info class="m-2 h-6 w-6 shrink-0" />
 								</button>
@@ -138,7 +148,7 @@ useHead({
 							</template>
 						</InfoMenu>
 
-						<DownloadMenu detail :data="data" :collection="collection" />
+						<DownloadMenu detail :data="data" :collection="collection" title="Download" />
 					</div>
 				</div>
 				<span v-else class="animate-pulse">{{ t("ui.loading") }}</span>

diff --git a/pages/detail/persons/[id].vue b/pages/detail/persons/[id].vue
@@ -99,15 +99,42 @@ useHead({
 						{{ data.entity.data?.fullname }}
 					</h1>
 					<div class="flex items-center gap-2">
-						<Indicator class="w-24" :status="data.entity.data?.ampel" />
+						<Indicator
+							class="w-24"
+							:status="data.entity.data?.ampel"
+							:title="t('collection-keys.viecpro_persons.ampel')"
+						/>
+						<InfoMenu class="text-base font-normal">
+							<template #button>
+								<button
+									:title="t('collection-keys.viecpro_persons.notes')"
+									class="rounded-full transition hover:bg-slate-200 active:bg-slate-300"
+								>
+									<span class="sr-only">{{ t("collection-keys.viecpro_courts.sources") }}</span>
+									<StickyNote class="m-2 h-6 w-6 shrink-0" />
+								</button>
+							</template>
+							<template #content>
+								<div v-if="data.details.data.notes">
+									{{ data.details.data.notes }}
+								</div>
+								<div v-else class="italic">
+									{{ t("collection-keys.viecpro_persons.no-notes") }}
+								</div>
+							</template>
+						</InfoMenu>
 						<HierarchyLinkButton
 							:id="String(data.entity.data?.object_id)"
 							model="Person"
 							:label="data.entity.data?.fullname"
+							:title="t('collection-keys.viecpro_persons.hierarchy')"
 						/>
 						<InfoMenu>
 							<template #button>
-								<button class="rounded-full transition hover:bg-slate-200 active:bg-slate-300">
+								<button
+									class="rounded-full transition hover:bg-slate-200 active:bg-slate-300"
+									:title="t('collection-keys.viecpro_persons.citations')"
+								>
 									<span class="sr-only">Show Infos</span>
 									<Info class="m-2 h-6 w-6 shrink-0" />
 								</button>
@@ -124,23 +151,7 @@ useHead({
 							</template>
 						</InfoMenu>
 
-						<InfoMenu class="text-base font-normal">
-							<template #button>
-								<button class="rounded-full transition hover:bg-slate-200 active:bg-slate-300">
-									<span class="sr-only">{{ t("collection-keys.viecpro_courts.sources") }}</span>
-									<StickyNote class="m-2 h-6 w-6 shrink-0" />
-								</button>
-							</template>
-							<template #content>
-								<div v-if="data.details.data.notes">
-									{{ data.details.data.notes }}
-								</div>
-								<div v-else class="italic">
-									{{ t("collection-keys.viecpro_persons.no-notes") }}
-								</div>
-							</template>
-						</InfoMenu>
-						<DownloadMenu detail :data="data" :collection="collection" />
+						<DownloadMenu detail :data="data" :collection="collection" title="Download" />
 					</div>
 				</div>
 				<span v-else class="animate-pulse">{{ t("ui.loading") }}</span>
@@ -283,11 +294,21 @@ useHead({
 				>
 					<div v-if="data.refs.data" class="flex flex-col divide-y-2">
 						<div
-							v-for="tag in [...new Set(data.refs.data.hits?.map((hit) => hit.document.tag))]"
-							:key="tag"
+							v-for="tag in [...new Set(data.refs.data.hits?.map((hit) => hit.document.tag))].sort(
+								(a, b) => {
+									const standard = [
+										'Primärquellen',
+										'Sekundärliteratur',
+										'Datenbanken',
+										'Projekte',
+									];
+									return standard.indexOf(a) - standard.indexOf(b);
+								},
+							)"
+							:key="String(tag)"
 							class="p-2"
 						>
-							<h2 class="mb-2 text-xl font-semibold">
+							<h2 class="mb-2 font-semibold">
 								{{ tag }}
 							</h2>
 							<template
@@ -297,16 +318,9 @@ useHead({
 								:key="reference.id"
 							>
 								<div v-if="i !== 0" class="my-1 border" />
-								<div>
-									<span
-										:class="reference.folio && `after:content-[',_']`"
-										v-html="detectURLsAddLinks(reference.title || reference.shortTitle)"
-									/>
-									<span
-										v-if="reference.folio"
-										class="text-sm text-gray-600"
-										v-html="detectURLsAddLinks(reference.folio)"
-									/>
+								<div class="flex flex-col gap-0.5">
+									<span v-html="detectURLsAddLinks(reference.title || reference.shortTitle)" />
+									<span v-if="reference.folio" v-html="detectURLsAddLinks(reference.folio)" />
 								</div>
 							</template>
 						</div>

diff --git a/pages/detail/places/[id].vue b/pages/detail/places/[id].vue
@@ -66,7 +66,7 @@ definePageMeta({
 });
 
 const title = computed(() => {
-	if (data.value.entity.data?.name)
+	if (data.value.entity.data.name)
 		return `${data.value.entity.data.name} - ${t("pages.searchviews.places.sing")}`;
 	return t("pages.searchviews.places.sing");
 });
@@ -98,10 +98,17 @@ useHead({
 						{{ data.entity.data?.name }}
 					</h1>
 					<div class="flex items-center gap-2">
-						<Indicator class="w-24" :status="data.entity.data?.ampel" />
+						<Indicator
+							class="w-24"
+							:status="data.entity.data?.ampel"
+							:title="t('collection-keys.viecpro_persons.ampel')"
+						/>
 						<InfoMenu>
 							<template #button>
-								<button class="rounded-full hover:bg-slate-200 active:bg-slate-300">
+								<button
+									class="rounded-full hover:bg-slate-200 active:bg-slate-300"
+									:title="t('collection-keys.viecpro_persons.citations')"
+								>
 									<span class="sr-only">Show Infos</span>
 									<Info class="m-2 h-6 w-6 shrink-0" />
 								</button>
@@ -120,7 +127,7 @@ useHead({
 							</template>
 						</InfoMenu>
 
-						<DownloadMenu detail :data="data" :collection="collection" />
+						<DownloadMenu detail :data="data" :collection="collection" title="Download" />
 					</div>
 				</div>
 				<span v-else class="animate-pulse">{{ t("ui.loading") }}</span>

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml