Fixed version sorting; moved version functions to separate file

Author: zonia3000

CHANGELOG.md

@@ -1,5 +1,9 @@
 *Note: Numbers like (\#123) point to closed Pull Requests on the fractal-web repository.*
 
+# Unreleased
+
+* Fixed task version sorting issue (\#733);
+
 # 1.16.1
 
 * Improved handling of new default values in task version update (\#731);

__tests__/v2/AddWorkflowTaskModal.test.js

@@ -175,8 +175,8 @@ describe('AddWorkflowTaskModal', () => {
 
 		const dropdown = await screen.findByRole('combobox');
 		expect(dropdown.options.length).eq(2);
-		expect(dropdown.options[0].text).eq('0.0.1');
-		expect(dropdown.options[1].text).eq('INVALID');
-		expect(dropdown.value).eq('0.0.1');
+		expect(dropdown.options[0].text).eq('INVALID');
+		expect(dropdown.options[1].text).eq('0.0.1');
+		expect(dropdown.value).eq('INVALID');
 	});
 });

components/__tests__/utils.test.js

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { stripNullAndEmptyObjectsAndArrays } from '../src/lib/utils';
+import { stripNullAndEmptyObjectsAndArrays } from '../src/lib/common/utils';
 
 describe('utils', () => {
 	it('should strip data objects correctly', () => {

__tests__/semver.test.js renamed to components/__tests__/version.test.js

@@ -1,6 +1,6 @@
 import { it, expect } from 'vitest';
 import valid from 'semver/functions/valid';
-import { greatestVersionAsc } from '../src/lib/common/component_utilities';
+import { greatestVersionAsc } from '../src/lib/common/version';
 
 it('should be able to loosely validate versions', () => {
 	const cases = [

components/src/lib/utils.js renamed to components/src/lib/common/utils.js

@@ -1,4 +1,4 @@
-import { JsonSchemaDataError } from './jschema/form_manager';
+import { JsonSchemaDataError } from '../jschema/form_manager';
 
 /**
  * @param {any} value

components/src/lib/common/version.js

@@ -0,0 +1,51 @@
+import coerce from 'semver/functions/coerce';
+import gte from 'semver/functions/gte';
+import lte from 'semver/functions/lte';
+import valid from 'semver/functions/valid';
+
+/**
+ * @param {string | null} version1
+ * @param {string | null} version2
+ * @returns {-1|0|1}
+ */
+export function greatestVersionAsc(version1, version2) {
+	const t1Version = validateVersion(version1);
+	const t2Version = validateVersion(version2);
+	if (t1Version !== null && t2Version !== null) {
+		const t1VersionLt = lte(t1Version, t2Version);
+		return t1VersionLt ? -1 : 1;
+	}
+	return 0;
+}
+
+/**
+ * @param {string | null} version1
+ * @param {string | null} version2
+ * @returns {-1|0|1}
+ */
+export function greatestVersionDesc(version1, version2) {
+	const t1Version = validateVersion(version1);
+	const t2Version = validateVersion(version2);
+	if (t1Version !== null && t2Version !== null) {
+		const t1VersionGt = gte(t1Version, t2Version);
+		return t1VersionGt ? -1 : 1;
+	}
+	return 0;
+}
+
+const semverValidationOptions = {
+	loose: true,
+	includePrerelease: true
+};
+
+/**
+ * @param {string|null} version
+ * @returns {string | null}
+ */
+function validateVersion(version) {
+	return (
+		valid(version, semverValidationOptions) ||
+		valid(coerce(version), semverValidationOptions) ||
+		null
+	);
+}

components/src/lib/index.js

@@ -1,7 +1,12 @@
 import JSchema from './jschema/JSchema.svelte';
 import PropertyDescription from './jschema/properties/PropertyDescription.svelte';
 import { SchemaValidator, detectSchemaVersion } from './jschema/jschema_validation';
-import { deepCopy, getValidationErrorMessage, stripNullAndEmptyObjectsAndArrays } from './utils';
+import {
+	deepCopy,
+	getValidationErrorMessage,
+	stripNullAndEmptyObjectsAndArrays
+} from './common/utils';
+import { greatestVersionDesc, greatestVersionAsc } from './common/version';
 import { getPropertiesToIgnore } from './jschema/property_utils';
 import { JsonSchemaDataError } from './jschema/form_manager';
 import { stripIgnoredProperties } from './jschema/jschema_adapter';
@@ -19,5 +24,7 @@ export {
 	getValidationErrorMessage,
 	PropertyDescription,
 	detectSchemaVersion,
-	FilteredTasksTable
+	FilteredTasksTable,
+	greatestVersionDesc,
+	greatestVersionAsc
 };

components/src/lib/jschema/form_manager.js

@@ -1,4 +1,4 @@
-import { deepCopy, stripNullAndEmptyObjectsAndArrays, undefinedToNull } from '../utils';
+import { deepCopy, stripNullAndEmptyObjectsAndArrays, undefinedToNull } from '../common/utils';
 import {
 	ArrayFormElement,
 	EnumFormElement,

components/src/lib/jschema/jschema_adapter.js

@@ -1,4 +1,4 @@
-import { deepCopy, isObject } from '../utils.js';
+import { deepCopy, isObject } from '../common/utils.js';
 
 /**
  * Creates a simpler but still equivalent JSON Schema. Removes properties to ignore,

components/src/lib/jschema/jschema_initial_data.js

@@ -1,4 +1,4 @@
-import { undefinedToNull } from '../utils.js';
+import { undefinedToNull } from '../common/utils.js';
 import { getAllObjectProperties, isTuple } from './property_utils.js';
 
 /**