From ef1be9f31a9d31a53b0be1d7eebecf15f99961b4 Mon Sep 17 00:00:00 2001 From: narekcat Date: Wed, 23 Sep 2020 13:59:29 +0400 Subject: [PATCH 1/6] fix: for issue #4784 --- src/services/terms.js | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/services/terms.js b/src/services/terms.js index 82184f1b..1a24e734 100644 --- a/src/services/terms.js +++ b/src/services/terms.js @@ -95,10 +95,21 @@ class TermsService { * @param {Number|String} termId id of the term * @return {Promise} promise of the request result */ - getTermDetails(termId) { - // looks like server cache responses, to prevent it we add nocache param with always new value - return this.private.api.get(`/terms/${termId}`) - .then(res => (res.ok ? res.json() : Promise.reject(res.json()))); + async getTermDetails(termId) { + let termDetails = {}; + let isLegacyTerm = false; + if (/^[\d]{5,8}$/.test(termId)) { + isLegacyTerm = true; + termDetails = await this.private.api.get(`/terms?legacyId=${termId}`) + .then(res => (res.ok ? res.json() : Promise.reject(res.json()))); + } else { + termDetails = await this.private.api.get(`/terms/${termId}`) + .then(res => (res.ok ? res.json() : Promise.reject(res.json()))); + } + return { + ...termDetails, + isLegacyTerm, + }; } /** From 3cb3059db78c0ea38396b1e90267011f0d0bbc02 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Wed, 23 Sep 2020 21:23:55 -0300 Subject: [PATCH 2/6] Terms: update result pass from legacyId call --- src/services/terms.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/services/terms.js b/src/services/terms.js index 1a24e734..affd8ad9 100644 --- a/src/services/terms.js +++ b/src/services/terms.js @@ -101,7 +101,8 @@ class TermsService { if (/^[\d]{5,8}$/.test(termId)) { isLegacyTerm = true; termDetails = await this.private.api.get(`/terms?legacyId=${termId}`) - .then(res => (res.ok ? res.json() : Promise.reject(res.json()))); + .then(res => (res.ok ? res.json() : Promise.reject(res.json()))) + .then(res => (res.result ? res.result[0] : Promise.reject(res.json()))); } else { termDetails = await this.private.api.get(`/terms/${termId}`) .then(res => (res.ok ? res.json() : Promise.reject(res.json()))); From 750c049b4e0252894acb1d4be4f64eb24f6942a7 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Wed, 23 Sep 2020 21:50:41 -0300 Subject: [PATCH 3/6] fix: for issue #4784 Issue: https://github.com/topcoder-platform/community-app/issues/4784 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3cf11723..1f19bda0 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "lint:js": "./node_modules/.bin/eslint --ext .js,.jsx .", "test": "npm run lint && npm run jest" }, - "version": "1000.22.6", + "version": "1000.22.9", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0", From 9e5459ecc00f156da7ac0b19af27034342845220 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Thu, 24 Sep 2020 03:04:07 -0300 Subject: [PATCH 4/6] Version: Sync with develop --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1f19bda0..20f49c6f 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "lint:js": "./node_modules/.bin/eslint --ext .js,.jsx .", "test": "npm run lint && npm run jest" }, - "version": "1000.22.9", + "version": "1.0.5", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0", From e1c7225f270507a7edaf4e3712f6aedd75a25c77 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Thu, 24 Sep 2020 03:07:08 -0300 Subject: [PATCH 5/6] Sync milestone-20200917 with develop: Test Release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 20f49c6f..16989639 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "lint:js": "./node_modules/.bin/eslint --ext .js,.jsx .", "test": "npm run lint && npm run jest" }, - "version": "1.0.5", + "version": "1000.22.10", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0", From d3c2f9efc382fe7ea77278ff88c3a7a0481d1235 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Thu, 24 Sep 2020 03:09:30 -0300 Subject: [PATCH 6/6] ci: Add dist tag --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0e161844..e8eac28e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,7 @@ jobs: - attach_workspace: at: . - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc - - run: npm publish + - run: npm publish --tag test-release # dont change anything workflows: version: 2