Merge branch 'dspace-cris-2023_02_x' into task/dspace-cris-2023_02_x/DSC-1864-alignment-dspace-7.6.2

Author: FrancescoMolinaro

src/app/admin/admin-import-batch-page/batch-import-page.component.html

@@ -20,11 +20,11 @@ <h1 id="header">{{'admin.batch-import.page.header' | translate}}</h1>
     </small>
   </div>
 
-  <ui-switch color="#ebebeb"
-             [checkedLabel]="'admin.metadata-import.page.toggle.upload' | translate"
-             [uncheckedLabel]="'admin.metadata-import.page.toggle.url' | translate"
-             [checked]="isUpload"
-             (change)="toggleUpload()" ></ui-switch>
+  <ds-switch
+    [options]="switchOptions"
+    [selectedValue]="isUpload ? 'upload' : 'url'"
+    (selectedValueChange)="toggleUpload()">
+  </ds-switch>
   <small class="form-text text-muted">
     {{'admin.batch-import.page.toggle.help' | translate}}
   </small>

src/app/admin/admin-import-batch-page/batch-import-page.component.ts

@@ -17,6 +17,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { take } from 'rxjs/operators';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { SwitchColor, SwitchOption } from '../../shared/switch/switch.component';
 
 @Component({
   selector: 'ds-batch-import-page',
@@ -48,6 +49,14 @@ export class BatchImportPageComponent {
    */
   fileURL: string;
 
+  /**
+   * The custom options for the 'ds-switch' component
+   */
+  switchOptions: SwitchOption[] = [
+    { value: 'upload', icon: 'fa fa-upload', label: 'admin.metadata-import.page.toggle.upload', iconColor: SwitchColor.Primary },
+    { value: 'url', icon: 'fa fa-link', label: 'admin.metadata-import.page.toggle.url', iconColor: SwitchColor.Primary },
+  ];
+
   public constructor(private location: Location,
                      protected translate: TranslateService,
                      protected notificationsService: NotificationsService,
@@ -154,4 +163,5 @@ export class BatchImportPageComponent {
   toggleUpload() {
     this.isUpload = !this.isUpload;
   }
+
 }

src/app/admin/admin.module.ts

@@ -12,7 +12,6 @@ import { ExpandableAdminSidebarSectionComponent } from './admin-sidebar/expandab
 import { AdminEditUserAgreementComponent } from './admin-edit-user-agreement/admin-edit-user-agreement.component';
 import { EditCmsMetadataComponent } from './edit-cms-metadata/edit-cms-metadata.component';
 import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
-import { UiSwitchModule } from 'ngx-ui-switch';
 import { UploadModule } from '../shared/upload/upload.module';
 
 const ENTRY_COMPONENTS = [
@@ -30,7 +29,6 @@ const ENTRY_COMPONENTS = [
     AdminSearchModule.withEntryComponents(),
     AdminWorkflowModuleModule.withEntryComponents(),
     SharedModule,
-    UiSwitchModule,
     UploadModule,
   ],
   declarations: [

src/app/bulk-import/bulk-import-page.component.html

@@ -13,7 +13,7 @@ <h2 class="mb-3">{{ 'bulk-import.title' | translate }}</h2>
       <input type="checkbox" formControlName="abortOnError" id="abortOnError" class="form-check-input" />
       <label for="abortOnError" class="mr-5">{{ 'bulk-import.abort-on-error' | translate }}</label>
     </div>
-    
+
     <button type="submit" class="btn btn-primary float-right" [disabled]="form.invalid || (isProcessingImport() | async)" >
       <span *ngIf="(isProcessingImport() | async)">
         <i class='fas fa-circle-notch fa-spin'></i> {{'bulk-import.processing' | translate}}
@@ -22,9 +22,9 @@ <h2 class="mb-3">{{ 'bulk-import.title' | translate }}</h2>
           {{'bulk-import.submit' | translate}}
       </span>
     </button>
-    <button class="btn btn-secondary float-right mr-2" (click)="goBack()">
+    <button class="btn btn-outline-secondary float-right mr-2" (click)="goBack()">
       {{'bulk-import.back' | translate}}
     </button>
 
   </form>
-</div>
+</div>

src/app/bulk-import/bulk-import-page.component.spec.ts

@@ -115,7 +115,7 @@ describe('BulkImportPageComponent', () => {
       expect(scriptDataService.invoke).toHaveBeenCalledWith('bulk-import', [
         { name: '-c', value: '626b80c5-ef15-4b29-8e69-bda89b0a7acf' },
         { name: '-f', value: 'test.xls' },
-        { name: '-e', value: true }
+        { name: '-er', value: true }
       ], [file]);
     });
 

src/app/bulk-import/bulk-import-page.component.ts

@@ -92,7 +92,7 @@ export class BulkImportPageComponent implements OnInit, OnDestroy {
     ];
 
     if (values.abortOnError) {
-      stringParameters.push( { name: '-e', value: values.abortOnError } );
+      stringParameters.push( { name: '-er', value: values.abortOnError } );
     }
 
     this.scriptService.invoke('bulk-import', stringParameters, [file])

src/app/external-login-review-account-info-page/external-login-review-account-info-page.module.ts

@@ -8,7 +8,6 @@ import {
   ThemedExternalLoginReviewAccountInfoPageComponent
 } from './themed-external-login-review-account-info-page.component';
 import { ReviewAccountInfoComponent } from './review-account-info/review-account-info.component';
-import { UiSwitchModule } from 'ngx-ui-switch';
 import { SharedModule } from '../shared/shared.module';
 import { ExternalLoginModule } from '../external-log-in/external-login.module';
 
@@ -23,7 +22,6 @@ import { ExternalLoginModule } from '../external-log-in/external-login.module';
     CommonModule,
     ExternalLoginReviewAccountInfoRoutingModule,
     SharedModule,
-    UiSwitchModule,
     ExternalLoginModule
   ]
 })

src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.html

@@ -40,13 +40,12 @@ <h2> {{'external-login-validation.review-account-info.header' | translate}}</h2>
           </span>
         </td>
         <td>
-          <ui-switch
+          <ds-switch
             *ngIf="(data.receivedValue !== data.currentValue) && data.currentValue"
-            [checkedLabel]="'on-label' | translate"
-            [uncheckedLabel]="'off-label' | translate"
-            [checked]="data.overrideValue"
-            (change)="onOverrideChange($event, data.identifier)"
-          ></ui-switch>
+            [options]="switchOptions"
+            [selectedValue]="data.overrideValue"
+            (selectedValueChange)="onOverrideChange($event, data.identifier)">
+          </ds-switch>
         </td>
       </tr>
     </tbody>

src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.spec.ts

@@ -190,7 +190,7 @@ describe('ReviewAccountInfoComponent', () => {
     const firstDataRow = dataRows[1];
     const firstDataLabel: HTMLElement = firstDataRow.querySelector('th');
     const firstDataReceivedValue: HTMLElement = firstDataRow.querySelectorAll('td')[0];
-    const firstDataOverrideSwitch: HTMLElement = firstDataRow.querySelector('ui-switch');
+    const firstDataOverrideSwitch: HTMLElement = firstDataRow.querySelector('ds-switch');
     expect(firstDataLabel.textContent.trim()).toBe('Lastname');
     expect(firstDataReceivedValue.textContent.trim()).toBe('Doe');
     expect(firstDataOverrideSwitch).toBeNull();

src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.ts

@@ -15,6 +15,7 @@ import { HardRedirectService } from '../../core/services/hard-redirect.service';
 import { AuthRegistrationType } from '../../core/auth/models/auth.registration-type';
 import { ExternalLoginService } from '../../external-log-in/services/external-login.service';
 import { NativeWindowRef, NativeWindowService } from '../../core/services/window.service';
+import { SwitchColor, SwitchOption } from '../../shared/switch/switch.component';
 
 export interface ReviewAccountInfoData {
   label: string;
@@ -53,6 +54,14 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy {
    */
   subs: Subscription[] = [];
 
+  /**
+   * The custom options for the 'ds-switch' component
+   */
+  switchOptions: SwitchOption[] = [
+    { value: true, labelColor: SwitchColor.Success, backgroundColor: SwitchColor.Success ,label: 'on-label' },
+    { value: false, label: 'off-label' },
+  ];
+
   constructor(
     @Inject(NativeWindowService) protected _window: NativeWindowRef,
     private ePersonService: EPersonDataService,