From 64811748e40368e709cf3f3ccbb40046de195a6b Mon Sep 17 00:00:00 2001 From: jvillarf Date: Tue, 13 Apr 2021 20:58:52 +0200 Subject: [PATCH 1/2] Revert "Fix catalog in staging" --- NEWS.md | 1 - .../javascripts/new-dashboard/store/actions/catalog.js | 2 +- lib/assets/javascripts/new-dashboard/utils/base-url.js | 5 +++-- .../javascripts/new-dashboard/utils/catalog/base-url.js | 9 +++++++++ package-lock.json | 2 +- package.json | 2 +- 6 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 lib/assets/javascripts/new-dashboard/utils/catalog/base-url.js diff --git a/NEWS.md b/NEWS.md index 9292898682..ba4445bf28 100644 --- a/NEWS.md +++ b/NEWS.md @@ -118,7 +118,6 @@ sudo make install - Fix error that avoid to render Spatial Data Catalog properly in Internet Explorer [#16236](https://github.com/CartoDB/cartodb/pull/16236) - Free users can't create datasets due to default state was private [16223](https://github.com/CartoDB/cartodb/pull/16223) - Improve visibility over SAML errors [#16243](https://github.com/CartoDB/cartodb/pull/16243) -- Support staging hostname in the catalog [#16245](https://github.com/CartoDB/cartodb/pull/16245) - SAML adjustments [#16246](https://github.com/CartoDB/cartodb/pull/16246) - Retrieve user email for SAML logout before closing CARTO session [#16248](https://github.com/CartoDB/cartodb/pull/16248) diff --git a/lib/assets/javascripts/new-dashboard/store/actions/catalog.js b/lib/assets/javascripts/new-dashboard/store/actions/catalog.js index 63c9a73008..58ba2b1894 100644 --- a/lib/assets/javascripts/new-dashboard/store/actions/catalog.js +++ b/lib/assets/javascripts/new-dashboard/store/actions/catalog.js @@ -1,7 +1,7 @@ import 'whatwg-fetch'; import { setUrlParameters } from 'new-dashboard/utils/catalog/url-parameters'; -import { getBaseURL } from 'new-dashboard/utils/base-url'; +import { getBaseURL } from 'new-dashboard/utils/catalog/base-url'; const entitiesEndpoint = 'data/observatory/metadata/entities'; const datasetsEndpoint = 'data/observatory/metadata/datasets'; diff --git a/lib/assets/javascripts/new-dashboard/utils/base-url.js b/lib/assets/javascripts/new-dashboard/utils/base-url.js index e6b8b4144f..7df65d710b 100644 --- a/lib/assets/javascripts/new-dashboard/utils/base-url.js +++ b/lib/assets/javascripts/new-dashboard/utils/base-url.js @@ -1,8 +1,9 @@ export function getBaseURL (state, apiVersion = 'v4') { if (state.config) { + // const username = state.config.user_name; + // const host = state.config.account_host; + // return `https://${username}.${host}/api/${apiVersion}`; return `${state.config.base_url}/api/${apiVersion}`; - } else if (window.location.hostname === 'carto-staging.com') { - return `https://public.carto-staging.com/api/${apiVersion}`; } else { return `https://public.carto.com/api/${apiVersion}`; } diff --git a/lib/assets/javascripts/new-dashboard/utils/catalog/base-url.js b/lib/assets/javascripts/new-dashboard/utils/catalog/base-url.js new file mode 100644 index 0000000000..a9bd1501be --- /dev/null +++ b/lib/assets/javascripts/new-dashboard/utils/catalog/base-url.js @@ -0,0 +1,9 @@ +export function getBaseURL (state) { + if (state.config) { + const username = state.config.user_name; + const host = state.config.account_host; + return `https://${username}.${host}/api/v4`; + } else { + return 'https://public.carto.com/api/v4'; + } +} diff --git a/package-lock.json b/package-lock.json index 5648687ea7..01ab3f8031 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "1.0.0-assets.239", + "version": "1.0.0-assets.238", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0ffd9dc815..1b895eb80b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "1.0.0-assets.239", + "version": "1.0.0-assets.238", "description": "CARTO UI frontend", "repository": { "type": "git", From 7d8ab993dd57271545dba33e5ca4838ff6bf5617 Mon Sep 17 00:00:00 2001 From: cgonzalez Date: Tue, 13 Apr 2021 20:53:41 +0100 Subject: [PATCH 2/2] Skip assets version 239 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 01ab3f8031..b5bad66e2c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "1.0.0-assets.238", + "version": "1.0.0-assets.240", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 1b895eb80b..26127994bf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "1.0.0-assets.238", + "version": "1.0.0-assets.240", "description": "CARTO UI frontend", "repository": { "type": "git",