From 0f7c4fffdc0158553c2bb1fb6d3026fc09979101 Mon Sep 17 00:00:00 2001
From: Ivan Moreno
Date: Wed, 31 Mar 2021 17:36:44 +0200
Subject: [PATCH] Show dataset version in subscription list and details
(#16235)
---
NEWS.md | 2 +
babel.config.json | 6 +
lib/assets/javascripts/do-catalog/main.js | 1 +
.../components/Catalog/DatasetHeader.vue | 2 +-
.../Catalog/browser/DatasetListItem.vue | 27 +-
lib/assets/javascripts/new-dashboard/main.js | 1 +
.../pages/Data/CatalogDatasetSummary.vue | 16 +
.../javascripts/new-dashboard/polyfills.js | 3 +
package-lock.json | 4721 +++++++++++++----
package.json | 12 +-
vue.config.js | 3 +
11 files changed, 3779 insertions(+), 1015 deletions(-)
create mode 100644 lib/assets/javascripts/new-dashboard/polyfills.js
diff --git a/NEWS.md b/NEWS.md
index 6e52e0e004cd..ca156427c642 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -106,6 +106,8 @@ sudo make install
- Modify superadmin users activity endpoint to allow pagination [#16226](https://github.com/CartoDB/cartodb/pull/16226)
- Update cartodb-common to v1.1.1, which contains serveral logging fixes [#16182](https://github.com/CartoDB/cartodb/pull/16182)
- Read config for public statics compilation [#16234](https://github.com/CartoDB/cartodb/pull/16234)
+- Show dataset version in subscription list and details [#16235](https://github.com/CartoDB/cartodb/pull/16235)
+- Fix error that avoid to render Spatial Data Catalog properly in Internet Explorer [#16236](https://github.com/CartoDB/cartodb/pull/16236)
4.44.0 (2020-11-20)
-------------------
diff --git a/babel.config.json b/babel.config.json
index fc441e7b2358..00ef6a9671b1 100644
--- a/babel.config.json
+++ b/babel.config.json
@@ -7,9 +7,12 @@
"corejs": 3
}
],
+ "@vue/cli-plugin-babel/preset",
"@babel/preset-react"
],
"plugins": [
+ "@babel/plugin-proposal-export-default-from",
+ "@babel/plugin-transform-arrow-functions",
"@babel/plugin-proposal-object-rest-spread",
"@babel/plugin-transform-classes",
"@babel/plugin-transform-object-assign",
@@ -25,9 +28,12 @@
"test": {
"presets": [
["@babel/env"],
+ "@vue/cli-plugin-babel/preset",
"@babel/preset-react"
],
"plugins": [
+ "@babel/plugin-proposal-export-default-from",
+ "@babel/plugin-transform-arrow-functions",
"@babel/plugin-proposal-object-rest-spread",
"@babel/plugin-transform-classes",
"@babel/plugin-transform-object-assign",
diff --git a/lib/assets/javascripts/do-catalog/main.js b/lib/assets/javascripts/do-catalog/main.js
index aa945d492239..c8a2fe1736e1 100644
--- a/lib/assets/javascripts/do-catalog/main.js
+++ b/lib/assets/javascripts/do-catalog/main.js
@@ -1,3 +1,4 @@
+import 'babel-polyfill';
import Vue from 'vue';
import App from './App.vue';
diff --git a/lib/assets/javascripts/new-dashboard/components/Catalog/DatasetHeader.vue b/lib/assets/javascripts/new-dashboard/components/Catalog/DatasetHeader.vue
index 58603a321057..6ad63e8dc3a6 100644
--- a/lib/assets/javascripts/new-dashboard/components/Catalog/DatasetHeader.vue
+++ b/lib/assets/javascripts/new-dashboard/components/Catalog/DatasetHeader.vue
@@ -10,7 +10,7 @@
}}
/
{{
- dataset.data_source_name
+ dataset.provider_name
}}
diff --git a/lib/assets/javascripts/new-dashboard/components/Catalog/browser/DatasetListItem.vue b/lib/assets/javascripts/new-dashboard/components/Catalog/browser/DatasetListItem.vue
index c0a574940faf..4a31f27967fc 100644
--- a/lib/assets/javascripts/new-dashboard/components/Catalog/browser/DatasetListItem.vue
+++ b/lib/assets/javascripts/new-dashboard/components/Catalog/browser/DatasetListItem.vue
@@ -38,7 +38,7 @@
v-if="!dataset.is_geography && !minimal"
>
License
{{ dataset.license_name }}
@@ -46,13 +46,20 @@
Placetype
{{ dataset.placetype_name }}
+
+
Temporal aggr.
{{ temporalAggregation }}
+
-
+
+
Version
{{ dataset.version }}
+
+
Temporal aggr.
{{ temporalAggregation }}
+