diff --git a/sas/package-lock.json b/sas/package-lock.json index d85d7ba..3305ecb 100644 --- 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", diff --git a/sas/sasjs/macros/mpe_makedata.sas b/sas/sasjs/macros/mpe_makedata.sas index c02d872..ca70379 100644 --- 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" diff --git a/sas/sasjs/services/editors/getdata.sas b/sas/sasjs/services/editors/getdata.sas index 7e1d711..0979653 100755 --- 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)