Staging

bin/deploy.js

@@ -100,6 +100,14 @@ async function main() {
         default: true,
       },
     ]);
+    await inquirer.prompt([
+      {
+        type: 'confirm',
+        name: 'checkDocsUpdated',
+        message: 'Check that docs have been updated',
+        default: true,
+      },
+    ]);
     log('C\'est fini! 🎉');
 
   } catch (error) {

chrome-ext-files/manifest.json

@@ -3,7 +3,7 @@
   "name": "Altair GraphQL Client",
   "short_name": "Altair",
   "description": "The only graphQL client you'll ever need.",
-  "version": "4.0.7",
+  "version": "4.0.9",
   "icons": {
     "16": "assets/img/altair_logo_128.png",
     "48": "assets/img/altair_logo_128.png",

cwex.yml

@@ -10,7 +10,7 @@ manifestOptions:
   name: Altair GraphQL Client
   short_name: Altair
   description: A beautiful feature-rich GraphQL client for all platforms
-  version: 4.0.7
+  version: 4.0.9
   icons:
     16: assets/img/altair_logo_128.png
     48: assets/img/altair_logo_128.png

lerna.json

@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "4.0.7",
+  "version": "4.0.9",
   "registry": "https://registry.npmjs.org/",
   "npmClient": "yarn",
   "stream": true

package.json

@@ -1,6 +1,6 @@
 {
   "name": "altair",
-  "version": "4.0.7",
+  "version": "4.0.9",
   "license": "MIT",
   "author": "Samuel Imolorhe <altair@sirmuel.design> (https://sirmuel.design/)",
   "description": "The best graphQL client you will ever need",

packages/altair-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "altair-app",
-  "version": "4.0.7",
+  "version": "4.0.9",
   "description": "Contains the altair app",
   "main": "dist/main.js",
   "license": "MIT",
@@ -51,7 +51,7 @@
     "@webcomponents/custom-elements": "^1.4.1",
     "abab": "^2.0.5",
     "actioncable": "^5.2.4-4",
-    "altair-graphql-core": "^4.0.7",
+    "altair-graphql-core": "^4.0.9",
     "angular-feather": "^6.0.10",
     "apollo-cache-inmemory": "^1.6.6",
     "apollo-link": "^1.2.14",
@@ -73,7 +73,7 @@
     "file-dialog": "^0.0.8",
     "file-saver": "^2.0.2",
     "fuse.js": "^6.4.6",
-    "graphql": "15.0.0",
+    "graphql": "^15.5.1",
     "graphql-query-compress": "^1.2.2",
     "graphql-ws": "^4.4.1",
     "lodash-es": "^4.17.21",
@@ -94,6 +94,7 @@
     "ngx-popper": "^7.0.0",
     "ngx-sortablejs": "^11.1.0",
     "ngx-take-until-destroy": "^5.4.0",
+    "ngx-toastr": "^14.1.0",
     "object-path": "^0.11.5",
     "popper.js": "^1.15.0",
     "prettier": "^1.18.2",

packages/altair-app/src/app/modules/altair/altair.module.ts

@@ -7,6 +7,7 @@ import { HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common
 import { Store, StoreModule } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
+import { ToastrModule } from 'ngx-toastr';
 
 import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
@@ -152,6 +153,15 @@ const providers = [
         deps: [ HttpClient ]
       }
     }),
+    ToastrModule.forRoot({
+      newestOnTop: false,
+      closeButton: true,
+      positionClass: 'toast-top-center',
+      enableHtml: true,
+      countDuplicates: true,
+      preventDuplicates: true,
+      resetTimeoutOnDuplicate: true,
+    }),
   ],
   providers: providers,
   bootstrap: [ AppComponent ],

packages/altair-app/src/app/modules/altair/components/settings-dialog/settings-dialog.component.spec.ts

@@ -14,6 +14,7 @@ import { SharedModule } from '../../modules/shared/shared.module';
 import { SchemaFormModule } from '../schema-form/schema-form.module';
 import { HttpClientModule } from '@angular/common/http';
 import { AltairConfig } from 'altair-graphql-core/build/config';
+import { MockProviders } from 'ng-mocks';
 
 describe('SettingsDialogComponent', () => {
   let component: SettingsDialogComponent;
@@ -32,7 +33,7 @@ describe('SettingsDialogComponent', () => {
         SchemaFormModule,
       ],
       providers: [
-        NotifyService,
+        MockProviders(NotifyService),
         KeybinderService,
         WindowService,
         DbService,

packages/altair-app/src/app/modules/altair/services/electron-app/electron-app.service.spec.ts

@@ -7,6 +7,7 @@ import { NgxElectronModule } from 'ngx-electron';
 import { empty as observableEmpty } from 'rxjs';
 import { GqlService } from '../gql/gql.service';
 import { HttpClientModule } from '@angular/common/http';
+import { MockProvider } from 'ng-mocks';
 
 describe('ElectronAppService', () => {
   beforeEach(() => {
@@ -19,7 +20,7 @@ describe('ElectronAppService', () => {
         ElectronAppService,
         WindowService,
         DbService,
-        NotifyService,
+        MockProvider(NotifyService),
         GqlService,
         {
           provide: Store, useValue: {

packages/altair-app/src/app/modules/altair/services/keybinder/keybinder.service.spec.ts

@@ -10,6 +10,7 @@ import { ElectronService } from 'ngx-electron';
 import { NotifyService } from '../notify/notify.service';
 import { GqlService } from '../gql/gql.service';
 import { HttpClientModule } from '@angular/common/http';
+import { MockProvider } from 'ng-mocks';
 
 describe('KeybinderService', () => {
   beforeEach(() => {
@@ -23,7 +24,7 @@ describe('KeybinderService', () => {
         DbService,
         ElectronAppService,
         ElectronService,
-        NotifyService,
+        MockProvider(NotifyService),
         GqlService,
         {
           provide: Store, useValue: {

packages/altair-app/src/app/modules/altair/services/notify/notify.service.spec.ts

@@ -1,22 +1,23 @@
 import { TestBed, inject } from '@angular/core/testing';
 import { HotToastService } from '@ngneat/hot-toast';
+import { ToastrService } from 'ngx-toastr';
 
 import { NotifyService } from './notify.service';
 import { Store } from '@ngrx/store';
 import { of } from 'rxjs';
 import { anyFn, mock } from '../../../../../testing';
 import { RootState } from 'altair-graphql-core/build/types/state/state.interfaces';
 
-let mockHotToastService: HotToastService;
+let mockToastService: ToastrService;
 let mockStore: Store<RootState>;
 
 describe('NotifyService', () => {
   beforeEach(() => {
-    mockHotToastService = mock<HotToastService>({
+    mockToastService = mock<ToastrService>({
       success: anyFn(),
       error: anyFn(),
       warning: anyFn(),
-      show: anyFn(),
+      info: anyFn(),
     });
     mockStore = mock();
     TestBed.configureTestingModule({
@@ -27,8 +28,8 @@ describe('NotifyService', () => {
           useFactory: () => mockStore,
         },
         {
-          provide: HotToastService,
-          useFactory: () => mockHotToastService,
+          provide: ToastrService,
+          useFactory: () => mockToastService,
         },
       ]
     });
@@ -40,14 +41,14 @@ describe('NotifyService', () => {
 
   describe('.success', () => {
     it('should call .exec with passed options', inject([NotifyService], (service: NotifyService) => {
-      service.success('message', 'title', { data: {} });
+      service.success('message', 'title', { data: 'x' });
 
-      expect(mockHotToastService.success).toHaveBeenCalledWith(
+      expect(mockToastService.success).toHaveBeenCalledWith(
         'message',
-        {
-          autoClose: true,
-          id: 'message',
-        }
+        'title',
+        ({
+          data: 'x'
+        }) as any
       );
     }));
   });
@@ -63,14 +64,14 @@ describe('NotifyService', () => {
         }
       };
       mockStore.select = (predicate: any) => of(predicate(state));
-      service.warning('message', 'title', { data: {} });
+      service.warning('message', 'title', { data: 'x' });
 
-      expect(mockHotToastService.warning).toHaveBeenCalledWith(
+      expect(mockToastService.warning).toHaveBeenCalledWith(
         'message',
-        {
-          autoClose: true,
-          id: 'message',
-        }
+        'title',
+        ({
+          data: 'x'
+        }) as any
       );
     }));
 
@@ -84,36 +85,36 @@ describe('NotifyService', () => {
         }
       };
       mockStore.select = (predicate: any) => of(predicate(state));
-      service.warning('message', 'title', { data: {} });
+      service.warning('message', 'title', { data: 'x' });
 
-      expect(mockHotToastService.warning).not.toHaveBeenCalled();
+      expect(mockToastService.warning).not.toHaveBeenCalled();
     }));
   });
 
   describe('.info', () => {
     it('should call .exec with passed options', inject([NotifyService], (service: NotifyService) => {
-      service.info('message', 'title', { data: {} });
+      service.info('message', 'title', { data: 'x' });
 
-      expect(mockHotToastService.show).toHaveBeenCalledWith(
+      expect(mockToastService.info).toHaveBeenCalledWith(
         'message',
-        {
-          autoClose: true,
-          id: 'message',
-        }
+        'title',
+        ({
+          data: 'x'
+        }) as any
       );
     }));
   });
 
   describe('.error', () => {
     it('should call .exec with passed options', inject([NotifyService], (service: NotifyService) => {
-      service.error('message', 'title', { data: {} });
+      service.error('message', 'title', { data: 'x' });
 
-      expect(mockHotToastService.error).toHaveBeenCalledWith(
+      expect(mockToastService.error).toHaveBeenCalledWith(
         'message',
-        {
-          autoClose: true,
-          id: 'message',
-        }
+        'title',
+        ({
+          data: 'x'
+        }) as any
       );
     }));
   });

packages/altair-app/src/app/modules/altair/services/notify/notify.service.ts

@@ -1,27 +1,22 @@
 import { Injectable } from '@angular/core';
 import { HotToastService } from '@ngneat/hot-toast';
+import { ToastrService, ActiveToast, IndividualConfig } from 'ngx-toastr';
 import { isExtension } from '../../utils';
 import { Store } from '@ngrx/store';
 import * as fromRoot from '../../store';
 import { IDictionary } from '../../interfaces/shared';
 import { first } from 'rxjs/operators';
 import { RootState } from 'altair-graphql-core/build/types/state/state.interfaces';
 
-interface NotifyOptions {
-  data?: {
-    url?: string,
-  },
-  disableTimeOut?: boolean;
-};
-
-type NotifyType = 'success' | 'error' | 'warning' | 'show';
+type NotifyOptions = Partial<IndividualConfig & { data: any }>;
+type NotifyType = 'success' | 'error' | 'warning' | 'info';
 @Injectable()
 export class NotifyService {
 
   extensionNotifications: IDictionary = {};
 
   constructor(
-    private toast: HotToastService,
+    private toast: ToastrService,
     private store: Store<RootState>
   ) {
     this.manageExtensionNotifications();
@@ -43,29 +38,29 @@ export class NotifyService {
     });
   }
   info(message: string, title = '', opts: NotifyOptions = {}) {
-    this.exec('show', message, title, opts);
+    this.exec('info', message, title, opts);
   }
   exec(type: NotifyType, message: string, title: string, opts: NotifyOptions = {}) {
-    let toastContent = message;
-
-    if (title) {
-      toastContent = `<div><b>${title}</b></div>${toastContent}`;
+    const toast: ActiveToast<any> = this.toast[type](message, title, opts);
+    if (opts.data && opts.data.url) {
+      toast.onTap.subscribe(_toast => {
+        window.open(opts.data.url, '_blank');
+      })
     }
+    return toast;
+    // let toastContent = message;
 
-    if (opts.data?.url) {
-      toastContent = `${toastContent}<a href="${opts.data.url}" target="_blank">Link</a>`;
-    }
-    return this.toast[type](message, {
-      id: message,
-      autoClose: !opts.disableTimeOut,
-    })
-    // const toast: ActiveToast<any> = this.toastr[type](message, title, opts);
-    // if (opts.data && opts.data.url) {
-    //   toast.onTap.subscribe(_toast => {
-    //     window.open(opts.data.url, '_blank');
-    //   })
+    // if (title) {
+    //   toastContent = `<div><b>${title}</b></div>${toastContent}`;
+    // }
+
+    // if (opts.data?.url) {
+    //   toastContent = `${toastContent}<a href="${opts.data.url}" target="_blank">Link</a>`;
     // }
-    // return toast;
+    // return this.toast[type](message, {
+    //   id: message,
+    //   autoClose: !opts.disableTimeOut,
+    // })
   }
 
   pushNotify(message: string, title = 'Altair', opts: any = {}) {

packages/altair-app/src/app/modules/altair/services/window.service.spec.ts

@@ -9,6 +9,7 @@ import { WindowService } from './window.service';
 import { GqlService } from './gql/gql.service';
 import { HttpClientModule } from '@angular/common/http';
 import { NotifyService } from './notify/notify.service';
+import { MockProvider } from 'ng-mocks';
 
 describe('WindowService', () => {
   beforeEach(() => {
@@ -19,7 +20,7 @@ describe('WindowService', () => {
       providers: [
         WindowService,
         GqlService,
-        NotifyService,
+        MockProvider(NotifyService),
         services.DbService,
         { provide: Store, useValue: {
           subscribe: () => {},