Skip to content

Commit 31aabab

Browse files
committed
Issue 1818: Code refactoring
1 parent 1e12d41 commit 31aabab

File tree

3 files changed

+31
-28
lines changed

3 files changed

+31
-28
lines changed

src/app/modules/server-settings/pages/manage-settings/manage-settings.component.html

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -205,21 +205,22 @@
205205
</mat-tab>
206206

207207
<mat-tab>
208-
<ng-template mat-tab-label>
209-
<span [class.invalid]="getCorsConfigurationGroup().invalid">Repository configuration</span>
210-
</ng-template>
211-
212-
<div class="tabContent">
213-
<div fxLayout.lt-md="column" fxLayout="row" fxLayoutGap="10%">
214-
<mat-form-field>
215-
<mat-select formControlName="digestAlgorithmSet" placeholder="Checksum digest algorithms" [disableOptionCentering]="true" multiple>
216-
<mat-option *ngFor="let algorithm of availableDigestAlgorithmSet" [value]="algorithm">
217-
{{ algorithm }}
218-
</mat-option>
219-
</mat-select>
220-
</mat-form-field>
208+
<ng-template mat-tab-label>
209+
<span>Repository configuration</span>
210+
</ng-template>
211+
212+
<div class="tabContent">
213+
<div fxLayout.lt-md="column" fxLayout="row" fxLayoutGap="10%">
214+
<mat-form-field>
215+
<mat-select formControlName="digestAlgorithmSet" placeholder="Checksum digest algorithms"
216+
[disableOptionCentering]="true" multiple>
217+
<mat-option *ngFor="let algorithm of availableDigestAlgorithmSet" [value]="algorithm">
218+
{{ algorithm }}
219+
</mat-option>
220+
</mat-select>
221+
</mat-form-field>
222+
</div>
221223
</div>
222-
</div>
223224
</mat-tab>
224225
</mat-tab-group>
225226

src/app/modules/storage-management/pages/manage-repository/manage-repository.component.html

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,18 @@
5757
</mat-form-field>
5858

5959
<div formGroupName="repositoryConfiguration">
60-
<mat-checkbox *ngIf="isMavenLayout()" [checked]="overrideAlgorithmConfig" color="primary" (change)="onOverrideAlgorithmConfigChange()">
61-
Override checksum digest algorithms
62-
</mat-checkbox>
63-
<mat-form-field *ngIf="isMavenLayout() && overrideAlgorithmConfig">
64-
<mat-select formControlName="digestAlgorithmSet" placeholder="Checksum digest algorithms" [disableOptionCentering]="true" multiple>
65-
<mat-option *ngFor="let algorithm of availableDigestAlgorithmSet" [value]="algorithm">
66-
{{ algorithm }}
67-
</mat-option>
68-
</mat-select>
69-
</mat-form-field>
60+
<mat-checkbox *ngIf="isMavenLayout()" [checked]="overrideAlgorithmConfig" color="primary"
61+
(change)="onOverrideAlgorithmConfigChange()">
62+
Override checksum digest algorithms
63+
</mat-checkbox>
64+
<mat-form-field *ngIf="isMavenLayout() && overrideAlgorithmConfig">
65+
<mat-select formControlName="digestAlgorithmSet" placeholder="Checksum digest algorithms"
66+
[disableOptionCentering]="true" multiple>
67+
<mat-option *ngFor="let algorithm of availableDigestAlgorithmSet" [value]="algorithm">
68+
{{ algorithm }}
69+
</mat-option>
70+
</mat-select>
71+
</mat-form-field>
7072
</div>
7173

7274
<section>

src/app/modules/storage-management/pages/manage-repository/manage-repository.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export class ManageRepositoryComponent implements OnInit {
5959
generateCommonFormFields(type: RepositoryTypeEnum, repo: Repository) {
6060
let repositoryConfiguration;
6161
if (repo.layout === RepositoryLayoutEnum.MAVEN2) {
62-
repositoryConfiguration = new FormGroup({...this.generateMavenRepositoryFormFields(repo.repositoryConfiguration)});
62+
repositoryConfiguration = new FormGroup({ ...this.generateMavenRepositoryFormFields(repo.repositoryConfiguration) });
6363
} else {
6464
repositoryConfiguration = new FormControl(null);
6565
}
@@ -100,7 +100,7 @@ export class ManageRepositoryComponent implements OnInit {
100100

101101
generateMavenRepositoryFormFields(repositoryConfiguration: CustomRepositoryConfiguration) {
102102
if (repositoryConfiguration['digestAlgorithmSet']
103-
&& repositoryConfiguration['digestAlgorithmSet'].length > 0) {
103+
&& repositoryConfiguration['digestAlgorithmSet'].length > 0) {
104104
this.overrideAlgorithmConfig = true;
105105
}
106106
return {
@@ -110,7 +110,7 @@ export class ManageRepositoryComponent implements OnInit {
110110
cronExpression: new FormControl(repositoryConfiguration['cronExpression']),
111111
metadataExpirationStrategy: new FormControl(repositoryConfiguration['metadataExpirationStrategy']),
112112
digestAlgorithmSet: new FormControl(repositoryConfiguration['digestAlgorithmSet'],
113-
this.overrideAlgorithmConfig ? Validators.required : null)
113+
this.overrideAlgorithmConfig ? Validators.required : null)
114114
};
115115
}
116116

@@ -346,7 +346,7 @@ export class ManageRepositoryComponent implements OnInit {
346346
}
347347

348348
isMavenLayout() {
349-
return this.form.get('layout').value === RepositoryLayoutEnum.MAVEN2;
349+
return this.form.get('layout').value === RepositoryLayoutEnum.MAVEN2;
350350
}
351351

352352
}

0 commit comments

Comments
 (0)