-
Notifications
You must be signed in to change notification settings - Fork 305
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
NAS-131802: Error with some dataset paths in pool creation (#10897)
- Loading branch information
Showing
4 changed files
with
149 additions
and
119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
144 changes: 72 additions & 72 deletions
144
...ges/storage/modules/disks/components/manual-test-dialog/manual-test-dialog.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,80 +1,80 @@ | ||
<h1 matDialogTitle>{{ 'Manual S.M.A.R.T. Test' | translate }}</h1> | ||
|
||
<form | ||
class="ix-form-container" | ||
[formGroup]="form" | ||
(submit)="onSubmit()" | ||
> | ||
<div class="disks-list"> | ||
@if (selectedDisksWithSmartSupport.length) { | ||
@if (isSubmitted()) { | ||
<div class="prompt">{{ 'Running manual test(s) on disk(s):' }}</div> | ||
} @else { | ||
<div class="prompt">{{ 'Run manual test(s) on disk(s):' }}</div> | ||
} | ||
<ul class="disks"> | ||
@for (disk of selectedDisksWithSmartSupport; track disk.name) { | ||
<ix-test-progress-row | ||
[disk]="disk" | ||
[testType]="form.value.type" | ||
[loading]="isSubmitted()" | ||
[testStartError]="disk.error" | ||
[testStarted]="startedTests()" | ||
></ix-test-progress-row> | ||
} | ||
</ul> | ||
} | ||
@if (selectedDisksWithoutSmartSupport.length) { | ||
<div class="prompt"> | ||
{{ 'These disks do not support S.M.A.R.T. tests:' | translate }} | ||
</div> | ||
<ul class="disks"> | ||
@for (disk of selectedDisksWithoutSmartSupport; track disk) { | ||
<li> | ||
<div class="list-item"> | ||
<span>{{ disk.name }} ({{ disk.serial }})</span> | ||
</div> | ||
</li> | ||
} | ||
</ul> | ||
<form | ||
class="ix-form-container" | ||
[formGroup]="form" | ||
(submit)="onSubmit()" | ||
> | ||
<div class="disks-list"> | ||
@if (selectedDisksWithSmartSupport.length) { | ||
@if (isSubmitted()) { | ||
<div class="prompt">{{ 'Running manual test(s) on disk(s):' }}</div> | ||
} @else { | ||
<div class="prompt">{{ 'Run manual test(s) on disk(s):' }}</div> | ||
} | ||
</div> | ||
<ul class="disks"> | ||
@for (disk of selectedDisksWithSmartSupport; track disk.name) { | ||
<ix-test-progress-row | ||
[disk]="disk" | ||
[testType]="form.value.type" | ||
[loading]="isSubmitted()" | ||
[testStartError]="disk.error" | ||
[testStarted]="startedTests()" | ||
></ix-test-progress-row> | ||
} | ||
</ul> | ||
} | ||
@if (selectedDisksWithoutSmartSupport.length) { | ||
<div class="prompt"> | ||
{{ 'These disks do not support S.M.A.R.T. tests:' | translate }} | ||
</div> | ||
<ul class="disks"> | ||
@for (disk of selectedDisksWithoutSmartSupport; track disk) { | ||
<li> | ||
<div class="list-item"> | ||
<span>{{ disk.name }} ({{ disk.serial }})</span> | ||
</div> | ||
</li> | ||
} | ||
</ul> | ||
} | ||
</div> | ||
|
||
@if (!isSubmitted()) { | ||
<ix-select | ||
formControlName="type" | ||
[required]="true" | ||
[label]="'Type' | translate" | ||
[options]="testTypes$" | ||
></ix-select> | ||
} | ||
<ix-form-actions> | ||
@if (!isSubmitted()) { | ||
<ix-select | ||
formControlName="type" | ||
[required]="true" | ||
[label]="'Type' | translate" | ||
[options]="testTypes$" | ||
></ix-select> | ||
<button mat-button type="button" ixTest="cancel" [matDialogClose]="false"> | ||
{{ 'Cancel' | translate }} | ||
</button> | ||
|
||
<button | ||
*ixRequiresRoles="[Role.FullAdmin]" | ||
mat-button | ||
type="submit" | ||
color="primary" | ||
ixTest="start-test" | ||
[disabled]="form.invalid || !selectedDisksWithSmartSupport.length" | ||
> | ||
{{ 'Start' | translate }} | ||
</button> | ||
} @else { | ||
<button | ||
mat-button | ||
type="button" | ||
ixTest="minimize" | ||
[matDialogClose]="false" | ||
> | ||
{{ 'Continue in background' | translate }} | ||
</button> | ||
} | ||
<ix-form-actions> | ||
@if (!isSubmitted()) { | ||
<button mat-button type="button" ixTest="cancel" [matDialogClose]="false"> | ||
{{ 'Cancel' | translate }} | ||
</button> | ||
|
||
<button | ||
*ixRequiresRoles="[Role.FullAdmin]" | ||
mat-button | ||
type="submit" | ||
color="primary" | ||
ixTest="start-test" | ||
[disabled]="form.invalid || !selectedDisksWithSmartSupport.length" | ||
> | ||
{{ 'Start' | translate }} | ||
</button> | ||
} @else { | ||
<button | ||
mat-button | ||
type="button" | ||
ixTest="minimize" | ||
[matDialogClose]="false" | ||
> | ||
{{ 'Continue in background' | translate }} | ||
</button> | ||
} | ||
|
||
</ix-form-actions> | ||
</form> | ||
</ix-form-actions> | ||
</form> | ||
|