implemented global persisted settings

.gitignore

@@ -14,8 +14,6 @@ out/
 /web-ext-artifacts
 /firebase-sample-dist
 *.nex
-src/app/utils/settings.schema.json
-src/app/utils/validate_settings_schema.js
 extension-builds/
 coverage
 

.prettierignore

@@ -13,8 +13,6 @@ out/
 /web-ext-artifacts
 /firebase-sample-dist
 *.nex
-src/app/utils/settings.schema.json
-src/app/utils/validate_settings_schema.js
 extension-builds/
 coverage
 

packages/altair-app/package.json

@@ -134,7 +134,6 @@
     "@types/zen-observable": "^0.8.1",
     "@typescript-eslint/eslint-plugin": "^7.4.0",
     "@typescript-eslint/parser": "^7.4.0",
-    "ajv-cli": "3.1.0",
     "babel-plugin-transform-async-to-generator": "6.24.1",
     "babel-preset-env": "1.7.0",
     "babel-preset-react": "6.24.1",
@@ -162,8 +161,7 @@
     "ts-jest": "29.0.5",
     "ts-mocks": "2.6.1",
     "ts-node": "9.1.1",
-    "typescript": "5.2.2",
-    "typescript-json-schema": "0.50.1"
+    "typescript": "5.2.2"
   },
   "homepage": "https://altair-graphql.github.io/altair/",
   "license": "MIT",
@@ -178,13 +176,11 @@
   "scripts": {
     "analyze": "ng build --stats-json && npx webpack-bundle-analyzer dist/stats.json",
     "analyze:prod": "ng build --aot --stats-json && npx webpack-bundle-analyzer dist/stats.json",
-    "build": "yarn generate-settings-schema-validator && node --max_old_space_size=8000 ../../node_modules/@angular/cli/bin/ng build --aot --stats-json && yarn sentry:sourcemaps:inject",
-    "generate-settings-schema-validator": "./scripts/generate-settings-schema.sh",
+    "build": "node --max_old_space_size=8000 ../../node_modules/@angular/cli/bin/ng build --aot --stats-json && yarn sentry:sourcemaps:inject",
     "lint": "ng lint",
     "new:component": "ng g component modules/altair/components/",
     "ng": "ng",
-    "postinstall": "yarn generate-settings-schema-validator",
-    "prepare": "yarn generate-settings-schema-validator && node --max_old_space_size=8000 ../../node_modules/@angular/cli/bin/ng build --output-hashing=none --aot --stats-json && yarn sentry:sourcemaps:inject",
+    "prepare": "node --max_old_space_size=8000 ../../node_modules/@angular/cli/bin/ng build --output-hashing=none --aot --stats-json && yarn sentry:sourcemaps:inject",
     "start": "ng serve",
     "sentry:sourcemaps:inject": "sentry-cli sourcemaps inject --org altair-graphql --project electron ./dist",
     "test": "jest && ng lint",

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

@@ -57,6 +57,7 @@ import { ReducerBootstrapper } from './store/reducer-bootstrapper';
 import { RootState } from 'altair-graphql-core/build/types/state/state.interfaces';
 import { AccountEffects } from './effects/account.effect';
 import { WorkspaceEffects } from './effects/workspace.effect';
+import { ElectronEffects } from './effects/electron.effect';
 
 registerLocaleData(en);
 
@@ -147,6 +148,7 @@ const providers = [
       LocalEffects,
       AccountEffects,
       WorkspaceEffects,
+      ElectronEffects,
     ]),
     // StoreDevtoolsModule.instrument({
     //   logOnly: environment.production,

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

@@ -1,4 +1,4 @@
-import settingsSchema from '../../utils/settings.schema.json';
+import settingsSchema from 'altair-graphql-core/build/settings.schema.json';
 import { JSONSchema7 } from 'json-schema';
 import { jsonSchema } from 'codemirror-json-schema';
 

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

@@ -16,7 +16,7 @@ import { KeyboardShortcutCategory } from '../../services/keybinder/keybinder.ser
 import { SettingsState } from 'altair-graphql-core/build/types/state/settings.interfaces';
 import { AltairConfig } from 'altair-graphql-core/build/config';
 import { Extension } from '@codemirror/state';
-import settingsSchema from '../../utils/settings.schema.json';
+import settingsSchema from 'altair-graphql-core/build/settings.schema.json';
 import { getEditorExtensions } from './extensions';
 import { IDictionary } from 'altair-graphql-core/build/types/shared';
 

packages/altair-app/src/app/modules/altair/effects/electron.effect.ts

@@ -0,0 +1,39 @@
+import { Injectable } from '@angular/core';
+import { createEffect, Actions, ofType } from '@ngrx/effects';
+import { Store } from '@ngrx/store';
+import { RootState } from 'altair-graphql-core/build/types/state/state.interfaces';
+import { of } from 'rxjs';
+import { tap, withLatestFrom } from 'rxjs/operators';
+import { ElectronAppService } from '../services';
+
+import * as variablesActions from '../store/variables/variables.action';
+import * as settingsActions from '../store/settings/settings.action';
+
+@Injectable()
+export class ElectronEffects {
+  updateSettingsOnFile$ = createEffect(
+    () => {
+      return this.actions$.pipe(
+        ofType(settingsActions.UPDATE_SETTINGS, settingsActions.SET_SETTINGS_JSON),
+        withLatestFrom(
+          this.store,
+          (action: variablesActions.UpdateFileVariableDataAction, state) => {
+            return {
+              state,
+            };
+          }
+        ),
+        tap(({ state }) => {
+          return of(this.electronAppService.updateSettingsOnFile(state.settings));
+        })
+      );
+    },
+    { dispatch: false }
+  );
+
+  constructor(
+    private actions$: Actions,
+    private store: Store<RootState>,
+    private electronAppService: ElectronAppService
+  ) {}
+}

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

@@ -23,6 +23,7 @@ import { IDictionary } from 'altair-graphql-core/build/types/shared';
 import { IQueryCollection } from 'altair-graphql-core/build/types/state/collection.interfaces';
 import { electronAPI } from '@altairgraphql/electron-interop/build/renderer';
 import { environment } from 'environments/environment';
+import { SettingsState } from 'altair-graphql-core/build/types/state/settings.interfaces';
 
 interface ConnectOptions {
   importFileContent: (content: string) => void;
@@ -156,9 +157,7 @@ export class ElectronAppService {
     this.api.events.onReloadDocs(() => {
       this.zone.run(() =>
         this.store.dispatch(
-          new queryActions.SendIntrospectionQueryRequestAction(
-            this.activeWindowId
-          )
+          new queryActions.SendIntrospectionQueryRequestAction(this.activeWindowId)
         )
       );
     });
@@ -343,4 +342,12 @@ export class ElectronAppService {
       fileType: 'agbkp',
     });
   }
+
+  getSettingsFromFile() {
+    return this.api?.actions.getAltairAppSettingsFromFile();
+  }
+
+  updateSettingsOnFile(settings: SettingsState) {
+    return this.api?.actions.updateAltairAppSettingsOnFile(settings);
+  }
 }

packages/altair-app/src/app/modules/altair/store/reducer-bootstrapper.ts

@@ -21,6 +21,18 @@ export class ReducerBootstrapper {
         updateFromLocalStorage: true,
       });
 
+      // Merge electron setting state with initial setting state if available
+      const settingsFromFile = await this.electronAppService.getSettingsFromFile();
+      if (settingsFromFile) {
+        this.initialState = {
+          ...this.initialState,
+          settings: {
+            ...this.initialState?.settings,
+            ...settingsFromFile,
+          },
+        };
+      }
+
       // try to import backup if no initial state
       if (!this.initialState) {
         if (await this.electronAppService.importAutobackupData()) {

packages/altair-app/src/app/modules/altair/store/settings/settings.reducer.ts

@@ -9,7 +9,7 @@ import { AllActions } from '../action';
 
 export const getInitialState = (): SettingsState => {
   const altairConfig = getAltairConfig();
-  const initialSettings = altairConfig.initialData.settings || {};
+  const initialSettings = altairConfig.initialData.settings ?? {};
   return {
     theme: altairConfig.defaultTheme,
     language: <SettingsLanguage>altairConfig.default_language,
@@ -23,17 +23,29 @@ export function settingsReducer(
   state = getInitialState(),
   action: AllActions
 ): SettingsState {
+  const persistedSettings = getAltairConfig().initialData.persistedSettings ?? {};
   switch (action.type) {
     case settings.SET_SETTINGS_JSON: {
-      const newState = { ...getInitialState(), ...jsonc(action.payload.value) };
+      const newState = {
+        ...getInitialState(),
+        ...jsonc(action.payload.value),
+        ...persistedSettings, // apply persisted settings last
+      };
 
       return newState;
     }
     case settings.UPDATE_SETTINGS: {
-      const newState = { ...state, ...action.payload };
+      const newState = {
+        ...state,
+        ...action.payload,
+        ...persistedSettings, // apply persisted settings last
+      };
       return newState;
     }
     default:
-      return state;
+      return {
+        ...state,
+        ...persistedSettings, // apply persisted settings last
+      };
   }
 }

packages/altair-app/src/app/modules/altair/store/settings/settings.spec.ts

@@ -1,5 +1,6 @@
 import { settingsReducer } from './settings.reducer';
 import { SET_SETTINGS_JSON, SetSettingsJsonAction } from './settings.action';
+import { AltairConfig } from 'altair-graphql-core/build/config';
 
 let mockAltairConfig = {
   initialData: {},
@@ -10,6 +11,8 @@ let mockAltairConfig = {
 };
 jest.mock('altair-graphql-core/build/config', () => {
   return {
+    AltairConfig: jest.requireActual('altair-graphql-core/build/config')
+      .AltairConfig,
     getAltairConfig() {
       return mockAltairConfig;
     },
@@ -71,6 +74,32 @@ describe('settings', () => {
     });
   });
 
+  it('should set persistent settings after user provided settings', () => {
+    mockAltairConfig = new AltairConfig({
+      initialSettings: {
+        theme: 'dark',
+        disablePushNotification: true,
+      },
+      persistedSettings: {
+        theme: 'light',
+      },
+    });
+    const initialState = settingsReducer(undefined, {
+      type: 'UNKNOWN_ACTION',
+    } as any);
+    const newState = settingsReducer(
+      initialState,
+      new SetSettingsJsonAction({ value: JSON.stringify({ theme: 'changed' }) })
+    );
+    expect(newState).toEqual({
+      theme: 'light',
+      disablePushNotification: true,
+      language: 'en-US',
+      addQueryDepthLimit: 3,
+      tabSize: 2,
+    });
+  });
+
   it(`should set settings data from provided JSON string for [${SET_SETTINGS_JSON}] action`, () => {
     const newState = settingsReducer(
       undefined,