Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CARTO Provider for Backend Storage #922

Closed
wants to merge 138 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
c6b7fa4
add @carto/toolkit dependency
rjimenezda Oct 2, 2019
92225e1
add carto cloud provider
rjimenezda Oct 2, 2019
dfcc247
run demo-app in https for carto's oauth
rjimenezda Oct 2, 2019
f8e0a66
Bump carto/toolkit version to rc.3
rjimenezda Oct 3, 2019
9eccd09
fix cloud provider flow only using dropbox
rjimenezda Oct 3, 2019
d5006a3
carto public upload
rjimenezda Oct 3, 2019
031637d
wip load back from carto
rjimenezda Oct 6, 2019
f2940bc
Update carto toolkit, avoid undefined authToken
Oct 7, 2019
31f3d97
refactor map sharing to be more generic
rjimenezda Oct 7, 2019
12158b4
parse dataset info back from carto
rjimenezda Oct 7, 2019
a63a993
Add missing copyright
rjimenezda Oct 7, 2019
efa49a0
read carto username from toolkit, add to url
rjimenezda Oct 8, 2019
8b13581
Remove optional parameter mapId from provider URL
jesusbotella Oct 22, 2019
1ffe897
Remove mapId from URL params object
jesusbotella Oct 22, 2019
37d3a79
Add mapId to queryParams and redirect to /demo in case of missing params
jesusbotella Oct 22, 2019
9db56d4
Merge pull request #30 from CartoDB/feature/unify-url-parameters
Oct 22, 2019
af4b9f7
First approach to connector modal
jesusbotella Oct 30, 2019
add3fc0
Aesthetic changes, logout and modal connection to Kepler demo app
jesusbotella Nov 4, 2019
b9d045c
Remove unneeded properties from Database icon
jesusbotella Nov 4, 2019
ef13bb8
Remove fixed width if PanelAction has no label
jesusbotella Nov 4, 2019
8f88a48
Add feature flag for backend storage. Self code review.
jesusbotella Nov 4, 2019
a37a0be
Add license to JS files
jesusbotella Nov 6, 2019
5c0dbcb
Merge branch 'master' into feature/share-to-carto
jesusbotella Nov 6, 2019
7fe3a52
Show SampleMapPanel buttons only if properties exist
jesusbotella Nov 6, 2019
b5547d1
Get first element in action options if input is array
jesusbotella Nov 6, 2019
5ee8264
Fix sharing URL interpolation and add more data to Kepler options to …
jesusbotella Nov 6, 2019
bbaf8c9
Revert changes in Kepler components
jesusbotella Nov 7, 2019
c8e7a8f
Hide Sample panel when loading map from CARTO
jesusbotella Nov 7, 2019
641be88
Change Dropbox copy to make it more general
VictorVelarde Nov 7, 2019
b3e6134
Update @carto/toolkit
neokore Nov 11, 2019
1684d6e
Merge pull request #33 from CartoDB/fix/open-in-kepler
Nov 12, 2019
4d67420
Merge pull request #34 from CartoDB/raul/fix/open-in-kepler
VictorVelarde Nov 13, 2019
4195683
Cleaning
neokore Nov 14, 2019
032c693
Improve help information
neokore Nov 14, 2019
55eb67b
Add CartoClientId to webpack config
VictorVelarde Nov 18, 2019
48ffc93
Add @carto/toolkit for cloud provider
VictorVelarde Nov 18, 2019
b1ef859
Run demo-app in https
VictorVelarde Nov 18, 2019
f4e3618
Get CARTO_CLIENT_ID from environment + copy
VictorVelarde Nov 18, 2019
8186655
Add carto icon resource
VictorVelarde Nov 18, 2019
1030ea1
Give some margin to provider tiles
VictorVelarde Nov 18, 2019
ae4585c
Allow disabling SampleMapPanel
VictorVelarde Nov 18, 2019
b18ab2b
Extract SharingUrl component & remove permalink
VictorVelarde Nov 18, 2019
6f7c7cd
Remove MAP_URI from url
VictorVelarde Nov 18, 2019
1bd1ee4
Generalize to allow loading several resources
VictorVelarde Nov 18, 2019
ae32f4d
Add carto cloud provider
VictorVelarde Nov 18, 2019
6aa6e93
Add map route including provider
VictorVelarde Nov 18, 2019
9ed6c12
Refactor carto provider into a class
VictorVelarde Nov 19, 2019
bab6bb0
Add carto to providers list
VictorVelarde Nov 19, 2019
5989291
Add loadMap from provider
VictorVelarde Nov 19, 2019
927f315
Revert ExportCloudModal until refactored
VictorVelarde Nov 19, 2019
85b6404
Improve share link for all providers
neokore Nov 21, 2019
1a7ed0b
Add recover previous URL format
neokore Nov 21, 2019
ebd13ad
Let providers create own permalink
neokore Nov 21, 2019
84dbb28
Remove redundant code
VictorVelarde Nov 21, 2019
f267836
Add getUserName to carto provider
VictorVelarde Nov 21, 2019
ffbaf4d
Add TODO getUserName to dropbox provider
VictorVelarde Nov 21, 2019
ca02785
Include cloud provider userName in sharing panel
VictorVelarde Nov 21, 2019
7c3d9c0
Comment out unused RenderMeta method
neokore Nov 22, 2019
1c9f6d6
Merge pull request #38 from CartoDB/raul/share-to-carto-refactored
neokore Nov 22, 2019
c0abfb6
Merge branch 'feature/share-to-carto-refactored' of github.com:CartoD…
neokore Nov 22, 2019
8f876a7
Fix React warnings
neokore Nov 22, 2019
e437ad9
Merge branch 'master' into feature/share-to-carto
neokore Nov 22, 2019
d483697
Hide username when token is expired
neokore Nov 22, 2019
660bc42
Merge pull request #39 from CartoDB/feature/cloud-provider/display-user
VictorVelarde Nov 22, 2019
426f037
Merge branch 'feature/connector-panel' of github.com:CartoDB/kepler.g…
neokore Dec 2, 2019
3d9b28d
Fix header deps
neokore Dec 2, 2019
c891a9c
Save panel to panel-header approach
neokore Dec 2, 2019
9f0131b
Save map WIP
neokore Dec 10, 2019
07301b4
Merge branch 'master' into feature/share-to-carto
neokore Dec 10, 2019
d052428
Load cloud map to action
neokore Dec 10, 2019
893263d
Merge branch 'feature/share-to-carto' into feature/save-map
neokore Dec 10, 2019
3e379fa
Save private maps (WIP)
neokore Dec 17, 2019
2fbb6d1
Sync with upstream master
neokore Dec 17, 2019
d518858
Add error managing to CARTO provider
neokore Dec 17, 2019
f08d6b2
Merge branch 'feature/share-to-carto' into feature/save-map
neokore Dec 17, 2019
6ef8a41
Load private map by URL
neokore Jan 7, 2020
70b3686
Merge branch 'master' into feature/save-map
neokore Jan 7, 2020
7a531e4
Add loading and autoclose save map modal after saving
neokore Jan 7, 2020
f1548cf
Load saved visualizations (WIP)
neokore Jan 10, 2020
781d35c
Load saved visualizations (WIP)
neokore Jan 10, 2020
d1ab4b9
Load private map
neokore Jan 13, 2020
f62a38b
Merge branch 'master' into feature/save-map
neokore Jan 14, 2020
abf5559
Show current loaded map info in Save map modal
neokore Jan 14, 2020
3c5593d
Remove unused files and show errors on map loading
neokore Jan 15, 2020
0a222d5
[Feat] UI for save map to backend storage
heshan0131 Jan 14, 2020
8ee9e45
Merge branch 'backend-storage-ui' of https://github.com/keplergl/kepl…
neokore Jan 20, 2020
01532d8
'feature/save-map' >> raul/backend-storage-ui
neokore Jan 20, 2020
33cb2b3
CARTO Provider for Backend Storage (WIP)
neokore Jan 21, 2020
9a41325
CARTO provider for backend storage
neokore Jan 22, 2020
7228f15
CARTO Provider for Backend Storage (WIP)
neokore Jan 22, 2020
dda27fc
Load via storage with thumbnail layout
neokore Jan 23, 2020
a246e01
Privacy label for loading maps via Storage
neokore Jan 24, 2020
d18f1de
Notifications for loading/saving maps (WIP)
neokore Jan 27, 2020
7473d2e
Improve notification management
neokore Jan 28, 2020
4f5d70e
Use constants for notifications
neokore Jan 28, 2020
645a856
Fix cloud provider safe initialization
neokore Jan 28, 2020
2839440
[Feat] UI for save map to backend storage
heshan0131 Jan 14, 2020
bd7a9e9
Improve error messages for backend storage
neokore Jan 29, 2020
4456b89
Merge remote-tracking branch 'upstream/backend-storage-ui' into raul/…
neokore Jan 30, 2020
1171fb9
Set default error message for CARTO provider
neokore Jan 30, 2020
a67e1af
Upgrade @Carto/toolkit dependency
neokore Jan 31, 2020
1f97d91
Fix select already logged in backend provider
neokore Feb 3, 2020
465f282
Upgrade dependencies
neokore Feb 6, 2020
d103db8
Sync with upstream
neokore Feb 6, 2020
0187d96
Migrate load visualizations to use new CloudTile
neokore Feb 7, 2020
66d6b3a
[Feat] UI for save map to backend storage
heshan0131 Jan 14, 2020
3a47f02
add share and save map capacity to kepler core
heshan0131 Jan 30, 2020
f5fbb1d
delete unused actions
heshan0131 Feb 5, 2020
a051c96
pass in isConnected
heshan0131 Feb 6, 2020
39d7efa
optimize thumbnail generation
heshan0131 Feb 6, 2020
5352707
rebase and fix tests
heshan0131 Feb 7, 2020
4eedd2d
Add provider state test
heshan0131 Feb 7, 2020
014c35e
add component tests
heshan0131 Feb 8, 2020
984b7e5
add node-test
heshan0131 Feb 8, 2020
1b96bd5
Sync with upstream
neokore Feb 10, 2020
1dfcbe9
Sync with upstream
neokore Feb 10, 2020
a721f47
Sort cloud visualizations by date
neokore Feb 10, 2020
152be7c
Remove unused files
neokore Feb 11, 2020
0d63877
Remove duplicated Carto client entires
VictorVelarde Feb 14, 2020
7c8c1f6
[Feat] Load cloud map with provider
heshan0131 Feb 6, 2020
30f64cb
Sync with upstream:master
neokore Feb 17, 2020
16504c6
Merge branch 'raul/backend-storage-ui' of github.com:CartoDB/kepler.g…
neokore Feb 17, 2020
dd2ff4f
Sync with upstream:provider-load-map and fix conflicts
neokore Feb 17, 2020
47dbe6f
Fix loading maps from CARTO
neokore Feb 17, 2020
2229590
Fix loading and sharing maps with CARTO
neokore Feb 18, 2020
b4a39a1
Fix login not persisting between sessions
neokore Feb 18, 2020
2dcefe1
Remove unused files
neokore Feb 18, 2020
3c3d93c
Remove unused files
neokore Feb 18, 2020
943b18f
Fix thumbnails not generated when overwriting maps
neokore Feb 19, 2020
07dff03
Fix setting map URL after saving or sharing
neokore Feb 19, 2020
c8ce3c2
Sync with master
neokore Mar 2, 2020
754d244
Sync with master
neokore Mar 2, 2020
96dc4e5
Clean up
neokore Mar 2, 2020
a124acf
Provider class adapt
neokore Mar 2, 2020
0e1d235
Add error messages panel when saving private maps
neokore Mar 2, 2020
e134662
Add storage management links
neokore Mar 3, 2020
f68678d
Upgrade CARTO dependency
neokore Mar 3, 2020
6eb88f0
Upgrade Carto dependency
neokore Mar 4, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/demo-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"start-local-https": "webpack-dev-server --mode development --https --env.es6 --progress --hot --open"
},
"dependencies": {
"@carto/toolkit": "0.0.1-rc.13",
"@carto/toolkit": "0.0.1-rc.16",
"d3-request": "^1.0.6",
"dropbox": "^4.0.12",
"global": "^4.3.0",
Expand Down Expand Up @@ -60,4 +60,4 @@
"webpack-hot-middleware": "^2.24.3",
"webpack-stats-plugin": "^0.2.1"
}
}
}
54 changes: 54 additions & 0 deletions examples/demo-app/src/cloud-providers/carto/carto-icon.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
// Copyright (c) 2020 Uber Technologies, Inc.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

import React, {Component} from 'react';
import {Icons} from 'kepler.gl/components';
import PropTypes from 'prop-types';

class CartoIcon extends Component {
static propTypes = {
/** Set the height of the icon, ex. '16px' */
height: PropTypes.string,
colors: PropTypes.arrayOf(PropTypes.string)
};

static defaultProps = {
height: '100%',
viewBox: '0 0 92 36',
predefinedClassName: 'data-ex-icons-carto'
};

render() {
return (
<Icons.IconWrapper {...this.props} viewBox={"0 0 92 36"}>
<g id="Page-1" stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">
<g id="Logo-Scale-Negative" transform="translate(-162.000000, -282.000000)" fill="#2e3c43">
<g id="logo_carto_n_36" transform="translate(162.000000, 282.000000)">
<path d="M74,36 C83.9411255,36 92,27.9411255 92,18 C92,8.0588745 83.9411255,0 74,0 C64.0588745,0 56,8.0588745 56,18 C56,27.9411255 64.0588745,36 74,36 Z" id="halo" fillOpacity="0.200000018"></path>
<path d="M6.25280899,23.981602 C8.76747566,23.981602 10.220757,22.882802 11.2984713,21.390402 L8.9144367,19.684802 C8.22861851,20.521202 7.52647133,21.078802 6.33445401,21.078802 C4.73421159,21.078802 3.60751029,19.734002 3.60751029,18.012002 L3.60751029,17.979202 C3.60751029,16.306402 4.73421159,14.928802 6.33445401,14.928802 C7.4284973,14.928802 8.1796315,15.470002 8.83279168,16.273602 L11.2168263,14.420402 C10.204428,13.026402 8.70215964,12.042402 6.36711202,12.042402 C2.9053631,12.042402 0.358038428,14.666402 0.358038428,18.012002 L0.358038428,18.044802 C0.358038428,21.472402 2.98700813,23.981602 6.25280899,23.981602 L6.25280899,23.981602 Z M16.732047,23.752002 L20.0468349,23.752002 L20.8632851,21.685602 L25.2884453,21.685602 L26.1048955,23.752002 L29.5013284,23.752002 L24.6352851,12.190002 L21.5817613,12.190002 L16.732047,23.752002 Z M21.7940384,19.209202 L23.0840297,15.962002 L24.357692,19.209202 L21.7940384,19.209202 Z M35.6697093,23.752002 L38.8375361,23.752002 L38.8375361,20.275202 L40.2418305,20.275202 L42.5442201,23.752002 L46.1855881,23.752002 L43.4586443,19.750402 C44.8792677,19.143602 45.810021,17.979202 45.810021,16.208002 L45.810021,16.175202 C45.810021,15.043602 45.4671119,14.174402 44.7976227,13.502002 C44.0301595,12.731202 42.8218132,12.272002 41.0746097,12.272002 L35.6697093,12.272002 L35.6697093,23.752002 Z M38.8375361,17.782402 L38.8375361,15.010802 L40.9276487,15.010802 C41.9727049,15.010802 42.6421941,15.470002 42.6421941,16.388402 L42.6421941,16.421202 C42.6421941,17.257602 42.005363,17.782402 40.9439777,17.782402 L38.8375361,17.782402 Z M55.2605317,23.752002 L58.4283585,23.752002 L58.4283585,15.060002 L61.8574495,15.060002 L61.8574495,12.272002 L51.8477698,12.272002 L51.8477698,15.060002 L55.2605317,15.060002 L55.2605317,23.752002 Z M74,24 C77.3137085,24 80,21.3137085 80,18 C80,14.6862915 77.3137085,12 74,12 C70.6862915,12 68,14.6862915 68,18 C68,21.3137085 70.6862915,24 74,24 Z" id="logotype"></path>
</g>
</g>
</g>
</Icons.IconWrapper>
);
}
}

export default CartoIcon;
Loading