Browse Source
# Conflicts: # common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/GitRepository.javapull/6601/head
Viacheslav Klimov
4 years ago
57 changed files with 978 additions and 461 deletions
@ -0,0 +1,73 @@ |
|||
<!-- |
|||
|
|||
Copyright © 2016-2022 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. |
|||
|
|||
--> |
|||
<section style="min-width: 400px;"> |
|||
<section *ngIf="!resultMessage"> |
|||
<mat-toolbar> |
|||
<h2>{{ 'version-control.create-entity-version' | translate }}</h2> |
|||
<span fxFlex></span> |
|||
</mat-toolbar> |
|||
<mat-progress-bar color="warn" style="z-index: 10; width: 100%; margin-bottom: -4px;" mode="indeterminate" |
|||
*ngIf="isLoading$ | async"> |
|||
</mat-progress-bar> |
|||
<form [formGroup]="exportFormGroup" style="padding-top: 16px;"> |
|||
<fieldset [disabled]="isLoading$ | async"> |
|||
<div fxFlex fxLayout="column"> |
|||
<tb-branch-autocomplete |
|||
required |
|||
formControlName="branch"> |
|||
</tb-branch-autocomplete> |
|||
<mat-form-field class="mat-block" fxFlex> |
|||
<mat-label translate>version-control.version-name</mat-label> |
|||
<input required matInput formControlName="versionName"> |
|||
<mat-error *ngIf="exportFormGroup.get('versionName').hasError('required')"> |
|||
{{ 'version-control.version-name-required' | translate }} |
|||
</mat-error> |
|||
</mat-form-field> |
|||
<mat-checkbox formControlName="saveRelations" style="margin-bottom: 16px;"> |
|||
{{ 'version-control.export-entity-relations' | translate }} |
|||
</mat-checkbox> |
|||
</div> |
|||
</fieldset> |
|||
</form> |
|||
<div fxLayoutAlign="end center" fxLayoutGap="8px"> |
|||
<button mat-button color="primary" |
|||
type="button" |
|||
[disabled]="(isLoading$ | async)" |
|||
(click)="cancel()" cdkFocusInitial> |
|||
{{ 'action.cancel' | translate }} |
|||
</button> |
|||
<button mat-raised-button color="primary" |
|||
type="button" |
|||
(click)="export()" |
|||
[disabled]="(isLoading$ | async) || exportFormGroup.invalid || !exportFormGroup.dirty"> |
|||
{{ 'action.create' | translate }} |
|||
</button> |
|||
</div> |
|||
</section> |
|||
<section *ngIf="resultMessage"> |
|||
<div class="mat-title export-result-message">{{ resultMessage }}</div> |
|||
<div fxLayoutAlign="end center" fxLayoutGap="8px"> |
|||
<button mat-button color="primary" |
|||
type="button" |
|||
[disabled]="(isLoading$ | async)" |
|||
(click)="cancel()" cdkFocusInitial> |
|||
{{ 'action.close' | translate }} |
|||
</button> |
|||
</div> |
|||
</section> |
|||
</section> |
|||
@ -0,0 +1,21 @@ |
|||
/** |
|||
* Copyright © 2016-2022 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 { |
|||
.export-result-message { |
|||
padding: 48px 8px 8px; |
|||
text-align: center; |
|||
} |
|||
} |
|||
@ -0,0 +1,96 @@ |
|||
///
|
|||
/// Copyright © 2016-2022 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, OnInit } from '@angular/core'; |
|||
import { PageComponent } from '@shared/components/page.component'; |
|||
import { FormBuilder, FormGroup, Validators } from '@angular/forms'; |
|||
import { |
|||
SingleEntityVersionCreateRequest, |
|||
VersionCreateRequestType, |
|||
VersionCreationResult |
|||
} from '@shared/models/vc.models'; |
|||
import { Store } from '@ngrx/store'; |
|||
import { AppState } from '@core/core.state'; |
|||
import { EntitiesVersionControlService } from '@core/http/entities-version-control.service'; |
|||
import { EntityId } from '@shared/models/id/entity-id'; |
|||
import { TranslateService } from '@ngx-translate/core'; |
|||
|
|||
@Component({ |
|||
selector: 'tb-entity-version-export', |
|||
templateUrl: './entity-version-export.component.html', |
|||
styleUrls: ['./entity-version-export.component.scss'] |
|||
}) |
|||
export class EntityVersionExportComponent extends PageComponent implements OnInit { |
|||
|
|||
@Input() |
|||
branch: string; |
|||
|
|||
@Input() |
|||
entityId: EntityId; |
|||
|
|||
@Input() |
|||
onClose: (result: VersionCreationResult | null, branch: string | null) => void; |
|||
|
|||
@Input() |
|||
onContentUpdated: () => void; |
|||
|
|||
exportFormGroup: FormGroup; |
|||
|
|||
resultMessage: string; |
|||
|
|||
constructor(protected store: Store<AppState>, |
|||
private entitiesVersionControlService: EntitiesVersionControlService, |
|||
private translate: TranslateService, |
|||
private fb: FormBuilder) { |
|||
super(store); |
|||
} |
|||
|
|||
ngOnInit(): void { |
|||
this.exportFormGroup = this.fb.group({ |
|||
branch: [this.branch, [Validators.required]], |
|||
versionName: [null, [Validators.required]], |
|||
saveRelations: [false, []] |
|||
}); |
|||
} |
|||
|
|||
cancel(): void { |
|||
if (this.onClose) { |
|||
this.onClose(null, null); |
|||
} |
|||
} |
|||
|
|||
export(): void { |
|||
const request: SingleEntityVersionCreateRequest = { |
|||
entityId: this.entityId, |
|||
branch: this.exportFormGroup.get('branch').value, |
|||
versionName: this.exportFormGroup.get('versionName').value, |
|||
config: { |
|||
saveRelations: this.exportFormGroup.get('saveRelations').value |
|||
}, |
|||
type: VersionCreateRequestType.SINGLE_ENTITY |
|||
}; |
|||
this.entitiesVersionControlService.saveEntitiesVersion(request).subscribe((result) => { |
|||
if (!result.added && !result.modified) { |
|||
this.resultMessage = this.translate.instant('version-control.nothing-to-commit'); |
|||
if (this.onContentUpdated) { |
|||
this.onContentUpdated(); |
|||
} |
|||
} else if (this.onClose) { |
|||
this.onClose(result, request.branch); |
|||
} |
|||
}); |
|||
} |
|||
} |
|||
@ -0,0 +1,49 @@ |
|||
<!-- |
|||
|
|||
Copyright © 2016-2022 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. |
|||
|
|||
--> |
|||
<section style="min-width: 400px;"> |
|||
<mat-toolbar> |
|||
<h2>{{ 'version-control.restore-entity-from-version' | translate: {versionName} }}</h2> |
|||
<span fxFlex></span> |
|||
</mat-toolbar> |
|||
<mat-progress-bar color="warn" style="z-index: 10; width: 100%; margin-bottom: -4px;" mode="indeterminate" |
|||
*ngIf="isLoading$ | async"> |
|||
</mat-progress-bar> |
|||
<form [formGroup]="restoreFormGroup" style="padding-top: 16px;"> |
|||
<fieldset [disabled]="isLoading$ | async"> |
|||
<div fxFlex fxLayout="column"> |
|||
<mat-checkbox formControlName="loadRelations" style="margin-bottom: 16px;"> |
|||
{{ 'version-control.load-entity-relations' | translate }} |
|||
</mat-checkbox> |
|||
</div> |
|||
</fieldset> |
|||
</form> |
|||
<div fxLayoutAlign="end center" fxLayoutGap="8px"> |
|||
<button mat-button color="primary" |
|||
type="button" |
|||
[disabled]="(isLoading$ | async)" |
|||
(click)="cancel()" cdkFocusInitial> |
|||
{{ 'action.cancel' | translate }} |
|||
</button> |
|||
<button mat-raised-button color="primary" |
|||
type="button" |
|||
(click)="restore()" |
|||
[disabled]="(isLoading$ | async) || restoreFormGroup.invalid"> |
|||
{{ 'action.restore' | translate }} |
|||
</button> |
|||
</div> |
|||
</section> |
|||
@ -0,0 +1,86 @@ |
|||
///
|
|||
/// Copyright © 2016-2022 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, OnInit } from '@angular/core'; |
|||
import { PageComponent } from '@shared/components/page.component'; |
|||
import { FormBuilder, FormGroup } from '@angular/forms'; |
|||
import { SingleEntityVersionLoadRequest, VersionLoadRequestType, VersionLoadResult } from '@shared/models/vc.models'; |
|||
import { Store } from '@ngrx/store'; |
|||
import { AppState } from '@core/core.state'; |
|||
import { EntitiesVersionControlService } from '@core/http/entities-version-control.service'; |
|||
import { EntityId } from '@shared/models/id/entity-id'; |
|||
import { TranslateService } from '@ngx-translate/core'; |
|||
|
|||
@Component({ |
|||
selector: 'tb-entity-version-restore', |
|||
templateUrl: './entity-version-restore.component.html', |
|||
styleUrls: [] |
|||
}) |
|||
export class EntityVersionRestoreComponent extends PageComponent implements OnInit { |
|||
|
|||
@Input() |
|||
branch: string; |
|||
|
|||
@Input() |
|||
versionName: string; |
|||
|
|||
@Input() |
|||
versionId: string; |
|||
|
|||
@Input() |
|||
externalEntityId: EntityId; |
|||
|
|||
@Input() |
|||
onClose: (result: Array<VersionLoadResult> | null) => void; |
|||
|
|||
restoreFormGroup: FormGroup; |
|||
|
|||
constructor(protected store: Store<AppState>, |
|||
private entitiesVersionControlService: EntitiesVersionControlService, |
|||
private translate: TranslateService, |
|||
private fb: FormBuilder) { |
|||
super(store); |
|||
} |
|||
|
|||
ngOnInit(): void { |
|||
this.restoreFormGroup = this.fb.group({ |
|||
loadRelations: [false, []] |
|||
}); |
|||
} |
|||
|
|||
cancel(): void { |
|||
if (this.onClose) { |
|||
this.onClose(null); |
|||
} |
|||
} |
|||
|
|||
restore(): void { |
|||
const request: SingleEntityVersionLoadRequest = { |
|||
branch: this.branch, |
|||
versionId: this.versionId, |
|||
externalEntityId: this.externalEntityId, |
|||
config: { |
|||
loadRelations: this.restoreFormGroup.get('loadRelations').value |
|||
}, |
|||
type: VersionLoadRequestType.SINGLE_ENTITY |
|||
}; |
|||
this.entitiesVersionControlService.loadEntitiesVersion(request).subscribe((result) => { |
|||
if (this.onClose) { |
|||
this.onClose(result); |
|||
} |
|||
}); |
|||
} |
|||
} |
|||
@ -1,77 +0,0 @@ |
|||
<!-- |
|||
|
|||
Copyright © 2016-2022 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. |
|||
|
|||
--> |
|||
<section style="min-width: 400px;"> |
|||
<mat-toolbar color="primary"> |
|||
<h2>{{ (createResult ? 'version-control.entity-version-exported' : 'version-control.export-entity-version') | translate }}</h2> |
|||
<span fxFlex></span> |
|||
<button mat-button mat-icon-button |
|||
(click)="cancel()" |
|||
type="button"> |
|||
<mat-icon class="material-icons">close</mat-icon> |
|||
</button> |
|||
</mat-toolbar> |
|||
<mat-progress-bar color="warn" mode="indeterminate" *ngIf="isLoading$ | async"> |
|||
</mat-progress-bar> |
|||
<div mat-dialog-content> |
|||
<form *ngIf="!createResult" [formGroup]="exportFormGroup"> |
|||
<fieldset [disabled]="isLoading$ | async"> |
|||
<div fxFlex fxLayout="column"> |
|||
<tb-branch-autocomplete |
|||
required |
|||
formControlName="branch"> |
|||
</tb-branch-autocomplete> |
|||
<mat-form-field class="mat-block" fxFlex> |
|||
<mat-label translate>version-control.version-name</mat-label> |
|||
<input required matInput formControlName="versionName"> |
|||
<mat-error *ngIf="exportFormGroup.get('versionName').hasError('required')"> |
|||
{{ 'version-control.version-name-required' | translate }} |
|||
</mat-error> |
|||
</mat-form-field> |
|||
<mat-checkbox formControlName="saveRelations" style="margin-bottom: 16px;"> |
|||
{{ 'version-control.export-entity-relations' | translate }} |
|||
</mat-checkbox> |
|||
</div> |
|||
</fieldset> |
|||
</form> |
|||
<div *ngIf="createResult" fxFlex fxLayout="column" fxLayoutAlign="center"> |
|||
<div [innerHTML]="createResultMessage"></div> |
|||
</div> |
|||
</div> |
|||
<div *ngIf="!createResult" mat-dialog-actions fxLayoutAlign="end center"> |
|||
<button mat-button color="primary" |
|||
type="button" |
|||
[disabled]="(isLoading$ | async)" |
|||
(click)="cancel()" cdkFocusInitial> |
|||
{{ 'action.cancel' | translate }} |
|||
</button> |
|||
<button mat-raised-button color="primary" |
|||
type="button" |
|||
(click)="export()" |
|||
[disabled]="(isLoading$ | async) || exportFormGroup.invalid || !exportFormGroup.dirty"> |
|||
{{ 'action.export' | translate }} |
|||
</button> |
|||
</div> |
|||
<div *ngIf="createResult" mat-dialog-actions fxLayoutAlign="end center"> |
|||
<button mat-button color="primary" |
|||
type="button" |
|||
[disabled]="(isLoading$ | async)" |
|||
(click)="cancel()" cdkFocusInitial> |
|||
{{ 'action.close' | translate }} |
|||
</button> |
|||
</div> |
|||
</section> |
|||
@ -1,105 +0,0 @@ |
|||
///
|
|||
/// Copyright © 2016-2022 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, OnInit, SkipSelf } from '@angular/core'; |
|||
import { ErrorStateMatcher } from '@angular/material/core'; |
|||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; |
|||
import { Store } from '@ngrx/store'; |
|||
import { AppState } from '@core/core.state'; |
|||
import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms'; |
|||
import { Router } from '@angular/router'; |
|||
import { DialogComponent } from '@app/shared/components/dialog.component'; |
|||
import { EntityId } from '@shared/models/id/entity-id'; |
|||
import { |
|||
SingleEntityVersionCreateRequest, |
|||
VersionCreateRequestType, |
|||
VersionCreationResult |
|||
} from '@shared/models/vc.models'; |
|||
import { EntitiesVersionControlService } from '@core/http/entities-version-control.service'; |
|||
import { DomSanitizer, SafeHtml } from '@angular/platform-browser'; |
|||
import { TranslateService } from '@ngx-translate/core'; |
|||
|
|||
export interface VcEntityExportDialogData { |
|||
entityId: EntityId; |
|||
} |
|||
|
|||
@Component({ |
|||
selector: 'tb-vc-entity-export-dialog', |
|||
templateUrl: './vc-entity-export-dialog.component.html', |
|||
providers: [{provide: ErrorStateMatcher, useExisting: VcEntityExportDialogComponent}], |
|||
styleUrls: [] |
|||
}) |
|||
export class VcEntityExportDialogComponent extends DialogComponent<VcEntityExportDialogComponent> |
|||
implements OnInit, ErrorStateMatcher { |
|||
|
|||
exportFormGroup: FormGroup; |
|||
|
|||
submitted = false; |
|||
|
|||
createResult: VersionCreationResult; |
|||
|
|||
createResultMessage: SafeHtml; |
|||
|
|||
constructor(protected store: Store<AppState>, |
|||
protected router: Router, |
|||
@Inject(MAT_DIALOG_DATA) public data: VcEntityExportDialogData, |
|||
@SkipSelf() private errorStateMatcher: ErrorStateMatcher, |
|||
public dialogRef: MatDialogRef<VcEntityExportDialogComponent>, |
|||
private entitiesVersionControlService: EntitiesVersionControlService, |
|||
private translate: TranslateService, |
|||
private domSanitizer: DomSanitizer, |
|||
private fb: FormBuilder) { |
|||
super(store, router, dialogRef); |
|||
|
|||
this.exportFormGroup = this.fb.group({ |
|||
branch: [null, [Validators.required]], |
|||
versionName: [null, [Validators.required]], |
|||
saveRelations: [false, []] |
|||
}); |
|||
} |
|||
|
|||
ngOnInit(): void { |
|||
} |
|||
|
|||
isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean { |
|||
const originalErrorState = this.errorStateMatcher.isErrorState(control, form); |
|||
const customErrorState = !!(control && control.invalid && this.submitted); |
|||
return originalErrorState || customErrorState; |
|||
} |
|||
|
|||
cancel(): void { |
|||
this.dialogRef.close(); |
|||
} |
|||
|
|||
export(): void { |
|||
this.submitted = true; |
|||
const request: SingleEntityVersionCreateRequest = { |
|||
entityId: this.data.entityId, |
|||
branch: this.exportFormGroup.get('branch').value, |
|||
versionName: this.exportFormGroup.get('versionName').value, |
|||
config: { |
|||
saveRelations: this.exportFormGroup.get('saveRelations').value |
|||
}, |
|||
type: VersionCreateRequestType.SINGLE_ENTITY |
|||
}; |
|||
this.entitiesVersionControlService.saveEntitiesVersion(request).subscribe((result) => { |
|||
this.createResult = result; |
|||
const message = this.translate.instant('version-control.export-entity-version-result-message', |
|||
{name: result.version.name, commitId: result.version.id}); |
|||
this.createResultMessage = this.domSanitizer.bypassSecurityTrustHtml(message); |
|||
}); |
|||
} |
|||
} |
|||
@ -0,0 +1,30 @@ |
|||
/** |
|||
* Copyright © 2016-2022 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-option.branch-option { |
|||
.mat-icon, .check-placeholder { |
|||
margin-right: 8px; |
|||
} |
|||
.check-placeholder { |
|||
width: 18px; |
|||
display: inline-block; |
|||
} |
|||
.mat-option-text { |
|||
width: 100%; |
|||
.default-branch { |
|||
float: right; |
|||
} |
|||
} |
|||
} |
|||
Loading…
Reference in new issue