Moved actions and reducers together under store

packages/altair-app/package.json

@@ -19,7 +19,7 @@
     "lint": "ng lint",
     "e2e": "ng e2e",
     "e2e:ci": "ng e2e --webdriver-update=false",
-    "generate-settings-schema": "typescript-json-schema --ignoreErrors src/app/reducers/settings/settings.ts State > src/app/utils/settings.schema.json",
+    "generate-settings-schema": "typescript-json-schema --ignoreErrors src/app/store/settings/settings.reducer.ts State > src/app/utils/settings.schema.json",
     "compile-settings-schema-validator": "ajv compile -s src/app/utils/settings.schema.json -o src/app/utils/validate_settings_schema.js",
     "generate-settings-schema-validator": "npm run generate-settings-schema && npm run compile-settings-schema-validator",
     "analyze": "ng build --stats-json && npx webpack-bundle-analyzer dist/stats.json",

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

@@ -17,7 +17,7 @@ import { SortablejsModule } from 'ngx-sortablejs';
 import { CookieService } from 'ngx-cookie-service';
 import { SharedModule } from './modules/shared/shared.module';
 
-import { metaReducers, reducerToken } from './reducers';
+import { metaReducers, reducerToken } from './store';
 
 import { QueryEffects } from './effects/query';
 import { WindowsEffects } from './effects/windows';

packages/altair-app/src/app/components/doc-viewer/doc-viewer/doc-viewer.component.ts

@@ -17,7 +17,7 @@ import { from } from 'rxjs';
 import { AltairConfig } from '../../../config';
 import { debug } from 'app/utils/logger';
 import { DomSanitizer } from '@angular/platform-browser';
-import * as fromDocs from '../../../reducers/docs/docs';
+import * as fromDocs from '../../../store/docs/docs.reducer';
 
 import { untilDestroyed } from 'ngx-take-until-destroy';
 import {

packages/altair-app/src/app/components/edit-collection-dialog/edit-collection-dialog.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
-import { IQueryCollection } from 'app/reducers/collection/collection';
+import { IQueryCollection } from 'app/store/collection/collection.reducer';
 
 @Component({
   selector: 'app-edit-collection-dialog',

packages/altair-app/src/app/components/environment-manager/environment-manager.component.ts

@@ -11,7 +11,7 @@ import {
   SimpleChanges,
 } from '@angular/core';
 
-import * as fromEnvironments from '../../reducers/environments';
+import * as fromEnvironments from '../../store/environments/environments.reducer';
 import { handleEditorRefresh } from 'app/utils/codemirror/refresh-editor';
 
 // Import the codemirror packages

packages/altair-app/src/app/components/plugin-manager/plugin-manager.component.ts

@@ -3,7 +3,7 @@ import { PluginRegistryService } from 'app/services';
 import { Observable, of } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 
-import * as fromSettings from '../../reducers/settings/settings';
+import * as fromSettings from '../../store/settings/settings.reducer';
 
 @Component({
   selector: 'app-plugin-manager',

packages/altair-app/src/app/components/query-collection-item/query-collection-item.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, Input, Output, EventEmitter, ChangeDetectionStrategy } from '@angular/core';
 import { memoize } from 'app/utils/memoize';
-import { IQueryCollection, IQuery } from 'app/reducers/collection/collection';
+import { IQueryCollection, IQuery } from 'app/store/collection/collection.reducer';
 
 type SortByOptions = 'a-z' | 'z-a' | 'newest' | 'oldest';
 @Component({

packages/altair-app/src/app/components/query-collections/query-collections.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
-import { IQueryCollection } from 'app/reducers/collection/collection';
+import { IQueryCollection } from 'app/store/collection/collection.reducer';
 
 @Component({
   selector: 'app-query-collections',

packages/altair-app/src/app/components/query-editor/query-editor.component.ts

@@ -14,8 +14,8 @@ import {
   DoCheck,
 } from '@angular/core';
 
-import * as fromVariables from '../../reducers/variables/variables';
-import * as fromQuery from '../../reducers/query/query';
+import * as fromVariables from '../../store/variables/variables.reducer';
+import * as fromQuery from '../../store/query/query.reducer';
 
 // Import the codemirror packages
 import * as Codemirror from 'codemirror';

packages/altair-app/src/app/components/query-result/query-result.component.ts

@@ -27,7 +27,7 @@ import 'codemirror/addon/search/matchesonscrollbar';
 import 'codemirror/addon/search/jump-to-line';
 import 'codemirror/addon/scroll/annotatescrollbar';
 import 'codemirror-graphql/results/mode';
-import { SubscriptionResponse } from 'app/reducers/query/query';
+import { SubscriptionResponse } from 'app/store/query/query.reducer';
 import { handleEditorRefresh } from 'app/utils/codemirror/refresh-editor';
 
 @Component({

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

@@ -12,7 +12,7 @@ import {
   DoCheck,
 } from '@angular/core';
 
-import * as fromSettings from '../../reducers/settings/settings';
+import * as fromSettings from '../../store/settings/settings.reducer';
 
 import { AltairConfig } from '../../config';
 import { debug } from 'app/utils/logger';

packages/altair-app/src/app/config.ts

@@ -1,7 +1,7 @@
 import isElectron from './utils/is_electron';
 import { IDictionary } from './interfaces/shared';
-import { IInitialEnvironments } from './reducers/environments';
-import * as fromSettings from './reducers/settings/settings';
+import { IInitialEnvironments } from './store/environments/environments.reducer';
+import * as fromSettings from './store/settings/settings.reducer';
 
 const isTranslateMode = (window as any).__ALTAIR_TRANSLATE__;
 

packages/altair-app/src/app/containers/app/app.component.ts

@@ -6,27 +6,27 @@ import { TranslateService } from '@ngx-translate/core';
 
 import * as uuid from 'uuid/v4';
 
-import * as fromRoot from '../../reducers';
-import * as fromHeader from '../../reducers/headers/headers';
-import * as fromVariable from '../../reducers/variables/variables';
-import * as fromSettings from '../../reducers/settings/settings';
-import * as fromCollection from '../../reducers/collection/collection';
-import * as fromWindowsMeta from '../../reducers/windows-meta/windows-meta';
-import * as fromEnvironments from '../../reducers/environments';
-
-import * as queryActions from '../../actions/query/query';
-import * as headerActions from '../../actions/headers/headers';
-import * as variableActions from '../../actions/variables/variables';
-import * as dialogsActions from '../../actions/dialogs/dialogs';
-import * as layoutActions from '../../actions/layout/layout';
-import * as docsActions from '../../actions/docs/docs';
-import * as windowsActions from '../../actions/windows/windows';
-import * as windowsMetaActions from '../../actions/windows-meta/windows-meta';
-import * as settingsActions from '../../actions/settings/settings';
-import * as donationActions from '../../actions/donation';
-import * as windowActions from '../../actions/windows/windows';
-import * as collectionActions from '../../actions/collection/collection';
-import * as environmentsActions from '../../actions/environments/environments';
+import * as fromRoot from '../../store';
+import * as fromHeader from '../../store/headers/headers.reducer';
+import * as fromVariable from '../../store/variables/variables.reducer';
+import * as fromSettings from '../../store/settings/settings.reducer';
+import * as fromCollection from '../../store/collection/collection.reducer';
+import * as fromWindowsMeta from '../../store/windows-meta/windows-meta.reducer';
+import * as fromEnvironments from '../../store/environments/environments.reducer';
+
+import * as queryActions from '../../store/query/query.action';
+import * as headerActions from '../../store/headers/headers.action';
+import * as variableActions from '../../store/variables/variables.action';
+import * as dialogsActions from '../../store/dialogs/dialogs.action';
+import * as layoutActions from '../../store/layout/layout.action';
+import * as docsActions from '../../store/docs/docs.action';
+import * as windowsActions from '../../store/windows/windows.action';
+import * as windowsMetaActions from '../../store/windows-meta/windows-meta.action';
+import * as settingsActions from '../../store/settings/settings.action';
+import * as donationActions from '../../store/donation/donation.action';
+import * as windowActions from '../../store/windows/windows.action';
+import * as collectionActions from '../../store/collection/collection.action';
+import * as environmentsActions from '../../store/environments/environments.action';
 
 import { environment } from '../../../environments/environment';
 

packages/altair-app/src/app/containers/window/window.component.ts

@@ -11,27 +11,27 @@ import {
 } from '@angular/core';
 import { Store, select } from '@ngrx/store';
 
-import * as fromRoot from '../../reducers';
-import * as fromHeader from '../../reducers/headers/headers';
-import * as fromHistory from '../../reducers/history/history';
-import * as fromVariable from '../../reducers/variables/variables';
-import * as fromQuery from '../../reducers/query/query';
-import * as fromCollection from '../../reducers/collection/collection';
-import * as fromPreRequest from '../../reducers/pre-request/pre-request';
-import * as fromDocs from '../../reducers/docs/docs';
-
-import * as queryActions from '../../actions/query/query';
-import * as headerActions from '../../actions/headers/headers';
-import * as variableActions from '../../actions/variables/variables';
-import * as dialogsActions from '../../actions/dialogs/dialogs';
-import * as docsActions from '../../actions/docs/docs';
-import * as layoutActions from '../../actions/layout/layout';
-import * as schemaActions from '../../actions/gql-schema/gql-schema';
-import * as historyActions from '../../actions/history/history';
-import * as windowActions from '../../actions/windows/windows';
-import * as collectionActions from '../../actions/collection/collection';
-import * as streamActions from '../../actions/stream/stream';
-import * as preRequestActions from '../../actions/pre-request/pre-request';
+import * as fromRoot from '../../store';
+import * as fromHeader from '../../store/headers/headers.reducer';
+import * as fromHistory from '../../store/history/history.reducer';
+import * as fromVariable from '../../store/variables/variables.reducer';
+import * as fromQuery from '../../store/query/query.reducer';
+import * as fromCollection from '../../store/collection/collection.reducer';
+import * as fromPreRequest from '../../store/pre-request/pre-request.reducer';
+import * as fromDocs from '../../store/docs/docs.reducer';
+
+import * as queryActions from '../../store/query/query.action';
+import * as headerActions from '../../store/headers/headers.action';
+import * as variableActions from '../../store/variables/variables.action';
+import * as dialogsActions from '../../store/dialogs/dialogs.action';
+import * as docsActions from '../../store/docs/docs.action';
+import * as layoutActions from '../../store/layout/layout.action';
+import * as schemaActions from '../../store/gql-schema/gql-schema.action';
+import * as historyActions from '../../store/history/history.action';
+import * as windowActions from '../../store/windows/windows.action';
+import * as collectionActions from '../../store/collection/collection.action';
+import * as streamActions from '../../store/stream/stream.action';
+import * as preRequestActions from '../../store/pre-request/pre-request.action';
 
 import { GqlService, NotifyService, PluginRegistryService, WindowService } from '../../services';
 import { Observable, empty as observableEmpty, combineLatest } from 'rxjs';

packages/altair-app/src/app/effects/query-collection.ts

@@ -6,9 +6,9 @@ import { Injectable } from '@angular/core';
 import { Store, Action } from '@ngrx/store';
 import { Effect, Actions, ofType } from '@ngrx/effects';
 
-import * as fromRoot from '../reducers';
+import * as fromRoot from '../store';
 
-import * as collectionActions from '../actions/collection/collection';
+import * as collectionActions from '../store/collection/collection.action';
 import { QueryCollectionService, WindowService, NotifyService } from '../services';
 import { downloadJson, openFile } from 'app/utils';
 

packages/altair-app/src/app/effects/query.ts

@@ -17,18 +17,18 @@ import {
   EnvironmentService,
   PreRequestService
 } from '../services';
-import * as fromRoot from '../reducers';
-
-import * as queryActions from '../actions/query/query';
-import * as variablesActions from '../actions/variables/variables';
-import * as layoutActions from '../actions/layout/layout';
-import * as gqlSchemaActions from '../actions/gql-schema/gql-schema';
-import * as docsAction from '../actions/docs/docs';
-import * as windowsMetaActions from '../actions/windows-meta/windows-meta';
-import * as donationAction from '../actions/donation';
-import * as historyActions from '../actions/history/history';
-import * as dialogsActions from '../actions/dialogs/dialogs';
-import * as streamActions from '../actions/stream/stream';
+import * as fromRoot from '../store';
+
+import * as queryActions from '../store/query/query.action';
+import * as variablesActions from '../store/variables/variables.action';
+import * as layoutActions from '../store/layout/layout.action';
+import * as gqlSchemaActions from '../store/gql-schema/gql-schema.action';
+import * as docsAction from '../store/docs/docs.action';
+import * as windowsMetaActions from '../store/windows-meta/windows-meta.action';
+import * as donationAction from '../store/donation/donation.action';
+import * as historyActions from '../store/history/history.action';
+import * as dialogsActions from '../store/dialogs/dialogs.action';
+import * as streamActions from '../store/stream/stream.action';
 
 import { downloadJson, downloadData, copyToClipboard, openFile } from '../utils';
 import { debug } from '../utils/logger';

packages/altair-app/src/app/effects/windows.ts

@@ -6,12 +6,12 @@ import { Injectable } from '@angular/core';
 import { Store, Action } from '@ngrx/store';
 import { Effect, Actions, ofType } from '@ngrx/effects';
 
-import * as fromRoot from '../reducers';
-import * as fromWindows from '../reducers/windows';
+import * as fromRoot from '../store';
+import * as fromWindows from '../store/windows/windows.reducer';
 
-import * as windowActions from '../actions/windows/windows';
-import * as windowsMetaActions from '../actions/windows-meta/windows-meta';
-import * as localActions from '../actions/local/local';
+import * as windowActions from '../store/windows/windows.action';
+import * as windowsMetaActions from '../store/windows-meta/windows-meta.action';
+import * as localActions from '../store/local/local.action';
 
 import { WindowService } from '../services/window.service';
 

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

@@ -7,13 +7,13 @@ import { Store } from '@ngrx/store';
 import { WindowService } from '../window.service';
 import { NotifyService } from '../notify/notify.service';
 
-import * as fromRoot from '../../reducers';
-import * as fromHeader from '../../reducers/headers/headers';
+import * as fromRoot from '../../store';
+import * as fromHeader from '../../store/headers/headers.reducer';
 
-import * as queryActions from '../../actions/query/query';
-import * as docsActions from '../../actions/docs/docs';
-import * as windowsMetaActions from '../../actions/windows-meta/windows-meta';
-import * as windowsActions from '../../actions/windows/windows';
+import * as queryActions from '../../store/query/query.action';
+import * as docsActions from '../../store/docs/docs.action';
+import * as windowsMetaActions from '../../store/windows-meta/windows-meta.action';
+import * as windowsActions from '../../store/windows/windows.action';
 import { debug } from 'app/utils/logger';
 
 @Injectable()

packages/altair-app/src/app/services/environment/environment.service.spec.ts

@@ -1,5 +1,5 @@
 import { TestBed } from '@angular/core/testing';
-import * as fromRoot from '../../reducers';
+import * as fromRoot from '../../store';
 
 import { EnvironmentService } from './environment.service';
 import { Store } from '@ngrx/store';

packages/altair-app/src/app/services/environment/environment.service.ts

@@ -1,9 +1,9 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
-import * as fromRoot from '../../reducers';
-import * as fromEnvironments from '../../reducers/environments';
-import * as fromHeaders from '../../reducers/headers/headers';
+import * as fromRoot from '../../store';
+import * as fromEnvironments from '../../store/environments/environments.reducer';
+import * as fromHeaders from '../../store/headers/headers.reducer';
 import { IDictionary } from 'app/interfaces/shared';
 
 interface IEnvironment extends IDictionary<any> {

packages/altair-app/src/app/services/gql/gql.service.spec.ts

@@ -3,7 +3,7 @@ import { Mock } from 'ts-mocks';
 
 import { HttpClient, HttpEventType, HttpResponse, HttpErrorResponse } from '@angular/common/http';
 
-import * as fromRoot from '../../reducers';
+import * as fromRoot from '../../store';
 import { GqlService } from './gql.service';
 import { NotifyService } from '../notify/notify.service';
 import { Store } from '@ngrx/store';

packages/altair-app/src/app/services/gql/gql.service.ts

@@ -35,8 +35,8 @@ import { oldIntrospectionQuery } from './oldIntrospectionQuery';
 import { buildClientSchema as oldBuildClientSchema } from './oldBuildClientSchema';
 import { debug } from 'app/utils/logger';
 
-import * as fromHeaders from '../../reducers/headers/headers';
-import * as fromVariables from '../../reducers/variables/variables';
+import * as fromHeaders from '../../store/headers/headers.reducer';
+import * as fromVariables from '../../store/variables/variables.reducer';
 import { fillAllFields } from './fillFields';
 import { setByDotNotation } from 'app/utils';
 import { Token } from 'codemirror';
@@ -49,7 +49,7 @@ import {
   refactorArgumentsToVariables,
   generateRandomNameForString,
 } from './helpers';
-import { SelectedOperation } from 'app/reducers/query/query';
+import { SelectedOperation } from 'app/store/query/query.reducer';
 
 
 interface SendRequestOptions {

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

@@ -4,11 +4,11 @@ import 'mousetrap-global-bind';
 import { Store } from '@ngrx/store';
 import { WindowService } from '../window.service';
 
-import * as fromRoot from '../../reducers';
+import * as fromRoot from '../../store';
 
-import * as dialogsActions from '../../actions/dialogs/dialogs';
-import * as queryActions from '../../actions/query/query';
-import * as docsActions from '../../actions/docs/docs';
+import * as dialogsActions from '../../store/dialogs/dialogs.action';
+import * as queryActions from '../../store/query/query.action';
+import * as docsActions from '../../store/docs/docs.action';
 import { ElectronAppService } from '../electron-app/electron-app.service';
 
 

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

@@ -1,6 +1,6 @@
 import { TestBed, inject } from '@angular/core/testing';
 import { ToastrService } from 'ngx-toastr';
-import * as fromRoot from '../../reducers';
+import * as fromRoot from '../../store';
 
 import { NotifyService } from './notify.service';
 import { Store } from '@ngrx/store';

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

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { ToastrService, ActiveToast, ToastrConfig } from 'ngx-toastr';
 import { isExtension } from '../../utils';
 import { Store } from '@ngrx/store';
-import * as fromRoot from '../../reducers';
+import * as fromRoot from '../../store';
 import { IDictionary } from 'app/interfaces/shared';
 import { first } from 'rxjs/operators';
 

packages/altair-app/src/app/services/plugin/plugin-props-factory.ts

@@ -3,13 +3,13 @@ import { Store } from '@ngrx/store';
 import { PluginInstance, isAppLevelPluginType, PluginComponentDataProps } from './plugin';
 import { map, distinctUntilChanged } from 'rxjs/operators';
 
-import * as fromRoot from '../../reducers';
+import * as fromRoot from '../../store';
 
-import * as queryActions from '../../actions/query/query';
-import * as variableActions from '../../actions/variables/variables';
+import * as queryActions from '../../store/query/query.action';
+import * as variableActions from '../../store/variables/variables.action';
 import { Observable, Subscription } from 'rxjs';
 import { WindowService } from '../window.service';
-import { ExportWindowState } from 'app/reducers/windows';
+import { ExportWindowState } from 'app/store/windows/windows.reducer';
 import { PluginEventService, PluginEvent } from './plugin-event.service';
 import is_electron from 'app/utils/is_electron';