From 3ec70b28521c9b9a2e51d75cba92042a6ee0231a Mon Sep 17 00:00:00 2001
From: Vladimir Y <dev.vladimir.y@gmail.com>
Date: Fri, 29 Jun 2018 18:53:33 +0300
Subject: [PATCH] fix general setting saving (checkboxes)

---
 package.json                                |  2 +-
 src/web/src/app/+options/options.effects.ts |  4 ++--
 src/webpack/web.ts                          |  5 -----
 yarn.lock                                   | 22 ++++++++++++++++-----
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 64f8ea860..c4e326d63 100644
--- a/package.json
+++ b/package.json
@@ -150,7 +150,7 @@
     "karma-sourcemap-loader": "0.3.7",
     "karma-webpack": "3.0.0",
     "less-loader": "4.1.0",
-    "mini-css-extract-plugin": "0.4.0",
+    "mini-css-extract-plugin": "0.4.1",
     "mkdirp": "0.5.1",
     "ngx-bootstrap": "3.0.1",
     "node-sass": "4.9.0",
diff --git a/src/web/src/app/+options/options.effects.ts b/src/web/src/app/+options/options.effects.ts
index da3babeb0..45ac34778 100644
--- a/src/web/src/app/+options/options.effects.ts
+++ b/src/web/src/app/+options/options.effects.ts
@@ -214,10 +214,10 @@ export class OptionsEffects {
     @Effect()
     updateBaseSettings$ = this.actions$.pipe(
         filter(OPTIONS_ACTIONS.is.PatchBaseSettingsRequest),
-        switchMap((patch) => observableMerge(
+        switchMap(({payload}) => observableMerge(
             of(this.buildPatchProgress({updatingBaseSettings: true})),
             this.electronService
-                .callIpcMain("patchBaseSettings")(patch)
+                .callIpcMain("patchBaseSettings")(payload)
                 .pipe(
                     map((config) => OPTIONS_ACTIONS.GetConfigResponse(config)),
                     catchError((error) => this.effectsService.buildFailActionObservable(error)),
diff --git a/src/webpack/web.ts b/src/webpack/web.ts
index b1a7ad697..04476742b 100644
--- a/src/webpack/web.ts
+++ b/src/webpack/web.ts
@@ -48,13 +48,8 @@ const tsConfigFile = srcPath(({
     test: "./web/test/tsconfig.json",
 } as Record<BuildEnvironment, string>)[environment]);
 const tsConfigCompilerOptions: ts.CompilerOptions = (() => {
-    // AngularCompilerPlugin does only a shallow Object.assign-like merge with options defined in tsconfig.json
     const tsConfig = readConfiguration(tsConfigFile);
 
-    if (environmentSate.production) {
-
-    }
-
     if (environmentSate.development) {
         tsConfig.options.paths["_@web/src/environments/*"] = [webSrcEnvPath() + "/*"];
     }
diff --git a/yarn.lock b/yarn.lock
index 4542d1f12..30fd3dc63 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -687,6 +687,17 @@
     "@webassemblyjs/wast-parser" "1.5.12"
     long "^3.2.0"
 
+"@webpack-contrib/schema-utils@^1.0.0-beta.0":
+  version "1.0.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@webpack-contrib/schema-utils/-/schema-utils-1.0.0-beta.0.tgz#bf9638c9464d177b48209e84209e23bee2eb4f65"
+  dependencies:
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+    chalk "^2.3.2"
+    strip-ansi "^4.0.0"
+    text-table "^0.2.0"
+    webpack-log "^1.1.2"
+
 "@yarnpkg/lockfile@^1.0.0":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.0.2.tgz#833d163680a151d2441a2489f5fe5fa87ac87726"
@@ -1794,7 +1805,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.3.2, chalk@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
   dependencies:
@@ -6476,10 +6487,11 @@ min-document@^2.19.0:
   dependencies:
     dom-walk "^0.1.0"
 
-mini-css-extract-plugin@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.0.tgz#ff3bf08bee96e618e177c16ca6131bfecef707f9"
+mini-css-extract-plugin@0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.1.tgz#d2bcf77bb2596b8e4bd9257e43d3f9164c2e86cb"
   dependencies:
+    "@webpack-contrib/schema-utils" "^1.0.0-beta.0"
     loader-utils "^1.1.0"
     webpack-sources "^1.1.0"
 
@@ -9874,7 +9886,7 @@ text-encoding@^0.6.4:
   version "0.6.4"
   resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
 
-text-table@~0.2.0:
+text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"