{
const updateDossiers = () => {
- console.log(this.all.filter(d => d.dossierId !== dossier.dossierId));
this.setEntities(this.all.filter(d => d.dossierId !== dossier.dossierId));
};
const showToast = () => {
diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts
index 7c60c66a5..4dae7a6f7 100644
--- a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts
@@ -107,7 +107,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnInit, OnD
this._setup();
});
- this.addSubscription = this.dossiersService.dossierChanged$.subscribe(() => {
+ this.addSubscription = this.dossiersService.entityChanged$.subscribe(() => {
this._setup();
});
}
diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html
index 5b097423b..c7dcdb041 100644
--- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html
@@ -30,6 +30,14 @@
{{ 'dictionary-overview.compare.compare' | translate }}
+
+
+ {{ selectDossier.dossierName | translate }}
+
+ {{ dossier.dossierName }}
+
+
+
{{ selectDossier.dossierName | translate }}
diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts
index 270dd1efe..659227060 100644
--- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts
@@ -24,6 +24,7 @@ export class DictionaryManagerComponent implements OnChanges, OnInit {
readonly iconButtonTypes = IconButtonTypes;
@Input() withFloatingActions = true;
+ @Input() filterByDossierTemplate = false;
@Input() initialEntries: List;
@Input() canEdit = false;
@Output() readonly saveDictionary = new EventEmitter();
diff --git a/apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts b/apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts
index b6fa9b25e..1a89f56a0 100644
--- a/apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts
+++ b/apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts
@@ -2,9 +2,9 @@ import { Injectable } from '@angular/core';
import { DossierAttribute, DossierAttributes, DossierAttributesControllerService, IDossierAttributeConfig } from '@redaction/red-ui-http';
import { Dossier } from '@state/model/dossier';
import { DossierAttributeWithValue } from '@models/dossier-attributes.model';
-import { AppStateService } from '@state/app-state.service';
import { Observable } from 'rxjs';
import { DossierAttributeConfig } from '@state/model/dossier-attribute-config';
+import { DossierTemplatesService } from '../../../dossier/services/dossier-templates.service';
@Injectable({
providedIn: 'root'
@@ -12,7 +12,7 @@ import { DossierAttributeConfig } from '@state/model/dossier-attribute-config';
export class DossierAttributesService {
constructor(
private readonly _dossierAttributesControllerService: DossierAttributesControllerService,
- private readonly _appStateService: AppStateService
+ private readonly _dossierTemplatesService: DossierTemplatesService
) {}
async getValues(dossier: Dossier): Promise {
@@ -31,11 +31,11 @@ export class DossierAttributesService {
return this._dossierAttributesControllerService.setDossierAttributes({ dossierAttributeList }, dossier.id).toPromise();
}
- deleteConfigs(ids: string[], dossierTemplateId = this._appStateService.activeDossierTemplateId): Promise {
+ deleteConfigs(ids: string[], dossierTemplateId = this._dossierTemplatesService.activeDossierTemplateId): Promise {
return this._dossierAttributesControllerService.deleteDossierAttributesConfig(ids, dossierTemplateId).toPromise();
}
- async getConfig(dossierTemplateId = this._appStateService.activeDossierTemplateId): Promise {
+ async getConfig(dossierTemplateId = this._dossierTemplatesService.activeDossierTemplateId): Promise {
const config$ = this._dossierAttributesControllerService.getDossierAttributesConfig(dossierTemplateId);
const result = (await config$.toPromise())?.dossierAttributeConfigs || [];
return result.map(item => new DossierAttributeConfig(item));
@@ -43,7 +43,7 @@ export class DossierAttributesService {
addOrUpdateConfig(
attribute: IDossierAttributeConfig,
- dossierTemplateId = this._appStateService.activeDossierTemplateId
+ dossierTemplateId = this._dossierTemplatesService.activeDossierTemplateId
): Observable {
return this._dossierAttributesControllerService.addOrUpdateDossierAttributesConfig(attribute, dossierTemplateId);
}
diff --git a/apps/red-ui/src/app/state/app-state.guard.ts b/apps/red-ui/src/app/state/app-state.guard.ts
index 113c461c2..5f4ba7ee7 100644
--- a/apps/red-ui/src/app/state/app-state.guard.ts
+++ b/apps/red-ui/src/app/state/app-state.guard.ts
@@ -3,6 +3,7 @@ import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router';
import { AppStateService } from './app-state.service';
import { UserService } from '@services/user.service';
import { DossiersService } from '../modules/dossier/services/dossiers.service';
+import { DossierTemplatesService } from '../modules/dossier/services/dossier-templates.service';
@Injectable({
providedIn: 'root'
@@ -11,6 +12,7 @@ export class AppStateGuard implements CanActivate {
constructor(
private readonly _appStateService: AppStateService,
private readonly _dossiersService: DossiersService,
+ private readonly _dossierTemplatesService: DossierTemplatesService,
private readonly _userService: UserService,
private readonly _router: Router
) {}
@@ -22,7 +24,7 @@ export class AppStateGuard implements CanActivate {
if (this._userService.currentUser.isUser || this._userService.currentUser.isAdmin) {
await this._userService.loadUsersIfNecessary();
- await this._appStateService.loadDossierTemplatesIfNecessary();
+ await this._dossierTemplatesService.loadAllIfEmpty();
await this._appStateService.loadDictionaryDataIfNecessary();
}
@@ -42,7 +44,7 @@ export class AppStateGuard implements CanActivate {
return false;
}
- if (dossierTemplateId && !this._appStateService.getDossierTemplateById(dossierTemplateId)) {
+ if (dossierTemplateId && !this._dossierTemplatesService.find(dossierTemplateId)) {
await this._router.navigate(['main', 'admin', 'dossier-templates']);
return false;
}
diff --git a/apps/red-ui/src/app/state/app-state.service.ts b/apps/red-ui/src/app/state/app-state.service.ts
index 9d91b6165..0b61648c2 100644
--- a/apps/red-ui/src/app/state/app-state.service.ts
+++ b/apps/red-ui/src/app/state/app-state.service.ts
@@ -1,10 +1,10 @@
import { Injectable } from '@angular/core';
import { Colors, IFile, ReanalysisControllerService } from '@redaction/red-ui-http';
-import { ActivationEnd, Event, ResolveStart, Router } from '@angular/router';
+import { ActivationEnd, Router } from '@angular/router';
import { UserService } from '@services/user.service';
import { forkJoin, Observable, of, Subject } from 'rxjs';
import { catchError, filter, first, map, tap } from 'rxjs/operators';
-import { FALLBACK_COLOR, hexToRgb } from '@utils/functions';
+import { currentComponentRoute, FALLBACK_COLOR, hexToRgb } from '@utils/functions';
import { File } from '@models/file/file';
import { Dossier } from './model/dossier';
import { TypeValue } from '@models/file/type-value';
@@ -15,26 +15,20 @@ import { FilesService } from '../modules/dossier/services/files.service';
import { DictionaryService } from '@shared/services/dictionary.service';
import { DossierTemplatesService } from '../modules/dossier/services/dossier-templates.service';
import { FileAttributesService } from '../modules/dossier/services/file-attributes.service';
-import { BaseScreenComponent } from '@components/base-screen/base-screen.component';
export interface AppState {
- dossierTemplates: DossierTemplate[];
activeFileId?: string;
- activeDossierTemplateId?: string;
activeDictionaryType?: string;
}
-const getRelatedEvents = filter(event => event instanceof ActivationEnd && event.snapshot.component !== BaseScreenComponent);
-
@Injectable({
providedIn: 'root'
})
export class AppStateService {
readonly fileChanged$ = new Subject();
readonly fileReanalysed$ = new Subject();
- readonly dossierTemplateChanged$ = new Subject();
- private _appState: AppState;
+ private _appState: AppState = {};
constructor(
private readonly _router: Router,
@@ -47,11 +41,7 @@ export class AppStateService {
private readonly _fileAttributesService: FileAttributesService,
private readonly _userPreferenceService: UserPreferenceService
) {
- this._appState = {
- dossierTemplates: []
- };
-
- _router.events.pipe(getRelatedEvents).subscribe(async (event: ActivationEnd) => {
+ _router.events.pipe(currentComponentRoute).subscribe(async (event: ActivationEnd) => {
const fileId = event.snapshot.paramMap.get('fileId');
const sameIdAsCurrentActive = fileId === this.activeFileId;
@@ -80,16 +70,8 @@ export class AppStateService {
return this._dictionaryData;
}
- get activeDossierTemplateId(): string | undefined {
- return this._appState.activeDossierTemplateId;
- }
-
- get activeDossierTemplate(): DossierTemplate | undefined {
- return this.getDossierTemplateById(this.activeDossierTemplateId);
- }
-
get dossierTemplates(): DossierTemplate[] {
- return this._appState.dossierTemplates;
+ return this._dossierTemplatesService.all;
}
get activeDictionaryType(): string | undefined {
@@ -97,11 +79,9 @@ export class AppStateService {
}
get activeDictionary(): TypeValue | undefined {
- return this.activeDossierTemplateId &&
- this.activeDictionaryType &&
- this.dictionaryData &&
- this.dictionaryData[this.activeDossierTemplateId]
- ? this.dictionaryData[this.activeDossierTemplateId][this.activeDictionaryType]
+ const activeDossierTemplateId = this._dossierTemplatesService.activeDossierTemplateId;
+ return activeDossierTemplateId && this.activeDictionaryType && this.dictionaryData && this.dictionaryData[activeDossierTemplateId]
+ ? this.dictionaryData[activeDossierTemplateId][this.activeDictionaryType]
: undefined;
}
@@ -113,10 +93,6 @@ export class AppStateService {
return this._appState.activeFileId;
}
- private static _isFileOverviewRoute(event: Event) {
- return event instanceof ResolveStart && event.url.includes('/main/dossiers/') && event.url.includes('/file/');
- }
-
async reloadActiveDossierFilesIfNecessary() {
if (this._dossiersService.activeDossier?.hasPendingOrProcessing) {
await this.reloadActiveDossierFiles();
@@ -139,13 +115,6 @@ export class AppStateService {
return color ?? this._dictionaryData[dossierTemplateId]['default'].hexColor;
}
- getDossierTemplateById(id?: string): DossierTemplate | undefined {
- if (!id) {
- return undefined;
- }
- return this.dossierTemplates.find(rs => rs.dossierTemplateId === id);
- }
-
getDictionaryTypeValue(key: string, dossierTemplateId = this._dossiersService.activeDossier.dossierTemplateId): TypeValue | undefined {
if (!dossierTemplateId) {
dossierTemplateId = this.dossierTemplates.length > 0 ? this.dossierTemplates[0].dossierTemplateId : undefined;
@@ -226,29 +195,18 @@ export class AppStateService {
await this._updateLastActiveFileForDossier(dossierId, fileId);
}
- async activateDossierTemplate(dossierTemplateId: string) {
- this._appState.activeDossierTemplateId = dossierTemplateId;
- this._appState.activeDictionaryType = null;
- if (!this.activeDossierTemplate) {
- this._appState.activeDossierTemplateId = null;
- await this._router.navigate(['/main/admin/dossier-templates']);
- }
- }
-
- async activateDictionary(dictionaryType: string, dossierTemplateId: string) {
- await this.activateDossierTemplate(dossierTemplateId);
- if (this.activeDossierTemplate) {
+ async activateDictionary(dictionaryType: string) {
+ if (this._dossierTemplatesService.activeDossierTemplate) {
this._appState.activeDictionaryType = dictionaryType;
if (!this.activeDictionary) {
this._appState.activeDictionaryType = null;
- await this._router.navigate(['/main/admin/dossier-templates/' + this.activeDossierTemplateId]);
+ await this._router.navigate([this._dossierTemplatesService.activeDossierTemplate.routerLink]);
}
}
}
reset() {
this._appState.activeFileId = null;
- this._appState.activeDossierTemplateId = null;
this._appState.activeDictionaryType = null;
}
@@ -258,33 +216,15 @@ export class AppStateService {
}
}
- async loadAllDossierTemplates() {
- const dossierTemplates = await this._dossierTemplatesService.get().toPromise();
- this._appState.dossierTemplates = dossierTemplates.map(dossierTemplate => new DossierTemplate(dossierTemplate));
- for (const dossierTemplate of this._appState.dossierTemplates) {
- await this._fileAttributesService.getFileAttributesConfig(dossierTemplate.dossierTemplateId).toPromise();
- }
- }
-
async refreshDossierTemplate(dossierTemplateId: string) {
const dossierTemplate = await this._dossierTemplatesService.get(dossierTemplateId).toPromise();
await this._fileAttributesService.getFileAttributesConfig(dossierTemplateId).toPromise();
- Object.assign(
- this._appState.dossierTemplates.find(d => d.dossierTemplateId === dossierTemplateId),
- new DossierTemplate(dossierTemplate)
- );
+ const newDossierTemplate = new DossierTemplate(dossierTemplate);
+ this._dossierTemplatesService.replace(newDossierTemplate);
await this.refreshDossierTemplateDictionaryData(dossierTemplateId);
-
- this.dossierTemplateChanged$.next(this._appState.dossierTemplates.find(d => d.dossierTemplateId === dossierTemplateId));
- }
-
- async loadDossierTemplatesIfNecessary() {
- if (!this._appState.dossierTemplates.length) {
- await this.loadAllDossierTemplates();
- }
}
async loadAllDossiersIfNecessary() {
diff --git a/apps/red-ui/src/app/utils/functions.ts b/apps/red-ui/src/app/utils/functions.ts
index 28d8757e9..9410bf00c 100644
--- a/apps/red-ui/src/app/utils/functions.ts
+++ b/apps/red-ui/src/app/utils/functions.ts
@@ -1,5 +1,12 @@
import * as moment from 'moment';
import { List } from '@iqser/common-ui';
+import { filter } from 'rxjs/operators';
+import { ActivationEnd } from '@angular/router';
+import { BaseScreenComponent } from '@components/base-screen/base-screen.component';
+
+export const currentComponentRoute = filter(
+ event => event instanceof ActivationEnd && !!event.snapshot.component && event.snapshot.component !== BaseScreenComponent
+);
export const FALLBACK_COLOR = '#CCCCCC';