diff --git a/api/src/org/labkey/api/data/Sort.java b/api/src/org/labkey/api/data/Sort.java index 621eeeaf8a2..9dac8a7f567 100644 --- a/api/src/org/labkey/api/data/Sort.java +++ b/api/src/org/labkey/api/data/Sort.java @@ -145,7 +145,7 @@ else if (str.charAt(0) == SortDirection.ASC.dir) public String toUrlString() { - return (_dir == SortDirection.ASC ? "" : "-") + _fieldKey.toString(); + return (_dir == SortDirection.ASC ? "+" : "-") + _fieldKey.toString(); } private SQLFragment toOrderByFragment(SqlDialect dialect, DatabaseIdentifier alias) diff --git a/api/webapp/clientapi/dom/DataRegion.js b/api/webapp/clientapi/dom/DataRegion.js index a408c2fb949..68f327fdb94 100644 --- a/api/webapp/clientapi/dom/DataRegion.js +++ b/api/webapp/clientapi/dom/DataRegion.js @@ -2999,8 +2999,8 @@ if (!LABKEY.DataRegions) { }); } - if (direction === SORT_ASC) { // Easier to read without the encoded + on the URL... - direction = ''; + if (!direction) { + direction = SORT_ASC; } if (LABKEY.Utils.isString(direction)) { diff --git a/assay/package-lock.json b/assay/package-lock.json index 0fc3e6fc8f4..9444f0a41ec 100644 --- a/assay/package-lock.json +++ b/assay/package-lock.json @@ -8,7 +8,7 @@ "name": "assay", "version": "0.0.0", "dependencies": { - "@labkey/components": "7.16.0" + "@labkey/components": "7.16.1-fb-sort-plus-442.1" }, "devDependencies": { "@labkey/build": "8.8.0", @@ -2788,9 +2788,9 @@ } }, "node_modules/@labkey/components": { - "version": "7.16.0", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.16.0.tgz", - "integrity": "sha512-w4wzsgmGW5ffzxlg8wdPqiwU3usgEJnNS9duFRmolzAKpplOpU1Z8YFyyKYfZq3HYPFb0yEKy1ho3N6z8VWtuA==", + "version": "7.16.1-fb-sort-plus-442.1", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.16.1-fb-sort-plus-442.1.tgz", + "integrity": "sha512-5j13C1Ma8CXOm3F4UBmXgpsiKVY22nmycDZ3dFli8eAh2YvSCXKBbuIEJHahIBoYRqCqMKri88HTAqRS4N0QMg==", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@hello-pangea/dnd": "18.0.1", diff --git a/assay/package.json b/assay/package.json index 90b4657fa5e..7d2315ff346 100644 --- a/assay/package.json +++ b/assay/package.json @@ -12,7 +12,7 @@ "clean": "rimraf resources/web/assay/gen && rimraf resources/views/gen && rimraf resources/web/gen" }, "dependencies": { - "@labkey/components": "7.16.0" + "@labkey/components": "7.16.1-fb-sort-plus-442.1" }, "devDependencies": { "@labkey/build": "8.8.0", diff --git a/core/package-lock.json b/core/package-lock.json index e7e4a95ee63..0b7a2fe1872 100644 --- a/core/package-lock.json +++ b/core/package-lock.json @@ -8,7 +8,7 @@ "name": "labkey-core", "version": "0.0.0", "dependencies": { - "@labkey/components": "7.16.0", + "@labkey/components": "7.16.1-fb-sort-plus-442.1", "@labkey/themes": "1.6.0" }, "devDependencies": { @@ -3857,9 +3857,9 @@ } }, "node_modules/@labkey/components": { - "version": "7.16.0", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.16.0.tgz", - "integrity": "sha512-w4wzsgmGW5ffzxlg8wdPqiwU3usgEJnNS9duFRmolzAKpplOpU1Z8YFyyKYfZq3HYPFb0yEKy1ho3N6z8VWtuA==", + "version": "7.16.1-fb-sort-plus-442.1", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.16.1-fb-sort-plus-442.1.tgz", + "integrity": "sha512-5j13C1Ma8CXOm3F4UBmXgpsiKVY22nmycDZ3dFli8eAh2YvSCXKBbuIEJHahIBoYRqCqMKri88HTAqRS4N0QMg==", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@hello-pangea/dnd": "18.0.1", diff --git a/core/package.json b/core/package.json index e398c389fb8..b49aa55a3d6 100644 --- a/core/package.json +++ b/core/package.json @@ -53,7 +53,7 @@ } }, "dependencies": { - "@labkey/components": "7.16.0", + "@labkey/components": "7.16.1-fb-sort-plus-442.1", "@labkey/themes": "1.6.0" }, "devDependencies": { diff --git a/experiment/package-lock.json b/experiment/package-lock.json index a971f0b6448..541166347fb 100644 --- a/experiment/package-lock.json +++ b/experiment/package-lock.json @@ -8,7 +8,7 @@ "name": "experiment", "version": "0.0.0", "dependencies": { - "@labkey/components": "7.16.0" + "@labkey/components": "7.16.1-fb-sort-plus-442.1" }, "devDependencies": { "@labkey/build": "8.8.0", @@ -3634,9 +3634,9 @@ } }, "node_modules/@labkey/components": { - "version": "7.16.0", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.16.0.tgz", - "integrity": "sha512-w4wzsgmGW5ffzxlg8wdPqiwU3usgEJnNS9duFRmolzAKpplOpU1Z8YFyyKYfZq3HYPFb0yEKy1ho3N6z8VWtuA==", + "version": "7.16.1-fb-sort-plus-442.1", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.16.1-fb-sort-plus-442.1.tgz", + "integrity": "sha512-5j13C1Ma8CXOm3F4UBmXgpsiKVY22nmycDZ3dFli8eAh2YvSCXKBbuIEJHahIBoYRqCqMKri88HTAqRS4N0QMg==", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@hello-pangea/dnd": "18.0.1", diff --git a/experiment/package.json b/experiment/package.json index e387ee9d9b3..59650df4e16 100644 --- a/experiment/package.json +++ b/experiment/package.json @@ -13,7 +13,7 @@ "test-integration": "cross-env NODE_ENV=test jest --ci --runInBand -c test/js/jest.config.integration.js" }, "dependencies": { - "@labkey/components": "7.16.0" + "@labkey/components": "7.16.1-fb-sort-plus-442.1" }, "devDependencies": { "@labkey/build": "8.8.0", diff --git a/pipeline/package-lock.json b/pipeline/package-lock.json index 3cabca3a0a2..63b4bef6822 100644 --- a/pipeline/package-lock.json +++ b/pipeline/package-lock.json @@ -8,7 +8,7 @@ "name": "pipeline", "version": "0.0.0", "dependencies": { - "@labkey/components": "7.16.0" + "@labkey/components": "7.16.1-fb-sort-plus-442.1" }, "devDependencies": { "@labkey/build": "8.8.0", @@ -3022,9 +3022,9 @@ } }, "node_modules/@labkey/components": { - "version": "7.16.0", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.16.0.tgz", - "integrity": "sha512-w4wzsgmGW5ffzxlg8wdPqiwU3usgEJnNS9duFRmolzAKpplOpU1Z8YFyyKYfZq3HYPFb0yEKy1ho3N6z8VWtuA==", + "version": "7.16.1-fb-sort-plus-442.1", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.16.1-fb-sort-plus-442.1.tgz", + "integrity": "sha512-5j13C1Ma8CXOm3F4UBmXgpsiKVY22nmycDZ3dFli8eAh2YvSCXKBbuIEJHahIBoYRqCqMKri88HTAqRS4N0QMg==", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@hello-pangea/dnd": "18.0.1", diff --git a/pipeline/package.json b/pipeline/package.json index 277143fd2e2..9b3f8330460 100644 --- a/pipeline/package.json +++ b/pipeline/package.json @@ -14,7 +14,7 @@ "build-prod": "npm run clean && cross-env NODE_ENV=production PROD_SOURCE_MAP=source-map webpack --config node_modules/@labkey/build/webpack/prod.config.js --color --progress --profile" }, "dependencies": { - "@labkey/components": "7.16.0" + "@labkey/components": "7.16.1-fb-sort-plus-442.1" }, "devDependencies": { "@labkey/build": "8.8.0",