Rename service source data signal

ndsev · Aug 16, 2024 · f8de129 · f8de129
1 parent 456921f
commit f8de129
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/erdblick_app/app/feature.panel.component.ts b/erdblick_app/app/feature.panel.component.ts
@@ -184,13 +184,12 @@ export class FeaturePanelComponent implements OnInit  {
     filterByValues = true;
     filterOnlyFeatureIds = false;
     filterGeometryEntries = false;
+    jsonTree = "";
 
     @ViewChild('inspectionMenu') inspectionMenu!: Menu;
     inspectionMenuItems: MenuItem[] | undefined;
     inspectionMenuVisible: boolean = false;
 
-    @Input() jsonTree = "";
-
     constructor(private clipboardService: ClipboardService,
                 public inspectionService: InspectionService,
                 public jumpService: JumpTargetService,
@@ -336,7 +335,7 @@ export class FeaturePanelComponent implements OnInit  {
         const address = sourceDataRef.address;
         const mapId = this.inspectionService.selectedMapIdName;
 
-        this.inspectionService.sourceData.next({
+        this.inspectionService.selectedSourceData.next({
             tileId: Number(tileId),
             layerId: String(layerId),
             mapId: String(mapId),

diff --git a/erdblick_app/app/inspection.panel.component.ts b/erdblick_app/app/inspection.panel.component.ts
@@ -64,9 +64,14 @@ export class InspectionPanelComponent implements OnInit
 
         this.inspectionService.featureTree.pipe(distinctUntilChanged()).subscribe((tree: string) => {
             this.reset();
+
+            // TODO: Create a new FeaturePanelComponent instance for each unique selected feature
+            //       then we can get rid of all the service's View Component logic/functions.
+            //       reset() Would then completely clear the tabs.
+            this.tabs[0].title = this.inspectionService.selectedFeatureIdName;
         });
 
-        this.inspectionService.sourceData.pipe(distinctUntilChanged()).subscribe(data => {
+        this.inspectionService.selectedSourceData.pipe(distinctUntilChanged()).subscribe(data => {
             this.reset();
             this.pushSourceDataInspector(data);
         })
@@ -82,7 +87,7 @@ export class InspectionPanelComponent implements OnInit
 
     pushFeatureInspector() {
         let tab = {
-            title: "Feature",
+            title: "",
             icon: "pi-sitemap",
             component: FeaturePanelComponent,
         }

diff --git a/erdblick_app/app/inspection.service.ts b/erdblick_app/app/inspection.service.ts
@@ -39,7 +39,7 @@ export class InspectionService {
     selectedFeatureIdName: string = "";
     selectedMapIdName: string = "";
     selectedFeature: FeatureWrapper | null = null;
-    sourceData: ReplaySubject<SelectedSourceData> = new ReplaySubject<SelectedSourceData>();
+    selectedSourceData: ReplaySubject<SelectedSourceData> = new ReplaySubject<SelectedSourceData>();
 
     constructor(private mapService: MapService,
                 private jumpService: JumpTargetService,