Fixed some issues in web client
Signed-off-by: Matthias Koller <m.koller@peak-solution.de>
diff --git a/org.eclipse.mdm.application/src/main/webapp/angular.json b/org.eclipse.mdm.application/src/main/webapp/angular.json
index 5268e88..a8932d8 100644
--- a/org.eclipse.mdm.application/src/main/webapp/angular.json
+++ b/org.eclipse.mdm.application/src/main/webapp/angular.json
@@ -28,11 +28,9 @@
"node_modules/primeng/resources/primeng.min.css",
"node_modules/font-awesome/css/font-awesome.min.css",
"node_modules/bootstrap/dist/css/bootstrap.min.css",
- "node_modules/primeflex/primeflex.css",
"src/styles.css"
],
"scripts": [
- "node_modules/chart.js/dist/Chart.js"
],
"es5BrowserSupport": true
},
diff --git a/org.eclipse.mdm.application/src/main/webapp/package-lock.json b/org.eclipse.mdm.application/src/main/webapp/package-lock.json
index 7ee05dc..bd76d05 100644
--- a/org.eclipse.mdm.application/src/main/webapp/package-lock.json
+++ b/org.eclipse.mdm.application/src/main/webapp/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "openMDM-Web",
- "version": "1.0.0",
+ "version": "5.1.0M8",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/org.eclipse.mdm.application/src/main/webapp/package.json b/org.eclipse.mdm.application/src/main/webapp/package.json
index 08410e8..643f223 100644
--- a/org.eclipse.mdm.application/src/main/webapp/package.json
+++ b/org.eclipse.mdm.application/src/main/webapp/package.json
@@ -30,8 +30,6 @@
"@ngx-translate/core": "11.0.1",
"@ngx-translate/http-loader": "4.0.0",
"bootstrap": "4.1.3",
- "chart.js": "^2.8.0",
- "chartjs-plugin-zoom": "0.7.0",
"class-transformer": "0.1.6",
"core-js": "2.6.0",
"file-saver": "1.3.3",
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/services/chart-viewer-data.service.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/services/chart-viewer-data.service.ts
index 75ffe4d..7773a30 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/services/chart-viewer-data.service.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/services/chart-viewer-data.service.ts
@@ -141,6 +141,6 @@
console.log('Could not find attribute SubMatrixNoRows on ChannelGroup with id ' + channelGroup.id);
return;
}
- return parseInt(attr.value, 10);
+ return parseInt(<string> attr.value, 10);
}
}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-core.module.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-core.module.ts
index 2947cb6..256cbbd 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-core.module.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-core.module.ts
@@ -36,6 +36,8 @@
import { MDMNotificationComponent } from './mdm-notification.component';
import { OverwriteDialogComponent } from './overwrite-dialog.component';
+import { AttributeValuePipe } from '../navigator/attribute-value.pipe';
+
import { MDMDataSourceTranslationPipe } from '../localization/mdmdatasourcetranslation.pipe';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
@@ -80,6 +82,7 @@
OverwriteDialogComponent,
MDMDataSourceTranslationPipe,
OnlyNumberDirective,
+ AttributeValuePipe
],
exports: [
CommonModule,
@@ -101,6 +104,7 @@
OverwriteDialogComponent,
TranslateModule,
MDMDataSourceTranslationPipe,
+ AttributeValuePipe,
OnlyNumberDirective,
],
providers: [
