From 9e28932a42ba2e18bbb852ecb4df18f762375e18 Mon Sep 17 00:00:00 2001
From: Rijk van Zanten <rijkvanzanten@me.com>
Date: Mon, 27 Apr 2020 10:50:38 -0400
Subject: [PATCH] Collection display template (#487)

* Add translation strings for adding/editing item

* Add display_template to collection type

* Dont use functional for skeleton loader

* Make title optional and add title slot

* Make title prop optional in private view

* Render -- for null values in render template

* Render display template in header bar

* Render null values in template as subdued --

* Render status dot aligned in the middle

* Fetch latest collections on settings save
---
 src/components/v-form/v-form.vue              |  2 +-
 .../v-skeleton-loader/v-skeleton-loader.vue   |  6 ++--
 src/displays/status-dot/status-dot.vue        |  1 +
 src/lang/en-US/index.json                     |  5 +++-
 src/layouts/cards/components/card.vue         |  2 +-
 .../compositions/use-navigation.test.ts       |  4 +++
 .../collections/routes/detail/detail.vue      | 29 +++++++++++++++++--
 .../components/navigation/navigation.vue      |  2 +-
 .../routes/data-model/fields/fields.vue       |  3 ++
 .../components/navigation/navigation.vue      |  2 +-
 src/routes/install/install-requirements.vue   |  2 +-
 src/stores/collections/types.ts               |  1 +
 .../components/header-bar/header-bar.vue      | 10 ++++---
 .../render-template/render-template.vue       |  9 ++++--
 src/views/private/private-view.vue            |  2 +-
 15 files changed, 61 insertions(+), 19 deletions(-)

diff --git a/src/components/v-form/v-form.vue b/src/components/v-form/v-form.vue
index 139eb100b8..c79cf4b04e 100644
--- a/src/components/v-form/v-form.vue
+++ b/src/components/v-form/v-form.vue
@@ -356,7 +356,7 @@ body {
 .interface {
 	position: relative;
 
-	::v-deep .v-skeleton-loader {
+	.v-skeleton-loader {
 		position: absolute;
 		top: 0;
 		left: 0;
diff --git a/src/components/v-skeleton-loader/v-skeleton-loader.vue b/src/components/v-skeleton-loader/v-skeleton-loader.vue
index 1a68576a62..013001eddb 100644
--- a/src/components/v-skeleton-loader/v-skeleton-loader.vue
+++ b/src/components/v-skeleton-loader/v-skeleton-loader.vue
@@ -1,7 +1,7 @@
-<template functional>
+<template>
 	<transition name="fade">
-		<div class="v-skeleton-loader" :class="props.type">
-			<template v-if="props.type === 'list-item-icon'">
+		<div :class="type" class="v-skeleton-loader">
+			<template v-if="type === 'list-item-icon'">
 				<div class="icon" />
 				<div class="text" />
 			</template>
diff --git a/src/displays/status-dot/status-dot.vue b/src/displays/status-dot/status-dot.vue
index 18605d088e..ab2a1a668b 100644
--- a/src/displays/status-dot/status-dot.vue
+++ b/src/displays/status-dot/status-dot.vue
@@ -43,6 +43,7 @@ export default defineComponent({
 	width: 12px;
 	height: 12px;
 	margin: 0 4px;
+	vertical-align: middle;
 	border-radius: 6px;
 }
 </style>
diff --git a/src/lang/en-US/index.json b/src/lang/en-US/index.json
index 06eb986db2..0c32e0263f 100644
--- a/src/lang/en-US/index.json
+++ b/src/lang/en-US/index.json
@@ -147,6 +147,7 @@
 		"3": "Only super admins have access to this",
 		"4": "Super Admin Token not provided",
 		"11": "Can't Reach Database",
+		"12": "Field has invalid regular expression",
 		"100": "Incorrect Email/Password",
 		"101": "Logged-out from Inactivity",
 		"102": "Logged-out from Inactivity",
@@ -375,6 +376,9 @@
 	"statuses_not_configured": "Status mapping option configured incorrectly",
 	"status_mapping": "Status Mapping",
 
+	"adding_in": "Adding New Item in {collection}",
+	"editing_in": "Editing Item in {collection}",
+
   "about_directus": "About Directus",
   "activity_log": "Activity Log",
   "add_field_filter": "Add a field filter",
@@ -535,7 +539,6 @@
   "drop_files": "Can't Drop Files | Drop file here... | Drop files here...",
   "duplicate": "Duplicate",
   "duplicating_field": "Duplicating Field",
-  "editing": "Editing Item: {collection}",
   "editing_item": "Editing Item",
   "editing_items": "Batch Editing {count} Items",
   "editing_my_profile": "Editing My Profile",
diff --git a/src/layouts/cards/components/card.vue b/src/layouts/cards/components/card.vue
index 5fa4c479f1..cab2f2bca9 100644
--- a/src/layouts/cards/components/card.vue
+++ b/src/layouts/cards/components/card.vue
@@ -200,7 +200,7 @@ export default defineComponent({
 			--v-icon-color: var(--foreground-subdued);
 		}
 
-		::v-deep .v-skeleton-loader {
+		.v-skeleton-loader {
 			position: absolute;
 			top: 0;
 			left: 0;
diff --git a/src/modules/collections/compositions/use-navigation.test.ts b/src/modules/collections/compositions/use-navigation.test.ts
index de5a18db38..0f7f7054af 100644
--- a/src/modules/collections/compositions/use-navigation.test.ts
+++ b/src/modules/collections/compositions/use-navigation.test.ts
@@ -25,6 +25,7 @@ describe('Modules / Collections / Compositions / useNavigation', () => {
 				managed: true,
 				single: false,
 				translation: null,
+				display_template: null,
 			},
 		];
 
@@ -60,6 +61,7 @@ describe('Modules / Collections / Compositions / useNavigation', () => {
 				managed: true,
 				single: false,
 				translation: null,
+				display_template: null,
 			},
 			{
 				collection: 'test2',
@@ -70,6 +72,7 @@ describe('Modules / Collections / Compositions / useNavigation', () => {
 				managed: true,
 				single: false,
 				translation: null,
+				display_template: null,
 			},
 			{
 				collection: 'test3',
@@ -80,6 +83,7 @@ describe('Modules / Collections / Compositions / useNavigation', () => {
 				managed: true,
 				single: false,
 				translation: null,
+				display_template: null,
 			},
 		];
 
diff --git a/src/modules/collections/routes/detail/detail.vue b/src/modules/collections/routes/detail/detail.vue
index 05f881b68d..b0d4c44b15 100644
--- a/src/modules/collections/routes/detail/detail.vue
+++ b/src/modules/collections/routes/detail/detail.vue
@@ -3,11 +3,22 @@
 	<private-view
 		v-else
 		:title="
-			$t(collectionInfo.single ? 'editing_single' : 'editing', {
-				collection: collectionInfo.name,
-			})
+			isNew
+				? $t('adding_in', { collection: collectionInfo.name })
+				: $t('editing_in', { collection: collectionInfo.name })
 		"
 	>
+		<template #title v-if="isNew === false && collectionInfo.display_template">
+			<v-skeleton-loader class="title-loader" type="text" v-if="loading" />
+			<h1 class="type-title" v-else>
+				<render-template
+					:collection="collectionInfo.collection"
+					:item="templateValues"
+					:template="collectionInfo.display_template"
+				/>
+			</h1>
+		</template>
+
 		<template #title-outer:prepend>
 			<v-button
 				v-if="collectionInfo.single"
@@ -190,6 +201,13 @@ export default defineComponent({
 			() => `/${currentProjectKey.value}/collections/${collection.value}/`
 		);
 
+		const templateValues = computed(() => {
+			return {
+				...(item.value || {}),
+				...edits.value,
+			};
+		});
+
 		return {
 			item,
 			loading,
@@ -211,6 +229,7 @@ export default defineComponent({
 			saveAsCopyAndNavigate,
 			isBatch,
 			softDeleteStatus,
+			templateValues,
 		};
 
 		async function saveAndQuit() {
@@ -268,4 +287,8 @@ export default defineComponent({
 .v-form {
 	padding: var(--content-padding);
 }
+
+.title-loader {
+	width: 260px;
+}
 </style>
diff --git a/src/modules/files/components/navigation/navigation.vue b/src/modules/files/components/navigation/navigation.vue
index 7f6d800b16..decaee3a9c 100644
--- a/src/modules/files/components/navigation/navigation.vue
+++ b/src/modules/files/components/navigation/navigation.vue
@@ -52,7 +52,7 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-::v-deep .v-skeleton-loader {
+.v-skeleton-loader {
 	--v-skeleton-loader-background-color: var(--background-normal-alt);
 }
 
diff --git a/src/modules/settings/routes/data-model/fields/fields.vue b/src/modules/settings/routes/data-model/fields/fields.vue
index 5e957e443a..4750c33260 100644
--- a/src/modules/settings/routes/data-model/fields/fields.vue
+++ b/src/modules/settings/routes/data-model/fields/fields.vue
@@ -82,6 +82,7 @@ import useProjectsStore from '@/stores/projects';
 import { i18n } from '@/lang';
 import useItem from '@/compositions/use-item';
 import router from '@/router';
+import useCollectionsStore from '@/stores/collections';
 
 export default defineComponent({
 	components: { SettingsNavigation, FieldsManagement },
@@ -96,6 +97,7 @@ export default defineComponent({
 		const { collection } = toRefs(props);
 		const { info: collectionInfo, fields } = useCollection(collection);
 		const { currentProjectKey } = toRefs(projectsStore.state);
+		const collectionsStore = useCollectionsStore();
 
 		const breadcrumb = computed(() => {
 			return [
@@ -152,6 +154,7 @@ export default defineComponent({
 
 		async function saveAndQuit() {
 			await save();
+			await collectionsStore.hydrate();
 			router.push(`/${currentProjectKey.value}/settings/data-model`);
 		}
 	},
diff --git a/src/modules/users/components/navigation/navigation.vue b/src/modules/users/components/navigation/navigation.vue
index 45acb2ace9..0cec9acc56 100644
--- a/src/modules/users/components/navigation/navigation.vue
+++ b/src/modules/users/components/navigation/navigation.vue
@@ -36,7 +36,7 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-::v-deep .v-skeleton-loader {
+.v-skeleton-loader {
 	--v-skeleton-loader-background-color: var(--background-normal-alt);
 }
 
diff --git a/src/routes/install/install-requirements.vue b/src/routes/install/install-requirements.vue
index 65e07aa21e..69fbb7701b 100644
--- a/src/routes/install/install-requirements.vue
+++ b/src/routes/install/install-requirements.vue
@@ -146,7 +146,7 @@ export default defineComponent({
 
 <style lang="scss" scoped>
 .v-notice,
-::v-deep .v-skeleton-loader {
+.v-skeleton-loader {
 	margin-bottom: 12px;
 }
 </style>
diff --git a/src/stores/collections/types.ts b/src/stores/collections/types.ts
index 05e273aafb..51500190cc 100644
--- a/src/stores/collections/types.ts
+++ b/src/stores/collections/types.ts
@@ -13,6 +13,7 @@ export interface CollectionRaw {
 	managed: boolean;
 	icon: string | null;
 	translation: Translation[] | null;
+	display_template: string | null;
 }
 
 export interface Collection extends CollectionRaw {
diff --git a/src/views/private/components/header-bar/header-bar.vue b/src/views/private/components/header-bar/header-bar.vue
index dd8b11e190..6a806cb849 100644
--- a/src/views/private/components/header-bar/header-bar.vue
+++ b/src/views/private/components/header-bar/header-bar.vue
@@ -11,9 +11,11 @@
 		<div class="title-container">
 			<slot name="headline" />
 			<div class="title">
-				<slot name="title:prepend" />
-				<h1 class="type-title">{{ title }}</h1>
-				<slot name="title:append" />
+				<slot name="title">
+					<slot name="title:prepend" />
+					<h1 class="type-title">{{ title }}</h1>
+					<slot name="title:append" />
+				</slot>
 			</div>
 		</div>
 
@@ -38,7 +40,7 @@ export default defineComponent({
 	props: {
 		title: {
 			type: String,
-			required: true,
+			default: null,
 		},
 	},
 	setup() {
diff --git a/src/views/private/components/render-template/render-template.vue b/src/views/private/components/render-template/render-template.vue
index b63e132463..ec60d4bbdc 100644
--- a/src/views/private/components/render-template/render-template.vue
+++ b/src/views/private/components/render-template/render-template.vue
@@ -1,11 +1,12 @@
 <template>
 	<div class="render-template">
 		<template v-for="(part, index) in parts">
+			<span :key="index" v-if="part === null || part.value === null" class="subdued">--</span>
 			<component
-				v-if="part !== null && typeof part === 'object'"
+				v-else-if="typeof part === 'object'"
 				:is="`display-${part.component}`"
 				:key="index"
-				:value="part.value"
+				:value="part.value === null ? '--' : part.value"
 				:interface="part.interface"
 				:interface-options="part.interfaceOptions"
 				v-bind="part.options"
@@ -91,4 +92,8 @@ export default defineComponent({
 .render-template {
 	display: contents;
 }
+
+.subdued {
+	color: var(--foreground-subdued);
+}
 </style>
diff --git a/src/views/private/private-view.vue b/src/views/private/private-view.vue
index 53490c4281..7610416de4 100644
--- a/src/views/private/private-view.vue
+++ b/src/views/private/private-view.vue
@@ -94,7 +94,7 @@ export default defineComponent({
 	props: {
 		title: {
 			type: String,
-			required: true,
+			default: null,
 		},
 	},
 	setup() {