tsai
/
squidex
mirror of https://github.com/Squidex/squidex.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Subscriptions fixed.

pull/243/head
Sebastian Stehle 8 years ago
parent
6aaf918c13
commit
99172d8363
4 changed files with 97 additions and 82 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/Squidex/app/features/content/pages/content/content-page.component.html
  2. 2
      src/Squidex/app/features/content/pages/contents/contents-page.component.html
  3. 173
      src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts
  4. 2
      src/Squidex/app/features/schemas/pages/schema/schema-page.component.html

2
src/Squidex/app/features/content/pages/content/content-page.component.html
View File

@ -1,4 +1,4 @@
<sqx-title message="{app} | {schema} | Content" parameter1="app" parameter2="schema" [value1]="ctx.appName" [value2]="schema?.name"></sqx-title>
<sqx-title message="{app} | {schema} | Content" parameter1="app" parameter2="schema" [value1]="ctx.appName" [value2]="schema?.displayName"></sqx-title>
<form [formGroup]="contentForm" (ngSubmit)="saveAndPublish()">
<sqx-panel desiredWidth="53rem">

2
src/Squidex/app/features/content/pages/contents/contents-page.component.html
View File

@ -1,4 +1,4 @@
<sqx-title message="{app} | {schema} | Contents" parameter1="app" parameter2="schema" [value1]="ctx.appName" [value2]="schema?.name"></sqx-title>
<sqx-title message="{app} | {schema} | Contents" parameter1="app" parameter2="schema" [value1]="ctx.appName" [value2]="schema?.displayName"></sqx-title>
<sqx-panel [desiredWidth]="isReadOnly ? '40rem' : '60rem'">
<div class="panel-header">

173
src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts
View File

@ -5,7 +5,8 @@
* Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
*/
import { Component, OnInit } from '@angular/core';
import { Component, OnDestroy, OnInit } from '@angular/core';
import { Subscription } from 'rxjs';
import {
AppContext,
@ -28,7 +29,9 @@ declare var _urq: any;
fadeAnimation
]
})
export class DashboardPageComponent implements OnInit {
export class DashboardPageComponent implements OnDestroy, OnInit {
private subscriptions: Subscription[] = [];
public profileDisplayName = '';
public chartStorageCount: any;
@ -68,84 +71,96 @@ export class DashboardPageComponent implements OnInit {
) {
}
public ngOnDestroy() {
for (let subscription of this.subscriptions) {
subscription.unsubscribe();
}
this.subscriptions = [];
}
public ngOnInit() {
this.app
.switchMap(app => this.usagesService.getTodayStorage(app.name))
.subscribe(dto => {
this.assetsCurrent = dto.size;
this.assetsMax = dto.maxAllowed;
});
this.app
.switchMap(app => this.usagesService.getMonthCalls(app.name))
.subscribe(dto => {
this.callsCurrent = dto.count;
this.callsMax = dto.maxAllowed;
});
this.app
.switchMap(app => this.usagesService.getStorageUsages(app.name, DateTime.today().addDays(-20), DateTime.today()))
.subscribe(dtos => {
this.chartStorageCount = {
labels: createLabels(dtos),
datasets: [
{
label: 'Number of Assets',
lineTension: 0,
fill: false,
backgroundColor: 'rgba(51, 137, 213, 0.6)',
borderColor: 'rgba(51, 137, 213, 1)',
borderWidth: 1,
data: dtos.map(x => x.count)
}
]
};
this.chartStorageSize = {
labels: createLabels(dtos),
datasets: [
{
label: 'Size of Assets (MB)',
lineTension: 0,
fill: false,
backgroundColor: 'rgba(51, 137, 213, 0.6)',
borderColor: 'rgba(51, 137, 213, 1)',
borderWidth: 1,
data: dtos.map(x => Math.round(10 * (x.size / (1024 * 1024))) / 10)
}
]
};
});
this.app
.switchMap(app => this.usagesService.getCallsUsages(app.name, DateTime.today().addDays(-20), DateTime.today()))
.subscribe(dtos => {
this.chartCallsCount = {
labels: createLabels(dtos),
datasets: [
{
label: 'Number of API Calls',
backgroundColor: 'rgba(51, 137, 213, 0.6)',
borderColor: 'rgba(51, 137, 213, 1)',
borderWidth: 1,
data: dtos.map(x => x.count)
}
]
};
this.chartCallsPerformance = {
labels: createLabels(dtos),
datasets: [
{
label: 'API Performance (Milliseconds)',
backgroundColor: 'rgba(51, 137, 213, 0.6)',
borderColor: 'rgba(51, 137, 213, 1)',
borderWidth: 1,
data: dtos.map(x => x.averageMs)
}
]
};
});
this.subscriptions.push(
this.app
.switchMap(app => this.usagesService.getTodayStorage(app.name))
.subscribe(dto => {
this.assetsCurrent = dto.size;
this.assetsMax = dto.maxAllowed;
}));
this.subscriptions.push(
this.app
.switchMap(app => this.usagesService.getMonthCalls(app.name))
.subscribe(dto => {
this.callsCurrent = dto.count;
this.callsMax = dto.maxAllowed;
}));
this.subscriptions.push(
this.app
.switchMap(app => this.usagesService.getStorageUsages(app.name, DateTime.today().addDays(-20), DateTime.today()))
.subscribe(dtos => {
this.chartStorageCount = {
labels: createLabels(dtos),
datasets: [
{
label: 'Number of Assets',
lineTension: 0,
fill: false,
backgroundColor: 'rgba(51, 137, 213, 0.6)',
borderColor: 'rgba(51, 137, 213, 1)',
borderWidth: 1,
data: dtos.map(x => x.count)
}
]
};
this.chartStorageSize = {
labels: createLabels(dtos),
datasets: [
{
label: 'Size of Assets (MB)',
lineTension: 0,
fill: false,
backgroundColor: 'rgba(51, 137, 213, 0.6)',
borderColor: 'rgba(51, 137, 213, 1)',
borderWidth: 1,
data: dtos.map(x => Math.round(10 * (x.size / (1024 * 1024))) / 10)
}
]
};
}));
this.subscriptions.push(
this.app
.switchMap(app => this.usagesService.getCallsUsages(app.name, DateTime.today().addDays(-20), DateTime.today()))
.subscribe(dtos => {
this.chartCallsCount = {
labels: createLabels(dtos),
datasets: [
{
label: 'Number of API Calls',
backgroundColor: 'rgba(51, 137, 213, 0.6)',
borderColor: 'rgba(51, 137, 213, 1)',
borderWidth: 1,
data: dtos.map(x => x.count)
}
]
};
this.chartCallsPerformance = {
labels: createLabels(dtos),
datasets: [
{
label: 'API Performance (Milliseconds)',
backgroundColor: 'rgba(51, 137, 213, 0.6)',
borderColor: 'rgba(51, 137, 213, 1)',
borderWidth: 1,
data: dtos.map(x => x.averageMs)
}
]
};
}));
}
public showForum() {

2
src/Squidex/app/features/schemas/pages/schema/schema-page.component.html
View File

@ -1,4 +1,4 @@
<sqx-title message="{app} | {schema}" parameter1="app" [value1]="ctx.appName" parameter2="schema" [value2]="schema?.name"></sqx-title>
<sqx-title message="{app} | {schema}" parameter1="app" [value1]="ctx.appName" parameter2="schema" [value2]="schema?.displayName"></sqx-title>
<sqx-panel desiredWidth="56rem">
<div class="panel-header">

Write Preview
Loading…
Cancel
Save