hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'w2p-98211_advanced-workflow-actions-7.2' into w2p-98211_advanced-workflow-actions-main

Browse Source 
# Conflicts:
#	yarn.lock
This commit is contained in:
Alexandre Vryghem
2023-02-09 17:19:59 +01:00
parent 9deb7cbb60 ac06f30950
commit 0ec4e08e4b
5 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@@ -114,7 +114,6 @@
"ng-mocks": "^13.1.1", "ng-mocks": "^13.1.1",
"ng2-file-upload": "1.4.0", "ng2-file-upload": "1.4.0",
"ng2-nouislider": "^1.8.3", "ng2-nouislider": "^1.8.3",
"ngx-bootstrap": "7.1.2",
"ngx-infinite-scroll": "^10.0.1", "ngx-infinite-scroll": "^10.0.1",
"ngx-pagination": "5.0.0", "ngx-pagination": "5.0.0",
"ngx-sortablejs": "^11.1.0", "ngx-sortablejs": "^11.1.0",

10
src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html
View File

@@ -21,12 +21,14 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label"> <label class="control-label mb-1">
{{ 'advanced-workflow-action.rating.form.rating.label' | translate }}* {{ 'advanced-workflow-action.rating.form.rating.label' | translate }}*
</label> </label>
<rating [max]="advancedInfo?.maxValue" [ngClass]="{ 'text-danger': isInvalid('rating') }" <div class="d-block">
class="d-block" formControlName="rating"> <ngb-rating [max]="advancedInfo?.maxValue" [ngClass]="{ 'text-danger': isInvalid('rating') }"
</rating> formControlName="rating">
</ngb-rating>
</div>
<small *ngIf="isInvalid('rating')" class="invalid-feedback d-block"> <small *ngIf="isInvalid('rating')" class="invalid-feedback d-block">
{{ 'advanced-workflow-action.rating.form.rating.error' | translate }} {{ 'advanced-workflow-action.rating.form.rating.error' | translate }}
</small> </small>

4
src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.spec.ts
View File

@@ -18,7 +18,7 @@ import { WorkflowItemDataServiceStub } from '../../../shared/testing/workflow-it
import { RouterStub } from '../../../shared/testing/router.stub'; import { RouterStub } from '../../../shared/testing/router.stub';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { VarDirective } from '../../../shared/utils/var.directive'; import { VarDirective } from '../../../shared/utils/var.directive';
import { RatingModule } from 'ngx-bootstrap/rating'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { WorkflowItem } from '../../../core/submission/models/workflowitem.model'; import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
import { createSuccessfulRemoteDataObject$, createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils'; import { createSuccessfulRemoteDataObject$, createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
@@ -52,7 +52,7 @@ describe('AdvancedWorkflowActionRatingComponent', () => {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
imports: [ imports: [
FormsModule, FormsModule,
RatingModule, NgbModule,
ReactiveFormsModule, ReactiveFormsModule,
TranslateModule.forRoot(), TranslateModule.forRoot(),
], ],

4
src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts
View File

@@ -31,7 +31,7 @@ import {
ReviewersListComponent ReviewersListComponent
} from './advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component'; } from './advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component';
import { FormModule } from '../shared/form/form.module'; import { FormModule } from '../shared/form/form.module';
import { RatingModule } from 'ngx-bootstrap/rating'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
@NgModule({ @NgModule({
imports: [ imports: [
@@ -43,7 +43,7 @@ import { RatingModule } from 'ngx-bootstrap/rating';
ItemPageModule, ItemPageModule,
AccessControlModule, AccessControlModule,
FormModule, FormModule,
RatingModule, NgbModule,
], ],
declarations: [ declarations: [
WorkflowItemDeleteComponent, WorkflowItemDeleteComponent,

7
yarn.lock
View File

@@ -7981,13 +7981,6 @@ ng2-nouislider@^1.8.3:
resolved "https://registry.yarnpkg.com/ng2-nouislider/-/ng2-nouislider-1.8.3.tgz#c9c1ec77b6b5a909f87368ba799914208baa13a6" resolved "https://registry.yarnpkg.com/ng2-nouislider/-/ng2-nouislider-1.8.3.tgz#c9c1ec77b6b5a909f87368ba799914208baa13a6"
integrity sha512-Vl8tHCcJ/ioJLAs2t6FBC35sZq1P/O5ZdqdFwYxOCOMVbILGWNg+2gWZIjFstvv9pqb/mVvVUYe6qGG/mA/RBQ== integrity sha512-Vl8tHCcJ/ioJLAs2t6FBC35sZq1P/O5ZdqdFwYxOCOMVbILGWNg+2gWZIjFstvv9pqb/mVvVUYe6qGG/mA/RBQ==
ngx-bootstrap@7.1.2:
version "7.1.2"
resolved "https://registry.yarnpkg.com/ngx-bootstrap/-/ngx-bootstrap-7.1.2.tgz#cf06a05cc22a74b882b45882a1f64f72ddece23d"
integrity sha512-VsZwlGVM+qYOAdvEzzH3wqCjvj3yHec4n82Tho0ve6mhN1GTRu9WPrPmvxp3cFjIu8VQbREUeKPfK0ooO8U5eg==
dependencies:
tslib "^2.0.0"
ngx-infinite-scroll@^10.0.1: ngx-infinite-scroll@^10.0.1:
version "10.0.1" version "10.0.1"
resolved "https://registry.yarnpkg.com/ngx-infinite-scroll/-/ngx-infinite-scroll-10.0.1.tgz#6f51f2f8775a7c50d1dd8bad125d4e748abbe880" resolved "https://registry.yarnpkg.com/ngx-infinite-scroll/-/ngx-infinite-scroll-10.0.1.tgz#6f51f2f8775a7c50d1dd8bad125d4e748abbe880"