fix: gateway update side effects

ProgrammeVitam · Mar 5, 2024 · 04d8550 · 04d8550
1 parent a1d2399
commit 04d8550
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 12 deletions.
diff --git a/...mon/src/app/modules/archive/components/archive-unit-editor/archive-unit-editor.service.ts b/...mon/src/app/modules/archive/components/archive-unit-editor/archive-unit-editor.service.ts
@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core';
 import { BehaviorSubject, combineLatest } from 'rxjs';
 import { Logger } from '../../../logger/logger';
+import { Collection, Schema } from '../../../models';
 import { EditObject } from '../../../object-editor/models/edit-object.model';
 import { EditObjectService } from '../../../object-editor/services/edit-object.service';
 import { SchemaService as SchemaUtils } from '../../../object-editor/services/schema.service';
@@ -10,7 +11,7 @@ import { DisplayObjectHelperService } from '../../../object-viewer/services/disp
 import { DisplayRuleHelperService } from '../../../object-viewer/services/display-rule-helper.service';
 import { SchemaElementToDisplayRuleService } from '../../../object-viewer/services/schema-element-to-display-rule.service';
 import { DisplayObjectType, SedaVersion } from '../../../object-viewer/types';
-import { Collection, Schema, SchemaService } from '../../../schema';
+import { SchemaService } from '../../../schema';
 import { diff } from '../../../utils';
 import { ArchiveUnit } from '../../models/archive-unit';
 import { JsonPatch, JsonPatchDto } from '../../models/json-patch';

diff --git a/ui/ui-frontend-common/src/app/modules/object-editor/services/edit-object.service.ts b/ui/ui-frontend-common/src/app/modules/object-editor/services/edit-object.service.ts
@@ -5,9 +5,9 @@ import { DisplayRule } from '../../object-viewer/models';
 import { DataStructureService } from '../../object-viewer/services/data-structure.service';
 import { TypeService } from '../../object-viewer/services/type.service';
 import { ComponentType, DisplayObjectType } from '../../object-viewer/types';
-import { Schema } from '../../schema';
 import { EditObject } from '../models/edit-object.model';
 import { SchemaOptions, SchemaService } from './schema.service';
+import { Schema } from '../../models';
 
 @Injectable({
   providedIn: 'root',

diff --git a/ui/ui-frontend-common/src/app/modules/object-editor/services/schema.service.ts b/ui/ui-frontend-common/src/app/modules/object-editor/services/schema.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
+import { Collection, Schema } from '../../models';
 import { SchemaElement } from '../../object-viewer/models';
 import { SedaVersion } from '../../object-viewer/types';
-import { Collection, Schema } from '../../schema';
 import { PathService } from './path.service';
 
 export interface SchemaOptions {

diff --git a/ui/ui-frontend-common/src/app/modules/object-editor/services/template.service.ts b/ui/ui-frontend-common/src/app/modules/object-editor/services/template.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { DisplayRule } from '../../object-viewer/models';
 import { DataStructureService } from '../../object-viewer/services/data-structure.service';
 import { SchemaElementToDisplayRuleService } from '../../object-viewer/services/schema-element-to-display-rule.service';
-import { Schema } from '../../schema';
+import { Schema } from '../../models';
 
 @Injectable({ providedIn: 'root' })
 export class TemplateService {

diff --git a/ui/ui-frontend-common/src/app/modules/object-viewer/models/schema-element.model.ts b/ui/ui-frontend-common/src/app/modules/object-viewer/models/schema-element.model.ts
@@ -34,7 +34,7 @@
  * The fact that you are presently reading this means that you have had
  * knowledge of the CeCILL-C license and that you accept its terms.
  */
-import { Collection } from '../../schema';
+import { Collection } from '../../models';
 import { Cardinality, SedaVersion } from '../types';
 import { WithPath } from './with-path.model';
 

diff --git a/ui/ui-frontend-common/src/app/modules/vitamui-common.module.ts b/ui/ui-frontend-common/src/app/modules/vitamui-common.module.ts
@@ -148,6 +148,7 @@ export function startupServiceFactory(startupService: StartupService, authServic
     AccountModule,
     ApplicationCardModule,
     ApplicationSelectContentModule,
+    ArchiveModule,
     AutocompletePositionDirectiveModule,
     CancelledSnackBarModule,
     CollapseDirectiveModule,
@@ -216,6 +217,7 @@ export function startupServiceFactory(startupService: StartupService, authServic
     AccountModule,
     ApplicationCardModule,
     ApplicationSelectContentModule,
+    ArchiveModule,
     AutocompletePositionDirectiveModule,
     BlankComponent,
     CollapseDirectiveModule,

diff --git a/ui/ui-frontend/package-lock.json b/ui/ui-frontend/package-lock.json
diff --git a/...ve/archive-preview/archive-unit-description-tab/archive-unit-description-tab.component.ts b/...ve/archive-preview/archive-unit-description-tab/archive-unit-description-tab.component.ts
@@ -54,11 +54,11 @@ export class ArchiveUnitDescriptionTabComponent implements OnInit, AfterViewInit
   }
 
   ngAfterViewInit(): void {
-    this.subscriptions.add(
-      this.archiveUnitEditor.editObject$.subscribe((editObject) => {
-        this.editObject = editObject;
-      }),
-    );
+    const subscription = this.archiveUnitEditor?.editObject$.subscribe((editObject) => {
+      this.editObject = editObject;
+    });
+
+    if (subscription) this.subscriptions.add(subscription);
   }
 
   ngOnDestroy(): void {