@eclipse-scout/chart 22.0.39 → 23.1.0-beta.4

package/src/table/controls/{ChartTableControlAdapter.js → ChartTableControlAdapter.ts}

@@ -1,20 +1,19 @@
 /*
- * Copyright (c) 2010-2020 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
  */
 import {TableControlAdapter} from '@eclipse-scout/core';
 
-export default class ChartTableControlAdapter extends TableControlAdapter {
+export class ChartTableControlAdapter extends TableControlAdapter {
 
   constructor() {
     super();
     this._addRemoteProperties(['chartType', 'chartAggregation', 'chartGroup1', 'chartGroup2']);
   }
-
 }

package/src/table/controls/ChartTableControlEventMap.ts

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     BSI Business Systems Integration AG - initial API and implementation
+ */
+import {ActionEventMap, PropertyChangeEvent} from '@eclipse-scout/core';
+import {TableControlChartAggregation, TableControlChartGroup, TableControlChartType} from './ChartTableControl';
+
+export interface ChartTableControlEventMap extends ActionEventMap {
+  'propertyChange:chartAggregation': PropertyChangeEvent<TableControlChartAggregation>;
+  'propertyChange:chartGroup1': PropertyChangeEvent<TableControlChartGroup>;
+  'propertyChange:chartGroup2': PropertyChangeEvent<TableControlChartGroup>;
+  'propertyChange:chartType': PropertyChangeEvent<TableControlChartType>;
+}

package/src/table/controls/{ChartTableControlLayout.js → ChartTableControlLayout.ts}

@@ -1,23 +1,25 @@
 /*
- * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
  */
 import {AbstractLayout, scrollbars} from '@eclipse-scout/core';
+import {ChartTableControl} from '../../index';
 
-export default class ChartTableControlLayout extends AbstractLayout {
+export class ChartTableControlLayout extends AbstractLayout {
+  control: ChartTableControl;
 
-  constructor(control) {
+  constructor(control: ChartTableControl) {
     super();
     this.control = control;
   }
 
-  layout($container) {
+  override layout($container: JQuery) {
     if (!this.control.contentRendered) {
       return;
     }

package/src/table/controls/ChartTableControlModel.ts

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     BSI Business Systems Integration AG - initial API and implementation
+ */
+import {TableControlModel} from '@eclipse-scout/core';
+import {TableControlChartAggregation, TableControlChartGroup, TableControlChartType} from './ChartTableControl';
+
+export interface ChartTableControlModel extends TableControlModel {
+  chartAggregation?: TableControlChartAggregation;
+  chartGroup1?: TableControlChartGroup;
+  chartGroup2?: TableControlChartGroup;
+  chartType?: TableControlChartType;
+}

package/src/table/controls/{ChartTableUserFilter.js → ChartTableUserFilter.ts}

@@ -1,16 +1,26 @@
 /*
- * Copyright (c) 2010-2020 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
  */
-import {arrays, TableMatrix, TableUserFilter} from '@eclipse-scout/core';
+import {arrays, TableMatrix, TableMatrixKeyAxis, TableRow, TableUserFilter, TableUserFilterAddedEventData} from '@eclipse-scout/core';
+import {ChartTableUserFilterModel} from '../../index';
+import {TableControlDeterministicKey} from './ChartTableControl';
 
-export default class ChartTableUserFilter extends TableUserFilter {
+export class ChartTableUserFilter extends TableUserFilter implements ChartTableUserFilterModel {
+  declare model: ChartTableUserFilterModel;
+
+  text: string;
+  xAxis: TableMatrixKeyAxis;
+  yAxis: TableMatrixKeyAxis;
+  filters: { deterministicKey: TableControlDeterministicKey }[];
+  columnIdX: string;
+  columnIdY: string;
 
   constructor() {
     super();
@@ -29,11 +39,8 @@ export default class ChartTableUserFilter extends TableUserFilter {
     return this.text;
   }
 
-  /**
-   * @override TableUserFilter.js
-   */
-  createFilterAddedEventData() {
-    let data = super.createFilterAddedEventData();
+  override createFilterAddedEventData(): ChartTableUserFilterAddedEventData {
+    let data: ChartTableUserFilterAddedEventData = super.createFilterAddedEventData();
     data.text = this.text;
     data.filters = this.filters;
     data.columnIdX = (this.xAxis && this.xAxis.column) ? this.xAxis.column.id : null;
@@ -54,7 +61,7 @@ export default class ChartTableUserFilter extends TableUserFilter {
     matrix.calculate();
   }
 
-  accept(row) {
+  accept(row: TableRow): boolean {
     if (!this.xAxis) {
       // Lazy calculation. It is not possible on init, because the table is not rendered yet.
       this.calculate();
@@ -63,10 +70,16 @@ export default class ChartTableUserFilter extends TableUserFilter {
     let deterministicKeyX = this.xAxis.normDeterministic(value);
 
     if (!this.yAxis) {
-      return (this.filters.filter(filter => filter.deterministicKey === deterministicKeyX).length);
+      return this.filters.filter(filter => filter.deterministicKey === deterministicKeyX).length > 0;
     }
     value = this.yAxis.column.cellValueOrTextForCalculation(row);
     let deterministicKeyY = this.yAxis.normDeterministic(value);
-    return (this.filters.filter(filter => arrays.equals(filter.deterministicKey, [deterministicKeyX, deterministicKeyY])).length);
+    return this.filters.filter(filter => arrays.equals(filter.deterministicKey as (number | string)[], [deterministicKeyX, deterministicKeyY])).length > 0;
   }
 }
+
+type ChartTableUserFilterAddedEventData = TableUserFilterAddedEventData & {
+  filters?: { deterministicKey: TableControlDeterministicKey }[];
+  columnIdX?: string;
+  columnIdY?: string;
+};

package/src/table/controls/ChartTableUserFilterModel.ts

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     BSI Business Systems Integration AG - initial API and implementation
+ */
+import {TableMatrixKeyAxis, TableUserFilterModel} from '@eclipse-scout/core';
+import {TableControlDeterministicKey} from './ChartTableControl';
+
+export interface ChartTableUserFilterModel extends TableUserFilterModel {
+  text?: string;
+  xAxis?: TableMatrixKeyAxis;
+  yAxis?: TableMatrixKeyAxis;
+  filters?: { deterministicKey: TableControlDeterministicKey }[];
+}

package/src/tile/{ChartFieldTile.js → ChartFieldTile.ts}

@@ -1,28 +1,34 @@
 /*
- * Copyright (c) 2010-2020 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
  */
-import {FormFieldTile} from '@eclipse-scout/core';
+import {FormFieldTile, PropertyChangeEvent} from '@eclipse-scout/core';
+import {Chart, ChartField, ChartFieldTileModel} from '../index';
+import {ChartConfig} from '../chart/Chart';
 
-export default class ChartFieldTile extends FormFieldTile {
+export class ChartFieldTile extends FormFieldTile implements ChartFieldTileModel {
+  declare model: ChartFieldTileModel;
+  declare tileWidget: ChartField;
+
+  protected _chartConfigChangeHandler: (event: PropertyChangeEvent<ChartConfig, Chart>) => void;
 
   constructor() {
     super();
     this._chartConfigChangeHandler = this._onChartConfigChange.bind(this);
   }
 
-  _renderColorScheme() {
+  protected override _renderColorScheme() {
     super._renderColorScheme();
     this._updateChartColorScheme();
   }
 
-  _updateChartColorScheme() {
+  protected _updateChartColorScheme() {
     let config = $.extend(true, {}, this.tileWidget.chart.config, {
       options: {
         colorScheme: this.colorScheme
@@ -32,11 +38,11 @@ export default class ChartFieldTile extends FormFieldTile {
     this.tileWidget.chart.setConfig(config);
   }
 
-  _onChartConfigChange(event) {
+  protected _onChartConfigChange(event: PropertyChangeEvent<ChartConfig, Chart>) {
     this._updateChartColorScheme();
   }
 
-  _setTileWidget(tileWidget) {
+  protected override _setTileWidget(tileWidget: ChartField) {
     if (this.tileWidget) {
       this.tileWidget.chart.off('propertyChange:config', this._chartConfigChangeHandler);
     }

package/src/tile/{ChartFieldTileAdapter.js → ChartFieldTileAdapter.ts}

@@ -1,18 +1,14 @@
 /*
- * Copyright (c) 2010-2020 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
  */
 import {FormFieldTileAdapter} from '@eclipse-scout/core';
 
-export default class ChartFieldTileAdapter extends FormFieldTileAdapter {
-
-  constructor() {
-    super();
-  }
+export class ChartFieldTileAdapter extends FormFieldTileAdapter {
 }

package/src/tile/ChartFieldTileModel.ts

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     BSI Business Systems Integration AG - initial API and implementation
+ */
+import {ChartField} from '../index';
+import {WidgetTileModel} from '@eclipse-scout/core';
+
+export interface ChartFieldTileModel extends WidgetTileModel {
+  tileWidget?: ChartField;
+}