Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ <h2 class="my-0 text-xl font-bold">Analytics Overview</h2>
>
</div>
<p class="text-3xl font-bold m-0 leading-tight">
{{ getCardValue(overviewData(), card.valueKey) | number }}
{{ getCardValue(overviewData(), card.valueKey, card.valueKeyFallback) | number }}
</p>
<span class="text-xs mt-1">{{ card.sub }}</span>
</div>
Expand Down
10 changes: 8 additions & 2 deletions apps/36-blocks/src/app/panel/dashboard/dashboard.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,14 @@ export class DashboardComponent extends BaseComponent implements OnInit {

readonly overviewCards = OVERVIEW_CARDS;

getCardValue(data: any, path: string): number {
return path.split('.').reduce((acc, k) => acc?.[k], data) ?? 0;
getCardValue(data: any, path: string, fallbackPath?: string): number {
const read = (p: string) => p.split('.').reduce((acc, k) => acc?.[k], data);
const primary = read(path);
if (fallbackPath) {
if (primary) return primary as number;
return (read(fallbackPath) as number) ?? 0;
}
return (primary as number) ?? 0;
}

readonly rangeOptions = RANGE_OPTIONS;
Expand Down
4 changes: 3 additions & 1 deletion apps/36-blocks/src/app/panel/dashboard/dashboard.models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export interface IRangeOption {
export interface IOverviewCard {
key: string;
valueKey: string;
valueKeyFallback?: string;
label: string;
icon: string;
sub: string;
Expand Down Expand Up @@ -85,7 +86,8 @@ export interface IBreakdownGroupByOption {
export const OVERVIEW_CARDS: IOverviewCard[] = [
{
key: 'users',
valueKey: 'users.client_total',
valueKey: 'users.feature_configuration_total',
valueKeyFallback: 'users.client_total',
label: 'Total Users',
icon: 'people',
sub: 'registered total',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export class OnboardingComponent implements OnInit, OnDestroy {
});

public ngOnInit(): void {
this.pendingJwtToken = this.activatedRoute.snapshot.queryParamMap.get('token');
this.pendingJwtToken = this.activatedRoute.snapshot.queryParamMap.get('onboarding_token');
}

public ngOnDestroy(): void {
Expand Down
Loading