Skip to content

Commit

Permalink
* fixed issue with missing back button after drilldown in pivot table
Browse files Browse the repository at this point in the history
* fixed issue with back button after back from drillthrough
* fixed issue with missing gauges charts
* fixed issue with switch data source control and first element in list
  • Loading branch information
agnybida committed Jul 8, 2024
1 parent 9669d65 commit 637b05b
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "deep-see-web",
"version": "4.0.2",
"version": "4.0.3",
"scripts": {
"ng": "ng",
"start": "ng serve --proxy-config=proxy.conf.samples-bi.js",
Expand Down
4 changes: 4 additions & 0 deletions src/app/components/ui/modal/modal.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {NgComponentOutlet} from '@angular/common';
export class ModalComponent implements OnInit, OnDestroy, OnChanges, AfterViewInit {
@ViewChild(NgComponentOutlet, {read: ElementRef}) dynCompEl?: ElementRef;
@ViewChild(NgComponentOutlet) ngComponentOutlet?: NgComponentOutlet;

@Input() data!: IModal;
search = new EventEmitter<string>();
isInitialized = false;
Expand Down Expand Up @@ -209,6 +210,9 @@ export class ModalComponent implements OnInit, OnDestroy, OnChanges, AfterViewIn
// @ts-ignore
comp = this.ngComponentOutlet._componentRef.instance;
}
/* if (this.viewContRef?.get(0)?.context) {
comp = this.viewContRef.get(0).context;
} */
if (!comp) {
return;
}
Expand Down
4 changes: 3 additions & 1 deletion src/app/components/widgets/base-widget.class.ts
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,8 @@ export class BaseWidget implements OnInit, OnDestroy {
if (this.widget.isDrillthrough) {
this.restoreWidgetType();
this.widget.isDrillthrough = false;
this.widget.backButton = !!this.drills?.length;
this.parent.header?.cd.detectChanges();
} else {
void this.doDrillOnly();
}
Expand Down Expand Up @@ -1028,7 +1030,7 @@ export class BaseWidget implements OnInit, OnDestroy {
let val = '';
const sel = item.dsSelected;
if (sel) {
const idx = item.labels?.indexOf(sel.toString()) || -1;
const idx = item.labels?.indexOf(sel.toString()) ?? -1;
if (idx !== -1) {
val = item?.values?.[idx] || '';
}
Expand Down
6 changes: 3 additions & 3 deletions src/app/components/widgets/charts/base-chart.class.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {IButtonToggle} from '../../../services/widget.service';
import {IChartConfigAppearance} from '../../ui/chart-colors-config/chart-colors-config.component';
import {Subscription} from 'rxjs';
// Highcharts
import Highcharts from 'highcharts';
import Highcharts from 'highcharts/highstock';
import HighMaps from 'highcharts/modules/map';
import More from 'highcharts/highcharts-more';
import Tree from 'highcharts/modules/treemap';
Expand All @@ -26,14 +26,14 @@ import {
IMDXTuple
} from '../../../services/dsw.types';

HighMaps(Highcharts);
More(Highcharts);
SolidGauge(Highcharts);
HighMaps(Highcharts);
Tree(Highcharts);
Heatmap(Highcharts);
ThreeD(Highcharts);
Exporting(Highcharts);
HC_stock(Highcharts);
SolidGauge(Highcharts);

export const DEF_ROW_COUNT = 20;
const DEF_COL_COUNT = 20;
Expand Down
4 changes: 4 additions & 0 deletions src/app/components/widgets/wpivot/pivot.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ export class WPivotComponent extends BaseWidget {

this.widget.backButton = this.lpt?.DRILL_LEVEL !== 0;
this.parent.cd.detectChanges();
this.parent.header?.cd.detectChanges();
}

onDrillThrough(...args) {
Expand Down Expand Up @@ -124,12 +125,14 @@ export class WPivotComponent extends BaseWidget {
this.widget.isDrillthrough = true;
this.widget.backButton = true;
this.parent.cd.detectChanges();
this.parent.header?.cd.detectChanges();
});
return false;
}
this._oldMdx = this.lpt?.getActualMDX() || '';
this.widget.backButton = true;
this.parent.cd.detectChanges();
this.parent.header?.cd.detectChanges();
return true;
}

Expand All @@ -147,6 +150,7 @@ export class WPivotComponent extends BaseWidget {
this.doDrillFilter(p.path, this.drills);
}
this.parent.cd.detectChanges();
this.parent.header?.cd.detectChanges();
this.broadcastDependents(p.mdx);
}

Expand Down
6 changes: 6 additions & 0 deletions src/changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
#### 4.0.3 beta
* fixed issue with missing back button after drilldown in pivot table
* fixed issue with back button after back from drillthrough
* fixed issue with missing gauges charts
* fixed issue with switch data source control and first element in list

#### 4.0.2 beta
* fixed issue with treemap

Expand Down

0 comments on commit 637b05b

Please sign in to comment.