zhongjin
/
cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DO Catalog link in new dataset [ch83967]

Browse Source
pull/15704/head
Raúl Yeguas 4 years ago
parent 103c5405ea
commit d83a9924b8
12 changed files with 151 additions and 26 deletions
Show Stats Download Patch File Download Diff File

63
app/assets/images/layout/connectors/dataobservatory.svg
Unescape View File

@ -0,0 +1,63 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="26px" height="28px" viewBox="0 0 26 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 64 (93537) - https://sketch.com -->
<title>dataobservatory.6b9db5ec</title>
<desc>Created with Sketch.</desc>
<defs>
<rect id="path-1" x="0" y="0" width="5.91133005" height="3.26808511"></rect>
<polygon id="path-3" points="0.0785846037 1.20885251 10.1935271 0.0416792608 10.1935271 5.87754552 0.0785846037 4.71037227"></polygon>
<polygon id="path-5" points="0.019032125 1.50011938 13.2948942 0.243163569 13.2948942 11.5557659 0.019032125 10.2988101"></polygon>
</defs>
<g id="Catalog" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Data-&gt;-Connect" transform="translate(-325.000000, -119.000000)">
<g id="data-observatory" transform="translate(316.000000, 108.000000)">
<g id="dataobservatory.6b9db5ec" transform="translate(9.000000, 10.000000)">
<rect id="Rectangle-2" fill="#FFFFFF" fill-rule="nonzero" x="13" y="25" width="1" height="3"></rect>
<polygon id="Rectangle-2" fill="#FFFFFF" fill-rule="nonzero" points="10.5669873 23.1519238 11.4330127 23.5975579 8.4330127 28.228723 7.5669873 27.783089"></polygon>
<polygon id="Rectangle-2" fill="#FFFFFF" fill-rule="nonzero" points="15.5669873 23.5975579 16.4330127 23.1519238 19.4330127 27.783089 18.5669873 28.228723"></polygon>
<rect id="Rectangle-2" fill="#FFFFFF" fill-rule="nonzero" x="13" y="15" width="2" height="6"></rect>
<g id="Rectangle-3" transform="translate(11.000000, 22.000000)">
<g id="path-1-Clipped">
<g>
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<g id="path-1"></g>
<rect id="path-1" fill="#FFFFFF" fill-rule="nonzero" mask="url(#mask-2)" x="0" y="0" width="5.91133005" height="2.26808511"></rect>
</g>
</g>
</g>
<g id="Rectangle-6" transform="translate(6.500000, 15.000000) rotate(-25.000000) translate(-6.500000, -15.000000) translate(1.000000, 12.000000)">
<g id="path-5-Clipped">
<g>
<mask id="mask-4" fill="white">
<use xlink:href="#path-3"></use>
</mask>
<g id="path-5"></g>
<polygon id="path-5" stroke="#2E51E8" stroke-width="2" fill="#FFFFFF" fill-rule="nonzero" mask="url(#mask-4)" points="0.501202865 0.302544726 9.42261826 -0.864628526 9.42261826 4.97123774 0.501202865 3.80406448"></polygon>
</g>
</g>
</g>
<g id="Rectangle-6" transform="translate(21.788691, 7.046846) rotate(-25.000000) translate(-21.788691, -7.046846) translate(19.788691, 1.046846)" fill="#FFFFFF" fill-rule="nonzero">
<g id="path-3-Clipped">
<g id="path-3">
<rect x="0.224679945" y="5.20472554e-13" width="2.77532006" height="12"></rect>
</g>
</g>
</g>
<g id="Rectangle-6" transform="translate(16.000000, 10.000000) rotate(-25.000000) translate(-16.000000, -10.000000) translate(9.000000, 4.000000)">
<g id="path-7-Clipped">
<g>
<mask id="mask-6" fill="white">
<use xlink:href="#path-5"></use>
</mask>
<g id="path-7"></g>
<polygon id="path-7" stroke="#2E51E8" stroke-width="2" fill="#FFFFFF" fill-rule="nonzero" mask="url(#mask-6)" points="0.019032125 1.50011938 11 0.243163569 11 11.5557659 0.019032125 10.2988101"></polygon>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

1
app/helpers/frontend_config_helper.rb
Unescape View File

@ -39,6 +39,7 @@ module FrontendConfigHelper
config[:postgres_enabled] = Cartodb.get_config(:connectors, 'postgres', 'enabled')
config[:sqlserver_enabled] = Cartodb.get_config(:connectors, 'sqlserver', 'enabled')
config[:hive_enabled] = Cartodb.get_config(:connectors, 'hive', 'enabled')
config[:dataobservatory_enabled] = Cartodb.get_config(:connectors, 'dataobservatory', 'enabled')
config[:max_asset_file_size] = Cartodb.get_config(:assets, 'max_file_size')
config[:watcher_ttl] = Cartodb.get_config(:watcher, 'ttl') || 60
config[:licenses] = Carto::License.all

16
assets/stylesheets/common/create/listing/imports_options.scss
Unescape View File

@ -178,7 +178,8 @@ $import-button-width: 174px;
}
&:not(.is-enterprise) .ImportButton__tag--beta,
&:not(.is-enterprise) .ImportButton__tag--soon {
&:not(.is-enterprise) .ImportButton__tag--soon,
&:not(.is-enterprise) .ImportButton__tag--new {
@extend .ImportButton__tag:first-of-type;
}
@ -292,8 +293,20 @@ $import-button-width: 174px;
}
}
.is-highlighted {
background-color: $cNavyBlue;
color: $cStructure-grayBkg;
border-color: transparent;
.ImportButton__tag {
background-color: rgba(255, 255, 255, 0.16);
border-color: transparent;
}
}
.is-beta .ImportButton__tag--beta,
.is-soon .ImportButton__tag--soon,
.is-new .ImportButton__tag--new,
.is-enterprise .ImportButton__tag--enterprise {
display: inline-block;
}
@ -327,6 +340,7 @@ $import-button-width: 174px;
@include importIcon(postgresql);
@include importIcon(arcgis);
@include importIcon(twitter);
@include importIcon(dataobservatory);
.SelectedImport {
&__header {

1
assets/stylesheets/variables/colors.scss
Unescape View File

@ -58,3 +58,4 @@ $cNotification: #73C86B;
// CARTO colors
$cLocationBlue: #1785FB;
$cNavyBlue: #2e51e8;

3
config/app_config.yml.sample
Unescape View File

@ -764,6 +764,9 @@ defaults: &defaults
bigquery:
enabled: false
max_rows: 1000000
dataobservatory:
enabled: true
max_rows: 1000000
enforce_non_empty_layer_css: false
dataservices:
enabled:

3
config/routes.rb
Unescape View File

@ -178,7 +178,8 @@ CartoDB::Application.routes.draw do
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/summary' => 'visualizations#index', as: :datasets_docatalog_summary
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/: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

12
lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-options.js
Unescape View File

@ -236,5 +236,17 @@ module.exports = {
name: 'hive',
title: 'Hive',
type: 'database'
},
DataObservatory: {
view: null,
enabled: function (config, userModel) { return config.get('dataobservatory_enabled'); },
name: 'dataobservatory',
title: 'CARTO Data Observatory',
type: 'dataobservatory',
options: {
new: true,
highlighted: true,
link: '/dashboard/datasets/do-catalog/'
}
}
};

1
lib/assets/javascripts/builder/components/modals/add-layer/content/imports/imports-selector/import-button.tpl
Unescape View File

@ -4,6 +4,7 @@
<div class="ImportButton__tag ImportButton__tag--enterprise"><%- _t('components.modals.add-layer.imports.tags.enterprise') %></div>
<div class="ImportButton__tag ImportButton__tag--beta"><%- _t('components.modals.add-layer.imports.tags.beta') %></div>
<div class="ImportButton__tag ImportButton__tag--soon"><%- _t('components.modals.add-layer.imports.tags.soon') %></div>
<div class="ImportButton__tag ImportButton__tag--new"><%- _t('components.modals.add-layer.imports.tags.new') %></div>
</div>
<i class='ImportButton__icon is-<%- name %>'></i>
<span class="ImportButton__name"><%= cdb.core.sanitize.html(title || name) %></span>

9
lib/assets/javascripts/builder/components/modals/add-layer/content/imports/imports-selector/imports-selector-model.js
Unescape View File

@ -41,6 +41,11 @@ module.exports = Backbone.Model.extend({
'description': null,
'enabled': false
},
'dataobservatory': {
'name': 'CARTO Data Observatory',
'description': null,
'enabled': false
},
loaded: false
},
@ -137,5 +142,9 @@ module.exports = Backbone.Model.extend({
_isBigQueryImportEnabled: function () {
return this.get('bigquery').enabled;
},
_isDataObservatoryEnabled: function () {
return this.get('dataobservatory').enabled;
}
});

47
lib/assets/javascripts/builder/components/modals/add-layer/content/imports/imports-selector/imports-selector-view.js
Unescape View File

@ -19,7 +19,8 @@ const REQUIRED_OPTS = [
const IMPORTER_TYPES = {
cloud: 'cloud',
database: 'database',
other: 'other'
other: 'other',
dataobservatory: 'dataobservatory'
};
/**
@ -81,6 +82,9 @@ module.exports = CoreView.extend({
this.clearSubViews();
this.$el.empty();
this.$el.append(CategoryTitleTemplate({ title: '' }));
this._generateImportButtons(IMPORTER_TYPES.dataobservatory);
this.$el.append(CategoryTitleTemplate({
title: 'Cloud Storage'
}));
@ -184,6 +188,14 @@ module.exports = CoreView.extend({
if (importConfig.options && importConfig.options.soon) {
importButton.$el.addClass('is-soon');
}
if (importConfig.options && importConfig.options.new) {
importButton.$el.addClass('is-new');
}
if (importConfig.options && importConfig.options.highlighted) {
importButton.$el.addClass('is-highlighted');
}
},
_onImportSelected: function (selectedImport) {
@ -192,19 +204,26 @@ module.exports = CoreView.extend({
const enabled = this.model._isImportEnabled(opts);
if ((enabled || enabled === undefined)) {
const ImportView = opts.importView;
importContent = new ImportView(
_.extend(
opts,
{
userModel: this._userModel,
configModel: this._configModel,
createModel: this._createModel,
privacyModel: this._privacyModel,
guessingModel: this._guessingModel
}
)
);
// Import wizard view
if (opts.importView) {
const ImportView = opts.importView;
importContent = new ImportView(
_.extend(
opts,
{
userModel: this._userModel,
configModel: this._configModel,
createModel: this._createModel,
privacyModel: this._privacyModel,
guessingModel: this._guessingModel
}
)
);
// Link to elsewhere in dashboard
} else if (opts.link) {
window.location.pathname = opts.link;
return;
}
}
this.trigger('selectImport', importContent, this);

3
lib/assets/javascripts/locale/en.json
Unescape View File

@ -1412,7 +1412,8 @@
"tags": {
"enterprise": "Enterprise",
"beta": "Beta",
"soon": "Soon"
"soon": "Soon",
"new": "New"
},
"request": {
"other": "Request connector",

18
lib/assets/javascripts/new-dashboard/router/routes/data.js
Unescape View File

@ -25,6 +25,15 @@ const routes = [
title: () => 'Catalog | CARTO'
}
},
{
path: 'do-catalog',
name: 'do-home',
component: DOCatalog,
meta: {
title: () => 'Data Observatory Catalog | CARTO'
},
children: [ ...doCatalogRoutes ]
},
{
path: '',
component: Datasets,
@ -33,15 +42,6 @@ const routes = [
title: () => 'Data | CARTO'
},
beforeEnter: datasetsBeforeEnter
},
{
path: 'do-catalog',
name: 'do-home',
component: DOCatalog,
meta: {
title: () => 'DO Catalog | CARTO'
},
children: [ ...doCatalogRoutes ]
}
]
},

Write Preview
Loading…
Cancel
Save