fix: upload path added, sasjsconfig in index.html, images base64 encoded

sasjs · Sep 23, 2021 · 2111179 · 2111179
1 parent 5e4ab0f
commit 2111179
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 49 deletions.
diff --git a/sasjs/sasjsconfig.json b/sasjs/sasjsconfig.json
@@ -6,7 +6,8 @@
   "programFolders": [],
   "serviceConfig": {
     "serviceFolders": [
-      "sasjs/services/common"
+      "sasjs/services/common",
+      "sasjs/services/files"
     ],
     "initProgram": "",
     "termProgram": "",
@@ -42,21 +43,6 @@
         "buildResultsFolder": "sasjsresults",
         "buildOutputFolder": "sasjsbuild"
       },
-      "jobConfig": {
-        "jobFolders": [],
-        "initProgram": "",
-        "termProgram": "",
-        "macroVars": {}
-      },
-      "serviceConfig": {
-        "serviceFolders": [
-          "sasjs/services/common",
-          "sasjs/services/files"
-        ],
-        "initProgram": "",
-        "termProgram": "",
-        "macroVars": {}
-      },
       "streamConfig": {
         "assetPaths": [],
         "streamWeb": false,
@@ -74,38 +60,33 @@
     },
     {
       "name": "sas9",
+      "serverUrl": "https://sas.analytium.co.uk:8343",
       "serverType": "SAS9",
-      "serverUrl": "YOURSAS9SERVER",
+      "allowInsecureRequests": false,
       "appLoc": "/Public/app/angular-seed-app",
+      "macroFolders": [],
+      "programFolders": [],
       "buildConfig": {
-        "buildOutputFileName": "mysas9deploy.sas"
-      },
-      "deployConfig": {
-        "deployServicePack": true,
-        "deployScripts": [
-          "sasjsbuild/mysas9deploy.sas"
-        ]
-      },
-      "serviceConfig": {
-        "serviceFolders": [],
-        "initProgram": "",
-        "termProgram": "",
-        "macroVars": {}
-      },
-      "jobConfig": {
-        "jobFolders": [],
+        "buildOutputFileName": "mysas9deploy.sas",
+        "buildResultsFolder": "sasjsresults",
+        "buildOutputFolder": "sasjsbuild",
         "initProgram": "",
         "termProgram": "",
         "macroVars": {}
       },
-      "serverName": "SASApp",
-      "repositoryName": "Foundation",
       "streamConfig": {
         "assetPaths": [],
-        "streamWeb": false,
+        "streamWeb": true,
         "streamWebFolder": "web9",
-        "webSourcePath": "dist"
-      }
+        "webSourcePath": "dist",
+        "streamServiceName": "clickme"
+      },
+      "deployConfig": {
+        "deployServicePack": true,
+        "deployScripts": []
+      },
+      "serverName": "SASApp",
+      "repositoryName": "Foundation"
     }
   ]
 }
diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -1,6 +1,6 @@
 <header class="header-6">
   <div class="branding">
-    <img src="./assets/logo-white.png" />
+    <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFUAAABVCAYAAAA49ahaAAAACXBIWXMAAAsTAAALEwEAmpwYAAAF3mlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDggNzkuMTY0MDM2LCAyMDE5LzA4LzEzLTAxOjA2OjU3ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgMjEuMCAoTWFjaW50b3NoKSIgeG1wOkNyZWF0ZURhdGU9IjIwMjAtMDItMTZUMDk6Mjk6MDhaIiB4bXA6TW9kaWZ5RGF0ZT0iMjAyMC0wMi0xNlQxMDowMTowMloiIHhtcDpNZXRhZGF0YURhdGU9IjIwMjAtMDItMTZUMTA6MDE6MDJaIiBkYzpmb3JtYXQ9ImltYWdlL3BuZyIgcGhvdG9zaG9wOkNvbG9yTW9kZT0iMyIgcGhvdG9zaG9wOklDQ1Byb2ZpbGU9InNSR0IgSUVDNjE5NjYtMi4xIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjg4NzQ1M2JkLWRjZWEtNGZkYi1hZWY5LTJjOTcwYzBmYTQ3OCIgeG1wTU06RG9jdW1lbnRJRD0iYWRvYmU6ZG9jaWQ6cGhvdG9zaG9wOjAyYzZhMWNiLTY1MzYtMWU0ZC04MWE2LTY0ODk5MzRjNWM4YSIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjc2ZjNhNzIwLTU4MWQtNDU0YS1hYmIyLTE4OTg4NjgyYzkwZSI+IDx4bXBNTTpIaXN0b3J5PiA8cmRmOlNlcT4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImNyZWF0ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6NzZmM2E3MjAtNTgxZC00NTRhLWFiYjItMTg5ODg2ODJjOTBlIiBzdEV2dDp3aGVuPSIyMDIwLTAyLTE2VDA5OjI5OjA4WiIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKE1hY2ludG9zaCkiLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjg4NzQ1M2JkLWRjZWEtNGZkYi1hZWY5LTJjOTcwYzBmYTQ3OCIgc3RFdnQ6d2hlbj0iMjAyMC0wMi0xNlQxMDowMTowMloiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCAyMS4wIChNYWNpbnRvc2gpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDwvcmRmOlNlcT4gPC94bXBNTTpIaXN0b3J5PiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PgU8a6AAAAmVSURBVHic7ZxbrFxVGcd/38w5pxeLVGg1tSQUbCIEHjRGIybiBfACKF5qohZNQEmjGEJCNEajDyWxmuiDhhDevMR6aTQlXtoQk6ImQowKqbRoVQIoF6laK5RyLjPz92GtdfY3++yZM6ez98xQ9j/ZWfusy15r//e31ndZa45Joka5aIx7AKcjalIrQE1qBahJrQA1qRWgJrUC1KRWgJrUClCTWgFqUitATWoFqEmtADWpFaAmtQJMDdPYzMoax0rRAPKdy12nhLLCoEOROgYYgdB2j/LGMuUjwfOJ1Kakjpm1ASTN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" />
   </div>
   <div class="header-nav">
     <a routerLinkActive="active" routerLink="/homepage" class="nav-link nav-text">Homepage</a>

diff --git a/src/app/sas.service.ts b/src/app/sas.service.ts
@@ -10,14 +10,9 @@ export class SasService {
   private sasService: any;
 
   constructor(private stateService: StateService) {
-    this.sasService = new SASjs({
-      serverUrl: '',
-      appLoc: '/Public/app/angular-seed-app',
-      serverType: 'SASVIYA',
-      debug: true,
-      useComputeApi: true,
-      contextName: 'SAS Job Execution compute context',
-    });
+    let sasjsConfigInput = (window as any).sasjsConfigInput || {}
+
+    this.sasService = new SASjs(sasjsConfigInput);
   }
 
   public fetchStartupData() {

diff --git a/src/app/uploader/uploader.component.html b/src/app/uploader/uploader.component.html
@@ -4,6 +4,15 @@
         <input (change)="onFileChange($event)" type="file" id="fileToUpload">
     </div>
 
+    <div class="clr-form-control">
+        <label for="example" class="clr-control-label">Upload path</label>
+        <div class="clr-control-container">
+          <div class="clr-input-wrapper">
+            <input [(ngModel)]="uploadPath" style="width: 230px;" type="text" id="example" placeholder="Enter path" class="clr-input" />
+          </div>
+        </div>
+    </div>
+
     <hr style="margin-top: 20px; width: 100%;"/>
     <button (click)="submit()" [clrLoading]="uploadLoading" class="btn btn-primary">upload</button>
 </div>

diff --git a/src/app/uploader/uploader.component.ts b/src/app/uploader/uploader.component.ts
@@ -10,6 +10,7 @@ import { SasService } from '../sas.service';
 export class UploaderComponent implements OnInit {
   public selectedFiles: any[] = []
   public uploadUrl: string = 'services/files/upload'
+  public uploadPath: string = ''
   public responseModalMessage: string | null = null
   public uploadLoading: boolean = false
 
@@ -44,9 +45,9 @@ export class UploaderComponent implements OnInit {
         fileName: file.name
       })
     }
-
+    console.log('this.uploadPath', this.uploadPath)
     this.sasService
-      .uploadFile(this.uploadUrl, filesToUpload)
+      .uploadFile(this.uploadUrl, filesToUpload, { path: this.uploadPath })
       .then(
         (res: any) => {
           console.log('res', res)

diff --git a/src/index.html b/src/index.html
@@ -6,6 +6,16 @@
     <base href="./" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="icon" type="image/x-icon" href="favicon.ico" />
+
+    <script type="text/javascript">
+      window.sasjsConfigInput = {
+        appLoc: '/Public/app/angular-seed-app',
+        serverType: 'SASVIYA',
+        debug: true,
+        useComputeApi: true,
+        contextName: 'SAS Job Execution compute context',
+      }
+    </script>
   </head>
   <body class="mat-typography">
     <app-root></app-root>