Max Petrov
2 years ago
committed by
GitHub
GitHub
137 changed files with 24168 additions and 1526 deletions
|
After Width: | Height: | Size: 112 KiB |
|
After Width: | Height: | Size: 138 KiB |
|
After Width: | Height: | Size: 114 KiB |
|
After Width: | Height: | Size: 112 KiB |
|
After Width: | Height: | Size: 119 KiB |
|
After Width: | Height: | Size: 120 KiB |
|
After Width: | Height: | Size: 113 KiB |
|
After Width: | Height: | Size: 73 KiB |
|
After Width: | Height: | Size: 104 KiB |
|
After Width: | Height: | Size: 118 KiB |
|
After Width: | Height: | Size: 120 KiB |
|
After Width: | Height: | Size: 121 KiB |
|
After Width: | Height: | Size: 108 KiB |
|
After Width: | Height: | Size: 120 KiB |
|
After Width: | Height: | Size: 101 KiB |
|
Before Width: | Height: | Size: 113 KiB After Width: | Height: | Size: 113 KiB |
@ -0,0 +1,66 @@ |
|||
<!-- |
|||
|
|||
Copyright © 2016-2024 The Thingsboard Authors |
|||
|
|||
Licensed under the Apache License, Version 2.0 (the "License"); |
|||
you may not use this file except in compliance with the License. |
|||
You may obtain a copy of the License at |
|||
|
|||
http://www.apache.org/licenses/LICENSE-2.0 |
|||
|
|||
Unless required by applicable law or agreed to in writing, software |
|||
distributed under the License is distributed on an "AS IS" BASIS, |
|||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|||
See the License for the specific language governing permissions and |
|||
limitations under the License. |
|||
|
|||
--> |
|||
<mat-toolbar color="primary"> |
|||
<h2 translate>layout.add-new-breakpoint</h2> |
|||
<span fxFlex></span> |
|||
<button mat-icon-button |
|||
(click)="cancel()" |
|||
type="button"> |
|||
<mat-icon class="material-icons">close</mat-icon> |
|||
</button> |
|||
</mat-toolbar> |
|||
<div mat-dialog-content style="width: 400px; max-width: 100%;"> |
|||
<form [formGroup]="addBreakpointFormGroup"> |
|||
<mat-form-field appearance="outline"> |
|||
<mat-label translate>layout.breakpoint</mat-label> |
|||
<mat-select formControlName="newBreakpointId" [hideSingleSelectionIndicator]="false"> |
|||
<mat-select-trigger>{{ getName(this.addBreakpointFormGroup.get('newBreakpointId').value) }}</mat-select-trigger> |
|||
<mat-option *ngFor="let breakpoint of allowBreakpointIds" [value]="breakpoint"> |
|||
<mat-icon><tb-icon>{{ getIcon(breakpoint) }}</tb-icon></mat-icon> |
|||
<div>{{ getName(breakpoint) }}</div> |
|||
<div style="font-size: 12px;letter-spacing: 0.4px;color: #9e9e9e;">{{ getSizeDescription(breakpoint) }}</div> |
|||
</mat-option> |
|||
</mat-select> |
|||
</mat-form-field> |
|||
<mat-form-field appearance="outline" subscriptSizing="dynamic"> |
|||
<mat-label translate>layout.copy-from</mat-label> |
|||
<mat-select formControlName="copyFrom" [hideSingleSelectionIndicator]="false"> |
|||
<mat-select-trigger>{{ getName(this.addBreakpointFormGroup.get('copyFrom').value) }}</mat-select-trigger> |
|||
<mat-option *ngFor="let breakpoint of selectedBreakpointIds" [value]="breakpoint"> |
|||
<mat-icon><tb-icon>{{ getIcon(breakpoint) }}</tb-icon></mat-icon> |
|||
<div>{{ getName(breakpoint) }}</div> |
|||
<div style="font-size: 12px;letter-spacing: 0.4px;color: #9e9e9e;">{{ getSizeDescription(breakpoint) }}</div> |
|||
</mat-option> |
|||
</mat-select> |
|||
</mat-form-field> |
|||
</form> |
|||
</div> |
|||
<div mat-dialog-actions fxLayoutAlign="end center"> |
|||
<button mat-button |
|||
color="primary" |
|||
type="button" |
|||
(click)="cancel()"> |
|||
{{ 'action.cancel' | translate }} |
|||
</button> |
|||
<button mat-raised-button color="primary" |
|||
type="button" |
|||
(click)="save()" |
|||
[disabled]="addBreakpointFormGroup.invalid"> |
|||
{{ 'action.add' | translate }} |
|||
</button> |
|||
</div> |
|||
@ -0,0 +1,85 @@ |
|||
///
|
|||
/// Copyright © 2016-2024 The Thingsboard Authors
|
|||
///
|
|||
/// Licensed under the Apache License, Version 2.0 (the "License");
|
|||
/// you may not use this file except in compliance with the License.
|
|||
/// You may obtain a copy of the License at
|
|||
///
|
|||
/// http://www.apache.org/licenses/LICENSE-2.0
|
|||
///
|
|||
/// Unless required by applicable law or agreed to in writing, software
|
|||
/// distributed under the License is distributed on an "AS IS" BASIS,
|
|||
/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|||
/// See the License for the specific language governing permissions and
|
|||
/// limitations under the License.
|
|||
///
|
|||
|
|||
import { Component, Inject } from '@angular/core'; |
|||
import { DialogComponent } from '@shared/components/dialog.component'; |
|||
import { FormBuilder, FormGroup } from '@angular/forms'; |
|||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; |
|||
import { Store } from '@ngrx/store'; |
|||
import { AppState } from '@core/core.state'; |
|||
import { Router } from '@angular/router'; |
|||
import { DashboardUtilsService } from '@core/services/dashboard-utils.service'; |
|||
import { BreakpointId } from '@shared/models/dashboard.models'; |
|||
|
|||
export interface AddNewBreakpointDialogData { |
|||
allowBreakpointIds: string[]; |
|||
selectedBreakpointIds: string[]; |
|||
} |
|||
|
|||
export interface AddNewBreakpointDialogResult { |
|||
newBreakpointId: BreakpointId; |
|||
copyFrom: BreakpointId; |
|||
} |
|||
|
|||
@Component({ |
|||
selector: 'add-new-breakpoint-dialog', |
|||
templateUrl: './add-new-breakpoint-dialog.component.html', |
|||
}) |
|||
export class AddNewBreakpointDialogComponent extends DialogComponent<AddNewBreakpointDialogComponent, AddNewBreakpointDialogResult> { |
|||
|
|||
addBreakpointFormGroup: FormGroup; |
|||
|
|||
allowBreakpointIds = []; |
|||
selectedBreakpointIds = []; |
|||
|
|||
constructor(protected store: Store<AppState>, |
|||
protected router: Router, |
|||
private fb: FormBuilder, |
|||
@Inject(MAT_DIALOG_DATA) private data: AddNewBreakpointDialogData, |
|||
protected dialogRef: MatDialogRef<AddNewBreakpointDialogComponent, AddNewBreakpointDialogResult>, |
|||
private dashboardUtils: DashboardUtilsService,) { |
|||
|
|||
super(store, router, dialogRef); |
|||
|
|||
this.allowBreakpointIds = this.data.allowBreakpointIds; |
|||
this.selectedBreakpointIds = this.data.selectedBreakpointIds; |
|||
|
|||
this.addBreakpointFormGroup = this.fb.group({ |
|||
newBreakpointId: [{value: this.allowBreakpointIds[0], disabled: this.allowBreakpointIds.length === 1}], |
|||
copyFrom: [{value: 'default', disabled: this.selectedBreakpointIds.length === 1}], |
|||
}); |
|||
} |
|||
|
|||
cancel(): void { |
|||
this.dialogRef.close(null); |
|||
} |
|||
|
|||
save(): void { |
|||
this.dialogRef.close(this.addBreakpointFormGroup.getRawValue()); |
|||
} |
|||
|
|||
getName(breakpointId: BreakpointId): string { |
|||
return this.dashboardUtils.getBreakpointName(breakpointId); |
|||
} |
|||
|
|||
getIcon(breakpointId: BreakpointId): string { |
|||
return this.dashboardUtils.getBreakpointIcon(breakpointId); |
|||
} |
|||
|
|||
getSizeDescription(breakpointId: BreakpointId): string { |
|||
return this.dashboardUtils.getBreakpointSizeDescription(breakpointId); |
|||
} |
|||
} |
|||
@ -0,0 +1,29 @@ |
|||
<!-- |
|||
|
|||
Copyright © 2016-2024 The Thingsboard Authors |
|||
|
|||
Licensed under the Apache License, Version 2.0 (the "License"); |
|||
you may not use this file except in compliance with the License. |
|||
You may obtain a copy of the License at |
|||
|
|||
http://www.apache.org/licenses/LICENSE-2.0 |
|||
|
|||
Unless required by applicable law or agreed to in writing, software |
|||
distributed under the License is distributed on an "AS IS" BASIS, |
|||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|||
See the License for the specific language governing permissions and |
|||
limitations under the License. |
|||
|
|||
--> |
|||
<mat-select |
|||
[class.hidden]="breakpointIds.length < 2" |
|||
class="select-dashboard-breakpoint" |
|||
[(ngModel)]="selectedBreakpoint" |
|||
(ngModelChange)="selectLayoutChanged()"> |
|||
<mat-select-trigger>{{ getName(selectedBreakpoint) }}</mat-select-trigger> |
|||
<mat-option *ngFor="let breakpointId of breakpointIds" [value]="breakpointId"> |
|||
<mat-icon><tb-icon>{{ getIcon(breakpointId) }}</tb-icon></mat-icon> |
|||
<div>{{ getName(breakpointId) }}</div> |
|||
<div style="font-size: 12px;letter-spacing: 0.4px;color: #9e9e9e;">{{ getSizeDescription(breakpointId) }}</div> |
|||
</mat-option> |
|||
</mat-select> |
|||
@ -0,0 +1,34 @@ |
|||
/** |
|||
* Copyright © 2016-2024 The Thingsboard Authors |
|||
* |
|||
* Licensed under the Apache License, Version 2.0 (the "License"); |
|||
* you may not use this file except in compliance with the License. |
|||
* You may obtain a copy of the License at |
|||
* |
|||
* http://www.apache.org/licenses/LICENSE-2.0 |
|||
* |
|||
* Unless required by applicable law or agreed to in writing, software |
|||
* distributed under the License is distributed on an "AS IS" BASIS, |
|||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|||
* See the License for the specific language governing permissions and |
|||
* limitations under the License. |
|||
*/ |
|||
:host { |
|||
pointer-events: all; |
|||
width: min-content; //for Safari |
|||
|
|||
.hidden { |
|||
display: none; |
|||
} |
|||
} |
|||
|
|||
:host ::ng-deep { |
|||
.mat-mdc-select.select-dashboard-breakpoint { |
|||
.mat-mdc-select-value { |
|||
max-width: 200px; |
|||
} |
|||
.mat-mdc-select-arrow { |
|||
width: 24px; |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,81 @@ |
|||
///
|
|||
/// Copyright © 2016-2024 The Thingsboard Authors
|
|||
///
|
|||
/// Licensed under the Apache License, Version 2.0 (the "License");
|
|||
/// you may not use this file except in compliance with the License.
|
|||
/// You may obtain a copy of the License at
|
|||
///
|
|||
/// http://www.apache.org/licenses/LICENSE-2.0
|
|||
///
|
|||
/// Unless required by applicable law or agreed to in writing, software
|
|||
/// distributed under the License is distributed on an "AS IS" BASIS,
|
|||
/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|||
/// See the License for the specific language governing permissions and
|
|||
/// limitations under the License.
|
|||
///
|
|||
|
|||
import { Component, Input, OnDestroy, OnInit } from '@angular/core'; |
|||
import { DashboardPageComponent } from '@home/components/dashboard-page/dashboard-page.component'; |
|||
import { Subscription } from 'rxjs'; |
|||
import { BreakpointId } from '@shared/models/dashboard.models'; |
|||
import { DashboardUtilsService } from '@core/services/dashboard-utils.service'; |
|||
|
|||
@Component({ |
|||
selector: 'tb-select-dashboard-breakpoint', |
|||
templateUrl: './select-dashboard-breakpoint.component.html', |
|||
styleUrls: ['./select-dashboard-breakpoint.component.scss'] |
|||
}) |
|||
export class SelectDashboardBreakpointComponent implements OnInit, OnDestroy { |
|||
|
|||
@Input() |
|||
dashboardCtrl: DashboardPageComponent; |
|||
|
|||
selectedBreakpoint: BreakpointId = 'default'; |
|||
|
|||
breakpointIds: Array<BreakpointId> = ['default']; |
|||
|
|||
private layoutDataChanged$: Subscription; |
|||
|
|||
constructor(private dashboardUtils: DashboardUtilsService) { |
|||
} |
|||
|
|||
ngOnInit() { |
|||
this.layoutDataChanged$ = this.dashboardCtrl.layouts.main.layoutCtx.layoutDataChanged.subscribe(() => { |
|||
if (this.dashboardCtrl.layouts.main.layoutCtx.layoutData) { |
|||
this.breakpointIds = Object.keys(this.dashboardCtrl.layouts.main.layoutCtx?.layoutData) as BreakpointId[]; |
|||
this.breakpointIds.sort((a, b) => { |
|||
const aMaxWidth = this.dashboardUtils.getBreakpointInfoById(a)?.maxWidth || Infinity; |
|||
const bMaxWidth = this.dashboardUtils.getBreakpointInfoById(b)?.maxWidth || Infinity; |
|||
return bMaxWidth - aMaxWidth; |
|||
}); |
|||
if (this.breakpointIds.indexOf(this.dashboardCtrl.layouts.main.layoutCtx.breakpoint) > -1) { |
|||
this.selectedBreakpoint = this.dashboardCtrl.layouts.main.layoutCtx.breakpoint; |
|||
} else { |
|||
this.selectedBreakpoint = 'default'; |
|||
this.dashboardCtrl.layouts.main.layoutCtx.breakpoint = this.selectedBreakpoint; |
|||
} |
|||
} |
|||
}); |
|||
} |
|||
|
|||
ngOnDestroy() { |
|||
this.layoutDataChanged$.unsubscribe(); |
|||
} |
|||
|
|||
selectLayoutChanged() { |
|||
this.dashboardCtrl.layouts.main.layoutCtx.ctrl.updatedCurrentBreakpoint(this.selectedBreakpoint); |
|||
this.dashboardCtrl.updateLayoutSizes(); |
|||
} |
|||
|
|||
getName(breakpointId: BreakpointId): string { |
|||
return this.dashboardUtils.getBreakpointName(breakpointId); |
|||
} |
|||
|
|||
getIcon(breakpointId: BreakpointId): string { |
|||
return this.dashboardUtils.getBreakpointIcon(breakpointId); |
|||
} |
|||
|
|||
getSizeDescription(breakpointId: BreakpointId): string { |
|||
return this.dashboardUtils.getBreakpointSizeDescription(breakpointId); |
|||
} |
|||
} |
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue