upload

package.json

@@ -4,45 +4,38 @@
     "license": "MIT",
     "scripts": {
         "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",
-        "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",
+        "build": "npm run build-prod:core && npm run build-apps",
+        "build:core": "ng build wave-core-new",
+        "build-watch:core": "ng build wave-core-new --watch",
+        "build-prod:core": "ng build --prod wave-core-new",
+        "build-apps": "npm run build-prod:geoengine && npm run build-prod:data-atlas",
         "serve:geoengine": "ng serve geoengine-app --proxy-config proxy-geoengine.conf.json",
         "serve:data-atlas": "ng serve data-atlas-app --proxy-config proxy-data-atlas.conf.json",
-        "serve:gfbio": "ng serve gfbio-app --proxy-config proxy.conf.json",
-        "serve:nature40": "ng serve nature40-app --proxy-config proxy.conf.json",
-        "build:core": "ng build wave-core",
-        "build-watch:core": "ng build wave-core --watch",
-        "build:core-new": "ng build wave-core-new",
-        "build-watch:core-new": "ng build wave-core-new --watch",
-        "build-prod:core": "ng build --prod wave-core",
-        "build-prod:wave": "ng build --prod wave-app",
-        "build-prod:gfbio": "ng build --prod gfbio-app",
-        "build-prod:nature40": "ng build --prod nature40-app",
+        "build-prod:geoengine": "ng build --prod geoengine-app",
+        "build-prod:data-atlas": "ng build --prod data-atlas-app",
         "publish:core:patch": "version=patch scripts/publish-to-github.sh",
         "publish:core:minor": "version=minor scripts/publish-to-github.sh",
         "publish:core:major": "version=major scripts/publish-to-github.sh",
+        "prettier": "prettier",
+        "check": "prettier --check . && ng lint",
         "test": "ng test",
         "lint": "ng lint",
         "e2e": "ng e2e",
         "postinstall": "ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points"
     },
     "private": true,
     "dependencies": {
-        "@angular/animations": "~10.1.5",
-        "@angular/cdk": "~10.2.4",
-        "@angular/common": "~10.1.5",
-        "@angular/compiler": "~10.1.5",
-        "@angular/core": "~10.1.5",
-        "@angular/flex-layout": "~10.0.0-beta.32",
-        "@angular/forms": "~10.1.5",
-        "@angular/material": "~10.2.4",
-        "@angular/platform-browser": "~10.1.5",
-        "@angular/platform-browser-dynamic": "~10.1.5",
-        "@angular/router": "~10.1.5",
+        "@angular/animations": "~11.2.7",
+        "@angular/cdk": "~11.2.6",
+        "@angular/common": "~11.2.7",
+        "@angular/compiler": "~11.2.7",
+        "@angular/core": "~11.2.7",
+        "@angular/flex-layout": "~11.0.0-beta.33",
+        "@angular/forms": "~11.2.7",
+        "@angular/material": "~11.2.6",
+        "@angular/platform-browser": "~11.2.7",
+        "@angular/platform-browser-dynamic": "~11.2.7",
+        "@angular/router": "~11.2.7",
         "codemirror": "~5.58.1",
         "d3": "~6.2.0",
         "dagre": "~0.8.5",
@@ -63,40 +56,40 @@
         "zone.js": "~0.10.3"
     },
     "devDependencies": {
-        "@angular-devkit/build-angular": "~0.1002.2",
-        "@angular-devkit/build-ng-packagr": "~0.1002.2",
-        "@angular-eslint/builder": "1.2.0",
-        "@angular-eslint/eslint-plugin": "1.2.0",
-        "@angular-eslint/eslint-plugin-template": "1.2.0",
-        "@angular-eslint/schematics": "1.2.0",
-        "@angular-eslint/template-parser": "1.2.0",
-        "@angular/cli": "~10.2.3",
-        "@angular/compiler-cli": "~10.1.5",
-        "@angular/language-service": "~10.1.5",
+        "@angular-devkit/architect": "^0.1102.6",
+        "@angular-devkit/build-angular": "~0.1102.6",
+        "@angular-eslint/builder": "^2.0.0",
+        "@angular-eslint/eslint-plugin": "^2.0.0",
+        "@angular-eslint/eslint-plugin-template": "^2.0.0",
+        "@angular-eslint/schematics": "2.0.2",
+        "@angular-eslint/template-parser": "^2.0.0",
+        "@angular/cli": "~11.2.6",
+        "@angular/compiler-cli": "~11.2.7",
+        "@angular/language-service": "~11.2.7",
         "@types/codemirror": "~0.0.87",
         "@types/d3": "~5.16.3",
-        "@types/jasmine": "~3.5.14",
+        "@types/jasmine": "~3.6.0",
         "@types/jasminewd2": "~2.0.3",
         "@types/node": "^12.11.1",
         "@types/papaparse": "~4.5.7",
-        "@typescript-eslint/eslint-plugin": "4.3.0",
-        "@typescript-eslint/parser": "4.3.0",
+        "@typescript-eslint/eslint-plugin": "4.16.1",
+        "@typescript-eslint/parser": "4.16.1",
         "eslint": "^7.6.0",
         "eslint-config-prettier": "^8.1.0",
         "eslint-plugin-import": "2.22.1",
         "eslint-plugin-jsdoc": "30.7.6",
         "eslint-plugin-prefer-arrow": "1.2.2",
         "eslint-plugin-prettier": "^3.3.1",
-        "jasmine-core": "~3.5.0",
-        "jasmine-spec-reporter": "~4.2.1",
-        "karma": "~4.3.0",
+        "jasmine-core": "~3.6.0",
+        "jasmine-spec-reporter": "~5.0.0",
+        "karma": "~6.1.0",
         "karma-chrome-launcher": "~3.1.0",
         "karma-coverage-istanbul-reporter": "~2.1.0",
-        "karma-jasmine": "~2.0.1",
-        "karma-jasmine-html-reporter": "^1.5.4",
-        "ng-packagr": "^10.1.0",
+        "karma-jasmine": "~4.0.0",
+        "karma-jasmine-html-reporter": "^1.5.0",
+        "ng-packagr": "~11.1.0",
         "prettier": "2.2.1",
-        "protractor": "~5.4.3",
+        "protractor": "~7.0.0",
         "ts-node": "~8.3.0",
         "typescript": "~4.0.3"
     }

projects/geoengine-app/src/app/app.component.ts

@@ -18,7 +18,7 @@ import {MatSidenav} from '@angular/material/sidenav';
 import {MatTabGroup} from '@angular/material/tabs';
 import {
     AddDataComponent,
-    AddDataListButton,
+    AddDataButton,
     Layer,
     SidenavContainerComponent,
     LayoutService,
@@ -41,7 +41,6 @@ import {
 import {DomSanitizer} from '@angular/platform-browser';
 import {ActivatedRoute} from '@angular/router';
 import {AppConfig} from './app-config.service';
-import {MockLayersComponent} from './mock-layers/mock-layers.component';
 
 @Component({
     selector: 'wave-app-root',
@@ -190,15 +189,11 @@ export class AppComponent implements OnInit, AfterViewInit {
         return {component: AddDataComponent, config: {buttons: AppComponent.createAddDataListButtons()}};
     }
 
-    private static createAddDataListButtons(): Array<AddDataListButton> {
+    private static createAddDataListButtons(): Array<AddDataButton> {
         return [
             AddDataComponent.createDataSetListButton(),
-            {
-                name: 'Mock data',
-                description: 'Mock data sets',
-                iconSrc: AddDataComponent.createIconDataUrl('mock'),
-                sidenavConfig: {component: MockLayersComponent, keepParent: true},
-            },
+            AddDataComponent.createUploadButton(),
+
             // SourceOperatorListComponent.createDrawFeaturesButton(),
             // ...SourceOperatorListComponent.createCustomFeaturesButtons(),
             // {