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

# Conflicts:
#	yarn.lock

package.json

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

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

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

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

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

src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts

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

yarn.lock

@@ -7981,13 +7981,6 @@ ng2-nouislider@^1.8.3:
   resolved "https://registry.yarnpkg.com/ng2-nouislider/-/ng2-nouislider-1.8.3.tgz#c9c1ec77b6b5a909f87368ba799914208baa13a6"
   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:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/ngx-infinite-scroll/-/ngx-infinite-scroll-10.0.1.tgz#6f51f2f8775a7c50d1dd8bad125d4e748abbe880"