From 2d46687116febe6c034e5ad75cdf885f7ff7dc32 Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Tue, 11 Aug 2020 17:39:34 -0400
Subject: [PATCH] Set correct defaults for users/files

---
 api/src/database/seeds/system.yaml            | 34 +++++++++++++++++++
 .../use-collection-preset.ts                  |  2 +-
 .../modules/files/routes/browse/browse.vue    | 19 -----------
 .../modules/users/routes/browse/browse.vue    | 29 +++++-----------
 4 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/api/src/database/seeds/system.yaml b/api/src/database/seeds/system.yaml
index cbb13ab90b..b02d6bce24 100644
--- a/api/src/database/seeds/system.yaml
+++ b/api/src/database/seeds/system.yaml
@@ -1728,6 +1728,40 @@ rows:
         permissions: {}
         fields: "project_name,project_logo,project_color,public_foreground,public_background,public_note"
 
+  directus_presets:
+    defaults:
+      title: null
+      user: null
+      role: null
+      collection: null
+      search: null
+      filters: []
+      view_type: tabular
+      view_query: null
+      view_options: null
+
+    data:
+      - collection: directus_files
+        view_type: cards
+        view_query:
+          cards:
+            sort: -uploaded_on
+        view_options:
+          cards:
+            icon: insert_drive_file
+            title: '{{ title }}'
+            subtitle: '{{ type }} • {{ filesize }}'
+            size: 4
+            imageFit: crop
+      - collection: directus_users
+        view_type: cards
+        view_options:
+          cards:
+            icon: person
+            title: '{{ first_name }} {{ last_name }}'
+            subtitle: '{{ title }}'
+            size: 4
+
   directus_relations:
     defaults:
       many_collection: directus_users
diff --git a/app/src/composables/use-collection-preset/use-collection-preset.ts b/app/src/composables/use-collection-preset/use-collection-preset.ts
index adeeeb6e57..ceeabe0792 100644
--- a/app/src/composables/use-collection-preset/use-collection-preset.ts
+++ b/app/src/composables/use-collection-preset/use-collection-preset.ts
@@ -76,7 +76,7 @@ export function usePreset(collection: Ref<string>, bookmark: Ref<number | null>
 
 	const viewType = computed<string | null>({
 		get() {
-			return localPreset.value.view_type || null;
+			return localPreset.value.view_type || 'tabular';
 		},
 		set(val) {
 			localPreset.value = {
diff --git a/app/src/modules/files/routes/browse/browse.vue b/app/src/modules/files/routes/browse/browse.vue
index c3c2f7b6df..45a3f14672 100644
--- a/app/src/modules/files/routes/browse/browse.vue
+++ b/app/src/modules/files/routes/browse/browse.vue
@@ -188,25 +188,6 @@ export default defineComponent({
 			];
 		});
 
-		if (viewType.value === null) {
-			viewType.value = 'cards';
-		}
-
-		if (viewOptions.value === null && viewType.value === 'cards') {
-			viewOptions.value = {
-				icon: 'insert_drive_file',
-				title: '{{title}}',
-				subtitle: '{{type}} • {{filesize}}',
-				size: 4,
-			};
-		}
-
-		if (viewQuery.value === null && viewType.value === 'cards') {
-			viewQuery.value = {
-				sort: '-uploaded_on',
-			};
-		}
-
 		const { moveToDialogActive, moveToFolder, moving, selectedFolder } = useMovetoFolder();
 
 		onMounted(() => emitter.on(Events.upload, refresh));
diff --git a/app/src/modules/users/routes/browse/browse.vue b/app/src/modules/users/routes/browse/browse.vue
index 51bc1853f2..cff7d290c0 100644
--- a/app/src/modules/users/routes/browse/browse.vue
+++ b/app/src/modules/users/routes/browse/browse.vue
@@ -34,7 +34,14 @@
 				</v-card>
 			</v-dialog>
 
-			<v-button rounded icon class="action-batch" v-if="selection.length > 1" :to="batchLink" v-tooltip.bottom="$t('edit')">
+			<v-button
+				rounded
+				icon
+				class="action-batch"
+				v-if="selection.length > 1"
+				:to="batchLink"
+				v-tooltip.bottom="$t('edit')"
+			>
 				<v-icon name="edit" />
 			</v-button>
 
@@ -122,30 +129,12 @@ export default defineComponent({
 					});
 				}
 
-				return [
-					...urlFilters,
-					...filters.value,
-				];
+				return [...urlFilters, ...filters.value];
 			}
 
 			return filters.value;
 		});
 
-		if (viewType.value === null) {
-			viewType.value = 'cards';
-		}
-
-		if (viewOptions.value === null) {
-			if (viewType.value === 'cards') {
-				viewOptions.value = {
-					icon: 'person',
-					title: '{{first_name}} {{last_name}}',
-					subtitle: '{{ title }}',
-					size: 4
-				};
-			}
-		}
-
 		return {
 			_filters,
 			addNewLink,