From ff5e2862b838e619c21436db0e103dfab9f671ce Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Tue, 13 Oct 2020 07:49:47 +1100 Subject: [PATCH] Fix change in logging levels --- v2/internal/runtime/js/runtime/runtime.d.ts | 10 +++++----- v2/test/kitchensink/frontend/package-lock.json | 6 +++--- v2/test/kitchensink/frontend/package.json | 2 +- v2/test/kitchensink/frontend/src/Store.js | 3 ++- .../frontend/src/pages/logging/Log/Log.svelte | 2 +- .../src/pages/logging/SetLogLevel/SetLogLevel.svelte | 7 +++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/v2/internal/runtime/js/runtime/runtime.d.ts b/v2/internal/runtime/js/runtime/runtime.d.ts index 3b2379af1..a0617311b 100644 --- a/v2/internal/runtime/js/runtime/runtime.d.ts +++ b/v2/internal/runtime/js/runtime/runtime.d.ts @@ -8,11 +8,11 @@ interface Store { } interface Level { - TRACE: 0, - DEBUG: 1, - INFO: 2, - WARNING: 3, - ERROR: 4, + TRACE: 1, + DEBUG: 2, + INFO: 3, + WARNING: 4, + ERROR: 5, }; declare const wailsapp__runtime: { diff --git a/v2/test/kitchensink/frontend/package-lock.json b/v2/test/kitchensink/frontend/package-lock.json index 75f1264ae..8743a7f36 100644 --- a/v2/test/kitchensink/frontend/package-lock.json +++ b/v2/test/kitchensink/frontend/package-lock.json @@ -135,9 +135,9 @@ } }, "@wails/runtime": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@wails/runtime/-/runtime-1.0.3.tgz", - "integrity": "sha512-YfCItPdQ1Gk3AJWpEhnUKdL+eeod9lTtUV697G0q/Y6SnOc86B70S6osvyTCQcQmHVfNVhObpSdaosjWRShupg==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@wails/runtime/-/runtime-1.0.4.tgz", + "integrity": "sha512-x7marEg5nU//qUVRJAF9Hp0oyW75bevHv6jWAzoU977KQPoWtuCkxWm8B5X1u40rq1O0DHWy58R4CujwpewUTw==", "dev": true }, "alphanum-sort": { diff --git a/v2/test/kitchensink/frontend/package.json b/v2/test/kitchensink/frontend/package.json index 0cb589a3a..94d929cce 100644 --- a/v2/test/kitchensink/frontend/package.json +++ b/v2/test/kitchensink/frontend/package.json @@ -11,7 +11,7 @@ "@rollup/plugin-commonjs": "^11.0.0", "@rollup/plugin-node-resolve": "^7.0.0", "@rollup/plugin-url": "^5.0.1", - "@wails/runtime": "^1.0.3", + "@wails/runtime": "^1.0.4", "focus-visible": "^5.2.0", "halfmoon": "^1.1.1", "postcss": "^8.1.1", diff --git a/v2/test/kitchensink/frontend/src/Store.js b/v2/test/kitchensink/frontend/src/Store.js index b5e2d8475..70250fc5a 100644 --- a/v2/test/kitchensink/frontend/src/Store.js +++ b/v2/test/kitchensink/frontend/src/Store.js @@ -13,7 +13,8 @@ runtime.System.OnThemeChange( (isDarkMode) => { // LogLevel // Create a svelte store for the logLevel and initialise with // the loglevel stored in the Wails runtime -export let logLevel = writable(runtime.System.LogLevel.get()); +const defaultLogLevel = runtime.System.LogLevel.get(); +export let logLevel = writable(defaultLogLevel); // Bind updates to the Wails store to the Svelte Store runtime.System.LogLevel.subscribe( (newValue) => { diff --git a/v2/test/kitchensink/frontend/src/pages/logging/Log/Log.svelte b/v2/test/kitchensink/frontend/src/pages/logging/Log/Log.svelte index 64bff4e5e..029a5dd33 100644 --- a/v2/test/kitchensink/frontend/src/pages/logging/Log/Log.svelte +++ b/v2/test/kitchensink/frontend/src/pages/logging/Log/Log.svelte @@ -41,7 +41,7 @@
Select Log Method
{#each loglevels as option, index} - {#if index === $logLevel} + {#if (index + 1) === $logLevel}
Current Log Level
{/if}
diff --git a/v2/test/kitchensink/frontend/src/pages/logging/SetLogLevel/SetLogLevel.svelte b/v2/test/kitchensink/frontend/src/pages/logging/SetLogLevel/SetLogLevel.svelte index 76bcaac3c..0a8a95bf2 100644 --- a/v2/test/kitchensink/frontend/src/pages/logging/SetLogLevel/SetLogLevel.svelte +++ b/v2/test/kitchensink/frontend/src/pages/logging/SetLogLevel/SetLogLevel.svelte @@ -11,15 +11,14 @@ var options = ["Trace", "Debug", "Info", "Warning", "Error"]; let isJs = false; var id = "SetLogLevel"; - let loglevelText = options[$logLevel]; + let loglevelText = options[$logLevel-1]; $: setLogLevelMethod = isJs ? Log.SetLogLevel : backend.main.Logger.SetLogLevel; function setLogLevel() { let logLevelUpper = loglevelText.toUpperCase(); - let logLevelNumber = Log.Level[logLevelUpper]; - setLogLevelMethod(logLevelNumber); - logLevel.set(logLevelNumber); + let logLevelMethod = Log.Level[logLevelUpper]; + setLogLevelMethod(logLevelMethod); }; $: lang = isJs ? 'Javascript' : 'Go';