Remove multiple documents support

Author: stavshamir

src/app/channels/channel-main/channel-main.component.ts

@@ -5,7 +5,6 @@ import { Schema } from 'src/app/shared/models/schema.model';
 import { PublisherService } from 'src/app/shared/publisher.service';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { Operation } from 'src/app/shared/models/channel.model';
-import { Subscription } from 'rxjs';
 import { STATUS } from 'angular-in-memory-web-api';
 
 @Component({
@@ -39,7 +38,7 @@ export class ChannelMainComponent implements OnInit {
   ngOnInit(): void {
     this.asyncApiService.getAsyncApis().subscribe(
       asyncapi => {
-        let schemas: Map<string, Schema> = asyncapi.get(this.docName).components.schemas;
+        let schemas: Map<string, Schema> = asyncapi.components.schemas;
         this.schemaName = this.operation.message.payload.$ref.slice(this.operation.message.payload.$ref.lastIndexOf('/') + 1)
         this.schema = schemas[this.schemaName];
 

src/app/channels/channels.component.ts

@@ -1,9 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { AsyncApiService } from '../shared/asyncapi.service';
 import { Channel } from '../shared/models/channel.model';
-import { subscribeOn } from 'rxjs/operators';
-import { Subscription } from 'rxjs';
-import {Location} from "@angular/common";
+import { Location } from "@angular/common";
 
 @Component({
   selector: 'app-channels',
@@ -15,31 +13,27 @@ export class ChannelsComponent implements OnInit {
 
   channels: Channel[];
   selectedChannel: string;
-  nameSubscription: Subscription;
   docName: string;
 
   constructor(private asyncApiService: AsyncApiService, private location: Location) {
     this.setChannelSelectionFromLocation()
   }
 
   ngOnInit(): void {
-    this.location.subscribe(() : void => this.setChannelSelectionFromLocation())
+    this.location.subscribe((): void => this.setChannelSelectionFromLocation())
 
-    this.nameSubscription = this.asyncApiService.getCurrentAsyncApiName().subscribe(name => {
-      this.docName = name;
-      this.asyncApiService.getAsyncApis().subscribe(asyncapi => {
-        this.channels = this.sortChannels(asyncapi.get(name).channels);
-      });
+    this.asyncApiService.getAsyncApis().subscribe(asyncapi => {
+      this.channels = this.sortChannels(asyncapi.channels);
     });
   }
 
   private sortChannels(channels: Array<Channel>): Array<Channel> {
-    return channels.sort((a,b) => {
-      if(a?.operation?.protocol === b?.operation?.protocol) {
-        if(a?.operation?.operation === b?.operation.operation) {
+    return channels.sort((a, b) => {
+      if (a?.operation?.protocol === b?.operation?.protocol) {
+        if (a?.operation?.operation === b?.operation.operation) {
           return a.name?.localeCompare(b.name);
         } else {
-          return a?.operation?.operation?.localeCompare(b?.operation?.operation); 
+          return a?.operation?.operation?.localeCompare(b?.operation?.operation);
         }
       } else {
         return a?.operation?.protocol?.localeCompare(b?.operation?.protocol);
@@ -52,7 +46,7 @@ export class ChannelsComponent implements OnInit {
   }
   setChannelSelectionFromLocation(): void {
     const anchor = window.location.hash.substr(1);
-    if(anchor.startsWith(ChannelsComponent.CHANNEL_ANCHOR_PREFIX)) {
+    if (anchor.startsWith(ChannelsComponent.CHANNEL_ANCHOR_PREFIX)) {
       this.selectedChannel = anchor;
     }
   }

src/app/header/header.component.html

@@ -1,12 +1,6 @@
 <mat-toolbar color="primary" fxLayout fxLayoutAlign="space-between center">
-    <div fxLayout fxLayoutAlign="center center" fxLayoutGap="16px">
-        <h2>springwolf</h2>
-        <select [(ngModel)]="selectedDocumentMod">
-            <option disabled>Choose a doc</option>
-            <option *ngFor="let doc of documents" [ngValue]="doc">{{ doc }}</option>
-        </select>
-    </div>
+    <h2>springwolf</h2>
     <a href="https://github.com/stavshamir/springwolf">
         <i class="fa fa-github fa-2x"></i>
     </a>
-</mat-toolbar>
+</mat-toolbar>

src/app/header/header.component.ts

@@ -1,41 +1,9 @@
-import { Component, OnInit } from '@angular/core';
-import { AsyncApiService } from 'src/app/shared/asyncapi.service';
+import { Component } from '@angular/core';
 
 @Component({
   selector: 'app-header',
   templateUrl: './header.component.html',
   styleUrls: ['./header.component.css']
 })
-export class HeaderComponent implements OnInit {
-  private static URL_SEARCH_DOCUMENT_PARAM = "document"
-
-  documents: string[];
-  selectedDocument: string;
-  location: Location;
-
-  constructor(private asyncApiService: AsyncApiService) {
-    this.location = window.location
-    this.selectedDocument = new URLSearchParams(window.location.search).get(HeaderComponent.URL_SEARCH_DOCUMENT_PARAM)
-  }
-
-  ngOnInit(): void {
-    this.asyncApiService.getAsyncApis().subscribe(docsMap => {
-      this.documents = [...docsMap.keys()];
-      if(!this.documents.includes(this.selectedDocument)) {
-        this.selectedDocument = this.documents[0]
-      }
-      this.asyncApiService.setCurrentAsyncApiName(this.selectedDocument);
-    });
-  }
-
-  get selectedDocumentMod() {
-    return this.selectedDocument;
-  }
-
-  set selectedDocumentMod(value) {
-    let updatedSearchParams = new URLSearchParams(window.location.search)
-    updatedSearchParams.set(HeaderComponent.URL_SEARCH_DOCUMENT_PARAM, value)
-    this.location.search = updatedSearchParams.toString()
-  }
-
+export class HeaderComponent {
 }

src/app/info/info.component.ts

@@ -2,7 +2,6 @@ import { Component, OnInit } from '@angular/core';
 import { AsyncApi } from '../shared/models/asyncapi.model';
 import { Info } from '../shared/models/info.model';
 import { AsyncApiService } from '../shared/asyncapi.service';
-import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-info',
@@ -13,16 +12,13 @@ export class InfoComponent implements OnInit {
 
   asyncApiData: AsyncApi;
   info: Info;
-  nameSubscription: Subscription;
 
   constructor(private asyncApiService: AsyncApiService) { }
 
   ngOnInit(): void {
-    this.nameSubscription = this.asyncApiService.getCurrentAsyncApiName().subscribe(name => {
-      this.asyncApiService.getAsyncApis().subscribe(asyncapi => {
-        this.asyncApiData = asyncapi.get(name);
-        this.info = asyncapi.get(name).info;
-      });
+    this.asyncApiService.getAsyncApis().subscribe(asyncapi => {
+      this.asyncApiData = asyncapi;
+      this.info = asyncapi.info;
     });
   }
 

src/app/schemas/schemas.component.ts

@@ -1,6 +1,5 @@
 import { Component, OnInit } from '@angular/core';
 import { Location } from '@angular/common';
-import { Subscription, SubscriptionLike } from 'rxjs';
 import { AsyncApiService } from '../shared/asyncapi.service';
 import { Schema } from '../shared/models/schema.model';
 
@@ -14,18 +13,14 @@ export class SchemasComponent implements OnInit {
 
   schemas: Map<string, Schema>;
   selectedSchema: string;
-  nameSubscription: Subscription;
 
   constructor(private asyncApiService: AsyncApiService, private location: Location) {
     this.setSchemaSelectionFromLocation()
   }
 
   ngOnInit(): void {
     this.location.subscribe(() : void => this.setSchemaSelectionFromLocation())
-
-    this.nameSubscription = this.asyncApiService.getCurrentAsyncApiName().subscribe(name => {
-      this.asyncApiService.getAsyncApis().subscribe(asyncapi => this.schemas = asyncapi.get(name).components.schemas);
-    });
+      this.asyncApiService.getAsyncApis().subscribe(asyncapi => this.schemas = asyncapi.components.schemas);
   }
 
   setSchemaSelection(schema: string): void {

src/app/servers/servers.component.ts

@@ -1,6 +1,4 @@
 import { Component, OnInit } from '@angular/core';
-import { forkJoin, Subscription, zip } from 'rxjs';
-import { mergeMap } from 'rxjs/operators';
 import { AsyncApiService } from '../shared/asyncapi.service';
 import { Server } from '../shared/models/server.model';
 
@@ -12,14 +10,11 @@ import { Server } from '../shared/models/server.model';
 export class ServersComponent implements OnInit {
 
   servers: Map<String, Server>;
-  nameSubscription: Subscription;
 
   constructor(private asyncApiService: AsyncApiService) { }
 
   ngOnInit(): void {
-    this.nameSubscription = this.asyncApiService.getCurrentAsyncApiName().subscribe(name => {
-      this.asyncApiService.getAsyncApis().subscribe(asyncapi => this.servers = asyncapi.get(name).servers );
-    });
+      this.asyncApiService.getAsyncApis().subscribe(asyncapi => this.servers = asyncapi.servers );
   }
 
 }

src/app/shared/asyncapi.service.ts

@@ -4,7 +4,7 @@ import { Channel, Message, Operation } from './models/channel.model';
 import { Schema } from './models/schema.model';
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Observable, of, Subject } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { Info } from './models/info.model';
 import { Endpoints } from './endpoints';
@@ -39,39 +39,23 @@ interface ServerAsyncApi {
 @Injectable()
 export class AsyncApiService {
 
-    private nameSubject: Subject<string>;
-    private docs: Map<string, AsyncApi>;
+    private docs: AsyncApi;
 
     constructor(private http: HttpClient) {
-        this.nameSubject = new Subject<string>();
     }
 
-    public setCurrentAsyncApiName(currnetAsyncApiName: string) {
-        this.nameSubject.next(currnetAsyncApiName);
-    }
-
-    public getCurrentAsyncApiName(): Observable<string> {
-        return this.nameSubject.asObservable();
-    }
-
-    public getAsyncApis(): Observable<Map<string, AsyncApi>> {
+    public getAsyncApis(): Observable<AsyncApi> {
         if (this.docs) {
             return of(this.docs);
         }
 
-        return this.http.get<Map<string, ServerAsyncApi>>(Endpoints.docs).pipe(map(item => {
-            this.docs = this.toAsyncApiMap(item);
+        return this.http.get<ServerAsyncApi>(Endpoints.docs).pipe(map(item => {
+            this.docs = this.toAsyncApi(item);
             return this.docs;
         }));
     }
 
-    toAsyncApiMap(response: Map<string, ServerAsyncApi>): Map<string, AsyncApi> {
-        const docs = new Map<string, AsyncApi>();
-        Object.entries(response).forEach(([docName, doc]) => docs.set(docName, this.toAsyncApi(doc)));
-        return docs;
-    }
-
-    toAsyncApi(item: ServerAsyncApi): AsyncApi {
+    private toAsyncApi(item: ServerAsyncApi): AsyncApi {
         return {
             info: item.info,
             servers: this.mapServers(item.servers),
@@ -104,9 +88,8 @@ export class AsyncApiService {
         topicName: string,
         description: ServerAsyncApi["channels"][""]["description"],
         operation: ServerAsyncApi["channels"][""]["subscribe"] | ServerAsyncApi["channels"][""]["publish"],
-        operationName: string): Channel[]
-    {
-        if(operation !== undefined) {
+        operationName: string): Channel[] {
+        if (operation !== undefined) {
             let messages: Message[] = 'oneOf' in operation.message ? operation.message.oneOf : [operation.message];
 
             return messages.map(message => {

src/app/shared/mock/mock-server.ts

@@ -20,7 +20,7 @@ export class MockServer implements InMemoryDbService {
       return reqInfo.utils.createResponse$(() => {
         return {
           status: STATUS.OK,
-          body: mockAsyncApi
+          body: mockSpringwolfKafka
         }
       });
     }