Merge pull request #784 from nextcloud/backport/710/stable0.6

[stable0.6] Fix number column issues
nextcloud · Jan 19, 2024 · 0c746a4 · 0c746a4
2 parents 927e41c + a3a51f7
commit 0c746a4
Show file tree

Hide file tree

Showing 11 changed files with 88 additions and 39 deletions.
diff --git a/lib/Service/ColumnService.php b/lib/Service/ColumnService.php
@@ -151,7 +151,7 @@ public function find(int $id, string $userId = null): Column {
 	 * @param string|null $selectionOptions
 	 * @param string|null $selectionDefault
 	 * @param string|null $datetimeDefault
-	 * @param array|null $selectedViewIds
+	 * @param array $selectedViewIds
 	 * @return Column
 	 *
 	 * @throws DoesNotExistException
@@ -185,7 +185,7 @@ public function create(
 		?string $selectionDefault,
 
 		?string $datetimeDefault,
-		?array $selectedViewIds
+		array $selectedViewIds = []
 	):Column {
 		// security
 		if ($viewId) {
@@ -321,39 +321,21 @@ public function update(
 			if ($mandatory !== null) {
 				$item->setMandatory($mandatory);
 			}
-			if ($description !== null) {
-				$item->setDescription($description);
-			}
-			if ($textDefault !== null) {
-				$item->setTextDefault($textDefault);
-			}
-			if ($textAllowedPattern !== null) {
-				$item->setTextAllowedPattern($textAllowedPattern);
-			}
-			if ($textMaxLength !== null) {
-				$item->setTextMaxLength($textMaxLength);
-			}
-			if ($numberDefault !== null) {
-				$item->setNumberDefault($numberDefault);
-			}
-			if ($numberMin !== null) {
-				$item->setNumberMin($numberMin);
-			}
-			if ($numberMax !== null) {
-				$item->setNumberMax($numberMax);
-			}
-			if ($numberDecimals !== null) {
-				$item->setNumberDecimals($numberDecimals);
-			}
+			$item->setDescription($description);
+			$item->setTextDefault($textDefault);
+			$item->setTextAllowedPattern($textAllowedPattern);
+			$item->setTextMaxLength($textMaxLength);
+			$item->setNumberDefault($numberDefault);
+			$item->setNumberMin($numberMin);
+			$item->setNumberMax($numberMax);
+			$item->setNumberDecimals($numberDecimals);
 			if ($selectionOptions !== null) {
 				$item->setSelectionOptions($selectionOptions);
 			}
 			if ($selectionDefault !== null) {
 				$item->setSelectionDefault($selectionDefault);
 			}
-			if ($datetimeDefault !== null) {
-				$item->setDatetimeDefault($datetimeDefault);
-			}
+			$item->setDatetimeDefault($datetimeDefault);
 
 			$time = new DateTime();
 			$item->setLastEditAt($time->format('Y-m-d H:i:s'));

diff --git a/lib/Service/ColumnTypes/NumberBusiness.php b/lib/Service/ColumnTypes/NumberBusiness.php
@@ -12,6 +12,9 @@ class NumberBusiness extends SuperBusiness implements IColumnTypeBusiness {
 	 * @return string
 	 */
 	public function parseValue($value, ?Column $column = null): string {
+		if ($value === null) {
+			return '';
+		}
 		return json_encode(floatval($value));
 	}
 

diff --git a/src/modules/modals/EditColumn.vue b/src/modules/modals/EditColumn.vue
@@ -168,13 +168,18 @@ export default {
 		async updateColumn() {
 			const data = Object.assign({}, this.editColumn)
 			if ((this.column.type === ColumnTypes.SelectionMulti || this.column.type === ColumnTypes.SelectionCheck) && data.selectionDefault !== null) data.selectionDefault = JSON.stringify(data.selectionDefault)
+			data.numberDefault = data.numberDefault === '' ? null : data.numberDefault
+			data.numberDecimals = data.numberDecimals === '' ? null : data.numberDecimals
+			data.numberMin = data.numberMin === '' ? null : data.numberMin
+			data.numberMax = data.numberMax === '' ? null : data.numberMax
 			delete data.type
 			delete data.id
 			delete data.tableId
 			delete data.createdAt
 			delete data.createdBy
 			delete data.lastEditAt
 			delete data.lastEditBy
+			console.debug('this column data will be send', data)
 			const res = await this.$store.dispatch('updateColumn', { id: this.editColumn.id, data })
 			if (res) {
 				showSuccess(t('tables', 'The column "{column}" was updated.', { column: this.editColumn.title }))

diff --git a/src/shared/components/ncTable/mixins/columnClass.js b/src/shared/components/ncTable/mixins/columnClass.js
@@ -51,6 +51,16 @@ export class AbstractColumn {
 		return valueObject.value
 	}
 
+	/**
+	 * parse an input value
+	 *
+	 * @param value
+	 * @return {*}
+	 */
+	parseValue(value) {
+		return value
+	}
+
 }
 
 export class AbstractNumberColumn extends AbstractColumn {

diff --git a/src/shared/components/ncTable/mixins/columnsTypes/number.js b/src/shared/components/ncTable/mixins/columnsTypes/number.js
@@ -50,4 +50,8 @@ export default class NumberColumn extends AbstractNumberColumn {
 		return super.isFilterFound(filterMethod, cell)
 	}
 
+	parseValue(value) {
+		return value === null ? null : parseFloat(value)
+	}
+
 }
diff --git a/src/shared/components/ncTable/mixins/columnsTypes/numberProgress.js b/src/shared/components/ncTable/mixins/columnsTypes/numberProgress.js
@@ -38,4 +38,8 @@ export default class NumberProgressColumn extends AbstractNumberColumn {
 		return super.isFilterFound(filterMethod, cell)
 	}
 
+	parseValue(value) {
+		return parseInt(value)
+	}
+
 }
diff --git a/src/shared/components/ncTable/mixins/columnsTypes/selection.js b/src/shared/components/ncTable/mixins/columnsTypes/selection.js
@@ -59,4 +59,8 @@ export default class SelectionColumn extends AbstractSelectionColumn {
 		return super.isFilterFound(filterMethod, cell)
 	}
 
+	parseValue(value) {
+		return parseInt(value)
+	}
+
 }
diff --git a/src/shared/components/ncTable/partials/TableCellNumber.vue b/src/shared/components/ncTable/partials/TableCellNumber.vue
@@ -24,6 +24,9 @@ export default {
 	},
 	computed: {
 		getValue() {
+			if (this.value === null) {
+				return null
+			}
 			return this.value.toFixed(this.column?.numberDecimals)
 		},
 	},

diff --git a/src/shared/components/ncTable/partials/TableRow.vue b/src/shared/components/ncTable/partials/TableRow.vue
@@ -146,13 +146,7 @@ export default {
 				value = column.default()
 			}
 
-			if ([ColumnTypes.NumberProgress, ColumnTypes.Selection].includes(column.type)) {
-				return parseInt(value)
-			}
-			if ([ColumnTypes.Number].includes(column.type)) {
-				return parseFloat(value)
-			}
-			return value
+			return column.parseValue(value)
 		},
 		truncate(text) {
 			if (text.length >= 400) {

diff --git a/src/shared/components/ncTable/partials/columnTypePartials/forms/NumberForm.vue b/src/shared/components/ncTable/partials/columnTypePartials/forms/NumberForm.vue
@@ -5,8 +5,8 @@
 				<div class="fix-col-4 title">
 					{{ t('tables', 'Default value') }}
 				</div>
-				<div class="fix-col-4">
-					<input v-model="mutableColumn.numberDefault" type="number">
+				<div class="fix-col-4" :class="{error: defaultValueErrorHint !== ''}">
+					<input v-model="mutableColumn.numberDefault" type="number" @input="event => defaultValue = event.target.value">
 				</div>
 			</div>
 			<div class="col-2 space-R" style="display: block">
@@ -18,6 +18,11 @@
 					<input v-model="mutableColumn.numberDecimals" type="number">
 				</div>
 			</div>
+			<div v-if="defaultValueErrorHint !== ''" class="col-4">
+				<NcNoteCard type="warning">
+					<p>{{ defaultValueErrorHint }}</p>
+				</NcNoteCard>
+			</div>
 		</div>
 
 		<div class="row space-T">
@@ -67,9 +72,15 @@
 <script>
 
 import { translate as t } from '@nextcloud/l10n'
+import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
 
 export default {
 	name: 'NumberForm',
+
+	components: {
+		NcNoteCard,
+	},
+
 	props: {
 		column: {
 			type: Object,
@@ -80,11 +91,32 @@ export default {
 			default: true,
 		},
 	},
+
 	data() {
 		return {
 			mutableColumn: this.column,
+			defaultValue: null,
 		}
 	},
+
+	computed: {
+		defaultValueErrorHint() {
+			if (this.defaultValue === null || this.defaultValue === '') {
+				return ''
+			}
+
+			if (this.mutableColumn.numberMin !== null && this.mutableColumn.numberMin !== '' && this.defaultValue < this.mutableColumn.numberMin) {
+				return t('tables', 'The default value is lower than the minimum allowed value.')
+			}
+
+			if (this.mutableColumn.numberMax !== null && this.mutableColumn.numberMax !== '' && this.defaultValue > this.mutableColumn.numberMax) {
+				return t('tables', 'The default value is greater than the maximum allowed value.')
+			}
+
+			return ''
+		},
+	},
+
 	watch: {
 		column() {
 			this.mutableColumn = this.column

diff --git a/src/shared/components/ncTable/partials/rowTypePartials/NumberForm.vue b/src/shared/components/ncTable/partials/rowTypePartials/NumberForm.vue
@@ -78,7 +78,15 @@ export default {
 
 	methods: {
 		parseValue(inputValue) {
-			const parsedValue = parseFloat(inputValue.replace(',', '.'))
+			if (inputValue === null || inputValue === '') {
+				return null
+			}
+			let parsedValue
+			if (typeof inputValue === 'string' || inputValue instanceof String) {
+				parsedValue = parseFloat(inputValue.replace(',', '.'))
+			} else {
+				parsedValue = inputValue
+			}
 			const roundedValue = parsedValue.toFixed(this.column?.numberDecimals)
 			let value = parseFloat(roundedValue)
 			if (this.column?.numberMin && value < this.column?.numberMin) {