diff --git a/NEWS.md b/NEWS.md
index 9964ff9304..c97eae391a 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -5,6 +5,7 @@ Development
- None yet
### Features
+* Update DO Catalog dependencies and some changes to use bundle on CARTO Workspace [#16325](https://github.com/CartoDB/cartodb/pull/16325)
* Send data to Hubspot when accessing datasets [#16313](https://github.com/CartoDB/cartodb/pull/16313)
* Request access to datasets directly from DO Catalog [#16291](https://github.com/CartoDB/cartodb/pull/16291)
* Adapt rake SAML parameters for the new version ruby-saml v1.12.2 [#16274](https://github.com/CartoDB/cartodb/pull/16274), [#16275](https://github.com/CartoDB/cartodb/pull/16275/)
diff --git a/lib/assets/javascripts/do-catalog/main.js b/lib/assets/javascripts/do-catalog/main.js
index c8a2fe1736..5d03027610 100644
--- a/lib/assets/javascripts/do-catalog/main.js
+++ b/lib/assets/javascripts/do-catalog/main.js
@@ -11,14 +11,22 @@ Vue.config.productionTip = false;
const el = process.env.NODE_ENV === 'development' ? '#app' : '#do-catalog';
/* eslint-disable no-new */
-new Vue({
- el,
- router,
- store,
- i18n,
- components: { App },
- template: ''
-});
+function execDataObservatoryCatalog () {
+ const app = new Vue({
+ el,
+ router,
+ store,
+ i18n,
+ components: { App },
+ template: ''
+ });
+
+ return { app, router };
+}
+
+execDataObservatoryCatalog();
+
+window.createDataObservatoryCatalog = execDataObservatoryCatalog;
// HTML integration
/*
diff --git a/lib/assets/javascripts/do-catalog/main.scss b/lib/assets/javascripts/do-catalog/main.scss
index 101273994b..a7980a97f4 100644
--- a/lib/assets/javascripts/do-catalog/main.scss
+++ b/lib/assets/javascripts/do-catalog/main.scss
@@ -11,9 +11,9 @@ $color-primary--dark: #3D33CC;
// layout
@import '../new-dashboard/styles/layout/cells';
+@import '../new-dashboard/styles/layout/container';
@import '../new-dashboard/styles/layout/grid';
@import '../new-dashboard/styles/layout/page';
-@import '../new-dashboard/styles/layout/section';
// components
@import '../new-dashboard/styles/components/buttons';
diff --git a/lib/assets/javascripts/do-catalog/router.js b/lib/assets/javascripts/do-catalog/router.js
index b91971be10..8ae517ff3f 100644
--- a/lib/assets/javascripts/do-catalog/router.js
+++ b/lib/assets/javascripts/do-catalog/router.js
@@ -7,8 +7,9 @@ import CatalogDatasetMap from 'new-dashboard/pages/Data/CatalogDatasetMap.vue';
import CatalogDatasetData from 'new-dashboard/pages/Data/CatalogDatasetData.vue';
import CatalogDatasetSummary from 'new-dashboard/pages/Data/CatalogDatasetSummary.vue';
-Vue.use(Router);
+const isCartoWorkspace = window.CARTO_WORKSPACE;
+Vue.use(Router);
const router = new Router({
mode: 'history',
base: '/spatial-data-catalog/browser/',
@@ -17,7 +18,7 @@ const router = new Router({
path: '/',
name: 'spatial-data-catalog',
component: Catalog,
- props: { publicWebsite: true },
+ props: { publicWebsite: true, isCartoWorkspace },
meta: {
title: () => 'Spatial Data Catalog | CARTO'
}
@@ -25,7 +26,7 @@ const router = new Router({
{
path: '/:entity_type/:entity_id',
component: CatalogDataset,
- props: { publicWebsite: true },
+ props: { publicWebsite: true, isCartoWorkspace },
meta: {
title: () => 'Spatial Data Catalog | CARTO'
},
diff --git a/lib/assets/javascripts/new-dashboard/assets/icons/common/back-long.svg b/lib/assets/javascripts/new-dashboard/assets/icons/common/back-long.svg
new file mode 100644
index 0000000000..71f99604c8
--- /dev/null
+++ b/lib/assets/javascripts/new-dashboard/assets/icons/common/back-long.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/lib/assets/javascripts/new-dashboard/components/Catalog/CatalogMap.vue b/lib/assets/javascripts/new-dashboard/components/Catalog/CatalogMap.vue
index a420150a2c..abe3d0791b 100644
--- a/lib/assets/javascripts/new-dashboard/components/Catalog/CatalogMap.vue
+++ b/lib/assets/javascripts/new-dashboard/components/Catalog/CatalogMap.vue
@@ -59,10 +59,16 @@ export default {
data () {
return {
map: null,
- showMap: false,
+ showMap: true,
variable: null,
geomType: null,
- initialViewState: null,
+ initialViewState: {
+ zoom: 1,
+ latitude: 0,
+ longitude: 0,
+ bearing: 0,
+ pitch: 0
+ },
centered: false
};
},
@@ -156,6 +162,7 @@ export default {
deck = new Deck({
canvas: 'deck-canvas',
+ initialViewState: this.initialViewState,
onViewStateChange: ({ viewState }) => {
this.syncMapboxViewState(viewState);
},
diff --git a/lib/assets/javascripts/new-dashboard/components/Subscriptions/SubscriptionAccess.vue b/lib/assets/javascripts/new-dashboard/components/Subscriptions/SubscriptionAccess.vue
index 5f01210546..1badd7ceef 100644
--- a/lib/assets/javascripts/new-dashboard/components/Subscriptions/SubscriptionAccess.vue
+++ b/lib/assets/javascripts/new-dashboard/components/Subscriptions/SubscriptionAccess.vue
@@ -55,12 +55,15 @@