Better handling of errors when trying to edit an API. Fixes #337

Signed-off-by: Eric Wittmann <eric.wittmann@gmail.com>
Apicurio · Jul 12, 2018 · 0cf9e4c · 0cf9e4c
1 parent 37e362f
commit 0cf9e4c
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 13 deletions.
diff --git a/front-end/studio/src/app/components/vertical-nav.component.ts b/front-end/studio/src/app/components/vertical-nav.component.ts
@@ -46,7 +46,6 @@ export class VerticalNavComponent implements OnInit {
     constructor(private router: Router) {}
 
     ngOnInit(): void {
-        console.log("Subscribing to router events.");
         this.router.events.subscribe(event => {
             if (event instanceof NavigationStart) {
                 this.onShadeClick();

diff --git a/front-end/studio/src/app/pages/apis/apis.page.ts b/front-end/studio/src/app/pages/apis/apis.page.ts
@@ -113,7 +113,6 @@ export class ApisPageComponent extends AbstractPageComponent implements OnDestro
     public loadAsyncPageData(): void {
         console.log("[ApisPageComponent] loadAsyncPageData")
         this.apis.getApis().then( apis => {
-            console.info("APIS: %O", apis);
             this.allApis = apis;
             this.filterApis();
             this.loaded("apis");

diff --git a/front-end/studio/src/app/pages/apis/import/_components/import-form.component.ts b/front-end/studio/src/app/pages/apis/import/_components/import-form.component.ts
@@ -68,7 +68,6 @@ export class ImportApiFormComponent {
             try {
                 importApi.data = Base64Utils.encode(this.model.data);
             } catch (e) {
-                console.info("***  Failed to fire IMPORT event.  ***");
                 console.error(e);
             }
         }

diff --git a/...dio/src/app/pages/apis/{apiId}/editor/_components/dialogs/security-scheme-30.component.ts b/...dio/src/app/pages/apis/{apiId}/editor/_components/dialogs/security-scheme-30.component.ts
@@ -262,11 +262,9 @@ export class SecurityScheme30DialogComponent {
      * @return
      */
     private toScopesArray(scopes: any): Scope[] {
-        console.info("toScopesArray: %o", scopes);
         let rval: Scope[] = [];
         if (scopes) {
             for (let sk in scopes) {
-                console.info("    " + sk);
                 let sd: string = scopes[sk]
                 rval.push({
                     name: sk,

diff --git a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/source-form.base.ts b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/source-form.base.ts
@@ -114,14 +114,12 @@ export abstract class SourceFormComponent<T extends OasNode> {
     }
 
     public revertSource(): void {
-        console.info("Reverting source");
         let originalSource: string;
         if (this._sourceFormat === CodeEditorMode.YAML) {
             originalSource = YAML.stringify(this.sourceJs(), 100, 4);
         } else {
             originalSource = JSON.stringify(this.sourceJs(), null, 4);
         }
-        console.info("this.source = originalSource");
         this.source = originalSource;
         this._source.dirty = false;
         this._source.value = null;

diff --git a/front-end/studio/src/app/pages/apis/{apiId}/editor/api-editor.page.ts b/front-end/studio/src/app/pages/apis/{apiId}/editor/api-editor.page.ts
@@ -147,7 +147,6 @@ export class ApiEditorPageComponent extends AbstractPageComponent implements Aft
                     });
                 },
                 onSelection: (user, selection) => {
-                    console.info("User %s selection changed to: %s", user.userName, selection);
                     this.zone.run(() => {
                         __component.updateSelection(user, selection);
                     });
@@ -180,7 +179,6 @@ export class ApiEditorPageComponent extends AbstractPageComponent implements Aft
     public ngAfterViewInit(): void {
         this._apiEditor.changes.subscribe( () => {
             if (this._apiEditor.first) {
-                console.info("Editor is available!");
                 this._pendingCommands.subscribe( commands => {
                     this.pendingCommands = [];
                     commands.forEach( command => {
@@ -205,7 +203,9 @@ export class ApiEditorPageComponent extends AbstractPageComponent implements Aft
      * Called when the page is destroyed.
      */
     public ngOnDestroy(): void {
-        this.editingSession.close();
+        if (this.editingSession) {
+            this.editingSession.close();
+        }
     }
 
     /**

diff --git a/front-end/studio/src/app/services/apis.service.ts b/front-end/studio/src/app/services/apis.service.ts
@@ -419,9 +419,8 @@ export class ApisService extends AbstractHubService {
 
                 return def;
             }).toPromise();
-        }, () => {
-            // TODO handle an error here!
-            return null;
+        }, error => {
+            return Promise.reject(error);
         });
     }