Merge pull request #322 from nlnwa/echarts

Replace chart.js with ngx-echarts
nlnwa · Nov 1, 2021 · b415b62 · b415b62
2 parents 04abf0b + f84a8e2
commit b415b62
Show file tree

Hide file tree

Showing 35 changed files with 1,721 additions and 3,563 deletions.
diff --git a/package.json b/package.json
@@ -37,18 +37,17 @@
     "@types/prismjs": "^1.16.6",
     "angular-oauth2-oidc": "~12.0.2",
     "angular-oauth2-oidc-jwks": "^12.0.0",
-    "chart.js": "^2.9.4",
-    "chartjs-plugin-datalabels": "^0.7.0",
     "google-protobuf": "^3.17.3",
-    "grpc-web": "^1.2.1",
+    "echarts": "^5.1.2",
+    "grpc-web": "^1.3.0",
     "hammerjs": "^2.0.8",
     "ip-address": "^6.4.0",
     "minimist": "^1.2.5",
     "moment": "^2.29.1",
     "moment-duration-format": "^2.3.2",
     "nano-editor": "^1.2.4",
     "ng-keyboard-shortcuts": "^10.1.17",
-    "ng2-charts": "^2.4.2",
+    "ngx-echarts": "^7.0.1",
     "ngx-filesize": "^2.0.16",
     "prismjs": "^1.24.1",
     "rxjs": "~6.6.7",
@@ -66,6 +65,7 @@
     "@types/google-protobuf": "^3.15.4",
     "@types/jasmine": "~3.8.2",
     "@types/jasminewd2": "~2.0.10",
+    "@juggle/resize-observer": "^3.3.1",
     "@types/node": "^14.17.0",
     "codelyzer": "^6.0.2",
     "jasmine-core": "~3.8.0",

diff --git a/protobuf/Makefile b/protobuf/Makefile
@@ -1,7 +1,7 @@
-VEIDEMANN_API_VERSION?=1.0.0-beta23
-PROTOC_VERSION=3.15.8
+VEIDEMANN_API_VERSION?=1.0.0-beta24
+PROTOC_VERSION=3.19.1
 PROTOC_FILE_VERSION=$$(echo ${PROTOC_VERSION} | sed -r 's|(.*)(rc)(.*)|\1-\2-\3|')
-GRPC_WEB_VERSION=1.2.1
+GRPC_WEB_VERSION=1.3.0
 
 PROTOC=tools/bin/protoc
 PROTOC_GEN_GRPC_WEB=tools/protoc-gen-grpc-web-${GRPC_WEB_VERSION}-linux-x86_64

diff --git a/src/api/gen/commons/v1/resources_pb.js b/src/api/gen/commons/v1/resources_pb.js
@@ -13,7 +13,13 @@
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = Function('return this')();
+var global = (function() {
+  if (this) { return this; }
+  if (typeof window !== 'undefined') { return window; }
+  if (typeof global !== 'undefined') { return global; }
+  if (typeof self !== 'undefined') { return self; }
+  return Function('return this')();
+}.call(null));
 
 goog.exportSymbol('proto.veidemann.api.commons.v1.Error', null, global);
 goog.exportSymbol('proto.veidemann.api.commons.v1.ExtractedText', null, global);

diff --git a/src/api/gen/config/v1/config_grpc_web_pb.d.ts b/src/api/gen/config/v1/config_grpc_web_pb.d.ts
@@ -1,7 +1,7 @@
 import * as grpcWeb from 'grpc-web';
 
-import * as config_v1_resources_pb from '../../config/v1/resources_pb';
 import * as google_protobuf_empty_pb from 'google-protobuf/google/protobuf/empty_pb';
+import * as config_v1_resources_pb from '../../config/v1/resources_pb';
 import * as config_v1_config_pb from '../../config/v1/config_pb';
 
 
@@ -13,7 +13,7 @@ export class ConfigClient {
   getConfigObject(
     request: config_v1_resources_pb.ConfigRef,
     metadata: grpcWeb.Metadata | undefined,
-    callback: (err: grpcWeb.Error,
+    callback: (err: grpcWeb.RpcError,
                response: config_v1_resources_pb.ConfigObject) => void
   ): grpcWeb.ClientReadableStream<config_v1_resources_pb.ConfigObject>;
 
@@ -25,56 +25,56 @@ export class ConfigClient {
   countConfigObjects(
     request: config_v1_config_pb.ListRequest,
     metadata: grpcWeb.Metadata | undefined,
-    callback: (err: grpcWeb.Error,
+    callback: (err: grpcWeb.RpcError,
                response: config_v1_config_pb.ListCountResponse) => void
   ): grpcWeb.ClientReadableStream<config_v1_config_pb.ListCountResponse>;
 
   saveConfigObject(
     request: config_v1_resources_pb.ConfigObject,
     metadata: grpcWeb.Metadata | undefined,
-    callback: (err: grpcWeb.Error,
+    callback: (err: grpcWeb.RpcError,
                response: config_v1_resources_pb.ConfigObject) => void
   ): grpcWeb.ClientReadableStream<config_v1_resources_pb.ConfigObject>;
 
   updateConfigObjects(
     request: config_v1_config_pb.UpdateRequest,
     metadata: grpcWeb.Metadata | undefined,
-    callback: (err: grpcWeb.Error,
+    callback: (err: grpcWeb.RpcError,
                response: config_v1_config_pb.UpdateResponse) => void
   ): grpcWeb.ClientReadableStream<config_v1_config_pb.UpdateResponse>;
 
   deleteConfigObject(
     request: config_v1_resources_pb.ConfigObject,
     metadata: grpcWeb.Metadata | undefined,
-    callback: (err: grpcWeb.Error,
+    callback: (err: grpcWeb.RpcError,
                response: config_v1_config_pb.DeleteResponse) => void
   ): grpcWeb.ClientReadableStream<config_v1_config_pb.DeleteResponse>;
 
   getLabelKeys(
     request: config_v1_config_pb.GetLabelKeysRequest,
     metadata: grpcWeb.Metadata | undefined,
-    callback: (err: grpcWeb.Error,
+    callback: (err: grpcWeb.RpcError,
                response: config_v1_config_pb.LabelKeysResponse) => void
   ): grpcWeb.ClientReadableStream<config_v1_config_pb.LabelKeysResponse>;
 
   getLogConfig(
     request: google_protobuf_empty_pb.Empty,
     metadata: grpcWeb.Metadata | undefined,
-    callback: (err: grpcWeb.Error,
+    callback: (err: grpcWeb.RpcError,
                response: config_v1_resources_pb.LogLevels) => void
   ): grpcWeb.ClientReadableStream<config_v1_resources_pb.LogLevels>;
 
   saveLogConfig(
     request: config_v1_resources_pb.LogLevels,
     metadata: grpcWeb.Metadata | undefined,
-    callback: (err: grpcWeb.Error,
+    callback: (err: grpcWeb.RpcError,
                response: config_v1_resources_pb.LogLevels) => void
   ): grpcWeb.ClientReadableStream<config_v1_resources_pb.LogLevels>;
 
   getScriptAnnotations(
     request: config_v1_config_pb.GetScriptAnnotationsRequest,
     metadata: grpcWeb.Metadata | undefined,
-    callback: (err: grpcWeb.Error,
+    callback: (err: grpcWeb.RpcError,
                response: config_v1_config_pb.GetScriptAnnotationsResponse) => void
   ): grpcWeb.ClientReadableStream<config_v1_config_pb.GetScriptAnnotationsResponse>;