convert y axis definition to standalone component

Reviewed-on: #1

block-storage/src/main/java/org/lucares/pdb/map/PersistentMapStats.java

@@ -1,6 +1,6 @@
 package org.lucares.pdb.map;
 
-import java.util.List;
+import org.lucares.utils.HumanBytes;
 
 public class PersistentMapStats {
     private long values = 0;
@@ -87,7 +87,7 @@ public class PersistentMapStats {
         builder.append(String.format("\navg. depth= %.2f", averageDepth));
         builder.append(String.format("\navg. fill=  %.2f", averageFill));
         builder.append(String.format("\nvalues/node=%.2f", averageValuesInNode));
-        builder.append(String.format("\nfile size=  %s\n", toHumanBytes(fileSize)));
+        builder.append(String.format("\nfile size=  %s\n", HumanBytes.toHumanBytes(fileSize)));
         return builder.toString();
     }
 
@@ -100,21 +100,9 @@ public class PersistentMapStats {
         builder.append(String.format("\navg. depth= %.2f -> %.2f", old.averageDepth, averageDepth));
         builder.append(String.format("\navg. fill=  %.2f -> %.2f", old.averageFill, averageFill));
         builder.append(String.format("\nvalues/node=%.2f -> %.2f", old.averageValuesInNode, averageValuesInNode));
-        builder.append(String.format("\nfile size=  %s -> %s\n", toHumanBytes(old.fileSize), toHumanBytes(fileSize)));
+        builder.append(String.format("\nfile size=  %s -> %s\n", HumanBytes.toHumanBytes(old.fileSize),
+                HumanBytes.toHumanBytes(fileSize)));
         return builder.toString();
     }
 
-    private static String toHumanBytes(final long bytes) {
-        final List<String> powers = List.of("bytes", "KB", "MB", "GB", "TB", "PB", "EB");
-
-        int power = 1;
-        String result = String.format("%d bytes", bytes);
-        while (bytes >= Math.pow(1024, power) && power < powers.size()) {
-            result = String.format("%.3f", bytes / Math.pow(1024, power));
-            result = result.replaceAll("\\.?0*$", "");
-            result = result + " " + powers.get(power);
-            power = power + 1;
-        }
-        return result;
-    }
 }

build.gradle

@@ -4,27 +4,27 @@ import org.apache.tools.ant.filters.ReplaceTokens
 plugins {
   id 'java'
   id 'eclipse'            
-  id 'com.github.ben-manes.versions' version "0.45.0" // check for dependency updates run: gradlew dependenyUpdates
+  id 'com.github.ben-manes.versions' version "0.51.0" // check for dependency updates run: gradlew dependenyUpdates
 }
 
 
 ext {
 
-  javaVersion=17
+  javaVersion=21
 
-  version_log4j2= '2.19.0' // keep in sync with spring-boot-starter-log4j2
+  version_log4j2= '2.20.0' // keep in sync with spring-boot-starter-log4j2
-  version_spring = '3.0.2'
+  version_spring = '3.3.4'
-  version_junit = '5.9.2'
+  version_junit = '5.11.1'
-  version_junit_platform = '1.9.2'
+  version_junit_platform = '1.11.1'
-  version_nodejs = '16.17.1' // keep in sync with npm
+  version_nodejs = '20.17.0' // keep in sync with npm
-  version_npm = '8.15.0'    // keep in sync with nodejs
+  version_npm = '10.8.2'    // keep in sync with nodejs
 
-  lib_antlr = "org.antlr:antlr4:4.11.1"
+  lib_antlr = "org.antlr:antlr4:4.13.2"
 
   lib_commons_collections4 = 'org.apache.commons:commons-collections4:4.4'
-  lib_commons_csv= 'org.apache.commons:commons-csv:1.10.0'
+  lib_commons_csv= 'org.apache.commons:commons-csv:1.12.0'
-  lib_commons_lang3 = 'org.apache.commons:commons-lang3:3.12.0'
+  lib_commons_lang3 = 'org.apache.commons:commons-lang3:3.17.0'
-  lib_jackson_databind = 'com.fasterxml.jackson.core:jackson-databind:2.14.2'
+  lib_jackson_databind = 'com.fasterxml.jackson.core:jackson-databind:2.18.0'
 
   lib_log4j2_core = "org.apache.logging.log4j:log4j-core:${version_log4j2}"
   lib_log4j2_slf4j_impl = "org.apache.logging.log4j:log4j-slf4j-impl:${version_log4j2}"
@@ -73,6 +73,11 @@ subprojects {
       url 'https://repo.lucares.de/'
       content { includeGroup "org.lucares" }
     }
+    maven {
+      url "https://nexus.disco.lab/repository/maven-all/"
+      allowInsecureProtocol = true
+      content { excludeGroup "org.lucares" }
+    }
     mavenCentral(content: { excludeGroup "org.lucares" })
   }
 
@@ -136,5 +141,5 @@ subprojects {
 }
 
 wrapper {
-  gradleVersion = '8.0.1'
+  gradleVersion = '8.10.2'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,10 +85,9 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+' "$PWD" ) || exit
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,18 +134,21 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
+fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +201,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
+
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-#     shell script including quotes and variable substitutions, so put them in
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-#     double quotes to make sure that they get re-expanded; and
+
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 

pdb-api/src/main/java/org/lucares/pdb/api/AbortException.java

@@ -1,5 +1,7 @@
 package org.lucares.pdb.api;
 
+import java.util.concurrent.TimeUnit;
+
 public class AbortException extends RuntimeException {
 
     private static final long serialVersionUID = 7614132985675048490L;
@@ -29,4 +31,18 @@ public class AbortException extends RuntimeException {
         }
     }
 
+    public static void sleepAbortibly(final long millis) throws AbortException {
+        final long deadline = System.currentTimeMillis() + millis;
+
+        while (System.currentTimeMillis() < deadline) {
+            try {
+                TimeUnit.MILLISECONDS.sleep(Math.min(10, deadline - System.currentTimeMillis()));
+            } catch (final InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new AbortException();
+            }
+            AbortException.abortIfInterrupted();
+        }
+    }
+
 }

pdb-js/.vscode/settings.json

@@ -0,0 +1,2 @@
+{
+}

pdb-js/angular.json

@@ -18,12 +18,15 @@
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
-            "outputPath": "build/generated/resources",
+            "outputPath": {
+              "base": "build/generated/resources"
+            },
             "index": "src/index.html",
-            "main": "src/main.ts",
+            "polyfills": [
-            "polyfills": "src/polyfills.ts",
+              "src/polyfills.ts"
+            ],
             "tsConfig": "tsconfig.app.json",
             "inlineStyleLanguage": "scss",
             "assets": [
@@ -33,7 +36,10 @@
             "styles": [
               "src/styles.scss"
             ],
-            "scripts": []
+            "scripts": [
+              "node_modules/marked/marked.min.js"
+            ],
+            "browser": "src/main.ts"
           },
           "configurations": {
             "production": {
@@ -55,12 +61,11 @@
                   "with": "src/environments/environment.prod.ts"
                 }
               ],
-              "outputHashing": "all"
+              "outputHashing": "all",
+              "sourceMap": true
             },
             "development": {
-              "buildOptimizer": false,
               "optimization": false,
-              "vendorChunk": true,
               "extractLicenses": false,
               "sourceMap": true,
               "namedChunks": true
@@ -75,10 +80,10 @@
           },
           "configurations": {
             "production": {
-              "browserTarget": "pdb-js:build:production"
+              "buildTarget": "pdb-js:build:production"
             },
             "development": {
-              "browserTarget": "pdb-js:build:development"
+              "buildTarget": "pdb-js:build:development"
             }
           },
           "defaultConfiguration": "development"
@@ -86,7 +91,7 @@
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "pdb-js:build"
+            "buildTarget": "pdb-js:build"
           }
         },
         "test": {
@@ -109,5 +114,8 @@
         }
       }
     }
+  },
+  "cli": {
+    "analytics": false
   }
 }

pdb-js/build.gradle

@@ -2,7 +2,8 @@ import java.nio.file.Files
 import java.nio.file.Paths
 
 plugins {
-	id("com.github.node-gradle.node") version "3.5.1"
+	id("com.github.node-gradle.node") version "7.0.0"
+	id("java-library") // not sure why this is needed - is already set in /build.gradle - but without it the project sometimes (not always) is not configured as a java project
 }
 
 

pdb-js/package.json

@@ -9,38 +9,44 @@
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e",
-    "releasebuild": "ng build --configuration production"
+    "releasebuild": "ng build --configuration production",
+    "explore": "source-map-explorer build/generated/resources/**/*.js"
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^15.0.2",
+    "@angular/animations": "^18.2.6",
-    "@angular/cdk": "^15.0.1",
+    "@angular/cdk": "^18.2.6",
-    "@angular/common": "^15.0.2",
+    "@angular/common": "^18.2.6",
-    "@angular/compiler": "^15.0.2",
+    "@angular/compiler": "^18.2.6",
-    "@angular/core": "^15.0.2",
+    "@angular/core": "^18.2.6",
-    "@angular/forms": "^15.0.2",
+    "@angular/forms": "^18.2.6",
-    "@angular/material": "^15.0.1",
+    "@angular/material": "^18.2.6",
-    "@angular/platform-browser": "^15.0.2",
+    "@angular/platform-browser": "^18.2.6",
-    "@angular/platform-browser-dynamic": "^15.0.2",
+    "@angular/platform-browser-dynamic": "^18.2.6",
-    "@angular/router": "^15.0.2",
+    "@angular/router": "^18.2.6",
-    "moment": "^2.29.1",
+    "luxon": "^3.4.3",
+    "marked": "^12",
+    "ngx-markdown": "18.0.0",
     "rxjs": "~7.5.0",
     "rxjs-compat": "^6.6.7",
     "tslib": "^2.3.0",
-    "zone.js": "~0.11.4"
+    "zone.js": "^0.14.10"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^15.0.2",
+    "@angular-devkit/build-angular": "^18.2.6",
-    "@angular/cli": "^15.0.2",
+    "@angular/cli": "^18.2.6",
-    "@angular/compiler-cli": "^15.0.2",
+    "@angular/compiler-cli": "^18.2.6",
-    "@types/jasmine": "~3.10.0",
+    "@types/jasmine": "~4.3.0",
+    "@types/luxon": "^3.3.2",
+    "@types/marked": "^4.0.8",
     "@types/node": "^12.11.1",
-    "jasmine-core": "~3.10.0",
+    "jasmine-core": "~4.6.0",
-    "karma": "~6.3.0",
+    "karma": "~6.4.0",
-    "karma-chrome-launcher": "~3.1.0",
+    "karma-chrome-launcher": "~3.2.0",
-    "karma-coverage": "~2.1.0",
+    "karma-coverage": "~2.2.0",
-    "karma-jasmine": "~4.0.0",
+    "karma-jasmine": "~5.1.0",
-    "karma-jasmine-html-reporter": "~1.7.0",
+    "karma-jasmine-html-reporter": "~2.1.0",
-    "typescript": "4.8"
+    "source-map-explorer": "^2.5.3",
+    "typescript": "^5.4.5"
   }
 }

pdb-js/src/app/app-routing.module.ts

@@ -1,31 +1,25 @@
-import { NgModule } from '@angular/core';
+import { NgModule } from "@angular/core";
-import { Routes, RouterModule } from '@angular/router';
+import { RouterModule, Routes } from "@angular/router";
-import { VisualizationPageComponent } from './visualization-page/visualization-page.component';
+import { VisualizationPageComponent } from "./visualization-page/visualization-page.component";
-import { MainPageComponent } from './main-page/main-page.component';
+import { DashboardPageComponent } from "./dashboard-page/dashboard-page.component";
-import { UploadPageComponent } from './upload-page/upload-page.component';
+import { DashboardComponent } from "./dashboard-page/dashboard/dashboard.component";
-import { HelpPageComponent } from './help-page/help-page.component';
-import { DashboardPageComponent } from './dashboard-page/dashboard-page.component';
-import { DashboardComponent } from './dashboard-page/dashboard/dashboard.component';
-import { CustomizableGridComponent } from './customizable-grid/customizable-grid.component';
-
 
 const routes: Routes = [
-  { path: '', component: MainPageComponent},
+  { path: "", loadComponent: () => import("./main-page/main-page.component").then(m => m.MainPageComponent) },
-  { path: 'vis', component: VisualizationPageComponent },
+  { path: "vis", component: VisualizationPageComponent },
-  { path: 'dashboard', component: DashboardPageComponent},
+  { path: "dashboard", component: DashboardPageComponent },
-  { path: 'dashboard/:id', component: DashboardComponent},
+  { path: "dashboard/:id", component: DashboardComponent },
-  { path: 'upload', component: UploadPageComponent },
+  { path: "upload", loadComponent: () =>  import("./upload-page/upload-page.component").then(m => m.UploadPageComponent) },
-  { path: 'grid', component: CustomizableGridComponent },
+  { path: "grid", loadComponent: () =>  import("./customizable-grid/customizable-grid.component").then(m => m.CustomizableGridComponent) },
-  { path: 'help', component: HelpPageComponent },
+  { path: "help", loadComponent: () =>  import("./help-page/help-page.component").then(m => m.HelpPageComponent)  },
   // { path: '**', component: PageNotFoundComponent }
 ];
 
 @NgModule({
   imports: [
-    RouterModule.forRoot(routes, {})
+    RouterModule.forRoot(routes, {}),
   ],
-  //declarations: [VisualizationPageComponent],
   declarations: [],
-  exports: [RouterModule]
+  exports: [RouterModule],
 })
 export class AppRoutingModule {}

pdb-js/src/app/app.module.ts

@@ -1,105 +1,115 @@
-import { BrowserModule } from '@angular/platform-browser';
+import { BrowserModule } from "@angular/platform-browser";
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
-import { NgModule, enableProdMode } from '@angular/core';
+import { enableProdMode, NgModule } from "@angular/core";
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from "@angular/common/http";
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 
-import { AppRoutingModule } from './app-routing.module';
+import { AppRoutingModule } from "./app-routing.module";
-import { AppComponent } from './app.component';
+import { AppComponent } from "./app.component";
-import { MainPageComponent } from './main-page/main-page.component';
+import { VisualizationPageComponent } from "./visualization-page/visualization-page.component";
-import { HelpPageComponent } from './help-page/help-page.component';
-import { UploadPageComponent } from './upload-page/upload-page.component';
-import { VisualizationPageComponent } from './visualization-page/visualization-page.component';
 
-import {MatAutocompleteModule} from '@angular/material/autocomplete';
+import { DatePickerComponent } from "./components/datepicker/date-picker.component";
-import {MatButtonModule} from '@angular/material/button';
-import {MatCheckboxModule} from '@angular/material/checkbox';
-import {MatSelectModule} from '@angular/material/select';
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatInputModule } from '@angular/material/input';
-import {MatProgressBarModule} from '@angular/material/progress-bar';
-import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
-import {MatRadioModule} from '@angular/material/radio';
-import {MatSnackBarModule} from '@angular/material/snack-bar';
-import {MatTooltipModule} from '@angular/material/tooltip';
-import { YAxisDefinitionComponent } from './y-axis-definition/y-axis-definition.component';
-import { QueryAutocompleteComponent } from './query-autocomplete/query-autocomplete.component';
-import { LimitByComponent } from './limit-by/limit-by.component';
-import { PlotDetailsComponent } from './plot-details/plot-details.component';
-import { PlotViewComponent } from './plot-view/plot-view.component';
-import { GalleryViewComponent, GalleryItemView, GalleryFilterView } from './gallery-view/gallery-view.component';
-import { ImageToggleComponent } from './image-toggle/image-toggle.component';
-import { DashboardPageComponent } from './dashboard-page/dashboard-page.component';
-import { NewDashboardComponent } from './dashboard-page/new-dashboard/new-dashboard.component';
-import { MatDialogModule, MAT_DIALOG_DEFAULT_OPTIONS } from '@angular/material/dialog';
-import {MatTableModule} from '@angular/material/table';
-import {MatBadgeModule} from '@angular/material/badge';
-import { DashboardComponent } from './dashboard-page/dashboard/dashboard.component';
-import { AddTextDialogComponent } from './dashboard-page/dashboard/add-text-dialog/add-text-dialog.component';
-import { TextWidgetComponent } from './dashboard-page/dashboard/text-widget/text-widget.component';
-import { AddPlotDialogComponent } from './dashboard-page/dashboard/add-plot-dialog/add-plot-dialog.component';
-import { PlotWidgetComponent } from './dashboard-page/dashboard/plot-widget/plot-widget.component';
-import { FullScreenPlotDialogComponent } from './dashboard-page/dashboard/full-screen-plot-dialog/full-screen-plot-dialog.component';
-import { CustomizableGridComponent } from './customizable-grid/customizable-grid.component';
 
-import {DragDropModule} from '@angular/cdk/drag-drop';
+import { MatAutocompleteModule } from "@angular/material/autocomplete";
-import { ConfirmationDialogComponent } from './confirmation-dialog/confirmation-dialog.component';
+import { MatButtonModule } from "@angular/material/button";
-import { FocusDirective } from './focus.directive';
+import { MatCheckboxModule } from "@angular/material/checkbox";
+import { MatSelectModule } from "@angular/material/select";
+import { MatFormFieldModule } from "@angular/material/form-field";
+import { MatInputModule } from "@angular/material/input";
+import { MatProgressBarModule } from "@angular/material/progress-bar";
+import { MatProgressSpinnerModule } from "@angular/material/progress-spinner";
+import { MatRadioModule } from "@angular/material/radio";
+import { MatSnackBarModule } from "@angular/material/snack-bar";
+import { MatTooltipModule } from "@angular/material/tooltip";
+import { OverlayModule } from "@angular/cdk/overlay";
+import { YAxisDefinitionComponent } from "./y-axis-definition/y-axis-definition.component";
+import { QueryAutocompleteComponent } from "./query-autocomplete/query-autocomplete.component";
+import { PlotDetailsComponent } from "./plot-details/plot-details.component";
+import { PlotViewComponent } from "./plot-view/plot-view.component";
+import {
+  GalleryFilterView,
+  GalleryItemView,
+  GalleryViewComponent,
+} from "./gallery-view/gallery-view.component";
+import { ImageToggleComponent } from "./image-toggle/image-toggle.component";
+import { DashboardPageComponent } from "./dashboard-page/dashboard-page.component";
+import {
+  MAT_DIALOG_DEFAULT_OPTIONS,
+  MatDialogModule,
+} from "@angular/material/dialog";
+import { MatTabsModule } from "@angular/material/tabs";
+import { MatTableModule } from "@angular/material/table";
+import { MatGridListModule } from "@angular/material/grid-list";
+import { MatCardModule } from "@angular/material/card";
+import { MatBadgeModule } from "@angular/material/badge";
+import { DashboardComponent } from "./dashboard-page/dashboard/dashboard.component";
+import { TextWidgetComponent } from "./dashboard-page/dashboard/text-widget/text-widget.component";
+import { AddPlotDialogComponent } from "./dashboard-page/dashboard/add-plot-dialog/add-plot-dialog.component";
+import { PlotWidgetComponent } from "./dashboard-page/dashboard/plot-widget/plot-widget.component";
+import { FullScreenPlotDialogComponent } from "./dashboard-page/dashboard/full-screen-plot-dialog/full-screen-plot-dialog.component";
 
-@NgModule({
+import { DragDropModule } from "@angular/cdk/drag-drop";
-  declarations: [
+import { ConfirmationDialogComponent } from "./confirmation-dialog/confirmation-dialog.component";
+import { FocusDirective } from "./focus.directive";
+import { MarkdownModule } from "ngx-markdown";
+import { MainPageComponent } from "./main-page/main-page.component";
+import { LimitByComponent } from "./limit-by/limit-by.component";
+
+@NgModule({ declarations: [
         AppComponent,
-    MainPageComponent,
-    HelpPageComponent,
-    UploadPageComponent,
         VisualizationPageComponent,
-    YAxisDefinitionComponent,
         QueryAutocompleteComponent,
-    LimitByComponent,
         PlotDetailsComponent,
         PlotViewComponent,
         GalleryViewComponent,
         GalleryItemView,
         GalleryFilterView,
-    ImageToggleComponent,
         DashboardPageComponent,
-    NewDashboardComponent,
         DashboardComponent,
-    AddTextDialogComponent,
         TextWidgetComponent,
         AddPlotDialogComponent,
         PlotWidgetComponent,
         FullScreenPlotDialogComponent,
-    CustomizableGridComponent,
         ConfirmationDialogComponent,
-    FocusDirective
+        FocusDirective,
     ],
+    bootstrap: [AppComponent], 
     imports: [
+        MarkdownModule.forRoot(),
         BrowserModule,
         AppRoutingModule,
         FormsModule,
         ReactiveFormsModule,
+        DatePickerComponent,
         DragDropModule,
+        ImageToggleComponent,
+        LimitByComponent,
+        MainPageComponent,
         MatAutocompleteModule,
         MatBadgeModule,
         MatButtonModule,
+        MatCardModule,
         MatCheckboxModule,
         MatDialogModule,
         MatFormFieldModule,
+        MatGridListModule,
         MatInputModule,
         MatRadioModule,
         MatProgressBarModule,
         MatProgressSpinnerModule,
         MatSelectModule,
         MatSnackBarModule,
+        MatTabsModule,
         MatTableModule,
         MatTooltipModule,
         BrowserAnimationsModule,
-    HttpClientModule
+        OverlayModule,
+        YAxisDefinitionComponent
       ], 
-  providers: [{provide: MAT_DIALOG_DEFAULT_OPTIONS, useValue: {hasBackdrop: true}}],
+      providers: [{
-  bootstrap: [AppComponent]
+            provide: MAT_DIALOG_DEFAULT_OPTIONS,
-})
+            useValue: { hasBackdrop: true },
+        }, provideHttpClient(withInterceptorsFromDi())] })
 export class AppModule {}
 
-enableProdMode()
+enableProdMode();

pdb-js/src/app/components/datepicker/date-picker.component.html

@@ -0,0 +1,188 @@
+<style>
+  .date-picker-overlay {
+    width: 500px;
+    transition: box-shadow 200ms cubic-bezier(0, 0, 0.2, 1);
+    box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2),
+      0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
+    background-color: white;
+  }
+
+  .tab-quick {
+    display: flex;
+    flex-direction: row;
+    gap: 2em;
+  }
+  .tab-quick-column {
+    display: flex;
+    flex-direction: column;
+  }
+
+  .date-picker-form-field {
+    width: 23.5em;
+  }
+</style>
+
+<button
+  mat-button
+  matTooltip="Date Picker"
+  (click)="isOpen = !isOpen"
+  cdkOverlayOrigin
+  #trigger="cdkOverlayOrigin"
+  [attr.disabled]="isDisabled ? 'disabled' : null"
+>
+  {{ datePickerControl.value?.display }}
+</button>
+
+<ng-template
+  cdkConnectedOverlay
+  [cdkConnectedOverlayOrigin]="trigger"
+  [cdkConnectedOverlayOpen]="isOpen"
+>
+  <div class="date-picker-overlay">
+    <mat-tab-group
+      animationDuration="0ms"
+      (selectedTabChange)="tabChange()"
+      [(selectedIndex)]="selectedTabIndex"
+    >
+      <mat-tab label="Quick">
+        <div class="tab-quick">
+          <div class="tab-quick-column">
+            <button mat-button (click)="applyQuick('BD/E1D', 'today')">
+              Today
+            </button>
+            <button mat-button (click)="applyQuick('B-1D/E-1D', 'yesterday')">
+              Yesterday
+            </button>
+            <button mat-button (click)="applyQuick('BW/EW', 'this week')">
+              This Week
+            </button>
+            <button mat-button (click)="applyQuick('BM/EM', 'this month')">
+              This Month
+            </button>
+            <button mat-button (click)="applyQuick('BY/EY', 'this year')">
+              This Year
+            </button>
+          </div>
+          <div class="tab-quick-column">
+            <button mat-button (click)="applyQuick('B-7D/ED', 'last 7 days')">
+              Last 7 Days
+            </button>
+            <button mat-button (click)="applyQuick('B-1W/ED', 'last week')">
+              Last Week
+            </button>
+            <button mat-button (click)="applyQuick('B-30D/ED', 'last 30 days')">
+              Last 30 Days
+            </button>
+            <button mat-button (click)="applyQuick('B-1M/E-1M', 'last month')">
+              Last Month
+            </button>
+            <button
+              mat-button
+              (click)="applyQuick('B-3M/E-1M', 'last 3 months')"
+            >
+              Last 3 Months
+            </button>
+            <button mat-button (click)="applyQuick('B-1Y/E-1Y', 'last year')">
+              Last Year
+            </button>
+          </div>
+        </div>
+      </mat-tab>
+
+      <mat-tab label="Relative">
+        <mat-form-field
+          class="pdb-form-number-small"
+          (wheel)="scrollRelativeTimeRange($event, 'seconds', 59)"
+        >
+          <mat-label>Seconds:</mat-label>
+          <input
+            matInput
+            name="relative-time-range-seconds"
+            [(ngModel)]="relativeTimeRange.seconds"
+            type="number"
+            min="0"
+            max="59"
+          />
+        </mat-form-field>
+        <mat-form-field
+          class="pdb-form-number-small"
+          (wheel)="scrollRelativeTimeRange($event, 'minutes', 59)"
+        >
+          <mat-label>Minutes:</mat-label>
+          <input
+            matInput
+            name="relative-time-range-minutes"
+            [(ngModel)]="relativeTimeRange.minutes"
+            type="number"
+            min="0"
+            max="59"
+          />
+        </mat-form-field>
+        <mat-form-field
+          class="pdb-form-number-small"
+          (wheel)="scrollRelativeTimeRange($event, 'hours', 23)"
+        >
+          <mat-label>Hours:</mat-label>
+          <input
+            matInput
+            name="relative-time-range-hours"
+            [(ngModel)]="relativeTimeRange.hours"
+            type="number"
+            min="0"
+            max="23"
+          />
+        </mat-form-field>
+        <mat-form-field
+          class="pdb-form-number-small"
+          (wheel)="scrollRelativeTimeRange($event, 'days', 367)"
+        >
+          <mat-label>Days:</mat-label>
+          <input
+            matInput
+            name="relative-time-range-days"
+            [(ngModel)]="relativeTimeRange.days"
+            type="number"
+            min="0"
+            max="367"
+          />
+        </mat-form-field>
+        <mat-form-field
+          class="pdb-form-number-small"
+          (wheel)="scrollRelativeTimeRange($event, 'months', 11)"
+        >
+          <mat-label>Months:</mat-label>
+          <input
+            matInput
+            name="relative-time-range-months"
+            [(ngModel)]="relativeTimeRange.months"
+            type="number"
+            min="0"
+            max="11"
+          />
+        </mat-form-field>
+        <mat-form-field
+          class="pdb-form-number-small"
+          (wheel)="scrollRelativeTimeRange($event, 'years', 10)"
+        >
+          <mat-label>Years:</mat-label>
+          <input
+            matInput
+            name="relative-time-range-years"
+            [(ngModel)]="relativeTimeRange.years"
+            type="number"
+            min="0"
+            max="10"
+          />
+        </mat-form-field>
+        <button mat-button (click)="applyRelativeTimeRange()">Apply</button>
+      </mat-tab>
+      <mat-tab label="Absolute">
+        <mat-form-field class="date-picker-form-field">
+          <mat-label>Date Range:</mat-label>
+          <input matInput [formControl]="dateRange" name="dates" />
+        </mat-form-field>
+        <button mat-button (click)="applyAbsoluteTime()">Apply</button>
+      </mat-tab>
+    </mat-tab-group>
+  </div>
+</ng-template>

pdb-js/src/app/components/datepicker/date-picker.component.ts

@@ -0,0 +1,208 @@
+import { OverlayModule } from "@angular/cdk/overlay";
+import {
+  Component,
+  EventEmitter,
+  forwardRef,
+  Input,
+  Output,
+} from "@angular/core";
+import {
+  ControlValueAccessor,
+  FormControl,
+  FormsModule,
+  NG_VALUE_ACCESSOR,
+  ReactiveFormsModule,
+  Validators,
+} from "@angular/forms";
+import { MatButtonModule } from "@angular/material/button";
+import { MAT_DIALOG_DEFAULT_OPTIONS } from "@angular/material/dialog";
+import { MatFormFieldModule } from "@angular/material/form-field";
+import { MatInputModule } from "@angular/material/input";
+import { MatTabsModule } from "@angular/material/tabs";
+import { BrowserModule } from "@angular/platform-browser";
+import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
+
+export type DateType = "QUICK" | "RELATIVE" | "ABSOLUTE";
+
+export class DateValue {
+  constructor(
+    public type: DateType,
+    public value: string,
+    public display: string,
+  ) {}
+}
+
+export class DatePickerChange {
+  constructor(public value: DateValue) {}
+}
+
+@Component({
+  selector: "app-date-picker",
+  templateUrl: "./date-picker.component.html",
+  standalone: true,
+  imports: [
+    BrowserModule,
+    MatButtonModule,
+    MatFormFieldModule,
+    MatInputModule,
+    MatTabsModule,
+    FormsModule,
+    ReactiveFormsModule,
+    OverlayModule
+  ],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => DatePickerComponent),
+      multi: true,
+    },
+    {
+      provide: MAT_DIALOG_DEFAULT_OPTIONS,
+      useValue: { hasBackdrop: true },
+  }
+  ],
+})
+export class DatePickerComponent implements ControlValueAccessor {
+  isOpen = false;
+
+  relativeTimeRangeUnit = "relativeTimeRangeMinutes";
+
+  relativeTimeRangeAmount = 15;
+
+  relativeTimeRange = {
+    seconds: 0,
+    minutes: 15,
+    hours: 0,
+    days: 0,
+    months: 0,
+    years: 0,
+  };
+
+  dateRange = new FormControl<string>(
+    "2019-10-05 00:00:00 - 2019-10-11 23:59:59",
+    [
+      Validators.pattern(
+        /^\d{4}-\d{2}-\d{2} ([01][0-9]|2[0-3]):\d{2}:\d{2} - \d{4}-\d{2}-\d{2} ([01][0-9]|2[0-3]):\d{2}:\d{2}$/,
+      ),
+    ],
+  );
+
+  datePickerControl = new FormControl(
+    new DateValue("QUICK", "BM/EM", "this month"),
+  );
+
+  @Input()
+  isDisabled: boolean = false;
+
+  @Output()
+  readonly dateValueSelected: EventEmitter<DatePickerChange> = new EventEmitter<
+    DatePickerChange
+  >();
+
+  selectedTabIndex = 0;
+
+  _onChange = (_: any) => {};
+
+  _onTouched = (_: any) => {};
+
+  constructor() {}
+
+  getDateValue(): DateValue {
+    return this.datePickerControl.value!;
+  }
+
+  writeValue(obj: DateValue): void {
+    this.datePickerControl.setValue(obj);
+    switch (obj.type) {
+      case "QUICK":
+        break;
+      case "ABSOLUTE":
+        this.dateRange.setValue(obj.value);
+        break;
+      case "RELATIVE":
+        const x = this.relativeTimeRange;
+        // obj.value looks like "P1Y2M3DT4H5M6S" or "PT4H5M6S" or "P1Y2M3D" or "P1YT6S" or ...
+        const matches = obj.value.match(
+          /P(?:(\d+)Y)(?:(\d+)M)(?:(\d+)D)?(?:T(?:(\d+)H)(?:(\d+)M)(?:(\d+)S))?/,
+        ) ?? [];
+
+        x.years = Number.parseInt(matches[1] ?? 0);
+        x.months = Number.parseInt(matches[2] ?? 0);
+        x.days = Number.parseInt(matches[3] ?? 0);
+        x.hours = Number.parseInt(matches[4] ?? 0);
+        x.minutes = Number.parseInt(matches[5] ?? 0);
+        x.seconds = Number.parseInt(matches[6] ?? 0);
+        break;
+      default:
+    }
+  }
+  registerOnChange(fn: any): void {
+    this._onChange = fn;
+  }
+  registerOnTouched(fn: any): void {
+    this._onTouched = fn;
+  }
+  setDisabledState?(isDisabled: boolean): void {
+    this.isDisabled = isDisabled;
+  }
+
+  dateDisplay(): string {
+    return this.datePickerControl.value?.display || "no date set";
+  }
+
+  tabChange() {
+    //(<any> window).initSimpleDatePicker(); // breaks form control
+  }
+
+  setDateValue(dateValue: DateValue) {
+    this.datePickerControl.setValue(dateValue);
+    this._onChange(dateValue);
+    this.dateValueSelected.emit(new DatePickerChange(dateValue));
+    //console.log("date value updated: ", dateValue);
+  }
+
+  applyQuick(value: string, display: string) {
+    const newValue = new DateValue("QUICK", value, display);
+    this.setDateValue(newValue);
+    this.isOpen = false;
+  }
+
+  private fixToRange(val: number, min: number, max: number) {
+    return val < min ? min : (val > max ? max : val);
+  }
+
+  applyRelativeTimeRange() {
+
+    const x = this.relativeTimeRange;
+    const years = x.years ? "-"+x.years + "Y" : "";
+    const months = x.months ? "-"+x.months + "M" : "";
+    const days = x.days ? "-"+x.days + "D" : "";
+    const hours = x.hours ? "-"+x.hours + "H" : "";
+    const minutes = x.minutes ? "-"+x.minutes + "m" : "";
+    
+    const timeRange = `B${years}${months}${days}${hours}${minutes}/Bm`; 
+
+    const newValue = new DateValue("RELATIVE", timeRange, timeRange);
+    this.setDateValue(newValue);
+    this.isOpen = false;
+  }
+
+  applyAbsoluteTime() {
+    const value = <string> this.dateRange.value;
+    const newValue = new DateValue("ABSOLUTE", value, value);
+    this.setDateValue(newValue);
+    this.isOpen = false;
+  }
+
+  scrollRelativeTimeRange(
+    event: WheelEvent,
+    unit: "seconds" | "minutes" | "hours" | "days" | "months" | "years",
+    max: number,
+  ) {
+    this.relativeTimeRange[unit] = this.fixToRange(
+      this.relativeTimeRange[unit] + (event.deltaY > 0 ? -1 : 1),
+      0,
+      max,
+    );
+  }
+}

pdb-js/src/app/customizable-grid/customizable-grid.component.html

@@ -1,121 +1,113 @@
 <style>
-  .customizable-grid {
+  .example-list {
-    width: 100%;
+  list-style-type: none;
-    display: flex;
+  padding: 0;
-    flex-wrap: wrap;
-  }
-  .draggable {
-    flex-shrink: 0;
-    padding: 0.5rem;
-    border: solid 1px;
-    border-collapse: collapse;
 }
 
-  .draggable-small {
+.example-list li {
-    width: 300px;
+  display: table-cell;
-    height: 300px;
+  padding: 4px;
-    
-    background-color: rgb(158, 240, 189);
-  }
-
-  .draggable-middle {
-    width: 600px;
-    height: 300px;
-    background-color: darksalmon;
 }
 
 .example-container {
-  width: 400px;
+  display: flex;
-  max-width: 100%;
+  flex-wrap: wrap;
-  margin: 0 25px 25px 0;
+  min-width: 600px;
-  display: inline-block;
+  max-width: 1200px;
-  vertical-align: top;
-}
-
-.example-list {
-  border: solid 1px #ccc;
-  min-height: 60px;
-  background: white;
-  border-radius: 4px;
-  overflow: hidden;
-  display: block;
 }
 
 .example-box {
-  padding: 20px 10px;
+  width: var(--box-width);
-  border-bottom: solid 1px #ccc;
+  height: var(--box-height);
+  border: solid 1px #ccc;
+  font-size: 30pt;
+  font-weight: bold;
   color: rgba(0, 0, 0, 0.87);
+  cursor: grab;
   display: flex;
-  flex-direction: row;
+  justify-content: center;
   align-items: center;
-  justify-content: space-between;
+  text-align: center;
-  box-sizing: border-box;
+  background: #fff;
-  cursor: move;
+  border-radius: 4px;
-  background: white;
+  position: relative;
-  font-size: 14px;
+  z-index: 1;
+  transition: box-shadow 200ms cubic-bezier(0, 0, 0.2, 1);
+  box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14),
+    0 1px 5px 0 rgba(0, 0, 0, 0.12);
+}
+
+.example-box--wide {
+  width: 400px;
+  height: var(--box-height);
+}
+
+.example-box:active {
+  box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2),
+    0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12);
+  opacity: 0.6;
+}
+
+.cdk-drop-list {
+  display: flex;
+  padding-right: 10px;
+  padding-bottom: 10px;
 }
 
 .cdk-drag-preview {
   box-sizing: border-box;
+  border-color: red;
   border-radius: 4px;
   box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2),
-              0 8px 10px 1px rgba(0, 0, 0, 0.14),
+    0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12);
-              0 3px 14px 2px rgba(0, 0, 0, 0.12);
 }
 
 .cdk-drag-placeholder {
-  opacity: 0;
+  opacity: 0.3;
+  border-color: green;
 }
 
 .cdk-drag-animating {
   transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
 }
 
-.example-box:last-child {
+.cdk-drop-list-dragging {
-  border: none;
+  cursor: grabbing !important;
 }
 
-.example-list.cdk-drop-list-dragging .example-box:not(.cdk-drag-placeholder) {
+button {
-  transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
+  margin-right: 4px;
 }
 
-
 </style>
-<!--
+<h1>Drag&Drop with a flex-wrap</h1>
-<div class="customizable-grid">
-  <div class="draggable draggable-small"></div>
-  <div class="draggable draggable-middle"></div>
-  <div class="draggable draggable-small"></div>
-  <div class="draggable draggable-middle"></div>
-</div>
--->
 
-<div class="example-container">
+<button (click)="add()">Add</button>
-  <h2>To do</h2>
+<button (click)="shuffle()">Shuffle</button>
+
+<br />
+
+<ul class="example-list">
+  <li *ngFor="let item of items">{{ item }}</li>
+</ul>
 
 <div
-    cdkDropList
+  class="example-container"
-    #todoList="cdkDropList"
+  cdkDropListGroup
-    [cdkDropListData]="todo"
+  [ngStyle]="{ '--box-width': boxWidth, '--box-height': boxHeight }"
-    [cdkDropListConnectedTo]="[doneList]"
+>
-    class="example-list"
-    (cdkDropListDropped)="drop($event)">
-    <div class="example-box" *ngFor="let item of todo" cdkDrag>{{item}}</div>
-  </div>
-</div>
-
-<div class="example-container">
-  <h2>Done</h2>
-
   <div
     cdkDropList
-    #doneList="cdkDropList"
+    style="outline: dashed 2px black;"
-    [cdkDropListData]="done"
+    (cdkDropListEntered)="onDropListEntered($event)"
-    [cdkDropListConnectedTo]="[todoList]"
+    (cdkDropListDropped)="onDropListDropped()"
-    class="example-list"
+  ></div>
-    (cdkDropListDropped)="drop($event)">
+  <div
-    <div class="example-box" *ngFor="let item of done" cdkDrag>{{item}}</div>
+    cdkDropList
+    (cdkDropListEntered)="onDropListEntered($event)"
+    (cdkDropListDropped)="onDropListDropped()"
+    *ngFor="let item of items"
+  >
+    <div cdkDrag class="example-box" [ngClass]="{'example-box--wide': item%14==0}">{{ item }}</div>
   </div>
 </div>
-
-

pdb-js/src/app/customizable-grid/customizable-grid.component.ts

@@ -1,24 +1,126 @@
 import { Component } from '@angular/core';
-import {CdkDragDrop, moveItemInArray, transferArrayItem} from '@angular/cdk/drag-drop';
+import { CdkDragEnter, CdkDropList, moveItemInArray, DragRef, DragDropModule} from '@angular/cdk/drag-drop';
+import { AfterViewInit } from '@angular/core';
+import { ViewChild } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+
 
 @Component({
   selector: 'app-customizable-grid',
-  templateUrl: './customizable-grid.component.html'
+  templateUrl: './customizable-grid.component.html',
+  standalone: true,
+  imports: [
+    BrowserModule,
+    DragDropModule
+  ]
 })
-export class CustomizableGridComponent {
+export class CustomizableGridComponent implements AfterViewInit {
-  todo = ['Get to work', 'Pick up groceries', 'Go home', 'Fall asleep'];
+  @ViewChild(CdkDropList) placeholder!: CdkDropList;
-  done = ['Get up', 'Brush teeth', 'Take a shower', 'Check e-mail', 'Walk dog'];
 
-  drop(event: CdkDragDrop<string[]>) {
+  private target: CdkDropList|null = null;
-    if (event.previousContainer === event.container) {
+  private targetIndex: number = 0;
-      moveItemInArray(event.container.data, event.previousIndex, event.currentIndex);
+  private source: CdkDropList|null = null;
-    } else {
+  private sourceIndex: number = 0;
-      transferArrayItem(
+  private dragRef: DragRef|null = null;
-        event.previousContainer.data,
+
-        event.container.data,
+  items: Array<number> = [1, 2, 3, 4, 5, 6, 7, 8, 9];
-        event.previousIndex,
+
-        event.currentIndex,
+  boxWidth = '200px';
+  boxHeight = '200px';
+
+  ngAfterViewInit() {
+    const placeholderElement = this.placeholder.element.nativeElement;
+
+    placeholderElement.style.display = 'none';
+    placeholderElement.parentNode!.removeChild(placeholderElement);
+  }
+
+  add() {
+    this.items.push(this.items.length + 1);
+  }
+
+  shuffle() {
+    this.items.sort(function () {
+      return 0.5 - Math.random();
+    });
+  }
+
+  onDropListDropped() {
+    if (!this.target) {
+      return;
+    }
+
+    const placeholderElement: HTMLElement =
+      this.placeholder.element.nativeElement;
+    const placeholderParentElement: HTMLElement =
+      placeholderElement.parentElement!;
+
+    placeholderElement.style.display = 'none';
+
+    placeholderParentElement.removeChild(placeholderElement);
+    placeholderParentElement.appendChild(placeholderElement);
+    placeholderParentElement.insertBefore(
+      this.source!.element.nativeElement,
+      placeholderParentElement.children[this.sourceIndex]
+    );
+
+    if (this.placeholder._dropListRef.isDragging() && this.dragRef != null) {
+      this.placeholder._dropListRef.exit(this.dragRef);
+    }
+
+    this.target = null;
+    this.source = null;
+    this.dragRef = null;
+
+    if (this.sourceIndex !== this.targetIndex) {
+      moveItemInArray(this.items, this.sourceIndex, this.targetIndex);
+    }
+  }
+
+  onDropListEntered({ item, container }: CdkDragEnter) {
+    if (container == this.placeholder) {
+      return;
+    }
+
+    const placeholderElement: HTMLElement =
+      this.placeholder.element.nativeElement;
+    const sourceElement: HTMLElement = item.dropContainer.element.nativeElement;
+    const dropElement: HTMLElement = container.element.nativeElement;
+    const dragIndex: number = Array.prototype.indexOf.call(
+      dropElement.parentElement!.children,
+      this.source ? placeholderElement : sourceElement
+    );
+    const dropIndex: number = Array.prototype.indexOf.call(
+      dropElement.parentElement!.children,
+      dropElement
+    );
+
+    if (!this.source) {
+      this.sourceIndex = dragIndex;
+      this.source = item.dropContainer;
+
+      placeholderElement.style.width = this.boxWidth + 'px';
+      placeholderElement.style.height = this.boxHeight + 40 + 'px';
+
+      sourceElement.parentElement!.removeChild(sourceElement);
+    }
+
+    this.targetIndex = dropIndex;
+    this.target = container;
+    this.dragRef = item._dragRef;
+
+    placeholderElement.style.display = '';
+    placeholderElement.style.backgroundColor ='pink';
+
+    dropElement.parentElement!.insertBefore(
+      placeholderElement,
+      dropIndex > dragIndex ? dropElement.nextSibling : dropElement
+    );
+
+    this.placeholder._dropListRef.enter(
+      item._dragRef,
+      item.element.nativeElement.offsetLeft,
+      item.element.nativeElement.offsetTop
     );
   }
 }
-}

pdb-js/src/app/dashboard-page/dashboard-page.component.html

@@ -1,14 +1,8 @@
 <style>
   :host {
-    /*
-    height: calc(100% - 29px);
-    */
-    width: 100%;
-    position: absolute;
     padding: 0.5em;
   }
 
-
   .center {
     position: absolute;
     top: 50%;
@@ -23,6 +17,9 @@
     font-weight: bold;
     color: #333;
   }
+  .no-break {
+    white-space: nowrap;
+  }
 </style>
 
 <div *ngIf="loading" class="center">
@@ -55,11 +52,14 @@
       <th mat-header-cell *matHeaderCellDef>Description</th>
       <td mat-cell *matCellDef="let element">{{element.description}}</td>
     </ng-container>
-    <!-- Delete Column -->
+    <!-- actions Column -->
-    <ng-container matColumnDef="delete">
+    <ng-container matColumnDef="actions">
-      <th mat-header-cell *matHeaderCellDef></th>
+      <th mat-header-cell *matHeaderCellDef>Actions</th>
-      <td mat-cell *matCellDef="let element">
+      <td mat-cell *matCellDef="let element" class="no-break">
-        <button mat-icon-button (click)="delete(element)">
+        <button mat-icon-button (click)="edit(element)" aria-label="edit dashboard" title="edit dashboard">
+          <img src="assets/img/edit-outline.svg" class="icon-small" title="delete" />
+        </button>
+        <button mat-icon-button (click)="delete(element)" aria-label="delete dashboard" title="delete dashboard">
           <img src="assets/img/recycle-bin-line.svg" class="icon-small" title="delete" />
         </button>
       </td>

pdb-js/src/app/dashboard-page/dashboard-page.component.ts

@@ -1,6 +1,7 @@
 import { HttpErrorResponse } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
+import { MatSnackBar } from '@angular/material/snack-bar';
 import { ConfirmationDialogComponent } from '../confirmation-dialog/confirmation-dialog.component';
 import { Dashboard, DashboardCreationData, DashboardList, DashboardService } from '../dashboard.service';
 import { NewDashboardComponent } from './new-dashboard/new-dashboard.component';
@@ -11,14 +12,15 @@ import { NewDashboardComponent } from './new-dashboard/new-dashboard.component';
 })
 export class DashboardPageComponent implements OnInit {
 
-  displayedColumns: string[] = [/*'icon',*/ 'name', 'description','delete'];
+  displayedColumns: string[] = [/*'icon',*/ 'name', 'description','actions'];
   dataSource: Dashboard[] = [];
   loading = true;
   error = "";
 
-  constructor(public dialog: MatDialog, private dashboardService: DashboardService){
+  constructor(
-
+    public dialog: MatDialog, 
-  }
+    private dashboardService: DashboardService,
+    private snackBar: MatSnackBar){}
 
   ngOnInit(): void {
       this.refreshTable();
@@ -45,38 +47,57 @@ export class DashboardPageComponent implements OnInit {
   createNewDashboard() {
     const dialogRef = this.dialog.open(NewDashboardComponent, {
       data: {name: "", description: ""},
-      hasBackdrop: true
+      width: '30em'
     });
 
     dialogRef.afterClosed().subscribe((result: DashboardCreationData) => {
-      console.log('The dialog was closed with result ', JSON.stringify(result));
+      this.dashboardService.createDashboard(result).subscribe(result => this.refreshTable());
-      this.dashboardService.createDashboard(result).subscribe(result => {
-        console.log(result);
-
-        this.refreshTable();
     });
+  }
+
+  edit(dashboard: Dashboard) {
+    const dialogRef = this.dialog.open(NewDashboardComponent, {
+      data: {name: dashboard.name, description: dashboard.description},
+      hasBackdrop: true
+    });
+
+    dialogRef.afterClosed().subscribe((result?: DashboardCreationData) => {
+
+      if (result) {
+        dashboard.name = result.name;
+        dashboard.description = result.description;
+        this.dashboardService.saveDashboard(dashboard).subscribe({
+          'error': () => {
+            this.snackBar.open("server made a boo boo", "", {
+              duration:5000
+            })
+          },
+          complete: () => {
+            this.refreshTable()
+          }
+        });
+      }
     });
   }
 
   delete(dashboard: Dashboard){
 
     const dialogRef = this.dialog.open(ConfirmationDialogComponent, {
-      data: {title: "", text: "Delete dashboard '"+dashboard.name+"'?", btnOkLabel: "Delete", btnCancelLabel: "Cancel"},
+      data: {title: "", text: "Delete dashboard '"+dashboard.name+"'?", btnOkLabel: "Delete", btnCancelLabel: "Cancel"}
-      hasBackdrop: true
     });
 
     dialogRef.afterClosed().subscribe((result: boolean) => {
       if (result === true) {
         this.dashboardService.deleteDashboard(dashboard.id).subscribe({
           'error': (error) => {
-    
+            this.snackBar.open("failed to delete dashboard","", {
+              duration: 5000,
+              verticalPosition: 'top'
+            });
           },
           'complete': () => this.refreshTable()
         });
       }
     });    
-
-
-    
   }
 }

pdb-js/src/app/dashboard-page/dashboard/add-plot-dialog/add-plot-dialog.component.html

@@ -14,9 +14,7 @@
     max-height: unset;
   }
 </style>
-<h1 mat-dialog-title>Add Plot</h1>
+<pdb-visualization-page mat-dialog-content #plot [defaultConfig]="data.config" [galleryEnabled]="false"></pdb-visualization-page>
-
-<pdb-visualization-page mat-dialog-content #plot></pdb-visualization-page>
 
 <div mat-dialog-actions align="end">
   <button mat-button mat-dialog-close >Cancel</button>

pdb-js/src/app/dashboard-page/dashboard/add-plot-dialog/add-plot-dialog.component.ts

@@ -1,17 +1,22 @@
-import { Component, ElementRef, ViewChild } from '@angular/core';
+import {  Component,  Inject, ViewChild } from '@angular/core';
-import { MatDialogRef } from '@angular/material/dialog';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { PlotConfig } from 'src/app/plot.service';
 import { VisualizationPageComponent } from 'src/app/visualization-page/visualization-page.component';
 
 @Component({
   selector: 'app-add-plot-dialog',
-  templateUrl: './add-plot-dialog.component.html',
+  templateUrl: './add-plot-dialog.component.html'
-  styleUrls: ['./add-plot-dialog.component.scss']
 })
 export class AddPlotDialogComponent {
 
   @ViewChild("plot") plotElement! :VisualizationPageComponent;
 
-  constructor(public dialogRef: MatDialogRef<string>){
+
+
+  constructor(
+    public dialogRef: MatDialogRef<PlotConfig | undefined>,
+    @Inject(MAT_DIALOG_DATA) public data: {config: PlotConfig, title: string}
+    ){
   }
 
   onSaveClick(): void {

pdb-js/src/app/dashboard-page/dashboard/add-text-dialog/add-text-dialog.component.html

@@ -1,14 +1,36 @@
 <style>
+
+  markdown {
+    --mdc-dialog-supporting-text-color: black;
+  }
+  .mat-mdc-dialog-content {
+    display: flex;
+    justify-content: center;
+    height: 22em;
+  }
+  .mat-mdc-dialog-content > div {
+    width:50%;
+  }
+  .preview {
+    margin-left: 0.5em;
+    overflow: auto;
+  }
   mat-form-field textarea {
-    height: 7em;
+    height: 20em;
   }
 </style>
 <h1 mat-dialog-title>Add Text</h1>
 <div mat-dialog-content>
+  <div>
     <mat-form-field class="pdb-form-full-width">
       <mat-label>Text</mat-label>
       <textarea matInput [(ngModel)]="text" #textElement focus ></textarea>
     </mat-form-field>
+    <div>Text field supports <a href="https://spec.commonmark.org/" class="external-link" target="_blank" rel="noopener">Markdown</a>.</div>
+  </div>
+  <div class="preview">
+    <markdown [data]="this.text"></markdown>
+  </div>
 </div>
 <div mat-dialog-actions align="end">
   <button mat-button mat-dialog-close (click)="close()">Cancel</button>

pdb-js/src/app/dashboard-page/dashboard/add-text-dialog/add-text-dialog.component.ts

@@ -1,9 +1,28 @@
 import { Component, ElementRef,  Inject,  ViewChild } from '@angular/core';
-import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatDialogRef, MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
+import { BrowserModule } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { MarkdownModule } from 'ngx-markdown';
 
 @Component({
   selector: 'app-add-text-dialog',
-  templateUrl: './add-text-dialog.component.html'
+  templateUrl: './add-text-dialog.component.html',
+  standalone: true,
+  imports: [
+    BrowserModule,
+    BrowserAnimationsModule,
+    FormsModule,
+    ReactiveFormsModule,
+    MarkdownModule,
+    MatButtonModule,
+    MatDialogModule,
+    MatFormFieldModule,
+    MatInputModule,
+  ]
 })
 export class AddTextDialogComponent  {
   text = "";
@@ -18,7 +37,6 @@ export class AddTextDialogComponent  {
     this.dialogRef.close(undefined);
   }
 
-
   onSaveClick(): void {
     this.dialogRef.close(this.text);
   }

pdb-js/src/app/dashboard-page/dashboard/dashboard.component.html

@@ -2,7 +2,16 @@
   :host {
     width: 100%;
     height: 100%;
-    
+  }
+  .toolbar {
+    display: flex;
+    flex-direction: row;
+  }
+  .toolbar #filter-date-range{
+    flex-grow: 1;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
   }
   .center {
     position: absolute;
@@ -22,23 +31,46 @@
   .content {
     padding: 0.5em;
   }
+  .dashboard-area {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-evenly;
+    align-items: stretch;
+  }
   .dashboard-column {
     display: flex;
     flex-direction: column;
+    
+    /* make all columns equal width - flex-basis:0 to make all resizing start from the same size*/
+    flex-grow: 1;
+    flex-shrink: 1;
+    flex-basis: 0;
+    
   }
-  .editable .editable-hovered {
+  .editable {
+    padding: 0.5em;
+  }
+
+  .editable-hovered {
     visibility: hidden;
   }
+
   .editable:hover .editable-hovered{
     visibility: visible;
   }
+
   .handle {
+    display: block;
     height: 1.5em;
+    visibility: hidden;
+    width: fit-content;
+  }
+  [cdkDrag] {
+    position: relative;
   }
   [cdkDrag]:hover .handle, .cdk-drop-list-dragging .handle {
-    background-color: #f3f3f3;
-    border-radius: 3px;
     cursor: grab;
+    visibility: visible;
   }
 </style>
 
@@ -53,32 +85,33 @@
   <div class="toolbar">
     <button mat-button  (click)="addText()">Add Text</button>
     <button mat-button (click)="addPlot()">Add Plot</button>
-    <button class="save-button" mat-button (click)="save()">Save</button>
+    <button class="save-button" mat-button (click)="save()" [disabled]="!isDirty()">Save</button>
+    <div id="filter-date-range">
+      Date range: <app-date-picker #datePicker (dateValueSelected)="updateDateRange($event)" ></app-date-picker>
+    </div>
   </div>
   <div class="editable">
     <h1>{{dashboard.name}}<button mat-icon-button (click)="editNameAndDescription()" class="editable-hovered"><img src="/assets/img/edit-outline.svg"/></button></h1>
     <p>{{dashboard.description}}</p>
   </div>
-
+  <div cdkDropListGroup class="dashboard-area">
-  <div cdkDropListGroup>
-    <!-- All lists in here will be connected. -->
     <div 
       cdkDropList
       class="dashboard-column"
-      *ngFor="let column of dashboard.arrangement"
+      *ngFor="let i of [0,1]"
-      [cdkDropListData]="column"
+      [cdkDropListData]="i"
       (cdkDropListDropped)="drop($event)">
       <div 
         cdkDrag 
-        *ngFor="let id of column" 
+        *ngFor="let id of dashboard.arrangement[i]" 
         [attr.widget-id]="id">
-        <div cdkDragHandle class="handle"></div>
+        <div cdkDragHandle class="handle"><img src="/assets/img/drag_handle.svg" class="icon-small"/></div>
         <app-text-widget 
           *ngIf="isTextWidget(id)"
-          [data]="getTextWidget(id)!"></app-text-widget>
+          [data]="getTextWidget(id)!" (deleted)="delete($event)"></app-text-widget>
         <app-plot-widget
           *ngIf="isPlotWidget(id)" 
-          [data]="getPlotWidget(id)!"></app-plot-widget>
+          [data]="getPlotWidget(id)!" (deleted)="delete($event)"></app-plot-widget>
       </div>
     </div>
   </div>

pdb-js/src/app/dashboard-page/dashboard/dashboard.component.ts

@@ -1,14 +1,15 @@
 import { CdkDragDrop, moveItemInArray, transferArrayItem } from '@angular/cdk/drag-drop';
 import { HttpErrorResponse } from '@angular/common/http';
-import { Component, ElementRef, OnInit } from '@angular/core';
+import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { ActivatedRoute } from '@angular/router';
-import { BaseWidget, Dashboard, DashboardCreationData, DashboardService, PlotSize, PlotWidget, PlotWidgetRenderData, TextWidget } from 'src/app/dashboard.service';
+import { Dashboard, DashboardCreationData, DashboardService, PlotWidget, PlotWidgetRenderData, TextWidget } from 'src/app/dashboard.service';
-import { PlotConfig, PlotRequest, PlotResponse, PlotService, RenderOptions } from 'src/app/plot.service';
+import { PlotConfig, PlotResponse, PlotService } from 'src/app/plot.service';
 import { NewDashboardComponent } from '../new-dashboard/new-dashboard.component';
 import { AddPlotDialogComponent } from './add-plot-dialog/add-plot-dialog.component';
 import { AddTextDialogComponent } from './add-text-dialog/add-text-dialog.component';
+import { DatePickerChange, DatePickerComponent } from 'src/app/components/datepicker/date-picker.component';
 
 @Component({
   selector: 'app-dashboard',
@@ -18,10 +19,15 @@ export class DashboardComponent implements OnInit {
 
   dashboard?: Dashboard = undefined;
 
+  pristineDashboardJSON?: string = undefined;
+
   error = "";
 
   plotWidgetRenderData: PlotWidgetRenderData[] = [];
 
+  @ViewChild("datePicker")
+  datePicker!: DatePickerComponent;
+
   constructor(
     private route: ActivatedRoute,  
     private service: DashboardService, 
@@ -34,10 +40,12 @@ export class DashboardComponent implements OnInit {
       this.service.getDashboard(<string>this.route.snapshot.paramMap.get("id")).subscribe({
         'next':(dashboard: Dashboard) => {
           this.dashboard = dashboard;
+          this.pristineDashboardJSON = JSON.stringify(dashboard);
           this.repairArrangement();
 
           dashboard.plots.forEach(p => {
-            this.plotWidgetRenderData.push(new PlotWidgetRenderData(p));
+            const submitterId = (<any>window).submitterId + (<any>window).randomId();
+            this.plotWidgetRenderData.push(new PlotWidgetRenderData(p, submitterId));
           });
 
           this.loadImages(0, this.plotWidgetRenderData);
@@ -54,68 +62,49 @@ export class DashboardComponent implements OnInit {
       });
   }
 
+  updateDateRange(e: DatePickerChange) {
+    this.plotWidgetRenderData.forEach(r => {
+      r.widget.config.dateRange = e.value;
+    });
+    this.loadImages(0, this.plotWidgetRenderData);
+  }
+
+  isDirty() {
+    return this.pristineDashboardJSON !== JSON.stringify(this.dashboard);
+  }
+
   loadImages(index: number, plotWidgetQueue: PlotWidgetRenderData[]) {
 
     if (index < plotWidgetQueue.length){
+
       const plot = plotWidgetQueue[index];
-      const request = this.createPlotRequest(plot.widget)
+      if (plot.isAborted) {
+        this.loadImages(index +1 , plotWidgetQueue);
+      }else{
+
+        plot.plotResponse = undefined; // remove old image and show loading icon
+
+        const request = PlotWidget.createPlotRequest(plot.widget, plot.submitterId);
         this.plotService.sendPlotRequest(request).subscribe({
           next: (response: PlotResponse)=> {
             plot.plotResponse = response;
           },
-          error: (error:any)=> {},
+          error: (error:any)=> {
+            plot.error = error;
+            this.loadImages(index +1 , plotWidgetQueue);
+          },
           complete: () => {
             this.loadImages(index +1 , plotWidgetQueue);
           }
         });
       }
     }
-
-
-  createPlotRequest(plotWidget: PlotWidget): PlotRequest {
-    
-    const height = this.height(plotWidget.size);
-    const width  = this.width(plotWidget.size);
-
-    const fullWidth = window.innerWidth-30; 
-    const fullHeight = window.innerHeight-30;
-
-    const request = new PlotRequest(
-      (<any>window).submitterId+crypto.randomUUID(),
-      plotWidget.config, 
-      {
-        'main': new RenderOptions(height,width, false, true),
-        'fullScreen': new RenderOptions(fullHeight,fullWidth, false, true)
-      }
-    );
-    return request;
-  }
-
-  height(size: PlotSize): number{
-    switch (size) {
-      case 'SMALL':
-        return 300;
-      case 'MEDIUM':
-        return 400;
-      case 'LARGE':
-        return 600;
-    }
-  }
-  width(size: PlotSize): number{
-    switch (size) {
-      case 'SMALL':
-        return 400;
-      case 'MEDIUM':
-        return 600;
-      case 'LARGE':
-        return 900;
-    }
   }
 
   private repairArrangement(){
     const arrangement = this.dashboard!.arrangement || [];
-    if (arrangement.length == 0){
+    for (let i = 0; i < 2; i++){
-      arrangement[0] = [];
+      arrangement[i] = arrangement[i] ?? [] ;
     }
     this.dashboard?.texts.forEach(t => {
       if (!this.arrangmentContainsId(arrangement, t.id)){
@@ -127,6 +116,7 @@ export class DashboardComponent implements OnInit {
         arrangement[0].push(t.id);
       }
     });
+
     this.dashboard!.arrangement = arrangement;
   }
 
@@ -143,9 +133,9 @@ export class DashboardComponent implements OnInit {
   addText() {
     this.dialog.open(AddTextDialogComponent,{
       data: {text:""},
-      width: '600px'
+      width: '800px'
     }).afterClosed().subscribe((text: string) => {
-      const widget = new TextWidget(crypto.randomUUID(),'MEDIUM', text);
+      const widget = new TextWidget((<any>window).randomId(),'MEDIUM', text);
       this.dashboard!.texts.push(widget); 
       this.dashboard!.arrangement[0].push(widget.id);
     });
@@ -153,14 +143,15 @@ export class DashboardComponent implements OnInit {
 
   addPlot() {
     this.dialog.open(AddPlotDialogComponent,{
+      data: {},
       width: 'calc(100% - 1em)',
       height: 'calc(100% - 1em)'
     }).afterClosed().subscribe((config: PlotConfig | "") => {
       if (config != "" && config.query.length > 0) {
-        const widget = new PlotWidget(crypto.randomUUID(), 'MEDIUM', config);
+        const widget = new PlotWidget((<any>window).randomId(), 'MEDIUM', config);
         this.dashboard!.plots.push(widget);
         this.dashboard!.arrangement[0].push(widget.id);
-        this.plotWidgetRenderData.push(new PlotWidgetRenderData(widget));
+        this.plotWidgetRenderData.push(new PlotWidgetRenderData(widget, (<any>window).randomId()));
         this.loadImages(this.plotWidgetRenderData.length-1, this.plotWidgetRenderData);
       }
     });
@@ -201,6 +192,7 @@ export class DashboardComponent implements OnInit {
           duration: 5000,
           verticalPosition: 'top'
         });
+        this.pristineDashboardJSON = JSON.stringify(this.dashboard);
       }
     });
   }
@@ -218,7 +210,6 @@ export class DashboardComponent implements OnInit {
           this.dashboard!.description = result.description;
         }
       });
-    
   }
 
   isTextWidget(id: string): boolean {
@@ -237,16 +228,23 @@ export class DashboardComponent implements OnInit {
     return this.plotWidgetRenderData.find( x => x.widget.id == id);
   }
 
-  drop(event: CdkDragDrop<string[]>) {
+  drop(event: CdkDragDrop<number>) {
     if (event.previousContainer === event.container) {
-      moveItemInArray(event.container.data, event.previousIndex, event.currentIndex);
+      moveItemInArray(this.dashboard!.arrangement[event.container.data], event.previousIndex, event.currentIndex);
     } else {
+      window.console.log("from ",event.previousContainer.data, " to ", event.container.data);
       transferArrayItem(
-        event.previousContainer.data,
+        this.dashboard!.arrangement[event.previousContainer.data],
-        event.container.data,
+        this.dashboard!.arrangement[event.container.data],
         event.previousIndex,
         event.currentIndex,
       );
     }
   }
+
+  delete(dashboardId: string) {
+    this.dashboard!.arrangement[0] = this.dashboard!.arrangement[0].filter(a => a != dashboardId);
+    this.dashboard!.plots = this.dashboard!.plots.filter(p => p.id != dashboardId);
+    this.dashboard!.texts = this.dashboard!.texts.filter(t => t.id != dashboardId);
+  }
 }

pdb-js/src/app/dashboard-page/dashboard/plot-widget/plot-widget.component.html

@@ -3,7 +3,7 @@
     float: left;
   }
   .dashboard-card {
-    border: solid 1px red;
+    position: relative;
     display: flex;
     justify-content: center;
     align-items: center;
@@ -16,15 +16,73 @@
     width: 402px;
     height: 302px;
   }
-  img {
+  img.render-img {
     cursor: zoom-in;
   }
+
+  .top-left {
+    position: absolute;
+    left: 0;
+    top: 0;
+  }
+
+  .top-right {
+    position: absolute;
+    right: 0;
+    top: 0;
+  }
+
+  .dashboard-card .editable-hovered {
+    visibility: hidden;
+  }
+  .dashboard-card:hover .editable-hovered {
+    visibility: visible;
+  }
+
+  .aborted-img {
+    flex-grow: 0.3;
+    opacity: 0.3;
+  }
+  .aborted-img img {
+    width: 100%;
+  }
+
+  .invader {
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAUCAYAAACTQC2+AAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9kKGRAxBENShygAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAbUlEQVRIx9WVQQrAMAgEM6X///L2FCihYvRg7F416LCsQdKo0DWKZA4CBGzjev1lRHgezS0lkan3IYr485ZFdo5oJZkbWoRWfSWrJ8p6suvZucsgCS8THsHX+zKiO5uLaO763bpobvoS/e6HfQBzIE0PhAsDxgAAAABJRU5ErkJggg==);
+    width: 26px;
+    height: 20px;
+    display: inline-block;
+    vertical-align: text-bottom;
+  }
+  .spinner {
+    animation: wobble 2s linear infinite;
+  }
+  @keyframes wobble {
+    0% {
+      opacity: 1;
+    }
+    50% {
+      opacity: 0.3;
+    }
+    100% {
+      opacity: 1;
+    }
+  }
 </style>
 <div class="dashboard-card" [ngClass]="{'size-medium' : true}">
-  <mat-spinner *ngIf="!hasRender('main') && !isError"></mat-spinner>
+  <div class="editable-hovered top-right">
-  <img *ngIf="hasRender('main')" [src]="getImageUrl('main')" (click)="showFullScreenImage()" />
+    <button mat-icon-button (click)="edit()" ><img src="/assets/img/edit-outline.svg"/></button>
-  <div *ngIf="isError">
+    <button mat-icon-button (click)="delete()"><img src="/assets/img/recycle-bin-line.svg"/></button>
+  </div>
+  <div *ngIf="!hasRender('main') && !data?.error && !data.isAborted">
+    <button mat-button (click)="abort()"><span class="invader spinner"></span>Cancel</button>    
+  </div>
+  <img *ngIf="hasRender('main')" [src]="getImageUrl('main')" (click)="showFullScreenImage()"  class="render-img" />
+  <div *ngIf="data?.error && !data?.isAborted">
     There was an error! This is a good time to panic!
   </div>
+  <div *ngIf="data?.isAborted" class="aborted-img">
+    <img src="assets/img/image-aborted.svg" />
+  </div>
 </div>
 

pdb-js/src/app/dashboard-page/dashboard/plot-widget/plot-widget.component.ts

@@ -1,33 +1,32 @@
-import { AfterViewInit, Component, Input, OnInit, ViewChild } from '@angular/core';
+import {  Component, EventEmitter, Input, Output,  ViewChild, input } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
+import { ConfirmationDialogComponent } from 'src/app/confirmation-dialog/confirmation-dialog.component';
 import { PlotWidget, PlotWidgetRenderData } from 'src/app/dashboard.service';
 import { PlotViewComponent } from 'src/app/plot-view/plot-view.component';
-import { PlotRequest, PlotResponse, PlotService, RenderOptions } from 'src/app/plot.service';
+import { PlotConfig, PlotResponse, PlotService } from 'src/app/plot.service';
+import { AddPlotDialogComponent } from '../add-plot-dialog/add-plot-dialog.component';
 import { FullScreenPlotDialogComponent } from '../full-screen-plot-dialog/full-screen-plot-dialog.component';
 
 @Component({
   selector: 'app-plot-widget',
   templateUrl: './plot-widget.component.html'
 })
-export class PlotWidgetComponent implements AfterViewInit {
+export class PlotWidgetComponent  {
   @Input("data")
   data!: PlotWidgetRenderData;
 
   public thumbnailUrl = "";
 
-  isError = false;
 
-  @ViewChild("plotView") plotView!: PlotViewComponent;
+  //@ViewChild("plotView") plotView!: PlotViewComponent;
 
-  constructor(private dialog: MatDialog, ){}
+  @Output()
+  deleted : EventEmitter<string> = new EventEmitter<string>();
 
-  ngAfterViewInit(): void {
+  constructor(private dialog: MatDialog, private service: PlotService){}
-    
-  }
 
   hasRender(name: string): boolean{
-    const hasRender = this.data !== undefined && this.data.plotResponse !== undefined && this.data.plotResponse?.rendered[name] !== undefined;
+    return this.data !== undefined && this.data.plotResponse !== undefined && this.data.plotResponse?.rendered[name] !== undefined;
-    return hasRender;
   }
 
   getImageUrl(name: string ): string | undefined {
@@ -35,13 +34,61 @@ export class PlotWidgetComponent implements AfterViewInit {
   }
 
   showFullScreenImage() {
-    
     this.dialog.open(FullScreenPlotDialogComponent,{
       width: 'calc(100% - 15px)',
       height: 'calc(100% - 15px)',
-      'data': {'imageUrl': this.getImageUrl('fullScreen')}
+      data: {'imageUrl': this.getImageUrl('fullScreen')}
     }).afterClosed().subscribe(() => {
       
     });
   }
+
+  abort(){
+    window.console.log("abort");
+    this.data.isAborted = true;
+    this.service.abort(this.data.submitterId).subscribe({
+      complete: () => {
+        window.console.log("cancelled");
+      },
+      error: () => {}
+    });
+  }
+
+  delete() {
+    this.dialog
+      .open(ConfirmationDialogComponent, {
+        data: {title: "", text: "Delete plot?", btnOkLabel: "Delete", btnCancelLabel: "Cancel"}
+      })
+      .afterClosed()
+      .subscribe((result: boolean) => {
+        if (result === true) {
+          this.deleted.emit(this.data.widget.id);
+        }
+      });   
+  } 
+
+  edit() {
+    this.dialog.open(AddPlotDialogComponent, {
+      data: {config: this.data.widget.config},
+      width: 'calc(100% - 15px)',
+      height: 'calc(100% - 15px)',
+    }).afterClosed().subscribe((config?: PlotConfig) => {
+      if (config !== undefined && config.query.length > 0) {
+        this.data.widget.config = config;
+
+        this.data.error = false;
+        this.data.plotResponse = undefined;
+
+        const request = PlotWidget.createPlotRequest(this.data.widget, this.data.submitterId);
+        this.service.sendPlotRequest(request).subscribe({
+          next: (response: PlotResponse)=> {
+            this.data.plotResponse = response;
+          },
+          error: (error:any)=> {
+            this.data.error = true;
+          },
+        });
+      }
+    });
+  }
 }

pdb-js/src/app/dashboard-page/dashboard/text-widget/text-widget.component.html

@@ -4,7 +4,7 @@
   }
   .text-widget {
     position: relative;
-    padding: 1em 0;
+    padding-bottom: 1em;
   }
   .text-widget:hover {
     /*outline: solid 1px black;/**/
@@ -14,7 +14,7 @@
   .editable-hovered {
     position: absolute;
     right: 0;
-    top: 0;
+    top: -2em;
   }
 
   .text-widget .editable-hovered {
@@ -25,6 +25,9 @@
   }
 </style>
 <div class="text-widget">
-  <button mat-icon-button (click)="edit()" class="editable-hovered"><img src="/assets/img/edit-outline.svg"/></button>
+  <div class="editable-hovered">
-  <p *ngFor="let line of lines()">{{line}}</p>
+    <button mat-icon-button (click)="edit()"><img src="/assets/img/edit-outline.svg"/></button>
+    <button mat-icon-button (click)="delete()"><img src="/assets/img/recycle-bin-line.svg"/></button>
+  </div>
+  <markdown [data]="this.data.text"></markdown>
 </div>

pdb-js/src/app/dashboard-page/dashboard/text-widget/text-widget.component.ts

@@ -1,5 +1,6 @@
-import { Component, Input } from '@angular/core';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
+import { ConfirmationDialogComponent } from 'src/app/confirmation-dialog/confirmation-dialog.component';
 import { TextWidget } from 'src/app/dashboard.service';
 import { AddTextDialogComponent } from '../add-text-dialog/add-text-dialog.component';
 
@@ -11,16 +12,31 @@ export class TextWidgetComponent {
   @Input()
   data! : TextWidget;
 
+  @Output()
+  deleted : EventEmitter<string> = new EventEmitter<string>();
+
   constructor(private dialog: MatDialog){}
 
   lines(): string[]{
     return typeof this.data.text == 'string' ? this.data.text.split(/\r?\n/) : [];
   }
+  delete() {
+    this.dialog
+      .open(ConfirmationDialogComponent, {
+        data: {title: "", text: "Delete text?", btnOkLabel: "Delete", btnCancelLabel: "Cancel"}
+      })
+      .afterClosed()
+      .subscribe((result: boolean) => {
+        if (result === true) {
+          this.deleted.emit(this.data.id);
+        }
+      });   
+  } 
 
   edit() {
     this.dialog.open(AddTextDialogComponent,{
       data: {text : this.data.text},
-      width: '600px'
+      width: '800px'
     }).afterClosed().subscribe((text?: string) => {
       if (text !== undefined) {
         this.data.text = text;

pdb-js/src/app/dashboard-page/new-dashboard/new-dashboard.component.html

@@ -1,15 +1,29 @@
+<style>
+  div[mat-dialog-content] {
+    overflow: hidden;
+  }
+</style>
+<form [formGroup]="registerForm" >
   <h1 mat-dialog-title>Create a new dashboard</h1>
   <div mat-dialog-content>
     <mat-form-field class="pdb-form-full-width">
       <mat-label>Name</mat-label>
-    <input matInput [(ngModel)]="data.name" #name>
+      <input matInput [(ngModel)]="data.name" #name formControlName="name" focus maxlength="64" required="required" />
+      <mat-error>Name must be between one and 64 characters.</mat-error>
     </mat-form-field>
     <mat-form-field class="pdb-form-full-width">
       <mat-label>Description</mat-label>
-    <textarea matInput [(ngModel)]="data.description"></textarea>
+      <textarea matInput [(ngModel)]="data.description" maxlength="65535" formControlName="description"></textarea>
     </mat-form-field>
   </div>
   <div mat-dialog-actions align="end">
     <button mat-button mat-dialog-close>Cancel</button>
-  <button class="save-button" mat-button mat-dialog-close (click)="onSaveClick()" cdkFocusInitial>Save</button>
+    <button 
+      class="save-button" 
+      mat-button 
+      mat-dialog-close 
+      (click)="onSaveClick()" 
+      [disabled]="!registerForm.valid">Save</button>
   </div>
+</form>
+  

pdb-js/src/app/dashboard-page/new-dashboard/new-dashboard.component.scss

@@ -1,4 +0,0 @@
-
-div[mat-dialog-content] {
-  overflow: hidden;
-}

pdb-js/src/app/dashboard-page/new-dashboard/new-dashboard.component.ts

@@ -1,14 +1,35 @@
 import { Component, ElementRef, Inject, OnInit, ViewChild } from '@angular/core';
-import {MatDialog, MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
+import {MAT_DIALOG_DATA, MatDialogModule, MatDialogRef} from '@angular/material/dialog';
 import { DashboardCreationData } from 'src/app/dashboard.service';
+import {  FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
+import { BrowserModule } from '@angular/platform-browser';
+import { MatButtonModule } from '@angular/material/button';
+import {  OverlayModule } from '@angular/cdk/overlay';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
 
 @Component({
   selector: 'app-new-dashboard',
   templateUrl: './new-dashboard.component.html',
-  styleUrls: ['./new-dashboard.component.scss']
+  standalone: true,
+  imports: [
+    BrowserModule,
+    FormsModule,
+    MatButtonModule,
+    MatDialogModule,
+    MatFormFieldModule,
+    MatInputModule,
+    ReactiveFormsModule
+  ]
 })
 export class NewDashboardComponent implements OnInit {
 
+
+  registerForm = new FormGroup({
+    name: new FormControl('', [Validators.pattern(/^[^\s]+.{0,63}$/), Validators.required]),
+    description: new FormControl('', [Validators.maxLength(65535)]),
+  });
+
   @ViewChild('name') nameInput!: ElementRef;
 
   constructor(public dialogRef: MatDialogRef<NewDashboardComponent>,
@@ -16,7 +37,7 @@ export class NewDashboardComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    window.setTimeout(() => this.nameInput.nativeElement.focus(), 0);
+    //window.setTimeout(() => this.nameInput.nativeElement.focus(), 0);
   }
 
   onSaveClick(): void {

pdb-js/src/app/dashboard.service.ts

@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { PlotConfig, PlotResponse } from './plot.service';
+import { PlotConfig, PlotRequest, PlotResponse, RenderOptions } from './plot.service';
 
 @Injectable({
   providedIn: 'root'
@@ -67,6 +67,47 @@ export class PlotWidget extends BaseWidget {
   constructor(override id: string, override size: 'SMALL'|'MEDIUM'|'LARGE', public config: PlotConfig) {
     super(id, 'PLOT', size);
   }
+
+  public static createPlotRequest(widget: PlotWidget, submitterId: string): PlotRequest {
+    
+    const height = this.height(widget.size);
+    const width  = this.width(widget.size);
+
+    const fullWidth = window.innerWidth-30; 
+    const fullHeight = window.innerHeight-30;
+
+    const request = new PlotRequest(
+      submitterId,
+      widget.config, 
+      {
+        'main': new RenderOptions(height,width, false, true),
+        'fullScreen': new RenderOptions(fullHeight,fullWidth, false, true)
+      }
+    );
+    return request;
+  }
+
+
+  static height(size: PlotSize): number{
+    switch (size) {
+      case 'SMALL':
+        return 300;
+      case 'MEDIUM':
+        return 400;
+      case 'LARGE':
+        return 600;
+    }
+  }
+  static width(size: PlotSize): number{
+    switch (size) {
+      case 'SMALL':
+        return 400;
+      case 'MEDIUM':
+        return 600;
+      case 'LARGE':
+        return 900;
+    }
+  }
 }
 
 export type PlotSize = 'SMALL'|'MEDIUM'|'LARGE';
@@ -74,7 +115,9 @@ export type PlotSize = 'SMALL'|'MEDIUM'|'LARGE';
 export type PlotType = 'TEXT'|'PLOT';
 
 export class PlotWidgetRenderData  {
-  constructor(public widget: PlotWidget, public plotResponse?: PlotResponse) {
+  public isAborted = false;
+  public error: string|boolean = false;
+  constructor(public widget: PlotWidget, public submitterId: string, public plotResponse?: PlotResponse) {
   }
 }
 

pdb-js/src/app/help-page/help-page.component.ts

@@ -3,7 +3,8 @@ import { Component, OnInit } from '@angular/core';
 @Component({
   selector: 'pdb-help-page',
   templateUrl: './help-page.component.html',
-  styleUrls: ['./help-page.component.scss']
+  styleUrls: ['./help-page.component.scss'],
+  standalone: true
 })
 export class HelpPageComponent implements OnInit {
 

pdb-js/src/app/image-toggle/image-toggle.component.ts

@@ -1,9 +1,14 @@
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
 
 @Component({
   selector: 'pdb-image-toggle',
   templateUrl: './image-toggle.component.html',
-  styleUrls: ['./image-toggle.component.scss']
+  styleUrls: ['./image-toggle.component.scss'],
+  standalone: true,
+  imports: [
+    BrowserModule
+  ]
 })
 export class ImageToggleComponent implements OnInit {
 

pdb-js/src/app/limit-by/limit-by.component.html

@@ -17,6 +17,7 @@
 
 <mat-form-field class="pdb-form-number"
   *ngIf="limitBy !== 'NO_LIMIT'">
+  <mat-label><!--empty label needed for layout reasons--></mat-label>
   <input 
     matInput 
     type="number" 

pdb-js/src/app/limit-by/limit-by.component.ts

@@ -1,10 +1,25 @@
-import { Component,  Input} from '@angular/core';
+import { Component } from '@angular/core';
-import {FormControl} from '@angular/forms';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { MatFormField, MatLabel } from '@angular/material/form-field';
+import { MatInput } from '@angular/material/input';
+import { MatOption, MatSelect } from '@angular/material/select';
+import { BrowserModule } from '@angular/platform-browser';
 
 @Component({
   selector: 'pdb-limit-by',
   templateUrl: './limit-by.component.html',
-  styleUrls: ['./limit-by.component.scss']
+  styleUrls: ['./limit-by.component.scss'],
+  standalone: true,
+  imports: [
+    BrowserModule,
+    FormsModule,
+    MatFormField,
+    MatInput,
+    MatLabel,
+    MatSelect,
+    MatOption,
+    ReactiveFormsModule
+  ]
 })
 export class LimitByComponent {
 

pdb-js/src/app/main-page/main-page.component.ts

@@ -1,15 +1,14 @@
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
+import { RouterLink } from '@angular/router';
 
 @Component({
   selector: 'pdb-main-page',
   templateUrl: './main-page.component.html',
-  styleUrls: ['./main-page.component.scss']
+  standalone: true,
+  imports: [
+    RouterLink
+  ]
 })
-export class MainPageComponent implements OnInit {
+export class MainPageComponent {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
 
 }

pdb-js/src/app/plot-details/plot-details.component.scss

@@ -1,33 +1,4 @@
 
-.plot-details-plotType {
-  background-image: url(/assets/img/pointTypes.png);
-  width: 9px;
-  height: 7px;
-  transform: scale(1.5);
-}
-
-.plot-details-plotType_0 {background-position-x:    0px;}
-.plot-details-plotType_1 {background-position-x:  -10px;}
-.plot-details-plotType_2 {background-position-x:  -20px;}
-.plot-details-plotType_3 {background-position-x:  -30px;}
-.plot-details-plotType_4 {background-position-x:  -40px;}
-.plot-details-plotType_5 {background-position-x:  -50px;}
-.plot-details-plotType_6 {background-position-x:  -60px;}
-.plot-details-plotType_7 {background-position-x:  -70px;}
-.plot-details-plotType_8 {background-position-x:  -80px;}
-.plot-details-plotType_9 {background-position-x:  -90px;}
-.plot-details-plotType_10 {background-position-x:-100px;}
-.plot-details-plotType_11 {background-position-x:-110px;}
-.plot-details-plotType_12 {background-position-x:-120px;}
-
-.plot-details-plotType_0051c2 {background-position-y:   0px;}
-.plot-details-plotType_bf8300 {background-position-y:  -8px;}
-.plot-details-plotType_9400d3 {background-position-y: -16px;}
-.plot-details-plotType_00c254 {background-position-y: -24px;}
-.plot-details-plotType_e6e600 {background-position-y: -32px;}
-.plot-details-plotType_e51e10 {background-position-y: -40px;}
-.plot-details-plotType_57a1c2 {background-position-y: -48px;}
-.plot-details-plotType_bd36c2 {background-position-y: -56px;}
 
 
 .gallery-item-details td {

pdb-js/src/app/plot-details/plot-details.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Input, Output, ViewChild, EventEmitter, ɵpublishDefaultGlobalUtils } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { DashTypeAndColor, PlotResponseStats, DataSeriesStats } from '../plot.service';
 import { UtilService } from '../utils.service';
 

pdb-js/src/app/plot-view/plot-view.component.html

@@ -1,3 +1,16 @@
+
+<!---->
+<div cdkDrag 
+    [ngClass]="{'hidden': !imageUrl || showStats || dataSeries().length == 0}" 
+    class="plot-view--legend" 
+    [cdkDragFreeDragPosition]="legendInitialPosition">
+  <div cdkDragHandle></div>
+  <div class="plot-view--legend-content">
+    <ol>
+      <li *ngFor="let stat of dataSeries()"><div class="{{ pointTypeClass(stat.dashTypeAndColor) }}" title="{{ stat.name }}"></div>{{ stat.name }}</li>
+    </ol>
+  </div>
+</div>
 <div
   *ngIf="imageUrl">
   <div 

pdb-js/src/app/plot-view/plot-view.component.scss

@@ -21,3 +21,60 @@ img {
   box-shadow: 5px 5px 10px 0px #e0e0e0;
   overflow: auto;
 }
+
+.plot-view--legend {
+  border: solid 1px #ccc;
+  display: flex;
+  flex-direction: column;
+  background: #fff;
+  border-radius: 4px;
+  position: fixed;
+  z-index: 1;
+  transition: box-shadow 200ms cubic-bezier(0, 0, 0.2, 1);
+  box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2),
+              0 2px 2px 0 rgba(0, 0, 0, 0.14),
+              0 1px 5px 0 rgba(0, 0, 0, 0.12);
+  background-color: white;
+}
+
+.plot-view--legend:active {
+  box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2),
+              0 8px 10px 1px rgba(0, 0, 0, 0.14),
+              0 3px 14px 2px rgba(0, 0, 0, 0.12);
+}
+.plot-view--legend div[cdkDragHandle] {
+  visibility: hidden;
+  height: 1.2rem;
+  flex-shrink: 0;
+}
+
+.plot-view--legend:hover div[cdkDragHandle] {
+  cursor: move;
+  visibility: visible;
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAAF0lEQVQI12P4//8/AwMDhGSEUFCAUwYAJl4R8Z1D4wIAAAAASUVORK5CYII=);
+}
+
+.plot-view--legend-content {
+  max-height: 30em;
+  overflow: auto;
+  max-width: 60em;
+  overflow: auto;
+  resize: both;
+  padding-bottom: 0.5em;
+}
+
+.plot-view--legend ol {
+  padding-inline-start: 0.7em;
+}
+
+.plot-view--legend ol li {
+  list-style-type: none;
+  display: flex;
+  flex-direction: row;
+  align-items: center
+}
+.plot-view--legend ol li .plot-details-plotType{
+  margin-right: 0.3em; 
+  flex-shrink: 0;
+  flex-grow: 0;
+}

pdb-js/src/app/plot-view/plot-view.component.ts

@@ -1,23 +1,29 @@
-import { Component, OnInit, Output, EventEmitter } from '@angular/core';
+import { Component, Output, EventEmitter } from '@angular/core';
-import { DataType, AxesTypes, PlotResponseStats, PlotConfig, PlotService, PlotResponse, PlotRequest, RenderOptions  } from '../plot.service';
+import { DataType, AxesTypes, PlotResponseStats, PlotConfig, PlotService, PlotResponse, PlotRequest, RenderOptions, DataSeriesStats, DashTypeAndColor  } from '../plot.service';
 import { MatSnackBar } from '@angular/material/snack-bar';
-import * as moment from 'moment';
+//import * as moment from 'moment';
 import { WidgetDimensions } from '../dashboard.service';
+import { Overlay } from "@angular/cdk/overlay";
+
+import { DateTime, Duration } from "luxon";
+import { DateValue } from '../components/datepicker/date-picker.component';
+import { Observable } from 'rxjs';
 
 @Component({
   selector: 'pdb-plot-view',
   templateUrl: './plot-view.component.html',
   styleUrls: ['./plot-view.component.scss']
 })
-export class PlotViewComponent implements OnInit {
+export class PlotViewComponent {
 
-  readonly DATE_PATTERN = "YYYY-MM-DD HH:mm:ss"; // for moment-JS
+  readonly DATE_PATTERN = "yyyy-MM-dd HH:mm:ss"; // for moment-JS
 
   readonly gnuplotLMargin = 110; // The left margin configured for gnuplot
   readonly gnuplotRMargin = 110; // The right margin configured for gnuplot
   readonly gnuplotTMargin = 57; // The top margin configured for gnuplot
   readonly gnuplotBMargin = 76; // The bottom margin configured for gnuplot
 
+  isOpen = false;
 
   imageUrl! : string;
   stats: PlotResponseStats | null = null;
@@ -28,7 +34,7 @@ export class PlotViewComponent implements OnInit {
   loadingEvent : EventEmitter<LoadingEvent> = new EventEmitter<LoadingEvent>();
 
   @Output()
-  dateRangeUpdateEvent : EventEmitter<string> = new EventEmitter<string>();
+  dateRangeUpdateEvent : EventEmitter<DateValue> = new EventEmitter<DateValue>();
   
   in_drag_mode = false;
   drag_start_x = 0;
@@ -47,10 +53,9 @@ export class PlotViewComponent implements OnInit {
 
   config? : PlotConfig;
 
-  constructor(private service : PlotService, private snackBar: MatSnackBar) { }
+  legendInitialPosition = {x:115,y:60};
 
-  ngOnInit() {
+  constructor(private service : PlotService, private snackBar: MatSnackBar, private overlay: Overlay) { }
-  }
 
 
   showError(message:string) {
@@ -177,14 +182,12 @@ export class PlotViewComponent implements OnInit {
   }
 
   setDateRange(startDate: any, endDate: any) {
-    const formattedStartDate = startDate.format(this.DATE_PATTERN);
+    const formattedStartDate = startDate.toFormat(this.DATE_PATTERN);
-    const formattedEndDate = endDate.format(this.DATE_PATTERN);
+    const formattedEndDate = endDate.toFormat(this.DATE_PATTERN);
     
     const newDateRange = formattedStartDate+" - "+formattedEndDate;
-    
+    const newDateValue = new DateValue('ABSOLUTE', newDateRange, newDateRange);
-    //(<HTMLInputElement>document.getElementById("search-date-range")).value = newDateRange;
+    this.dateRangeUpdateEvent.emit(newDateValue);
-    this.dateRangeUpdateEvent.emit(newDateRange);
-    //this.plot();
   }
 
   zoomRange(range: SelectionRange) {
@@ -251,6 +254,10 @@ export class PlotViewComponent implements OnInit {
 
     const request = this.createPlotRequest(dimension);
 
+    this.imageUrl = '';
+    this.stats = null;
+    
+    document.dispatchEvent(new Event("invadersStart", {}));
     this.loadingEvent.emit(new LoadingEvent(true));
     const x = this.service.sendPlotRequest(request).subscribe({
       next: (plotResponse: PlotResponse) => {
@@ -289,18 +296,26 @@ export class PlotViewComponent implements OnInit {
    * shiftDateByAnchor(dateRangeAsString, 0.20, 0.5) zooms in by 50%, so that the date that was at 20% before the zoom is still at 20% after the zoom
    * shiftDateByAnchor(dateRangeAsString, 0.33, 2) zooms out by 50%, so that the date that was at 33% before the zoom is still at 33% after the zoom
    */
- shiftDateByAnchor(dateRange:string, anchorInPercentOfDateRange:number, zoomFactor:number)
+ shiftDateByAnchor(dateValue:DateValue, anchorInPercentOfDateRange:number, zoomFactor:number)
  {
-     const dateRangeParsed = this.parseDateRange(dateRange);
+     const dateRangeParsed = this.parseDateRange(dateValue);
-     const dateRangeInSeconds = dateRangeParsed.duration.asSeconds();
+     dateRangeParsed.subscribe({
+      next: (dataRange: DateRange) => {
+        const dateRangeInSeconds = Math.floor(dataRange.duration.toMillis()/1000);
      
-     const anchorTimestampInSeconds = dateRangeParsed.startDate.clone().add(Math.floor(dateRangeInSeconds*anchorInPercentOfDateRange), "seconds");
+        const anchorTimestampInSeconds = dataRange.startDate.plus(Math.floor(dateRangeInSeconds*anchorInPercentOfDateRange)*1000);
         const newDateRangeInSeconds = dateRangeInSeconds * zoomFactor;
         
-     const newStartDate = anchorTimestampInSeconds.clone().subtract(newDateRangeInSeconds*anchorInPercentOfDateRange, "seconds");
+        const newStartDate = anchorTimestampInSeconds.minus(newDateRangeInSeconds*anchorInPercentOfDateRange*1000);
-     const newEndDate = newStartDate.clone().add({seconds: newDateRangeInSeconds});;
+        const newEndDate = newStartDate.plus({seconds: newDateRangeInSeconds});;
         
         this.setDateRange(newStartDate, newEndDate);
+      },
+      error: (err: any) => {
+        window.console.error("failed to parse DateValue into DateRange: ", err);
+      }
+     })
+     
  }
  
  /**
@@ -312,26 +327,47 @@ export class PlotViewComponent implements OnInit {
   * shiftDate(dateRangeAsString, -0.5, -0.5) will move the range by half its size to older values
   * shiftDate(dateRangeAsString, 1, 1) will move the range by its size to newer values
   */
- shiftDate(dateRange: string, factorStartDate: number, factorEndDate: number)
+ shiftDate(dateValue: DateValue, factorStartDate: number, factorEndDate: number)
  {
-     const dateRangeParsed = this.parseDateRange(dateRange);
+     this.parseDateRange(dateValue).subscribe(
-     const dateRangeInSeconds = dateRangeParsed.duration.asSeconds();
+      dateRangeParsed => {
+        const dateRangeInSeconds = Math.floor(dateRangeParsed.duration.toMillis()/1000);
         
-     const newStartDate = dateRangeParsed.startDate.add({seconds: dateRangeInSeconds*factorStartDate});
+        const newStartDate = dateRangeParsed.startDate.plus({seconds: dateRangeInSeconds*factorStartDate});
-     const newEndDate = dateRangeParsed.endDate.add({seconds: dateRangeInSeconds*factorEndDate});
+        const newEndDate = dateRangeParsed.endDate.plus({seconds: dateRangeInSeconds*factorEndDate});
         
         this.setDateRange(newStartDate, newEndDate);
       }
+     );
+ }
+ 
+  parseDateRange(dateValue : DateValue) : Observable<DateRange> {
+    return this.service.toDateRange(dateValue);
+    /*
+      .pipe(map((dateRangeAsString:string) => {
+        const startDate = DateTime.fromFormat(dateRangeAsString.slice(0, 19), this.DATE_PATTERN );
+        const endDate = DateTime.fromFormat(dateRangeAsString.slice(22, 41), this.DATE_PATTERN );
       
-  parseDateRange(dateRangeAsString : string) : DateRange {
-   const startDate = moment(dateRangeAsString.slice(0, 19));
-   const endDate = moment(dateRangeAsString.slice(22, 41));
     
       return {
         startDate: startDate,
         endDate: endDate,
-     duration: moment.duration(endDate.diff(startDate))
+        duration: endDate.diff(startDate),
       };
+      }));
+      */
+  }
+
+
+
+  dataSeries(): Array<DataSeriesStats> {
+    return this.stats ? this.stats.dataSeriesStats : [];
+  }
+
+  pointTypeClass(typeAndColor: DashTypeAndColor): string {
+    return "plot-details-plotType"
+      +" plot-details-plotType_"+typeAndColor.pointType
+      +" plot-details-plotType_"+typeAndColor.color.toLocaleLowerCase();
   } 
 }
 
@@ -360,7 +396,8 @@ export class LoadingEvent {
 }
 
 export class DateRange {
-  startDate: any;
+  constructor(
-  endDate: any;
+    public startDate: DateTime,
-  duration: any;
+    public endDate: DateTime,
+    public duration: Duration){}
 }

pdb-js/src/app/plot.service.ts

@@ -1,64 +1,228 @@
-import { Injectable, OnInit } from '@angular/core';
+import { Injectable, OnInit } from "@angular/core";
-import { HttpClient, HttpParams } from '@angular/common/http';
+import { HttpClient, HttpParams } from "@angular/common/http";
-import { Observable } from 'rxjs';
+import { Observable } from "rxjs";
-import { map } from 'rxjs/operators';
+import { map } from "rxjs/operators";
-
+import { DateValue } from "./components/datepicker/date-picker.component";
+import { DateRange } from "./plot-view/plot-view.component";
+import { DateTime } from "luxon";
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: "root",
 })
 export class PlotService {
 
+  readonly DATE_PATTERN = "yyyy-MM-dd'T'HH:mm:ss";
+
   plotTypes: Array<PlotType>;
 
   constructor(private http: HttpClient) {
     this.plotTypes = new Array<PlotType>();
-    this.plotTypes.push(new PlotType("SCATTER","Scatter","scatter-chart2",true,DataType.Time,DataType.Duration));
+    this.plotTypes.push(
-    this.plotTypes.push(new PlotType("CUM_DISTRIBUTION", "Cumulative Distribution", "cumulative-distribution-chart", true, DataType.Percent, DataType.Duration));
+      new PlotType(
-    this.plotTypes.push(new PlotType("HISTOGRAM", "Histogram", "histogram", true, DataType.HistogramBin, DataType.HistogramCount));
+        "SCATTER",
-    this.plotTypes.push(new PlotType("PARALLEL", "Parallel Requests", "parallel-requests-chart", true, DataType.Time, DataType.Count));
+        "Scatter",
-    this.plotTypes.push(new PlotType("BAR", "Bar (number of requests)", "bar-chart", true, DataType.Group, DataType.Count));
+        "scatter-chart2",
-    this.plotTypes.push(new PlotType("BOX", "Box", "box-plot", true, DataType.Time, DataType.Duration));
+        true,
+        DataType.Time,
+        DataType.Duration,
+      ),
+    );
+    this.plotTypes.push(
+      new PlotType(
+        "CUM_DISTRIBUTION",
+        "Cumulative Distribution",
+        "cumulative-distribution-chart",
+        true,
+        DataType.Percent,
+        DataType.Duration,
+      ),
+    );
+    this.plotTypes.push(
+      new PlotType(
+        "HISTOGRAM",
+        "Histogram",
+        "histogram",
+        true,
+        DataType.HistogramBin,
+        DataType.HistogramCount,
+      ),
+    );
+    this.plotTypes.push(
+      new PlotType(
+        "PARALLEL",
+        "Parallel Requests",
+        "parallel-requests-chart",
+        true,
+        DataType.Time,
+        DataType.Count,
+      ),
+    );
+    this.plotTypes.push(
+      new PlotType(
+        "BAR",
+        "Bar (number of requests)",
+        "bar-chart",
+        true,
+        DataType.Group,
+        DataType.Count,
+      ),
+    );
+    this.plotTypes.push(
+      new PlotType(
+        "BOX",
+        "Box",
+        "box-plot",
+        true,
+        DataType.Time,
+        DataType.Duration,
+      ),
+    );
 
-    this.plotTypes.push(new PlotType("HEATMAP", "Heatmap", "heatmap", false, DataType.Other, DataType.Other));
+    this.plotTypes.push(
-    this.plotTypes.push(new PlotType("CONTOUR", "Contour", "contour-chart", false, DataType.Time, DataType.Duration));
+      new PlotType(
-    this.plotTypes.push(new PlotType("RIDGELINES", "Ridgelines", "ridgelines", false, DataType.Other, DataType.Other));
+        "HEATMAP",
-    this.plotTypes.push(new PlotType("QQ", "Quantile-Quantile", "quantile-quantile", false, DataType.Other, DataType.Other));
+        "Heatmap",
-    this.plotTypes.push(new PlotType("VIOLIN", "Violin", "violin-chart", false, DataType.Group, DataType.Duration));
+        "heatmap",
-    this.plotTypes.push(new PlotType("STRIP", "Strip", "strip-chart", false, DataType.Group, DataType.Duration));
+        false,
-    this.plotTypes.push(new PlotType("PIE", "Pie", "pie-chart", false, DataType.Other, DataType.Other));
+        DataType.Other,
-    this.plotTypes.push(new PlotType("STEP_FIT", "Step Fit", "step-fit", false, DataType.Other, DataType.Other));
+        DataType.Other,
-    this.plotTypes.push(new PlotType("LAG", "Lag", "lag-plot", false, DataType.Other, DataType.Other));
+      ),
-    this.plotTypes.push(new PlotType("ACF", "ACF", "acf-plot", false, DataType.Other, DataType.Other));
+    );
+    this.plotTypes.push(
+      new PlotType(
+        "CONTOUR",
+        "Contour",
+        "contour-chart",
+        false,
+        DataType.Time,
+        DataType.Duration,
+      ),
+    );
+    this.plotTypes.push(
+      new PlotType(
+        "RIDGELINES",
+        "Ridgelines",
+        "ridgelines",
+        false,
+        DataType.Other,
+        DataType.Other,
+      ),
+    );
+    this.plotTypes.push(
+      new PlotType(
+        "QQ",
+        "Quantile-Quantile",
+        "quantile-quantile",
+        false,
+        DataType.Other,
+        DataType.Other,
+      ),
+    );
+    this.plotTypes.push(
+      new PlotType(
+        "VIOLIN",
+        "Violin",
+        "violin-chart",
+        false,
+        DataType.Group,
+        DataType.Duration,
+      ),
+    );
+    this.plotTypes.push(
+      new PlotType(
+        "STRIP",
+        "Strip",
+        "strip-chart",
+        false,
+        DataType.Group,
+        DataType.Duration,
+      ),
+    );
+    this.plotTypes.push(
+      new PlotType(
+        "PIE",
+        "Pie",
+        "pie-chart",
+        false,
+        DataType.Other,
+        DataType.Other,
+      ),
+    );
+    this.plotTypes.push(
+      new PlotType(
+        "STEP_FIT",
+        "Step Fit",
+        "step-fit",
+        false,
+        DataType.Other,
+        DataType.Other,
+      ),
+    );
+    this.plotTypes.push(
+      new PlotType(
+        "LAG",
+        "Lag",
+        "lag-plot",
+        false,
+        DataType.Other,
+        DataType.Other,
+      ),
+    );
+    this.plotTypes.push(
+      new PlotType(
+        "ACF",
+        "ACF",
+        "acf-plot",
+        false,
+        DataType.Other,
+        DataType.Other,
+      ),
+    );
   }
 
   getPlotTypes(): Array<PlotType> {
-    return this.plotTypes.filter(plotType => plotType.active);
+    return this.plotTypes.filter((plotType) => plotType.active);
   }
 
   getTagFields(): Observable<Array<string>> {
-    return this.http.get<Array<string>>('//'+window.location.hostname+':'+window.location.port+'/api/fields');
+    return this.http.get<Array<string>>(
+      "//" + window.location.hostname + ":" + window.location.port +
+        "/api/fields",
+    );
   }
 
-  autocomplete(query: string, caretIndex: number, resultMode: ResultMode): Observable<AutocompleteResult>
+  autocomplete(
-  {
+    query: string,
+    caretIndex: number,
+    resultMode: ResultMode,
+  ): Observable<AutocompleteResult> {
     const options = {
       params: new HttpParams()
-        .set('caretIndex', ""+caretIndex)
+        .set("caretIndex", "" + caretIndex)
-        .set('query', query)
+        .set("query", query)
-        .set('resultMode', resultMode)
+        .set("resultMode", resultMode),
     };
-    return this.http.get<AutocompleteResult>('//'+window.location.hostname+':'+window.location.port+'/api/autocomplete', options);
+    return this.http.get<AutocompleteResult>(
+      "//" + window.location.hostname + ":" + window.location.port +
+        "/api/autocomplete",
+      options,
+    );
   }
 
   abort(submitterId: string): Observable<void> {
-    return this.http.delete<void>('//'+window.location.hostname+':'+window.location.port+'/api/plots/'+submitterId)
+    return this.http.delete<void>(
+      "//" + window.location.hostname + ":" + window.location.port +
+        "/api/plots/" + submitterId,
+    );
   }
 
   sendPlotRequest(plotRequest: PlotRequest): Observable<PlotResponse> {
-    
     //console.log("send plot request: "+  JSON.stringify(plotRequest));
-    const result = this.http.post<PlotResponse>('//'+window.location.hostname+':'+window.location.port+'/api/plots', plotRequest);
+    const result = this.http.post<PlotResponse>(
+      "//" + window.location.hostname + ":" + window.location.port +
+        "/api/plots",
+      plotRequest,
+    );
     return result.pipe(map(this.enrichStats));
   }
 
@@ -77,36 +241,48 @@ export class PlotService {
   }
 
   getFilterDefaults(): Observable<FilterDefaults> {
-    return this.http.get<FilterDefaults>('//'+window.location.hostname+':'+window.location.port+'/api/filters/defaults')
+    return this.http.get<FilterDefaults>(
+      "//" + window.location.hostname + ":" + window.location.port +
+        "/api/filters/defaults",
+    );
   }
 
   splitQuery(query: string, splitBy: string): Observable<Array<string>> {
-    
     const q = "(" + query + ") and " + splitBy + "=";
     return this.autocomplete(q, q.length + 1, ResultMode.FULL_VALUES).pipe(
       map(
-        (autocompleteResult: AutocompleteResult) => autocompleteResult.proposals.map((suggestion:Suggestion) => suggestion.value)
+        (autocompleteResult: AutocompleteResult) =>
-      )
+          autocompleteResult.proposals.map((suggestion: Suggestion) =>
+            suggestion.value
+          ),
+      ),
     );
   }
+  toDateRange(dateValue: DateValue): Observable<DateRange> {
+    return this.http.post<{start: string, end:string, startEpochMilli: number, endEpochMilli: number}>("//" + window.location.hostname+":" + window.location.port +"/api/dates",dateValue)
+    .pipe(map((data) => {
+      const startDate = DateTime.fromFormat(data.start.slice(0, -1), this.DATE_PATTERN );
+      const endDate = DateTime.fromFormat(data.end.slice(0, -1), this.DATE_PATTERN );
+    
+  
+    return {
+      startDate: startDate,
+      endDate: endDate,
+      duration: endDate.diff(startDate),
+    };
+    }));
+  }
 }
 
-
 export class PlotType {
-  id: string;
+  constructor(
-  name: string;
+    public id: string,
-  icon: string
+    public name: string,
-  active: boolean;
+    public icon: string,
-  xAxis: DataType;
+    public active: boolean,
-  yAxis: DataType;
+    public xAxis: DataType,
-  
+    public yAxis: DataType,
-  constructor(id: string, name: string, icon: string, active: boolean, xAxis: DataType, yAxis: DataType) {
+  ) {
-    this.id = id;
-    this.name = name;
-    this.icon = icon;
-    this.active = active;
-    this.xAxis = xAxis;
-    this.yAxis = yAxis;
   }
 
   compatible(others: Array<PlotType>): boolean {
@@ -140,7 +316,7 @@ export enum DataType {
   Metric,
   HistogramBin,
   HistogramCount,
-    Other
+  Other,
 }
 
 export class AxesTypes {
@@ -186,10 +362,10 @@ export class AxesTypes {
     const x2 = this.getXAxisDataType(2);
     const y2 = this.getYAxisDataType(2);
 
-    return (x1 ? "x1:"+DataType[x1] : "")
+    return (x1 ? "x1:" + DataType[x1] : "") +
-      + (y1 ? " y1:"+DataType[y1] : "")
+      (y1 ? " y1:" + DataType[y1] : "") +
-      + (x2 ? " x2:"+DataType[x2] : "")
+      (x2 ? " x2:" + DataType[x2] : "") +
-      + (y2 ? " y2:"+DataType[y2] : ""); 
+      (y2 ? " y2:" + DataType[y2] : "");
   }
 }
 
@@ -197,10 +373,10 @@ export class Suggestion {
   constructor(
     public value: string,
     public newQuery: string,
-    public newCaretPosition: number){}
+    public newCaretPosition: number,
+  ) {}
 }
 
-
 export class AutocompleteResult {
   constructor(public proposals: Array<Suggestion>) {}
 }
@@ -217,35 +393,37 @@ export class PlotRequest {
   constructor(
     public submitterId: string,
     public config: PlotConfig,
-    public renders: RenderOptionsMap
+    public renders: RenderOptionsMap,
   ) {}
 
-  
   copy(): PlotRequest {
     return JSON.parse(JSON.stringify(this));
   }
 }
 
 export class PlotConfig {
-  constructor(    public query : string,
+  constructor(
+    public query: string,
     public groupBy: Array<string>,
     public limitBy: string,
     public limit: number,
     public y1: YAxisDefinition,
     public y2: YAxisDefinition | undefined,
-    public dateRange : string,
+    public dateRange: DateValue,
     public aggregates: Array<string>,
     public intervalUnit: string,
     public intervalValue: number,
-    public renderBarChartTickLabels: boolean = false,) {}
+    public renderBarChartTickLabels: boolean = false,
+  ) {}
 }
 
 export class RenderOptions {
   constructor(
     public height: number,
     public width: number,
-    public keyOutside: boolean, 
+    public showKey: boolean,
-    public renderLabels: boolean) {}
+    public renderLabels: boolean,
+  ) {}
 }
 
 export class YAxisDefinition {
@@ -253,13 +431,15 @@ export class YAxisDefinition {
     public axisScale: string,
     public rangeMin: number,
     public rangeMax: number,
-    public rangeUnit  : string){}
+    public rangeUnit: string,
+  ) {}
 }
 
 export class PlotResponse {
   constructor(
     public stats: PlotResponseStats,
-    public rendered: RenderedImages){}
+    public rendered: RenderedImages,
+  ) {}
 }
 
 export class PlotResponseStats {
@@ -269,7 +449,8 @@ export class PlotResponseStats {
     public average: number,
     public plottedValues: number,
     public maxAvgRatio: number,
-    public dataSeriesStats : Array<DataSeriesStats>){}
+    public dataSeriesStats: Array<DataSeriesStats>,
+  ) {}
 }
 
 export class DataSeriesStats {
@@ -280,23 +461,26 @@ export class DataSeriesStats {
     public average: number,
     public plottedValues: number,
     public dashTypeAndColor: DashTypeAndColor,
-    public percentiles: Map<string, number>){}
+    public percentiles: Map<string, number>,
+  ) {}
 }
 
 export class DashTypeAndColor {
   constructor(
     public color: string,
-    public pointType: number) {}
+    public pointType: number,
+  ) {}
 }
 
 export class FilterDefaults {
   constructor(
     public groupBy: Array<string>,
     public fields: Array<string>,
-    public splitBy: string){}
+    public splitBy: string,
+  ) {}
 }
 
 export enum ResultMode {
   CUT_AT_DOT = "CUT_AT_DOT",
-  FULL_VALUES = "FULL_VALUES"
+  FULL_VALUES = "FULL_VALUES",
 }

pdb-js/src/app/query-autocomplete/query-autocomplete.component.ts

@@ -1,5 +1,5 @@
-import { Component, OnInit, Input, ViewChild } from '@angular/core';
+import { Component, OnInit, Input, ViewChild, AfterViewInit } from '@angular/core';
-import {UntypedFormControl} from '@angular/forms';
+import {FormControl, UntypedFormControl} from '@angular/forms';
 import {Observable} from 'rxjs';
 import {startWith, map} from 'rxjs/operators';
 import {MatAutocompleteTrigger } from '@angular/material/autocomplete';
@@ -12,7 +12,7 @@ import { PlotService, PlotType, AutocompleteResult, Suggestion, ResultMode } fro
 })
 export class QueryAutocompleteComponent implements OnInit {
 
-  queryField = new UntypedFormControl('');
+  queryField = new FormControl<Suggestion>(new Suggestion("","",0));
 
   suggestions = new UntypedFormControl();
     
@@ -20,26 +20,33 @@ export class QueryAutocompleteComponent implements OnInit {
   
   query : string = ""; 
 
+  suggestionFetcherEnabled = true;
+  
   @ViewChild(MatAutocompleteTrigger)
   autocomplete!: MatAutocompleteTrigger;
   
   
-  constructor(private plotService: PlotService) {}
+  constructor(private plotService: PlotService) {
+  }
 
   ngOnInit() {
-    const that = this;
     this.query = "";
-    this.queryField.valueChanges.subscribe(function(value){
+    this.queryField.valueChanges.subscribe((value) =>{
+      if (value != null) {
         if (typeof value == "string") {
-        that.query = value;
+          this.query = value;
         }else{
-        that.query = value.newQuery;
+          this.query = value.newQuery;
           
-        var el : HTMLInputElement = <HTMLInputElement>document.getElementById('query-autocomplete-input');
+          const el : HTMLInputElement = <HTMLInputElement>document.getElementById('query-autocomplete-input');
           el.selectionStart=value.newCaretPosition;
           el.selectionEnd=value.newCaretPosition;
+        }
         
-        that.fetchSuggestions(value.newCaretPosition);
+        
+        if (this.suggestionFetcherEnabled) {
+          this.fetchSuggestions(value.newCaretPosition);
+        }
       }
     });
     this.filteredSuggestions = this.suggestions.valueChanges.pipe(
@@ -61,23 +68,21 @@ export class QueryAutocompleteComponent implements OnInit {
     const that = this;
     const query = typeof this.queryField.value == "string" 
       ? this.queryField.value
-      : this.queryField.value.newQuery;
+      : this.queryField.value!.newQuery;
     
     this.plotService
       .autocomplete(query, caretIndex, ResultMode.CUT_AT_DOT)
-      .subscribe(
+      .subscribe({
-        (data: AutocompleteResult) => {// success path
+        next: (data: AutocompleteResult) => {
-          //console.log(JSON.stringify(data.proposals));
           that.suggestions.setValue(data.proposals);
-          
           that.autocomplete.openPanel();
         }, 
-        (error:any) => console.log(error)
+        error: (error:any) => console.log(error)
+      }
       );
   }
   
   displaySuggestion(suggestion?: Suggestion): string {
-    //console.log("suggestion: "+JSON.stringify(suggestion));
     return suggestion ? suggestion.newQuery : '';
   }
 }

pdb-js/src/app/upload-page/upload-page.component.ts

@@ -3,7 +3,8 @@ import { Component, OnInit } from '@angular/core';
 @Component({
   selector: 'pdb-upload-page',
   templateUrl: './upload-page.component.html',
-  styleUrls: ['./upload-page.component.scss']
+  styleUrls: ['./upload-page.component.scss'],
+  standalone: true
 })
 export class UploadPageComponent implements OnInit {
 

pdb-js/src/app/visualization-page/visualization-page.component.html

@@ -4,21 +4,31 @@
   </div>
 
   <div id="date-box">
+    <app-date-picker #datePicker></app-date-picker>
+    <!--
     <mat-form-field class="pdb-form-full-width">
         <mat-label>Date Range:</mat-label>
         <input matInput id="search-date-range" value="dateRange" name="dates" />
       </mat-form-field>
+      -->
   </div>
 
   <div id="filters">
     <div id="filterpanel">
-      
-
       <mat-form-field class="pdb-form-full-width">
         <mat-label>Type:</mat-label>
-        <mat-select  multiple [(ngModel)]="selectedPlotType" (ngModelChange)="changePlotType($event)">
+        <mat-select
-          <mat-option *ngFor="let plotType of plotTypes" [value]="plotType" [disabled]="!plotType.active">
+          multiple
-            <img src="assets/img/{{plotType.icon}}.svg" class="icon-select" /> {{plotType.name}}
+          [(ngModel)]="selectedPlotType"
+          (ngModelChange)="changePlotType($event)"
+        >
+          <mat-option
+            *ngFor="let plotType of plotTypes"
+            [value]="plotType"
+            [disabled]="!plotType.active"
+          >
+            <img src="assets/img/{{ plotType.icon }}.svg" class="icon-select" />
+            {{ plotType.name }}
           </mat-option>
         </mat-select>
       </mat-form-field>
@@ -26,7 +36,9 @@
       <mat-form-field class="pdb-form-full-width">
         <mat-label>Group By:</mat-label>
         <mat-select multiple [(value)]="groupBy">
-          <mat-option *ngFor="let tagField of tagFields" [value]="tagField">{{tagField.name}}</mat-option>
+          <mat-option *ngFor="let tagField of tagFields" [value]="tagField">{{
+            tagField.name
+          }}</mat-option>
         </mat-select>
       </mat-form-field>
 
@@ -47,32 +59,62 @@
         </mat-form-field>
       </div>
       <div [hidden]="!selectedPlotTypesContains(['BAR', 'BOX'])">
-        <mat-checkbox [(ngModel)]="renderBarChartTickLabels">Show Tic Labels (bar chart)</mat-checkbox>
+        <mat-checkbox [(ngModel)]="renderBarChartTickLabels"
+          >Show Tic Labels (bar chart)</mat-checkbox
+        >
       </div>
-     <pdb-y-axis-definition #y1AxisDefinitionComponent yIndex="1"></pdb-y-axis-definition>
+      <pdb-y-axis-definition
-     <pdb-y-axis-definition #y2AxisDefinitionComponent yIndex="2" [hidden]="!y2AxisAvailable"></pdb-y-axis-definition>
+        #y1AxisDefinitionComponent
+        yIndex="1"
+      ></pdb-y-axis-definition>
+      <pdb-y-axis-definition
+        #y2AxisDefinitionComponent
+        yIndex="2"
+        [hidden]="!y2AxisAvailable"
+      ></pdb-y-axis-definition>
 
-     <mat-checkbox [(ngModel)]="enableGallery">Gallery</mat-checkbox>
+      <mat-checkbox
+        *ngIf="galleryEnabled"
+        [(ngModel)]="enableGallery"
+        (click)="toggleGallery($event)"
+        >Gallery</mat-checkbox
+      >
 
       <mat-form-field *ngIf="enableGallery" class="pdb-form-full-width">
         <mat-label>Split By:</mat-label>
         <mat-select [(value)]="splitBy">
-          <mat-option *ngFor="let tagField of tagFields" [value]="tagField">{{tagField.name}}</mat-option>
+          <mat-option *ngFor="let tagField of tagFields" [value]="tagField">{{
+            tagField.name
+          }}</mat-option>
         </mat-select>
         <mat-error *ngIf="splitBy == null || true">
           Please select a value!
         </mat-error>
       </mat-form-field>
 
-     
       <div id="plot-button-bar">
+        <a
+          mat-icon-button
+          [routerLink]="['/vis']"
+          [queryParams]="{ config: serializedConfig() }"
+          target="_blank"
+          aria-label="open new window with the same search"
+          title="open new window with the same search"
+          ><img src="assets/img/link.svg" aria-hidden="true"
+        /></a>
         <button
           *ngIf="!enableGallery && !plotJobActive"
           [disabled]="plotJobActive"
           mat-button
           matTooltip="Create Plot"
-        (click)="plot()">
+          (click)="plot()"
-          <img src="assets/img/scatter-chart2.svg" class="icon-inline" aria-hidden="true" title="create plot" />
+        >
+          <img
+            src="assets/img/scatter-chart2.svg"
+            class="icon-inline"
+            aria-hidden="true"
+            title="create plot"
+          />
           Plot
         </button>
         <button
@@ -80,15 +122,24 @@
           mat-button
           matTooltip="Create Gallery"
           (click)="gallery()"
-          [disabled]="this.splitBy == null">
+          [disabled]="this.splitBy == null"
-          <img src="assets/img/four-squares-line.svg" class="icon-inline" aria-hidden="true" title="Create Gallery (only active if 'Split' is set)" />
+        >
+          <img
+            src="assets/img/four-squares-line.svg"
+            class="icon-inline"
+            aria-hidden="true"
+            title="Create Gallery (only active if 'Split' is set)"
+          />
           Gallery
         </button>
         <button
           *ngIf="plotJobActive"
           mat-button
           (click)="abort()"
-          matTooltip="abort"><img src="assets/img/close.svg" class="icon-inline" /> Abort</button>
+          matTooltip="abort"
+        >
+          <img src="assets/img/close.svg" class="icon-inline" /> Abort
+        </button>
       </div>
     </div>
   </div>
@@ -97,12 +148,8 @@
     <pdb-plot-view
       #plotView
       (loadingEvent)="loading($event)"
-      (dateRangeUpdateEvent)="updateDateRange($event)"></pdb-plot-view>
+      (dateRangeUpdateEvent)="updateDateRange($event)"
-    <pdb-gallery-view
+    ></pdb-plot-view>
-      #galleryView>
+    <pdb-gallery-view #galleryView> </pdb-gallery-view>
-    </pdb-gallery-view>
   </div>
-  
 </div>
-
-

pdb-js/src/app/visualization-page/visualization-page.component.scss

@@ -15,11 +15,11 @@
     grid:
       "query-box query-box date-box" auto 
       "filters results results" 1fr
-      / 25.5em 3fr 24em;
+      / 25.5em 3fr auto;
   }
 }
 
-@media screen and (max-width: 1000px) {
+@media screen and (max-width: 900px) {
   #visualization {
     display: grid;
     margin: 0;
@@ -27,7 +27,7 @@
     grid:
       "query-box" auto
       "date-box" auto
-      "filters" auto
+      "filters" min-content
       "results" 1fr
       / 1fr;
   }
@@ -43,6 +43,8 @@
 
 #date-box{
   grid-area: date-box;
+  display: flex;
+  align-items: center;
 }
 
 
@@ -67,5 +69,7 @@
 }
 
 #plot-button-bar {
-  text-align: right;
+  display: flex;
+  justify-content: space-between;
 }
+

pdb-js/src/app/visualization-page/visualization-page.component.ts

@@ -1,123 +1,212 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import {
-import { PlotService, PlotType, PlotRequest, PlotResponse, TagField, FilterDefaults, DataType, YAxisDefinition, AxesTypes, PlotConfig, RenderOptions, RenderOptionsMap  } from '../plot.service';
+  AfterViewInit,
-import { UntypedFormControl, Validators } from '@angular/forms';
+  Component,
-import { MatSnackBar } from '@angular/material/snack-bar';
+  Input,
-import { LimitByComponent } from '../limit-by/limit-by.component';
+  OnInit,
-import { YAxisDefinitionComponent } from '../y-axis-definition/y-axis-definition.component';
+  ViewChild,
-import { QueryAutocompleteComponent } from '../query-autocomplete/query-autocomplete.component';
+} from "@angular/core";
-import { PlotViewComponent, SelectionRange, DateAnchor, LoadingEvent } from '../plot-view/plot-view.component';
+import {
-import { GalleryViewComponent } from '../gallery-view/gallery-view.component';
+  AxesTypes,
-import * as moment from 'moment';
+  DataType,
-import { WidgetDimensions } from '../dashboard.service';
+  FilterDefaults,
+  PlotConfig,
+  PlotRequest,
+  PlotService,
+  PlotType,
+  RenderOptions,
+  RenderOptionsMap,
+  Suggestion,
+  TagField,
+} from "../plot.service";
+import { UntypedFormControl } from "@angular/forms";
+import { MatSnackBar } from "@angular/material/snack-bar";
+import { LimitByComponent } from "../limit-by/limit-by.component";
+import { YAxisDefinitionComponent } from "../y-axis-definition/y-axis-definition.component";
+import { QueryAutocompleteComponent } from "../query-autocomplete/query-autocomplete.component";
+import {
+  DateRange,
+  LoadingEvent,
+  PlotViewComponent,
+} from "../plot-view/plot-view.component";
+import { GalleryViewComponent } from "../gallery-view/gallery-view.component";
+import { WidgetDimensions } from "../dashboard.service";
+import {
+  DatePickerComponent,
+  DateValue,
+} from "../components/datepicker/date-picker.component";
 
 @Component({
-  selector: 'pdb-visualization-page',
+  selector: "pdb-visualization-page",
-  templateUrl: './visualization-page.component.html',
+  templateUrl: "./visualization-page.component.html",
-  styleUrls: ['./visualization-page.component.scss']
+  styleUrls: ["./visualization-page.component.scss"],
 })
-export class VisualizationPageComponent implements OnInit {
+export class VisualizationPageComponent implements OnInit, AfterViewInit {
-  
   readonly DATE_PATTERN = "YYYY-MM-DD HH:mm:ss"; // for moment-JS
 
-  dateRange = new UntypedFormControl('2019-10-05 00:00:00 - 2019-10-11 23:59:59');
+  @Input()
+  defaultConfig?: PlotConfig;
+
+  @Input()
+  galleryEnabled = true;
+
+  dateRange = new UntypedFormControl(
+    "2019-10-05 00:00:00 - 2019-10-11 23:59:59",
+  );
 
   selectedPlotType = new Array<PlotType>();
-  plotTypes: Array<any> = [];
+  plotTypes: PlotType[] = [];
 
   tagFields: Array<TagField> = new Array<TagField>();
 
   groupBy = new Array<TagField>();
 
-  @ViewChild('limitbycomponent')
+  @ViewChild("limitbycomponent")
   private limitbycomponent!: LimitByComponent;
 
-  
+  @ViewChild("y1AxisDefinitionComponent", { read: YAxisDefinitionComponent })
-  @ViewChild('y1AxisDefinitionComponent',  { read: YAxisDefinitionComponent })
   private y1AxisDefinitionComponent!: YAxisDefinitionComponent;
 
-  @ViewChild('y2AxisDefinitionComponent',  { read: YAxisDefinitionComponent })
+  @ViewChild("y2AxisDefinitionComponent", { read: YAxisDefinitionComponent })
   private y2AxisDefinitionComponent!: YAxisDefinitionComponent;
 
-  @ViewChild('query')
+  @ViewChild("query")
   query!: QueryAutocompleteComponent;
 
-  @ViewChild('plotView')
+  @ViewChild("plotView")
   plotView!: PlotViewComponent;
 
-  @ViewChild('galleryView')
+  @ViewChild("galleryView")
   galleryView!: GalleryViewComponent;
 
+  @ViewChild("datePicker")
+  datePicker!: DatePickerComponent;
+
   enableGallery = false;
   splitBy: TagField | undefined = undefined;
   y2AxisAvailable = false;
 
-  intervalUnit = 'NO_INTERVAL';
+  intervalUnit = "NO_INTERVAL";
   intervalValue = 1;
   renderBarChartTickLabels = false;
 
   plotJobActive = false;
 
   constructor(private plotService: PlotService, private snackBar: MatSnackBar) {
+    const params = new URLSearchParams(window.location.search);
+    if (!this.defaultConfig && params.get("config")) {
+      const config = JSON.parse(params.get("config")!);
+      this.defaultConfig = config;
+    }
   }
 
   showError(message: string) {
     this.snackBar.open(message, "", {
       duration: 5000,
-      verticalPosition: 'top'
+      verticalPosition: "top",
     });
   }
 
   ngOnInit() {
-    const that = this;
-
     (<any> window).initDatePicker();
 
     this.plotTypes = this.plotService.getPlotTypes();
     this.selectedPlotType.push(this.plotTypes[0]);
 
-    that.plotService.getFilterDefaults().subscribe(function(filterDefaults: FilterDefaults) {
+    this.plotService.getFilterDefaults().subscribe(
-    
+      (filterDefaults: FilterDefaults) => {
-      filterDefaults.fields.forEach(function(name:string) {
+        filterDefaults.fields.forEach((name: string) => {
-        that.tagFields.push(new TagField(name));
+          this.tagFields.push(new TagField(name));
-      },
+        }, (error: any) => {
-      (error: any) => {
+          this.showError(error.error.message);
-        that.showError(error.error.message);
         });
 
-      that.groupBy = that.tagFields.filter(val => filterDefaults.groupBy.includes(val.name));
+        const groupByDefaults = this.defaultConfig
-      that.splitBy = that.tagFields.find(val => filterDefaults.splitBy == val.name);
+          ? this.defaultConfig.groupBy
-    });
+          : filterDefaults.groupBy;
+        this.groupBy = this.tagFields.filter((val) =>
+          groupByDefaults.includes(val.name)
+        );
+        this.splitBy = this.tagFields.find((val) =>
+          filterDefaults.splitBy == val.name
+        );
+
+        if (this.defaultConfig) {
+          this.plot();
         }
+      },
+    );
+  }
+
+  ngAfterViewInit(): void {
+    if (this.defaultConfig) {
+      const c = this.defaultConfig;
+      this.query.suggestionFetcherEnabled = false;
+      this.query.queryField.setValue(
+        new Suggestion(c.query, c.query, c.query.length),
+      );
+      this.query.suggestionFetcherEnabled = true;
+
+      this.selectedPlotType = this.plotTypes.filter((pt) =>
+        c.aggregates.includes(pt.id)
+      );
+      this.changePlotType(this.selectedPlotType);
+      this.updateDateRange(c.dateRange, false);
+      this.limitbycomponent.limitBy = c.limitBy;
+      this.limitbycomponent.limit = c.limit;
+      this.intervalUnit = c.intervalUnit;
+      this.intervalValue = c.intervalValue;
+      this.y1AxisDefinitionComponent.yAxisScale = c.y1.axisScale;
+      this.y1AxisDefinitionComponent.minYValue = c.y1.rangeMin;
+      this.y1AxisDefinitionComponent.maxYValue = c.y1.rangeMax;
+      this.y1AxisDefinitionComponent.yAxisUnit = c.y1.rangeUnit;
+
+      if (c.y2) {
+        this.y2AxisDefinitionComponent.yAxisScale = c.y2.axisScale;
+        this.y2AxisDefinitionComponent.minYValue = c.y2.rangeMin;
+        this.y2AxisDefinitionComponent.maxYValue = c.y2.rangeMax;
+        this.y2AxisDefinitionComponent.yAxisUnit = c.y2.rangeUnit;
+      }
+    }
+  }
+
+  toggleGallery(event: Event) {
+    this.galleryView.show = this.enableGallery;
+  }
+
   loading(event: LoadingEvent) {
     this.plotJobActive = event.loading;
   }
 
-  updateDateRange(newDateRange: string) {
+  updateDateRange(newDateRange: DateValue, updatePlot = true) {
-    (<HTMLInputElement>document.getElementById("search-date-range")).value = newDateRange;
+    this.datePicker.setDateValue(newDateRange);
+    if (updatePlot) {
       this.plot();
     }
+  }
 
   changePlotType(selectedPlotTypes: Array<PlotType>) {
-    const compatiblePlotTypes = this.plotTypes.filter(pt => pt.compatible(selectedPlotTypes));
+    const compatiblePlotTypes = this.plotTypes.filter((pt) =>
-    this.plotTypes.forEach(pt => pt.active=false);
+      pt.compatible(selectedPlotTypes)
-    compatiblePlotTypes.forEach(pt => pt.active=true);
+    );
+    this.plotTypes.forEach((pt) => pt.active = false);
+    compatiblePlotTypes.forEach((pt) => pt.active = true);
 
     const axesTypes = this.getAxes();
     this.y2AxisAvailable = axesTypes.y.length == 2;
   }
 
   selectedPlotTypesContains(plotTypeIds: Array<string>) {
-    return this.selectedPlotType.filter(pt => plotTypeIds.includes(pt.id)).length > 0;
+    return this.selectedPlotType.filter((pt) => plotTypeIds.includes(pt.id))
+      .length > 0;
   }
 
-  
+  dateRangeAsString(): DateValue {
-  dateRangeAsString() : string {
+    return this.datePicker.getDateValue();
-    return (<HTMLInputElement>document.getElementById("search-date-range")).value;
   }
 
   gallery() {
     if (this.splitBy != null) {
-      this.plotView.imageUrl = '';
+      this.plotView.imageUrl = "";
       this.plotView.stats = null;
       this.galleryView.show = true;
       const request = this.createPlotRequest();
@@ -128,7 +217,6 @@ export class VisualizationPageComponent implements OnInit {
   }
 
   getAxes(): AxesTypes {
-    
     const x = new Array<DataType>();
     const y = new Array<DataType>();
 
@@ -148,7 +236,7 @@ export class VisualizationPageComponent implements OnInit {
   abort() {
     this.plotService.abort((<any> window).submitterId).subscribe({
       complete: () => {
-      }
+      },
     });
   }
 
@@ -161,24 +249,27 @@ export class VisualizationPageComponent implements OnInit {
     const results = document.getElementById("results");
     return new WidgetDimensions(
       results != null ? results.offsetWidth - 1 : 1024,
-      results != null ? results.offsetHeight-1: 1024);
+      results != null ? results.offsetHeight - 1 : 1024,
+    );
   }
 
   createPlotConfig(): PlotConfig {
     const aggregates = new Array<string>();
-    this.selectedPlotType.forEach(a => aggregates.push(a.id));
+    this.selectedPlotType.forEach((a) => aggregates.push(a.id));
 
     const y1 = this.y1AxisDefinitionComponent.getAxisDefinition();
-    const y2 = this.y2AxisDefinitionComponent ? this.y2AxisDefinitionComponent.getAxisDefinition() : undefined;
+    const y2 = this.y2AxisDefinitionComponent
+      ? this.y2AxisDefinitionComponent.getAxisDefinition()
+      : undefined;
 
     const config = new PlotConfig(
       this.query.query,
-      this.groupBy.map(o => o.name),
+      this.groupBy.map((o) => o.name),
       this.limitbycomponent.limitBy,
       this.limitbycomponent.limit,
       y1,
       y2,
-      this.dateRangeAsString(), // dateRange 
+      this.datePicker.getDateValue(), // dateRange
       aggregates, // aggregates
       this.intervalUnit,
       this.intervalValue,
@@ -193,15 +284,29 @@ export class VisualizationPageComponent implements OnInit {
     const config = this.createPlotConfig();
 
     const renderOptions: RenderOptionsMap = {
-      'main': new RenderOptions(results!.offsetHeight-1, results!.offsetWidth-1, false, true),
+      "main": new RenderOptions(
-      'thumbnail': new RenderOptions(200, 300, false, false),
+        results!.offsetHeight - 1,
+        results!.offsetWidth - 1,
+        true,
+        true,
+      ),
+      "thumbnail": new RenderOptions(200, 300, false, false),
     };
 
     const request = new PlotRequest(
       (<any> window).submitterId,
       config,
-      renderOptions
+      renderOptions,
     );
     return request;
   }
+
+  serializedConfig(): string {
+    try {
+      const config = this.createPlotConfig();
+      return JSON.stringify(config);
+    } catch (e) {
+      return "";
+    }
+  }
 }

pdb-js/src/app/y-axis-definition/y-axis-definition.component.html

@@ -11,11 +11,15 @@
       <mat-form-field class="pdb-form-mid">
         <mat-label>Y{{yIndex}}-Axis Unit:</mat-label>
         <mat-select [(value)]="yAxisUnit">
-          <mat-optgroup label="⸺numbers⸺">
+          <mat-optgroup label="—numbers—">
             <mat-option value="AUTOMATIC_NUMBER">auto (number)</mat-option>
             <mat-option value="NO_UNIT">no unit</mat-option>
           </mat-optgroup>
-          <mat-optgroup label="⸺time⸺">
+          <mat-optgroup label="—bytes—">
+            <mat-option value="AUTOMATIC_BYTES">auto (bytes)</mat-option>
+            <mat-option value="BYTES">bytes</mat-option>
+          </mat-optgroup>
+          <mat-optgroup label="—time—">
             <mat-option value="AUTOMATIC_TIME">auto (time)</mat-option>
             <mat-option value="MILLISECONDS">millis</mat-option>
             <mat-option value="SECONDS">seconds</mat-option>
@@ -25,11 +29,11 @@
           </mat-optgroup>
         </mat-select>
       </mat-form-field>
-      <mat-form-field *ngIf="yAxisUnit !== 'AUTOMATIC_TIME' && yAxisUnit !== 'AUTOMATIC_NUMBER'" class="pdb-form-number">
+      <mat-form-field *ngIf="yAxisUnit !== 'AUTOMATIC_TIME' && yAxisUnit !== 'AUTOMATIC_NUMBER' && yAxisUnit !== 'AUTOMATIC_BYTES'" class="pdb-form-number">
         <mat-label>Min:</mat-label>
         <input matInput type="number" placeholder="Min" min="0" [(ngModel)]="minYValue">
       </mat-form-field>
-      <mat-form-field *ngIf="yAxisUnit !== 'AUTOMATIC_TIME' && yAxisUnit !== 'AUTOMATIC_NUMBER'" class="pdb-form-number">
+      <mat-form-field *ngIf="yAxisUnit !== 'AUTOMATIC_TIME' && yAxisUnit !== 'AUTOMATIC_NUMBER' && yAxisUnit !== 'AUTOMATIC_BYTES'" class="pdb-form-number">
         <mat-label>Max:</mat-label>
         <input matInput type="number" placeholder="Max" min="0" [(ngModel)]="maxYValue">
       </mat-form-field>

pdb-js/src/app/y-axis-definition/y-axis-definition.component.ts

@@ -1,10 +1,27 @@
 import { Component,  Input } from '@angular/core';
 import { YAxisDefinition  } from '../plot.service';
+import { BrowserModule } from '@angular/platform-browser';
+import { MatFormField, MatLabel } from '@angular/material/form-field';
+import { MatOptgroup, MatOption, MatSelect } from '@angular/material/select';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { MatInput } from '@angular/material/input';
 
 @Component({
   selector: 'pdb-y-axis-definition',
   templateUrl: './y-axis-definition.component.html',
-  styleUrls: ['./y-axis-definition.component.scss']
+  styleUrls: ['./y-axis-definition.component.scss'],
+  standalone: true,
+  imports: [
+    BrowserModule,
+    FormsModule,
+    MatFormField,
+    MatInput,
+    MatLabel,
+    MatSelect,
+    MatOption,
+    MatOptgroup,
+    ReactiveFormsModule
+  ]
 })
 export class YAxisDefinitionComponent {
 

pdb-js/src/assets/img/bookmark-add-line.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24" viewBox="0 0 24 24" width="24"><rect fill="none" height="24" width="24"/><path d="M17,11v6.97l-5-2.14l-5,2.14V5h6V3H7C5.9,3,5,3.9,5,5v16l7-3l7,3V11H17z M21,7h-2v2h-2V7h-2V5h2V3h2v2h2V7z"/></svg>

pdb-js/src/assets/img/bookmark-line.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M17 3H7c-1.1 0-2 .9-2 2v16l7-3 7 3V5c0-1.1-.9-2-2-2zm0 15l-5-2.18L7 18V5h10v13z"/></svg>

pdb-js/src/assets/img/bookmarks-line.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M15 7v12.97l-4.21-1.81-.79-.34-.79.34L5 19.97V7h10m4-6H8.99C7.89 1 7 1.9 7 3h10c1.1 0 2 .9 2 2v13l2 1V3c0-1.1-.9-2-2-2zm-4 4H5c-1.1 0-2 .9-2 2v16l7-3 7 3V7c0-1.1-.9-2-2-2z"/></svg>

pdb-js/src/assets/img/drag_handle.svg

@@ -0,0 +1,21 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 32 32">
+<g transform="translate(0.5,0.5)" style="fill:black">
+<circle cx="4" cy="9" r="2"/>
+<circle cx="12" cy="9" r="2"/>
+<circle cx="20" cy="9" r="2"/>
+<circle cx="28" cy="9" r="2"/>
+
+<circle cx="4" cy="15" r="2"/>
+<circle cx="12" cy="15" r="2"/>
+<circle cx="20" cy="15" r="2"/>
+<circle cx="28" cy="15" r="2"/>
+
+<circle cx="4" cy="21" r="2"/>
+<circle cx="12" cy="21" r="2"/>
+<circle cx="20" cy="21" r="2"/>
+<circle cx="28" cy="21" r="2"/>
+</g>
+</svg>
+
+
+

pdb-js/src/assets/img/image-aborted.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality" fill-rule="evenodd" clip-rule="evenodd" viewBox="-30 -30 700 700">
+<path d="M-.012 65.611h640.024v508.778H-.012V65.611zm180.026 132.273c22.996 0 41.635 18.638 41.635 41.634 0 22.997-18.638 41.635-41.635 41.635-22.996 0-41.634-18.638-41.634-41.635 0-22.996 18.638-41.634 41.634-41.634zm175.207 178.679l83.269-143.978 88.466 223.763h-412.86v-27.756l34.702-1.725 34.69-85.005 17.338 60.722h52.052l45.095-116.222 57.248 90.201zM47.528 107.764h544.944v424.47H47.528v-424.47z"/>
+
+<line x1="10" y1="630" x2="630" y2="10" style="stroke:#000; stroke-width: 60px; stroke-linecap: round;" />
+</svg>

pdb-js/src/assets/img/launch.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"/></svg>

pdb-js/src/assets/img/move.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512"><title>ionicons-v5-g</title><polyline points="176 112 256 32 336 112" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><line x1="255.98" y1="32" x2="256" y2="480" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><polyline points="176 400 256 480 336 400" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><polyline points="400 176 480 256 400 336" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><polyline points="112 176 32 256 112 336" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><line x1="32" y1="256" x2="480" y2="256" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/></svg>

pdb-js/src/assets/img/resize.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512"><title>ionicons-v5-c</title><polyline points="304 96 416 96 416 208" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><line x1="405.77" y1="106.2" x2="111.98" y2="400.02" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><polyline points="208 416 96 416 96 304" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/></svg>

pdb-js/src/assets/img/save-outline.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512"><title>ionicons-v5-p</title><path d="M380.93,57.37A32,32,0,0,0,358.3,48H94.22A46.21,46.21,0,0,0,48,94.22V417.78A46.21,46.21,0,0,0,94.22,464H417.78A46.36,46.36,0,0,0,464,417.78V153.7a32,32,0,0,0-9.37-22.63ZM256,416a64,64,0,1,1,64-64A63.92,63.92,0,0,1,256,416Zm48-224H112a16,16,0,0,1-16-16V112a16,16,0,0,1,16-16H304a16,16,0,0,1,16,16v64A16,16,0,0,1,304,192Z" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/></svg>

pdb-js/src/assets/js/invaders.js

@@ -7,32 +7,24 @@ var invaders_stepSize = 5;
 var invaders_margin = 30;
 var invaders_city_height = 75;
 var invaders_pause = true;
-var invaders_parentDivId = 'invaders_area';
+var invaders_area = 'invaders_area';
 var invaders_kills = 0;
 var invaders_points = 0;
 var invaders_points_kill = 10;
 var invaders_points_lost = -50;
 var invaders_game_over = false;
 var invaders_loop_count = 0;
+var invaders_parentDivId = "invaders";
 
 function initInvaders(parentDivId) {
+    invaders_parentDivId = parentDivId;
 	
-	// create a copy of the parentDiv
+    $('body').append('<div id="'+invaders_area+'"><div id="invaders_points">Points: 0</div><div id="invaders_kills">Kills: 0</div><div id="invaders_game_over"><div class="invader_notify">Game Over</div></div></div>');
-	// and set it at the exact same position
-	var parent = $('#'+parentDivId);
-    var height = parent.height();
-    var width = parent.width();
-    $('body').append('<div id="'+invaders_parentDivId+'"><div id="invaders_points">Points: 0</div><div id="invaders_kills">Kills: 0</div><div id="invaders_game_over"><div class="invader_notify">Game Over</div></div></div>');
-    $('#'+invaders_parentDivId).offset({ top: parent.offset().top, left: parent.offset().left})
-    $('#'+invaders_parentDivId).height(parent.height());
-    $('#'+invaders_parentDivId).width(parent.width());
-    
-    $('#'+invaders_parentDivId)
     
     $('.invader_notify').click(function() {
     	// restart the game
-    	$('#'+invaders_parentDivId).remove();
+    	$('#'+invaders_area).remove();
-    	initInvaders(parentDivId);
+    	initInvaders(invaders_parentDivId);
     	invaders_game_over = false;
     	invaders_kills = 0;
 		  invaders_points = 0;
@@ -49,7 +41,7 @@ function gameOver() {
 }
 
 function pauseInvaders() {
-	$('#'+invaders_parentDivId).hide();
+	$('#'+invaders_area).hide();
 	clearIntervals();
 }
 
@@ -60,15 +52,25 @@ function clearIntervals() {
 
 function startInvaders() {
 
-	$('#'+invaders_parentDivId).show();
+  // move invaders_area to the same position as the parent div
+  const parent = $('#'+invaders_parentDivId);
+  const height = parent.height();
+  const width = parent.width();
+  const area = document.getElementById(invaders_area);
+  area.style.top=parent.offset().top+"px";
+  area.style.left=parent.offset().left+"px";
+  area.style.height=parent.height()+"px";
+  area.style.width=parent.width()+"px";
+	
+	$('#'+invaders_area).show();
 
 	if (!invaders_game_over) {
 		if (invaders_count == 0) {
-			addInvader(invaders_parentDivId);
+			addInvader(invaders_area);
 		}
 	
 		clearIntervals();
-		invaders_game_move=window.setInterval("moveRandomly('"+invaders_parentDivId+"')",100);
+		invaders_game_move=window.setInterval("moveRandomly('"+invaders_area+"')",100);
 		invaders_game_new=window.setInterval("addInvader()", 1000);
 	}
 }
@@ -77,7 +79,7 @@ function startInvaders() {
 function addInvader()
 {
     var id = 'invader_' + invaders_count++;
-    var parent = $('#'+invaders_parentDivId);
+    var parent = $('#'+invaders_area);
     var height = parent.height();
     var width = parent.width();
     var top =  10; // start at the top

pdb-js/src/index.html

@@ -40,17 +40,30 @@
               'Last 30 Days': [moment().subtract(29, 'days').startOf('day'), moment().endOf('day')],
               'This Month': [moment().startOf('month'), moment().endOf('month').endOf('day')],
               'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')],
-              'Last 3 Months': [moment().subtract(3, 'month').startOf('month'),moment().endOf('month').endOf('day')],
+              'Last 3 Months': [moment().subtract(3, 'month').startOf('month'),moment().subtract(1, 'month').endOf('month').endOf('day')],
               'This Year': [moment().startOf('year'),moment().endOf('month').endOf('day')],
               'Last Year': [moment().subtract(1, 'year').startOf('year'),moment().subtract(1, 'year').endOf('year')],
           },
         });
     }
 
+    function initSimpleDatePicker() {
+      $('input[name="dates"]').daterangepicker({
+          timePicker: true,
+          minDate: "2017-01-01",
+          maxDate: "2029-12-31",
+          maxYear: parseInt(moment().format('YYYY'),10),
+          timePicker24Hour: true,
+          timePickerSeconds: true,
+          showDropdowns: true, // drop downs for selecting year and month
+          locale: {
+            format: 'YYYY-MM-DD HH:mm:ss',
+            "firstDay": 1 // monday is the first day of the week
+          },
+        });
+    }
+
     $( document ).ready(function() {
-        //initDatePicker();
-        
-        
         initInvaders('results');
         document.addEventListener("invadersPause", function(event) {
           pauseInvaders();

pdb-js/src/main.ts

@@ -8,7 +8,11 @@ if (environment.production) {
   enableProdMode();
 }
 
-(<any>window).submitterId = crypto.randomUUID();
+(<any>window).randomId = () => {
+  return Math.random().toString(36).replace('0.', '') + Math.random().toString(36).replace('0.', '');
+};
+
+(<any>window).submitterId = (<any>window).randomId();
 
 platformBrowserDynamic().bootstrapModule(AppModule)
   .catch(err => console.error(err));

pdb-js/src/styles.scss

@@ -14,25 +14,21 @@
 //  If you don't need the default component typographies but still want the hierarchy styles,
 //  you can delete this line and instead use:
 //    `@include mat.legacy-typography-hierarchy(mat.define-typography-config());`
-/* TODO(mdc-migration): Remove all-legacy-component-typographies once all legacy components are migrated*/
-@include mat.all-legacy-component-typographies();
 @include mat.all-component-typographies();
-/* TODO(mdc-migration): Remove legacy-core once all legacy components are migrated*/
-@include mat.legacy-core();
 @include mat.core();
 
 // Define the palettes for your theme using the Material Design palettes available in palette.scss
 // (imported above). For each palette, you can optionally specify a default, lighter, and darker
 // hue. Available color palettes: https://material.io/design/color/
-$candy-app-primary: mat.define-palette(mat.$blue-palette);
+$candy-app-primary: mat.m2-define-palette(mat.$m2-blue-palette);
-$candy-app-accent: mat.define-palette(mat.$blue-palette, A200, A100, A400);
+$candy-app-accent: mat.m2-define-palette(mat.$m2-blue-palette, A200, A100, A400);
 
 // The warn palette is optional (defaults to red).
-$candy-app-warn: mat.define-palette(mat.$red-palette);
+$candy-app-warn: mat.m2-define-palette(mat.$m2-red-palette);
 
 // Create the theme object. A theme consists of configurations for individual
 // theming systems such as "color" or "typography".
-$candy-app-theme: mat.define-light-theme((
+$candy-app-theme: mat.m2-define-light-theme((
   color: (
     primary: $candy-app-primary,
     accent: $candy-app-accent,
@@ -45,8 +41,6 @@ $candy-app-theme: mat.define-light-theme((
 // Include theme styles for core and each component used in your app.
 // Alternatively, you can import and @include the theme mixins for each component
 // that you are using.
-/* TODO(mdc-migration): Remove all-legacy-component-themes once all legacy components are migrated*/
-@include mat.all-legacy-component-themes($candy-app-theme);
 @include mat.all-component-themes($candy-app-theme);
 
 
@@ -97,6 +91,10 @@ h2 {
   margin-block-end: 0.83rem;
 }
 
+.hidden {
+  visibility: hidden;
+}
+
 .icon-inline {
   width: 1em;
   height: 1em;
@@ -110,23 +108,25 @@ button[disabled] .icon-inline {
 button.save-button {
   background-color: #ff9900;
 }
+button.save-button:disabled {
+  background-color: inherit;
+}
+
+.icon-tiny {
+  width: 1em;
+  height: 1em;
+}
 
 .icon-small {
   width: 1.5em;
   height: 1.5em;
 }
-.icon-small:hover {
-  background-color: #eee;
-}
 
 .icon-middle {
   width: 2.5em;
   height: 2.5em;
   margin: 0.2em;
 }
-.icon-middle:hover {
-  background-color: #eee;
-}
 
 .icon-large {
   width: 8em;
@@ -145,8 +145,6 @@ button.save-button {
   vertical-align: text-bottom;
 }
 
-
-
 a ,a:visited {
   color: blue;
   text-decoration: none;
@@ -178,6 +176,9 @@ a.external-link:after {
 mat-form-field.pdb-form-full-width {
   width: 100%;
 }
+mat-form-field.pdb-form-number-small {
+  width: 4.5em;
+}
 mat-form-field.pdb-form-number {
   width: 5.5em;
 }
@@ -190,13 +191,14 @@ mat-form-field.pdb-form-mid {
 mat-form-field.pdb-form-wide {
   width: 10em;
 }
-.mat-mdc-form-field-subscript-wrapper  {
+pdb-visualization-page .mat-mdc-form-field-subscript-wrapper,
-  display: none;
+app-add-text-dialog .mat-mdc-form-field-subscript-wrapper  {
+  display: none;/**/
 }
 
 .errorPanel {
   padding: 1ex;
-  background-color: map-get(mat.$red-palette, 100);
+  background-color: map-get(mat.$m2-red-palette, 100);
   border-radius: 5px;
 }
 
@@ -207,3 +209,73 @@ mat-form-field.pdb-form-wide {
   top: 0.2em;
   line-height: 1em;
 }
+
+a.external-link:after {
+  content: "";
+  display: inline-block;
+  background: url("assets/img/external-link.svg") no-repeat;
+  background-size: 1em;
+  width: 1em;
+  height: 1em;
+  margin-left: 0.3em;
+  vertical-align: text-top;
+}
+
+
+/* styles for markdown*/
+markdown blockquote {
+  border-left: 3px grey solid;
+  display: block;
+  margin: 1em 0 1em 2em;
+  padding: 0.5em 0 0.5em 0.5em;
+}
+
+markdown table {
+  border-collapse: collapse;
+}
+
+markdown table th, markdown table td {
+  border: solid 1px black;
+  padding: 0.4em;
+}
+markdown thead {
+  border-bottom: 2px black solid;
+}
+markdown tfoot {
+  border-top: 2px black solid;
+}
+
+markdown pre {
+  font-family: monospace;
+}
+
+
+.plot-details-plotType {
+  background-image: url(/assets/img/pointTypes.png);
+  width: 9px;
+  height: 7px;
+  transform: scale(1.5);
+}
+
+.plot-details-plotType_0 {background-position-x:    0px;}
+.plot-details-plotType_1 {background-position-x:  -10px;}
+.plot-details-plotType_2 {background-position-x:  -20px;}
+.plot-details-plotType_3 {background-position-x:  -30px;}
+.plot-details-plotType_4 {background-position-x:  -40px;}
+.plot-details-plotType_5 {background-position-x:  -50px;}
+.plot-details-plotType_6 {background-position-x:  -60px;}
+.plot-details-plotType_7 {background-position-x:  -70px;}
+.plot-details-plotType_8 {background-position-x:  -80px;}
+.plot-details-plotType_9 {background-position-x:  -90px;}
+.plot-details-plotType_10 {background-position-x:-100px;}
+.plot-details-plotType_11 {background-position-x:-110px;}
+.plot-details-plotType_12 {background-position-x:-120px;}
+
+.plot-details-plotType_0051c2 {background-position-y:   0px;}
+.plot-details-plotType_bf8300 {background-position-y:  -8px;}
+.plot-details-plotType_9400d3 {background-position-y: -16px;}
+.plot-details-plotType_00c254 {background-position-y: -24px;}
+.plot-details-plotType_e6e600 {background-position-y: -32px;}
+.plot-details-plotType_e51e10 {background-position-y: -40px;}
+.plot-details-plotType_57a1c2 {background-position-y: -48px;}
+.plot-details-plotType_bd36c2 {background-position-y: -56px;}

pdb-js/tsconfig.json

@@ -5,6 +5,7 @@
     "baseUrl": "./",
     "outDir": "./dist/out-tsc",
     "forceConsistentCasingInFileNames": true,
+    "esModuleInterop": true,
     "strict": true,
     "noImplicitOverride": true,
     "noPropertyAccessFromIndexSignature": true,
@@ -12,7 +13,6 @@
     "noFallthroughCasesInSwitch": true,
     "sourceMap": true,
     "declaration": false,
-    "downlevelIteration": true,
     "experimentalDecorators": true,
     "moduleResolution": "node",
     "importHelpers": true,

pdb-plotting/src/main/java/org/lucares/pdb/plot/api/DateTimeRangeParser.java

@@ -0,0 +1,143 @@
+package org.lucares.pdb.plot.api;
+
+import java.time.DayOfWeek;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalAdjusters;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.lucares.pdb.api.DateTimeRange;
+import org.lucares.utils.Preconditions;
+
+public class DateTimeRangeParser {
+
+    private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+    public static DateTimeRange parse(final OffsetDateTime offsetTime, final String datePeriod) {
+
+        final String[] startEnd = datePeriod.split(Pattern.quote("/"));
+        final String start = startEnd[0];
+        final String end = startEnd[1];
+
+        final OffsetDateTime startTime = parseInternal(offsetTime, start);
+        final OffsetDateTime endTime = parseInternal(offsetTime, end);
+
+        return new DateTimeRange(startTime, endTime);
+    }
+
+    private static OffsetDateTime parseInternal(final OffsetDateTime offsetTime, final String timeDefinition) {
+
+        final Pattern regex = Pattern.compile("(?<beginEnd>[BE])(?<amountUnit>(\\-?[0-9]*[mHDWMY])+)",
+                Pattern.MULTILINE);
+
+        final Matcher matcher = regex.matcher(timeDefinition);
+
+        if (matcher.matches()) {
+
+            final String beginEnd = matcher.group("beginEnd");
+            final boolean begin = "B".equals(beginEnd);
+
+            OffsetDateTime result = offsetTime;
+
+            final String amountUnitString = matcher.group("amountUnit");
+            final Pattern regexAmountUnit = Pattern.compile("(?<amount>\\-?[0-9]*)(?<unit>[mHDWMY])");
+            final Matcher m = regexAmountUnit.matcher(amountUnitString);
+            while (m.find()) {
+                final String amountString = m.group("amount");
+                final String unitString = m.group("unit");
+                final int amount = amountString.equals("") ? 0 : Integer.parseInt(amountString);
+
+                switch (unitString) {
+                case "m": {
+                    final ChronoUnit unit = ChronoUnit.MINUTES;
+                    if (begin) {
+                        result = result.plus(amount, unit).truncatedTo(unit);
+                    } else {
+                        result = result.plus(amount + 1, unit).truncatedTo(unit).minusSeconds(1);
+                    }
+                    break;
+                }
+                case "H": {
+                    final ChronoUnit unit = ChronoUnit.HOURS;
+                    if (begin) {
+                        result = result.plus(amount, unit).truncatedTo(unit);
+                    } else {
+                        result = result.plus(amount + 1, unit).truncatedTo(unit).minusSeconds(1);
+                    }
+                    break;
+                }
+                case "D": {
+                    final ChronoUnit unit = ChronoUnit.DAYS;
+                    if (begin) {
+                        result = result.plus(amount, unit).truncatedTo(unit);
+                    } else {
+                        result = result.plus(amount + 1, unit).truncatedTo(unit).minusSeconds(1);
+                    }
+                    break;
+                }
+                case "W": {
+                    final DayOfWeek firstDayOfWeek = DayOfWeek.MONDAY;
+                    final DayOfWeek lastDayOfWeek = DayOfWeek
+                            .of(((firstDayOfWeek.getValue() - 1 + 6) % DayOfWeek.values().length) + 1); // weird
+                                                                                                        // computation,
+                                                                                                        // because
+                                                                                                        // DayOfWeek
+                                                                                                        // goes from 1
+                                                                                                        // to 7
+                    final ChronoUnit unit = ChronoUnit.WEEKS;
+                    if (begin) {
+                        result = result.plus(amount, unit).with(TemporalAdjusters.previousOrSame(firstDayOfWeek))
+                                .truncatedTo(ChronoUnit.DAYS);
+                    } else {
+                        result = result.plus(amount, unit).with(TemporalAdjusters.nextOrSame(lastDayOfWeek))
+                                .plus(1, ChronoUnit.DAYS).truncatedTo(ChronoUnit.DAYS).minusSeconds(1);
+                    }
+                    break;
+                }
+                case "M": {
+                    final ChronoUnit unit = ChronoUnit.MONTHS;
+                    if (begin) {
+                        result = result.plus(amount, unit).truncatedTo(ChronoUnit.DAYS).withDayOfMonth(1);
+                    } else {
+                        result = result.plus(amount, unit).truncatedTo(ChronoUnit.DAYS).withDayOfMonth(1)
+                                .plus(1, ChronoUnit.MONTHS).minusSeconds(1);
+                    }
+                    break;
+                }
+                case "Y": {
+                    final ChronoUnit unit = ChronoUnit.YEARS;
+                    if (begin) {
+                        result = result.plus(amount, unit).truncatedTo(ChronoUnit.DAYS).withDayOfYear(1);
+                    } else {
+                        result = result.plus(amount, unit).truncatedTo(ChronoUnit.DAYS).withDayOfYear(1)
+                                .plus(1, ChronoUnit.YEARS).minusSeconds(1);
+                    }
+                    break;
+                }
+                default:
+                    throw new IllegalArgumentException("Unexpected value: " + unitString);
+                }
+            }
+            return result;
+        }
+
+        throw new IllegalArgumentException("invalid input: " + timeDefinition);
+    }
+
+    public static DateTimeRange parseAbsolute(final String dateRangeAsString) {
+        final String[] startEnd = dateRangeAsString.split(Pattern.quote(" - "));
+        Preconditions.checkEqual(startEnd.length, 2, "invalid date range: ''{0}''", dateRangeAsString);
+
+        final String startString = startEnd[0];
+        final String endString = startEnd[1];
+
+        final OffsetDateTime start = LocalDateTime.parse(startString, DATE_FORMAT).atOffset(ZoneOffset.UTC);
+        final OffsetDateTime end = LocalDateTime.parse(endString, DATE_FORMAT).atOffset(ZoneOffset.UTC);
+
+        return new DateTimeRange(start, end);
+    }
+}

pdb-plotting/src/main/java/org/lucares/pdb/plot/api/DateValue.java

@@ -0,0 +1,38 @@
+package org.lucares.pdb.plot.api;
+
+public class DateValue {
+    public enum DateType {
+        QUICK, RELATIVE, ABSOLUTE
+    }
+
+    private DateType type;
+
+    private String display;
+
+    private String value;
+
+    public DateType getType() {
+        return type;
+    }
+
+    public void setType(final DateType type) {
+        this.type = type;
+    }
+
+    public String getDisplay() {
+        return display;
+    }
+
+    public void setDisplay(final String display) {
+        this.display = display;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(final String value) {
+        this.value = value;
+    }
+
+}

pdb-plotting/src/main/java/org/lucares/pdb/plot/api/PlotSettings.java

@@ -1,23 +1,19 @@
 package org.lucares.pdb.plot.api;
 
-import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.TreeMap;
-import java.util.regex.Pattern;
 
 import org.lucares.pdb.api.DateTimeRange;
 import org.lucares.recommind.logs.GnuplotAxis;
 import org.lucares.recommind.logs.GnuplotSettings;
-import org.lucares.utils.Preconditions;
 
 public class PlotSettings {
 
-    private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+    public static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
     private String query;
 
@@ -27,7 +23,7 @@ public class PlotSettings {
 
     private int limit;
 
-    private String dateRangeAsString;
+    private DateValue dateValue;
 
     private YAxisDefinition y1;
     private YAxisDefinition y2;
@@ -80,30 +76,32 @@ public class PlotSettings {
         this.limit = limit;
     }
 
-    public String getDateRange() {
+    public DateValue getDateRange() {
-        return dateRangeAsString;
+        return dateValue;
     }
 
-    public void setDateRange(final String dateRangeAsString) {
+    public void setDateRange(final DateValue dateValue) {
-        this.dateRangeAsString = dateRangeAsString;
+        this.dateValue = dateValue;
     }
 
     public DateTimeRange dateRange() {
 
-        final String[] startEnd = dateRangeAsString.split(Pattern.quote(" - "));
+        switch (this.dateValue.getType()) {
-        Preconditions.checkEqual(startEnd.length, 2, "invalid date range: ''{0}''", dateRangeAsString);
+        case RELATIVE:
-
+        case QUICK:
-        final OffsetDateTime startDate = LocalDateTime.parse(startEnd[0], DATE_FORMAT).atOffset(ZoneOffset.UTC);
+            final DateTimeRange dateTimeRange = DateTimeRangeParser.parse(OffsetDateTime.now(), dateValue.getValue());
-        final OffsetDateTime endDate = LocalDateTime.parse(startEnd[1], DATE_FORMAT).atOffset(ZoneOffset.UTC);
+            return dateTimeRange;
-
+        case ABSOLUTE:
-        return new DateTimeRange(startDate, endDate);
+            return DateTimeRangeParser.parseAbsolute(dateValue.getValue());
+        }
+        throw new UnsupportedOperationException();
 
     }
 
     @Override
     public String toString() {
         return "PlotSettings [query=" + query + ", groupBy=" + groupBy + ", limitBy=" + limitBy + ", limit=" + limit
-                + ", dateRangeAsString=" + dateRangeAsString + ", y1=" + y1 + " y2=" + y2 + ", aggregates=" + aggregates
+                + ", dateRangeAsString=" + dateValue + ", y1=" + y1 + " y2=" + y2 + ", aggregates=" + aggregates
                 + ", renders=" + renders + "]";
     }
 

pdb-plotting/src/main/java/org/lucares/pdb/plot/api/RangeUnit.java

@@ -7,6 +7,8 @@ public enum RangeUnit {
 
     NO_UNIT(false, Type.Number, "Value"),
 
+    AUTOMATIC_BYTES(true, Type.Number, "Value"),
+
     BYTES(false, Type.Number, "Value"),
 
     AUTOMATIC_TIME(true, Type.Duration, "Duration"),
@@ -43,6 +45,10 @@ public enum RangeUnit {
         return type == Type.Number || type == Type.HistogramCount;
     }
 
+    public boolean isBytes() {
+        return this == BYTES || this == AUTOMATIC_BYTES;
+    }
+
     public String getLabel() {
         return axisLabel;
     }
@@ -51,11 +57,9 @@ public enum RangeUnit {
         return type;
     }
 
-    public int valueForUnit(final int value) {
+    public long valueForUnit(final long value) {
 
         switch (this) {
-        case AUTOMATIC_NUMBER:
-            return Integer.MAX_VALUE;
         case NO_UNIT:
         case BYTES:
             return value;
@@ -69,10 +73,12 @@ public enum RangeUnit {
             return value * 60 * 60 * 1000;
         case DAYS:
             return value * 24 * 60 * 60 * 1000;
+        case AUTOMATIC_NUMBER:
         case AUTOMATIC_TIME:
-            return Integer.MAX_VALUE;
+        case AUTOMATIC_BYTES:
+            return Long.MAX_VALUE;
         }
-        return Integer.MAX_VALUE;
+        return Long.MAX_VALUE;
     }
 
 }

pdb-plotting/src/main/java/org/lucares/pdb/plot/api/RenderOptions.java

@@ -3,7 +3,7 @@ package org.lucares.pdb.plot.api;
 public class RenderOptions {
     private int height;
     private int width;
-    private boolean keyOutside;
+    private boolean showKey;
     private boolean renderLabels;
 
     public int getHeight() {
@@ -22,12 +22,12 @@ public class RenderOptions {
         this.width = width;
     }
 
-    public boolean isKeyOutside() {
+    public boolean isShowKey() {
-        return keyOutside;
+        return showKey;
     }
 
-    public void setKeyOutside(final boolean keyOutside) {
+    public void setShowKey(final boolean showKey) {
-        this.keyOutside = keyOutside;
+        this.showKey = showKey;
     }
 
     public boolean isRenderLabels() {

pdb-plotting/src/main/java/org/lucares/pdb/plot/api/YAxisDefinition.java

@@ -3,8 +3,8 @@ package org.lucares.pdb.plot.api;
 public class YAxisDefinition {
     private AxisScale axisScale = AxisScale.LINEAR;
 
-    private int rangeMin = 0;
+    private long rangeMin = 0;
-    private int rangeMax = 300;
+    private long rangeMax = 300;
     private RangeUnit rangeUnit = RangeUnit.AUTOMATIC_TIME;
 
     public AxisScale getAxisScale() {
@@ -23,7 +23,7 @@ public class YAxisDefinition {
         return rangeUnit.valueForUnit(rangeMax);
     }
 
-    public int getRangeMin() {
+    public long getRangeMin() {
         return rangeMin;
     }
 
@@ -31,15 +31,15 @@ public class YAxisDefinition {
         return !rangeUnit.isAutomatic() && rangeMin >= 0 && rangeMax >= 0 && rangeMin < rangeMax;
     }
 
-    public void setRangeMin(final int rangeMin) {
+    public void setRangeMin(final long rangeMin) {
         this.rangeMin = rangeMin;
     }
 
-    public int getRangeMax() {
+    public long getRangeMax() {
         return rangeMax;
     }
 
-    public void setRangeMax(final int rangeMax) {
+    public void setRangeMax(final long rangeMax) {
         this.rangeMax = rangeMax;
     }
 

pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotFileGenerator.java

@@ -50,10 +50,9 @@ public class GnuplotFileGenerator implements Appender {
 
             appendln(result, "set nokey");
         } else {
-            if (settings.isKeyOutside()) {
+            if (!settings.isShowKey()) {
-                appendfln(result, "set key outside");
+                appendfln(result, "set nokey");
-            } else {
+            }
-
             // make sure left and right margins are always the same
             // this is need to be able to zoom in by selecting a region
             // (horizontal: 1 unit = 10px; vertical: 1 unit = 19px)
@@ -62,7 +61,6 @@ public class GnuplotFileGenerator implements Appender {
             appendln(result, "set tmargin 3"); // margin 3 -> 57px - marker (1)
             appendln(result, "set bmargin 4"); // margin 4 -> 76
         }
-        }
 
         // appendfln(result, "set xrange [-1:1]");
         appendfln(result, "set boxwidth 0.5");

pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotSettings.java

@@ -30,7 +30,7 @@ public class GnuplotSettings {
     private YAxisDefinition y1;
     private YAxisDefinition y2;
     private AggregateHandlerCollection aggregates;
-    private boolean keyOutside = false;
+    private boolean showKey = false;
 
     private AxisSettings xAxisSettings = new AxisSettings();
     private boolean renderLabels = true;
@@ -101,12 +101,12 @@ public class GnuplotSettings {
         return aggregates;
     }
 
-    public void setKeyOutside(final boolean keyOutside) {
+    public void setShowKey(final boolean showKey) {
-        this.keyOutside = keyOutside;
+        this.showKey = showKey;
     }
 
-    public boolean isKeyOutside() {
+    public boolean isShowKey() {
-        return keyOutside;
+        return showKey;
     }
 
     public void renderLabels(final boolean renderLabels) {

pdb-plotting/src/main/java/org/lucares/recommind/logs/Plotter.java

@@ -126,7 +126,7 @@ public class Plotter {
                 gnuplotSettings.setY1(plotSettings.getY1());
                 gnuplotSettings.setY2(plotSettings.getY2());
                 gnuplotSettings.setAggregates(plotSettings.getAggregates());
-                gnuplotSettings.setKeyOutside(renderOptions.isKeyOutside());
+                gnuplotSettings.setShowKey(renderOptions.isShowKey());
                 gnuplotSettings.renderLabels(renderOptions.isRenderLabels());
                 gnuplot.plot(gnuplotSettings, dataSeries);
             }

pdb-plotting/src/main/java/org/lucares/recommind/logs/YAxisTicks.java

@@ -13,6 +13,7 @@ import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
 import org.lucares.pdb.plot.api.YAxisDefinition;
+import org.lucares.utils.HumanBytes;
 
 class YAxisTicks {
 
@@ -45,9 +46,21 @@ class YAxisTicks {
             default:
                 throw new IllegalStateException("unhandled value: " + yAxisDefinition.getRangeUnit());
             }
+        } else if (yAxisDefinition.getRangeUnit().isBytes()) {
+            switch (yAxisDefinition.getAxisScale()) {
+            case LINEAR:
+                result = computeLinearYTicksByte(height, yRangeMin, yRangeMax);
+                break;
+            case LOG10:
+                result = computeLog10YTicksByte(height, yRangeMin, yRangeMax);
+                break;
+            default:
+                throw new IllegalArgumentException("Unexpected value: " + yAxisDefinition.getAxisScale());
+            }
         } else {
             switch (yAxisDefinition.getAxisScale()) {
             case LINEAR:
+                result = computeLinearYTicksNoUnit(height, yRangeMin, yRangeMax);
                 break;
             case LOG10:
                 result = computeLog10YTicksNoUnit(height, yRangeMin, yRangeMax);
@@ -59,6 +72,33 @@ class YAxisTicks {
         return result;
     }
 
+    private static double log2(final double d) {
+        return Math.log10(d) / Math.log10(2);
+    }
+
+    private static List<String> computeLog10YTicksByte(final int height, final long yRangeMin, final long yRangeMax) {
+
+        final int fontHeight = GnuplotSettings.TICKS_FONT_SIZE * 2;
+        final long plotHeight = height - GnuplotSettings.GNUPLOT_TOP_BOTTOM_MARGIN;
+        final int heightPerPowerOf2 = (int) Math.ceil(plotHeight / log2(yRangeMax));
+
+        final List<String> ticsLabels = new ArrayList<>();
+
+        long nextFreePositionOnYAxis = 0;
+        int count = 1;
+        for (long v = 1; v <= yRangeMax * 10; v *= 2) // increase yRangeMax by factor 10, because Gnuplot uses the next
+                                                      // log10 value when scaling the y-axis
+        {
+            if (nextFreePositionOnYAxis < count * heightPerPowerOf2) {
+                ticsLabels.add("\"" + HumanBytes.toHumanBytes(v) + "\" " + v);
+                nextFreePositionOnYAxis = count * heightPerPowerOf2 + fontHeight;
+            }
+            count++;
+        }
+
+        return ticsLabels;
+    }
+
     private static List<String> computeLog10YTicksTime(final int height, final long yRangeMin, final long yRangeMax) {
 
         final List<String> ticsLabels = Arrays.asList(//
@@ -100,6 +140,52 @@ class YAxisTicks {
         return ticsLabels;
     }
 
+    private static List<String> computeLinearYTicksByte(final long height, final long yRangeMinInMs,
+            final long yRangeMaxInMs) {
+        final long plotHeight = height - GnuplotSettings.GNUPLOT_TOP_BOTTOM_MARGIN;
+        final long maxLabels = plotHeight / (GnuplotSettings.TICKS_FONT_SIZE * 2);
+
+        final long range = yRangeMaxInMs - yRangeMinInMs;
+        final long rangePerLabel = roundToNextLinearByteStep(range / maxLabels);
+
+        final List<String> ticsLabels = new ArrayList<>();
+        for (long i = yRangeMinInMs; i <= yRangeMaxInMs; i += rangePerLabel) {
+            ticsLabels.add("\"" + byteToTic(i, rangePerLabel) + "\" " + i);
+        }
+
+        return ticsLabels;
+    }
+
+    private static long roundToNextLinearByteStep(final long stepSize) {
+        final List<Long> steps = Arrays.asList(1L, 2L, 4L, 8L, 16L, 32L, 64L, 128L, 256L, 512L,
+
+                HumanBytes.KB, HumanBytes.KB * 5, HumanBytes.KB * 10, HumanBytes.KB * 50, HumanBytes.KB * 100,
+                HumanBytes.KB * 128, HumanBytes.KB * 256, HumanBytes.KB * 512,
+
+                HumanBytes.MB, HumanBytes.MB * 5, HumanBytes.MB * 10, HumanBytes.MB * 50, HumanBytes.MB * 100,
+                HumanBytes.MB * 128, HumanBytes.MB * 256, HumanBytes.MB * 512,
+
+                HumanBytes.GB, HumanBytes.GB * 5, HumanBytes.GB * 10, HumanBytes.GB * 50, HumanBytes.GB * 100,
+                HumanBytes.GB * 128, HumanBytes.GB * 256, HumanBytes.GB * 512,
+
+                HumanBytes.TB, HumanBytes.TB * 5, HumanBytes.TB * 10, HumanBytes.TB * 50, HumanBytes.TB * 100,
+                HumanBytes.TB * 128, HumanBytes.TB * 256, HumanBytes.TB * 512,
+
+                HumanBytes.PB, HumanBytes.PB * 5, HumanBytes.PB * 10, HumanBytes.PB * 50, HumanBytes.PB * 100,
+                HumanBytes.PB * 128, HumanBytes.PB * 256, HumanBytes.PB * 512,
+
+                HumanBytes.EB, HumanBytes.EB * 5, HumanBytes.EB * 10, HumanBytes.EB * 50, HumanBytes.EB * 100,
+                HumanBytes.EB * 128, HumanBytes.EB * 256, HumanBytes.EB * 512);
+
+        for (final Long step : steps) {
+            if (stepSize < step) {
+                return step;
+            }
+        }
+
+        return stepSize;
+    }
+
     private static List<String> computeLinearYTicksTime(final long height, final long yRangeMinInMs,
             final long yRangeMaxInMs) {
 
@@ -121,21 +207,103 @@ class YAxisTicks {
 
         final List<String> ticsLabels = Arrays.asList(//
                 "\"1\" 1", //
+                "\"2\" 2", //
+                "\"5\" 5", //
                 "\"10\" 10", //
+                "\"20\" 20", //
+                "\"50\" 50", //
                 "\"100\" 100", //
+                "\"200\" 200", //
+                "\"500\" 500", //
                 "\"1000\" 1000", //
+                "\"2000\" 2000", //
+                "\"5000\" 5000", //
                 "\"10k\" 10000", //
+                "\"20k\" 20000", //
+                "\"50k\" 50000", //
                 "\"100k\" 100000", //
+                "\"200k\" 200000", //
+                "\"500k\" 500000", //
                 "\"1m\" 1000000", //
+                "\"2m\" 2000000", //
+                "\"5m\" 5000000", //
                 "\"10m\" 10000000", //
+                "\"20m\" 20000000", //
+                "\"50m\" 50000000", //
                 "\"100m\" 100000000", //
+                "\"200m\" 200000000", //
+                "\"500m\" 500000000", //
                 "\"1b\" 1000000000.0", //
-                "\"10b\" 10000000000.0" //
+                "\"2b\" 2000000000.0", //
+                "\"5b\" 5000000000.0", //
+                "\"10b\" 10000000000.0", //
+                "\"20b\" 20000000000.0", //
+                "\"50b\" 50000000000.0", //
+                "\"100b\" 100000000000.0", //
+                "\"200b\" 200000000000.0", //
+                "\"500b\" 500000000000.0", //
+                "\"1t\" 1000000000000.0", //
+                "\"2t\" 2000000000000.0", //
+                "\"5t\" 5000000000000.0", //
+                "\"10t\" 10000000000000.0", //
+                "\"20t\" 20000000000000.0", //
+                "\"50t\" 50000000000000.0", //
+                "\"100t\" 100000000000000.0", //
+                "\"200t\" 2000000000000000.0", //
+                "\"500t\" 5000000000000000.0", //
+                "\"1q\" 10000000000000000.0", //
+                "\"2q\" 20000000000000000.0", //
+                "\"5q\" 50000000000000000.0" //
         );
 
         return ticsLabels;
     }
 
+    private static List<String> computeLinearYTicksNoUnit(final long height, final long yRangeMinInMs,
+            final long yRangeMaxInMs) {
+        final long plotHeight = height - GnuplotSettings.GNUPLOT_TOP_BOTTOM_MARGIN;
+        final long maxLabels = plotHeight / (GnuplotSettings.TICKS_FONT_SIZE * 2);
+
+        final long range = yRangeMaxInMs - yRangeMinInMs;
+        final long rangePerLabel = roundToNextLinearNoUnitStep(range / maxLabels);
+
+        final List<String> ticsLabels = new ArrayList<>();
+        for (long i = yRangeMinInMs; i <= yRangeMaxInMs; i += rangePerLabel) {
+            ticsLabels.add("\"" + valueToTic(i, rangePerLabel) + "\" " + i);
+        }
+
+        return ticsLabels;
+    }
+
+    private static String valueToTic(final long val, final double rangePerLabel) {
+        final List<String> powers = List.of("", "k", "m", "b", "t", "q");
+
+        int power = 1;
+        String result = String.format("%d", val);
+        while (val >= Math.pow(1000, power) && power < powers.size()) {
+            result = String.format("%.3f", val / Math.pow(1000, power));
+            result = result.replaceAll("\\.?0*$", "");
+            result = result + powers.get(power);
+            power = power + 1;
+        }
+        return result;
+    }
+
+    private static long roundToNextLinearNoUnitStep(final long stepSize) {
+        final List<Long> steps = Arrays.asList(1L, 5L, 10L, 20L, 25L, 50L, 100L, 200L, 250L, 500L, 1000L, 2000L, 2500L,
+                5000L, 10_000L, 20_000L, 25_000L, 50_000L, 100_000L, 200_000L, 250_000L, 500_000L, 1_000_000L,
+                2_000_000L, 2_500_000L, 5_000_000L, 10_000_000L, 20_000_000L, 25_000_000L, 100_000_000L, 200_000_000L,
+                250_000_000L, 500_000_000L, 1_000_000_000L, 2_000_000_000L, 2_500_000_000L, 5_000_000_000L);
+
+        for (final Long step : steps) {
+            if (stepSize < step) {
+                return step;
+            }
+        }
+
+        return stepSize;
+    }
+
     private static long roundToLinearLabelSteps(final long msPerLabel) {
         final List<Long> steps = Arrays.asList(2L, 5L, 10L, 20L, 50L, 100L, 200L, 500L, 1000L, 2000L, 5000L, 10_000L,
                 20_000L, MINUTES.toMillis(1), MINUTES.toMillis(2), MINUTES.toMillis(5), MINUTES.toMillis(10),
@@ -152,6 +320,10 @@ class YAxisTicks {
         return msPerLabel;
     }
 
+    private static String byteToTic(final long val, final double rangePerLabel) {
+        return HumanBytes.toHumanBytes(val);
+    }
+
     private static String msToTic(final long ms, final double msPerLabel) {
 
         if (ms < 1000) {

pdb-plotting/src/test/java/org/lucares/pdb/plot/api/DateTimeRangeParserTest.java

@@ -0,0 +1,133 @@
+package org.lucares.pdb.plot.api;
+
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.lucares.pdb.api.DateTimeRange;
+
+public class DateTimeRangeParserTest {
+
+    @Test
+    public void test() {
+
+    }
+
+    public static Stream<Arguments> providerDatePeriods() {
+
+        return Stream.of(//
+
+                // last 15 minutes
+                Arguments.of("2000-01-02 12:59:59", "B-14m/Em", "2000-01-02 12:45:00", "2000-01-02 12:59:59"),
+
+                // this hour
+                Arguments.of("2000-01-02 12:00:00", "BH/EH", "2000-01-02 12:00:00", "2000-01-02 12:59:59"),
+                Arguments.of("2000-01-02 12:59:59", "BH/EH", "2000-01-02 12:00:00", "2000-01-02 12:59:59"),
+
+                // previous hour
+                Arguments.of("2000-01-02 12:00:00", "B-1H/E-1H", "2000-01-02 11:00:00", "2000-01-02 11:59:59"),
+                Arguments.of("2000-01-02 12:59:58", "B-1H/E-1H", "2000-01-02 11:00:00", "2000-01-02 11:59:59"),
+                Arguments.of("2000-01-02 12:59:59", "B-1H/E-1H", "2000-01-02 11:00:00", "2000-01-02 11:59:59"),
+
+                // today
+                Arguments.of("2000-01-02 12:00:00", "BD/ED", "2000-01-02 00:00:00", "2000-01-02 23:59:59"),
+                Arguments.of("2000-01-02 00:00:00", "BD/ED", "2000-01-02 00:00:00", "2000-01-02 23:59:59"),
+                Arguments.of("2000-01-02 23:59:59", "BD/ED", "2000-01-02 00:00:00", "2000-01-02 23:59:59"),
+                Arguments.of("2000-01-02 12:00:00", "B0D/E0D", "2000-01-02 00:00:00", "2000-01-02 23:59:59"),
+
+                // tomorrow
+                Arguments.of("2000-01-02 12:00:00", "B1D/E1D", "2000-01-03 00:00:00", "2000-01-03 23:59:59"),
+
+                // yesterday
+                Arguments.of("2000-01-02 12:00:00", "B-1D/E-1D", "2000-01-01 00:00:00", "2000-01-01 23:59:59"),
+
+                // this week
+                Arguments.of("2024-04-22 12:00:00", "BW/EW", "2024-04-22 00:00:00", "2024-04-28 23:59:59"),
+                Arguments.of("2024-04-23 12:00:00", "BW/EW", "2024-04-22 00:00:00", "2024-04-28 23:59:59"),
+                Arguments.of("2024-04-24 12:00:00", "BW/EW", "2024-04-22 00:00:00", "2024-04-28 23:59:59"),
+                Arguments.of("2024-04-25 12:00:00", "BW/EW", "2024-04-22 00:00:00", "2024-04-28 23:59:59"),
+                Arguments.of("2024-04-26 12:00:00", "BW/EW", "2024-04-22 00:00:00", "2024-04-28 23:59:59"),
+                Arguments.of("2024-04-27 12:00:00", "BW/EW", "2024-04-22 00:00:00", "2024-04-28 23:59:59"),
+                Arguments.of("2024-04-28 12:00:00", "BW/EW", "2024-04-22 00:00:00", "2024-04-28 23:59:59"),
+
+                // previous week
+                Arguments.of("2024-04-29 12:00:00", "B-1W/E-1W", "2024-04-22 00:00:00", "2024-04-28 23:59:59"),
+
+                // last 4 week (including this one
+                Arguments.of("2024-04-28 12:00:00", "B-3W/EW", "2024-04-01 00:00:00", "2024-04-28 23:59:59"),
+
+                // this month
+                Arguments.of("2024-04-29 12:00:00", "BM/EM", "2024-04-01 00:00:00", "2024-04-30 23:59:59"),
+
+                // previous month (in a leap year)
+                Arguments.of("2023-03-29 12:00:00", "B-1M/E-1M", "2023-02-01 00:00:00", "2023-02-28 23:59:59"),
+
+                // previous month (in a leap year)
+                Arguments.of("2024-03-29 12:00:00", "B-1M/E-1M", "2024-02-01 00:00:00", "2024-02-29 23:59:59"),
+
+                // last 3 months
+                Arguments.of("2024-03-29 12:00:00", "B-2M/EM", "2024-01-01 00:00:00", "2024-03-31 23:59:59"),
+
+                // previous 3 months (in a leap year)
+                Arguments.of("2024-03-29 12:00:00", "B-3M/E-1M", "2023-12-01 00:00:00", "2024-02-29 23:59:59"),
+
+                // this year
+                Arguments.of("2024-03-29 12:00:00", "BY/EY", "2024-01-01 00:00:00", "2024-12-31 23:59:59"),
+
+                // previous year
+                Arguments.of("2024-03-29 12:00:00", "B-1Y/E-1Y", "2023-01-01 00:00:00", "2023-12-31 23:59:59"),
+
+                //
+                Arguments.of("2024-03-29 12:00:00", "B-1H-15m/Bm", "2024-03-29 10:45:00", "2024-03-29 12:00:00")
+
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("providerDatePeriods")
+    public void testDatePeriods(final String now, final String datePeriod, final String expectedStart,
+            final String expectedEnd) throws Exception {
+        final OffsetDateTime offsetTime = LocalDateTime.parse(now, PlotSettings.DATE_FORMAT).atOffset(ZoneOffset.UTC);
+
+        final DateTimeRange actual = DateTimeRangeParser.parse(offsetTime, datePeriod);
+
+        final String actualStart = PlotSettings.DATE_FORMAT.format(actual.getStart());
+        final String actualEnd = PlotSettings.DATE_FORMAT.format(actual.getEnd());
+        System.out.println("at " + now + " " + datePeriod + " -> " + actualStart + " - " + actualEnd);
+        Assertions.assertEquals(expectedStart, actualStart, "start");
+        Assertions.assertEquals(expectedEnd, actualEnd, "end");
+    }
+
+    public static Stream<Arguments> providerDatePeriods_multiple() {
+
+        return Stream.of(//
+
+                //
+                Arguments.of("2024-03-29 12:00:00", "B-1H-15m/Bm", "2024-03-29 10:45:00", "2024-03-29 12:00:00"),
+
+                Arguments.of("2024-03-29 12:00:00", "B-1H-15m/EH15m", "2024-03-29 10:45:00", "2024-03-29 13:14:59")
+
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("providerDatePeriods_multiple")
+    public void testDatePeriods_multiple(final String now, final String datePeriod, final String expectedStart,
+            final String expectedEnd) throws Exception {
+        final OffsetDateTime offsetTime = LocalDateTime.parse(now, PlotSettings.DATE_FORMAT).atOffset(ZoneOffset.UTC);
+
+        final DateTimeRange actual = DateTimeRangeParser.parse(offsetTime, datePeriod);
+
+        final String actualStart = PlotSettings.DATE_FORMAT.format(actual.getStart());
+        final String actualEnd = PlotSettings.DATE_FORMAT.format(actual.getEnd());
+        System.out.println("at " + now + " " + datePeriod + " -> " + actualStart + " - " + actualEnd);
+        Assertions.assertEquals(expectedStart, actualStart, "start");
+        Assertions.assertEquals(expectedEnd, actualEnd, "end");
+    }
+}

pdb-ui/src/main/java/org/lucares/pdbui/PdbController.java

@@ -3,6 +3,8 @@ package org.lucares.pdbui;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.text.Collator;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -26,6 +28,9 @@ import org.lucares.pdb.api.DateTimeRange;
 import org.lucares.pdb.api.QueryWithCaretMarker;
 import org.lucares.pdb.api.QueryWithCaretMarker.ResultMode;
 import org.lucares.pdb.datastore.Proposal;
+import org.lucares.pdb.plot.api.DateTimeRangeParser;
+import org.lucares.pdb.plot.api.DateValue;
+import org.lucares.pdb.plot.api.DateValue.DateType;
 import org.lucares.pdb.plot.api.PlotSettings;
 import org.lucares.pdbui.domain.AutocompleteProposal;
 import org.lucares.pdbui.domain.AutocompleteProposalByValue;
@@ -345,6 +350,22 @@ public class PdbController implements HardcodedValues, PropertyKeys {
         return result;
     }
 
+    @RequestMapping(path = "/dates", //
+            method = RequestMethod.POST, //
+            consumes = MediaType.APPLICATION_JSON_VALUE, //
+            produces = MediaType.APPLICATION_JSON_VALUE //
+    )
+    @ResponseBody
+    public DateTimeRange dates(@RequestBody final DateValue dateValue) {
+        final DateType type = dateValue.getType();
+        final DateTimeRange result = switch (type) {
+        case RELATIVE -> DateTimeRangeParser.parse(OffsetDateTime.now(ZoneId.of("UTC")), dateValue.getValue());
+        case QUICK -> DateTimeRangeParser.parse(OffsetDateTime.now(ZoneId.of("UTC")), dateValue.getValue());
+        case ABSOLUTE -> DateTimeRangeParser.parseAbsolute(dateValue.getValue());
+        };
+        return result;
+    }
+
     @PostMapping(path = "/data", consumes = MediaType.MULTIPART_MIXED_VALUE)
     @ResponseBody
     @ResponseStatus(code = HttpStatus.CREATED)

pdb-ui/src/main/java/org/lucares/pdbui/TcpIngestor.java

@@ -90,7 +90,7 @@ public class TcpIngestor implements Ingestor, AutoCloseable, DisposableBean {
             port = serverSocket.getLocalPort();
             LOGGER.info("listening on port " + serverSocket.getLocalPort());
 
-            serverSocket.setSoTimeout((int) TimeUnit.MILLISECONDS.toMillis(2));
+            serverSocket.setSoTimeout((int) TimeUnit.MILLISECONDS.toMillis(100));
             started.countDown(); // notify caller that the socket is now listening
 
             while (acceptNewConnections.get()) {

pdb-ui/src/main/java/org/lucares/pdbui/WebConfiguration.java

@@ -26,7 +26,7 @@ public class WebConfiguration implements WebMvcConfigurer, HardcodedValues, Prop
 
         addResourceHandlerForPlottedImages(registry);
 
-        // addResourceHandlerForAngular(registry);
+        addResourceHandlerForAngular(registry);
     }
 
     private void addResourceHandlerForPlottedImages(final ResourceHandlerRegistry registry) {
@@ -57,7 +57,7 @@ public class WebConfiguration implements WebMvcConfigurer, HardcodedValues, Prop
         // to determine which sub-page to show.
         //
         // This makes Angular also responsible for all 404 pages.
-        registry.addResourceHandler("/**").addResourceLocations("classpath:/resources/").resourceChain(true)
+        registry.addResourceHandler("/**").addResourceLocations("classpath:/resources/browser/").resourceChain(true)
                 .addResolver(new PathResourceResolver() {
                     @Override
                     protected Resource getResource(final String resourcePath, final Resource location)
@@ -65,7 +65,7 @@ public class WebConfiguration implements WebMvcConfigurer, HardcodedValues, Prop
                         final Resource requestedResource = location.createRelative(resourcePath);
 
                         return requestedResource.exists() && requestedResource.isReadable() ? requestedResource
-                                : new ClassPathResource("/resources/index.html");
+                                : new ClassPathResource("/resources/browser/index.html");
                     }
                 });
     }
@@ -88,6 +88,8 @@ public class WebConfiguration implements WebMvcConfigurer, HardcodedValues, Prop
 
         registry.addViewController("/").setViewName("forward:/index.html");
         registry.addViewController("/vis").setViewName("forward:/index.html");
+        registry.addViewController("/dashboard").setViewName("forward:/index.html");
+        registry.addViewController("/dashboard/**").setViewName("forward:/index.html");
         registry.addViewController("/upload").setViewName("forward:/index.html");
         registry.addViewController("/help").setViewName("forward:/index.html");
     }

pdb-ui/src/main/java/org/lucares/pdbui/domain/PlotConfig.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.lucares.pdb.plot.api.Aggregate;
+import org.lucares.pdb.plot.api.DateValue;
 import org.lucares.pdb.plot.api.Limit;
 import org.lucares.pdb.plot.api.YAxisDefinition;
 
@@ -25,7 +26,7 @@ public class PlotConfig {
     private YAxisDefinition y1 = new YAxisDefinition();
     private YAxisDefinition y2 = new YAxisDefinition();
 
-    private String dateRange;
+    private DateValue dateRange;
 
     private List<Aggregate> aggregates = new ArrayList<>();
 
@@ -66,11 +67,11 @@ public class PlotConfig {
         this.limit = limit;
     }
 
-    public String getDateRange() {
+    public DateValue getDateRange() {
         return dateRange;
     }
 
-    public void setDateRange(final String dateRange) {
+    public void setDateRange(final DateValue dateRange) {
         this.dateRange = dateRange;
     }
 

pdb-ui/src/main/resources/application-prod.properties

@@ -1,6 +1,6 @@
 #db.base=D:/ws/pdb/dataNew
 #db.base=D:/ws/pdb2/databases/prod
-db.base=D:/ws/pdb/databases/prod
+db.base=c:/ws/pdb/databases/prod
 server.port=17333
 gnuplot.home=D:/ws/pdb/gnuplot-5.2
 cache.images.duration.seconds=86400

pdb-ui/src/main/resources/application-testing.properties

@@ -1,7 +1,7 @@
-db.base=D:/ws/pdb/databases/test
+db.base=c:/ws/pdb/databases/test
 server.port=17333
 gnuplot.home=D:/ws/pdb/gnuplot-5.2
 cache.images.duration.seconds=86400
 defaults.groupBy=pod,method,metric
 defaults.splitBy=method
-defaults.query.examples=pod=vapfinra01 and method=ViewService.findFieldView,ViewService.findFieldViewGroup;pod=vappilby01 and method=ReviewInContextController.index;pod=vapnyse001 and method=ReviewInContextController.index,ReviewController.index
+defaults.query.examples=pod=vadperfo01 and method=ViewService.findFieldView,ViewService.findFieldViewGroup;pod=vadperfo01 and method=ReviewInContextController.index;pod=vadperfo01 and method=ReviewInContextController.index,ReviewController.index

pdb-utils/src/main/java/org/lucares/utils/HumanBytes.java

@@ -0,0 +1,32 @@
+package org.lucares.utils;
+
+import java.util.List;
+
+public class HumanBytes {
+
+    public static final long KB = 1024;
+
+    public static final long MB = KB * 1024;
+
+    public static final long GB = MB * 1024;
+
+    public static final long TB = GB * 1024;
+
+    public static final long PB = TB * 1024;
+
+    public static final long EB = TB * 1024;
+
+    public static String toHumanBytes(final long bytes) {
+        final List<String> powers = List.of("bytes", "KB", "MB", "GB", "TB", "PB", "EB");
+
+        int power = 1;
+        String result = String.format("%d bytes", bytes);
+        while (bytes >= Math.pow(1024, power) && power < powers.size()) {
+            result = String.format("%.3f", bytes / Math.pow(1024, power));
+            result = result.replaceAll("\\.?0*$", "");
+            result = result + " " + powers.get(power);
+            power = power + 1;
+        }
+        return result;
+    }
+}

pdb-utils/src/main/java/org/lucares/utils/byteencoder/VariableByteEncoder.java

@@ -28,15 +28,10 @@ public class VariableByteEncoder {
     public static final long MIN_VALUE = Long.MIN_VALUE / 2 + 1;
     public static final long MAX_VALUE = Long.MAX_VALUE / 2;
 
-    private static final int MAX_BYTES_PER_VALUE = 10;
-
     private static final int CONTINUATION_BYTE_FLAG = 1 << 7; // 10000000
 
     private static final long DATA_BITS = (1 << 7) - 1; // 01111111
 
-    private static final ThreadLocal<byte[]> SINGLE_VALUE_BUFFER = ThreadLocal
-            .withInitial(() -> new byte[MAX_BYTES_PER_VALUE]);
-
     /**
      * Encodes time and value into the given buffer.
      * <p>
@@ -137,8 +132,18 @@ public class VariableByteEncoder {
      * input:   0 1 -1 2 -2 3 -3
      * encoded: 1 2  3 4  5 6  7
      * </pre>
+     * 
+     * Note: 1. I tried to replace this ternary operator with a branchfree
+     * alternative, but it was slower:
+     * 
+     * <pre>
+     * final long sign = (x - 1) >> 63; // will be 111...1 if first bit was 1 (x was negative) and 000..0
+     *                                  // otherwise
+     * final long signBit = sign & 0x1; // will be 1 for negative x and 0 otherwise
+     * return (((x * 2) ^ (sign))) + (signBit * 2); // same as above, but branchless
+     * </pre>
      */
-    private static long encodeIntoPositiveValue(final long value) {
+    static long encodeIntoPositiveValue(final long value) {
         return value > 0 ? value * 2 : (value * -2) + 1;
     }
 
@@ -234,9 +239,9 @@ public class VariableByteEncoder {
     }
 
     public static int neededBytes(final long value) {
-        final byte[] buffer = SINGLE_VALUE_BUFFER.get();
+        final long val = encodeIntoPositiveValue(value);
-        final int usedBytes = encodeInto(value, buffer, 0);
+        final int numberOfOnes = 64 - Long.numberOfLeadingZeros(val);
-        return usedBytes;
+        return numberOfOnes / 7 + (numberOfOnes % 7 == 0 ? 0 : 1);
     }
 
 }

pdb-utils/src/test/java/org/lucares/utils/byteencoder/VariableByteEncoderTest.java

@@ -81,7 +81,7 @@ public class VariableByteEncoderTest {
         Assertions.assertEquals(originalValues, decodedValues);
     }
 
-    public static Stream<Arguments> providerNededBytes() {
+    public static Stream<Arguments> providerNeededBytes() {
         return Stream.of( //
                 Arguments.of(0, 1), //
                 Arguments.of(-10, 1), //
@@ -98,7 +98,7 @@ public class VariableByteEncoderTest {
     }
 
     @ParameterizedTest
-    @MethodSource("providerNededBytes")
+    @MethodSource("providerNeededBytes")
     public void testNeededBytes(final long value, final int expectedNeededBytes) {
 
         final int neededBytes = VariableByteEncoder.neededBytes(value);

settings.gradle

@@ -1,7 +1,8 @@
-// include all projects with a build.gradle
+include("block-storage")
-// (this does not support nested projects)
+include("data-store")
-File srcDir = new File(".")
+include("pdb-api")
-FileCollection collection = files { srcDir.listFiles() }
+include("pdb-js")
-collection.filter{ new File(it, "build.gradle").isFile() }.each{ include it.getName() }
+include("pdb-plotting")
-
+include("pdb-ui")
-
+include("pdb-utils")
+include("performanceDb")