nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1221: Fix for key not showing after copy of classification

This commit is contained in:
Tristan Eisermann 2020-06-24 16:50:24 +02:00 committed by Mustapha Zorgati
parent d07b11953d
commit 6f225ebc28
1 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
web/src/app/administration/components/classification-details/classification-details.component.ts
View File

@ -1,6 +1,6 @@
import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
import { Select, Store } from '@ngxs/store';
import { Observable, Subject, zip } from 'rxjs';
import { Observable, Subject, zip, combineLatest } from 'rxjs';
import { ClassificationDefinition, customFieldCount } from 'app/shared/models/classification-definition';
import { ACTION } from 'app/shared/models/action';
@ -28,7 +28,7 @@ import { ClassificationCategoryImages,
import { CreateClassification,
RemoveSelectedClassification,
RestoreSelectedClassification,
SaveClassification,
SaveClassification, SelectClassification,
SetActiveAction } from '../../../shared/store/classification-store/classification.actions';
@Component({
@ -73,9 +73,25 @@ export class ClassificationDetailsComponent implements OnInit, OnDestroy {
map(customisation => customisation.information),
getCustomFields(customFieldCount)
);
this.selectedClassification$.pipe(takeUntil(this.destroy$)).subscribe(data => {
this.fillClassificationInformation(data);
});
combineLatest(this.selectedClassification$, this.action$).pipe(takeUntil(this.destroy$))
.subscribe(([classification, action]) => {
this.action = action;
if (this.action === ACTION.CREATE) {
this.selectedClassification$.pipe(take(1)).subscribe(initialClassification => {
this.classification = { ...initialClassification };
});
this.badgeMessage = 'Creating new classification';
} else if (this.action === ACTION.COPY) {
this.badgeMessage = `Copying Classification: ${this.classification.name}`;
this.classification = { ...classification };
this.classification.key = null;
} else {
this.badgeMessage = '';
this.classification = { ...classification };
}
});
this.action$.pipe(takeUntil(this.destroy$)).subscribe(data => {
this.action = data;
if (this.action === ACTION.CREATE) {
@ -91,9 +107,7 @@ export class ClassificationDetailsComponent implements OnInit, OnDestroy {
});
this.importExportService.getImportingFinished().pipe(takeUntil(this.destroy$)).subscribe(() => {
if (this.classification.classificationId) {
this.selectClassification(this.classification.classificationId);
}
this.store.dispatch(new SelectClassification(this.classification.classificationId));
});
}
@ -199,26 +213,6 @@ export class ClassificationDetailsComponent implements OnInit, OnDestroy {
this.classificationsService.triggerClassificationSaved();
}
private async selectClassification(id: string) {
if (!this.classificationIsAlreadySelected()) {
this.requestInProgress = true;
const classification = await this.classificationsService.getClassification(id).toPromise();
this.fillClassificationInformation(classification);
this.requestInProgress = false;
}
}
private classificationIsAlreadySelected(): boolean {
return this.action === ACTION.CREATE && !!this.classification;
}
private fillClassificationInformation(classificationSelected: ClassificationDefinition) {
this.classification = { ...classificationSelected };
if (this.action === ACTION.COPY) {
this.classification.key = null;
}
}
private removeClassificationConfirmation() {
if (!this.classification || !this.classification.classificationId) {
this.notificationsService.triggerError(NOTIFICATION_TYPES.SELECT_ERR);