upload

package.json

@@ -6,7 +6,7 @@
         "ng": "ng",
         "prettier": "prettier",
         "start": "ng serve",
-        "build": "npm run build-prod:core && npm run build-prod:wave && npm run build-prod:gfbio && npm run build-prod:nature40",
+        "build": "npm run build-prod:core && npm run build-prod:wave && npm run build-prod:gfbio && npm run build-prod:nature40 && npm run build-prod:core-new",
         "check": "prettier --check . && ng lint wave-core-new && ng lint geoengine-app && ng lint data-atlas-app",
         "ci-core": "ng build --prod wave-core-new",
         "serve:wave": "ng serve wave-app --proxy-config proxy.conf.json",

projects/wave-core-new/src/lib/datasets/add-data/add-data.component.ts

@@ -1,5 +1,6 @@
 import {Component, OnInit, ChangeDetectionStrategy, Input} from '@angular/core';
 import {LayoutService, SidenavConfig} from '../../layout.service';
+import {createIconDataUrl} from '../../util/icons';
 import {DatasetListComponent} from '../dataset-list/dataset-list.component';
 import {UploadComponent} from '../upload/upload.component';
 
@@ -43,7 +44,7 @@ export class AddDataComponent implements OnInit {
         return {
             name: 'Data Sets',
             description: 'Available Data Sets',
-            iconSrc: this.createIconDataUrl('DataSets'),
+            iconSrc: createIconDataUrl('DataSets'),
             sidenavConfig: {component: DatasetListComponent, keepParent: true},
         };
     }
@@ -52,43 +53,8 @@ export class AddDataComponent implements OnInit {
         return {
             name: 'Upload',
             description: 'Upload data from you local computer',
-            iconSrc: this.createIconDataUrl('Upload'),
+            iconSrc: createIconDataUrl('Upload'),
             sidenavConfig: {component: UploadComponent, keepParent: true},
         };
     }
-
-    /**
-     * Each operator type must have a method that returns
-     * an icon as a data uri image. This provides a default
-     * out of the operator name.
-     */
-    static createIconDataUrl(iconName: string): string {
-        // TODO: replace with proper icons
-        // from `http://stackoverflow.com/questions/3426404/
-        // create-a-hexadecimal-colour-based-on-a-string-with-javascript`
-        const hashCode = (str: string): number => {
-            // java String#hashCode
-            let hash = 0;
-            for (let i = 0; i < str.length; i++) {
-                hash = str.charCodeAt(i) + ((hash << 5) - hash); // eslint-disable-line no-bitwise
-            }
-            return hash;
-        };
-        const intToRGB = (i: number): string => {
-            const c = (i & 0x00ffffff).toString(16).toUpperCase(); // eslint-disable-line no-bitwise
-
-            return '00000'.substring(0, 6 - c.length) + c;
-        };
-
-        const color = '#' + intToRGB(hashCode(iconName));
-        const size = 64;
-
-        const canvas = document.createElement('canvas');
-        canvas.width = size;
-        canvas.height = size;
-        const context = canvas.getContext('2d');
-        context.fillStyle = color;
-        context.fillRect(0, 0, 64, 64);
-        return canvas.toDataURL('image/png');
-    }
 }

projects/wave-core-new/src/lib/datasets/dataset.service.ts

@@ -5,7 +5,7 @@ import {DataSet} from './dataset.model';
 import {UserService} from '../users/user.service';
 import {map, mergeMap} from 'rxjs/operators';
 import {HttpEvent} from '@angular/common/http';
-import {CreateDataSetDict, UploadResponseDict} from '../backend/backend.model';
+import {CreateDataSetDict, DataSetIdDict, UploadResponseDict} from '../backend/backend.model';
 
 @Injectable({
     providedIn: 'root',
@@ -21,10 +21,10 @@ export class DataSetService {
     }
 
     upload(form: FormData): Observable<HttpEvent<UploadResponseDict>> {
-        return this.userService.getSessionStream().pipe(mergeMap((session) => this.backend.upload(session.sessionToken, form)));
+        return this.userService.getSessionTokenForRequest().pipe(mergeMap((token) => this.backend.upload(token, form)));
     }
 
     createDataSet(create: CreateDataSetDict): Observable<DataSetIdDict> {
-        return this.userService.getSessionStream().pipe(mergeMap((session) => this.backend.createDataSet(session.sessionToken, create)));
+        return this.userService.getSessionTokenForRequest().pipe(mergeMap((token) => this.backend.createDataSet(token, create)));
     }
 }

projects/wave-core-new/src/lib/datasets/upload/upload.component.ts

@@ -18,7 +18,7 @@ interface ExampleLoadingInfo {
 })
 export class UploadComponent implements OnInit {
     selectedFiles: FileList;
-    progress$ = new Subject();
+    progress$ = new Subject<number>();
     submittedUpload = false;
     submittedCreate = false;
 
@@ -132,13 +132,12 @@ export class UploadComponent implements OnInit {
 
     loadingInfo = '';
 
-    constructor(private dataSetService: DataSetService, private notificationService: NotificationService) {}
+    constructor(protected dataSetService: DataSetService, protected notificationService: NotificationService) {}
 
     ngOnInit(): void {}
 
     selectFiles(event): void {
         this.selectedFiles = event.target.files;
-        console.log(this.selectedFiles);
     }
 
     upload(): void {
@@ -157,7 +156,6 @@ export class UploadComponent implements OnInit {
                 } else if (event.type === HttpEventType.Response) {
                     this.uploadId$.next(event.body.id);
                 }
-                console.log(event);
             },
             (err) => {
                 this.notificationService.error('File upload failed: ' + err);

proxy-data-atlas.conf.json

@@ -1,6 +1,6 @@
 {
     "/api/*": {
-        "target": "http://pc12736.mathematik.uni-marburg.de:7777/api",
+        "target": "http://localhost:3030/",
         "changeOrigin": true,
         "pathRewrite": {
             "^/api": ""

proxy-geoengine.conf.json

@@ -1,6 +1,6 @@
 {
     "/api/*": {
-        "target": "http://pc12608.mathematik.uni-marburg.de:3030/",
+        "target": "http://localhost:3030/",
         "changeOrigin": true,
         "pathRewrite": {
             "^/api": ""