-
Notifications
You must be signed in to change notification settings - Fork 438
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'task/main/DURACOM-304' of github.com:4Science/dspace-an…
…gular into task/main/DURACOM-304
- Loading branch information
Showing
13 changed files
with
267 additions
and
129 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
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
59 changes: 43 additions & 16 deletions
59
src/app/process-page/form/scripts-select/scripts-select.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,20 +1,47 @@ | ||
| <div class="form-group" *ngIf="scripts$ | async"> | ||
| <label for="process-script">{{'process.new.select-script' | translate}}</label> | ||
| <select required id="process-script" | ||
| class="form-control" | ||
| name="script" | ||
| [(ngModel)]="selectedScript" | ||
| #script="ngModel"> | ||
| <option [ngValue]="undefined">{{'process.new.select-script.placeholder' | translate}}</option> | ||
| <option *ngFor="let script of scripts$ | async" [ngValue]="script.id"> | ||
| {{script.name}} | ||
| </option> | ||
| </select> | ||
|
|
||
| <div class="d-flex w-100 flex-column gap-3"> | ||
| <div> | ||
| <div ngbDropdown class="d-flex"> | ||
| <input id="process-script" | ||
| class="form-control" | ||
| required | ||
| [ngModel]="selectedScript" | ||
| placeholder="{{'process.new.select-script.placeholder' | translate}}" | ||
| [ngModelOptions]="{standalone: true}" | ||
| ngbDropdownToggle | ||
| role="combobox" | ||
| #script="ngModel"> | ||
| <div ngbDropdownMenu aria-labelledby="process-script" class="w-100 scrollable-menu" | ||
| role="menu" | ||
| (scroll)="onScroll($event)" | ||
| infiniteScroll | ||
| [infiniteScrollDistance]="5" | ||
| [infiniteScrollThrottle]="300" | ||
| [infiniteScrollUpDistance]="1.5" | ||
| [fromRoot]="true" | ||
| [scrollWindow]="false"> | ||
| <button class="dropdown-item" | ||
| *ngFor="let script of scripts" | ||
| role="menuitem" | ||
| type="button" | ||
| title="{{ script.name }}" | ||
| (click)="onSelect(script);"> | ||
| <span class="text-truncate">{{ script.name }}</span> | ||
| </button> | ||
| <ng-container *ngIf="(isLoading$ | async)"> | ||
| <button class="dropdown-item disabled" role="menuitem"> | ||
| <ds-loading message="{{'loading.default' | translate}}"> | ||
| </ds-loading> | ||
| </button> | ||
| </ng-container> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div> | ||
| <div *ngIf="script.invalid && (script.dirty || script.touched)" | ||
| class="alert alert-danger validation-error"> | ||
| <div *ngIf="script.errors.required"> | ||
| {{'process.new.select-script.required' | translate}} | ||
| </div> | ||
| <div *ngIf="script.errors.required"> | ||
| {{ 'process.new.select-script.required' | translate }} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> |
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 |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| .dropdown-item { | ||
| padding: 0.35rem 1rem; | ||
|
|
||
| &:active { | ||
| color: white !important; | ||
| } | ||
| } | ||
|
|
||
| .scrollable-menu { | ||
| height: auto; | ||
| max-height: var(--ds-dropdown-menu-max-height); | ||
| overflow-x: hidden; | ||
| } | ||
|
|
||
| li:not(:last-of-type) .dropdown-item { | ||
| border-bottom: var(--bs-dropdown-border-width) solid var(--bs-dropdown-border-color); | ||
| } | ||
|
|
||
| #entityControlsDropdownMenu { | ||
| outline: 0; | ||
| left: 0 !important; | ||
| box-shadow: var(--bs-btn-focus-box-shadow); | ||
| } |
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
Oops, something went wrong.