Merge pull request #15742 from CartoDB/do-catalog

DO catalog fixes / improvements
CartoDB · Jul 15, 2020 · 480a7f6 · 480a7f6
2 parents 70c7ee6 + a9cae17
commit 480a7f6
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 63 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -24,6 +24,7 @@ Development
 - Improve query builder performance ([#15725](https://github.com/CartoDB/cartodb/pull/15725))
 - Upgrade rails to 4.2.11.3 ([#15737](https://github.com/CartoDB/cartodb/pull/15737)) 
 - Avoid duplicates on data library loading ([#15720](https://github.com/CartoDB/cartodb/pull/15720))
+- Update DO catalog route ([#15742](https://github.com/CartoDB/cartodb/pull/15742))
 - Fixes CARTO attributions link
 
 4.38.0 (2020-06-05)

diff --git 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
@@ -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
@@ -3,7 +3,7 @@
   <div class="subscription">
     <% if (isSubscription) { %>
       <span class="Tag Tag--Subscription"><%- subscriptionName %></span>
-      <a class="CDB-Text CDB-Size-small is-semibold u-actionTextColor u-upperCase" href="<%- baseUrl %>/dashboard/datasets/do-catalog/dataset/<%- subscriptionId %>" target="_blank"><%- _t('dataset.subscriptions.view-subscription') %></a>
+      <a class="CDB-Text CDB-Size-small is-semibold u-actionTextColor u-upperCase" href="<%- baseUrl %>/dashboard/datasets/spatial-data-catalog/dataset/<%- subscriptionId %>" target="_blank"><%- _t('dataset.subscriptions.view-subscription') %></a>
     <% } %>
   </div>
 </div>

diff --git 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
@@ -10,7 +10,7 @@
         </router-link> -->
       </div>
       <router-link :to="{ name: 'do-catalog' }" class="tabs__item title is-small" exact active-class="is-active" style="margin-left: auto;">
-        <span>{{ $t('Subscriptions.do') }}</span>
+        <span>{{ $t('DataPage.tabs.spatialDataCatalog') }}</span>
       </router-link>
     </SecondaryNavigation>
     <router-view></router-view>

diff --git a/...ts/new-dashboard/pages/Data/DOCatalog.vue → ...shboard/pages/Data/SpatialDataCatalog.vue b/...ts/new-dashboard/pages/Data/DOCatalog.vue → ...shboard/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
@@ -9,7 +9,7 @@
           >
             <img svg-inline src="../../assets/icons/subscriptions/subscriptions-icon.svg">
           </EmptyState>
-          <router-link :to="{ name: 'do-catalog' }">
+          <router-link :to="{ name: 'spatial-data-catalog' }">
             <button class="button is-primary goDo">{{$t('Subscriptions.goDo')}}</button>
           </router-link>
         </div>

diff --git 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
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "1.0.0-assets.186",
+  "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#v0.1.2",
+    "@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",