chore: display relations with end_date only

pages/detail/event/[id].vue

@@ -5,7 +5,7 @@ import DetailPage from "@/components/detail-page.vue";
 import Timeline from "@/components/timeline/timeline.vue";
 import Loader from "@/components/ui/loader.vue";
 import { loadAndGroupRelations } from "@/lib/group-relations.ts";
-import type { TimelineObject } from "@/types/timeline";
+import { getFlattenedRelations } from "@/utils/timeline-utils";
 
 const t = useTranslations();
 const route = useRoute();
@@ -45,16 +45,7 @@ const chipNames = computed(() => {
 });
 const flattenedRelations = computed(() => {
 	if (!data.value.relations.data) return [];
-	const res = Object.entries(data.value.relations.data)
-		.map(([key, val]) =>
-			val.map((entry) => {
-				return { ...entry, class: key };
-			}),
-		)
-		.flat()
-		.filter((r): r is TimelineObject => Boolean(r.start_date))
-		.sort((r) => new Date(String(r.start_date)).valueOf());
-	return res;
+	return getFlattenedRelations(data.value.relations.data);
 });
 </script>
 

pages/detail/function/[id].vue

@@ -7,7 +7,7 @@ import Timeline from "@/components/timeline/timeline.vue";
 import VerticalTimeline from "@/components/timeline/vertical-timeline.vue";
 import Loader from "@/components/ui/loader.vue";
 import { loadAndGroupRelations } from "@/lib/group-relations.ts";
-import type { TimelineObject } from "@/types/timeline";
+import { getFlattenedRelations } from "@/utils/timeline-utils";
 
 const t = useTranslations();
 const route = useRoute();
@@ -48,16 +48,7 @@ const chipNames = computed(() => {
 });
 const flattenedRelations = computed(() => {
 	if (!data.value.relations.data) return [];
-	const res = Object.entries(data.value.relations.data)
-		.map(([key, val]) =>
-			val.map((entry) => {
-				return { ...entry, class: key };
-			}),
-		)
-		.flat()
-		.filter((r): r is TimelineObject => Boolean(r.start_date))
-		.sort((r) => new Date(String(r.start_date)).valueOf());
-	return res;
+	return getFlattenedRelations(data.value.relations.data);
 });
 const showVerticalTimeline = ref(false);
 function closeVerticalTimeline() {

pages/detail/institution/[id].vue

@@ -5,7 +5,7 @@ import DetailPage from "@/components/detail-page.vue";
 import Timeline from "@/components/timeline/timeline.vue";
 import Loader from "@/components/ui/loader.vue";
 import { loadAndGroupRelations } from "@/lib/group-relations.ts";
-import type { TimelineObject } from "@/types/timeline";
+import { getFlattenedRelations } from "@/utils/timeline-utils";
 
 const t = useTranslations();
 const route = useRoute();
@@ -46,16 +46,7 @@ const chipNames = computed(() => {
 });
 const flattenedRelations = computed(() => {
 	if (!data.value.relations.data) return [];
-	const res = Object.entries(data.value.relations.data)
-		.map(([key, val]) =>
-			val.map((entry) => {
-				return { ...entry, class: key };
-			}),
-		)
-		.flat()
-		.filter((r): r is TimelineObject => Boolean(r.start_date))
-		.sort((r) => new Date(String(r.start_date)).valueOf());
-	return res;
+	return getFlattenedRelations(data.value.relations.data);
 });
 </script>
 

pages/detail/person/[id].vue

@@ -9,7 +9,7 @@ import Timeline from "@/components/timeline/timeline.vue";
 import VerticalTimeline from "@/components/timeline/vertical-timeline.vue";
 import Loader from "@/components/ui/loader.vue";
 import { loadAndGroupRelations } from "@/lib/group-relations.ts";
-import type { TimelineObject } from "@/types/timeline";
+import { getFlattenedRelations } from "@/utils/timeline-utils";
 
 const t = useTranslations();
 const localePath = useLocalePath();
@@ -51,15 +51,7 @@ const functionNames = computed(() => {
 });
 const flattenedRelations = computed(() => {
 	if (!data.value.relations.data) return [];
-	const res = Object.entries(data.value.relations.data)
-		.map(([key, val]) =>
-			val.map((entry) => {
-				return { ...entry, class: key };
-			}),
-		)
-		.flat()
-		.filter((r): r is TimelineObject => Boolean(r.start_date));
-	return res;
+	return getFlattenedRelations(data.value.relations.data);
 });
 
 const sameAs = computed(() => {

pages/detail/place/[id].vue

@@ -6,7 +6,7 @@ import Map from "@/components/map.vue";
 import Timeline from "@/components/timeline/timeline.vue";
 import Loader from "@/components/ui/loader.vue";
 import { loadAndGroupRelations } from "@/lib/group-relations.ts";
-import type { TimelineObject } from "@/types/timeline";
+import { getFlattenedRelations } from "@/utils/timeline-utils";
 
 const t = useTranslations();
 const route = useRoute();
@@ -47,16 +47,7 @@ const chipNames = computed(() => {
 });
 const flattenedRelations = computed(() => {
 	if (!data.value.relations.data) return [];
-	const res = Object.entries(data.value.relations.data)
-		.map(([key, val]) =>
-			val.map((entry) => {
-				return { ...entry, class: key };
-			}),
-		)
-		.flat()
-		.filter((r): r is TimelineObject => Boolean(r.start_date))
-		.sort((r) => new Date(String(r.start_date)).valueOf());
-	return res;
+	return getFlattenedRelations(data.value.relations.data);
 });
 </script>
 

pages/detail/salary/[id].vue

@@ -5,7 +5,7 @@ import DetailPage from "@/components/detail-page.vue";
 import Timeline from "@/components/timeline/timeline.vue";
 import Loader from "@/components/ui/loader.vue";
 import { loadAndGroupRelations } from "@/lib/group-relations.ts";
-import type { TimelineObject } from "@/types/timeline";
+import { getFlattenedRelations } from "@/utils/timeline-utils";
 
 const t = useTranslations();
 const route = useRoute();
@@ -34,17 +34,8 @@ const data = ref({
 });
 
 const flattenedRelations = computed(() => {
-	if (data.value.relations.isLoading) return [];
-	const res = Object.entries(data.value.relations.data ?? {})
-		.map(([key, val]) =>
-			val.map((entry) => {
-				return { ...entry, class: key };
-			}),
-		)
-		.flat()
-		.filter((r): r is TimelineObject => Boolean(r.start_date))
-		.sort((r) => new Date(String(r.start_date)).valueOf());
-	return res;
+	if (!data.value.relations.data) return [];
+	return getFlattenedRelations(data.value.relations.data);
 });
 </script>
 

utils/timeline-utils.ts

@@ -1,3 +1,4 @@
+import type { TempTriple } from "@/types/resulttypes";
 import type { TimelineObject } from "@/types/timeline";
 
 //type guard to filter grouped relations
@@ -22,3 +23,28 @@ export function groupTimelineRelations(filteredRelations: Array<TimelineObject>)
 			isValidTimelineObject(arr),
 		);
 }
+
+export function getFlattenedRelations(relations: Record<string, Array<TempTriple>>) {
+	const res = Object.entries(relations)
+		.map(([key, val]) =>
+			val.map((entry) => {
+				return {
+					...entry,
+					class: key,
+				};
+			}),
+		)
+		.flat()
+		.filter((r): r is TimelineObject => Boolean(r.start_date) || Boolean(r.end_date))
+		.map((entry) => {
+			let start_date_written = entry.start_date_written;
+			if (!start_date_written || start_date_written === "")
+				start_date_written = entry.end_date_written;
+			return {
+				...entry,
+				start_date: entry.start_date ?? entry.end_date,
+				start_date_written: start_date_written,
+			};
+		});
+	return res;
+}