Merge pull request #3 from SoftwareAG/dev

Merging 1.2.0 from Dev into Main

debug.log

@@ -0,0 +1 @@
+[0316/155714.845:ERROR:registration_protocol_win.cc(102)] CreateFile: The system cannot find the file specified. (0x2)

package.json

@@ -1,6 +1,6 @@
 {
  "name": "gp-smart-echart-widget",
- "version": "1.1.0",
+ "version": "1.2.0",
  "description": "This is an Angular 11 widget, which is designed to display the chart based on the REST data or Datahub.",
  "author": "Neeru Arora - Software AG, Global Presales",
  "license": "Apache 2.0",
@@ -34,8 +34,8 @@
  "@c8y/style": "1011.0.12",
  "@juggle/resize-observer": "^3.3.1",
  "angular-resize-event": "^2.1.0",
- "echarts": "^5.2.1",
  "echarts-simple-transform": "^1.0.0",
+ "echarts": "^5.2.2",
  "ngx-bootstrap": "6.2.0",
  "ngx-echarts": "^7.1.0",
  "rxjs": "~6.6.3",

projects/gp-smart-echart-widget/package.json

@@ -1,6 +1,6 @@
 {
  "name": "gp-smart-echart-widget",
- "version": "1.1.0",
+ "version": "1.2.0",
  "description": "This is an Angular 11 widget, which is designed to display the chart based on the REST data or Datahub.",
  "author": "Neeru Arora - Software AG, Global Presales",
  "license": "Apache 2.0",

projects/gp-smart-echart-widget/src/lib/gp-smart-echart-widget.component.ts

@@ -475,6 +475,12 @@ export class GpSmartEchartWidgetComponent implements OnInit, OnDestroy {
  else if ((userInput.type === 'line' || userInput.type === 'bar')
  && (userInput.layout !== 'simpleHorizontalBar' && userInput.layout !== 'stackedHorizontalBar')) {
  this.seriesData = this.getSeriesData(userInput);
+ let boundaryGapValue;
+ if(userInput.type==='line'){
+ boundaryGapValue = false;
+ }else {
+ boundaryGapValue = true;
+ }
  let xAxisName; let yAxisName;
  if (userInput.xAxisDimension.split(',').length > 1) {
  xAxisName = ''
@@ -521,7 +527,7 @@ export class GpSmartEchartWidgetComponent implements OnInit, OnDestroy {
  return item[userInput.xAxisDimension];
  }),
  type: this.getXAxisType(userInput),
- boundaryGap: false,
+ boundaryGap: boundaryGapValue,
  axisLabel: {
  interval: 0,
  fontSize: axisFontSize,
@@ -671,6 +677,12 @@ export class GpSmartEchartWidgetComponent implements OnInit, OnDestroy {
  dimensions.push(userInput.groupBy)
  }
  encodeData = this.getEncodeData(userInput, datasetId, xDimensions, yDimensions);
+ let boundaryGapValue;
+ if(userInput.type==='line'){
+ boundaryGapValue = false;
+ }else {
+ boundaryGapValue = true;
+ }
  this.chartOption = {
  dataset: [
  {
@@ -688,7 +700,7 @@ export class GpSmartEchartWidgetComponent implements OnInit, OnDestroy {
  xAxis: {
  scale: true,
  type: this.getXAxisType(userInput),
- boundaryGap: false,
+ boundaryGap: boundaryGapValue,
  axisLabel: {
  interval: 0,
  fontSize: axisFontSize,
@@ -1084,6 +1096,12 @@ export class GpSmartEchartWidgetComponent implements OnInit, OnDestroy {
  }
  }
  encodeData = this.getEncodeData(userInput, datasetId, xDimensions, yDimensions);
+ let boundaryGapValue;
+ if(userInput.type==='line'){
+ boundaryGapValue = false;
+ }else {
+ boundaryGapValue = true;
+ }
  this.chartOption = {
  dataset: [
  {
@@ -1120,7 +1138,7 @@ export class GpSmartEchartWidgetComponent implements OnInit, OnDestroy {
  nameGap: 30,
  scale: true,
  type: this.getXAxisType(userInput),
- boundaryGap: false,
+ boundaryGap: boundaryGapValue,
  axisLabel: {
  interval: 0,
  fontSize: axisFontSize,

projects/gp-smart-echart-widget/src/lib/smart-chart-config/smart-chart-config.component.ts

@@ -275,7 +275,7 @@ export class SmartChartConfigComponent implements OnInit {
  @Output() configData: EventEmitter<any> = new EventEmitter();
  ngOnInit(): void {
  this.aggregationMethods = chartValues.aggregateMethod;
- if(this.config.aggrList.length===0){
+ if(!this.config.aggrList){
  this.config.aggrList = [];
  }else {
  this.isAggrAdded = true;

runtime/cumulocity.json

@@ -9,7 +9,7 @@
  "manifest": {
  "noAppSwitcher": true,
  "requiredPlatformVersion": ">=1011.0.0",
- "version":"1.1.0",
+ "version":"1.2.0",
  "author":"Software AG, Global Presales",
  "description": "This is an Angular 11 widget, which is designed to display the chart based on the REST data or Datahub.",
  "license": "Apache 2.0"

runtime/package.json

@@ -4,7 +4,7 @@
  "dist\\bundle-src\\custom-widget.js": "smart-echart-runtime-widget-CustomWidget",
  "dist/bundle-src/custom-widget.js": "smart-echart-runtime-widget-CustomWidget"
  },
- "version": "1.1.0",
+ "version": "1.2.0",
  "description": "Runtime package.json for library widget (written by Software AG Global Presales)",
  "author": "Darpankumar Lalani - Software AG, Global Presales",
  "license": "Apache 2.0"