|
|
|
|
@ -1,5 +1,5 @@
|
|
|
|
|
|
|
|
|
|
import { of as observableOf, Observable } from 'rxjs';
|
|
|
|
|
import { of as observableOf, Observable, Subject, combineLatest, BehaviorSubject, pipe, of, from } from 'rxjs';
|
|
|
|
|
import { HttpClient, HttpErrorResponse } from '@angular/common/http';
|
|
|
|
|
import { AfterViewInit, Component, OnChanges, OnInit, QueryList, SimpleChanges, ViewChild } from '@angular/core';
|
|
|
|
|
import { AbstractControl, Form, FormArray, FormBuilder, FormControl, FormGroup, ValidationErrors, ValidatorFn, Validators } from '@angular/forms';
|
|
|
|
|
@ -7,7 +7,7 @@ import { MatDialog } from '@angular/material/dialog';
|
|
|
|
|
import { MatHorizontalStepper, MatStep } from '@angular/material/stepper';
|
|
|
|
|
import { ActivatedRoute, ParamMap, Router } from '@angular/router';
|
|
|
|
|
import { TranslateService } from '@ngx-translate/core';
|
|
|
|
|
import { map, takeUntil } from 'rxjs/operators';
|
|
|
|
|
import { debounce, debounceTime, filter, map, mergeMap, takeUntil, tap } from 'rxjs/operators';
|
|
|
|
|
import * as FileSaver from 'file-saver';
|
|
|
|
|
import { BaseComponent } from '@common/base/base.component';
|
|
|
|
|
import { DatasetProfileEditorModel } from '@app/ui/admin/dataset-profile/editor/dataset-profile-editor-model';
|
|
|
|
|
@ -43,7 +43,7 @@ import { invalid } from '@angular/compiler/src/render3/view/util';
|
|
|
|
|
import { SideNavService } from '@app/core/services/sidenav/side-nav.sevice';
|
|
|
|
|
import { EditorCustomValidators, EditorCustomValidatorsEnum } from './custom-validators/editor-custom-validators';
|
|
|
|
|
import { CustomErrorValidator } from '@common/forms/validation/custom-validator';
|
|
|
|
|
import { STEPPER_ANIMATIONS } from './animations/animations';
|
|
|
|
|
import { GENERAL_ANIMATIONS, STEPPER_ANIMATIONS } from './animations/animations';
|
|
|
|
|
import { DatasetProfileComboBoxType } from '@app/core/common/enum/dataset-profile-combo-box-type';
|
|
|
|
|
import { MultipleAutoCompleteConfiguration } from '@app/library/auto-complete/multiple/multiple-auto-complete-configuration';
|
|
|
|
|
import { DmpInvitationUser } from '@app/core/model/dmp/invitation/dmp-invitation-user';
|
|
|
|
|
@ -51,6 +51,7 @@ import { RequestItem } from '@app/core/query/request-item';
|
|
|
|
|
import { DmpInvitationUserCriteria } from '@app/core/query/dmp/dmp-invitation-user-criteria';
|
|
|
|
|
import { DmpInvitationService } from '@app/core/services/dmp/dmp-invitation.service';
|
|
|
|
|
import { UserService } from '@app/core/services/user/user.service';
|
|
|
|
|
import { MatInput } from '@angular/material';
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const skipDisable: any[] = require('../../../../../assets/resources/skipDisable.json');
|
|
|
|
|
@ -59,7 +60,7 @@ const skipDisable: any[] = require('../../../../../assets/resources/skipDisable.
|
|
|
|
|
selector: 'app-dataset-profile-editor-component',
|
|
|
|
|
templateUrl: './dataset-profile-editor.component.html',
|
|
|
|
|
styleUrls: ['./dataset-profile-editor.component.scss'],
|
|
|
|
|
animations:[...STEPPER_ANIMATIONS],
|
|
|
|
|
animations:[...STEPPER_ANIMATIONS, ...GENERAL_ANIMATIONS],
|
|
|
|
|
providers:[VisibilityRulesService]
|
|
|
|
|
})
|
|
|
|
|
export class DatasetProfileEditorComponent extends BaseComponent implements OnInit {
|
|
|
|
|
@ -85,6 +86,9 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn
|
|
|
|
|
displayedColumns: String[] = ['name', 'email', 'button'];
|
|
|
|
|
|
|
|
|
|
colorizeInvalid:boolean = false;
|
|
|
|
|
inputUserState: 'untriggered'| 'triggered' = 'untriggered';
|
|
|
|
|
private _inputUserField$:BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
|
|
|
|
|
private _inputUserButton$:BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// customEditorValidators = new EditorCustomValidators();
|
|
|
|
|
@ -220,6 +224,22 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
combineLatest(this._inputUserButton$.asObservable(),this._inputUserField$.asObservable())
|
|
|
|
|
.pipe(takeUntil(this._destroyed))
|
|
|
|
|
.pipe(debounceTime(400))
|
|
|
|
|
.pipe(filter(_=> !_[0] && !_[1]))
|
|
|
|
|
.subscribe(_=>{
|
|
|
|
|
// if(!this.userFormDisabled)
|
|
|
|
|
this.inputUserState = 'untriggered';
|
|
|
|
|
});
|
|
|
|
|
// combineLatest(this._inputUserButton$.asObservable(),this._inputUserField$.asObservable())
|
|
|
|
|
// .pipe(takeUntil(this._destroyed))
|
|
|
|
|
// .pipe(debounceTime(200))
|
|
|
|
|
// .pipe(filter(_=> _[0] || _[1]))
|
|
|
|
|
// .subscribe(_=>{
|
|
|
|
|
// // if(!this.userFormDisabled)
|
|
|
|
|
// this.inputUserState = 'triggered';
|
|
|
|
|
// });
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private _initializeToCEntries(){
|
|
|
|
|
@ -1792,6 +1812,58 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn
|
|
|
|
|
return invalidControls;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
userFormDisabled:boolean = false;
|
|
|
|
|
addUser(email:MatInput){
|
|
|
|
|
|
|
|
|
|
// email.focus();
|
|
|
|
|
if(this.userFormDisabled) return;
|
|
|
|
|
|
|
|
|
|
// console.log('user add');
|
|
|
|
|
if(this.inputUserState === 'triggered'){
|
|
|
|
|
// this.checkAndAdd(email);
|
|
|
|
|
|
|
|
|
|
of(email.value)
|
|
|
|
|
.pipe(tap(_=> {this.userFormDisabled = true; email.focus()}))
|
|
|
|
|
.pipe(mergeMap(email=>this.userService.getFromEmail(email)))
|
|
|
|
|
.pipe(takeUntil(this._destroyed))
|
|
|
|
|
.subscribe((result) => {
|
|
|
|
|
this.userChipList.push(result);
|
|
|
|
|
this.form.patchValue({'users': this.userChipList});
|
|
|
|
|
|
|
|
|
|
email.value = '';
|
|
|
|
|
this.userFormDisabled = false;
|
|
|
|
|
// email.focus();
|
|
|
|
|
// this.inputUserState = 'triggered';
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
error=>{
|
|
|
|
|
// console.log(error.message);
|
|
|
|
|
this.uiNotificationService.snackBarNotification(error.message, SnackBarNotificationLevel.Error);
|
|
|
|
|
this.userFormDisabled = false;
|
|
|
|
|
// this.inputUserState = 'triggered';//when it loses focus(when disabled) it becomes untriggered
|
|
|
|
|
// email.focus();
|
|
|
|
|
});
|
|
|
|
|
// this.inputUserState = 'untriggered';
|
|
|
|
|
}else{
|
|
|
|
|
this.inputUserState = 'triggered';
|
|
|
|
|
email.focus();
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
onUserButtonFocus(){
|
|
|
|
|
this._inputUserButton$.next(true);
|
|
|
|
|
}
|
|
|
|
|
onUserButtonBlur(){
|
|
|
|
|
this._inputUserButton$.next(false);
|
|
|
|
|
}
|
|
|
|
|
onUserFieldFocus(){
|
|
|
|
|
this._inputUserField$.next(true);
|
|
|
|
|
}
|
|
|
|
|
onUserFieldBlur(){
|
|
|
|
|
this._inputUserField$.next(false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//Temporary patch
|
|
|
|
|
@ -1847,6 +1919,24 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn
|
|
|
|
|
this.form.patchValue({'users': this.userChipList});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
verifyAndRemoveUser(user:any){
|
|
|
|
|
const dialogRef = this.dialog.open(ConfirmationDialogComponent, {
|
|
|
|
|
restoreFocus: false,
|
|
|
|
|
data: {
|
|
|
|
|
message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.DELETE-ITEM'),
|
|
|
|
|
confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'),
|
|
|
|
|
cancelButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CANCEL'),
|
|
|
|
|
isDeleteConfirmation: true
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(approve => {
|
|
|
|
|
if (approve) {
|
|
|
|
|
this.removeUser(user);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
interface InvalidControl{
|
|
|
|
|
|
