diff --git a/dmp-frontend/angular.json b/dmp-frontend/angular.json index 7b6d198f6..e2dba7c01 100644 --- a/dmp-frontend/angular.json +++ b/dmp-frontend/angular.json @@ -23,6 +23,7 @@ ], "styles": [ "src/styles.scss", + "src/assets/scss/material-dashboard.scss", "src/assets/css/demo.css", "node_modules/cookieconsent/build/cookieconsent.min.css" ], diff --git a/dmp-frontend/src/app/app.module.ts b/dmp-frontend/src/app/app.module.ts index 67616a71b..4ae3e7125 100644 --- a/dmp-frontend/src/app/app.module.ts +++ b/dmp-frontend/src/app/app.module.ts @@ -4,7 +4,7 @@ import { LOCALE_ID, NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MAT_MOMENT_DATE_FORMATS, MatMomentDateModule } from '@angular/material-moment-adapter'; import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core'; -import { MAT_LEGACY_FORM_FIELD_DEFAULT_OPTIONS as MAT_FORM_FIELD_DEFAULT_OPTIONS, MatLegacyFormFieldDefaultOptions as MatFormFieldDefaultOptions } from '@angular/material/legacy-form-field'; +import { MAT_FORM_FIELD_DEFAULT_OPTIONS, MatFormFieldDefaultOptions } from '@angular/material/form-field'; import { BrowserModule, Title } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { AppRoutingModule } from '@app/app-routing.module'; diff --git a/dmp-frontend/src/app/core/services/auth/auth.service.ts b/dmp-frontend/src/app/core/services/auth/auth.service.ts index 8beb72c64..53355056d 100644 --- a/dmp-frontend/src/app/core/services/auth/auth.service.ts +++ b/dmp-frontend/src/app/core/services/auth/auth.service.ts @@ -1,7 +1,7 @@ import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack-bar'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { Router } from '@angular/router'; import { Credential } from '@app/core/model/auth/credential'; import { LoginInfo } from '@app/core/model/auth/login-info'; diff --git a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts index 272f1bd44..7e7ea3d1a 100644 --- a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts +++ b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts @@ -1,5 +1,5 @@ -import {FocusMonitor} from '@angular/cdk/a11y'; -import {BACKSPACE, ENTER} from '@angular/cdk/keycodes'; +import { FocusMonitor } from '@angular/cdk/a11y'; +import { BACKSPACE, ENTER } from '@angular/cdk/keycodes'; import { Component, DoCheck, @@ -16,19 +16,19 @@ import { TemplateRef, ViewChild } from '@angular/core'; -import {ControlValueAccessor, FormGroupDirective, NgControl, NgForm} from '@angular/forms'; +import { ControlValueAccessor, FormGroupDirective, NgControl, NgForm } from '@angular/forms'; +import { MatAutocomplete, MatAutocompleteSelectedEvent, MatAutocompleteTrigger } from '@angular/material/autocomplete'; import { MatChipInputEvent } from '@angular/material/chips'; -import {ErrorStateMatcher, mixinErrorState} from '@angular/material/core'; -import {MatLegacyAutocomplete as MatAutocomplete, MatLegacyAutocompleteSelectedEvent as MatAutocompleteSelectedEvent, MatLegacyAutocompleteTrigger as MatAutocompleteTrigger} from '@angular/material/legacy-autocomplete'; -import {MatLegacyFormFieldControl as MatFormFieldControl} from '@angular/material/legacy-form-field'; -import {AutoCompleteGroup} from '@app/library/auto-complete/auto-complete-group'; +import { ErrorStateMatcher, mixinErrorState } from '@angular/material/core'; +import { MatFormFieldControl } from '@angular/material/form-field'; +import { AutoCompleteGroup } from '@app/library/auto-complete/auto-complete-group'; import { MultipleAutoCompleteConfiguration } from '@app/library/auto-complete/multiple/multiple-auto-complete-configuration'; -import {BaseComponent} from '@common/base/base.component'; -import {isNullOrUndefined} from '@swimlane/ngx-datatable'; -import {BehaviorSubject, combineLatest, Observable, of as observableOf, Subject, Subscription} from 'rxjs'; -import {debounceTime, distinctUntilChanged, map, startWith, takeUntil, switchMap, tap} from 'rxjs/operators'; +import { BaseComponent } from '@common/base/base.component'; +import { isNullOrUndefined } from '@swimlane/ngx-datatable'; +import { BehaviorSubject, Observable, Subject, Subscription, combineLatest, of as observableOf } from 'rxjs'; +import { debounceTime, distinctUntilChanged, map, startWith, switchMap, takeUntil, tap } from 'rxjs/operators'; export class CustomComponentBase extends BaseComponent { constructor( @@ -48,14 +48,14 @@ export const _CustomComponentMixinBase = mixinErrorState(CustomComponentBase); selector: 'app-multiple-auto-complete', templateUrl: './multiple-auto-complete.component.html', styleUrls: ['./multiple-auto-complete.component.scss'], - providers: [{provide: MatFormFieldControl, useExisting: MultipleAutoCompleteComponent}] + providers: [{ provide: MatFormFieldControl, useExisting: MultipleAutoCompleteComponent }] }) export class MultipleAutoCompleteComponent extends _CustomComponentMixinBase implements OnInit, MatFormFieldControl, ControlValueAccessor, OnDestroy, DoCheck, OnChanges { static nextId = 0; - @ViewChild('autocomplete', {static: true}) autocomplete: MatAutocomplete; - @ViewChild('autocompleteTrigger', {static: true}) autocompleteTrigger: MatAutocompleteTrigger; - @ViewChild('autocompleteInput', {static: true}) autocompleteInput: ElementRef; + @ViewChild('autocomplete', { static: true }) autocomplete: MatAutocomplete; + @ViewChild('autocompleteTrigger', { static: true }) autocompleteTrigger: MatAutocompleteTrigger; + @ViewChild('autocompleteInput', { static: true }) autocompleteInput: ElementRef; @Input() get configuration(): MultipleAutoCompleteConfiguration { diff --git a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts index 4c91fcaac..36f7b89f6 100644 --- a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts +++ b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts @@ -2,14 +2,14 @@ import { FocusMonitor } from '@angular/cdk/a11y'; import { ENTER } from '@angular/cdk/keycodes'; import { Component, DoCheck, ElementRef, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Optional, Output, Self, SimpleChanges, TemplateRef, ViewChild } from '@angular/core'; import { ControlValueAccessor, FormGroupDirective, NgControl, NgForm } from '@angular/forms'; -import { MatLegacyAutocomplete as MatAutocomplete, MatLegacyAutocompleteSelectedEvent as MatAutocompleteSelectedEvent, MatLegacyAutocompleteTrigger as MatAutocompleteTrigger } from '@angular/material/legacy-autocomplete'; +import { MatAutocomplete, MatAutocompleteSelectedEvent, MatAutocompleteTrigger } from '@angular/material/autocomplete'; import { ErrorStateMatcher, mixinErrorState } from '@angular/material/core'; -import { MatLegacyFormFieldControl as MatFormFieldControl } from '@angular/material/legacy-form-field'; +import { MatFormFieldControl } from '@angular/material/form-field'; import { AutoCompleteGroup } from '@app/library/auto-complete/auto-complete-group'; import { SingleAutoCompleteConfiguration } from '@app/library/auto-complete/single/single-auto-complete-configuration'; import { BaseComponent } from '@common/base/base.component'; -import { Observable, of as observableOf, Subject } from 'rxjs'; -import {debounceTime, distinctUntilChanged, map, mergeMap, startWith, takeUntil, switchMap, tap} from 'rxjs/operators'; +import { Observable, Subject, of as observableOf } from 'rxjs'; +import { debounceTime, distinctUntilChanged, map, startWith, switchMap, takeUntil, tap } from 'rxjs/operators'; export class CustomComponentBase extends BaseComponent { diff --git a/dmp-frontend/src/app/library/deactivate/can-deactivate.guard.ts b/dmp-frontend/src/app/library/deactivate/can-deactivate.guard.ts index 06845c5e9..8e6df7ff9 100644 --- a/dmp-frontend/src/app/library/deactivate/can-deactivate.guard.ts +++ b/dmp-frontend/src/app/library/deactivate/can-deactivate.guard.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { CanDeactivate } from '@angular/router'; import { CheckDeactivateBaseComponent } from '@app/library/deactivate/deactivate.component'; import { BaseComponent } from '@common/base/base.component'; diff --git a/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.ts b/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.ts index ef4d6546c..a702a72b8 100644 --- a/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.ts +++ b/dmp-frontend/src/app/library/export-method-dialog/export-method-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Inject } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @Component({ diff --git a/dmp-frontend/src/app/library/notification/notification.component.ts b/dmp-frontend/src/app/library/notification/notification.component.ts index aead1307a..2bc6c31b6 100644 --- a/dmp-frontend/src/app/library/notification/notification.component.ts +++ b/dmp-frontend/src/app/library/notification/notification.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; -import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack-bar'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { PopupNotification, SnackBarNotification, SnackBarNotificationLevel, UiNotificationService, UiNotificationType } from '@app/core/services/notification/ui-notification-service'; import { PopupNotificationDialogComponent } from '@app/library/notification/popup/popup-notification.component'; import { SnackBarNotificationComponent } from '@app/library/notification/snack-bar/snack-bar-notification.component'; diff --git a/dmp-frontend/src/app/library/notification/popup/popup-notification.component.ts b/dmp-frontend/src/app/library/notification/popup/popup-notification.component.ts index e8c14d9a9..6240d08c5 100644 --- a/dmp-frontend/src/app/library/notification/popup/popup-notification.component.ts +++ b/dmp-frontend/src/app/library/notification/popup/popup-notification.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { PopupNotification } from '../../../core/services/notification/ui-notification-service'; @Component({ diff --git a/dmp-frontend/src/app/library/notification/snack-bar/snack-bar-notification.component.ts b/dmp-frontend/src/app/library/notification/snack-bar/snack-bar-notification.component.ts index ba9a1f4fc..ff8745b38 100644 --- a/dmp-frontend/src/app/library/notification/snack-bar/snack-bar-notification.component.ts +++ b/dmp-frontend/src/app/library/notification/snack-bar/snack-bar-notification.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MAT_LEGACY_SNACK_BAR_DATA as MAT_SNACK_BAR_DATA } from '@angular/material/legacy-snack-bar'; +import { MAT_SNACK_BAR_DATA } from '@angular/material/snack-bar'; import { SnackBarNotification } from '../../../core/services/notification/ui-notification-service'; @Component({ diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.html index 9e415287f..ec0d23910 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.html @@ -65,11 +65,11 @@ {{numbering}} --> - + - + @@ -91,20 +91,20 @@
- +
- + {{'GENERAL.VALIDATION.REQUIRED' | translate}} - + {{'GENERAL.VALIDATION.REQUIRED' | translate}} @@ -112,13 +112,13 @@
- +
- {{'DATASET-PROFILE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.MULTIPLICITY-TABLEVIEW' | translate}} diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.ts index f38a2b318..7e84e85dc 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core'; import { AbstractControl, UntypedFormArray, UntypedFormControl, UntypedFormGroup } from '@angular/forms'; -import { MatLegacyCheckboxChange as MatCheckboxChange } from '@angular/material/legacy-checkbox'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatCheckboxChange } from '@angular/material/checkbox'; +import { MatDialog } from '@angular/material/dialog'; import { DatasetProfileComboBoxType } from '@app/core/common/enum/dataset-profile-combo-box-type'; import { DatasetProfileFieldViewStyle } from '@app/core/common/enum/dataset-profile-field-view-style'; import { DatasetProfileInternalDmpEntitiesType } from '@app/core/common/enum/dataset-profile-internal-dmp-entities-type'; diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/upload/dataset-profile-editor-upload-field.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/upload/dataset-profile-editor-upload-field.component.ts index 0b7003eb5..76fb38032 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/upload/dataset-profile-editor-upload-field.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/upload/dataset-profile-editor-upload-field.component.ts @@ -1,10 +1,9 @@ -import {Component, Input, OnInit, ViewChild} from '@angular/core'; -import {UntypedFormArray, UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators} from '@angular/forms'; +import { Component, Input, OnInit } from '@angular/core'; +import { UntypedFormArray, UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angular/forms'; +import { FieldDataOption } from "@app/core/model/dataset-profile-definition/field-data/field-data"; +import { ConfigurationService } from "@app/core/services/configuration/configuration.service"; +import { FieldDataOptionEditorModel } from "@app/ui/admin/dataset-profile/admin/field-data/field-data-option-editor-model"; import { UploadFieldDataEditorModel } from '../../../../admin/field-data/upload-field-data-editor-model'; -import {FieldDataOption} from "@app/core/model/dataset-profile-definition/field-data/field-data"; -import {FieldDataOptionEditorModel} from "@app/ui/admin/dataset-profile/admin/field-data/field-data-option-editor-model"; -import {MatLegacySelect as MatSelect} from "@angular/material/legacy-select"; -import {ConfigurationService} from "@app/core/services/configuration/configuration.service"; @Component({ selector: 'app-dataset-profile-editor-upload-field-component', @@ -14,33 +13,33 @@ import {ConfigurationService} from "@app/core/services/configuration/configurati export class DatasetProfileEditorUploadFieldComponent implements OnInit { types: Array = [ // images - {label: "Animated Portable Network Graphics (APNG)", value: "image/apng", source: ""}, - {label: "AV1 Image File Format (AVIF)", value: "image/avif", source: ""}, - {label: "Graphics Interchange Format (GIF)", value: "image/gif", source: ""}, - {label: "Joint Photographic Expert Group image (JPEG)", value: "image/jpeg", source: ""}, - {label: "Portable Network Graphics (PNG)", value: "image/png", source: ""}, - {label: "Scalable Vector Graphics (SVG)", value: "image/svg+xml", source: ""}, - {label: "Web Picture format (WEBP)", value: "image/webp", source: ""}, - {label: "Tagged Image File Format (TIFF)", value: "image/tiff", source: ""}, + { label: "Animated Portable Network Graphics (APNG)", value: "image/apng", source: "" }, + { label: "AV1 Image File Format (AVIF)", value: "image/avif", source: "" }, + { label: "Graphics Interchange Format (GIF)", value: "image/gif", source: "" }, + { label: "Joint Photographic Expert Group image (JPEG)", value: "image/jpeg", source: "" }, + { label: "Portable Network Graphics (PNG)", value: "image/png", source: "" }, + { label: "Scalable Vector Graphics (SVG)", value: "image/svg+xml", source: "" }, + { label: "Web Picture format (WEBP)", value: "image/webp", source: "" }, + { label: "Tagged Image File Format (TIFF)", value: "image/tiff", source: "" }, // office word - {label: "Microsoft Word 97-2003", value: "application/msword", source: ""}, // .doc, .dot - {label: "Microsoft Word 2007-2013", value: "application/vnd.openxmlformats-officedocument.wordprocessingml.document", source: ""}, // .docx - {label: "OpenDocument Text", value: "application/vnd.openxmlformats-officedocument.wordprocessingml.document", source: ""}, // .odt + { label: "Microsoft Word 97-2003", value: "application/msword", source: "" }, // .doc, .dot + { label: "Microsoft Word 2007-2013", value: "application/vnd.openxmlformats-officedocument.wordprocessingml.document", source: "" }, // .docx + { label: "OpenDocument Text", value: "application/vnd.openxmlformats-officedocument.wordprocessingml.document", source: "" }, // .odt // office excel - {label: "Microsoft Excel 97-2003", value: "application/vnd.ms-excel", source: ""}, // .xls, .xlt, .xla - {label: "Microsoft Excel 2007-2013", value: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", source: ""}, // .xlsx - {label: "OpenDocument Spreadsheet", value: "application/vnd.oasis.opendocument.spreadsheet", source: ""}, // .ods + { label: "Microsoft Excel 97-2003", value: "application/vnd.ms-excel", source: "" }, // .xls, .xlt, .xla + { label: "Microsoft Excel 2007-2013", value: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", source: "" }, // .xlsx + { label: "OpenDocument Spreadsheet", value: "application/vnd.oasis.opendocument.spreadsheet", source: "" }, // .ods // office powerpoint - {label: "Microsoft PowerPoint 97-2003", value: "application/vnd.ms-powerpoint", source: ""}, // .ppt, .pot, .pps, .ppa - {label: "Microsoft PowerPoint 2007-2013", value: "application/vnd.openxmlformats-officedocument.presentationml.presentation", source: ""}, // .pptx - {label: "OpenDocument Presentation", value: "application/vnd.oasis.opendocument.presentation", source: ""}, // .odp + { label: "Microsoft PowerPoint 97-2003", value: "application/vnd.ms-powerpoint", source: "" }, // .ppt, .pot, .pps, .ppa + { label: "Microsoft PowerPoint 2007-2013", value: "application/vnd.openxmlformats-officedocument.presentationml.presentation", source: "" }, // .pptx + { label: "OpenDocument Presentation", value: "application/vnd.oasis.opendocument.presentation", source: "" }, // .odp - {label: "Comma-Seperated Values (CSV)", value: "text/csv", source: ""}, - {label: "Adobe Portable Document Format (PDF)", value: "application/pdf", source: ""} + { label: "Comma-Seperated Values (CSV)", value: "text/csv", source: "" }, + { label: "Adobe Portable Document Format (PDF)", value: "application/pdf", source: "" } ]; selected: string[] = []; @@ -49,14 +48,14 @@ export class DatasetProfileEditorUploadFieldComponent implements OnInit { @Input() form: UntypedFormGroup; private data: UploadFieldDataEditorModel = new UploadFieldDataEditorModel(); - constructor(private configurationService: ConfigurationService) {} + constructor(private configurationService: ConfigurationService) { } ngOnInit() { let typeValues: string[] = this.types.map(type => type.value); if (!this.form.get('data')) { this.form.addControl('data', this.data.buildForm()); } - if(this.form.get('data') && this.form.get('data').get('types')) { - for(let type of this.form.get('data').get('types').value) { - if(typeValues.indexOf(type.value) != -1) { + if (this.form.get('data') && this.form.get('data').get('types')) { + for (let type of this.form.get('data').get('types').value) { + if (typeValues.indexOf(type.value) != -1) { this.selected.push(type.value); } } @@ -86,7 +85,7 @@ export class DatasetProfileEditorUploadFieldComponent implements OnInit { addNewRow(type: FieldDataOption = null) { const typeListOptions: FieldDataOptionEditorModel = new FieldDataOptionEditorModel(); - if(type != null) { + if (type != null) { typeListOptions.fromModel(type); } (this.form.get('data')).addControl('types', new UntypedFormBuilder().array([])); diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts index d2dc8e314..cf2a828f6 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts @@ -2,8 +2,8 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FormGroupDirective, NgForm, UntypedFormArray, UntypedFormControl, UntypedFormGroup, } from '@angular/forms'; import { ErrorStateMatcher } from '@angular/material/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; -import { MatLegacySlideToggleChange as MatSlideToggleChange } from '@angular/material/legacy-slide-toggle'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSlideToggleChange } from '@angular/material/slide-toggle'; import { DatasetProfileComboBoxType } from '@app/core/common/enum/dataset-profile-combo-box-type'; import { DatasetProfileFieldViewStyle } from '@app/core/common/enum/dataset-profile-field-view-style'; import { DatasetProfileInternalDmpEntitiesType } from '@app/core/common/enum/dataset-profile-internal-dmp-entities-type'; diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html index 6604815b9..b943a4bb1 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html @@ -203,7 +203,7 @@
- +
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts index 7bc08888c..69dfb2db3 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts @@ -3,7 +3,7 @@ import { of as observableOf, Observable, combineLatest, BehaviorSubject,of } fr import { HttpClient, HttpErrorResponse } from '@angular/common/http'; import { Component, OnInit, QueryList, ViewChild } from '@angular/core'; import { AbstractControl, UntypedFormArray, UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { MatStepper} from '@angular/material/stepper'; import { ActivatedRoute, ParamMap, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; @@ -43,7 +43,7 @@ import { EditorCustomValidators, EditorCustomValidatorsEnum } from './custom-val import { GENERAL_ANIMATIONS, STEPPER_ANIMATIONS } from './animations/animations'; import { DatasetProfileComboBoxType } from '@app/core/common/enum/dataset-profile-combo-box-type'; import { UserService } from '@app/core/services/user/user.service'; -import { MatLegacyInput as MatInput } from '@angular/material/legacy-input'; +import { MatInput } from '@angular/material/input'; import { CheckDeactivateBaseComponent } from '@app/library/deactivate/deactivate.component'; import { DescriptionTemplateTypeService } from '@app/core/services/description-template-type/description-template-type.service'; import { DescriptionTemplateType } from '@app/core/model/description-template-type/description-template-type'; diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts index 607a0e2e2..7cf625f1f 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { DatasetProfileCriteria } from '@app/core/query/dataset-profile/dataset-profile-criteria'; import { DatasetProfileService } from '@app/core/services/dataset-profile/dataset-profile.service'; import { DialogConfirmationUploadDatasetProfiles } from '@app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component'; diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts index 234444ef8..144bde02f 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts @@ -1,4 +1,4 @@ -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Inject, Component } from '@angular/core'; diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts index 05d31fec1..20fadc783 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts @@ -1,8 +1,8 @@ import { DataSource } from '@angular/cdk/table'; import { HttpClient, HttpErrorResponse } from '@angular/common/http'; import { Component, OnInit, ViewChild } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; -import { MatLegacyPaginator as MatPaginator, LegacyPageEvent as PageEvent } from '@angular/material/legacy-paginator'; +import { MatDialog } from '@angular/material/dialog'; +import { MatPaginator, PageEvent } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { DatasetStatus } from '@app/core/common/enum/dataset-status'; @@ -20,7 +20,7 @@ import { BaseComponent } from '@common/base/base.component'; import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component'; import { TranslateService } from '@ngx-translate/core'; import * as FileSaver from 'file-saver'; -import { merge as observableMerge, Observable, of as observableOf } from 'rxjs'; +import { Observable, merge as observableMerge, of as observableOf } from 'rxjs'; import { map, startWith, switchMap, takeUntil } from 'rxjs/operators'; import { DialogConfirmationUploadDatasetProfiles } from './criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component'; @@ -128,7 +128,7 @@ export class DatasetProfileListingComponent extends BaseComponent implements OnI width: '500px', restoreFocus: false, data: { - message: this.language.instant('DATASET-WIZARD.NEW-VERSION-FROM-FILE.NEW-VERSION-XML-FILE-TITLE', {datasetName: label}), + message: this.language.instant('DATASET-WIZARD.NEW-VERSION-FROM-FILE.NEW-VERSION-XML-FILE-TITLE', { datasetName: label }), confirmButton: this.language.instant('DATASET-WIZARD.NEW-VERSION-FROM-FILE.NEW-VERSION-XML'), cancelButton: this.language.instant('DATASET-WIZARD.NEW-VERSION-FROM-FILE.NEW-VERSION-XML-FILE-CANCEL'), name: "", @@ -140,13 +140,13 @@ export class DatasetProfileListingComponent extends BaseComponent implements OnI if (data && data.sucsess && data.name != null && data.file != null) { this.datasetService.uploadFile(data.file, data.name, id) .pipe(takeUntil(this._destroyed)) - .subscribe(_=>{ + .subscribe(_ => { this.uiNotificationService.snackBarNotification(this.language.instant('DATASET-WIZARD.NEW-VERSION-FROM-FILE.NEW-VERSION-XML-SUCCESSFUL'), SnackBarNotificationLevel.Success); this.refresh(); }, - error=>{ - this.uiNotificationService.snackBarNotification(error.message, SnackBarNotificationLevel.Error); - } + error => { + this.uiNotificationService.snackBarNotification(error.message, SnackBarNotificationLevel.Error); + } ); } }); @@ -183,8 +183,8 @@ export class DatasetProfileListingComponent extends BaseComponent implements OnI return filename; } - deleteTemplate(id: string){ - if(id){ + deleteTemplate(id: string) { + if (id) { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { restoreFocus: false, data: { @@ -246,13 +246,13 @@ export class DatasetProfileListingComponent extends BaseComponent implements OnI if (data && data.sucsess && data.name != null && data.file != null) { this.datasetService.uploadFile(data.file, data.name) .pipe(takeUntil(this._destroyed)) - .subscribe(_=>{ + .subscribe(_ => { this.uiNotificationService.snackBarNotification('Template successfully uploaded', SnackBarNotificationLevel.Success); this.refresh(); }, - error=>{ - this.uiNotificationService.snackBarNotification(error.message, SnackBarNotificationLevel.Error); - } + error => { + this.uiNotificationService.snackBarNotification(error.message, SnackBarNotificationLevel.Error); + } ); } }); @@ -261,9 +261,9 @@ export class DatasetProfileListingComponent extends BaseComponent implements OnI /** * gets as a a pameter a number representing the status and returns the class that is applied * to status-chip */ - getStatusClass(status: DatasetStatus):string{ - - if(status == DatasetStatus.Finalized){ + getStatusClass(status: DatasetStatus): string { + + if (status == DatasetStatus.Finalized) { return 'status-chip-finalized' } diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents.ts index 08945b983..9fe19a5b9 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents.ts @@ -1,16 +1,13 @@ import { DOCUMENT } from '@angular/common'; -import { Component, EventEmitter, Inject, OnInit, Output, Input, AfterViewInit } from '@angular/core'; -import { BaseComponent } from '@common/base/base.component'; -import { interval, Subject, Subscription } from 'rxjs'; -import { distinctUntilChanged, filter, takeUntil } from 'rxjs/operators'; -import { type } from 'os'; -import { SimpleChanges } from '@angular/core'; -import { NewEntryType, TableUpdateInfo, ToCEntry, ToCEntryType } from './table-of-contents-entry'; -import { DragulaService } from 'ng2-dragula'; +import { AfterViewInit, Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core'; import { UntypedFormArray } from '@angular/forms'; -import { MatLegacySnackBar as MatSnackBar, MatLegacySnackBarConfig as MatSnackBarConfig } from '@angular/material/legacy-snack-bar'; +import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; +import { BaseComponent } from '@common/base/base.component'; import { TranslateService } from '@ngx-translate/core'; -import { ContentObserver } from '@angular/cdk/observers'; +import { DragulaService } from 'ng2-dragula'; +import { interval } from 'rxjs'; +import { filter, takeUntil } from 'rxjs/operators'; +import { NewEntryType, TableUpdateInfo, ToCEntry, ToCEntryType } from './table-of-contents-entry'; @Component({ @@ -36,7 +33,7 @@ export class DatasetProfileTableOfContents extends BaseComponent implements OnIn draggingItemId: string = null; tocEntryType = ToCEntryType; - DRAGULA_ITEM_ID_PREFIX="table_item_id_"; + DRAGULA_ITEM_ID_PREFIX = "table_item_id_"; ROOT_ID: string = "ROOT_ID";//no special meaning private _dragStartedAt; private VALID_DROP_TIME = 500;//ms @@ -52,10 +49,10 @@ export class DatasetProfileTableOfContents extends BaseComponent implements OnIn private dragulaService: DragulaService, private snackbar: MatSnackBar, private language: TranslateService - ) { + ) { super(); - - if(this.dragulaService.find('TABLEDRAG')){ + + if (this.dragulaService.find('TABLEDRAG')) { this.dragulaService.destroy('TABLEDRAG'); } @@ -63,43 +60,43 @@ export class DatasetProfileTableOfContents extends BaseComponent implements OnIn const drake = dragula.drake; - drake.on('drop', (el, target, source,sibling)=>{ + drake.on('drop', (el, target, source, sibling) => { - if(this._dragStartedAt){ + if (this._dragStartedAt) { const timeNow = new Date().getTime(); - if(timeNow - this._dragStartedAt> this.VALID_DROP_TIME){ + if (timeNow - this._dragStartedAt > this.VALID_DROP_TIME) { // console.log('timenow: ', timeNow); // console.log('timestarted', this._dragStartedAt); this._dragStartedAt = null; - - }else{ + + } else { this.dataNeedsRefresh.emit();// even though the data is not changed the TABLE DRAG may has changed return; } - }else{ + } else { this.dataNeedsRefresh.emit();// even though the data is not changed the TABLE DRAG may has changed return; - + } - const elementId = (el.id as string).replace(this.DRAGULA_ITEM_ID_PREFIX,''); + const elementId = (el.id as string).replace(this.DRAGULA_ITEM_ID_PREFIX, ''); const targetId = target.id as string; const sourceId = source.id as string; - if(!(elementId && targetId && sourceId)){ + if (!(elementId && targetId && sourceId)) { console.info('Elements do not have an id'); this.dataNeedsRefresh.emit(); return; } - const element:ToCEntry = this._findTocEntryById(elementId, this.links); - const targetContainer:ToCEntry = this._findTocEntryById(targetId , this.links); - const sourceContainer:ToCEntry = this._findTocEntryById(sourceId, this.links); + const element: ToCEntry = this._findTocEntryById(elementId, this.links); + const targetContainer: ToCEntry = this._findTocEntryById(targetId, this.links); + const sourceContainer: ToCEntry = this._findTocEntryById(sourceId, this.links); - if(!(element && (targetContainer ||((element.type===ToCEntryType.Page) && (targetId === this.ROOT_ID))) && (sourceContainer||((element.type===ToCEntryType.Page) && (sourceId === this.ROOT_ID))))){ + if (!(element && (targetContainer || ((element.type === ToCEntryType.Page) && (targetId === this.ROOT_ID))) && (sourceContainer || ((element.type === ToCEntryType.Page) && (sourceId === this.ROOT_ID))))) { // console.info('Could not find elements'); this.dataNeedsRefresh.emit(); //TODO: angular update //drake.cancel(true); @@ -107,9 +104,9 @@ export class DatasetProfileTableOfContents extends BaseComponent implements OnIn } - switch(element.type){ - case ToCEntryType.FieldSet:{ - if(targetContainer.type != this.tocEntryType.Section){ + switch (element.type) { + case ToCEntryType.FieldSet: { + if (targetContainer.type != this.tocEntryType.Section) { // const message = 'Fieldset can only be child of Subsections'; const message = this.language.instant('DATASET-PROFILE-EDITOR.STEPS.FORM.TABLE-OF-CONTENTS.ERROR-MESSAGES.FIELDSET-MUST-HAVE-PARENT-SECTION'); // console.error(message); @@ -119,7 +116,7 @@ export class DatasetProfileTableOfContents extends BaseComponent implements OnIn } //check if target container has no sections - if((targetContainer.form.get('sections') as UntypedFormArray).length){ + if ((targetContainer.form.get('sections') as UntypedFormArray).length) { // const message = 'Cannot have inputs and sections on the same level'; const message = this.language.instant('DATASET-PROFILE-EDITOR.STEPS.FORM.TABLE-OF-CONTENTS.ERROR-MESSAGES.INPUT-SECTION-SAME-LEVEL'); this.notifyUser(message); @@ -132,72 +129,72 @@ export class DatasetProfileTableOfContents extends BaseComponent implements OnIn const targetFieldsets = targetContainer.form.get('fieldSets') as UntypedFormArray; const sourceFieldsets = sourceContainer.form.get('fieldSets') as UntypedFormArray; - if(!targetFieldsets){ + if (!targetFieldsets) { console.info('Not target fieldsets container found'); this.dataNeedsRefresh.emit(); return; } - let sourceOrdinal=-1; + let sourceOrdinal = -1; let idx = -1; - sourceFieldsets.controls.forEach((elem,index)=>{ - if(elem.get('id').value === elementId){ + sourceFieldsets.controls.forEach((elem, index) => { + if (elem.get('id').value === elementId) { sourceOrdinal = elem.get('ordinal').value; idx = index } }); - if(sourceOrdinal>=0 && idx>=0){ + if (sourceOrdinal >= 0 && idx >= 0) { sourceFieldsets.removeAt(idx); - sourceFieldsets.controls.forEach(control=>{ + sourceFieldsets.controls.forEach(control => { const ordinal = control.get('ordinal'); - if((ordinal.value>= sourceOrdinal) && sourceOrdinal>0){ - const updatedOrdinalVal = ordinal.value -1; + if ((ordinal.value >= sourceOrdinal) && sourceOrdinal > 0) { + const updatedOrdinalVal = ordinal.value - 1; ordinal.setValue(updatedOrdinalVal); } }); sourceFieldsets.controls.sort(this._compareOrdinals); } - let position:number = targetFieldsets.length; + let position: number = targetFieldsets.length; - if(!sibling ||!sibling.id){ + if (!sibling || !sibling.id) { console.info('No sibling Id found'); - }else{ - const siblingId = (sibling.id as string).replace(this.DRAGULA_ITEM_ID_PREFIX,''); + } else { + const siblingId = (sibling.id as string).replace(this.DRAGULA_ITEM_ID_PREFIX, ''); let siblingIndex = -1; - targetFieldsets.controls.forEach((e,idx)=>{ - if(e.get('id').value === siblingId){ + targetFieldsets.controls.forEach((e, idx) => { + if (e.get('id').value === siblingId) { siblingIndex = idx; position = e.get('ordinal').value; } - + }); - if(siblingIndex>=0){ //sibling found - - targetFieldsets.controls.filter(control=> control.get('ordinal').value >= position).forEach(control=>{ + if (siblingIndex >= 0) { //sibling found + + targetFieldsets.controls.filter(control => control.get('ordinal').value >= position).forEach(control => { const ordinal = control.get('ordinal'); - const updatedOrdinalVal = ordinal.value +1; + const updatedOrdinalVal = ordinal.value + 1; ordinal.setValue(updatedOrdinalVal); }) } - + } fieldsetForm.get('ordinal').setValue(position); - targetFieldsets.insert(position,fieldsetForm); + targetFieldsets.insert(position, fieldsetForm); targetFieldsets.controls.sort(this._compareOrdinals); - this.dataNeedsRefresh.emit({draggedItemId: elementId}); + this.dataNeedsRefresh.emit({ draggedItemId: elementId }); break; } - case ToCEntryType.Section:{ + case ToCEntryType.Section: { - if(targetContainer.type == ToCEntryType.Section){ - if((targetContainer.form.get('fieldSets')as UntypedFormArray).length){ + if (targetContainer.type == ToCEntryType.Section) { + if ((targetContainer.form.get('fieldSets') as UntypedFormArray).length) { // const message = 'Cannot have inputs and sections on the same level'; const message = this.language.instant('DATASET-PROFILE-EDITOR.STEPS.FORM.TABLE-OF-CONTENTS.ERROR-MESSAGES.INPUT-SECTION-SAME-LEVEL');; this.notifyUser(message); @@ -210,61 +207,61 @@ export class DatasetProfileTableOfContents extends BaseComponent implements OnIn const elementSectionForm = element.form; const sourceSections = elementSectionForm.parent as UntypedFormArray; - if(!(targetSections && sourceSections && elementSectionForm)){ + if (!(targetSections && sourceSections && elementSectionForm)) { console.info('Could not load sections'); this.dataNeedsRefresh.emit(); return; } let idx = -1; - sourceSections.controls.forEach((section,i)=>{ - if(section.get('id').value === elementId){ + sourceSections.controls.forEach((section, i) => { + if (section.get('id').value === elementId) { idx = i; } }); - if(!(idx>=0)){ + if (!(idx >= 0)) { console.info('Could not find element in Parent container'); this.dataNeedsRefresh.emit(); return; } - sourceSections.controls.filter(control=>control.get('ordinal').value >= elementSectionForm.get('ordinal').value).forEach(control=>{ + sourceSections.controls.filter(control => control.get('ordinal').value >= elementSectionForm.get('ordinal').value).forEach(control => { const ordinal = control.get('ordinal'); - const updatedOrdinalVal = ordinal.value? ordinal.value -1: 0; + const updatedOrdinalVal = ordinal.value ? ordinal.value - 1 : 0; ordinal.setValue(updatedOrdinalVal); }); - + sourceSections.removeAt(idx); let targetOrdinal = targetSections.length; - if(sibling && sibling.id){ - const siblingId = sibling.id.replace(this.DRAGULA_ITEM_ID_PREFIX,''); + if (sibling && sibling.id) { + const siblingId = sibling.id.replace(this.DRAGULA_ITEM_ID_PREFIX, ''); - targetSections.controls.forEach((section,i)=>{ - if(section.get('id').value === siblingId){ + targetSections.controls.forEach((section, i) => { + if (section.get('id').value === siblingId) { targetOrdinal = section.get('ordinal').value; } }) // if(targetOrdinal!=targetSections.length){//mporei na einai idio - // section.get('ordinal').setValue(i+1); - targetSections.controls.filter(control=> control.get('ordinal').value>=targetOrdinal).forEach(control=>{ - const ordinal = control.get('ordinal'); - const updatedOrdinalVal = ordinal.value+1; - ordinal.setValue(updatedOrdinalVal); - }); + // section.get('ordinal').setValue(i+1); + targetSections.controls.filter(control => control.get('ordinal').value >= targetOrdinal).forEach(control => { + const ordinal = control.get('ordinal'); + const updatedOrdinalVal = ordinal.value + 1; + ordinal.setValue(updatedOrdinalVal); + }); // } - }else{ + } else { console.info('no siblings found'); } elementSectionForm.get('ordinal').setValue(targetOrdinal); targetSections.insert(targetOrdinal, elementSectionForm); - }else if(targetContainer.type === ToCEntryType.Page){ + } else if (targetContainer.type === ToCEntryType.Page) { // const pageId = targetContainer.form.get('id').value; const rootform = targetContainer.form.root; @@ -272,23 +269,23 @@ export class DatasetProfileTableOfContents extends BaseComponent implements OnIn const parentSections = sectionForm.parent as UntypedFormArray; let parentIndex = -1; - parentSections.controls.forEach((section,i )=>{ - if(section.get('id').value === elementId){ + parentSections.controls.forEach((section, i) => { + if (section.get('id').value === elementId) { parentIndex = i } }) - - if(parentIndex<0){ + + if (parentIndex < 0) { console.info('could not locate section in parents array'); this.dataNeedsRefresh.emit(); return; } //update parent sections ordinal - parentSections.controls.filter(section=>section.get('ordinal').value >= sectionForm.get('ordinal').value).forEach(section=>{ + parentSections.controls.filter(section => section.get('ordinal').value >= sectionForm.get('ordinal').value).forEach(section => { const ordinal = section.get('ordinal'); - const updatedOrdinalVal = ordinal.value?ordinal.value -1: 0; + const updatedOrdinalVal = ordinal.value ? ordinal.value - 1 : 0; ordinal.setValue(updatedOrdinalVal); }) @@ -297,34 +294,34 @@ export class DatasetProfileTableOfContents extends BaseComponent implements OnIn let position = 0; - if(targetContainer.subEntries){ + if (targetContainer.subEntries) { position = targetContainer.subEntries.length; } //populate sections const targetSectionsArray = rootform.get('sections') as UntypedFormArray; - if(sibling && sibling.id){ - const siblingId= sibling.id.replace(this.DRAGULA_ITEM_ID_PREFIX, ''); + if (sibling && sibling.id) { + const siblingId = sibling.id.replace(this.DRAGULA_ITEM_ID_PREFIX, ''); let indx = -1; - targetContainer.subEntries.forEach((e,i)=>{ - if(e.form.get('id').value === siblingId){ + targetContainer.subEntries.forEach((e, i) => { + if (e.form.get('id').value === siblingId) { indx = i; position = e.form.get('ordinal').value; } }); - if(indx>=0) { - + if (indx >= 0) { + // e.form.get('ordinal').setValue(i+1); - targetContainer.subEntries.filter(e=>e.form.get('ordinal').value >= position).forEach(e=>{ + targetContainer.subEntries.filter(e => e.form.get('ordinal').value >= position).forEach(e => { const ordinal = e.form.get('ordinal'); - const updatedOrdinalVal = ordinal.value +1; + const updatedOrdinalVal = ordinal.value + 1; ordinal.setValue(updatedOrdinalVal); }); } - }else{ + } else { console.info('No sibling found'); } @@ -332,7 +329,7 @@ export class DatasetProfileTableOfContents extends BaseComponent implements OnIn sectionForm.get('page').setValue(targetContainer.id); targetSectionsArray.push(sectionForm); - }else{ + } else { // const message = 'Drag not support to specific container'; const message = this.language.instant('DATASET-PROFILE-EDITOR.STEPS.FORM.TABLE-OF-CONTENTS.ERROR-MESSAGES.DRAG-NOT-SUPPORTED'); this.notifyUser(message); @@ -343,11 +340,11 @@ export class DatasetProfileTableOfContents extends BaseComponent implements OnIn - this.dataNeedsRefresh.emit({draggedItemId: elementId}); + this.dataNeedsRefresh.emit({ draggedItemId: elementId }); break; } - case ToCEntryType.Page:{ - if(targetId != this.ROOT_ID){ + case ToCEntryType.Page: { + if (targetId != this.ROOT_ID) { // const message = 'A page element can only be at top level'; const message = this.language.instant('DATASET-PROFILE-EDITOR.STEPS.FORM.TABLE-OF-CONTENTS.ERROR-MESSAGES.PAGE-ELEMENT-ONLY-TOP-LEVEL'); this.notifyUser(message); @@ -357,7 +354,7 @@ export class DatasetProfileTableOfContents extends BaseComponent implements OnIn } const rootForm = element.form.root; - if(!rootForm){ + if (!rootForm) { console.info('Could not find root!') this.dataNeedsRefresh.emit(); return; @@ -369,13 +366,13 @@ export class DatasetProfileTableOfContents extends BaseComponent implements OnIn let index = -1; - pages.controls.forEach((page,i)=>{ - if(page.get('id').value === elementId){ - index =i; + pages.controls.forEach((page, i) => { + if (page.get('id').value === elementId) { + index = i; } }); - if(index<0){ + if (index < 0) { console.info('Could not locate page on pages'); this.dataNeedsRefresh.emit(); return; @@ -383,21 +380,21 @@ export class DatasetProfileTableOfContents extends BaseComponent implements OnIn //ordinality - pages.controls.filter(page=> page.get('ordinal').value>= pageForm.get('ordinal').value).forEach(page=>{ + pages.controls.filter(page => page.get('ordinal').value >= pageForm.get('ordinal').value).forEach(page => { const ordinal = page.get('ordinal'); - const ordinalVal = ordinal.value? ordinal.value - 1: 0; - ordinal.setValue(ordinalVal); + const ordinalVal = ordinal.value ? ordinal.value - 1 : 0; + ordinal.setValue(ordinalVal); }); pages.removeAt(index); let targetPosition = pages.length; - if(sibling){ + if (sibling) { const siblingId = sibling.id.replace(this.DRAGULA_ITEM_ID_PREFIX, ''); - pages.controls.forEach((page,i)=>{ - if(page.get('id').value === siblingId){ + pages.controls.forEach((page, i) => { + if (page.get('id').value === siblingId) { targetPosition = page.get('ordinal').value; } }); @@ -405,15 +402,15 @@ export class DatasetProfileTableOfContents extends BaseComponent implements OnIn pageForm.get('ordinal').setValue(targetPosition); //update ordinality - pages.controls.filter(page=> page.get('ordinal').value>= targetPosition).forEach(page=>{ + pages.controls.filter(page => page.get('ordinal').value >= targetPosition).forEach(page => { const ordinal = page.get('ordinal'); - const ordinalVal = ordinal.value +1; - ordinal.setValue(ordinalVal); + const ordinalVal = ordinal.value + 1; + ordinal.setValue(ordinalVal); }); pages.insert(targetPosition, pageForm); - this.dataNeedsRefresh.emit({draggedItemId:elementId}); + this.dataNeedsRefresh.emit({ draggedItemId: elementId }); break; } default: @@ -426,8 +423,8 @@ export class DatasetProfileTableOfContents extends BaseComponent implements OnIn }); - drake.on('drag',(el,source)=>{ - this._dragStartedAt = new Date().getTime(); + drake.on('drag', (el, source) => { + this._dragStartedAt = new Date().getTime(); // console.log('drag fired'); this.isDragging = true; this.draggingItemId = (el.id as string).replace(this.DRAGULA_ITEM_ID_PREFIX, ''); @@ -438,20 +435,20 @@ export class DatasetProfileTableOfContents extends BaseComponent implements OnIn // } // }, this.VALID_DROP_TIME); }); - drake.on('over',(el, container, source)=>{ + drake.on('over', (el, container, source) => { try { this.overcontainer = container.id; } catch (error) { this.overcontainer = null; } }); - drake.on('dragend',(el)=>{ + drake.on('dragend', (el) => { this.isDragging = false; this.draggingItemId = null; this.overcontainer = null; }); - + } @@ -462,49 +459,49 @@ export class DatasetProfileTableOfContents extends BaseComponent implements OnIn const tableDiv = document.querySelector('#tocentrytable'); try { - top.addEventListener('mouseover', (e) => {this.scrollTableTop = true; },{ + top.addEventListener('mouseover', (e) => { this.scrollTableTop = true; }, { passive: true - }); - bottom.addEventListener('mouseover', (e) => {this.scrollTableBottom = true; },{ - passive: true - }); - - top.addEventListener('mouseout', (e) => {this.scrollTableTop = false},{ - passive: true - }); - bottom.addEventListener('mouseout', (e) => {this.scrollTableBottom = false;},{ - passive: true - }); - - - this.$clock - .pipe( - takeUntil(this._destroyed), - filter(() => this.scrollTableTop) - ) - .subscribe(()=>{ - try{ - tableDiv.scrollBy(0, -this.pxToScroll); - } catch {} }); - this.$clock - .pipe( - takeUntil(this._destroyed), - filter(() => this.scrollTableBottom) - ) - .subscribe(()=>{ - try{ - tableDiv.scrollBy(0, this.pxToScroll); - } catch {} + bottom.addEventListener('mouseover', (e) => { this.scrollTableBottom = true; }, { + passive: true }); + + top.addEventListener('mouseout', (e) => { this.scrollTableTop = false }, { + passive: true + }); + bottom.addEventListener('mouseout', (e) => { this.scrollTableBottom = false; }, { + passive: true + }); + + + this.$clock + .pipe( + takeUntil(this._destroyed), + filter(() => this.scrollTableTop) + ) + .subscribe(() => { + try { + tableDiv.scrollBy(0, -this.pxToScroll); + } catch { } + }); + this.$clock + .pipe( + takeUntil(this._destroyed), + filter(() => this.scrollTableBottom) + ) + .subscribe(() => { + try { + tableDiv.scrollBy(0, this.pxToScroll); + } catch { } + }); } catch { console.log('could not find scrolling elements'); } - + } - private _scrollIntoDragginItem(id: string){ + private _scrollIntoDragginItem(id: string) { // const table = document.getElementById('tocentrytable'); // if(table){ @@ -524,7 +521,7 @@ export class DatasetProfileTableOfContents extends BaseComponent implements OnIn // const tableRect = table.getBoundingClientRect(); // const elementRect = element.getBoundingClientRect(); - + // console.log('tablerect :',tableRect); // console.log('elementRect :',elementRect); @@ -540,62 +537,62 @@ export class DatasetProfileTableOfContents extends BaseComponent implements OnIn // } } - private _findTocEntryById(id: string, tocentries: ToCEntry[]): ToCEntry{ - if(!tocentries){ + private _findTocEntryById(id: string, tocentries: ToCEntry[]): ToCEntry { + if (!tocentries) { return null; } - let tocEntryFound = tocentries.find(entry=>entry.id === id); + let tocEntryFound = tocentries.find(entry => entry.id === id); - if(tocEntryFound){ + if (tocEntryFound) { return tocEntryFound; - } + } - for(let entry of tocentries){ + for (let entry of tocentries) { const result = this._findTocEntryById(id, entry.subEntries); - if(result){ + if (result) { tocEntryFound = result; break; } } - - return tocEntryFound? tocEntryFound: null; + + return tocEntryFound ? tocEntryFound : null; } ngOnInit(): void { - + } - itemClicked(item: ToCEntry){ + itemClicked(item: ToCEntry) { //leaf node this.itemClick.emit(item); } - + // addNewEntry(tce: ToCEntry){ // this.newEntry.emit(tce); // } - deleteEntry(currentLink: ToCEntry){ + deleteEntry(currentLink: ToCEntry) { this.removeEntry.emit(currentLink); } - createNewEntry(newEntry: NewEntryType){ + createNewEntry(newEntry: NewEntryType) { this.createEntry.emit(newEntry); } - onDataNeedsRefresh(){ + onDataNeedsRefresh() { this.dataNeedsRefresh.emit(); } - notifyUser(message:string){ + notifyUser(message: string) { this.snackbar.open(message, null, this._snackBarConfig); } private _snackBarConfig: MatSnackBarConfig = { - duration:2000 + duration: 2000 } - private _compareOrdinals(a, b){ + private _compareOrdinals(a, b) { const aValue = a.get('ordinal').value as number; const bValue = b.get('ordinal').value as number; diff --git a/dmp-frontend/src/app/ui/admin/description-types/editor/description-type-editor.component.html b/dmp-frontend/src/app/ui/admin/description-types/editor/description-type-editor.component.html index 6c818cfab..e5c13bec2 100644 --- a/dmp-frontend/src/app/ui/admin/description-types/editor/description-type-editor.component.html +++ b/dmp-frontend/src/app/ui/admin/description-types/editor/description-type-editor.component.html @@ -9,7 +9,7 @@
- + diff --git a/dmp-frontend/src/app/ui/admin/description-types/listing/description-types.component.ts b/dmp-frontend/src/app/ui/admin/description-types/listing/description-types.component.ts index 452ad2cb2..2249f6ec6 100644 --- a/dmp-frontend/src/app/ui/admin/description-types/listing/description-types.component.ts +++ b/dmp-frontend/src/app/ui/admin/description-types/listing/description-types.component.ts @@ -1,10 +1,9 @@ import { DataSource } from '@angular/cdk/table'; import { HttpErrorResponse } from '@angular/common/http'; import { Component, EventEmitter, OnInit, ViewChild } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; -import { MatLegacyPaginator as MatPaginator } from '@angular/material/legacy-paginator'; +import { MatDialog } from '@angular/material/dialog'; +import { MatPaginator } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; -import { MatLegacyTableDataSource as MatTableDataSource } from '@angular/material/legacy-table'; import { Router } from '@angular/router'; import { DescriptionTemplateType } from '@app/core/model/description-template-type/description-template-type'; import { DescriptionTemplateTypeLookup } from '@app/core/query/description-template/description-template-type.lookup'; @@ -13,7 +12,7 @@ import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/serv import { BaseComponent } from '@common/base/base.component'; import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component'; import { TranslateService } from '@ngx-translate/core'; -import { Observable, merge, of } from 'rxjs'; +import { Observable, merge } from 'rxjs'; import { map, startWith, switchMap, takeUntil } from 'rxjs/operators'; import { nameof } from 'ts-simple-nameof'; diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.ts b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.ts index 762bd5a96..bb0a2d8a0 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.ts +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.ts @@ -23,7 +23,7 @@ import { map, takeUntil } from 'rxjs/operators'; import { ConfigurationService } from '@app/core/services/configuration/configuration.service'; import { HttpClient } from '@angular/common/http'; import { MatomoService } from '@app/core/services/matomo/matomo-service'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component'; import { MultipleAutoCompleteConfiguration } from '@app/library/auto-complete/multiple/multiple-auto-complete-configuration'; import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile'; diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts index 4fec08bb4..65dea8f6c 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.ts @@ -1,4 +1,4 @@ -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Inject, Component } from '@angular/core'; diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts index 2c29752da..e80bea6b3 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { DmpBlueprintCriteria } from '@app/core/query/dmp/dmp-blueprint-criteria'; import { DmpProfileService } from '@app/core/services/dmp/dmp-profile.service'; import { BaseCriteriaComponent } from '@app/ui/misc/criteria/base-criteria.component'; diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.ts b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.ts index 0b79cc3ba..181a74020 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.ts +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.ts @@ -2,30 +2,28 @@ import { DataSource } from '@angular/cdk/table'; import { HttpClient, HttpErrorResponse } from '@angular/common/http'; import { Component, OnInit, ViewChild } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; -import { MatLegacyPaginator as MatPaginator, LegacyPageEvent as PageEvent } from '@angular/material/legacy-paginator'; -import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack-bar'; +import { MatDialog } from '@angular/material/dialog'; +import { MatPaginator, PageEvent } from '@angular/material/paginator'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { MatSort } from '@angular/material/sort'; import { ActivatedRoute, Params, Router } from '@angular/router'; +import { DmpProfileStatus } from '@app/core/common/enum/dmp-profile-status'; import { DataTableRequest } from '@app/core/model/data-table/data-table-request'; -import { DmpProfileListing } from '@app/core/model/dmp-profile/dmp-profile-listing'; -import { DmpProfileCriteria } from '@app/core/query/dmp/dmp-profile-criteria'; +import { DmpBlueprintListing } from '@app/core/model/dmp/dmp-blueprint/dmp-blueprint-listing'; +import { DmpBlueprintCriteria } from '@app/core/query/dmp/dmp-blueprint-criteria'; import { DmpProfileService } from '@app/core/services/dmp/dmp-profile.service'; import { MatomoService } from '@app/core/services/matomo/matomo-service'; import { UiNotificationService } from '@app/core/services/notification/ui-notification-service'; import { DmpProfileCriteriaComponent } from '@app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component'; import { BreadcrumbItem } from '@app/ui/misc/breadcrumb/definition/breadcrumb-item'; import { BaseComponent } from '@common/base/base.component'; +import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component'; import { SnackBarNotificationLevel } from '@common/modules/notification/ui-notification-service'; import { TranslateService } from '@ngx-translate/core'; -import { merge as observableMerge, Observable, of as observableOf } from 'rxjs'; +import * as FileSaver from 'file-saver'; +import { Observable, merge as observableMerge, of as observableOf } from 'rxjs'; import { map, startWith, switchMap, takeUntil } from 'rxjs/operators'; import { DialodConfirmationUploadDmpProfiles } from './criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component'; -import { DmpBlueprintCriteria } from '@app/core/query/dmp/dmp-blueprint-criteria'; -import { DmpBlueprintListing } from '@app/core/model/dmp/dmp-blueprint/dmp-blueprint-listing'; -import { DmpProfileStatus } from '@app/core/common/enum/dmp-profile-status'; -import * as FileSaver from 'file-saver'; -import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component'; @Component({ @@ -124,35 +122,37 @@ export class DmpProfileListingComponent extends BaseComponent implements OnInit deleteTemplate(id: string) { if (id) { - this.dialog.open(ConfirmationDialogComponent,{data:{ - isDeleteConfirmation: true, - confirmButton: this.languageService.instant('DMP-PROFILE-EDITOR.CONFIRM-DELETE-DIALOG.CONFIRM-BUTTON'), - cancelButton: this.languageService.instant("DMP-PROFILE-EDITOR.CONFIRM-DELETE-DIALOG.CANCEL-BUTTON"), - message: this.languageService.instant("DMP-PROFILE-EDITOR.CONFIRM-DELETE-DIALOG.MESSAGE") - }}) - .afterClosed() - .subscribe( - confirmed =>{ - if(confirmed){ - this.dmpProfileService.delete(id) - .pipe(takeUntil(this._destroyed)) - .subscribe( - complete => { - this.uiNotificationService.snackBarNotification(this.languageService.instant('GENERAL.SNACK-BAR.SUCCESSFUL-DMP-BLUEPRINT-DELETE'), SnackBarNotificationLevel.Success); - this.refresh(); - }, - error => { - this.onCallbackError(error); - if (error.error.statusCode == 674) { - this.uiNotificationService.snackBarNotification(this.languageService.instant('GENERAL.SNACK-BAR.UNSUCCESSFUL-DMP-BLUEPRINT-DELETE'), SnackBarNotificationLevel.Error); - } else { - this.uiNotificationService.snackBarNotification(this.languageService.instant(error.message), SnackBarNotificationLevel.Error); - } - } - ); - } + this.dialog.open(ConfirmationDialogComponent, { + data: { + isDeleteConfirmation: true, + confirmButton: this.languageService.instant('DMP-PROFILE-EDITOR.CONFIRM-DELETE-DIALOG.CONFIRM-BUTTON'), + cancelButton: this.languageService.instant("DMP-PROFILE-EDITOR.CONFIRM-DELETE-DIALOG.CANCEL-BUTTON"), + message: this.languageService.instant("DMP-PROFILE-EDITOR.CONFIRM-DELETE-DIALOG.MESSAGE") } - ) + }) + .afterClosed() + .subscribe( + confirmed => { + if (confirmed) { + this.dmpProfileService.delete(id) + .pipe(takeUntil(this._destroyed)) + .subscribe( + complete => { + this.uiNotificationService.snackBarNotification(this.languageService.instant('GENERAL.SNACK-BAR.SUCCESSFUL-DMP-BLUEPRINT-DELETE'), SnackBarNotificationLevel.Success); + this.refresh(); + }, + error => { + this.onCallbackError(error); + if (error.error.statusCode == 674) { + this.uiNotificationService.snackBarNotification(this.languageService.instant('GENERAL.SNACK-BAR.UNSUCCESSFUL-DMP-BLUEPRINT-DELETE'), SnackBarNotificationLevel.Error); + } else { + this.uiNotificationService.snackBarNotification(this.languageService.instant(error.message), SnackBarNotificationLevel.Error); + } + } + ); + } + } + ) } } @@ -170,11 +170,11 @@ export class DmpProfileListingComponent extends BaseComponent implements OnInit // this.datasetService.makeDatasetPublic(id).pipe(takeUntil(this._destroyed)).subscribe(); // } - parseStatus(value: number): string{ + parseStatus(value: number): string { const stringVal = value.toString() - try{ + try { return this.statuses.find(status => status.value === stringVal).viewValue; - }catch{ + } catch { return stringVal; } } @@ -195,22 +195,22 @@ export class DmpProfileListingComponent extends BaseComponent implements OnInit if (data && data.sucsess && data.name != null && data.file != null) { this.dmpProfileService.uploadFile(data.file, data.name) .pipe(takeUntil(this._destroyed)) - .subscribe(_=>{ + .subscribe(_ => { this.uiNotificationService.snackBarNotification(this.languageService.instant('DMP-PROFILE-LISTING.MESSAGES.TEMPLATE-UPLOAD-SUCCESS'), SnackBarNotificationLevel.Success); this.refresh(); }, - error=>{ - this.uiNotificationService.snackBarNotification(error.message, SnackBarNotificationLevel.Error); - }); + error => { + this.uiNotificationService.snackBarNotification(error.message, SnackBarNotificationLevel.Error); + }); } }); } - getStatusClass(status: number):string{ - - if(status === 1){//finalized + getStatusClass(status: number): string { + + if (status === 1) {//finalized return 'status-chip-finalized' } - if(status === 0){ + if (status === 0) { return 'status-chip-draft'; } return ''; @@ -248,14 +248,14 @@ export class DatasetDataSource extends DataSource { return this._service.getPagedBlueprint(request); }), /*.catch((error: any) => { - this._snackBar.openFromComponent(SnackBarNotificationComponent, { - data: { message: 'GENERAL.SNACK-BAR.FORMS-BAD-REQUEST', language: this._languageService }, - duration: 3000, - extraClasses: ['snackbar-warning'] - }); - //this._criteria.criteria.onCallbackError(error); - return Observable.of(null); - })*/ + this._snackBar.openFromComponent(SnackBarNotificationComponent, { + data: { message: 'GENERAL.SNACK-BAR.FORMS-BAD-REQUEST', language: this._languageService }, + duration: 3000, + extraClasses: ['snackbar-warning'] + }); + //this._criteria.criteria.onCallbackError(error); + return Observable.of(null); + })*/ map(result => { return result; }), diff --git a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.ts b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.ts index 73127bee2..8ead8986c 100644 --- a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.ts +++ b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.ts @@ -1,25 +1,24 @@ -import {of as observableOf, merge as observableMerge, Observable } from 'rxjs'; +import { Observable, merge as observableMerge, of as observableOf } from 'rxjs'; -import {map, catchError, switchMap, startWith, takeUntil} from 'rxjs/operators'; import { DataSource } from '@angular/cdk/table'; +import { HttpClient } from '@angular/common/http'; import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core'; -import { MatLegacyPaginator as MatPaginator } from '@angular/material/legacy-paginator'; -import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack-bar'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { MatSort } from '@angular/material/sort'; +import { MatomoService } from '@app/core/services/matomo/matomo-service'; +import { BaseComponent } from '@common/base/base.component'; import { TranslateService } from '@ngx-translate/core'; +import * as FileSaver from 'file-saver'; +import { catchError, map, startWith, switchMap, takeUntil } from 'rxjs/operators'; +import { DataTableRequest } from '../../../../core/model/data-table/data-table-request'; import { UserListingModel } from '../../../../core/model/user/user-listing'; import { UserCriteria } from '../../../../core/query/user/user-criteria'; import { UserService } from '../../../../core/services/user/user.service'; import { SnackBarNotificationComponent } from '../../../../library/notification/snack-bar/snack-bar-notification.component'; -import { DataTableRequest } from '../../../../core/model/data-table/data-table-request'; -import { UserCriteriaComponent } from './criteria/user-criteria.component'; import { BreadcrumbItem } from '../../../misc/breadcrumb/definition/breadcrumb-item'; -import { BaseComponent } from '@common/base/base.component'; -import * as FileSaver from 'file-saver'; -import { MatomoService } from '@app/core/services/matomo/matomo-service'; -import { HttpClient } from '@angular/common/http'; -import { MatLegacyTableDataSource as MatTableDataSource } from '@angular/material/legacy-table'; +import { UserCriteriaComponent } from './criteria/user-criteria.component'; export class UsersDataSource extends DataSource { @@ -147,7 +146,7 @@ export class UserListingComponent extends BaseComponent implements OnInit, After } // Export user mails - exportUsers(){ + exportUsers() { this.userService.downloadCSV() .pipe(takeUntil(this._destroyed)) .subscribe(response => { diff --git a/dmp-frontend/src/app/ui/contact/contact-dialog/contact-dialog.component.ts b/dmp-frontend/src/app/ui/contact/contact-dialog/contact-dialog.component.ts index b28c6acd7..d9b7d36b2 100644 --- a/dmp-frontend/src/app/ui/contact/contact-dialog/contact-dialog.component.ts +++ b/dmp-frontend/src/app/ui/contact/contact-dialog/contact-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { FormGroup } from '@angular/forms'; @Component({ diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts index 728ebfd6a..250fbd3ab 100644 --- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts @@ -25,7 +25,7 @@ import { BreadcrumbItem } from '../misc/breadcrumb/definition/breadcrumb-item'; import { IBreadCrumbComponent } from '../misc/breadcrumb/definition/IBreadCrumbComponent'; import { DmpCriteria } from '@app/core/query/dmp/dmp-criteria'; import { DatasetCriteria } from '@app/core/query/dataset/dataset-criteria'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { StartNewDmpDialogComponent } from '../dmp/start-new-dmp-dialogue/start-new-dmp-dialog.component'; import { StartNewDatasetDialogComponent } from '../dmp/start-new-dataset-dialogue/start-new-dataset-dialog.component'; import { DatasetWizardEditorModel } from '../dataset/dataset-wizard/dataset-wizard-editor.model'; diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts index d2c740bbd..8ac0c8947 100644 --- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts @@ -14,7 +14,7 @@ import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog import { DatasetCopyDialogueComponent } from '@app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component'; import {UntypedFormControl, UntypedFormBuilder, UntypedFormGroup} from '@angular/forms'; import { BaseComponent } from '@common/base/base.component'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { DatasetWizardService } from '@app/core/services/dataset-wizard/dataset-wizard.service'; import { SnackBarNotificationLevel } from '@app/core/services/notification/ui-notification-service'; import * as FileSaver from 'file-saver'; diff --git a/dmp-frontend/src/app/ui/dashboard/quick-wizard-create-add/quick-wizard-create-add.component.ts b/dmp-frontend/src/app/ui/dashboard/quick-wizard-create-add/quick-wizard-create-add.component.ts index a463b5ba5..d64a2de98 100644 --- a/dmp-frontend/src/app/ui/dashboard/quick-wizard-create-add/quick-wizard-create-add.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/quick-wizard-create-add/quick-wizard-create-add.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from "@angular/core"; -import { MatLegacySnackBar as MatSnackBar } from "@angular/material/legacy-snack-bar"; +import { MatSnackBar } from "@angular/material/snack-bar"; import { ActivatedRoute, Router } from "@angular/router"; import { BaseComponent } from '@common/base/base.component'; import { TranslateService } from "@ngx-translate/core"; diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts index ae3119ec0..0cd7ca4fc 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts @@ -1,5 +1,5 @@ import {Component, OnInit, Output, EventEmitter, Input, ViewChild} from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import {ActivatedRoute, Router} from '@angular/router'; import { RecentActivityType } from '@app/core/common/enum/recent-activity-type'; import { Principal } from '@app/core/model/auth/principal'; diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts index 34ebce7de..35f7fc046 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts @@ -10,7 +10,7 @@ import { TranslateService } from '@ngx-translate/core'; import { EnumUtils } from '@app/core/services/utilities/enum-utils.service'; import { UntypedFormControl, UntypedFormBuilder } from '@angular/forms'; import { DatasetCopyDialogueComponent } from '@app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { debounceTime, takeUntil } from 'rxjs/operators'; import {ActivatedRoute, Router} from '@angular/router'; import { DatasetWizardService } from '@app/core/services/dataset-wizard/dataset-wizard.service'; diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts index b43564d7a..79506428a 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts @@ -1,5 +1,5 @@ import {Component, OnInit, Output, EventEmitter, Input, ViewChild} from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import {ActivatedRoute, Router} from '@angular/router'; import { RecentActivityType } from '@app/core/common/enum/recent-activity-type'; import { Principal } from '@app/core/model/auth/principal'; diff --git a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts index 52cd5e7b9..4599943a9 100644 --- a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts +++ b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { UntypedFormArray, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { MatStepper } from '@angular/material/stepper'; import { Router } from '@angular/router'; import { DatasetStatus } from '@app/core/common/enum/dataset-status'; diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.ts index c26024b5d..37b53eb00 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.ts @@ -1,7 +1,7 @@ import { map, filter } from 'rxjs/operators'; import { Component } from "@angular/core"; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from "@angular/material/legacy-dialog"; +import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog"; import { SingleAutoCompleteConfiguration } from "../../../../library/auto-complete/single/single-auto-complete-configuration"; import { Observable } from "rxjs"; import { DataTableRequest } from "../../../../core/model/data-table/data-table-request"; diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.ts index fc0ad46c1..aafb6fe66 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.ts @@ -8,7 +8,7 @@ import { TranslateService } from '@ngx-translate/core'; import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile'; import { takeUntil } from 'rxjs/operators'; import { DmpProfileService } from '@app/core/services/dmp/dmp-profile.service'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { PopupNotificationDialogComponent } from '@app/library/notification/popup/popup-notification.component'; @Component({ diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts index 03fca64ee..120449716 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts @@ -2,8 +2,8 @@ import { Location } from '@angular/common'; import { HttpClient } from '@angular/common/http'; import { Component, OnInit, ViewChild } from '@angular/core'; import { AbstractControl, UntypedFormArray, UntypedFormControl, UntypedFormGroup } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; -import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack-bar'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { ActivatedRoute, Router } from '@angular/router'; import { DatasetStatus } from '@app/core/common/enum/dataset-status'; import { DmpStatus } from '@app/core/common/enum/dmp-status'; diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts index a2ca711c8..cac88b15d 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnInit, Output, EventEmitter } from '@angular/core'; import { UntypedFormArray, UntypedFormGroup } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { ExternalSourceItemModel } from '@app/core/model/external-sources/external-source-item'; import { ExternalSourcesConfiguration } from '@app/core/model/external-sources/external-sources-configuration'; diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.ts index 47a05a141..9c53aa709 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { ExternalDataRepositoryService } from '@app/core/services/external-sources/data-repository/extternal-data-repository.service'; import { ExternalDataRepositoryEditorModel } from '@app/ui/dataset/dataset-wizard/dataset-wizard-editor.model'; import { BaseComponent } from '@common/base/base.component'; diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.ts index 8033c9b1b..676181d56 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { ExternalDatasetService } from '@app/core/services/external-sources/dataset/external-dataset.service'; import { ExternalDatasetEditorModel } from '@app/ui/dataset/dataset-wizard/dataset-wizard-editor.model'; import { BaseComponent } from '@common/base/base.component'; diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.ts index 22d43bdb1..9179bdbc7 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { ExternalRegistryService } from '@app/core/services/external-sources/registry/external-registry.service'; import { ExternalRegistryEditorModel } from '@app/ui/dataset/dataset-wizard/dataset-wizard-editor.model'; import { BaseComponent } from '@common/base/base.component'; diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.ts index bb022c662..5da9f1b59 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { ExternalServiceService } from '@app/core/services/external-sources/service/external-service.service'; import { ExternalServiceEditorModel } from '@app/ui/dataset/dataset-wizard/dataset-wizard-editor.model'; import { BaseComponent } from '@common/base/base.component'; diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/prefill-dataset/prefill-dataset.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/prefill-dataset/prefill-dataset.component.ts index b0d7951b7..7849631b2 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/prefill-dataset/prefill-dataset.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/prefill-dataset/prefill-dataset.component.ts @@ -1,17 +1,17 @@ -import {Component, Inject, OnInit} from "@angular/core"; -import {MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialog as MatDialog, MatLegacyDialogRef as MatDialogRef} from "@angular/material/legacy-dialog"; -import {map, takeUntil} from "rxjs/operators"; -import {ProgressIndicationService} from "@app/core/services/progress-indication/progress-indication-service"; -import {BaseComponent} from "@common/base/base.component"; -import {SingleAutoCompleteConfiguration} from "@app/library/auto-complete/single/single-auto-complete-configuration"; -import {Observable, of} from "rxjs"; -import {Prefilling} from "@app/core/model/dataset/prefilling"; -import {PrefillingService} from "@app/core/services/prefilling.service"; -import {UntypedFormBuilder, UntypedFormGroup, Validators} from "@angular/forms"; +import { Component, Inject, OnInit } from "@angular/core"; +import { UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms"; +import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from "@angular/material/dialog"; import { DatasetProfileModel } from "@app/core/model/dataset/dataset-profile"; +import { Prefilling } from "@app/core/model/dataset/prefilling"; import { DmpProfileService } from "@app/core/services/dmp/dmp-profile.service"; +import { PrefillingService } from "@app/core/services/prefilling.service"; +import { ProgressIndicationService } from "@app/core/services/progress-indication/progress-indication-service"; +import { SingleAutoCompleteConfiguration } from "@app/library/auto-complete/single/single-auto-complete-configuration"; import { PopupNotificationDialogComponent } from "@app/library/notification/popup/popup-notification.component"; +import { BaseComponent } from "@common/base/base.component"; import { TranslateService } from "@ngx-translate/core"; +import { Observable } from "rxjs"; +import { map, takeUntil } from "rxjs/operators"; @Component({ selector: 'prefill-dataset-component', @@ -26,13 +26,13 @@ export class PrefillDatasetComponent extends BaseComponent implements OnInit { prefillForm: UntypedFormGroup; constructor(public dialogRef: MatDialogRef, - private prefillingService: PrefillingService, - private dmpProfileService: DmpProfileService, - private dialog: MatDialog, - private language: TranslateService, - private progressIndicationService: ProgressIndicationService, - private fb: UntypedFormBuilder, - @Inject(MAT_DIALOG_DATA) public data: any) { + private prefillingService: PrefillingService, + private dmpProfileService: DmpProfileService, + private dialog: MatDialog, + private language: TranslateService, + private progressIndicationService: ProgressIndicationService, + private fb: UntypedFormBuilder, + @Inject(MAT_DIALOG_DATA) public data: any) { super(); } @@ -45,13 +45,13 @@ export class PrefillDatasetComponent extends BaseComponent implements OnInit { profile: this.fb.control('', Validators.required), prefill: this.fb.control(null, Validators.required) }) - if(this.data.availableProfiles && this.data.availableProfiles.length === 1) { + if (this.data.availableProfiles && this.data.availableProfiles.length === 1) { this.addProfileIfUsedLessThanMax(this.data.availableProfiles[0]); } this.prefillAutoCompleteConfiguration = { filterFn: this.searchDatasets.bind(this), loadDataOnStart: false, - displayFn: (item) => (item['name'].length > 60)?(item['name'].substr(0, 60) + "..." ):item['name'], + displayFn: (item) => (item['name'].length > 60) ? (item['name'].substr(0, 60) + "...") : item['name'], titleFn: (item) => item['name'], subtitleFn: (item) => item['pid'] }; @@ -64,26 +64,26 @@ export class PrefillDatasetComponent extends BaseComponent implements OnInit { .pipe(takeUntil(this._destroyed)) .subscribe(result => { const section = result.definition.sections[dmpSectionIndex]; - if(section.hasTemplates){ + if (section.hasTemplates) { const foundTemplate = section.descriptionTemplates.find(template => template.descriptionTemplateId === profile.id); if (foundTemplate !== undefined) { let count = 0; - if(this.data.datasetFormGroup.get('dmp').value.datasets != null){ - for(let dataset of this.data.datasetFormGroup.get('dmp').value.datasets){ - if(dataset.dmpSectionIndex === dmpSectionIndex && dataset.profile.id === foundTemplate.descriptionTemplateId){ + if (this.data.datasetFormGroup.get('dmp').value.datasets != null) { + for (let dataset of this.data.datasetFormGroup.get('dmp').value.datasets) { + if (dataset.dmpSectionIndex === dmpSectionIndex && dataset.profile.id === foundTemplate.descriptionTemplateId) { count++; } } - if(count < foundTemplate.maxMultiplicity){ + if (count < foundTemplate.maxMultiplicity) { this.prefillForm.get('profile').patchValue(profile); } } } - else{ + else { this.prefillForm.get('profile').patchValue(profile); } } - else{ + else { this.prefillForm.get('profile').patchValue(profile); } }); @@ -97,17 +97,17 @@ export class PrefillDatasetComponent extends BaseComponent implements OnInit { .pipe(takeUntil(this._destroyed)) .subscribe(result => { const section = result.definition.sections[dmpSectionIndex]; - if(section.hasTemplates){ + if (section.hasTemplates) { const foundTemplate = section.descriptionTemplates.find(template => template.descriptionTemplateId === profile.id); if (foundTemplate !== undefined) { let count = 0; - if(this.data.datasetFormGroup.get('dmp').value.datasets != null){ - for(let dataset of this.data.datasetFormGroup.get('dmp').value.datasets){ - if(dataset.dmpSectionIndex === dmpSectionIndex && dataset.profile.id === foundTemplate.descriptionTemplateId){ + if (this.data.datasetFormGroup.get('dmp').value.datasets != null) { + for (let dataset of this.data.datasetFormGroup.get('dmp').value.datasets) { + if (dataset.dmpSectionIndex === dmpSectionIndex && dataset.profile.id === foundTemplate.descriptionTemplateId) { count++; } } - if(count === foundTemplate.maxMultiplicity){ + if (count === foundTemplate.maxMultiplicity) { this.dialog.open(PopupNotificationDialogComponent, { data: { title: this.language.instant('DATASET-EDITOR.MAX-DESCRIPTION-DIALOG.TITLE'), @@ -115,7 +115,7 @@ export class PrefillDatasetComponent extends BaseComponent implements OnInit { }, maxWidth: '30em' }); } - else{ + else { this.prefillForm.get('profile').setValue(profile); } } @@ -136,9 +136,9 @@ export class PrefillDatasetComponent extends BaseComponent implements OnInit { searchDatasets(query: string): Observable { return this.prefillingService.getPrefillingList(query).pipe(map(prefilling => prefilling.sort((a, b) => { - if(a.name > b.name) { + if (a.name > b.name) { return 1; - } else if(a.name < b.name) { + } else if (a.name < b.name) { return -1; } else { return 0; @@ -147,8 +147,8 @@ export class PrefillDatasetComponent extends BaseComponent implements OnInit { } next() { - if(this.isPrefilled) { - if(this.prefillForm.get('prefill').value.data == null) { + if (this.isPrefilled) { + if (this.prefillForm.get('prefill').value.data == null) { this.prefillingService.getPrefillingDataset(this.prefillForm.get('prefill').value.pid, this.prefillForm.get('profile').value.id, this.prefillForm.get('prefill').value.key).subscribe(wizard => { wizard.profile = this.prefillForm.get('profile').value; this.closeDialog(wizard); diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria-dialogue/dataset-criteria-dialog.component.ts b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria-dialogue/dataset-criteria-dialog.component.ts index 9a6fb1900..d640a6d1f 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria-dialogue/dataset-criteria-dialog.component.ts +++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria-dialogue/dataset-criteria-dialog.component.ts @@ -1,10 +1,10 @@ -import { Inject, Component, ViewChild, OnInit, Output, EventEmitter } from '@angular/core'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { HttpClient } from '@angular/common/http'; +import { Component, Inject, OnInit, ViewChild } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; -import { DatasetCriteriaComponent } from '../dataset-criteria.component'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { DatasetCriteria } from '@app/core/query/dataset/dataset-criteria'; import { MatomoService } from '@app/core/services/matomo/matomo-service'; -import { HttpClient } from '@angular/common/http'; +import { DatasetCriteriaComponent } from '../dataset-criteria.component'; @Component({ selector: 'dataset-criteria-dialog-component', diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts index 62159b8f4..79368187c 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts +++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts @@ -1,8 +1,8 @@ import { Component, Input, OnInit, Output, EventEmitter } from '@angular/core'; import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; -import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack-bar'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { Router } from '@angular/router'; import { DatasetStatus } from '@app/core/common/enum/dataset-status'; import { DataTableData } from '@app/core/model/data-table/data-table-data'; diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-upload-dialogue/dataset-upload-dialogue.component.ts b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-upload-dialogue/dataset-upload-dialogue.component.ts index 2716cbf94..307907fcd 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-upload-dialogue/dataset-upload-dialogue.component.ts +++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-upload-dialogue/dataset-upload-dialogue.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { DataTableData } from '@app/core/model/data-table/data-table-data'; import { DataTableRequest } from '@app/core/model/data-table/data-table-request'; import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile'; diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts index 155ad1476..75800d9cd 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts +++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts @@ -1,35 +1,35 @@ +import { HttpClient } from '@angular/common/http'; import { Component, OnInit, ViewChild } from '@angular/core'; -import { MatLegacyPaginator as MatPaginator } from '@angular/material/legacy-paginator'; +import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angular/forms'; +import { MatDialog } from '@angular/material/dialog'; +import { MatPaginator } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { DatasetStatus } from '@app/core/common/enum/dataset-status'; +import { RecentActivityOrder } from '@app/core/common/enum/recent-activity-order'; import { DataTableRequest } from '@app/core/model/data-table/data-table-request'; import { DatasetListingModel } from '@app/core/model/dataset/dataset-listing'; import { DatasetCriteria } from '@app/core/query/dataset/dataset-criteria'; +import { AuthService } from '@app/core/services/auth/auth.service'; import { DatasetService } from '@app/core/services/dataset/dataset.service'; import { DmpService } from '@app/core/services/dmp/dmp.service'; +import { MatomoService } from '@app/core/services/matomo/matomo-service'; +import { EnumUtils } from '@app/core/services/utilities/enum-utils.service'; +import { GuidedTour, Orientation } from '@app/library/guided-tour/guided-tour.constants'; +import { GuidedTourService } from '@app/library/guided-tour/guided-tour.service'; import { DatasetCriteriaComponent } from '@app/ui/dataset/listing/criteria/dataset-criteria.component'; -import { BreadcrumbItem } from '@app/ui/misc/breadcrumb/definition/breadcrumb-item'; +import { StartNewDatasetDialogComponent } from '@app/ui/dmp/start-new-dataset-dialogue/start-new-dataset-dialog.component'; +import { StartNewDmpDialogComponent } from '@app/ui/dmp/start-new-dmp-dialogue/start-new-dmp-dialog.component'; import { IBreadCrumbComponent } from '@app/ui/misc/breadcrumb/definition/IBreadCrumbComponent'; +import { BreadcrumbItem } from '@app/ui/misc/breadcrumb/definition/breadcrumb-item'; +import { isNullOrUndefined } from '@app/utilities/enhancers/utils'; import { BaseComponent } from '@common/base/base.component'; import { TranslateService } from '@ngx-translate/core'; import { Observable, of as observableOf } from 'rxjs'; import { debounceTime, takeUntil } from 'rxjs/operators'; -import { ExternalTagEditorModel, DatasetWizardEditorModel } from '../dataset-wizard/dataset-wizard-editor.model'; -import { AuthService } from '@app/core/services/auth/auth.service'; -import { isNullOrUndefined } from '@app/utilities/enhancers/utils'; +import { DatasetWizardEditorModel, ExternalTagEditorModel } from '../dataset-wizard/dataset-wizard-editor.model'; import { DatasetCriteriaDialogComponent } from './criteria/dataset-criteria-dialogue/dataset-criteria-dialog.component'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; -import { UntypedFormGroup, UntypedFormBuilder, UntypedFormControl } from '@angular/forms'; -import { RecentActivityOrder } from '@app/core/common/enum/recent-activity-order'; -import { EnumUtils } from '@app/core/services/utilities/enum-utils.service'; -import { GuidedTourService } from '@app/library/guided-tour/guided-tour.service'; -import { GuidedTour, Orientation } from '@app/library/guided-tour/guided-tour.constants'; -import { StartNewDatasetDialogComponent } from '@app/ui/dmp/start-new-dataset-dialogue/start-new-dataset-dialog.component'; -import { StartNewDmpDialogComponent } from '@app/ui/dmp/start-new-dmp-dialogue/start-new-dmp-dialog.component'; -import { MatomoService } from '@app/core/services/matomo/matomo-service'; -import { HttpClient } from '@angular/common/http'; @Component({ selector: 'app-dataset-listing-component', @@ -152,22 +152,22 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB } public dashboardTour: GuidedTour = { - tourId: 'dmp-dataset-tour', - useOrb: true, - steps: [ - { + tourId: 'dmp-dataset-tour', + useOrb: true, + steps: [ + { selector: '.dmp-tour', - content: 'Step 1', + content: 'Step 1', orientation: Orientation.Right, isStepUnique: false - }, - { - selector: '.dataset-tour', - content: 'Step 2', + }, + { + selector: '.dataset-tour', + content: 'Step 2', orientation: Orientation.Right, isStepUnique: false - } - ] + } + ] }; public isAuthenticated(): boolean { @@ -382,17 +382,17 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB public setDashboardTourDmpText(): void { this.dmpText = this.language.instant('DMP-LISTING.TEXT-INFO') + '\n\n' + - this.language.instant('DMP-LISTING.TEXT-INFO-QUESTION') + ' ' + - this.language.instant('DMP-LISTING.LINK-ZENODO') + ' ' + - this.language.instant('DMP-LISTING.GET-IDEA'); + this.language.instant('DMP-LISTING.TEXT-INFO-QUESTION') + ' ' + + this.language.instant('DMP-LISTING.LINK-ZENODO') + ' ' + + this.language.instant('DMP-LISTING.GET-IDEA'); this.dashboardTour.steps[0].title = this.dmpText; } public setDashboardTourDatasetText(): void { this.datasetText = this.language.instant('DATASET-LISTING.TEXT-INFO') + - this.language.instant('DATASET-LISTING.LINK-PUBLIC-DATASETS') + ' ' + - this.language.instant('DATASET-LISTING.TEXT-INFO-REST') + '\n\n' + - this.language.instant('DATASET-LISTING.TEXT-INFO-PAR'); + this.language.instant('DATASET-LISTING.LINK-PUBLIC-DATASETS') + ' ' + + this.language.instant('DATASET-LISTING.TEXT-INFO-REST') + '\n\n' + + this.language.instant('DATASET-LISTING.TEXT-INFO-PAR'); this.dashboardTour.steps[1].title = this.datasetText; } diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts index 4be0b6638..b3bd6ff78 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts +++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts @@ -8,7 +8,7 @@ import { BaseComponent } from '@common/base/base.component'; import { takeUntil } from 'rxjs/operators'; import * as FileSaver from 'file-saver'; import { DmpInvitationDialogComponent } from '@app/ui/dmp/invitation/dmp-invitation-dialog.component'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { DatasetCopyDialogueComponent } from '../../dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component'; import { UntypedFormControl } from '@angular/forms'; import { TranslateService } from '@ngx-translate/core'; diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts index 02bb5d5c6..05c9dec4e 100644 --- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts +++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts @@ -7,7 +7,7 @@ import { ActivatedRoute, Router, Params } from '@angular/router'; import { DatasetService } from '@app/core/services/dataset/dataset.service'; import { TranslateService } from '@ngx-translate/core'; import { AuthService } from '@app/core/services/auth/auth.service'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/services/notification/ui-notification-service'; import { ConfigurationService } from '@app/core/services/configuration/configuration.service'; import { Oauth2DialogService } from '@app/ui/misc/oauth2-dialog/service/oauth2-dialog.service'; diff --git a/dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.ts b/dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.ts index 27f83a507..58b67ae5f 100644 --- a/dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.ts +++ b/dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.ts @@ -1,18 +1,15 @@ import { Component, Inject } from '@angular/core'; -import { MatLegacyDialog as MatDialog, MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; -import { DmpService } from '@app/core/services/dmp/dmp.service'; -import { map, takeUntil } from 'rxjs/operators'; -import { DmpModel } from '@app/core/model/dmp/dmp'; -import { UntypedFormBuilder, UntypedFormArray, UntypedFormControl } from '@angular/forms'; -import { DatasetDescriptionFormEditorModel } from '@app/ui/misc/dataset-description-form/dataset-description-form.model'; -import { MultipleAutoCompleteConfiguration } from '@app/library/auto-complete/multiple/multiple-auto-complete-configuration'; -import { Observable } from 'rxjs'; -import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile'; +import { UntypedFormArray, UntypedFormBuilder, UntypedFormControl } from '@angular/forms'; +import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; import { DataTableRequest } from '@app/core/model/data-table/data-table-request'; +import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile'; import { DatasetProfileCriteria } from '@app/core/query/dataset-profile/dataset-profile-criteria'; -import { AvailableProfilesComponent } from '../../editor/available-profiles/available-profiles.component'; -import { DatasetPreviewDialogComponent } from '../../dataset-preview/dataset-preview-dialog.component'; +import { DmpService } from '@app/core/services/dmp/dmp.service'; +import { MultipleAutoCompleteConfiguration } from '@app/library/auto-complete/multiple/multiple-auto-complete-configuration'; import { BaseComponent } from '@common/base/base.component'; +import { Observable } from 'rxjs'; +import { map, takeUntil } from 'rxjs/operators'; +import { DatasetPreviewDialogComponent } from '../../dataset-preview/dataset-preview-dialog.component'; @Component({ selector: 'app-clone-dialog', diff --git a/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.ts b/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.ts index f0f9cc1fd..f652b7e4f 100644 --- a/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.ts +++ b/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.ts @@ -28,7 +28,7 @@ import { DatasetService } from '@app/core/services/dataset/dataset.service'; import { DmpEditorModel } from '../editor/dmp-editor.model'; import { DatasetWizardEditorModel } from '@app/ui/dataset/dataset-wizard/dataset-wizard-editor.model'; import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { isNullOrUndefined } from '@app/utilities/enhancers/utils'; import { DmpProfileService } from '@app/core/services/dmp/dmp-profile.service'; import { DmpBlueprintDefinition, SystemFieldType } from '@app/core/model/dmp/dmp-blueprint/dmp-blueprint'; diff --git a/dmp-frontend/src/app/ui/dmp/dataset-preview/dataset-preview-dialog.component.ts b/dmp-frontend/src/app/ui/dmp/dataset-preview/dataset-preview-dialog.component.ts index 2ee1dde41..9cacc9367 100644 --- a/dmp-frontend/src/app/ui/dmp/dataset-preview/dataset-preview-dialog.component.ts +++ b/dmp-frontend/src/app/ui/dmp/dataset-preview/dataset-preview-dialog.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { DatasetWizardService } from '@app/core/services/dataset-wizard/dataset-wizard.service'; import { ProgressIndicationService } from '@app/core/services/progress-indication/progress-indication-service'; import { DatasetDescriptionFormEditorModel } from '@app/ui/misc/dataset-description-form/dataset-description-form.model'; diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.ts b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.ts index 52ee05b08..45e838c9d 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.ts +++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.ts @@ -24,7 +24,7 @@ import { ExternalSourcesService } from '@app/core/services/external-sources/exte import { Observable, interval } from 'rxjs'; import { ExternalSourceItemModel } from '@app/core/model/external-sources/external-source-item'; import { OrganisationService } from '@app/core/services/organisation/organisation.service'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { AddResearcherComponent } from '../editor/add-researcher/add-researcher.component'; import { AddOrganizationComponent } from '../editor/add-organization/add-organization.component'; import { RequestItem } from '@app/core/query/request-item'; diff --git a/dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.ts b/dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.ts index 24da6d1dd..d23a6295e 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.ts +++ b/dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject, OnInit } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @Component({ selector: 'app-to-dataset-dialog-component', diff --git a/dmp-frontend/src/app/ui/dmp/editor/add-organization/add-organization.component.ts b/dmp-frontend/src/app/ui/dmp/editor/add-organization/add-organization.component.ts index 7b6b960a9..ed67c5dbd 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/add-organization/add-organization.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/add-organization/add-organization.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { AbstractControl, AsyncValidatorFn, UntypedFormControl, UntypedFormGroup, ValidationErrors } from '@angular/forms'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { ExternalSourcesService } from '@app/core/services/external-sources/external-sources.service'; import { ExternalResearcherService } from '@app/core/services/external-sources/researcher/external-researcher.service'; import { OrganisationService } from '@app/core/services/organisation/organisation.service'; diff --git a/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.ts b/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.ts index 35d66eada..d2c084b9b 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { AbstractControl, AsyncValidatorFn, UntypedFormControl, UntypedFormGroup, ValidationErrors } from '@angular/forms'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { ExternalSourcesService } from '@app/core/services/external-sources/external-sources.service'; import { ExternalResearcherService } from '@app/core/services/external-sources/researcher/external-researcher.service'; import { ResearcherEditorModel } from '@app/ui/dmp/editor/add-researcher/add-researcher.model'; diff --git a/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.ts b/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.ts index 6760d7772..e61adccd1 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { DataTableRequest } from '@app/core/model/data-table/data-table-request'; import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile'; import { DatasetProfileCriteria } from '@app/core/query/dataset-profile/dataset-profile-criteria'; diff --git a/dmp-frontend/src/app/ui/dmp/editor/cost-editor/add-cost/add-cost.component.ts b/dmp-frontend/src/app/ui/dmp/editor/cost-editor/add-cost/add-cost.component.ts index 3f888009b..ce9d0e91f 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/cost-editor/add-cost/add-cost.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/cost-editor/add-cost/add-cost.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { ExternalResearcherService } from '@app/core/services/external-sources/researcher/external-researcher.service'; import { BaseComponent } from '@common/base/base.component'; import { takeUntil } from 'rxjs/operators'; diff --git a/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.ts index ab0ce30c0..9983eb487 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.ts @@ -4,8 +4,8 @@ import { TranslateService } from '@ngx-translate/core'; import { ConfigurationService } from '@app/core/services/configuration/configuration.service'; import { ExternalSourcesService } from '@app/core/services/external-sources/external-sources.service'; import { MatChipInputEvent } from '@angular/material/chips'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; -import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack-bar'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { DatasetWizardService } from '@app/core/services/dataset-wizard/dataset-wizard.service'; import { ActivatedRoute, Router } from '@angular/router'; import { DmpService } from '@app/core/services/dmp/dmp.service'; diff --git a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.ts index 74c2b0e2f..1d88e6a52 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.ts @@ -7,7 +7,7 @@ import { MultipleAutoCompleteConfiguration } from '@app/library/auto-complete/mu import { map, takeUntil } from 'rxjs/operators'; import { Observable } from 'rxjs'; import { ExternalSourcesService } from '@app/core/services/external-sources/external-sources.service'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile'; import { DatasetProfileCriteria } from '@app/core/query/dataset-profile/dataset-profile-criteria'; import { DataTableRequest } from '@app/core/model/data-table/data-table-request'; diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-deposit-dropdown/dmp-deposit-dropdown.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dmp-deposit-dropdown/dmp-deposit-dropdown.component.ts index 2f0905d7d..36a1572a3 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-deposit-dropdown/dmp-deposit-dropdown.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-deposit-dropdown/dmp-deposit-dropdown.component.ts @@ -1,5 +1,5 @@ import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; -import {MatLegacyDialog as MatDialog} from '@angular/material/legacy-dialog'; +import {MatDialog} from '@angular/material/dialog'; import {DepositConfigurationStatus} from '@app/core/common/enum/deposit-configuration-status'; import {DepositConfigurationModel} from '@app/core/model/deposit/deposit-configuration'; import {DmpOverviewModel} from '@app/core/model/dmp/dmp-overview'; diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts index 0e56b3cf0..987a87021 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit} from '@angular/core'; import { UntypedFormGroup, AbstractControl, UntypedFormControl, UntypedFormArray} from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { DmpStatus } from '@app/core/common/enum/dmp-status'; import { DataTableRequest } from '@app/core/model/data-table/data-table-request'; diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.ts index b707f86fd..d49b4cbb2 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject, OnInit } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { DatasetStatus } from '@app/core/common/enum/dataset-status'; import { DatasetService } from '@app/core/services/dataset/dataset.service'; diff --git a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts index 4c7d5dc0f..223446719 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { UntypedFormGroup, UntypedFormArray } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { DataTableRequest } from '@app/core/model/data-table/data-table-request'; import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile'; import { DmpProfileDefinition } from '@app/core/model/dmp-profile/dmp-profile'; diff --git a/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.ts b/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.ts index b7918510f..91975a5c5 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.ts @@ -6,7 +6,7 @@ import { ExternalSourceItemModel } from '@app/core/model/external-sources/extern import { Observable } from 'rxjs'; import { ExternalSourcesService } from '@app/core/services/external-sources/external-sources.service'; import { isNullOrUndefined } from '@app/utilities/enhancers/utils'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { SingleAutoCompleteConfiguration } from '@app/library/auto-complete/single/single-auto-complete-configuration'; import { LanguageInfo } from '@app/core/model/language-info'; import { LanguageInfoService } from '@app/core/services/culture/language-info-service'; diff --git a/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.ts b/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.ts index 26f087ffe..1d371c001 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.ts @@ -9,7 +9,7 @@ import { ExternalSourceItemModel } from '@app/core/model/external-sources/extern import { Observable } from 'rxjs'; import { ExternalSourcesService } from '@app/core/services/external-sources/external-sources.service'; import { isNullOrUndefined } from '@app/utilities/enhancers/utils'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { AddOrganizationComponent } from '../add-organization/add-organization.component'; import { AddResearcherComponent } from '../add-researcher/add-researcher.component'; import { SingleAutoCompleteConfiguration } from '@app/library/auto-complete/single/single-auto-complete-configuration'; diff --git a/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.ts b/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.ts index a3b7e116b..749c26ac9 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component'; import { TranslateService } from '@ngx-translate/core'; import { Principal } from '../../../../core/model/auth/principal'; diff --git a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.ts b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.ts index e08b80b8e..27e4e19c3 100644 --- a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.ts +++ b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.ts @@ -3,7 +3,7 @@ import { COMMA, ENTER } from '@angular/cdk/keycodes'; import { Component, Inject, OnInit, ViewChild } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; import { MatChipInputEvent } from '@angular/material/chips'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { DmpInvitation } from '@app/core/model/dmp/invitation/dmp-invitation'; import { DmpInvitationUser } from '@app/core/model/dmp/invitation/dmp-invitation-user'; diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria-dialog.component.ts b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria-dialog.component.ts index 08190ec01..b17af0e78 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria-dialog.component.ts +++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria-dialog.component.ts @@ -1,5 +1,5 @@ import { Inject, Component, ViewChild, OnInit, Output, EventEmitter } from '@angular/core'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { DmpCriteriaComponent } from './dmp-criteria.component'; import { DmpCriteria } from '@app/core/query/dmp/dmp-criteria'; import { UntypedFormGroup } from '@angular/forms'; diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts index 9978e4053..0a39cbdcd 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts +++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit, Output, EventEmitter } from '@angular/core'; import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { DataTableRequest } from '@app/core/model/data-table/data-table-request'; import { GrantListingModel } from '@app/core/model/grant/grant-listing'; import { DatasetProfileCriteria } from '@app/core/query/dataset-profile/dataset-profile-criteria'; diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts index 4dea4a3a6..6652c3391 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts +++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts @@ -1,36 +1,36 @@ +import { HttpClient } from '@angular/common/http'; import { Component, OnInit, ViewChild } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; -import { MatLegacyPaginator as MatPaginator } from '@angular/material/legacy-paginator'; +import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angular/forms'; +import { MatDialog } from '@angular/material/dialog'; +import { MatPaginator } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; import { ActivatedRoute, Router } from '@angular/router'; +import { RecentActivityOrder } from '@app/core/common/enum/recent-activity-order'; import { DataTableRequest } from '@app/core/model/data-table/data-table-request'; import { DmpListingModel } from '@app/core/model/dmp/dmp-listing'; import { GrantListingModel } from '@app/core/model/grant/grant-listing'; import { DmpCriteria } from '@app/core/query/dmp/dmp-criteria'; +import { AuthService } from '@app/core/services/auth/auth.service'; import { DmpService } from '@app/core/services/dmp/dmp.service'; +import { GrantService } from "@app/core/services/grant/grant.service"; +import { MatomoService } from '@app/core/services/matomo/matomo-service'; +import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/services/notification/ui-notification-service'; import { EnumUtils } from '@app/core/services/utilities/enum-utils.service'; +import { GuidedTour, Orientation } from '@app/library/guided-tour/guided-tour.constants'; +import { GuidedTourService } from '@app/library/guided-tour/guided-tour.service'; import { DmpInvitationDialogComponent } from '@app/ui/dmp/invitation/dmp-invitation-dialog.component'; import { DmpCriteriaComponent } from '@app/ui/dmp/listing/criteria/dmp-criteria.component'; -import { BreadcrumbItem } from '@app/ui/misc/breadcrumb/definition/breadcrumb-item'; import { IBreadCrumbComponent } from '@app/ui/misc/breadcrumb/definition/IBreadCrumbComponent'; +import { BreadcrumbItem } from '@app/ui/misc/breadcrumb/definition/breadcrumb-item'; +import { isNullOrUndefined } from '@app/utilities/enhancers/utils'; import { BaseComponent } from '@common/base/base.component'; import { TranslateService } from '@ngx-translate/core'; +import { NgDialogAnimationService } from "ng-dialog-animation"; import { Observable, of as observableOf } from 'rxjs'; import { debounceTime, takeUntil } from 'rxjs/operators'; -import { GrantService } from "@app/core/services/grant/grant.service"; -import { DmpUploadDialogue } from './upload-dialogue/dmp-upload-dialogue.component'; -import { UiNotificationService, SnackBarNotificationLevel } from '@app/core/services/notification/ui-notification-service'; -import { isNullOrUndefined } from '@app/utilities/enhancers/utils'; -import { AuthService } from '@app/core/services/auth/auth.service'; -import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angular/forms'; import { DmpCriteriaDialogComponent } from './criteria/dmp-criteria-dialog.component'; -import { RecentActivityOrder } from '@app/core/common/enum/recent-activity-order'; -import { GuidedTourService } from '@app/library/guided-tour/guided-tour.service'; -import { GuidedTour, Orientation } from '@app/library/guided-tour/guided-tour.constants'; -import { NgDialogAnimationService } from "ng-dialog-animation"; -import { HttpClient } from '@angular/common/http'; -import { MatomoService } from '@app/core/services/matomo/matomo-service'; +import { DmpUploadDialogue } from './upload-dialogue/dmp-upload-dialogue.component'; @Component({ selector: 'app-dmp-listing-component', diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts index 7db452705..3cf55ed81 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts +++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { DmpListingModel } from '../../../../core/model/dmp/dmp-listing'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { DmpInvitationDialogComponent } from '../../invitation/dmp-invitation-dialog.component'; import { Router, ActivatedRoute } from '@angular/router'; import { DatasetService } from '../../../../core/services/dataset/dataset.service'; diff --git a/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.ts b/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.ts index 7a9f9e7fc..15cd4b718 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.ts +++ b/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatLegacyDialog as MatDialog, MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { DmpService } from '../../../../core/services/dmp/dmp.service'; import { MultipleAutoCompleteConfiguration } from '@app/library/auto-complete/multiple/multiple-auto-complete-configuration'; import { map, takeUntil } from 'rxjs/operators'; diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts index 320f89987..723d0aabe 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts @@ -1,5 +1,5 @@ import {Component, ElementRef, OnInit, ViewChild} from '@angular/core'; -import {MatLegacyDialog as MatDialog} from '@angular/material/legacy-dialog'; +import {MatDialog} from '@angular/material/dialog'; import {ActivatedRoute, Params, Router} from '@angular/router'; import {DatasetStatus} from '@app/core/common/enum/dataset-status'; import {DmpStatus} from '@app/core/common/enum/dmp-status'; diff --git a/dmp-frontend/src/app/ui/dmp/start-new-dataset-dialogue/start-new-dataset-dialog.component.ts b/dmp-frontend/src/app/ui/dmp/start-new-dataset-dialogue/start-new-dataset-dialog.component.ts index fc8d14baa..0783b92bf 100644 --- a/dmp-frontend/src/app/ui/dmp/start-new-dataset-dialogue/start-new-dataset-dialog.component.ts +++ b/dmp-frontend/src/app/ui/dmp/start-new-dataset-dialogue/start-new-dataset-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialogRef, MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog'; import { BaseComponent } from '@common/base/base.component'; import { SingleAutoCompleteConfiguration } from '@app/library/auto-complete/single/single-auto-complete-configuration'; import { TranslateService } from '@ngx-translate/core'; diff --git a/dmp-frontend/src/app/ui/dmp/start-new-dmp-dialogue/start-new-dmp-dialog.component.ts b/dmp-frontend/src/app/ui/dmp/start-new-dmp-dialogue/start-new-dmp-dialog.component.ts index eeb994bf1..f9b46a8d4 100644 --- a/dmp-frontend/src/app/ui/dmp/start-new-dmp-dialogue/start-new-dmp-dialog.component.ts +++ b/dmp-frontend/src/app/ui/dmp/start-new-dmp-dialogue/start-new-dmp-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialogRef, MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { DmpUploadDialogue } from '../listing/upload-dialogue/dmp-upload-dialogue.component'; import { UiNotificationService, SnackBarNotificationLevel } from '@app/core/services/notification/ui-notification-service'; diff --git a/dmp-frontend/src/app/ui/dmp/wizard/dmp-wizard.component.ts b/dmp-frontend/src/app/ui/dmp/wizard/dmp-wizard.component.ts index a1cdb06d9..0d3e9ee3a 100644 --- a/dmp-frontend/src/app/ui/dmp/wizard/dmp-wizard.component.ts +++ b/dmp-frontend/src/app/ui/dmp/wizard/dmp-wizard.component.ts @@ -2,7 +2,7 @@ import { HttpErrorResponse } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; -import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack-bar'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { DmpModel } from '@app/core/model/dmp/dmp'; import { DmpBlueprintDefinition, SystemFieldType } from '@app/core/model/dmp/dmp-blueprint/dmp-blueprint'; diff --git a/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.ts b/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.ts index 3ff161ed0..74767095c 100644 --- a/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.ts +++ b/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; -import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack-bar'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { ActivatedRoute, Router } from '@angular/router'; import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile'; import { ExternalSourceItemModel } from '@app/core/model/external-sources/external-source-item'; diff --git a/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.ts b/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.ts index 81620a10e..4e840d3ec 100644 --- a/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.ts +++ b/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.ts @@ -1,8 +1,8 @@ import { SelectionModel } from '@angular/cdk/collections'; import { Component, Input, OnInit, ViewChild } from '@angular/core'; import { UntypedFormArray, UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angular/forms'; -import { MatLegacyPaginator as MatPaginator } from '@angular/material/legacy-paginator'; -import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack-bar'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { MatSort } from '@angular/material/sort'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { DataTableRequest } from '@app/core/model/data-table/data-table-request'; diff --git a/dmp-frontend/src/app/ui/faq/dialog/faq-dialog.component.ts b/dmp-frontend/src/app/ui/faq/dialog/faq-dialog.component.ts index cd2714b2c..2c3261dad 100644 --- a/dmp-frontend/src/app/ui/faq/dialog/faq-dialog.component.ts +++ b/dmp-frontend/src/app/ui/faq/dialog/faq-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @Component({ selector: 'app-faq-dialog', diff --git a/dmp-frontend/src/app/ui/glossary/dialog/glossary-dialog.component.ts b/dmp-frontend/src/app/ui/glossary/dialog/glossary-dialog.component.ts index d90592019..bd8ccd72d 100644 --- a/dmp-frontend/src/app/ui/glossary/dialog/glossary-dialog.component.ts +++ b/dmp-frontend/src/app/ui/glossary/dialog/glossary-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @Component({ selector: 'app-glossary-dialog', diff --git a/dmp-frontend/src/app/ui/language/dialog/language-dialog.component.ts b/dmp-frontend/src/app/ui/language/dialog/language-dialog.component.ts index 5b73b940a..b2f90a4b5 100644 --- a/dmp-frontend/src/app/ui/language/dialog/language-dialog.component.ts +++ b/dmp-frontend/src/app/ui/language/dialog/language-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @Component({ selector: 'app-language-dialog', diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field-dialog/form-composite-field-dialog.component.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field-dialog/form-composite-field-dialog.component.ts index ae68f6427..d1a3625cb 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field-dialog/form-composite-field-dialog.component.ts +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field-dialog/form-composite-field-dialog.component.ts @@ -1,5 +1,5 @@ import {Component, Inject} from "@angular/core"; -import {MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef} from "@angular/material/legacy-dialog"; +import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog"; import {VisibilityRulesService} from "@app/ui/misc/dataset-description-form/visibility-rules/visibility-rules.service"; @Component({ diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.ts index 6bb7855f9..0009da801 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.ts +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.ts @@ -7,7 +7,7 @@ import {VisibilityRulesService} from '../../visibility-rules/visibility-rules.se import { FormCompositeFieldDialogComponent } from "@app/ui/misc/dataset-description-form/components/form-composite-field-dialog/form-composite-field-dialog.component"; -import {MatLegacyDialog as MatDialog} from "@angular/material/legacy-dialog"; +import {MatDialog} from "@angular/material/dialog"; import {cloneAbstractControl} from "@app/utilities/enhancers/utils"; @Component({ diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.ts index c76424be7..c19014f99 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.ts +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.ts @@ -44,7 +44,7 @@ import { UiNotificationService } from "@app/core/services/notification/ui-notification-service"; import {FormValidationErrorsDialogComponent} from "@common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component"; -import {MatLegacyDialog as MatDialog} from "@angular/material/legacy-dialog"; +import {MatDialog} from "@angular/material/dialog"; import {HttpError} from "@common/modules/errors/error-handling/http-error-handling.service"; import {HttpErrorResponse} from "@angular/common/http"; import * as FileSaver from "file-saver"; diff --git a/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts b/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts index ca9691a33..bfd52420f 100644 --- a/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts +++ b/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { UntypedFormControl } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { AppRole } from '@app/core/common/enum/app-role'; import { SearchBarItem } from '@app/core/model/dashboard/search-bar-item'; diff --git a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.ts b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.ts index bc2f1ca0a..aa805814d 100644 --- a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.ts +++ b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { Principal } from '../../../../core/model/auth/principal'; import { AuthService } from '../../../../core/services/auth/auth.service'; diff --git a/dmp-frontend/src/app/ui/misc/oauth2-dialog/oauth2-dialog.component.ts b/dmp-frontend/src/app/ui/misc/oauth2-dialog/oauth2-dialog.component.ts index 41f49bb69..2ec574631 100644 --- a/dmp-frontend/src/app/ui/misc/oauth2-dialog/oauth2-dialog.component.ts +++ b/dmp-frontend/src/app/ui/misc/oauth2-dialog/oauth2-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Inject } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { ActivatedRoute, Params } from '@angular/router'; import { BaseComponent } from '@common/base/base.component'; import { takeUntil } from 'rxjs/operators'; diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.ts b/dmp-frontend/src/app/ui/navbar/navbar.component.ts index a8ea20cd2..c701ab0ce 100644 --- a/dmp-frontend/src/app/ui/navbar/navbar.component.ts +++ b/dmp-frontend/src/app/ui/navbar/navbar.component.ts @@ -1,8 +1,8 @@ import { Location } from '@angular/common'; import { HttpClient } from '@angular/common/http'; import { Component, ElementRef, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; -import { MatLegacyMenuTrigger as MatMenuTrigger } from '@angular/material/legacy-menu'; +import { MatDialog } from '@angular/material/dialog'; +import { MatMenuTrigger } from '@angular/material/menu'; import { Router } from '@angular/router'; import { AppRole } from '@app/core/common/enum/app-role'; import { UserListingModel } from '@app/core/model/user/user-listing'; diff --git a/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.ts b/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.ts index 585636d9f..ce13e98bd 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { UntypedFormArray, UntypedFormGroup } from '@angular/forms'; -import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack-bar'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { ActivatedRoute, Router } from '@angular/router'; import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile'; import { DatasetProfileCriteria } from '@app/core/query/dataset-profile/dataset-profile-criteria'; diff --git a/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.ts b/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.ts index 9c4fa0d3d..e2e31863e 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { AbstractControl, FormArray, FormControl, UntypedFormGroup } from '@angular/forms'; -import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack-bar'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { Router } from '@angular/router'; import { GrantCriteria } from '@app/core/query/grant/grant-criteria'; import { RequestItem } from '@app/core/query/request-item'; diff --git a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts index e966a2d46..2a1160d60 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { AbstractControl, UntypedFormArray, FormControl, UntypedFormGroup } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; -import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack-bar'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { MatStepper } from '@angular/material/stepper'; import { Router } from '@angular/router'; import { DatasetStatus } from '@app/core/common/enum/dataset-status'; diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.ts index 94b278d3e..8ae6ec5ac 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.ts +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { ContactEmailFormModel } from '@app/core/model/contact/contact-email-form-model'; import { ContactSupportService } from '@app/core/services/contact-support/contact-support.service'; diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts index f1f724ca9..48bccf255 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts +++ b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { AuthService } from '../../core/services/auth/auth.service'; import { UserDialogComponent } from '../misc/navigation/user-dialog/user-dialog.component'; diff --git a/dmp-frontend/src/app/ui/user-guide/dialog/user-guide-dialog.component.ts b/dmp-frontend/src/app/ui/user-guide/dialog/user-guide-dialog.component.ts index cbe2ad8a8..8216c4625 100644 --- a/dmp-frontend/src/app/ui/user-guide/dialog/user-guide-dialog.component.ts +++ b/dmp-frontend/src/app/ui/user-guide/dialog/user-guide-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @Component({ selector: 'app-user-guide-dialog', diff --git a/dmp-frontend/src/app/ui/user-profile/add-account/add-account-dialog.component.ts b/dmp-frontend/src/app/ui/user-profile/add-account/add-account-dialog.component.ts index f6a8f6e36..1a98e1de5 100644 --- a/dmp-frontend/src/app/ui/user-profile/add-account/add-account-dialog.component.ts +++ b/dmp-frontend/src/app/ui/user-profile/add-account/add-account-dialog.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { UserMergeRequestModel } from '@app/core/model/merge/user-merge-request'; import { MergeLoginService } from '@app/ui/auth/login/utilities/merge-login.service'; import { DatasetDescriptionFormEditorModel } from '@app/ui/misc/dataset-description-form/dataset-description-form.model'; diff --git a/dmp-frontend/src/app/ui/user-profile/user-profile.component.ts b/dmp-frontend/src/app/ui/user-profile/user-profile.component.ts index 45df1d11f..d923f2237 100644 --- a/dmp-frontend/src/app/ui/user-profile/user-profile.component.ts +++ b/dmp-frontend/src/app/ui/user-profile/user-profile.component.ts @@ -23,7 +23,7 @@ import { UserProfileEditorModel } from './user-profile-editor.model'; import { RoleOrganizationType } from '@app/core/common/enum/role-organization-type'; import { EnumUtils } from '@app/core/services/utilities/enum-utils.service'; import { AddAccountDialogComponent } from './add-account/add-account-dialog.component'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { UserCredentialModel } from '@app/core/model/user/user-credential'; import { AuthProvider } from '@app/core/common/enum/auth-provider'; import { MergeEmailConfirmationService } from '@app/core/services/merge-email-confirmation/merge-email-confirmation.service'; diff --git a/dmp-frontend/src/assets/scss/core/_buttons.scss b/dmp-frontend/src/assets/scss/core/_buttons.scss index d5bc732c7..c59d4a723 100644 --- a/dmp-frontend/src/assets/scss/core/_buttons.scss +++ b/dmp-frontend/src/assets/scss/core/_buttons.scss @@ -14,7 +14,7 @@ cursor: pointer; background-color: transparent; border: 0; - //TODO: angular update border-radius: $border-radius-sm; + border-radius: $border-radius-sm; outline: 0; transition: box-shadow 0.2s cubic-bezier(0.4, 0, 1, 1), background-color 0.2s cubic-bezier(0.4, 0, 0.2, 1); will-change: box-shadow, transform; @@ -71,11 +71,11 @@ // Size variations &.btn-lg, .btn-group-lg & { - @include button-size($input-btn-padding-y-lg, $input-btn-padding-x-lg, $bmd-btn-font-size, $btn-lg-line-height, $border-radius-sm); + @include button-size($input-btn-padding-y-lg, $input-btn-padding-x-lg, $bmd-btn-font-size, $btn-lg-line-height, $border-radius-sm); } &.btn-sm, .btn-group-sm & { - @include button-size($input-btn-padding-y-sm, $input-btn-padding-x-sm, $bmd-btn-font-size-sm, $line-height-sm, $border-radius-sm); + @include button-size($input-btn-padding-y-sm, $input-btn-padding-x-sm, $bmd-btn-font-size-sm, $line-height-sm, $border-radius-sm); } &.btn-round { @@ -205,7 +205,7 @@ //} .dropdown-menu { - border-radius: 0 0 $border-radius $border-radius; + border-radius: 0 0 $border-radius $border-radius; } &.btn-group-raised { diff --git a/dmp-frontend/src/assets/scss/core/_forms.scss b/dmp-frontend/src/assets/scss/core/_forms.scss index 9d21503e1..1f810e893 100644 --- a/dmp-frontend/src/assets/scss/core/_forms.scss +++ b/dmp-frontend/src/assets/scss/core/_forms.scss @@ -1,3 +1,5 @@ +@import "_variables.scss"; + form { // ensure enough room at the bottom of any form to display a one-line bmd-help margin-bottom: ($bmd-help-size-ratio * $font-size-base) * $line-height-base; diff --git a/dmp-frontend/src/assets/scss/core/mixins/_buttons.scss b/dmp-frontend/src/assets/scss/core/mixins/_buttons.scss index 32968eb7d..f22c2f8f1 100644 --- a/dmp-frontend/src/assets/scss/core/mixins/_buttons.scss +++ b/dmp-frontend/src/assets/scss/core/mixins/_buttons.scss @@ -175,6 +175,7 @@ $active-background: $focus-background; //$active-background: darken($background, 17%); + $active-border: darken($border, 25%); @include bmd-button-variant($color, @@ -182,8 +183,8 @@ $focus-background, $active-background, $border, - $focus-border, - $active-border); + $focus-border, + $active-border); @include shadow-2dp-color($background); diff --git a/dmp-frontend/src/assets/scss/core/variables/_type.scss b/dmp-frontend/src/assets/scss/core/variables/_type.scss index f1ab356cb..43614bc76 100644 --- a/dmp-frontend/src/assets/scss/core/variables/_type.scss +++ b/dmp-frontend/src/assets/scss/core/variables/_type.scss @@ -11,13 +11,13 @@ $font-family-serif: 'Roboto Slab', 'Times New Roman', serif !default; //$font-family-base: $font-family-sans-serif !default; // Pixel value used to responsively scale all typography. Applied to the `` element. -//$font-size-root: 16px !default; +$font-size-root: 16px !default; // $font-size-base: 1rem !default; -//$font-size-lg: 1.25rem !default; -//$font-size-sm: .875rem !default; -//$font-size-xs: .75rem !default; -// +$font-size-lg: 1.25rem !default; +$font-size-sm: .875rem !default; +$font-size-xs: .75rem !default; + $font-size-h1: 3.3125rem; $font-size-h2: 2.25rem !default; @@ -41,7 +41,7 @@ $display4-size: 2.125rem !default; // md display-1 34px was 3.5rem //$display3-weight: 300 !default; //$display4-weight: 300 !default; // -//$line-height-base: 1.5 !default; +$line-height-base: 1.5 !default; // $headings-margin-bottom: math.div($spacer, 2) !default; //$headings-font-family: inherit !default; diff --git a/dmp-frontend/src/assets/scss/material-dashboard.scss b/dmp-frontend/src/assets/scss/material-dashboard.scss index a052ec24d..8194c858b 100644 --- a/dmp-frontend/src/assets/scss/material-dashboard.scss +++ b/dmp-frontend/src/assets/scss/material-dashboard.scss @@ -48,7 +48,8 @@ $custom-theme: mat.define-light-theme($custom-theme-primary, $custom-theme-accen @import "core/variables"; @import "core/mixins"; //Material-Bootstrap configuration -//TODO: angular update @import "assets/scss/bootstrap-material"; +@import "assets/scss/bootstrap-material"; +@import "/node_modules/bootstrap/scss/bootstrap"; // Core Components @import "core/buttons"; diff --git a/dmp-frontend/src/common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component.ts b/dmp-frontend/src/common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component.ts index 947a9ec6b..ae5dd4916 100644 --- a/dmp-frontend/src/common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component.ts +++ b/dmp-frontend/src/common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component.ts @@ -1,6 +1,6 @@ import { Component, Inject } from '@angular/core'; import { AbstractControl, UntypedFormArray, UntypedFormControl, UntypedFormGroup } from '@angular/forms'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; @Component({ diff --git a/dmp-frontend/src/common/forms/pending-form-changes/pending-form-changes-guard.service.ts b/dmp-frontend/src/common/forms/pending-form-changes/pending-form-changes-guard.service.ts index 1a879c5e4..c8a5166d9 100644 --- a/dmp-frontend/src/common/forms/pending-form-changes/pending-form-changes-guard.service.ts +++ b/dmp-frontend/src/common/forms/pending-form-changes/pending-form-changes-guard.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { MatDialog } from '@angular/material/dialog'; import { CanDeactivate } from '@angular/router'; import { BasePendingChangesComponent } from '@common/base/base-pending-changes.component'; import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component'; diff --git a/dmp-frontend/src/common/http/interceptors/response-payload.interceptor.ts b/dmp-frontend/src/common/http/interceptors/response-payload.interceptor.ts index 3130b5453..dab8544f8 100644 --- a/dmp-frontend/src/common/http/interceptors/response-payload.interceptor.ts +++ b/dmp-frontend/src/common/http/interceptors/response-payload.interceptor.ts @@ -1,6 +1,6 @@ import { HttpHandler, HttpHeaderResponse, HttpProgressEvent, HttpRequest, HttpResponse, HttpSentEvent, HttpUserEvent } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack-bar'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { BaseInterceptor } from './base.interceptor'; diff --git a/dmp-frontend/src/common/material/material.module.ts b/dmp-frontend/src/common/material/material.module.ts index 302d949b8..ea8ccda39 100644 --- a/dmp-frontend/src/common/material/material.module.ts +++ b/dmp-frontend/src/common/material/material.module.ts @@ -1,36 +1,36 @@ +import { CdkTableModule } from '@angular/cdk/table'; import { NgModule } from '@angular/core'; -import { MatLegacyAutocompleteModule as MatAutocompleteModule } from '@angular/material/legacy-autocomplete'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatButtonModule } from '@angular/material/button'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; -import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; -import { MatLegacyChipsModule as MatChipsModule } from '@angular/material/legacy-chips'; -import { MatLegacyOptionModule as MatOptionModule } from '@angular/material/legacy-core'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatChipsModule } from '@angular/material/chips'; +import { MatOptionModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; +import { MatDialogModule } from '@angular/material/dialog'; import { MatExpansionModule } from '@angular/material/expansion'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; +import { MatFormFieldModule } from '@angular/material/form-field'; import { MatGridListModule } from '@angular/material/grid-list'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; -import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list'; -import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; -import { MatLegacyPaginatorModule as MatPaginatorModule } from '@angular/material/legacy-paginator'; -import { MatLegacyProgressBarModule as MatProgressBarModule } from '@angular/material/legacy-progress-bar'; -import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner'; -import { MatLegacyRadioModule as MatRadioModule } from '@angular/material/legacy-radio'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatInputModule } from '@angular/material/input'; +import { MatListModule } from '@angular/material/list'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatRadioModule } from '@angular/material/radio'; +import { MatSelectModule } from '@angular/material/select'; import { MatSidenavModule } from '@angular/material/sidenav'; -import { MatLegacySlideToggleModule as MatSlideToggleModule } from '@angular/material/legacy-slide-toggle'; -import { MatLegacySliderModule as MatSliderModule } from '@angular/material/legacy-slider'; -import { MatLegacySnackBarModule as MatSnackBarModule } from '@angular/material/legacy-snack-bar'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; +import { MatSliderModule } from '@angular/material/slider'; +import { MatSnackBarModule } from '@angular/material/snack-bar'; import { MatSortModule } from '@angular/material/sort'; import { MatStepperModule } from '@angular/material/stepper'; -import { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table'; -import { MatLegacyTabsModule as MatTabsModule } from '@angular/material/legacy-tabs'; +import { MatTableModule } from '@angular/material/table'; +import { MatTabsModule } from '@angular/material/tabs'; import { MatToolbarModule } from '@angular/material/toolbar'; -import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; -import { CdkTableModule } from '@angular/cdk/table'; +import { MatTooltipModule } from '@angular/material/tooltip'; @NgModule({ imports: [ diff --git a/dmp-frontend/src/common/modules/confirmation-dialog/confirmation-dialog.component.ts b/dmp-frontend/src/common/modules/confirmation-dialog/confirmation-dialog.component.ts index e767aac89..6017d85c3 100644 --- a/dmp-frontend/src/common/modules/confirmation-dialog/confirmation-dialog.component.ts +++ b/dmp-frontend/src/common/modules/confirmation-dialog/confirmation-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @Component({ selector: 'app-confirmation-dialog', diff --git a/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.ts b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.ts index b3a5d35f6..445226bfa 100644 --- a/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.ts +++ b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @Component({ selector: 'app-multiple-choice-dialog', diff --git a/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.module.ts b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.module.ts index abecaded6..80a4329c6 100644 --- a/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.module.ts +++ b/dmp-frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.module.ts @@ -1,14 +1,13 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MultipleChoiceDialogComponent } from './multiple-choice-dialog.component'; -import { CommonUiModule } from '@common/ui/common-ui.module'; import { FormsModule } from '@angular/forms'; +import { CommonUiModule } from '@common/ui/common-ui.module'; +import { MultipleChoiceDialogComponent } from './multiple-choice-dialog.component'; @NgModule({ - imports: [CommonUiModule, FormsModule], - declarations: [MultipleChoiceDialogComponent], - exports: [MultipleChoiceDialogComponent] + imports: [CommonUiModule, FormsModule], + declarations: [MultipleChoiceDialogComponent], + exports: [MultipleChoiceDialogComponent] }) export class MultipleChoiceDialogModule { }