Merge branch 'staging' into l10n_staging

altair-graphql · Nov 10, 2019 · 9ac83d3 · 9ac83d3
2 parents 91d1662 + 7fe65c2
commit 9ac83d3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/app/effects/query.ts b/src/app/effects/query.ts
@@ -266,6 +266,9 @@ export class QueryEffects {
           if (schema) {
             this.gqlService.getSDL(schema).then(sdl => {
               return this.store.dispatch(new gqlSchemaActions.SetSchemaSDLAction(action.windowId, { sdl }))
+            })
+            .catch(err => {
+              this.notifyService.error('Could not set schema SDL');
             });
           }
 
@@ -638,6 +641,9 @@ export class QueryEffects {
                 downloadData(sdl, 'sdl', { fileType: 'gql' });
               }
             })
+            .catch(err => {
+              this.notifyService.error('Could not export SDL. Your schema might be invalid.');
+            });
           }
           return observableEmpty();
         }),

diff --git a/src/app/services/window.service.spec.ts b/src/app/services/window.service.spec.ts
@@ -6,12 +6,14 @@ import { StoreModule, Store } from '@ngrx/store';
 
 import * as services from '../services';
 import { WindowService } from './window.service';
+import { GqlService } from './gql/gql.service';
 
 describe('WindowService', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       providers: [
         WindowService,
+        GqlService,
         services.DbService,
         { provide: Store, useValue: {
           subscribe: () => {},