Improve schema updates

apache · Oct 15, 2023 · 08c328b · 08c328b
1 parent 16dc365
commit 08c328b
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/...ect/components/adapter-configuration/schema-editor/event-schema/event-schema.component.ts b/...ect/components/adapter-configuration/schema-editor/event-schema/event-schema.component.ts
@@ -31,7 +31,6 @@ import { UUID } from 'angular2-uuid';
 import { DataTypesService } from '../../../../services/data-type.service';
 import {
     AdapterDescription,
-    EventProperty,
     EventPropertyNested,
     EventPropertyPrimitive,
     EventPropertyUnion,
@@ -89,8 +88,7 @@ export class EventSchemaComponent implements OnChanges {
     @Output()
     clickNextEmitter: EventEmitter<MatStepper> = new EventEmitter();
 
-    @ViewChild(TreeComponent, { static: true })
-    tree: TreeComponent;
+    _tree: TreeComponent;
 
     schemaGuess: GuessSchema = new GuessSchema();
     countSelected = 0;
@@ -150,13 +148,11 @@ export class EventSchemaComponent implements OnChanges {
                 this.originalSchema = guessSchema.eventSchema;
                 this.validEventSchema = this.checkIfValid(this.targetSchema);
 
-                this.refreshTree();
-
                 this.isEditable = true;
                 this.isEditableChange.emit(true);
                 this.isLoading = false;
                 this.refreshedEventSchema = true;
-
+                this.refreshTree();
                 if (
                     guessSchema.eventPreview &&
                     guessSchema.eventPreview.length > 0
@@ -181,6 +177,11 @@ export class EventSchemaComponent implements OnChanges {
             if (refreshPreview) {
                 this.updatePreview();
             }
+            setTimeout(() => {
+                if (this._tree) {
+                    this._tree.treeModel.expandAll();
+                }
+            });
         }
     }
 
@@ -346,4 +347,13 @@ export class EventSchemaComponent implements OnChanges {
         this.targetSchema.eventProperties = this.nodes;
         this.updatePreview();
     }
+
+    @ViewChild('tree')
+    set tree(treeComponent: TreeComponent) {
+        this._tree = treeComponent;
+    }
+
+    get tree(): TreeComponent {
+        return this._tree;
+    }
 }