From 7431f353e9734ecd333a4d25d5c93da5d2b6921c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jimmy=20Wa=CC=88rting?= Date: Thu, 24 Nov 2022 17:52:25 +0100 Subject: [PATCH] replace some lodash function with native --- .../src/pages/SettingsPage/pages/ApiTokens/EditView/index.js | 5 ++--- packages/core/email/admin/src/pages/Settings/index.js | 2 +- packages/core/email/server/bootstrap.js | 4 +--- packages/core/email/server/controllers/email.js | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js index 3668c30d2f..a128aaa280 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js @@ -12,7 +12,6 @@ import { } from '@strapi/helper-plugin'; import { Main } from '@strapi/design-system/Main'; import { Formik } from 'formik'; -import { get } from 'lodash'; import { useRouteMatch, useHistory } from 'react-router-dom'; import { useQuery } from 'react-query'; import { formatAPIErrors } from '../../../../../utils'; @@ -205,12 +204,12 @@ const ApiTokenCreateView = () => { if (err?.response?.data?.error?.message === MSG_ERROR_NAME_TAKEN) { toggleNotification({ type: 'warning', - message: get(err, 'response.data.message', 'notification.error.tokennamenotunique'), + message: err.response.data.message || 'notification.error.tokennamenotunique', }); } else { toggleNotification({ type: 'warning', - message: get(err, 'response.data.message', 'notification.error'), + message: err?.response?.data?.message || 'notification.error', }); } unlockApp(); diff --git a/packages/core/email/admin/src/pages/Settings/index.js b/packages/core/email/admin/src/pages/Settings/index.js index d87dd47893..dfe23b7773 100644 --- a/packages/core/email/admin/src/pages/Settings/index.js +++ b/packages/core/email/admin/src/pages/Settings/index.js @@ -63,7 +63,7 @@ const SettingsPage = () => { setConfig(config); - const testAddressFound = get(config, 'settings.testAddress'); + const testAddressFound = config?.settings?.testAddress; if (testAddressFound) { setTestAddress(testAddressFound); diff --git a/packages/core/email/server/bootstrap.js b/packages/core/email/server/bootstrap.js index 6632c266af..f4a15d3ba0 100644 --- a/packages/core/email/server/bootstrap.js +++ b/packages/core/email/server/bootstrap.js @@ -1,9 +1,7 @@ 'use strict'; -const _ = require('lodash'); - const createProvider = (emailConfig) => { - const providerName = _.toLower(emailConfig.provider); + const providerName = emailConfig.provider.toLowerCase(); let provider; let modulePath; diff --git a/packages/core/email/server/controllers/email.js b/packages/core/email/server/controllers/email.js index 4ddb6ce36c..ac52326868 100644 --- a/packages/core/email/server/controllers/email.js +++ b/packages/core/email/server/controllers/email.js @@ -29,7 +29,7 @@ module.exports = { async test(ctx) { const { to } = ctx.request.body; - if (isNil(to)) { + if (!to) { throw new ApplicationError('No recipient(s) are given'); }