MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge branch 'ui-redesign' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot.git into ui-redesign

This commit is contained in:
MadDeCoDeR 2020-09-22 11:29:13 +03:00
parent 9a9fed37ce b75d7606cf
commit 71deb5f473
3 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html
View File

@ -50,7 +50,7 @@
</div> </div>
</div> </div>
<!-- External Fields --> <!-- External Fields -->
<app-dataset-external-references-editor-component (formChanged)="onFormChanged($event)" [formGroup]="formGroup" [viewOnly]="viewOnly"></app-dataset-external-references-editor-component> <app-dataset-external-references-editor-component [formGroup]="formGroup" [viewOnly]="viewOnly"></app-dataset-external-references-editor-component>
<!-- Template Field --> <!-- Template Field -->
<div class="heading">1.5 {{'DATASET-EDITOR.FIELDS.PROFILE' | translate}}*</div> <div class="heading">1.5 {{'DATASET-EDITOR.FIELDS.PROFILE' | translate}}*</div>
<div class="profile-form"> <div class="profile-form">

10
dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.ts
View File

@ -6,6 +6,7 @@ import { GuidedTourService } from '@app/library/guided-tour/guided-tour.service'
import { GuidedTour, Orientation } from '@app/library/guided-tour/guided-tour.constants'; import { GuidedTour, Orientation } from '@app/library/guided-tour/guided-tour.constants';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile'; import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile';
import { takeUntil } from 'rxjs/operators';
@Component({ @Component({
selector: 'app-dataset-editor-component', selector: 'app-dataset-editor-component',
@ -14,10 +15,10 @@ import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile';
}) })
export class DatasetEditorComponent extends BaseComponent { export class DatasetEditorComponent extends BaseComponent {
@Input() formGroup: FormGroup = null; @Input() formGroup: FormGroup;
// @Input() formGroup: FormGroup = null;
@Input() availableProfiles: DatasetProfileModel[]; @Input() availableProfiles: DatasetProfileModel[];
@Input() dmpId: string; @Input() dmpId: string;
@Output() formChanged: EventEmitter<any> = new EventEmitter();
showUri: boolean = false; showUri: boolean = false;
dmpText: string; dmpText: string;
viewOnly = false; viewOnly = false;
@ -69,9 +70,4 @@ export class DatasetEditorComponent extends BaseComponent {
public compareWith(object1: any, object2: any) { public compareWith(object1: any, object2: any) {
return object1 && object2 && object1.id === object2.id; return object1 && object2 && object1.id === object2.id;
} }
onFormChanged(event) {
this.formChanged.emit(event);
}
} }

34
dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts
View File

@ -383,9 +383,38 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr
this.formGroup.get('profile').valueChanges this.formGroup.get('profile').valueChanges
.pipe(takeUntil(this._destroyed)) .pipe(takeUntil(this._destroyed))
.subscribe(x => { .subscribe(x => {
console.log(x) if (x) {
if (x) { this.datasetProfileValueChanged(x.id); } this.datasetProfileValueChanged(x.id);
this.formChanged();
}
}); });
this.formGroup.get('label').valueChanges
.pipe(takeUntil(this._destroyed))
.subscribe(x => {
this.formChanged();
});
this.formGroup.get('description').valueChanges
.pipe(takeUntil(this._destroyed))
.subscribe(x => {
this.formChanged();
});
this.formGroup.get('uri').valueChanges
.pipe(takeUntil(this._destroyed))
.subscribe(x => {
this.formChanged();
});
this.formGroup.get('tags').valueChanges
.pipe(takeUntil(this._destroyed))
.subscribe(x => {
this.formChanged();
});
if (this.formGroup.get('datasetProfileDefinition')) {
this.formGroup.get('datasetProfileDefinition').valueChanges
.pipe(takeUntil(this._destroyed))
.subscribe(x => {
this.formChanged();
});
}
} }
dmpValueChanged(dmp: DmpListingModel) { dmpValueChanged(dmp: DmpListingModel) {
@ -835,7 +864,6 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr
this.isDiscarded = true; this.isDiscarded = true;
this.hasChanges = false; this.hasChanges = false;
if (this.isNew) { if (this.isNew) {
console.log(this.formGroup);
Object.keys(this.formGroup['controls']).forEach((key: string) => { Object.keys(this.formGroup['controls']).forEach((key: string) => {
if (key !== 'dmp') { if (key !== 'dmp') {
this.formGroup.get(key).reset(); this.formGroup.get(key).reset();