Igor Kulikov
4 years ago
13 changed files with 459 additions and 13 deletions
@ -0,0 +1,110 @@ |
|||||
|
<!-- |
||||
|
|
||||
|
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. |
||||
|
|
||||
|
--> |
||||
|
<div> |
||||
|
<mat-card class="settings-card"> |
||||
|
<mat-card-title> |
||||
|
<div fxLayout="row"> |
||||
|
<span class="mat-headline" translate>admin.git-repository-settings</span> |
||||
|
<span fxFlex></span> |
||||
|
<div tb-help="versionControlSettings"></div> |
||||
|
</div> |
||||
|
</mat-card-title> |
||||
|
<mat-progress-bar color="warn" mode="indeterminate" *ngIf="isLoading$ | async"> |
||||
|
</mat-progress-bar> |
||||
|
<div style="height: 4px;" *ngIf="!(isLoading$ | async)"></div> |
||||
|
<mat-card-content style="padding-top: 16px;"> |
||||
|
<form [formGroup]="versionControlSettingsForm" #formDirective="ngForm" (ngSubmit)="save()"> |
||||
|
<fieldset [disabled]="isLoading$ | async"> |
||||
|
<mat-form-field class="mat-block"> |
||||
|
<mat-label translate>admin.repository-url</mat-label> |
||||
|
<input matInput required formControlName="repositoryUri"> |
||||
|
<mat-error translate *ngIf="versionControlSettingsForm.get('repositoryUri').hasError('required')"> |
||||
|
admin.repository-url-required |
||||
|
</mat-error> |
||||
|
</mat-form-field> |
||||
|
<mat-form-field class="mat-block"> |
||||
|
<mat-label translate>admin.default-branch</mat-label> |
||||
|
<input matInput formControlName="defaultBranch"> |
||||
|
</mat-form-field> |
||||
|
<fieldset [disabled]="isLoading$ | async" class="fields-group"> |
||||
|
<legend class="group-title" translate>admin.authentication-settings</legend> |
||||
|
<mat-form-field fxFlex class="mat-block"> |
||||
|
<mat-label translate>admin.auth-method</mat-label> |
||||
|
<mat-select required formControlName="authMethod"> |
||||
|
<mat-option *ngFor="let method of versionControlAuthMethods" [value]="method"> |
||||
|
{{versionControlAuthMethodTranslations.get(method) | translate}} |
||||
|
</mat-option> |
||||
|
</mat-select> |
||||
|
</mat-form-field> |
||||
|
<section [fxShow]="versionControlSettingsForm.get('authMethod').value === versionControlAuthMethod.USERNAME_PASSWORD" fxLayout="column"> |
||||
|
<mat-form-field fxFlex class="mat-block"> |
||||
|
<mat-label translate>common.username</mat-label> |
||||
|
<input matInput formControlName="username" placeholder="{{ 'common.enter-username' | translate }}" |
||||
|
autocomplete="new-username"/> |
||||
|
</mat-form-field> |
||||
|
<mat-checkbox *ngIf="showChangePassword" (change)="changePasswordChanged()" |
||||
|
[(ngModel)]="changePassword" [ngModelOptions]="{ standalone: true }" style="padding-bottom: 16px;"> |
||||
|
{{ 'admin.change-password-access-token' | translate }} |
||||
|
</mat-checkbox> |
||||
|
<mat-form-field class="mat-block" *ngIf="changePassword || !showChangePassword"> |
||||
|
<mat-label translate>admin.password-access-token</mat-label> |
||||
|
<input matInput formControlName="password" type="password" |
||||
|
placeholder="{{ 'common.enter-password' | translate }}" autocomplete="new-password"/> |
||||
|
<tb-toggle-password matSuffix></tb-toggle-password> |
||||
|
</mat-form-field> |
||||
|
</section> |
||||
|
<section [fxShow]="versionControlSettingsForm.get('authMethod').value === versionControlAuthMethod.PRIVATE_KEY" fxLayout="column"> |
||||
|
<tb-file-input style="margin-bottom: 16px;" |
||||
|
[existingFileName]="versionControlSettingsForm.get('privateKeyFileName').value" |
||||
|
required |
||||
|
formControlName="privateKey" |
||||
|
dropLabel="{{ 'admin.drop-private-key-file-or' | translate }}" |
||||
|
[label]="'admin.private-key' | translate" |
||||
|
(fileNameChanged)="versionControlSettingsForm.get('privateKeyFileName').patchValue($event)"> |
||||
|
</tb-file-input> |
||||
|
<mat-checkbox *ngIf="showChangePrivateKeyPassword" (change)="changePrivateKeyPasswordChanged()" |
||||
|
[(ngModel)]="changePrivateKeyPassword" [ngModelOptions]="{ standalone: true }" style="padding-bottom: 16px;"> |
||||
|
{{ 'admin.change-passphrase' | translate }} |
||||
|
</mat-checkbox> |
||||
|
<mat-form-field class="mat-block" *ngIf="changePrivateKeyPassword || !showChangePrivateKeyPassword"> |
||||
|
<mat-label translate>admin.passphrase</mat-label> |
||||
|
<input matInput formControlName="privateKeyPassword" type="password" |
||||
|
placeholder="{{ 'admin.enter-passphrase' | translate }}" autocomplete="new-password"/> |
||||
|
<tb-toggle-password matSuffix></tb-toggle-password> |
||||
|
</mat-form-field> |
||||
|
</section> |
||||
|
</fieldset> |
||||
|
<div fxLayout="row" fxLayoutAlign="end center" fxLayout.xs="column" fxLayoutAlign.xs="end" fxLayoutGap="16px"> |
||||
|
<button mat-raised-button color="warn" type="button" [fxShow]="settings !== null" |
||||
|
[disabled]="(isLoading$ | async)" (click)="delete(formDirective)"> |
||||
|
{{'action.delete' | translate}} |
||||
|
</button> |
||||
|
<span fxFlex></span> |
||||
|
<button mat-raised-button type="button" |
||||
|
[disabled]="(isLoading$ | async) || versionControlSettingsForm.invalid" (click)="checkAccess()"> |
||||
|
{{'admin.check-access' | translate}} |
||||
|
</button> |
||||
|
<button mat-raised-button color="primary" [disabled]="(isLoading$ | async) || versionControlSettingsForm.invalid || !versionControlSettingsForm.dirty" |
||||
|
type="submit">{{'action.save' | translate}} |
||||
|
</button> |
||||
|
</div> |
||||
|
</fieldset> |
||||
|
</form> |
||||
|
</mat-card-content> |
||||
|
</mat-card> |
||||
|
</div> |
||||
@ -0,0 +1,33 @@ |
|||||
|
/** |
||||
|
* 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 { |
||||
|
.fields-group { |
||||
|
padding: 0 16px 8px; |
||||
|
margin-bottom: 10px; |
||||
|
border: 1px groove rgba(0, 0, 0, .25); |
||||
|
border-radius: 4px; |
||||
|
|
||||
|
legend { |
||||
|
color: rgba(0, 0, 0, .7); |
||||
|
width: fit-content; |
||||
|
} |
||||
|
|
||||
|
legend + * { |
||||
|
display: block; |
||||
|
margin-top: 16px; |
||||
|
} |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,198 @@ |
|||||
|
///
|
||||
|
/// 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, OnInit } from '@angular/core'; |
||||
|
import { PageComponent } from '@shared/components/page.component'; |
||||
|
import { HasConfirmForm } from '@core/guards/confirm-on-exit.guard'; |
||||
|
import { FormBuilder, FormGroup, FormGroupDirective, Validators } from '@angular/forms'; |
||||
|
import { Store } from '@ngrx/store'; |
||||
|
import { AppState } from '@core/core.state'; |
||||
|
import { AdminService } from '@core/http/admin.service'; |
||||
|
import { |
||||
|
EntitiesVersionControlSettings, |
||||
|
VersionControlAuthMethod, |
||||
|
versionControlAuthMethodTranslationMap |
||||
|
} from '@shared/models/settings.models'; |
||||
|
import { ActionNotificationShow } from '@core/notification/notification.actions'; |
||||
|
import { TranslateService } from '@ngx-translate/core'; |
||||
|
import { isNotEmptyStr } from '@core/utils'; |
||||
|
import { DialogService } from '@core/services/dialog.service'; |
||||
|
|
||||
|
@Component({ |
||||
|
selector: 'tb-version-control-settings', |
||||
|
templateUrl: './version-control-settings.component.html', |
||||
|
styleUrls: ['./version-control-settings.component.scss', './settings-card.scss'] |
||||
|
}) |
||||
|
export class VersionControlSettingsComponent extends PageComponent implements OnInit, HasConfirmForm { |
||||
|
|
||||
|
versionControlSettingsForm: FormGroup; |
||||
|
settings: EntitiesVersionControlSettings = null; |
||||
|
|
||||
|
versionControlAuthMethod = VersionControlAuthMethod; |
||||
|
versionControlAuthMethods = Object.values(VersionControlAuthMethod); |
||||
|
versionControlAuthMethodTranslations = versionControlAuthMethodTranslationMap; |
||||
|
|
||||
|
showChangePassword = false; |
||||
|
changePassword = false; |
||||
|
|
||||
|
showChangePrivateKeyPassword = false; |
||||
|
changePrivateKeyPassword = false; |
||||
|
|
||||
|
constructor(protected store: Store<AppState>, |
||||
|
private adminService: AdminService, |
||||
|
private dialogService: DialogService, |
||||
|
private translate: TranslateService, |
||||
|
public fb: FormBuilder) { |
||||
|
super(store); |
||||
|
} |
||||
|
|
||||
|
ngOnInit() { |
||||
|
this.versionControlSettingsForm = this.fb.group({ |
||||
|
repositoryUri: [null, [Validators.required]], |
||||
|
defaultBranch: [null, []], |
||||
|
authMethod: [VersionControlAuthMethod.USERNAME_PASSWORD, [Validators.required]], |
||||
|
username: [null, []], |
||||
|
password: [null, []], |
||||
|
privateKeyFileName: [null, [Validators.required]], |
||||
|
privateKey: [null, []], |
||||
|
privateKeyPassword: [null, []] |
||||
|
}); |
||||
|
this.updateValidators(false); |
||||
|
this.versionControlSettingsForm.get('authMethod').valueChanges.subscribe(() => { |
||||
|
this.updateValidators(true); |
||||
|
}); |
||||
|
this.versionControlSettingsForm.get('privateKeyFileName').valueChanges.subscribe(() => { |
||||
|
this.updateValidators(false); |
||||
|
}); |
||||
|
this.adminService.getEntitiesVersionControlSettings({ignoreErrors: true}).subscribe( |
||||
|
(settings) => { |
||||
|
this.settings = settings; |
||||
|
if (this.settings.authMethod === VersionControlAuthMethod.USERNAME_PASSWORD) { |
||||
|
this.showChangePassword = true; |
||||
|
} else { |
||||
|
this.showChangePrivateKeyPassword = true; |
||||
|
} |
||||
|
this.versionControlSettingsForm.reset(this.settings); |
||||
|
this.updateValidators(false); |
||||
|
}); |
||||
|
} |
||||
|
|
||||
|
checkAccess(): void { |
||||
|
const settings: EntitiesVersionControlSettings = this.versionControlSettingsForm.value; |
||||
|
this.adminService.checkVersionControlAccess(settings).subscribe(() => { |
||||
|
this.store.dispatch(new ActionNotificationShow({ message: this.translate.instant('admin.check-vc-access-success'), |
||||
|
type: 'success' })); |
||||
|
}); |
||||
|
} |
||||
|
|
||||
|
save(): void { |
||||
|
const settings: EntitiesVersionControlSettings = this.versionControlSettingsForm.value; |
||||
|
this.adminService.saveEntitiesVersionControlSettings(settings).subscribe( |
||||
|
(savedSettings) => { |
||||
|
this.settings = savedSettings; |
||||
|
if (this.settings.authMethod === VersionControlAuthMethod.USERNAME_PASSWORD) { |
||||
|
this.showChangePassword = true; |
||||
|
this.changePassword = false; |
||||
|
} else { |
||||
|
this.showChangePrivateKeyPassword = true; |
||||
|
this.changePrivateKeyPassword = false; |
||||
|
} |
||||
|
this.versionControlSettingsForm.reset(this.settings); |
||||
|
this.updateValidators(false); |
||||
|
} |
||||
|
); |
||||
|
} |
||||
|
|
||||
|
delete(formDirective: FormGroupDirective): void { |
||||
|
this.dialogService.confirm( |
||||
|
this.translate.instant('admin.delete-git-settings-title', ), |
||||
|
this.translate.instant('admin.delete-git-settings-text'), null, |
||||
|
this.translate.instant('action.delete') |
||||
|
).subscribe((data) => { |
||||
|
if (data) { |
||||
|
this.adminService.deleteEntitiesVersionControlSettings().subscribe( |
||||
|
() => { |
||||
|
this.settings = null; |
||||
|
this.showChangePassword = false; |
||||
|
this.changePassword = false; |
||||
|
this.showChangePrivateKeyPassword = false; |
||||
|
this.changePrivateKeyPassword = false; |
||||
|
formDirective.resetForm(); |
||||
|
this.versionControlSettingsForm.reset({ authMethod: VersionControlAuthMethod.USERNAME_PASSWORD }); |
||||
|
this.updateValidators(false); |
||||
|
} |
||||
|
); |
||||
|
} |
||||
|
}); |
||||
|
} |
||||
|
|
||||
|
confirmForm(): FormGroup { |
||||
|
return this.versionControlSettingsForm; |
||||
|
} |
||||
|
|
||||
|
changePasswordChanged() { |
||||
|
if (this.changePassword) { |
||||
|
this.versionControlSettingsForm.get('password').patchValue(''); |
||||
|
this.versionControlSettingsForm.get('password').markAsDirty(); |
||||
|
} |
||||
|
this.updateValidators(false); |
||||
|
} |
||||
|
|
||||
|
changePrivateKeyPasswordChanged() { |
||||
|
if (this.changePrivateKeyPassword) { |
||||
|
this.versionControlSettingsForm.get('privateKeyPassword').patchValue(''); |
||||
|
this.versionControlSettingsForm.get('privateKeyPassword').markAsDirty(); |
||||
|
} |
||||
|
this.updateValidators(false); |
||||
|
} |
||||
|
|
||||
|
updateValidators(emitEvent?: boolean): void { |
||||
|
const authMethod: VersionControlAuthMethod = this.versionControlSettingsForm.get('authMethod').value; |
||||
|
const privateKeyFileName: string = this.versionControlSettingsForm.get('privateKeyFileName').value; |
||||
|
if (authMethod === VersionControlAuthMethod.USERNAME_PASSWORD) { |
||||
|
this.versionControlSettingsForm.get('username').enable({emitEvent}); |
||||
|
if (this.changePassword || !this.showChangePassword) { |
||||
|
this.versionControlSettingsForm.get('password').enable({emitEvent}); |
||||
|
} else { |
||||
|
this.versionControlSettingsForm.get('password').disable({emitEvent}); |
||||
|
} |
||||
|
this.versionControlSettingsForm.get('privateKeyFileName').disable({emitEvent}); |
||||
|
this.versionControlSettingsForm.get('privateKey').disable({emitEvent}); |
||||
|
this.versionControlSettingsForm.get('privateKeyPassword').disable({emitEvent}); |
||||
|
} else { |
||||
|
this.versionControlSettingsForm.get('username').disable({emitEvent}); |
||||
|
this.versionControlSettingsForm.get('password').disable({emitEvent}); |
||||
|
this.versionControlSettingsForm.get('privateKeyFileName').enable({emitEvent}); |
||||
|
this.versionControlSettingsForm.get('privateKey').enable({emitEvent}); |
||||
|
if (this.changePrivateKeyPassword || !this.showChangePrivateKeyPassword) { |
||||
|
this.versionControlSettingsForm.get('privateKeyPassword').enable({emitEvent}); |
||||
|
} else { |
||||
|
this.versionControlSettingsForm.get('privateKeyPassword').disable({emitEvent}); |
||||
|
} |
||||
|
if (isNotEmptyStr(privateKeyFileName)) { |
||||
|
this.versionControlSettingsForm.get('privateKey').clearValidators(); |
||||
|
} else { |
||||
|
this.versionControlSettingsForm.get('privateKey').setValidators([Validators.required]); |
||||
|
} |
||||
|
} |
||||
|
this.versionControlSettingsForm.get('username').updateValueAndValidity({emitEvent: false}); |
||||
|
this.versionControlSettingsForm.get('password').updateValueAndValidity({emitEvent: false}); |
||||
|
this.versionControlSettingsForm.get('privateKeyFileName').updateValueAndValidity({emitEvent: false}); |
||||
|
this.versionControlSettingsForm.get('privateKey').updateValueAndValidity({emitEvent: false}); |
||||
|
this.versionControlSettingsForm.get('privateKeyPassword').updateValueAndValidity({emitEvent: false}); |
||||
|
} |
||||
|
|
||||
|
} |
||||
Loading…
Reference in new issue