From 94ab949df8c75072525751a2156b7a32c2e641dc Mon Sep 17 00:00:00 2001
From: Mihajlo Medjedovic <mihajlo.medjedovic@outlook.com>
Date: Mon, 25 Sep 2023 16:24:50 +0200
Subject: [PATCH] fix: updating editors/stagedata to address issues in
 particular viya configurations as described in issue #33

---
 client/package-lock.json                 | 14 +++++++-------
 client/package.json                      |  2 +-
 client/src/environments/_eula.ts         |  2 +-
 sas/package.json                         |  4 ++--
 sas/sasjs/services/editors/stagedata.sas | 11 +++--------
 5 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index 5ffadf0..c7da7f2 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -21,7 +21,7 @@
         "@clr/icons": "^13.0.2",
         "@clr/ui": "^13.17.0",
         "@handsontable/angular": "^13.1.0",
-        "@sasjs/adapter": "4.9.2",
+        "@sasjs/adapter": "4.10.1",
         "@sasjs/utils": "^3.4.0",
         "@sheet/crypto": "1.20211122.1",
         "@types/d3-graphviz": "^2.6.7",
@@ -3816,9 +3816,9 @@
       }
     },
     "node_modules/@sasjs/adapter": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-4.9.2.tgz",
-      "integrity": "sha512-WAWhJAbhsOwChbRB6N+dcgj9Tods2Hq/ygsCASALbjKvqxtYlUDVBoEhdedur0VdsWyUaTAqcwioCiCpWtcRZA==",
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-4.10.1.tgz",
+      "integrity": "sha512-/z6eR+3nNaLPyycK8YmpF+GAWNy0zgdl8n4cv4r45hjVBulPHVop7oj57JM/0uIPVOTT2V9IwrMCT/sFPq++vw==",
       "hasInstallScript": true,
       "dependencies": {
         "@sasjs/utils": "2.52.0",
@@ -22086,9 +22086,9 @@
       "optional": true
     },
     "@sasjs/adapter": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-4.9.2.tgz",
-      "integrity": "sha512-WAWhJAbhsOwChbRB6N+dcgj9Tods2Hq/ygsCASALbjKvqxtYlUDVBoEhdedur0VdsWyUaTAqcwioCiCpWtcRZA==",
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-4.10.1.tgz",
+      "integrity": "sha512-/z6eR+3nNaLPyycK8YmpF+GAWNy0zgdl8n4cv4r45hjVBulPHVop7oj57JM/0uIPVOTT2V9IwrMCT/sFPq++vw==",
       "requires": {
         "@sasjs/utils": "2.52.0",
         "axios": "0.27.2",
diff --git a/client/package.json b/client/package.json
index 1942eb2..9de66bd 100644
--- a/client/package.json
+++ b/client/package.json
@@ -49,7 +49,7 @@
     "@clr/icons": "^13.0.2",
     "@clr/ui": "^13.17.0",
     "@handsontable/angular": "^13.1.0",
-    "@sasjs/adapter": "4.9.2",
+    "@sasjs/adapter": "4.10.1",
     "@sasjs/utils": "^3.4.0",
     "@sheet/crypto": "1.20211122.1",
     "@types/d3-graphviz": "^2.6.7",
diff --git a/client/src/environments/_eula.ts b/client/src/environments/_eula.ts
index 3d7cba2..684dea6 100644
--- a/client/src/environments/_eula.ts
+++ b/client/src/environments/_eula.ts
@@ -18,4 +18,4 @@ In any case, you must not make any such use of this software as to develop softw
 UNLESS EXPRESSLY AGREED OTHERWISE, 4GL APPS PROVIDES THIS SOFTWARE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, AND IN NO EVENT AND UNDER NO LEGAL THEORY, SHALL 4GL APPS BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER ARISING FROM USE OR INABILITY TO USE THIS SOFTWARE.
 
 
-`
\ No newline at end of file
+`
diff --git a/sas/package.json b/sas/package.json
index fdbd15d..2220b79 100644
--- a/sas/package.json
+++ b/sas/package.json
@@ -27,7 +27,7 @@
   },
   "private": true,
   "dependencies": {
-    "@sasjs/cli": "^4.10.1",
-    "@sasjs/core": "^4.46.6"
+    "@sasjs/cli": "^4.11.1",
+    "@sasjs/core": "^4.47.0"
   }
 }
diff --git a/sas/sasjs/services/editors/stagedata.sas b/sas/sasjs/services/editors/stagedata.sas
index f3ccee7..b89cf3d 100755
--- a/sas/sasjs/services/editors/stagedata.sas
+++ b/sas/sasjs/services/editors/stagedata.sas
@@ -186,20 +186,15 @@ options notes mprint;
 libname approve "&dir";
 
 /* take copy of webin file */
-
 data _null_;
-  if symexist('_WEBIN_FILEREF1')
-    then ref=symget('_WEBIN_FILEREF1');
-  else if symexist('sasjs_tables') then do;
-    rc=filename('ref',"%sysfunc(pathname(work))/&dsn.csv");
-    ref='ref';
-  end;
+  if symexist('_WEBIN_FILEREF1') then ref=symget('_WEBIN_FILEREF1');
+  else if symexist('sasjs_tables') then ref='0ref'; /* no fileref created */
   else ref='indata1';
   call symputx('ref',ref);
   putlog ref=;
 run;
 
-%mp_binarycopy(inref=&ref, outloc="&dir/_WEBIN_FILEREF1.txt")
+%mp_binarycopy(inref=&ref,outloc="&dir/_WEBIN_FILEREF1.txt",iftrue=&ref ne 0ref)
 
 
 /* take copy of macvars */