chore(release): 6.6.4 [skip ci]

## [6.6.4](https://git.datacontroller.io/dc/dc/compare/v6.6.3...v6.6.4) (2024-04-01) ### Bug Fixes * ordering SOFTSELECT numerically in dropdown ([f522038](f522038b8d)), closes [#85](#85) * reverting col ([fbbcf90](fbbcf90956)) * typo ([31d4e5c](31d4e5c727))
Merge pull request 'ci: install sheet temporarily' (#89 ) from ci into main
2024-04-01 09:51:54 +00:00 · 2024-04-01 09:37:56 +00:00 · 2024-04-01 11:14:00 +02:00 · 2024-04-01 10:59:03 +02:00 · 2024-04-01 10:55:59 +02:00 · 2024-04-01 10:45:16 +02:00
9 changed files with 62 additions and 25 deletions
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@ -21,8 +21,17 @@ jobs:
      - name: Lint check
        run: npm run lint:check

-      - name: Licence checker
+      - name: Install dependencies
        run: |
          cd client
          npm ci
+          # Install sheet
+          wget ${{ secrets.SHEETLINK }}
+          mv ${{ secrets.SHEETNAME }} ${{ secrets.SHEETNAME }}.tgz
+          npm i ${{ secrets.SHEETNAME }}.tgz
+          # End
+
+      - name: Licence checker
+        run: |
+          cd client
          npm run license-checker
--- a/.gitea/workflows/release.yaml
+++ b/.gitea/workflows/release.yaml
@ -34,7 +34,14 @@ jobs:
          CYPRESS_CREDS: ${{ secrets.CYPRESS_CREDS }}

      - name: Install dependencies
-        run: npm ci
+        run: |
+          npm ci
+          cd client
+          # Install sheet
+          wget ${{ secrets.SHEETLINK }}
+          mv ${{ secrets.SHEETNAME }} ${{ secrets.SHEETNAME }}.tgz
+          npm i ${{ secrets.SHEETNAME }}.tgz
+          # End

      - name: Check audit
      # Audit should fail and stop the CI if critical vulnerability found
@ -86,7 +93,14 @@ jobs:
          CYPRESS_CREDS: ${{ secrets.CYPRESS_CREDS }}

      - name: Install dependencies
-        run: npm ci
+        run: |
+          npm ci
+          cd client
+          # Install sheet
+          wget ${{ secrets.SHEETLINK }}
+          mv ${{ secrets.SHEETNAME }} ${{ secrets.SHEETNAME }}.tgz
+          npm i ${{ secrets.SHEETNAME }}.tgz
+          # End

      # Install pm2 and prepare SASJS server
      - run: npm i -g pm2
@ -185,6 +199,11 @@ jobs:
        run: |
          cd client
          npm ci
+          # Install sheet
+          wget ${{ secrets.SHEETLINK }}
+          mv ${{ secrets.SHEETNAME }} ${{ secrets.SHEETNAME }}.tgz
+          npm i ${{ secrets.SHEETNAME }}.tgz
+          # End
          npm run build

      - name: Build SAS9 EBI Release
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,12 @@
+## [6.6.4](https://git.datacontroller.io/dc/dc/compare/v6.6.3...v6.6.4) (2024-04-01)
+
+
+### Bug Fixes
+
+* ordering SOFTSELECT numerically in dropdown ([f522038](https://git.datacontroller.io/dc/dc/commit/f522038b8ddb1da14b8adbf8346d0a4539a94cc8)), closes [#85](https://git.datacontroller.io/dc/dc/issues/85)
+* reverting col ([fbbcf90](https://git.datacontroller.io/dc/dc/commit/fbbcf90956bf538b032b0107c07b8576d20353b9))
+* typo ([31d4e5c](https://git.datacontroller.io/dc/dc/commit/31d4e5c727f790d428fb2ea8da60dca929561805))
+
 ## [6.6.3](https://git.datacontroller.io/dc/dc/compare/v6.6.2...v6.6.3) (2024-02-26)


--- a/client/package-lock.json
+++ b/client/package-lock.json
@ -23,7 +23,7 @@
        "@handsontable/angular": "^13.1.0",
        "@sasjs/adapter": "4.10.2",
        "@sasjs/utils": "^3.4.0",
-        "@sheet/crypto": "1.20211122.1",
+        "@sheet/crypto": "file:../../../RESOURCES/libs/0fae52415ec93a6dd3d5bd33c73b6dc124a07496be568a7aba6d033ec65df60b.tgz",
        "@types/d3-graphviz": "^2.6.7",
        "@types/text-encoding": "0.0.35",
        "base64-arraybuffer": "^0.2.0",
@ -4652,7 +4652,7 @@
    },
    "node_modules/@sheet/crypto": {
      "version": "1.20211122.1",
-      "resolved": "https://pylon.sheetjs.com:54111/@sheet%2fcrypto/-/crypto-1.20211122.1.tgz",
+      "resolved": "file:../../../RESOURCES/libs/0fae52415ec93a6dd3d5bd33c73b6dc124a07496be568a7aba6d033ec65df60b.tgz",
      "integrity": "sha512-G3/HWyzFUYbbVQoQIa+KSeMOhFnK492Ep595FXbzWN9IGZSwuvFl4saEyMl8R8pE2Al5YgSZuR9MpDpx3f7Izg==",
      "bin": {
        "xlsx": "bin/xlsx.njs"
@ -23681,8 +23681,7 @@
      }
    },
    "@sheet/crypto": {
-      "version": "1.20211122.1",
-      "resolved": "https://pylon.sheetjs.com:54111/@sheet%2fcrypto/-/crypto-1.20211122.1.tgz",
+      "version": "file:../../../RESOURCES/libs/0fae52415ec93a6dd3d5bd33c73b6dc124a07496be568a7aba6d033ec65df60b.tgz",
      "integrity": "sha512-G3/HWyzFUYbbVQoQIa+KSeMOhFnK492Ep595FXbzWN9IGZSwuvFl4saEyMl8R8pE2Al5YgSZuR9MpDpx3f7Izg=="
    },
    "@sideway/address": {
--- a/client/package.json
+++ b/client/package.json
@ -51,7 +51,6 @@
    "@handsontable/angular": "^13.1.0",
    "@sasjs/adapter": "4.10.2",
    "@sasjs/utils": "^3.4.0",
-    "@sheet/crypto": "1.20211122.1",
    "@types/d3-graphviz": "^2.6.7",
    "@types/text-encoding": "0.0.35",
    "base64-arraybuffer": "^0.2.0",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "dcfrontend",
-  "version": "6.6.3",
+  "version": "6.6.4",
  "description": "Data Controller",
  "devDependencies": {
    "@saithodev/semantic-release-gitea": "^2.1.0",
--- a/sas/package-lock.json
+++ b/sas/package-lock.json
@ -229,12 +229,6 @@
        "@types/node": "*"
      }
    },
-    "node_modules/@types/tough-cookie": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
-      "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
-      "peer": true
-    },
    "node_modules/abab": {
      "version": "2.0.6",
      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
@ -1933,12 +1927,6 @@
        "@types/node": "*"
      }
    },
-    "@types/tough-cookie": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
-      "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
-      "peer": true
-    },
    "abab": {
      "version": "2.0.6",
      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
@ -2965,8 +2953,7 @@
    "ws": {
      "version": "8.13.0",
      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
-      "requires": {}
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA=="
    },
    "xml": {
      "version": "1.0.1",
--- a/sas/sasjs/macros/mpe_makedata.sas
+++ b/sas/sasjs/macros/mpe_makedata.sas
@ -1874,6 +1874,16 @@ insert into &lib..MPE_VALIDATIONS set
    ,rule_value="services/validations/columns_in_libds"
    ,rule_active=1
    ,tx_to='31DEC5999:23:59:59'dt;
+/* test softselect on numeric var (should be ordered numerically) */
+insert into &lib..MPE_VALIDATIONS set
+    tx_from=0
+    ,base_lib="&lib"
+    ,base_ds="MPE_X_TEST"
+    ,base_col="SOME_BESTNUM"
+    ,rule_type='SOFTSELECT'
+    ,rule_value="&lib..MPE_X_TEST.SOME_BESTNUM"
+    ,rule_active=1
+    ,tx_to='31DEC5999:23:59:59'dt;
 insert into &lib..MPE_VALIDATIONS set
    tx_from=0
    ,base_lib="&lib"
--- a/sas/sasjs/services/editors/getdata.sas
+++ b/sas/sasjs/services/editors/getdata.sas
@ -631,9 +631,14 @@ create table dqdata as
      select distinct "&&base_col&x" as base_col length=32
        ,"&source" as rule_value length=74
        ,cats(&col) as rule_data length=1000
-        ,0 as selectbox_order
+        ,&col as tmp_order
      from &lib..&ds
-      order by 1;
+      order by tmp_order;
+    /* ensure both numerics and char vals are ordered correctly */
+    data work.dqdata&x (drop=tmp_order);
+      set work.dqdata&x;
+      selectbox_order=_n_;
+    run;
    %mp_abort(iftrue= (&syscc ne 0)
      ,mac=&_program
      ,msg=%str(syscc=&syscc when selecting &&base_col&x from &orig_libds)
Author	SHA1	Message	Date
semantic-release-bot	7b5bbe024d	chore(release): 6.6.4 [skip ci] ## [6.6.4](https://git.datacontroller.io/dc/dc/compare/v6.6.3...v6.6.4) (2024-04-01) ### Bug Fixes * ordering SOFTSELECT numerically in dropdown ([`f522038`](`f522038b8d`)), closes [#85](#85) * reverting col ([`fbbcf90`](`fbbcf90956`)) * typo ([`31d4e5c`](`31d4e5c727`))	2024-04-01 09:51:54 +00:00
mihajlo	4d84f15aca	Merge pull request 'ci: install sheet temporarily' (#89 ) from ci into main Release / Build-production-and-ng-test (push) Successful in 4m16s Details Release / Build-and-test-development (push) Successful in 8m1s Details Release / release (push) Successful in 6m22s Details Reviewed-on: #89	2024-04-01 09:37:56 +00:00
Mihajlo Medjedovic	928937daab	ci: sheet Build / Build-and-ng-test (pull_request) Successful in 1m4s Details	2024-04-01 11:14:00 +02:00
Mihajlo Medjedovic	3bd8d247e5	ci: sheet Build / Build-and-ng-test (pull_request) Successful in 1m3s Details	2024-04-01 10:59:03 +02:00
Mihajlo Medjedovic	cf6c9dd5f2	ci: sheet Build / Build-and-ng-test (pull_request) Failing after 1m0s Details	2024-04-01 10:55:59 +02:00
Mihajlo Medjedovic	ff55cbbaad	ci: sheet Build / Build-and-ng-test (pull_request) Failing after 17s Details	2024-04-01 10:45:16 +02:00
Mihajlo Medjedovic	3eda4e2c58	ci: install sheet temporarily Build / Build-and-ng-test (pull_request) Failing after 17s Details	2024-04-01 10:39:30 +02:00
allan	c3af97ef57	Merge pull request 'issue85' (#87 ) from issue85 into main Release / Build-production-and-ng-test (push) Failing after 1m13s Details Release / Build-and-test-development (push) Has been skipped Details Release / release (push) Has been skipped Details Reviewed-on: #87	2024-03-19 22:41:04 +00:00
Allan	31d4e5c727	fix: typo Build / Build-and-ng-test (pull_request) Failing after 47s Details	2024-03-19 22:36:00 +00:00
Allan	fbbcf90956	fix: reverting col	2024-03-19 22:35:16 +00:00
Allan	f522038b8d	fix: ordering SOFTSELECT numerically in dropdown Closes #85	2024-03-19 22:33:39 +00:00