Merge branch 'master' into feature/ch140093/axagroup-admin-dashboard-subscription-count

NEWS.md

@@ -119,7 +119,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)
 

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';

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}`;
   }

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';
+  }
+}

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "1.0.0-assets.239",
+  "version": "1.0.0-assets.240",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "1.0.0-assets.239",
+  "version": "1.0.0-assets.240",
   "description": "CARTO UI frontend",
   "repository": {
     "type": "git",