undo for non-string types

Signed-off-by: Kiril Isakov <kirix.isakov@gmail.com>
nextcloud · Jun 15, 2024 · b255c47 · b255c47
1 parent 0c91203
commit b255c47
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/shared/components/ncTable/mixins/columnsTypes/number.js b/src/shared/components/ncTable/mixins/columnsTypes/number.js
@@ -33,7 +33,7 @@ export default class NumberColumn extends AbstractNumberColumn {
 			if (!valueA && !valueB) {
 				return super.getNextSortsResult(nextSorts, rowA, rowB)
 			}
-			return valueA.localeCompare(valueB, undefined, { numeric: true }) * factor || super.getNextSortsResult(nextSorts, rowA, rowB)
+			return ((valueA < valueB) ? -1 : (valueA > valueB) ? 1 : 0) * factor || super.getNextSortsResult(nextSorts, rowA, rowB)
 		}
 	}
 

diff --git a/src/shared/components/ncTable/mixins/columnsTypes/numberProgress.js b/src/shared/components/ncTable/mixins/columnsTypes/numberProgress.js
@@ -13,8 +13,10 @@ export default class NumberProgressColumn extends AbstractNumberColumn {
 		const factor = mode === 'DESC' ? -1 : 1
 		return (rowA, rowB) => {
 			const tmpA = rowA.data.find(item => item.columnId === this.id)?.value || null
+			const valueA = parseInt(tmpA)
 			const tmpB = rowB.data.find(item => item.columnId === this.id)?.value || null
-			return tmpA.localeCompare(tmpB, undefined, { numeric: true }) * factor || super.getNextSortsResult(nextSorts, rowA, rowB)
+			const valueB = parseInt(tmpB)
+			return ((valueA < valueB) ? -1 : (valueA > valueB) ? 1 : 0) * factor || super.getNextSortsResult(nextSorts, rowA, rowB)
 		}
 	}
 

diff --git a/src/shared/components/ncTable/mixins/columnsTypes/numberStars.js b/src/shared/components/ncTable/mixins/columnsTypes/numberStars.js
@@ -13,8 +13,10 @@ export default class NumberStarsColumn extends AbstractNumberColumn {
 		const factor = mode === 'DESC' ? 1 : -1
 		return (rowA, rowB) => {
 			const tmpA = rowA.data.find(item => item.columnId === this.id)?.value
+			const valueA = Number.isNaN(parseInt(tmpA)) ? -1 : parseInt(tmpA)
 			const tmpB = rowB.data.find(item => item.columnId === this.id)?.value
-			return tmpA.localeCompare(tmpB, undefined, { numeric: true }) * factor || super.getNextSortsResult(nextSorts, rowA, rowB)
+			const valueB = Number.isNaN(parseInt(tmpB)) ? -1 : parseInt(tmpB)
+			return ((valueA < valueB) ? -1 : (valueA > valueB) ? 1 : 0) * factor || super.getNextSortsResult(nextSorts, rowA, rowB)
 		}
 	}
 

diff --git a/src/shared/components/ncTable/mixins/columnsTypes/selection.js b/src/shared/components/ncTable/mixins/columnsTypes/selection.js
@@ -34,7 +34,7 @@ export default class SelectionColumn extends AbstractSelectionColumn {
 			const selectionIdB = parseInt(rowB.data.find(item => item.columnId === this.id)?.value ?? null)
 			const vB = Number.isNaN(selectionIdB) ? '' : this.selectionOptions.find(item => item.id === selectionIdB)?.label
 			const valueB = this.removeEmoji(vB).trim()
-			return valueA.localeCompare(valueB, undefined) * factor || super.getNextSortsResult(nextSorts, rowA, rowB)
+			return ((valueA < valueB) ? -1 : (valueA > valueB) ? 1 : 0) * factor || super.getNextSortsResult(nextSorts, rowA, rowB)
 		}
 	}