Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ import {
} from "@abacritt/angularx-social-login";
import { catchError, firstValueFrom, lastValueFrom, of } from "rxjs";
import { HubSearchResultComponent } from "./hub/component/hub-search-result/hub-search-result.component";
import { UserDatasetStagedObjectsListComponent } from "./dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component";
import { StagedObjectsListComponent } from "./dashboard/component/user/staged-objects-list/staged-objects-list.component";
import { NzEmptyModule } from "ng-zorro-antd/empty";
import { NzDividerModule } from "ng-zorro-antd/divider";
import { NzProgressModule } from "ng-zorro-antd/progress";
Expand Down Expand Up @@ -322,7 +322,7 @@ registerLocaleData(en);
DatasetDetailComponent,
UserDatasetVersionFiletreeComponent,
UserDatasetFileRendererComponent,
UserDatasetStagedObjectsListComponent,
StagedObjectsListComponent,
NzModalCommentBoxComponent,
LeftPanelComponent,
ContextMenuComponent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,11 @@ <h2 class="page-title">General Settings</h2>
</div>
</nz-card>

<nz-card [nzTitle]="datasetTitle">
<ng-template #datasetTitle>
Dataset
<nz-card
*ngFor="let group of uploadGroups"
[nzTitle]="uploadTitle">
<ng-template #uploadTitle>
{{ group.label }}
<span
nz-tooltip
[nzTooltipTitle]="awsTip"
Expand All @@ -271,10 +273,10 @@ <h2 class="page-title">General Settings</h2>
<ng-template #awsTip>
<div>
<strong>Configuration Guidelines</strong><br />
Concurrent parts &times; part size in-flight data per file<br />
Keep usage within your client memory/bandwidth limits<br />
Use larger part size for large files to avoid &gt;10,000 parts<br />
Out-of-range inputs will be auto-adjusted to the nearest valid value<br /><br />
&bull; Concurrent parts &times; part size &asymp; in-flight data per file<br />
&bull; Keep usage within your client memory/bandwidth limits<br />
&bull; Use larger part size for large files to avoid &gt;10,000 parts<br />
&bull; Out-of-range inputs will be auto-adjusted to the nearest valid value<br /><br />
Learn more:
<a
href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/qfacts.html"
Expand All @@ -288,7 +290,7 @@ <h2 class="page-title">General Settings</h2>
<div class="settings-row">
<span>Concurrent Files:</span>
<nz-input-number
[(ngModel)]="maxConcurrentFiles"
[(ngModel)]="group.form.maxConcurrentFiles"
[nzMin]="1"
[nzMax]="1000"
[nzStep]="1"
Expand All @@ -301,7 +303,7 @@ <h2 class="page-title">General Settings</h2>
<span>File Size:</span>
<div class="input-with-unit">
<nz-input-number
[(ngModel)]="maxFileSizeMiB"
[(ngModel)]="group.form.maxFileSizeMiB"
[nzMin]="1"
[nzMax]="MAX_FILE_SIZE_MiB"
[nzStep]="10"
Expand All @@ -317,7 +319,7 @@ <h2 class="page-title">General Settings</h2>
<div class="settings-row">
<span>Concurrent Parts:</span>
<nz-input-number
[(ngModel)]="maxConcurrentChunks"
[(ngModel)]="group.form.maxConcurrentChunks"
[nzMin]="1"
[nzMax]="MAX_TOTAL_PARTS"
[nzStep]="1"
Expand All @@ -326,14 +328,14 @@ <h2 class="page-title">General Settings</h2>
</div>
<div class="help-text-number">
Number of parts uploaded in parallel. Range: 1 - {{ MAX_TOTAL_PARTS | number }}. Current configuration will use
approximately {{ partsAtMax | number }} parts for maximum file size.
approximately {{ partsAtMax(group.form) | number }} parts for maximum file size.
</div>

<div class="settings-row">
<span>Part Size:</span>
<div class="input-with-unit">
<nz-input-number
[(ngModel)]="chunkSizeMiB"
[(ngModel)]="group.form.chunkSizeMiB"
[nzMin]="MIN_PART_SIZE_MiB"
[nzMax]="MAX_PART_SIZE_MiB"
[nzStep]="10"
Expand All @@ -344,22 +346,22 @@ <h2 class="page-title">General Settings</h2>
</div>
<div class="help-text-number">
Size of each chunk during multipart upload. Range: {{ MIN_PART_SIZE_MiB }} MiB - {{ MAX_PART_SIZE_MiB | number }}
MiB (5 GiB). Minimum required for current configuration: {{ requiredMinPartSizeMiB | number }} MiB.
MiB (5 GiB). Minimum required for current configuration: {{ requiredMinPartSizeMiB(group.form) | number }} MiB.
<br />
In-flight data per file: ~{{ maxConcurrentChunks * chunkSizeMiB | number }} MiB
In-flight data per file: ~{{ group.form.maxConcurrentChunks * group.form.chunkSizeMiB | number }} MiB
</div>

<div class="button-row">
<button
nz-button
nzType="primary"
(click)="saveDatasetSettings()">
(click)="saveUploadSettings(group)">
Save
</button>
<button
nz-button
nzType="default"
(click)="resetDatasetSettings()">
(click)="resetUploadSettings(group)">
Reset
</button>
</div>
Expand Down
Loading
Loading