Skip to content

Commit

Permalink
fix general setting saving (checkboxes)
Browse files Browse the repository at this point in the history
  • Loading branch information
vladimiry committed Jun 29, 2018
1 parent d4b176c commit 3ec70b2
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 13 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions src/web/src/app/+options/options.effects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down
5 changes: 0 additions & 5 deletions src/webpack/web.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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() + "/*"];
}
Expand Down
22 changes: 17 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -6476,10 +6487,11 @@ min-document@^2.19.0:
dependencies:
dom-walk "^0.1.0"

[email protected].0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.0.tgz#ff3bf08bee96e618e177c16ca6131bfecef707f9"
[email protected].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"

Expand Down Expand Up @@ -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"

Expand Down

0 comments on commit 3ec70b2

Please sign in to comment.