fix(*): update app to work with CLI 2.0

Author: krishna-acondy

package-lock.json

@@ -9,9 +9,8 @@
     "lint": "ng lint",
     "e2e": "ng e2e",
     "build-watch": "ng build --watch",
-    "sync": "./node_modules/.bin/watch --wait=3 \"echo Account: ${npm_config_account} && npm run ${npm_config_serverType} --account=${npm_config_account} && echo 'App is synced!'\" dist",
-    "sas9": "rsync -avhe ssh ./dist/* --delete ${npm_config_account}@sas.domain.com:/opt/sas/sas9/config/Lev1/Web/WebServer/htdocs/${npm_config_account}/ngseed",
-    "viya": "rsync -avhe ssh ./dist/* --delete ${npm_config_account}@sas.domain.com:/var/www/html/${npm_config_account}/ngseed"
+    "deploy": "rsync -avhe ssh ./dist/* --delete $SSH_ACCOUNT:$DEPLOY_PATH",
+    "sync": "./node_modules/.bin/watch --wait=3 \"echo Account: $SSH_ACCOUNT && npm run deploy && echo 'App is synced!'\" dist"
   },
   "private": true,
   "dependencies": {
@@ -28,7 +27,8 @@
     "@clr/core": "3.1.2",
     "@clr/icons": "4.0.8",
     "@clr/ui": "4.0.8",
-    "@sasjs/adapter": "^2.0.0",
+    "@sasjs/adapter": "^2.0.2",
+    "@sasjs/core": "^2.2.1",
     "@webcomponents/webcomponentsjs": "^2.5.0",
     "moment": "^2.29.1",
     "rxjs": "~6.6.3",

package.json

@@ -2,7 +2,7 @@
   "macroFolders": ["macros"],
   "programFolders": [],
   "serviceConfig": {
-    "serviceFolders": [],
+    "serviceFolders": ["services/common"],
     "initProgram": "",
     "termProgram": "",
     "macroVars": {}
@@ -22,28 +22,31 @@
   "targets": [
     {
       "name": "viya",
+      "serverUrl": "https://sas.analytium.co.uk",
       "serverType": "SASVIYA",
-      "serverUrl": "YOURSASVIYASERVER",
       "appLoc": "/Public/app/angular-seed-app",
-      "contextName": "SAS Job Execution compute context",
+      "macroFolders": [],
+      "programFolders": [],
+      "authConfig": {
+        "access_token": "",
+        "refresh_token": "",
+        "client": "",
+        "secret": ""
+      },
       "buildConfig": {
         "buildOutputFileName": "myviyadeploy.sas",
         "initProgram": "",
         "termProgram": "",
         "macroVars": {}
       },
-      "deployConfig": {
-        "deployServicePack": true,
-        "deployScripts": ["sasjsbuild/myviyadeploy.sas"]
-      },
-      "serviceConfig": {
-        "serviceFolders": [],
+      "jobConfig": {
+        "jobFolders": [],
         "initProgram": "",
         "termProgram": "",
         "macroVars": {}
       },
-      "jobConfig": {
-        "jobFolders": [],
+      "serviceConfig": {
+        "serviceFolders": [],
         "initProgram": "",
         "termProgram": "",
         "macroVars": {}
@@ -53,13 +56,17 @@
         "streamWeb": false,
         "streamWebFolder": "webv",
         "webSourcePath": "dist"
+      },
+      "deployConfig": {
+        "deployServicePack": true,
+        "deployScripts": ["sasjsbuild/myviyadeploy.sas"]
       }
     },
     {
       "name": "sas9",
       "serverType": "SAS9",
       "serverUrl": "YOURSAS9SERVER",
-      "appLoc": "/User Folders/&sysuserid/My Folder/angular-seed-app",
+      "appLoc": "/Public/app/angular-seed-app",
       "buildConfig": {
         "buildOutputFileName": "mysas9deploy.sas"
       },
@@ -79,7 +86,6 @@
         "termProgram": "",
         "macroVars": {}
       },
-
       "serverName": "SASApp",
       "repositoryName": "Foundation",
       "streamConfig": {
@@ -90,4 +96,4 @@
       }
     }
   ]
-}
+}

sasjs/sasjsconfig.json

@@ -7,6 +7,8 @@
 
 **/
 
+%webout(FETCH)
+
 proc sql;
 create table springs as select * from sashelp.springs
   where area in (select area from areas);

sasjs/services/common/getdata.sas

@@ -5,7 +5,7 @@ import { SasService } from '../sas.service';
 @Component({
   selector: 'app-data',
   templateUrl: './data.component.html',
-  styleUrls: ['./data.component.scss']
+  styleUrls: ['./data.component.scss'],
 })
 export class DataComponent implements OnInit {
   public areas: any[] = [];
@@ -14,11 +14,8 @@ export class DataComponent implements OnInit {
   public springsLoading: boolean = false;
 
   public displayedColumns: string[] = ['LATITUDE', 'LONGITUDE', 'NAME', 'AREA', 'TYPE', 'FARENHEIT', 'CELSIUS'];
-  
-  constructor(
-    private stateService: StateService,
-    private sasService: SasService
-  ) { }
+
+  constructor(private stateService: StateService, private sasService: SasService) {}
 
   ngOnInit(): void {
     this.stateService.startupData.subscribe((data: any) => {
@@ -28,9 +25,9 @@ export class DataComponent implements OnInit {
 
   public submitData() {
     this.springsLoading = true;
-    let data = {areas: [{ area: this.selectedArea }]};
+    let data = { areas: [{ area: this.selectedArea }] };
 
-    this.sasService.request("common/getdata", data).then((res: any) => {
+    this.sasService.request('services/common/getdata', data).then((res: any) => {
       this.springs = res['springs'];
       this.springsLoading = false;
     });

src/app/data/data.component.ts

@@ -4,24 +4,24 @@ import SASjs from '@sasjs/adapter';
 import { StateService } from './state.service';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class SasService {
   private _sasService: any;
 
   constructor(private stateService: StateService) {
     this._sasService = new SASjs({
       serverUrl: '',
-      appLoc: '/Public/app/angular',
+      appLoc: '/Public/app/angular-seed-app',
       serverType: 'SASVIYA',
       debug: true,
       useComputeApi: true,
-      contextName: 'SAS Job Execution compute context'
+      contextName: 'SAS Job Execution compute context',
     });
   }
 
   public fetchStartupData() {
-    this.request('common/appinit', null).then((response: any) => {
+    this.request('services/common/appinit', null).then((response: any) => {
       console.log(response);
       this.stateService.setStartupData(response.areas);
     });
@@ -44,9 +44,9 @@ export class SasService {
             if (this.stateService.username.getValue().length < 1 && res.MF_GETUSER) {
               this.stateService.username.next(res.MF_GETUSER);
             }
-              
+
             if (res.status === 404) {
-              reject({MESSAGE: res.body || 'SAS responded with an error'})
+              reject({ MESSAGE: res.body || 'SAS responded with an error' });
             }
 
             resolve(res);
@@ -102,4 +102,4 @@ export class SasService {
   public setDebugState(state: boolean) {
     this._sasService.setDebugState(state);
   }
-}
+}