From 53d3ff860e6f377c613bb9d5a15b897057c0090b Mon Sep 17 00:00:00 2001
From: Nicola Krumschmidt <nicola.krumschmidt@freenet.de>
Date: Thu, 22 Oct 2020 18:03:07 +0200
Subject: [PATCH 1/2] Enable save options for new items

---
 app/src/modules/collections/routes/item.vue | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/modules/collections/routes/item.vue b/app/src/modules/collections/routes/item.vue
index 4280965d78..4b14711567 100644
--- a/app/src/modules/collections/routes/item.vue
+++ b/app/src/modules/collections/routes/item.vue
@@ -134,7 +134,7 @@
 				rounded
 				icon
 				:loading="saving"
-				:disabled="saveAllowed === false || hasEdits === false"
+				:disabled="isSavable === false"
 				v-tooltip.bottom="saveAllowed ? $t('save') : $t('not_allowed')"
 				@click="saveAndQuit"
 			>
@@ -143,7 +143,7 @@
 				<template #append-outer>
 					<save-options
 						v-if="collectionInfo.meta && collectionInfo.meta.singleton !== true"
-						:disabled="hasEdits === false"
+						:disabled="isSavable === false"
 						@save-and-stay="saveAndStay"
 						@save-and-add-new="saveAndAddNew"
 						@save-as-copy="saveAsCopyAndNavigate"
@@ -290,6 +290,10 @@ export default defineComponent({
 
 		const hasEdits = computed<boolean>(() => Object.keys(edits.value).length > 0);
 
+		const isSavable = computed<boolean>(
+			() => saveAllowed.value === true && (hasEdits.value === true || isNew.value === true)
+		);
+
 		const confirmDelete = ref(false);
 		const confirmArchive = ref(false);
 
@@ -343,7 +347,7 @@ export default defineComponent({
 			error,
 			isNew,
 			edits,
-			hasEdits,
+			isSavable,
 			saving,
 			collectionInfo,
 			saveAndQuit,
@@ -389,14 +393,14 @@ export default defineComponent({
 		}
 
 		async function saveAndQuit() {
-			if (saveAllowed.value === false || hasEdits.value === false) return;
+			if (isSavable.value === false) return;
 
 			await save();
 			if (props.singleton === false) router.push(`/collections/${props.collection}`);
 		}
 
 		async function saveAndStay() {
-			if (saveAllowed.value === false || hasEdits.value === false) return;
+			if (isSavable.value === false) return;
 
 			const savedItem: Record<string, any> = await save();
 
@@ -410,7 +414,7 @@ export default defineComponent({
 		}
 
 		async function saveAndAddNew() {
-			if (saveAllowed.value === false || hasEdits.value === false) return;
+			if (isSavable.value === false) return;
 
 			await save();
 

From ca297dda3a930bbfc38a2930f1b7d1c8230906e8 Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Mon, 26 Oct 2020 11:14:35 +0100
Subject: [PATCH 2/2] Check for default values

---
 .../use-collection/use-collection.ts          | 16 ++++++++++++-
 app/src/composables/use-item/use-item.ts      |  2 +-
 app/src/modules/collections/routes/item.vue   | 23 +++++++++++++++----
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/app/src/composables/use-collection/use-collection.ts b/app/src/composables/use-collection/use-collection.ts
index d14374bf1c..e9efcc3143 100644
--- a/app/src/composables/use-collection/use-collection.ts
+++ b/app/src/composables/use-collection/use-collection.ts
@@ -16,6 +16,20 @@ export function useCollection(collectionKey: string | Ref<string>) {
 		return fieldsStore.getFieldsForCollection(collection.value);
 	});
 
+	const defaults = computed(() => {
+		if (!fields.value) return {};
+
+		const defaults: Record<string, any> = {};
+
+		for (const field of fields.value) {
+			if (field.schema?.default_value) {
+				defaults[field.field] = field.schema.default_value;
+			}
+		}
+
+		return defaults;
+	});
+
 	const primaryKeyField = computed(() => {
 		// Every collection has a primary key; rules of the land
 		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -32,5 +46,5 @@ export function useCollection(collectionKey: string | Ref<string>) {
 		return info.value?.meta?.sort_field || null;
 	});
 
-	return { info, fields, primaryKeyField, userCreatedField, sortField };
+	return { info, fields, defaults, primaryKeyField, userCreatedField, sortField };
 }
diff --git a/app/src/composables/use-item/use-item.ts b/app/src/composables/use-item/use-item.ts
index a1f0466456..d0850b9d13 100644
--- a/app/src/composables/use-item/use-item.ts
+++ b/app/src/composables/use-item/use-item.ts
@@ -16,7 +16,7 @@ export function useItem(collection: Ref<string>, primaryKey: Ref<string | number
 	const saving = ref(false);
 	const deleting = ref(false);
 	const archiving = ref(false);
-	const edits = ref({});
+	const edits = ref<Record<string, any>>({});
 	const isNew = computed(() => primaryKey.value === '+');
 	const isBatch = computed(() => typeof primaryKey.value === 'string' && primaryKey.value.includes(','));
 	const isSingle = computed(() => !!collectionInfo.value?.meta?.singleton);
diff --git a/app/src/modules/collections/routes/item.vue b/app/src/modules/collections/routes/item.vue
index 246fd84b8d..2b8cbdf319 100644
--- a/app/src/modules/collections/routes/item.vue
+++ b/app/src/modules/collections/routes/item.vue
@@ -267,7 +267,7 @@ export default defineComponent({
 
 		const revisionsDrawerDetail = ref<Vue | null>(null);
 
-		const { info: collectionInfo, primaryKeyField } = useCollection(collection);
+		const { info: collectionInfo, defaults, primaryKeyField } = useCollection(collection);
 
 		const {
 			isNew,
@@ -288,11 +288,24 @@ export default defineComponent({
 			validationErrors,
 		} = useItem(collection, primaryKey);
 
-		const hasEdits = computed<boolean>(() => Object.keys(edits.value).length > 0);
+		const hasEdits = computed(() => Object.keys(edits.value).length > 0);
 
-		const isSavable = computed<boolean>(
-			() => saveAllowed.value === true && (hasEdits.value === true || isNew.value === true)
-		);
+		const isSavable = computed(() => {
+			if (saveAllowed.value === false) return false;
+
+			if (
+				!primaryKeyField.value?.schema?.has_auto_increment &&
+				!primaryKeyField.value?.meta?.special?.includes('uuid')
+			) {
+				return !!edits.value?.[primaryKeyField.value.field];
+			}
+
+			if (isNew.value === true) {
+				return Object.keys(defaults.value).length > 0 || hasEdits.value;
+			}
+
+			return hasEdits.value;
+		});
 
 		const confirmDelete = ref(false);
 		const confirmArchive = ref(false);