From 50f6939f934e1a9df4f217d688c567d457ae7a70 Mon Sep 17 00:00:00 2001 From: fdel-car Date: Wed, 24 Aug 2022 11:17:38 +0200 Subject: [PATCH 01/12] Update metadata casing and structure --- .../strapi/lib/services/metrics/sender.js | 4 +- packages/generators/app/lib/index.js | 12 ++--- packages/generators/app/lib/utils/usage.js | 45 +++++++------------ 3 files changed, 25 insertions(+), 36 deletions(-) diff --git a/packages/core/strapi/lib/services/metrics/sender.js b/packages/core/strapi/lib/services/metrics/sender.js index 788ca910e7..145ca40df1 100644 --- a/packages/core/strapi/lib/services/metrics/sender.js +++ b/packages/core/strapi/lib/services/metrics/sender.js @@ -44,13 +44,13 @@ module.exports = (strapi) => { const anonymousMetadata = { environment: strapi.config.environment, os: os.type(), - osPlatform: os.platform(), + platform: os.platform(), + osArch: os.arch(), osRelease: os.release(), nodeVersion: process.version, docker: process.env.DOCKER || isDocker(), isCI: ciEnv.isCI, version: strapi.config.get('info.strapi'), - strapiVersion: strapi.config.get('info.strapi'), projectType: isEE ? 'Enterprise' : 'Community', useTypescriptOnServer: isUsingTypeScriptSync(serverRootPath), useTypescriptOnAdmin: isUsingTypeScriptSync(adminRootPath), diff --git a/packages/generators/app/lib/index.js b/packages/generators/app/lib/index.js index 067f64af63..3788c528fb 100644 --- a/packages/generators/app/lib/index.js +++ b/packages/generators/app/lib/index.js @@ -58,12 +58,12 @@ const generateNewApp = (projectDirectory, cliArguments) => { sentry.configureScope(function scope(sentryScope) { const tags = { - os_arch: os.arch(), - os_type: os.type(), - os_platform: os.platform(), - os_release: os.release(), - strapi_version: scope.strapiVersion, - node_version: process.version, + os: os.type(), + platform: os.platform(), + osArch: os.arch(), + osRelease: os.release(), + version: scope.strapiVersion, + nodeVersion: process.versions.node, docker: scope.docker, }; diff --git a/packages/generators/app/lib/utils/usage.js b/packages/generators/app/lib/utils/usage.js index 7f7bbc1aad..5a6744dddc 100644 --- a/packages/generators/app/lib/utils/usage.js +++ b/packages/generators/app/lib/utils/usage.js @@ -53,6 +53,21 @@ function captureStderr(name, error) { return captureError(name); } +const getProperties = (scope, error) => ({ + error: typeof error === 'string' ? error : error && error.message, + os: os.type(), + platform: os.platform(), + osArch: os.arch(), + osRelease: os.release(), + version: scope.strapiVersion, + nodeVersion: process.versions.node, + docker: scope.docker, + useYarn: scope.useYarn, + useTypescriptOnServer: scope.useTypescript, + useTypescriptOnAdmin: scope.useTypescript, + noRun: (scope.runQuickstartApp !== true).toString(), +}); + function trackEvent(event, body) { if (process.env.NODE_ENV === 'test') { return; @@ -76,19 +91,7 @@ function trackEvent(event, body) { function trackError({ scope, error }) { const { uuid } = scope; - - const properties = { - error: typeof error === 'string' ? error : error && error.message, - os: os.type(), - platform: os.platform(), - release: os.release(), - version: scope.strapiVersion, - nodeVersion: process.version, - docker: scope.docker, - useYarn: scope.useYarn, - useTypescriptOnServer: scope.useTypescript, - useTypescriptOnAdmin: scope.useTypescript, - }; + const properties = getProperties(scope, error); try { return trackEvent('didNotCreateProject', { @@ -104,21 +107,7 @@ function trackError({ scope, error }) { function trackUsage({ event, scope, error }) { const { uuid } = scope; - - const properties = { - error: typeof error === 'string' ? error : error && error.message, - os: os.type(), - os_arch: os.arch(), - os_platform: os.platform(), - os_release: os.release(), - node_version: process.version, - version: scope.strapiVersion, - docker: scope.docker, - useYarn: scope.useYarn.toString(), - useTypescriptOnServer: scope.useTypescript, - useTypescriptOnAdmin: scope.useTypescript, - noRun: (scope.runQuickstartApp !== true).toString(), - }; + const properties = getProperties(scope, error); try { return trackEvent(event, { From 6f0041084ce672eb19a0b3ae2370bc8e8c5ef0ff Mon Sep 17 00:00:00 2001 From: fdel-car Date: Wed, 24 Aug 2022 12:45:59 +0200 Subject: [PATCH 02/12] Remove 'v' prefix from nodeVersion --- packages/core/strapi/lib/services/metrics/sender.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/strapi/lib/services/metrics/sender.js b/packages/core/strapi/lib/services/metrics/sender.js index 145ca40df1..844bbec77c 100644 --- a/packages/core/strapi/lib/services/metrics/sender.js +++ b/packages/core/strapi/lib/services/metrics/sender.js @@ -47,7 +47,7 @@ module.exports = (strapi) => { platform: os.platform(), osArch: os.arch(), osRelease: os.release(), - nodeVersion: process.version, + nodeVersion: process.versions.node, docker: process.env.DOCKER || isDocker(), isCI: ciEnv.isCI, version: strapi.config.get('info.strapi'), From 1bfb12eceba228370357d92b98db20392e6c4295 Mon Sep 17 00:00:00 2001 From: fdel-car Date: Fri, 26 Aug 2022 18:35:19 +0200 Subject: [PATCH 03/12] Rename platform to osPlatform --- packages/core/strapi/lib/services/metrics/sender.js | 2 +- packages/generators/app/lib/index.js | 2 +- packages/generators/app/lib/utils/usage.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/core/strapi/lib/services/metrics/sender.js b/packages/core/strapi/lib/services/metrics/sender.js index 844bbec77c..161f4237d1 100644 --- a/packages/core/strapi/lib/services/metrics/sender.js +++ b/packages/core/strapi/lib/services/metrics/sender.js @@ -44,7 +44,7 @@ module.exports = (strapi) => { const anonymousMetadata = { environment: strapi.config.environment, os: os.type(), - platform: os.platform(), + osPlatform: os.platform(), osArch: os.arch(), osRelease: os.release(), nodeVersion: process.versions.node, diff --git a/packages/generators/app/lib/index.js b/packages/generators/app/lib/index.js index 3788c528fb..4d063bde5c 100644 --- a/packages/generators/app/lib/index.js +++ b/packages/generators/app/lib/index.js @@ -59,7 +59,7 @@ const generateNewApp = (projectDirectory, cliArguments) => { sentry.configureScope(function scope(sentryScope) { const tags = { os: os.type(), - platform: os.platform(), + osPlatform: os.platform(), osArch: os.arch(), osRelease: os.release(), version: scope.strapiVersion, diff --git a/packages/generators/app/lib/utils/usage.js b/packages/generators/app/lib/utils/usage.js index 5a6744dddc..0016663efa 100644 --- a/packages/generators/app/lib/utils/usage.js +++ b/packages/generators/app/lib/utils/usage.js @@ -56,7 +56,7 @@ function captureStderr(name, error) { const getProperties = (scope, error) => ({ error: typeof error === 'string' ? error : error && error.message, os: os.type(), - platform: os.platform(), + osPlatform: os.platform(), osArch: os.arch(), osRelease: os.release(), version: scope.strapiVersion, From 5a80b2ce6fcc1dccfba57a2fb95641a783a50cc1 Mon Sep 17 00:00:00 2001 From: Julie Plantey Date: Mon, 29 Aug 2022 16:02:19 +0200 Subject: [PATCH 04/12] LoadingMessage component for ReactSelect --- .../lib/src/components/ReactSelect/ReactSelect.js | 9 ++++++++- .../ReactSelect/components/LoadingMessage.js | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 packages/core/helper-plugin/lib/src/components/ReactSelect/components/LoadingMessage.js diff --git a/packages/core/helper-plugin/lib/src/components/ReactSelect/ReactSelect.js b/packages/core/helper-plugin/lib/src/components/ReactSelect/ReactSelect.js index a8e49a1a5c..e5a6a23223 100644 --- a/packages/core/helper-plugin/lib/src/components/ReactSelect/ReactSelect.js +++ b/packages/core/helper-plugin/lib/src/components/ReactSelect/ReactSelect.js @@ -6,6 +6,7 @@ import { useTheme } from 'styled-components'; import ClearIndicator from './components/ClearIndicator'; import DropdownIndicator from './components/DropdownIndicator'; import IndicatorSeparator from './components/IndicatorSeparator'; +import LoadingMessage from './components/LoadingMessage'; import getSelectStyles from './utils/getSelectStyles'; @@ -17,7 +18,13 @@ const ReactSelect = ({ components, styles, error, ariaErrorMessage, ...props })