Merge branch 'master' into feature/sc-177364/feature-request-add-cloud-information-to

NEWS.md

@@ -13,8 +13,11 @@ Development
 * Bump ruby-saml to v1.12.2 [#16273](https://github.com/CartoDB/cartodb/pull/16273)
 * Bump cartodb-common to v1.1.2
 * Include DB connections, all parameters for Oauth connections, and the relationship between synchronizations and connections, in User migrations [#16287](https://github.com/CartoDB/cartodb/pull/16287)
+* Upgrade to CARTO Viewer v1.0.8 [16347](https://github.com/CartoDB/cartodb/pull/16347)
 
 ### Bug fixes / enhancements
+- Add "element" param to DO-Catalog entry function [#16343](https://github.com/CartoDB/cartodb/pull/16343)
+- Add new DO Catalog route for internal usage [#16342](https://github.com/CartoDB/cartodb/pull/16342)
 - Disable email validation in DO Premium Subscriptions [#16309](https://github.com/CartoDB/cartodb/pull/16309)
 - Hide sharing tab from viewer in on-premises [#16299](https://github.com/CartoDB/cartodb/pull/16299)
 - Remove all references to Spatial Data Catalog and Kepler GL maps in on-premises [#16293](https://github.com/CartoDB/cartodb/pull/16293)
@@ -54,6 +57,7 @@ Development
 - Fix wrong layer schema when creating a map from a shared dataset [#16323](https://github.com/CartoDB/cartodb/pull/16323)
 - Fix auto guessing when a csv field is wrong [#16326](https://github.com/CartoDB/cartodb/pull/16326)
 - Fix regenerating API Keys for a whole organization [#16336](https://github.com/CartoDB/cartodb/pull/16336)
+- Fix API Keys propagation to Redis function [#16340](https://github.com/CartoDB/cartodb/pull/16340)
 
 4.45.0 (2021-04-14)
 -------------------

app/models/carto/api_key.rb

@@ -662,6 +662,7 @@ module Carto
     end
 
     def valid_user?(new_user_attributes = {})
+      new_user_attributes ||= {}
       user.engine_enabled = new_user_attributes[:engine_enabled] if new_user_attributes[:engine_enabled].present?
       user.state = new_user_attributes[:state] if new_user_attributes[:state].present?
 

lib/assets/javascripts/do-catalog/main.js

@@ -8,23 +8,24 @@ import router from './router';
 
 Vue.config.productionTip = false;
 
-const el = process.env.NODE_ENV === 'development' ? '#app' : '#do-catalog';
-
 /* eslint-disable no-new */
-function execDataObservatoryCatalog () {
-  const app = new Vue({
-    el,
-    router,
-    store,
-    i18n,
-    components: { App },
-    template: '<App />'
-  });
-
-  return { app, router };
+function execDataObservatoryCatalog (el) {
+  if (document.querySelector(el)) {
+    const app = new Vue({
+      el,
+      router,
+      store,
+      i18n,
+      components: { App },
+      template: '<App />'
+    });
+
+    return { app, router };
+  }
 }
 
-execDataObservatoryCatalog();
+const el = process.env.NODE_ENV === 'development' ? '#app' : '#do-catalog';
+execDataObservatoryCatalog(el);
 
 window.createDataObservatoryCatalog = execDataObservatoryCatalog;
 

lib/assets/javascripts/do-catalog/router.js

@@ -23,6 +23,10 @@ const router = new Router({
         title: () => 'Spatial Data Catalog | CARTO'
       }
     },
+    {
+      path: '/do-catalog/internal',
+      redirect: { name: 'spatial-data-catalog' }
+    },
     {
       path: '/:entity_type/:entity_id',
       component: CatalogDataset,

lib/assets/javascripts/new-dashboard/pages/Data/CatalogDatasetData.vue

@@ -8,6 +8,7 @@
             <a
               v-if="variables && variables.length > 0"
               @click="scrollToVariables()"
+              id="viewDatasetVariables"
               class="is-small"
               >View {{ numberColumns }} variables list</a
             >
@@ -86,6 +87,7 @@
         v-if="variables && variables.length > 0"
         class="grid-cell--col12 u-mt--60"
         ref="variablesSection"
+        id="variablesSection"
       >
         <div class="u-flex u-flex__align--center u-flex__justify--between">
           <h2 class="grid-cell title is-caption is-txtMainTextColor">

lib/assets/javascripts/new-dashboard/store/mutations/catalog.js

@@ -27,13 +27,11 @@ export function setDataset (state, data) {
 
 export function setKeyVariables (state, data) {
   state.keyVariables = data;
-  state.isFetching = false;
   state.hasError = false;
 }
 
 export function setVariables (state, data) {
   state.variables = data;
-  state.isFetching = false;
   state.hasError = false;
 }
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "1.0.0-assets.261",
+  "version": "1.0.0-assets.264",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2753,8 +2753,8 @@
       }
     },
     "@carto/viewer": {
-      "version": "github:CartoDB/viewer#fcc862c5e872a4955623b386954ad21dfe467785",
-      "from": "github:CartoDB/viewer#v1.0.7",
+      "version": "github:CartoDB/viewer#fea8aa46b3cf1e1b635959eea9effe8495626689",
+      "from": "github:CartoDB/viewer#v1.0.8",
       "requires": {
         "@carto/react": "^1.0.0-beta5",
         "@material-ui/core": "^4.11.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "1.0.0-assets.261",
+  "version": "1.0.0-assets.264",
   "description": "CARTO UI frontend",
   "repository": {
     "type": "git",
@@ -23,7 +23,7 @@
     "@carto/carto.js": "^4.2.1",
     "@carto/toolkit-core": "0.0.1-rc.18",
     "@carto/toolkit-custom-storage": "0.0.1-rc.18",
-    "@carto/viewer": "github:CartoDB/viewer#v1.0.7",
+    "@carto/viewer": "github:CartoDB/viewer#v1.0.8",
     "@carto/zera": "1.0.7",
     "@deck.gl/carto": "8.5.6",
     "@deck.gl/core": "8.5.6",