Fix layout preview being empty when editing preview (#8654)

* Fix layout preview being empty when editing preview Fixes #8645 * Remove collection prop from layout component The prop is already passed through the layout state.
directus · Oct 8, 2021 · d6e40f4 · d6e40f4
1 parent 4c2de47
commit d6e40f4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/app/src/layouts/cards/index.ts b/app/src/layouts/cards/index.ts
@@ -188,7 +188,7 @@ export default defineLayout<LayoutOptions, LayoutQuery>({
 
 			const sort = computed<string[]>({
 				get() {
-					return layoutQuery.value?.sort || [primaryKeyField.value!.field] || [];
+					return layoutQuery.value?.sort || (primaryKeyField.value ? [primaryKeyField.value.field] : []);
 				},
 				set(newSort: string[]) {
 					layoutQuery.value = {

diff --git a/app/src/layouts/tabular/index.ts b/app/src/layouts/tabular/index.ts
@@ -160,7 +160,7 @@ export default defineLayout<LayoutOptions, LayoutQuery>({
 
 			const sort = computed<string[]>({
 				get() {
-					return layoutQuery.value?.sort || [primaryKeyField.value!.field] || [];
+					return layoutQuery.value?.sort || (primaryKeyField.value ? [primaryKeyField.value.field] : []);
 				},
 				set(newSort: string[]) {
 					layoutQuery.value = {

diff --git a/app/src/modules/settings/routes/presets/item.vue b/app/src/modules/settings/routes/presets/item.vue
@@ -68,12 +68,7 @@
 				<v-form v-model="edits" :fields="fields" :loading="loading" :initial-values="initialValues" :primary-key="id" />
 
 				<div class="layout">
-					<component
-						:is="`layout-${values.layout}`"
-						v-if="values.layout && values.collection"
-						v-bind="layoutState"
-						:collection="values.collection"
-					>
+					<component :is="`layout-${values.layout}`" v-if="values.layout && values.collection" v-bind="layoutState">
 						<template #no-results>
 							<v-info :title="t('no_results')" icon="search" center>
 								{{ t('no_results_copy') }}