From 8a8c1fee0c650cfe410f2abc4756da1b4bc6cc3d Mon Sep 17 00:00:00 2001 From: Maksim Eltyshev Date: Fri, 12 Apr 2024 12:07:19 +0200 Subject: [PATCH 1/2] fix: Fix error output when sending email or message to Slack --- client/src/containers/LoginContainer.js | 2 +- server/api/helpers/utils/send-email.js | 4 ++-- server/api/helpers/utils/send-slack-message.js | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/src/containers/LoginContainer.js b/client/src/containers/LoginContainer.js index 881b65b..1a16788 100755 --- a/client/src/containers/LoginContainer.js +++ b/client/src/containers/LoginContainer.js @@ -20,7 +20,7 @@ const mapStateToProps = (state) => { isSubmittingUsingOidc, error, withOidc: !!oidcConfig, - isOidcEnforced: oidcConfig && oidcConfig.isEnforced, + isOidcEnforced: !!oidcConfig && oidcConfig.isEnforced, }; }; diff --git a/server/api/helpers/utils/send-email.js b/server/api/helpers/utils/send-email.js index 7b8d08b..02593f8 100644 --- a/server/api/helpers/utils/send-email.js +++ b/server/api/helpers/utils/send-email.js @@ -23,9 +23,9 @@ module.exports = { from: sails.config.custom.smtpFrom, }); - sails.log.info('Email sent: %s', info.messageId); + sails.log.info(`Email sent: ${info.messageId}`); } catch (error) { - sails.log.error(error); // TODO: provide description text? + sails.log.error(`Error sending email: ${error}`); } }, }; diff --git a/server/api/helpers/utils/send-slack-message.js b/server/api/helpers/utils/send-slack-message.js index 573fcf8..510ae1b 100644 --- a/server/api/helpers/utils/send-slack-message.js +++ b/server/api/helpers/utils/send-slack-message.js @@ -35,19 +35,19 @@ module.exports = { body: JSON.stringify(body), }); } catch (error) { - sails.log.error(error); // TODO: provide description text? + sails.log.error(`Error sending to Slack: ${error}`); return; } if (!response.ok) { - sails.log.error('Error sending to Slack: %s', response.error); + sails.log.error(`Error sending to Slack: ${response.error}`); return; } const responseJson = await response.json(); if (!responseJson.ok) { - sails.log.error('Error sending to Slack: %s', responseJson.error); + sails.log.error(`Error sending to Slack: ${responseJson.error}`); } }, }; From 92f75789fa3c3d58655501373c3d990cde7c8d15 Mon Sep 17 00:00:00 2001 From: Maksim Eltyshev Date: Fri, 12 Apr 2024 12:09:22 +0200 Subject: [PATCH 2/2] chore: Update version --- charts/planka/Chart.yaml | 4 ++-- client/.env | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/planka/Chart.yaml b/charts/planka/Chart.yaml index 4a43c8f..02158c7 100644 --- a/charts/planka/Chart.yaml +++ b/charts/planka/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.25 +version: 0.1.26 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.16.3" +appVersion: "1.16.4" dependencies: - alias: postgresql diff --git a/client/.env b/client/.env index 31c7289..1b48387 100644 --- a/client/.env +++ b/client/.env @@ -1 +1 @@ -REACT_APP_VERSION=1.16.3 +REACT_APP_VERSION=1.16.4 diff --git a/package-lock.json b/package-lock.json index 3f255b0..9c2bff2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "planka", - "version": "1.16.3", + "version": "1.16.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "planka", - "version": "1.16.3", + "version": "1.16.4", "hasInstallScript": true, "license": "AGPL-3.0", "dependencies": { diff --git a/package.json b/package.json index 2b71a75..dab2865 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "planka", - "version": "1.16.3", + "version": "1.16.4", "private": true, "homepage": "https://plankanban.github.io/planka", "repository": {