From b3d283c03f031b8ae8cf99e19d98586860ea74cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 10 Jul 2020 05:42:57 +0200 Subject: [PATCH 1/5] Change /do-catalog route to /spatial-data-catalog --- NEWS.md | 1 + config/routes.rb | 6 +- .../content/imports/import-options.js | 2 +- .../dataset-content-options.tpl | 2 +- .../new-dashboard/pages/Data/Data.vue | 2 +- .../{DOCatalog.vue => SpatialDataCatalog.vue} | 0 .../pages/Data/Subscriptions.vue | 2 +- .../new-dashboard/router/routes/data.js | 8 +- package-lock.json | 86 ++++++++----------- package.json | 4 +- 10 files changed, 52 insertions(+), 61 deletions(-) rename lib/assets/javascripts/new-dashboard/pages/Data/{DOCatalog.vue => SpatialDataCatalog.vue} (100%) diff --git a/NEWS.md b/NEWS.md index 1b4a36112cd2..8efffc6820f9 100644 --- a/NEWS.md +++ b/NEWS.md @@ -23,6 +23,7 @@ Development - Ignore update_timestamp function on migrations ([#15710](https://github.com/CartoDB/cartodb/pull/15710)) - Improve query builder performance ([#15725](https://github.com/CartoDB/cartodb/pull/15725)) - Avoid duplicates on data library loading ([#15720](https://github.com/CartoDB/cartodb/pull/15720)) +- Update DO catalog route 4.38.0 (2020-06-05) ------------------- diff --git a/config/routes.rb b/config/routes.rb index 31a8610dc4a2..9aa872af13c2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -181,9 +181,9 @@ get '(/user/:user_domain)(/u/:user_domain)/dashboard/datasets/subscriptions' => 'visualizations#index', as: :datasets_subscriptions_index get '(/user/:user_domain)(/u/:user_domain)/dashboard/datasets/catalog' => 'visualizations#index', as: :datasets_catalog_index get '(/user/:user_domain)(/u/:user_domain)/dashboard/datasets/catalog/:id' => 'visualizations#index', as: :ddatasets_catalog_show - get '(/user/:user_domain)(/u/:user_domain)/dashboard/datasets/do-catalog' => 'visualizations#index', as: :datasets_docatalog_index - get '(/user/:user_domain)(/u/:user_domain)/dashboard/datasets/do-catalog/:type/:id' => 'visualizations#index', as: :datasets_docatalog_dataset_summary - get '(/user/:user_domain)(/u/:user_domain)/dashboard/datasets/do-catalog/:type/:id/data' => 'visualizations#index', as: :datasets_docatalog_dataset_data + get '(/user/:user_domain)(/u/:user_domain)/dashboard/datasets/spatial-data-catalog' => 'visualizations#index', as: :datasets_docatalog_index + get '(/user/:user_domain)(/u/:user_domain)/dashboard/datasets/spatial-data-catalog/:type/:id' => 'visualizations#index', as: :datasets_docatalog_dataset_summary + get '(/user/:user_domain)(/u/:user_domain)/dashboard/datasets/spatial-data-catalog/:type/:id/data' => 'visualizations#index', as: :datasets_docatalog_dataset_data get '(/user/:user_domain)(/u/:user_domain)/dashboard/datasets/:page' => 'visualizations#index', as: :datasets_page get '(/user/:user_domain)(/u/:user_domain)/dashboard/datasets/tag/:tag' => 'visualizations#index', as: :datasets_tag get '(/user/:user_domain)(/u/:user_domain)/dashboard/datasets/tag/:tag/:page' => 'visualizations#index', as: :datasets_tag_page diff --git a/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-options.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-options.js index 10e95c34b431..28cd17278861 100755 --- a/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-options.js +++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-options.js @@ -252,7 +252,7 @@ module.exports = { options: { new: true, highlighted: true, - link: '/dashboard/datasets/do-catalog/' + link: '/dashboard/datasets/spatial-data-catalog/' } } }; diff --git a/lib/assets/javascripts/builder/dataset/dataset-content/dataset-content-options.tpl b/lib/assets/javascripts/builder/dataset/dataset-content/dataset-content-options.tpl index fb9a81087c8a..6daa5406978e 100755 --- a/lib/assets/javascripts/builder/dataset/dataset-content/dataset-content-options.tpl +++ b/lib/assets/javascripts/builder/dataset/dataset-content/dataset-content-options.tpl @@ -3,7 +3,7 @@
<% if (isSubscription) { %> <%- subscriptionName %> - <%- _t('dataset.subscriptions.view-subscription') %> + <%- _t('dataset.subscriptions.view-subscription') %> <% } %>
diff --git a/lib/assets/javascripts/new-dashboard/pages/Data/Data.vue b/lib/assets/javascripts/new-dashboard/pages/Data/Data.vue index 9c157ffc048b..d9ef9dcef02c 100644 --- a/lib/assets/javascripts/new-dashboard/pages/Data/Data.vue +++ b/lib/assets/javascripts/new-dashboard/pages/Data/Data.vue @@ -9,7 +9,7 @@ {{ $t('DataPage.tabs.yourSubscriptions') }} --> - + {{ $t('Subscriptions.do') }} diff --git a/lib/assets/javascripts/new-dashboard/pages/Data/DOCatalog.vue b/lib/assets/javascripts/new-dashboard/pages/Data/SpatialDataCatalog.vue similarity index 100% rename from lib/assets/javascripts/new-dashboard/pages/Data/DOCatalog.vue rename to lib/assets/javascripts/new-dashboard/pages/Data/SpatialDataCatalog.vue diff --git a/lib/assets/javascripts/new-dashboard/pages/Data/Subscriptions.vue b/lib/assets/javascripts/new-dashboard/pages/Data/Subscriptions.vue index e7f669afab41..24edbd6d26f1 100644 --- a/lib/assets/javascripts/new-dashboard/pages/Data/Subscriptions.vue +++ b/lib/assets/javascripts/new-dashboard/pages/Data/Subscriptions.vue @@ -9,7 +9,7 @@ > - + diff --git a/lib/assets/javascripts/new-dashboard/router/routes/data.js b/lib/assets/javascripts/new-dashboard/router/routes/data.js index 6970b1520c4b..d70b0e2a1c25 100644 --- a/lib/assets/javascripts/new-dashboard/router/routes/data.js +++ b/lib/assets/javascripts/new-dashboard/router/routes/data.js @@ -6,7 +6,7 @@ import { doCatalogRoutes } from '@carto/common-ui'; const Data = () => import('new-dashboard/pages/Data/Data'); const Datasets = () => import('new-dashboard/pages/Data/Datasets'); // const Subscriptions = () => import('new-dashboard/pages/Data/Subscriptions'); -const DOCatalog = () => import('new-dashboard/pages/Data/DOCatalog'); +const SpatialDataCatalog = () => import('new-dashboard/pages/Data/SpatialDataCatalog'); const routes = [ { @@ -25,10 +25,10 @@ const routes = [ // } // }, { - path: 'do-catalog', - component: DOCatalog, + path: 'spatial-data-catalog', + component: SpatialDataCatalog, meta: { - title: () => 'Data Observatory Catalog | CARTO' + title: () => 'Spatial Data Catalog | CARTO' }, children: [...doCatalogRoutes] }, diff --git a/package-lock.json b/package-lock.json index 6bb1827233d8..98a5f6b24751 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "1.0.0-assets.186", + "version": "1.0.0-assets.186-do-catalog", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1524,21 +1524,24 @@ "backbone": "1.2.3", "backbone-poller": "^1.1.3", "camshaft-reference": "0.34.0", + "carto": "github:cartodb/carto#master", "clip-path-polygon": "0.1.12", "d3-array": "1.2.1", "d3-format": "1.2.0", "d3-time-format": "2.1.0", "jquery": "2.1.4", "mustache": "1.1.0", + "perfect-scrollbar": "git://github.com/CartoDB/perfect-scrollbar.git#master", "postcss": "5.0.19", "promise-polyfill": "^6.1.0", + "torque.js": "github:CartoDB/torque#master", "underscore": "1.8.3", "whatwg-fetch": "^2.0.3" }, "dependencies": { "carto": { "version": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", - "from": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", + "from": "github:cartodb/carto#master", "requires": { "mapnik-reference": "~6.0.2", "optimist": "~0.6.0", @@ -1547,34 +1550,23 @@ }, "perfect-scrollbar": { "version": "git://github.com/CartoDB/perfect-scrollbar.git#f2b66c76ad3718d3c704bd7e1693ea382e44e64d", - "from": "git://github.com/CartoDB/perfect-scrollbar.git#f2b66c76ad3718d3c704bd7e1693ea382e44e64d" + "from": "git://github.com/CartoDB/perfect-scrollbar.git#master" }, "torque.js": { "version": "github:CartoDB/torque#11b73bbc9a55b7c67c1ab72759a58eb417b88555", - "from": "github:CartoDB/torque#11b73bbc9a55b7c67c1ab72759a58eb417b88555", + "from": "github:CartoDB/torque#master", "requires": { - "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", + "carto": "github:cartodb/carto#master", "d3": "3.5.17", "turbo-carto": "^0.21.1", "turf-jenks": "~1.0.1" - }, - "dependencies": { - "carto": { - "version": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", - "from": "github:cartodb/carto#master", - "requires": { - "mapnik-reference": "~6.0.2", - "optimist": "~0.6.0", - "underscore": "1.8.3" - } - } } } } }, "@carto/common-ui": { - "version": "git://github.com/CartoDB/common-ui.git#4906ced96d4260ed4d69ff7f635f27ea9023be6b", - "from": "git://github.com/CartoDB/common-ui.git#v0.1.2", + "version": "git://github.com/CartoDB/common-ui.git#529413976b0eba65d4d788e53c7b0245bb15e4a0", + "from": "git://github.com/CartoDB/common-ui.git#master", "requires": { "core-js": "^3.6.4", "vue": "^2.6.11", @@ -1599,9 +1591,9 @@ "integrity": "sha512-w7oJzmHQs0FM9LXodfskhw9wgKBiaB+totOdb8sNzbTB2KDCEEwEs29NzBZFh/lmEK1t5tDmM1vtsO7ubG1DFw==" }, "whatwg-fetch": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.1.0.tgz", - "integrity": "sha512-pgmbsVWKpH9GxLXZmtdowDIqtb/rvPyjjQv3z9wLcmgWKFHilKnZD3ldgrOlwJoPGOUluQsRPWd52yVkPfmI1A==" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.2.0.tgz", + "integrity": "sha512-SdGPoQMMnzVYThUbSrEvqTlkvC1Ux27NehaJ/GUHBfNrh5Mjg+1/uRyFMwVnxO2MrikMWvWAqUGgQOfVU4hT7w==" } } }, @@ -3481,7 +3473,7 @@ "are-we-there-yet": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", - "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", + "integrity": "sha1-SzXClE8GKov82mZBB2A1D+nd/CE=", "dev": true, "requires": { "delegates": "^1.0.0", @@ -7291,7 +7283,7 @@ "deep-extend": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "integrity": "sha1-xPp8lUBKF6nD6Mp+FTcxK3NjMKw=", "dev": true, "optional": true }, @@ -7439,7 +7431,8 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", - "dev": true + "dev": true, + "optional": true }, "detect-newline": { "version": "3.1.0", @@ -11195,21 +11188,24 @@ "backbone": "1.2.3", "backbone-poller": "^1.1.3", "camshaft-reference": "0.34.0", + "carto": "github:cartodb/carto#master", "clip-path-polygon": "0.1.12", "d3-array": "1.2.1", "d3-format": "1.2.0", "d3-time-format": "2.1.0", "jquery": "2.1.4", "mustache": "1.1.0", + "perfect-scrollbar": "git://github.com/CartoDB/perfect-scrollbar.git#master", "postcss": "5.0.19", "promise-polyfill": "^6.1.0", + "torque.js": "github:CartoDB/torque#master", "underscore": "1.8.3", "whatwg-fetch": "^2.0.3" }, "dependencies": { "carto": { "version": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", - "from": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", + "from": "github:cartodb/carto#master", "requires": { "mapnik-reference": "~6.0.2", "optimist": "~0.6.0", @@ -11218,27 +11214,16 @@ }, "perfect-scrollbar": { "version": "git://github.com/CartoDB/perfect-scrollbar.git#f2b66c76ad3718d3c704bd7e1693ea382e44e64d", - "from": "git://github.com/CartoDB/perfect-scrollbar.git#f2b66c76ad3718d3c704bd7e1693ea382e44e64d" + "from": "git://github.com/CartoDB/perfect-scrollbar.git#master" }, "torque.js": { "version": "github:CartoDB/torque#11b73bbc9a55b7c67c1ab72759a58eb417b88555", - "from": "github:CartoDB/torque#11b73bbc9a55b7c67c1ab72759a58eb417b88555", + "from": "github:CartoDB/torque#master", "requires": { - "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", + "carto": "github:cartodb/carto#master", "d3": "3.5.17", "turbo-carto": "^0.21.1", "turf-jenks": "~1.0.1" - }, - "dependencies": { - "carto": { - "version": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", - "from": "github:cartodb/carto#master", - "requires": { - "mapnik-reference": "~6.0.2", - "optimist": "~0.6.0", - "underscore": "1.8.3" - } - } } } } @@ -15210,7 +15195,7 @@ "node-gyp": { "version": "3.8.0", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", - "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", + "integrity": "sha1-VAMEJhwzDoDQ1e3OJTpoyzlkIYw=", "dev": true, "requires": { "fstream": "^1.0.0", @@ -15561,7 +15546,7 @@ "npmlog": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=", "dev": true, "requires": { "are-we-there-yet": "~1.1.2", @@ -17718,7 +17703,7 @@ "rc": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "integrity": "sha1-zZJL9SAKB1uDwYjNa54hG3/A0+0=", "dev": true, "optional": true, "requires": { @@ -19493,7 +19478,7 @@ "stdout-stream": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz", - "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", + "integrity": "sha1-WsF0zdXNcmEEqgwLK9g4FdjVNd4=", "dev": true, "requires": { "readable-stream": "^2.0.1" @@ -20929,6 +20914,7 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "dev": true, + "optional": true, "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -20939,13 +20925,15 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true + "dev": true, + "optional": true }, "string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "dev": true, + "optional": true, "requires": { "safe-buffer": "~5.2.0" } @@ -21281,6 +21269,7 @@ "version": "github:CartoDB/torque#23101417f2774217b42ac4088119ccb80798b088", "from": "github:CartoDB/torque#master", "requires": { + "carto": "github:cartodb/carto#master", "d3": "3.5.17", "turbo-carto": "^0.21.1", "turf-jenks": "~1.0.1" @@ -21288,7 +21277,7 @@ "dependencies": { "carto": { "version": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", - "from": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", + "from": "github:cartodb/carto#master", "requires": { "mapnik-reference": "~6.0.2", "optimist": "~0.6.0", @@ -21418,7 +21407,7 @@ "true-case-path": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", - "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", + "integrity": "sha1-+BO1qMhrQNpZYGcisUTjIleZ9H0=", "dev": true, "requires": { "glob": "^7.1.2" @@ -23110,12 +23099,13 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz", "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=", - "dev": true + "dev": true, + "optional": true }, "wide-align": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "integrity": "sha1-rgdOa9wMFKQx6ATmJFScYzsABFc=", "dev": true, "requires": { "string-width": "^1.0.2 || 2" diff --git a/package.json b/package.json index 7f99454542b7..bb2b9612eb01 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "1.0.0-assets.186", + "version": "1.0.0-assets.186-do-catalog", "description": "CARTO UI frontend", "repository": { "type": "git", @@ -20,7 +20,7 @@ "@babel/runtime": "^7.9.2", "@babel/runtime-corejs3": "^7.9.2", "@carto/carto.js": "^4.1.10", - "@carto/common-ui": "git://github.com/CartoDB/common-ui.git#v0.1.2", + "@carto/common-ui": "git://github.com/CartoDB/common-ui.git#master", "@carto/toolkit-core": "0.0.1-rc.18", "@carto/toolkit-custom-storage": "0.0.1-rc.18", "@carto/zera": "1.0.7", From b7a770963115f6248883a5ab927d0126273aefc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 10 Jul 2020 06:41:42 +0200 Subject: [PATCH 2/5] Change name to Spatial Data Catalog --- lib/assets/javascripts/new-dashboard/i18n/locales/en.json | 3 +-- lib/assets/javascripts/new-dashboard/pages/Data/Data.vue | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/assets/javascripts/new-dashboard/i18n/locales/en.json b/lib/assets/javascripts/new-dashboard/i18n/locales/en.json index 31ad872a55b1..ecf1beaa3a13 100644 --- a/lib/assets/javascripts/new-dashboard/i18n/locales/en.json +++ b/lib/assets/javascripts/new-dashboard/i18n/locales/en.json @@ -92,7 +92,7 @@ "tabs": { "yourDatasets": "Your Datasets", "yourSubscriptions": "Your Subscriptions", - "catalog": "Catalog" + "spatialDataCatalog": "Spatial Data Catalog" } }, "MapsPage": { @@ -756,7 +756,6 @@ "emptyCase": "No subscriptions yet", "exploreDescription": "Explore the Data Catalog and subscribe to one of our Public or Premium datasets; then you will find it here.", "goDo": "Go to Data Observatory", - "do": "Data Observatory Catalog", "new": "New subscriptions", "exploreNotebook": "Explore Notebook", "datasetSize": "Dataset size" diff --git a/lib/assets/javascripts/new-dashboard/pages/Data/Data.vue b/lib/assets/javascripts/new-dashboard/pages/Data/Data.vue index d9ef9dcef02c..f20191a4418d 100644 --- a/lib/assets/javascripts/new-dashboard/pages/Data/Data.vue +++ b/lib/assets/javascripts/new-dashboard/pages/Data/Data.vue @@ -9,8 +9,8 @@ {{ $t('DataPage.tabs.yourSubscriptions') }} --> - - {{ $t('Subscriptions.do') }} + + {{ $t('DataPage.tabs.spatialDataCatalog') }} From 617e7824ca12ca3abc284963597ddc4e676afc81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Mon, 13 Jul 2020 10:11:07 +0200 Subject: [PATCH 3/5] Update common-ui --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 98a5f6b24751..9030474b1c29 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1565,7 +1565,7 @@ } }, "@carto/common-ui": { - "version": "git://github.com/CartoDB/common-ui.git#529413976b0eba65d4d788e53c7b0245bb15e4a0", + "version": "git://github.com/CartoDB/common-ui.git#44f275214c1ae2f9da277ca95b20267e733251c2", "from": "git://github.com/CartoDB/common-ui.git#master", "requires": { "core-js": "^3.6.4", From 0d3431a347bcccac48e383cd09af16fe03b65e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Mon, 13 Jul 2020 17:13:32 +0200 Subject: [PATCH 4/5] Update common-ui --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 9030474b1c29..cb1b34d1785f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1565,7 +1565,7 @@ } }, "@carto/common-ui": { - "version": "git://github.com/CartoDB/common-ui.git#44f275214c1ae2f9da277ca95b20267e733251c2", + "version": "git://github.com/CartoDB/common-ui.git#8376d7316d7fcc992847459ea8da9ce623e45f69", "from": "git://github.com/CartoDB/common-ui.git#master", "requires": { "core-js": "^3.6.4", From a9cae17fa506ee5833b80e618d558c6c1cd7bd97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 15 Jul 2020 13:51:12 +0200 Subject: [PATCH 5/5] Point to common-ui v0.1.3 --- package-lock.json | 6 +++--- package.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index cb1b34d1785f..2ac5da639450 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "1.0.0-assets.186-do-catalog", + "version": "1.0.0-assets.187", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1565,8 +1565,8 @@ } }, "@carto/common-ui": { - "version": "git://github.com/CartoDB/common-ui.git#8376d7316d7fcc992847459ea8da9ce623e45f69", - "from": "git://github.com/CartoDB/common-ui.git#master", + "version": "git://github.com/CartoDB/common-ui.git#a08de90caa6eec9fc98661846ea912bc459ed8f5", + "from": "git://github.com/CartoDB/common-ui.git#v0.1.3", "requires": { "core-js": "^3.6.4", "vue": "^2.6.11", diff --git a/package.json b/package.json index bb2b9612eb01..649e84ecd6e2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "1.0.0-assets.186-do-catalog", + "version": "1.0.0-assets.187", "description": "CARTO UI frontend", "repository": { "type": "git", @@ -20,7 +20,7 @@ "@babel/runtime": "^7.9.2", "@babel/runtime-corejs3": "^7.9.2", "@carto/carto.js": "^4.1.10", - "@carto/common-ui": "git://github.com/CartoDB/common-ui.git#master", + "@carto/common-ui": "git://github.com/CartoDB/common-ui.git#v0.1.3", "@carto/toolkit-core": "0.0.1-rc.18", "@carto/toolkit-custom-storage": "0.0.1-rc.18", "@carto/zera": "1.0.7",