From f4e6a487f3705ca424f4e2b8980286ec6f501519 Mon Sep 17 00:00:00 2001 From: munja Date: Wed, 14 Dec 2022 14:17:06 +0100 Subject: [PATCH 1/2] fix: removing redundant param in mS/M_webout macros --- meta/mm_webout.sas | 2 +- server/ms_webout.sas | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/mm_webout.sas b/meta/mm_webout.sas index 7904f864..0c1d848f 100644 --- a/meta/mm_webout.sas +++ b/meta/mm_webout.sas @@ -150,7 +150,7 @@ put " ""&wt"" : {"; put '"nlobs":' nlobs; put ',"nvars":' nvars; - %mp_jsonout(OBJ,&wt,jref=_sjsref,dslabel=first10rows,showmeta=Y,maxobs=10 + %mp_jsonout(OBJ,&wt,jref=_sjsref,dslabel=first10rows,showmeta=Y ,maxobs=&workobs ) data _null_; file _sjsref mod encoding='utf-8'; diff --git a/server/ms_webout.sas b/server/ms_webout.sas index 1b44e64b..a658bf6e 100644 --- a/server/ms_webout.sas +++ b/server/ms_webout.sas @@ -141,7 +141,7 @@ put " ""&wt"" : {"; put '"nlobs":' nlobs; put ',"nvars":' nvars; - %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,showmeta=Y,maxobs=10 + %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,showmeta=Y ,maxobs=&workobs ) data _null_; file &fref mod encoding='utf-8' termstr=lf; From 00628ec78adcfec262e9a5ba6b4ef6c27ba65938 Mon Sep 17 00:00:00 2001 From: munja Date: Wed, 14 Dec 2022 14:19:28 +0100 Subject: [PATCH 2/2] chore: updating lint settings, some line ending issues, and a sasjsconfig apploc fix --- .sasjslint | 24 ++++++++++++------------ .vscode/settings.json | 4 +++- base/mf_existfileref.sas | 2 +- sasjs/sasjsconfig.json | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.sasjslint b/.sasjslint index 6f6b4ae2..bee0905c 100644 --- a/.sasjslint +++ b/.sasjslint @@ -1,13 +1,13 @@ { - "noTrailingSpaces": true, - "noEncodedPasswords": true, - "hasDoxygenHeader": true, - "hasMacroNameInMend": true, - "hasMacroParentheses": true, - "noNestedMacros": false, - "noSpacesInFileNames": true, - "maxLineLength": 300, - "lowerCaseFileNames": true, - "noTabIndentation": true, - "indentationMultiple": 2 -} \ No newline at end of file + "noTrailingSpaces": true, + "noEncodedPasswords": true, + "hasDoxygenHeader": true, + "hasMacroNameInMend": true, + "hasMacroParentheses": true, + "noNestedMacros": false, + "noSpacesInFileNames": true, + "maxLineLength": 300, + "lowerCaseFileNames": true, + "noTabs": true, + "indentationMultiple": 2 +} diff --git a/.vscode/settings.json b/.vscode/settings.json index 475724d9..a73b8138 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,5 +6,7 @@ "editor.rulers": [ 80 ], - "files.trimTrailingWhitespace": true + "files.trimTrailingWhitespace": true, + "sasjs-for-vscode.target": "docsonly", + "sasjs-for-vscode.isLocal": true } \ No newline at end of file diff --git a/base/mf_existfileref.sas b/base/mf_existfileref.sas index 0423696e..82ede652 100644 --- a/base/mf_existfileref.sas +++ b/base/mf_existfileref.sas @@ -30,4 +30,4 @@ 0 %end; -%mend mf_existfileref; \ No newline at end of file +%mend mf_existfileref; diff --git a/sasjs/sasjsconfig.json b/sasjs/sasjsconfig.json index 07051764..69d1fcb4 100644 --- a/sasjs/sasjsconfig.json +++ b/sasjs/sasjsconfig.json @@ -85,7 +85,7 @@ { "name": "docsonly", "serverType": "SASJS", - "appLoc": "dummy", + "appLoc": "/dummy", "macroFolders": [ "meta", "metax",