From 7847cf7d63ad680d7fb3915dc8b41005305161c0 Mon Sep 17 00:00:00 2001 From: Omer Lachish Date: Thu, 17 Jan 2019 11:56:16 +0200 Subject: [PATCH 001/177] Fix invitation pending for older invitations (#3298) * explicitly look for a False under details['is_invitation_pending'] and not any falsey result, to avoid locking out invitations which were created before the Pending Invitation feature was introduced. Solves https://github.com/getredash/redash/issues/3297 * test that old invites (that do not have any is_invitation_pending flag set in their details object) are still acceptable --- redash/handlers/authentication.py | 2 +- tests/handlers/test_authentication.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/redash/handlers/authentication.py b/redash/handlers/authentication.py index d6c0380d6a..77b5de0ec5 100644 --- a/redash/handlers/authentication.py +++ b/redash/handlers/authentication.py @@ -38,7 +38,7 @@ def render_token_login_page(template, org_slug, token): return render_template("error.html", error_message="Your invite link has expired. Please ask for a new one."), 400 - if not user.is_invitation_pending: + if user.details.get('is_invitation_pending') is False: return render_template("error.html", error_message=("This invitation has already been accepted. " "Please try resetting your password instead.")), 400 diff --git a/tests/handlers/test_authentication.py b/tests/handlers/test_authentication.py index c0fb797d9f..1559921d14 100644 --- a/tests/handlers/test_authentication.py +++ b/tests/handlers/test_authentication.py @@ -50,6 +50,12 @@ def test_bad_token(self): response = self.post_request('/invite/{}'.format('jdsnfkjdsnfkj'), data={'password': '1234'}, org=self.factory.org) self.assertEqual(response.status_code, 400) + def test_user_invited_before_invitation_pending_check(self): + user = self.factory.create_user(details={}) + token = invite_token(user) + response = self.post_request('/invite/{}'.format(token), data={'password': 'test1234'}, org=self.factory.org) + self.assertEqual(response.status_code, 302) + def test_already_active_user(self): token = invite_token(self.factory.user) self.post_request('/invite/{}'.format(token), data={'password': 'test1234'}, org=self.factory.org) From 06887f6ff183792f7a56d030f9512db8a6bb105b Mon Sep 17 00:00:00 2001 From: Levko Kravets Date: Thu, 17 Jan 2019 15:14:46 +0200 Subject: [PATCH 002/177] Multifilter's dropdown cropped when visualization container is too small --- client/app/components/filters.html | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/client/app/components/filters.html b/client/app/components/filters.html index a770cdee78..9393e923e8 100644 --- a/client/app/components/filters.html +++ b/client/app/components/filters.html @@ -3,16 +3,29 @@
- + {{$select.selected | filterValue:filter}} {{value | filterValue:filter }} - + {{$item | filterValue:filter}} From e8120c5f79cca01b5a011e8197c4cd604bf718d9 Mon Sep 17 00:00:00 2001 From: Arik Fraimovich Date: Fri, 18 Jan 2019 11:30:45 +0200 Subject: [PATCH 003/177] Use None as "not scheduled" default value of a query (#3277) * Use null as the default scheduled value. * Don't serialize None to json, so we can use SQL is not null predicate. * Fix warning about unicode in tests * Handling empty query.schedule in UI (#3283) * Add migration to convert empty schedules to null and drop the not null contraint. --- client/app/components/proptypes.js | 14 +++++ .../app/components/queries/ScheduleDialog.jsx | 20 +++++-- .../components/queries/ScheduleDialog.test.js | 15 ++--- .../app/components/queries/SchedulePhrase.jsx | 7 ++- .../__snapshots__/ScheduleDialog.test.js.snap | 47 ++++------------ client/app/pages/queries/query.html | 2 +- client/app/services/query.js | 7 +-- .../73beceabb948_bring_back_null_schedule.py | 56 +++++++++++++++++++ redash/models/__init__.py | 12 ++-- redash/models/types.py | 3 + tests/factories.py | 2 +- tests/models/test_dashboards.py | 8 +-- tests/test_models.py | 5 +- 13 files changed, 123 insertions(+), 75 deletions(-) create mode 100644 migrations/versions/73beceabb948_bring_back_null_schedule.py diff --git a/client/app/components/proptypes.js b/client/app/components/proptypes.js index ff18c69de8..19b7f6c5aa 100644 --- a/client/app/components/proptypes.js +++ b/client/app/components/proptypes.js @@ -15,6 +15,20 @@ export const Table = PropTypes.shape({ export const Schema = PropTypes.arrayOf(Table); +export const RefreshScheduleType = PropTypes.shape({ + interval: PropTypes.number, + time: PropTypes.string, + day_of_week: PropTypes.string, + until: PropTypes.string, +}); + +export const RefreshScheduleDefault = { + interval: null, + time: null, + day_of_week: null, + until: null, +}; + export const Field = PropTypes.shape({ name: PropTypes.string.isRequired, title: PropTypes.string, diff --git a/client/app/components/queries/ScheduleDialog.jsx b/client/app/components/queries/ScheduleDialog.jsx index d33b961e76..5557aa5da7 100644 --- a/client/app/components/queries/ScheduleDialog.jsx +++ b/client/app/components/queries/ScheduleDialog.jsx @@ -9,6 +9,7 @@ import Radio from 'antd/lib/radio'; import { capitalize, clone, isEqual } from 'lodash'; import moment from 'moment'; import { secondsToInterval, durationHumanize, pluralize, IntervalEnum, localizeTime } from '@/filters'; +import { RefreshScheduleType, RefreshScheduleDefault } from '../proptypes'; import './ScheduleDialog.css'; @@ -21,13 +22,16 @@ const { Option, OptGroup } = Select; export class ScheduleDialog extends React.Component { static propTypes = { show: PropTypes.bool.isRequired, - // eslint-disable-next-line react/forbid-prop-types - query: PropTypes.object.isRequired, + schedule: RefreshScheduleType, refreshOptions: PropTypes.arrayOf(PropTypes.number).isRequired, updateQuery: PropTypes.func.isRequired, onClose: PropTypes.func.isRequired, }; + static defaultProps = { + schedule: RefreshScheduleDefault, + }; + constructor(props) { super(props); this.state = this.initState; @@ -35,7 +39,7 @@ export class ScheduleDialog extends React.Component { } get initState() { - const newSchedule = clone(this.props.query.schedule); + const newSchedule = clone(this.props.schedule || ScheduleDialog.defaultProps.schedule); const { time, interval: seconds, day_of_week: day } = newSchedule; const { interval } = secondsToInterval(seconds); const [hour, minute] = time ? localizeTime(time).split(':') : [null, null]; @@ -144,9 +148,15 @@ export class ScheduleDialog extends React.Component { } save() { + const { newSchedule } = this.state; + // save if changed - if (!isEqual(this.state.newSchedule, this.props.query.schedule)) { - this.props.updateQuery({ schedule: clone(this.state.newSchedule) }); + if (!isEqual(newSchedule, this.props.schedule)) { + if (newSchedule.interval) { + this.props.updateQuery({ schedule: clone(newSchedule) }); + } else { + this.props.updateQuery({ schedule: null }); + } } this.props.onClose(); } diff --git a/client/app/components/queries/ScheduleDialog.test.js b/client/app/components/queries/ScheduleDialog.test.js index cb0fc8ee2b..9227173344 100644 --- a/client/app/components/queries/ScheduleDialog.test.js +++ b/client/app/components/queries/ScheduleDialog.test.js @@ -1,17 +1,11 @@ import React from 'react'; import { mount } from 'enzyme'; import { ScheduleDialog } from './ScheduleDialog'; +import RefreshScheduleDefault from '../proptypes'; const defaultProps = { show: true, - query: { - schedule: { - time: null, - until: null, - interval: null, - day_of_week: null, - }, - }, + schedule: RefreshScheduleDefault, refreshOptions: [ 60, 300, 600, // 1, 5 ,10 mins 3600, 36000, 82800, // 1, 10, 23 hours @@ -23,12 +17,11 @@ const defaultProps = { }; function getWrapper(schedule = {}, props = {}) { - const defaultSchedule = defaultProps.query.schedule; props = Object.assign( {}, defaultProps, props, - { query: { schedule: Object.assign({}, defaultSchedule, schedule) } }, + { schedule: Object.assign({}, RefreshScheduleDefault, schedule) }, ); return [mount(), props]; } @@ -78,7 +71,7 @@ describe('ScheduleDialog', () => { const [wrapper] = getWrapper({ interval: 1209600, time: '22:15', - day_of_week: 2, + day_of_week: 'Monday', }); test('Sets to correct interval', () => { diff --git a/client/app/components/queries/SchedulePhrase.jsx b/client/app/components/queries/SchedulePhrase.jsx index 665b0ae1ab..9858d7b4f0 100644 --- a/client/app/components/queries/SchedulePhrase.jsx +++ b/client/app/components/queries/SchedulePhrase.jsx @@ -3,23 +3,24 @@ import React from 'react'; import PropTypes from 'prop-types'; import Tooltip from 'antd/lib/tooltip'; import { localizeTime, durationHumanize } from '@/filters'; +import { RefreshScheduleType, RefreshScheduleDefault } from '../proptypes'; import './ScheduleDialog.css'; class SchedulePhrase extends React.Component { static propTypes = { - // eslint-disable-next-line react/forbid-prop-types - schedule: PropTypes.object.isRequired, + schedule: RefreshScheduleType, isNew: PropTypes.bool.isRequired, isLink: PropTypes.bool, }; static defaultProps = { + schedule: RefreshScheduleDefault, isLink: false, }; get content() { - const { interval: seconds } = this.props.schedule; + const { interval: seconds } = this.props.schedule || SchedulePhrase.defaultProps.schedule; if (!seconds) { return ['Never']; } diff --git a/client/app/components/queries/__snapshots__/ScheduleDialog.test.js.snap b/client/app/components/queries/__snapshots__/ScheduleDialog.test.js.snap index 899d1525ca..65a8d28ff2 100644 --- a/client/app/components/queries/__snapshots__/ScheduleDialog.test.js.snap +++ b/client/app/components/queries/__snapshots__/ScheduleDialog.test.js.snap @@ -1632,6 +1632,7 @@ exports[`ScheduleDialog Sets correct schedule settings Sets to "2 Weeks 22:15 Tu >
+
+ +
diff --git a/client/app/pages/users/show.js b/client/app/pages/users/show.js index 1be8b39d02..318b197960 100644 --- a/client/app/pages/users/show.js +++ b/client/app/pages/users/show.js @@ -6,7 +6,7 @@ import './settings.less'; function UserCtrl( $scope, $routeParams, $http, $location, toastr, - clientConfig, currentUser, User, + clientConfig, currentUser, User, AlertDialog, ) { $scope.userId = $routeParams.userId; $scope.currentUser = currentUser; @@ -122,6 +122,34 @@ function UserCtrl( $scope.disableUser = (user) => { User.disableUser(user); }; + + $scope.regenerateUserApiKey = (user) => { + const doRegenerate = () => { + $scope.disableRegenerateApiKeyButton = true; + $http + .post(`api/users/${$scope.user.id}/regenerate_api_key`) + .success((data) => { + toastr.success('The API Key has been updated.'); + user.api_key = data.api_key; + $scope.disableRegenerateApiKeyButton = false; + }) + .error((response) => { + const message = + response.message + ? response.message + : `Failed regenerating API Key: ${response.statusText}`; + + toastr.error(message); + $scope.disableRegenerateApiKeyButton = false; + }); + }; + + const title = 'Regenerate API Key'; + const message = 'Are you sure you want to regenerate?'; + + AlertDialog.open(title, message, { class: 'btn-warning', title: 'Regenerate' }) + .then(doRegenerate); + }; } export default function init(ngModule) { diff --git a/redash/handlers/api.py b/redash/handlers/api.py index f8ef199857..23225a7b5d 100644 --- a/redash/handlers/api.py +++ b/redash/handlers/api.py @@ -11,7 +11,7 @@ from redash.handlers.events import EventsResource from redash.handlers.queries import QueryForkResource, QueryRefreshResource, QueryListResource, QueryRecentResource, QuerySearchResource, QueryResource, MyQueriesResource from redash.handlers.query_results import QueryResultListResource, QueryResultResource, JobResource -from redash.handlers.users import UserResource, UserListResource, UserInviteResource, UserResetPasswordResource, UserDisableResource +from redash.handlers.users import UserResource, UserListResource, UserInviteResource, UserResetPasswordResource, UserDisableResource, UserRegenerateApiKeyResource from redash.handlers.visualizations import VisualizationListResource from redash.handlers.visualizations import VisualizationResource from redash.handlers.widgets import WidgetResource, WidgetListResource @@ -101,6 +101,9 @@ def json_representation(data, code, headers=None): api.add_org_resource(UserResource, '/api/users/', endpoint='user') api.add_org_resource(UserInviteResource, '/api/users//invite', endpoint='user_invite') api.add_org_resource(UserResetPasswordResource, '/api/users//reset_password', endpoint='user_reset_password') +api.add_org_resource(UserRegenerateApiKeyResource, + '/api/users//regenerate_api_key', + endpoint='user_regenerate_api_key') api.add_org_resource(UserDisableResource, '/api/users//disable', endpoint='user_disable') api.add_org_resource(VisualizationListResource, '/api/visualizations', endpoint='visualizations') diff --git a/redash/handlers/users.py b/redash/handlers/users.py index 4b4b45a4e4..0e373cc864 100644 --- a/redash/handlers/users.py +++ b/redash/handlers/users.py @@ -149,6 +149,26 @@ def post(self, user_id): } +class UserRegenerateApiKeyResource(BaseResource): + def post(self, user_id): + user = models.User.get_by_id_and_org(user_id, self.current_org) + if user.is_disabled: + abort(404, message='Not found') + if not is_admin_or_owner(user_id): + abort(403) + + user.regenerate_api_key() + models.db.session.commit() + + self.record_event({ + 'action': 'regnerate_api_key', + 'object_id': user.id, + 'object_type': 'user' + }) + + return user.to_dict(with_api_key=True) + + class UserResource(BaseResource): def get(self, user_id): require_permission_or_owner('list_users', user_id) diff --git a/redash/models/users.py b/redash/models/users.py index f175b3b5c5..fb9a58cd80 100644 --- a/redash/models/users.py +++ b/redash/models/users.py @@ -122,6 +122,9 @@ def disable(self): def enable(self): self.disabled_at = None + def regenerate_api_key(self): + self.api_key = generate_token(40) + def to_dict(self, with_api_key=False): profile_image_url = self.profile_image_url if self.is_disabled: diff --git a/tests/handlers/test_users.py b/tests/handlers/test_users.py index 5b88ce7ec4..c12409d56a 100644 --- a/tests/handlers/test_users.py +++ b/tests/handlers/test_users.py @@ -328,3 +328,47 @@ def test_disabled_user_should_not_receive_restore_password_email(self): rv = self.make_request('post', '/api/users/{}/reset_password'.format(user.id), user=admin_user) self.assertEqual(rv.status_code, 404) send_password_reset_email_mock.assert_not_called() + + +class TestUserRegenerateApiKey(BaseTestCase): + def test_non_admin_cannot_regenerate_other_user_api_key(self): + admin_user = self.factory.create_admin() + other_user = self.factory.create_user() + orig_api_key = other_user.api_key + + rv = self.make_request('post', "/api/users/{}/regenerate_api_key".format(other_user.id), user=admin_user) + self.assertEqual(rv.status_code, 200) + + other_user = models.User.query.get(other_user.id) + self.assertNotEquals(orig_api_key, other_user.api_key) + + def test_admin_can_regenerate_other_user_api_key(self): + user1 = self.factory.create_user() + user2 = self.factory.create_user() + orig_user2_api_key = user2.api_key + + rv = self.make_request('post', "/api/users/{}/regenerate_api_key".format(user2.id), user=user1) + self.assertEqual(rv.status_code, 403) + + user = models.User.query.get(user2.id) + self.assertEquals(orig_user2_api_key, user.api_key) + + def test_admin_can_regenerate_api_key_myself(self): + admin_user = self.factory.create_admin() + orig_api_key = admin_user.api_key + + rv = self.make_request('post', "/api/users/{}/regenerate_api_key".format(admin_user.id), user=admin_user) + self.assertEqual(rv.status_code, 200) + + user = models.User.query.get(admin_user.id) + self.assertNotEquals(orig_api_key, user.api_key) + + def test_user_can_regenerate_api_key_myself(self): + user = self.factory.create_user() + orig_api_key = user.api_key + + rv = self.make_request('post', "/api/users/{}/regenerate_api_key".format(user.id), user=user) + self.assertEqual(rv.status_code, 200) + + user = models.User.query.get(user.id) + self.assertNotEquals(orig_api_key, user.api_key) diff --git a/tests/models/test_users.py b/tests/models/test_users.py index 7a51318ca2..f687c454ac 100644 --- a/tests/models/test_users.py +++ b/tests/models/test_users.py @@ -62,6 +62,17 @@ def test_non_unicode_search_string(self): assert user in User.search(User.all(user.org), term=u'א') +class TestUserRegenerateApiKey(BaseTestCase): + def test_regenerate_api_key(self): + user = self.factory.user + before_api_key = user.api_key + user.regenerate_api_key() + + # check committed by research + user = User.query.get(user.id) + self.assertNotEquals(user.api_key, before_api_key) + + class TestUserDetail(BaseTestCase): # def setUp(self): # super(TestUserDetail, self).setUp() @@ -94,4 +105,4 @@ def test_sync(self): user_reloaded = User.query.filter(User.id==user.id).first() self.assertIn('active_at', user_reloaded.details) - self.assertEqual(user_reloaded.active_at, timestamp) \ No newline at end of file + self.assertEqual(user_reloaded.active_at, timestamp) From 8bdcfb06c5fcdfb24acc2eb757ffe91bf23f4f45 Mon Sep 17 00:00:00 2001 From: Gabriel Dutra Date: Tue, 22 Jan 2019 04:52:23 -0200 Subject: [PATCH 008/177] add wait time before percy data source page snapshot (#3320) --- cypress/integration/data-source/create_data_source_spec.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cypress/integration/data-source/create_data_source_spec.js b/cypress/integration/data-source/create_data_source_spec.js index 1ae4be039a..e286a334e6 100644 --- a/cypress/integration/data-source/create_data_source_spec.js +++ b/cypress/integration/data-source/create_data_source_spec.js @@ -14,6 +14,8 @@ describe('Create Data Source', () => { cy.getByTestId('Database Name').type('postgres{enter}'); cy.contains('Saved.'); + + cy.wait(1000); cy.percySnapshot('Create Data Source page'); }); }); From c4bf44677a5e9957141d797e9fc6361513a7bb0f Mon Sep 17 00:00:00 2001 From: YOSHIDA Katsuhiko Date: Tue, 22 Jan 2019 21:43:52 +0900 Subject: [PATCH 009/177] Fix an error of exporting dict value as Excel (#3323) --- redash/models/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redash/models/__init__.py b/redash/models/__init__.py index a59bb25f28..73ff622bd3 100644 --- a/redash/models/__init__.py +++ b/redash/models/__init__.py @@ -351,7 +351,7 @@ def make_excel_content(self): for (r, row) in enumerate(query_data['rows']): for (c, name) in enumerate(column_names): v = row.get(name) - if isinstance(v, list): + if isinstance(v, list) or isinstance(v, dict): v = str(v).encode('utf-8') sheet.write(r + 1, c, v) From ff6b20b69c0fc0dedde7c74ad58e2c578f682149 Mon Sep 17 00:00:00 2001 From: Miles Maddox Date: Tue, 22 Jan 2019 07:52:13 -0600 Subject: [PATCH 010/177] support for fetching all JQL results by way of pagination (#3304) --- redash/query_runner/jql.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/redash/query_runner/jql.py b/redash/query_runner/jql.py index 2022f8f13a..de10508ad5 100644 --- a/redash/query_runner/jql.py +++ b/redash/query_runner/jql.py @@ -24,6 +24,8 @@ def add_column(self, column, column_type=TYPE_STRING): def to_json(self): return json_dumps({'rows': self.rows, 'columns': self.columns.values()}) + def merge(self, set): + self.rows = self.rows + set.rows def parse_issue(issue, field_mapping): result = OrderedDict() @@ -179,6 +181,19 @@ def run_query(self, query, user): results = parse_count(data) else: results = parse_issues(data, field_mapping) + index = data['startAt'] + data['maxResults'] + + while data['total'] > index: + query['startAt'] = index + response, error = self.get_response(jql_url, params=query) + if error is not None: + return None, error + + data = response.json() + index = data['startAt'] + data['maxResults'] + + addl_results = parse_issues(data, field_mapping) + results.merge(addl_results) return results.to_json(), None except KeyboardInterrupt: From 7fa66654451c197e5b5bf264edb1adc96bd0bff6 Mon Sep 17 00:00:00 2001 From: Levko Kravets Date: Tue, 22 Jan 2019 17:26:11 +0200 Subject: [PATCH 011/177] Use Ant's Paginator component; migrate SortIcon to React (#3317) --- client/app/assets/less/ant.less | 88 +++++++++++++++++++ client/app/assets/less/inc/ant-variables.less | 23 +++++ .../assets/less/inc/visualizations/misc.less | 7 +- client/app/assets/less/redash/query.less | 7 +- client/app/components/Paginator.jsx | 60 +++++++++++++ client/app/components/SortIcon.jsx | 31 +++++++ .../dynamic-table/dynamic-table.html | 13 +-- client/app/components/dynamic-table/index.js | 30 ++++++- client/app/components/paginator.js | 30 ------- client/app/components/sort-icon.js | 29 ------ client/app/lib/pagination/live-paginator.js | 1 + 11 files changed, 242 insertions(+), 77 deletions(-) create mode 100644 client/app/components/Paginator.jsx create mode 100644 client/app/components/SortIcon.jsx delete mode 100644 client/app/components/paginator.js delete mode 100644 client/app/components/sort-icon.js diff --git a/client/app/assets/less/ant.less b/client/app/assets/less/ant.less index e5c1311699..c9985fa36d 100644 --- a/client/app/assets/less/ant.less +++ b/client/app/assets/less/ant.less @@ -12,6 +12,7 @@ @import '~antd/lib/button/style/index'; @import '~antd/lib/radio/style/index'; @import '~antd/lib/time-picker/style/index'; +@import '~antd/lib/pagination/style/index'; @import 'inc/ant-variables'; // Remove bold in labels for Ant checkboxes and radio buttons @@ -47,3 +48,90 @@ -webkit-appearance: none; margin: 0; } + +// Pagination overrides (based on existing Bootstrap overrides) +.@{pagination-prefix-cls} { + display: inline-block; + margin-top: 18px; + margin-bottom: 18px; + vertical-align: top; + + &-item { + background-color: @pagination-bg; + border-color: transparent; + color: @pagination-color; + font-size: 14px; + margin-right: 5px; + + a { + color: inherit; + } + + &:focus, + &:hover { + background-color: @pagination-hover-bg; + border-color: transparent; + color: @pagination-hover-color; + a { + color: inherit; + } + } + + &-active { + &, + &:hover, + &:focus { + background-color: @pagination-active-bg; + color: @pagination-active-color; + border-color: transparent; + pointer-events: none; + cursor: default; + + a { + color: inherit; + } + } + } + } + + &-disabled { + &, + &:hover, + &:focus { + opacity: 0.5; + pointer-events: none; + } + } + + &-prev, + &-next { + .@{pagination-prefix-cls}-item-link { + background-color: @pagination-bg; + border-color: transparent; + color: @pagination-color; + line-height: @pagination-item-size - 2px; + } + + &:focus .@{pagination-prefix-cls}-item-link, + &:hover .@{pagination-prefix-cls}-item-link { + background-color: @pagination-hover-bg; + border-color: transparent; + color: @pagination-hover-color; + } + } + + &-prev, + &-jump-prev, + &-jump-next { + margin-right: 5px; + } + + &-jump-prev, + &-jump-next { + .@{pagination-prefix-cls}-item-container { + .@{pagination-prefix-cls}-item-link-icon { + color: @pagination-color; + } + } + } +} diff --git a/client/app/assets/less/inc/ant-variables.less b/client/app/assets/less/inc/ant-variables.less index adebc76f9f..44cbbcd430 100644 --- a/client/app/assets/less/inc/ant-variables.less +++ b/client/app/assets/less/inc/ant-variables.less @@ -1,8 +1,14 @@ /* -------------------------------------------------------- Colors -----------------------------------------------------------*/ + +@lightblue: #03A9F4; @primary-color: #2196F3; +@redash-gray: rgba(102, 136, 153, 1); +@redash-orange: rgba(255, 120, 100, 1); +@redash-black: rgba(0, 0, 0, 1); +@redash-yellow: rgba(252, 252, 161, 0.75); /* -------------------------------------------------------- Font @@ -27,3 +33,20 @@ @input-color: #595959; @border-radius-base: 2px; @border-color-base: #E8E8E8; + + +/* -------------------------------------------------------- + Pagination +-----------------------------------------------------------*/ + +@pagination-item-size: 33px; +@pagination-font-family: @redash-font; +@pagination-font-weight-active: normal; + +@pagination-bg: fade(@redash-gray, 15%); +@pagination-color: #7E7E7E; +@pagination-active-bg: @lightblue; +@pagination-active-color: #FFF; +@pagination-disabled-bg: fade(@redash-gray, 15%); +@pagination-hover-color: #333; +@pagination-hover-bg: fade(@redash-gray, 25%); diff --git a/client/app/assets/less/inc/visualizations/misc.less b/client/app/assets/less/inc/visualizations/misc.less index a01778d59c..d439837db0 100644 --- a/client/app/assets/less/inc/visualizations/misc.less +++ b/client/app/assets/less/inc/visualizations/misc.less @@ -1,3 +1,6 @@ -visualization-renderer .pagination { - margin: 0; +visualization-renderer { + .pagination, + .ant-pagination { + margin: 0; + } } diff --git a/client/app/assets/less/redash/query.less b/client/app/assets/less/redash/query.less index 20791a8c47..1cb76bff2e 100644 --- a/client/app/assets/less/redash/query.less +++ b/client/app/assets/less/redash/query.less @@ -202,8 +202,11 @@ edit-in-place p.editable:hover { } } -.visualization-renderer .pagination { - margin-top: 10px; +.visualization-renderer { + .pagination, + .ant-pagination { + margin-top: 10px; + } } .embed__vis { diff --git a/client/app/components/Paginator.jsx b/client/app/components/Paginator.jsx new file mode 100644 index 0000000000..be1a767364 --- /dev/null +++ b/client/app/components/Paginator.jsx @@ -0,0 +1,60 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { react2angular } from 'react2angular'; +import Pagination from 'antd/lib/pagination'; + +export function Paginator({ + page, + itemsPerPage, + totalCount, + onChange, +}) { + if (totalCount <= itemsPerPage) { + return null; + } + return ( +
+ +
+ ); +} + +Paginator.propTypes = { + page: PropTypes.number.isRequired, + itemsPerPage: PropTypes.number.isRequired, + totalCount: PropTypes.number.isRequired, + onChange: PropTypes.func, +}; + +Paginator.defaultProps = { + onChange: () => {}, +}; + +export default function init(ngModule) { + ngModule.component('paginatorImpl', react2angular(Paginator)); + ngModule.component('paginator', { + template: ` + `, + bindings: { + paginator: '<', + }, + controller($scope) { + this.onPageChanged = (page) => { + this.paginator.setPage(page); + $scope.$applyAsync(); + }; + }, + }); +} + +init.init = true; diff --git a/client/app/components/SortIcon.jsx b/client/app/components/SortIcon.jsx new file mode 100644 index 0000000000..ad16b5426e --- /dev/null +++ b/client/app/components/SortIcon.jsx @@ -0,0 +1,31 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { react2angular } from 'react2angular'; + +export function SortIcon({ column, sortColumn, reverse }) { + if (column !== sortColumn) { + return null; + } + + return ( + + ); +} + +SortIcon.propTypes = { + column: PropTypes.string, + sortColumn: PropTypes.string, + reverse: PropTypes.bool, +}; + +SortIcon.defaultProps = { + column: null, + sortColumn: null, + reverse: false, +}; + +export default function init(ngModule) { + ngModule.component('sortIcon', react2angular(SortIcon)); +} + +init.init = true; diff --git a/client/app/components/dynamic-table/dynamic-table.html b/client/app/components/dynamic-table/dynamic-table.html index fcc7d1afa8..3ee4f2ff9c 100644 --- a/client/app/components/dynamic-table/dynamic-table.html +++ b/client/app/components/dynamic-table/dynamic-table.html @@ -32,15 +32,4 @@ -
-
    -
    + diff --git a/client/app/components/dynamic-table/index.js b/client/app/components/dynamic-table/index.js index f29b0d1b1b..a51f661e52 100644 --- a/client/app/components/dynamic-table/index.js +++ b/client/app/components/dynamic-table/index.js @@ -82,9 +82,33 @@ function createRowRenderTemplate(columns, $compile) { return $compile(rowTemplate); } -function DynamicTable($compile) { +class DynamicTablePaginatorAdapter { + constructor($ctrl) { + this.$ctrl = $ctrl; + } + + get page() { + return this.$ctrl.currentPage; + } + + get itemsPerPage() { + return this.$ctrl.itemsPerPage; + } + + get totalCount() { + return this.$ctrl.preparedRows.length; + } + + setPage(page) { + this.$ctrl.onPageChanged(page); + } +} + +function DynamicTable($scope, $compile) { 'ngInject'; + this.paginatorAdapter = new DynamicTablePaginatorAdapter(this); + this.itemsPerPage = validateItemsPerPage(this.itemsPerPage); this.currentPage = 1; this.searchTerm = ''; @@ -180,8 +204,10 @@ function DynamicTable($compile) { } }; - this.onPageChanged = () => { + this.onPageChanged = (page) => { + this.currentPage = page; updateRowsToDisplay(false); + $scope.$applyAsync(); }; this.onSearchTermChanged = () => { diff --git a/client/app/components/paginator.js b/client/app/components/paginator.js deleted file mode 100644 index 63c0062e3e..0000000000 --- a/client/app/components/paginator.js +++ /dev/null @@ -1,30 +0,0 @@ -class PaginatorCtrl { - pageChanged() { - this.paginator.setPage(this.paginator.page); - } -} - -export default function init(ngModule) { - ngModule.component('paginator', { - template: ` -
    -
      -
      - `, - bindings: { - paginator: '<', - }, - controller: PaginatorCtrl, - }); -} - -init.init = true; diff --git a/client/app/components/sort-icon.js b/client/app/components/sort-icon.js deleted file mode 100644 index 314233156e..0000000000 --- a/client/app/components/sort-icon.js +++ /dev/null @@ -1,29 +0,0 @@ -export default function init(ngModule) { - ngModule.component('sortIcon', { - template: '', - bindings: { - column: '<', - sortColumn: '<', - reverse: '<', - }, - controller() { - this.$onChanges = (changes) => { - ['column', 'sortColumn', 'reverse'].forEach((v) => { - if (v in changes) { - this[v] = changes[v].currentValue; - } - }); - - this.showIcon = false; - - if (this.column === this.sortColumn) { - this.showIcon = true; - this.icon = this.reverse ? 'desc' : 'asc'; - } - }; - }, - }); -} - -init.init = true; - diff --git a/client/app/lib/pagination/live-paginator.js b/client/app/lib/pagination/live-paginator.js index 0ed8391dce..da3ae2bd80 100644 --- a/client/app/lib/pagination/live-paginator.js +++ b/client/app/lib/pagination/live-paginator.js @@ -4,6 +4,7 @@ export default class LivePaginator { } = {}) { this.page = page; this.itemsPerPage = itemsPerPage; + this.totalCount = 0; this.orderByField = orderByField; this.orderByReverse = orderByReverse; this.rowsFetcher = rowsFetcher; From a9c514aaf7d5d9a244988011d8fda05f30fbc064 Mon Sep 17 00:00:00 2001 From: Omer Lachish Date: Wed, 23 Jan 2019 11:10:04 +0200 Subject: [PATCH 012/177] Textless query result endpoint (#3311) * add an endpoint for running a query by its id and (optional) parameters without having to provide the query text * check for access to query before running it --- redash/handlers/api.py | 3 ++- redash/handlers/query_results.py | 23 +++++++++++++++++++++++ tests/handlers/test_query_results.py | 8 ++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/redash/handlers/api.py b/redash/handlers/api.py index 23225a7b5d..140c37ce83 100644 --- a/redash/handlers/api.py +++ b/redash/handlers/api.py @@ -6,7 +6,7 @@ from redash.handlers.base import org_scoped_rule from redash.handlers.permissions import ObjectPermissionsListResource, CheckPermissionResource from redash.handlers.alerts import AlertResource, AlertListResource, AlertSubscriptionListResource, AlertSubscriptionResource -from redash.handlers.dashboards import DashboardListResource, DashboardResource, DashboardShareResource, PublicDashboardResource +from redash.handlers.dashboards import DashboardListResource, DashboardResource, DashboardShareResource, PublicDashboardResource from redash.handlers.data_sources import DataSourceTypeListResource, DataSourceListResource, DataSourceSchemaResource, DataSourceResource, DataSourcePauseResource, DataSourceTestResource from redash.handlers.events import EventsResource from redash.handlers.queries import QueryForkResource, QueryRefreshResource, QueryListResource, QueryRecentResource, QuerySearchResource, QueryResource, MyQueriesResource @@ -92,6 +92,7 @@ def json_representation(data, code, headers=None): api.add_org_resource(QueryResultResource, '/api/query_results/.', '/api/query_results/', + '/api/queries//results', '/api/queries//results.', '/api/queries//results/.', endpoint='query_result') diff --git a/redash/handlers/query_results.py b/redash/handlers/query_results.py index d7cca6318e..575f576653 100644 --- a/redash/handlers/query_results.py +++ b/redash/handlers/query_results.py @@ -154,6 +154,29 @@ def options(self, query_id=None, query_result_id=None, filetype='json'): return make_response("", 200, headers) + @require_permission('execute_query') + def post(self, query_id): + """ + Execute a saved query. + + :param number query_id: The ID of the query whose results should be fetched. + :param object parameters: The parameter values to apply to the query. + :qparam number max_age: If query results less than `max_age` seconds old are available, + return them, otherwise execute the query; if omitted or -1, returns + any cached result, or executes if not available. Set to zero to + always execute. + """ + params = request.get_json(force=True) + parameters = params.get('parameters', {}) + max_age = int(params.get('max_age', 0)) + + query = get_object_or_404(models.Query.get_by_id_and_org, query_id, self.current_org) + + if not has_access(query.data_source.groups, self.current_user, not_view_only): + return {'job': {'status': 4, 'error': 'You do not have permission to run queries with this data source.'}}, 403 + else: + return run_query(query.data_source, parameters, query.query_text, query_id, max_age) + @require_permission('view_query') def get(self, query_id=None, query_result_id=None, filetype='json'): """ diff --git a/tests/handlers/test_query_results.py b/tests/handlers/test_query_results.py index 4517cc6256..8a65233ef6 100644 --- a/tests/handlers/test_query_results.py +++ b/tests/handlers/test_query_results.py @@ -128,6 +128,14 @@ def test_has_full_access_to_data_source(self): rv = self.make_request('get', '/api/query_results/{}'.format(query_result.id)) self.assertEquals(rv.status_code, 200) + def test_execute_new_query(self): + query = self.factory.create_query() + + rv = self.make_request('post', '/api/queries/{}/results'.format(query.id), data={'parameters': {}}) + + self.assertEquals(rv.status_code, 200) + self.assertIn('job', rv.json) + def test_access_with_query_api_key(self): ds = self.factory.create_data_source(group=self.factory.org.default_group, view_only=False) query = self.factory.create_query() From bfeb015d713df6757094ab8fa3f4c641aab5e261 Mon Sep 17 00:00:00 2001 From: Arik Fraimovich Date: Wed, 23 Jan 2019 13:38:08 +0200 Subject: [PATCH 013/177] Add configuration for the Support probot. (#3327) --- .github/support.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/support.yml diff --git a/.github/support.yml b/.github/support.yml new file mode 100644 index 0000000000..164b588b36 --- /dev/null +++ b/.github/support.yml @@ -0,0 +1,23 @@ +# Configuration for Support Requests - https://github.com/dessant/support-requests + +# Label used to mark issues as support requests +supportLabel: Support Question + +# Comment to post on issues marked as support requests, `{issue-author}` is an +# optional placeholder. Set to `false` to disable +supportComment: > + :wave: @{issue-author}, we use the issue tracker exclusively for bug reports + and planned work. However, this issue appears to be a support request. + Please use [our forum](https://discuss.redash.io) to get help. + +# Close issues marked as support requests +close: true + +# Lock issues marked as support requests +lock: false + +# Assign `off-topic` as the reason for locking. Set to `false` to disable +setLockReason: true + +# Repository to extend settings from +# _extends: repo From 87667676e6eab79d04c2389781e4e6a629497c05 Mon Sep 17 00:00:00 2001 From: Arik Fraimovich Date: Wed, 23 Jan 2019 13:48:11 +0200 Subject: [PATCH 014/177] Remove link to roadmap (#3329) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's no longer maintained 😢 --- CONTRIBUTING.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1288782f5f..54e5d58d13 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,6 @@ The following is a set of guidelines for contributing to Redash. These are guide ## Quick Links: -- [Feature Roadmap](https://trello.com/b/b2LUHU7A/redash-roadmap) - [Feature Requests](https://discuss.redash.io/c/feature-requests) - [Documentation](https://redash.io/help/) - [Blog](https://blog.redash.io/) From d5afa1815e7575b194ea18c4e01129ce9429a3cc Mon Sep 17 00:00:00 2001 From: Ran Byron Date: Wed, 23 Jan 2019 16:27:49 +0200 Subject: [PATCH 015/177] Filtering out incompatible dashboard params (#3330) --- .../app/components/ParameterMappingInput.jsx | 35 ++++++++++++------- .../components/dashboards/AddWidgetDialog.jsx | 6 ++-- .../EditParameterMappingsDialog.jsx | 6 ++-- 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/client/app/components/ParameterMappingInput.jsx b/client/app/components/ParameterMappingInput.jsx index c5ebcf0013..54487b7abc 100644 --- a/client/app/components/ParameterMappingInput.jsx +++ b/client/app/components/ParameterMappingInput.jsx @@ -223,7 +223,10 @@ export class ParameterMappingInput extends React.Component { export class ParameterMappingListInput extends React.Component { static propTypes = { mappings: PropTypes.arrayOf(PropTypes.object), - existingParamNames: PropTypes.arrayOf(PropTypes.string), + existingParams: PropTypes.arrayOf(PropTypes.shape({ + name: PropTypes.string, + type: PropTypes.string, + })), onChange: PropTypes.func, clientConfig: PropTypes.any, // eslint-disable-line react/forbid-prop-types Query: PropTypes.any, // eslint-disable-line react/forbid-prop-types @@ -231,7 +234,7 @@ export class ParameterMappingListInput extends React.Component { static defaultProps = { mappings: [], - existingParamNames: [], + existingParams: [], onChange: () => {}, clientConfig: null, Query: null, @@ -255,17 +258,23 @@ export class ParameterMappingListInput extends React.Component { return (
      - {this.props.mappings.map((mapping, index) => ( -
      - this.updateParamMapping(mapping, newMapping)} - clientConfig={clientConfig} - Query={Query} - /> -
      - ))} + {this.props.mappings.map((mapping, index) => { + const existingParamsNames = this.props.existingParams + .filter(({ type }) => type === mapping.param.type) // exclude mismatching param types + .map(({ name }) => name); // keep names only + + return ( +
      + this.updateParamMapping(mapping, newMapping)} + clientConfig={clientConfig} + Query={Query} + /> +
      + ); + })}
      ); } diff --git a/client/app/components/dashboards/AddWidgetDialog.jsx b/client/app/components/dashboards/AddWidgetDialog.jsx index a6922840e5..6d51a35e90 100644 --- a/client/app/components/dashboards/AddWidgetDialog.jsx +++ b/client/app/components/dashboards/AddWidgetDialog.jsx @@ -281,9 +281,9 @@ class AddWidgetDialog extends React.Component { const clientConfig = this.props.clientConfig; // eslint-disable-line react/prop-types const Query = this.props.Query; // eslint-disable-line react/prop-types - const existingParamNames = map( + const existingParams = map( this.props.dashboard.getParametersDefs(), - param => param.name, + ({ name, type }) => ({ name, type }), ); return ( @@ -311,7 +311,7 @@ class AddWidgetDialog extends React.Component { this.updateParamMappings(mappings)} clientConfig={clientConfig} Query={Query} diff --git a/client/app/components/dashboards/EditParameterMappingsDialog.jsx b/client/app/components/dashboards/EditParameterMappingsDialog.jsx index 3b1ba76ac7..2230224933 100644 --- a/client/app/components/dashboards/EditParameterMappingsDialog.jsx +++ b/client/app/components/dashboards/EditParameterMappingsDialog.jsx @@ -63,9 +63,9 @@ class EditParameterMappingsDialog extends React.Component { const clientConfig = this.props.clientConfig; // eslint-disable-line react/prop-types const Query = this.props.Query; // eslint-disable-line react/prop-types - const existingParamNames = map( + const existingParams = map( this.props.dashboard.getParametersDefs(), - param => param.name, + ({ name, type }) => ({ name, type }), ); return ( @@ -87,7 +87,7 @@ class EditParameterMappingsDialog extends React.Component { (this.state.parameterMappings.length > 0) && this.updateParamMappings(mappings)} clientConfig={clientConfig} Query={Query} From 1a61ee3ec0711e911bdaf25ed3f4130265991c4d Mon Sep 17 00:00:00 2001 From: Vibhor Kumar Date: Wed, 23 Jan 2019 13:07:40 -0500 Subject: [PATCH 016/177] Add: Uptycs query runner (#3319) * adding uptycs query_runner in redash * as per comment from Arik comment fixed the code * fixed function_name * fixed some indentation issues * fixed the indentation issue and taken out customer_id from secret * fixed the dependency of urllib3 * fixed the indententaton issue * remved the urllib3 from requirements * fixed the indentation issues * added the new square image for Uptycs. Removed unnecessary variable and made ssl as an option * fixed indentation issue * Renamed SSL to verify_ssl and also added verify_ssl validate in verify in missing places --- client/app/assets/images/db-logos/uptycs.png | Bin 0 -> 2629 bytes redash/query_runner/uptycs.py | 140 +++++++++++++++++++ redash/settings/__init__.py | 1 + 3 files changed, 141 insertions(+) create mode 100644 client/app/assets/images/db-logos/uptycs.png create mode 100644 redash/query_runner/uptycs.py diff --git a/client/app/assets/images/db-logos/uptycs.png b/client/app/assets/images/db-logos/uptycs.png new file mode 100644 index 0000000000000000000000000000000000000000..3f9ead878531696c74e07bc41df07bf791643ddd GIT binary patch literal 2629 zcmbW3c{tPy7sr2cOR1YBOK+~h7|JpXvJFEqni*^MWh}|wB)c$3*E%6%CnD-bmYM8Z zj7mtBY%{K9Y=guQS&G4{_rLd#_mB6U=Q+0&+0M%F&W_!) z2Y@qN802+}5J%?J%I#t}U)(HPbaC;*Avu`l*D(Bq-^v)mHoc@>yNBsN^WfJd{~$!| zXd=C^KTM8<;@{@94U^tUhbiTo6o0=J#=PSiq<+p{;OHDjL55EAO6gx4fspiVqlS5@ z_5#uWVndeZnby zu+3XO1Dm^5Fm-+ueT0Z!CPfUek;a{(7sVUrtG=M85g2OMJXy(M_qV_Aq!eDMFJADn zw>@QtHI*cjW_%G_(}*Mz#Q{Nr4@nSw2XWt@YjOptd$Pat;5`#;-Znh!i@g#Gmq=F< zmwK2{lr~t}NBgu1MMGlDBF;rlFS=&wBPjTpBCM>>sUtSxhwCujjXImB932~GEZNn%qQTqne`SlJ-XeBoMB;%q!R>{fVdJfrQW7v1X~4Yauyx8eK#z z1;wluCOG2NaQ7c85pat;ZC_BE?d%^|<06tx3g}3!Tiky8&$Me~Jy$vd{Z3*J^ zTix9|HGsbB-R2KEdo<>k(}#*H>XrOid6K_xy!ArUsY{fk-S>xPgIcxN9>%lFDY0cG zv#-l_dSy~JYGPmq*?CRp-^1i9dHOoZ!9u&{Ri&XLa{S?W^PqAoRcG}SmxG~eYa)*p z%P9GpS>x6&Lh)M(tvvDV+i6T&8}o^Nj{x~s+_m3*x_dkh<3?C;R*#XY@yom> zZR=?~Dqz}pR0|_g*0-mtxGl1{Ht5t#al8v1VjptdzeDKSWc5M7tmgVAHeHQ;7x6;< zoE>$ag$CE{<7AWucxM(;~4klJ~c|bZshX!b>boazgsf0gVn= zl}48OhtmTgPgGN`%*V)3d0S6*S#l{N0EVq-YS22eY^?hTpp6spYcC9AEffC`ict zfOHq1S1*#aYJvx)St^aJ8rtyaUu)=O6a<#ymng$xo#yw7rM@r$&HE}hEYWMHUT&c5 zBkdwjTTV(2r{< zs&}g?+{`rlj?vW#+dFRr@Nump@)r4Qxzh-)q7wTn+#77Ub>;LZ%Syo~*lZBdf7|+f zMbmpllZ36PHxUOLw1sV))c4BM5$_(EcN>LD)o}6);V0Ho2Mz8&GbBhPH4E-Z+-)ak z`4rV%3&!Q0SSb{lHhv|g+oCVOWiS>;?z8-GV|!Isv1h=tzEZW5FTbG1Ko&$STU8O@ zLL2RDKC*534Oh)UUyinLvlRQ#$r7uk@(+yj+l=Bs5=+U>HJwW36;hq5`cd zfO(P()vb>(Xhi;Gm!c>CLQaNg=JJGS>#}~%b#(hl7p4VR0TVmlEN+0-A9;`AL^U+C zixSqpseNEQp+mq#*|vR}?p$}eGD1(3ClbV!9+n{W(DfV6SW1EC1ZKB-2nJ21UGsE{ z#ZOW4GrDo2Te^Rq(U|7t6(hR78~+l6tf;E!aGwxLdz?Tpi5aB3&gCKo2{sQiv^L%M zSK$mX6&@VteJZJ4=4Z!`Ze#`XZY@4qy+0z+phFJGE#h1Z^9eQt2eWm*2!qk`9G>%5 z1&jBN^S@>ocEB5wK2UiSC2#wfdHDIngcHUR@&EdkoGQYWAy0|RJ$gN9 z34!Od3CNz*1hr=-;8cGI`1}_U_IptxiV!db>p}Km**U}^88oZHH9oBA(1ld42S;z% z6K@v3xC~D6L?mZm6^>1M_dXJG-1tq-tQ(Q&_upnSkoKe9!#U3TlX)0p*Pn>ELe)#X zB&W69sjmdhq-ceR0p3t~Jzk9Bc}oW)XHu4#24RMPw3~m5Zuq>XcY{taeC!N$U8JNj zZd6&u90BO1vGu459jZ7e1kL%`?1z_siZWOb8Z!---mUZEc>_+%^kN&66o+!_fDW1T zLah)(DzAoy)|C6Wz05`Pmx^J!G>GbS(S?#v&XSqoto`N0=0kVVd)UnciJlCUUv`_c z_X+*^RYxD?l;i-T*))_eV^Cnz^K58stme25$XhI>o`}MBKZpKbwgL$%#4wEykGT?R z;nLcfs9Bcg)T$2}?UoP-wGcn01KLJEB%<_mgmplcwo^Krr7PRsA`H`s^{I~x(+7P2>j3nvY G`t#pvmd)b; literal 0 HcmV?d00001 diff --git a/redash/query_runner/uptycs.py b/redash/query_runner/uptycs.py new file mode 100644 index 0000000000..d8e8c59fb1 --- /dev/null +++ b/redash/query_runner/uptycs.py @@ -0,0 +1,140 @@ +from redash.query_runner import * +from redash.utils import json_dumps + +import json +import jwt +import datetime +import requests +import logging + +logger = logging.getLogger(__name__) + + +class Uptycs(BaseSQLQueryRunner): + noop_query = "SELECT 1" + + @classmethod + def configuration_schema(cls): + return { + "type": "object", + "properties": { + "url": { + "type": "string" + }, + "customer_id": { + "type": "string" + }, + "key": { + "type": "string" + }, + "verify_ssl": { + "type": "boolean", + "default": True, + "title": "Verify SSL Certificates", + }, + "secret": { + "type": "string", + }, + }, + "order": ['url', 'customer_id', 'key', 'secret'], + "required": ["url", "customer_id", "key", "secret"], + "secret": ["secret", "key"] + } + + @classmethod + def annotate_query(cls): + return False + + def generate_header(self, key, secret): + header = {} + utcnow = datetime.datetime.utcnow() + date = utcnow.strftime("%a, %d %b %Y %H:%M:%S GMT") + auth_var = jwt.encode({'iss': key}, secret, algorithm='HS256') + authorization = "Bearer %s" % (auth_var) + header['date'] = date + header['Authorization'] = authorization + return header + + def transformed_to_redash_json(self, data): + transformed_columns = [] + rows = [] + # convert all type to JSON string + # In future we correct data type mapping later + if 'columns' in data: + for json_each in data['columns']: + name = json_each['name'] + new_json = {"name": name, + "type": "string", + "friendly_name": name} + transformed_columns.append(new_json) + # Transfored items into rows. + if 'items' in data: + rows = data['items'] + + redash_json_data = {"columns": transformed_columns, + "rows": rows} + return redash_json_data + + def api_call(self, sql): + # JWT encoded header + header = self.generate_header(self.configuration.get('key'), + self.configuration.get('secret')) + + # URL form using API key file based on GLOBAL + url = ("%s/public/api/customers/%s/query" % + (self.configuration.get('url'), + self.configuration.get('customer_id'))) + + # post data base sql + post_data_json = {"query": sql} + + response = requests.post(url, headers=header, json=post_data_json, + verify=self.configuration.get('verify_ssl', + True)) + + if response.status_code == 200: + response_output = json.loads(response.content) + else: + error = 'status_code ' + str(response.status_code) + '\n' + error = error + "failed to connect" + json_data = {} + return json_data, error + # if we get right status code then call transfored_to_redash + json_data = self.transformed_to_redash_json(response_output) + error = None + # if we got error from Uptycs include error information + if 'error' in response_output: + error = response_output['error']['message']['brief'] + error = error + '\n' + response_output['error']['message']['detail'] + return json_data, error + + def run_query(self, query, user): + data, error = self.api_call(query) + json_data = json_dumps(data) + logger.debug("%s", json_data) + return json_data, error + + def get_schema(self, get_stats=False): + header = self.generate_header(self.configuration.get('key'), + self.configuration.get('secret')) + url = ("%s/public/api/customers/%s/schema/global" % + (self.configuration.get('url'), + self.configuration.get('customer_id'))) + response = requests.get(url, headers=header, + verify=self.configuration.get('verify_ssl', + True)) + redash_json = [] + schema = json.loads(response.content) + for each_def in schema['tables']: + table_name = each_def['name'] + columns = [] + for col in each_def['columns']: + columns.append(col['name']) + table_json = {"name": table_name, "columns": columns} + redash_json.append(table_json) + + logger.debug("%s", schema.values()) + return redash_json + + +register(Uptycs) diff --git a/redash/settings/__init__.py b/redash/settings/__init__.py index f1608e9a87..a995b382fb 100644 --- a/redash/settings/__init__.py +++ b/redash/settings/__init__.py @@ -190,6 +190,7 @@ def all_settings(): 'redash.query_runner.druid', 'redash.query_runner.kylin', 'redash.query_runner.drill', + 'redash.query_runner.uptycs', ] enabled_query_runners = array_from_string(os.environ.get("REDASH_ENABLED_QUERY_RUNNERS", ",".join(default_query_runners))) From c2c722e12e5753fc21f93a3053b97bef705362e5 Mon Sep 17 00:00:00 2001 From: Levko Kravets Date: Wed, 23 Jan 2019 20:10:52 +0200 Subject: [PATCH 017/177] Migrate PageHeader component to React (#3324) * Migrate PageHeader component to React * CR1 --- .../assets/less/redash/redash-newstyle.less | 2 +- client/app/components/PageHeader.jsx | 23 +++++++++++++++++++ client/app/components/page-header/index.js | 16 ------------- .../components/page-header/page-header.html | 9 -------- client/app/components/settings-screen.html | 3 +-- .../outdated-queries/outdated-queries.html | 3 +-- client/app/pages/admin/status/status.html | 5 ++-- client/app/pages/admin/tasks/tasks.html | 3 +-- client/app/pages/alert/alert.html | 4 +--- client/app/pages/alerts-list/alerts-list.html | 2 +- .../app/pages/dashboards/dashboard-list.html | 3 +-- .../dashboards/public-dashboard-page.html | 3 +-- .../app/pages/queries-list/queries-list.html | 2 +- 13 files changed, 34 insertions(+), 44 deletions(-) create mode 100644 client/app/components/PageHeader.jsx delete mode 100644 client/app/components/page-header/index.js delete mode 100644 client/app/components/page-header/page-header.html diff --git a/client/app/assets/less/redash/redash-newstyle.less b/client/app/assets/less/redash/redash-newstyle.less index 711d546f38..efb824d138 100644 --- a/client/app/assets/less/redash/redash-newstyle.less +++ b/client/app/assets/less/redash/redash-newstyle.less @@ -370,7 +370,7 @@ body { padding: 20px; } -page-header, .page-header--new { +.page-header-wrapper, .page-header--new { h3 { margin: 0.2em 0; line-height: 1.3; diff --git a/client/app/components/PageHeader.jsx b/client/app/components/PageHeader.jsx new file mode 100644 index 0000000000..748f8f7e91 --- /dev/null +++ b/client/app/components/PageHeader.jsx @@ -0,0 +1,23 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { react2angular } from 'react2angular'; + +export function PageHeader({ title }) { + return ( +
      +
      +

      { title }

      +
      +
      + ); +} + +PageHeader.propTypes = { + title: PropTypes.string.isRequired, +}; + +export default function init(ngModule) { + ngModule.component('pageHeader', react2angular(PageHeader)); +} + +init.init = true; diff --git a/client/app/components/page-header/index.js b/client/app/components/page-header/index.js deleted file mode 100644 index 149c72943e..0000000000 --- a/client/app/components/page-header/index.js +++ /dev/null @@ -1,16 +0,0 @@ -import template from './page-header.html'; - -function controller() {} - -export default function init(ngModule) { - ngModule.component('pageHeader', { - template, - controller, - transclude: true, - bindings: { - title: '@', - }, - }); -} - -init.init = true; diff --git a/client/app/components/page-header/page-header.html b/client/app/components/page-header/page-header.html deleted file mode 100644 index 056ca2558d..0000000000 --- a/client/app/components/page-header/page-header.html +++ /dev/null @@ -1,9 +0,0 @@ -
      -
      -

      {{$ctrl.title}}

      -
      -
      -

      -

      -
      -
      diff --git a/client/app/components/settings-screen.html b/client/app/components/settings-screen.html index 809867f1fd..fb0510dc5e 100644 --- a/client/app/components/settings-screen.html +++ b/client/app/components/settings-screen.html @@ -1,6 +1,5 @@
      - - +
        diff --git a/client/app/pages/admin/outdated-queries/outdated-queries.html b/client/app/pages/admin/outdated-queries/outdated-queries.html index 68036ec98f..605b574709 100644 --- a/client/app/pages/admin/outdated-queries/outdated-queries.html +++ b/client/app/pages/admin/outdated-queries/outdated-queries.html @@ -1,6 +1,5 @@
        - - +
          diff --git a/client/app/pages/admin/status/status.html b/client/app/pages/admin/status/status.html index 99435059d2..eb5191df0e 100644 --- a/client/app/pages/admin/status/status.html +++ b/client/app/pages/admin/status/status.html @@ -1,6 +1,5 @@
          - - +
            @@ -62,4 +61,4 @@
          -
        \ No newline at end of file +
        diff --git a/client/app/pages/admin/tasks/tasks.html b/client/app/pages/admin/tasks/tasks.html index ffd96b5056..f0b04d913d 100644 --- a/client/app/pages/admin/tasks/tasks.html +++ b/client/app/pages/admin/tasks/tasks.html @@ -1,6 +1,5 @@
        - - +
          diff --git a/client/app/pages/alert/alert.html b/client/app/pages/alert/alert.html index 737f384624..54ff300f76 100644 --- a/client/app/pages/alert/alert.html +++ b/client/app/pages/alert/alert.html @@ -1,7 +1,5 @@
          - - - + diff --git a/client/app/pages/alerts-list/alerts-list.html b/client/app/pages/alerts-list/alerts-list.html index 1c8e7d8e8a..b4d96d0250 100644 --- a/client/app/pages/alerts-list/alerts-list.html +++ b/client/app/pages/alerts-list/alerts-list.html @@ -1,5 +1,5 @@
          - + - - +
          diff --git a/client/app/pages/dashboards/public-dashboard-page.html b/client/app/pages/dashboards/public-dashboard-page.html index e25016c9f3..4377410336 100644 --- a/client/app/pages/dashboards/public-dashboard-page.html +++ b/client/app/pages/dashboards/public-dashboard-page.html @@ -1,6 +1,5 @@
          - - +
          diff --git a/client/app/pages/queries-list/queries-list.html b/client/app/pages/queries-list/queries-list.html index a20f96d9ac..acc005bbff 100644 --- a/client/app/pages/queries-list/queries-list.html +++ b/client/app/pages/queries-list/queries-list.html @@ -1,5 +1,5 @@
          - +
          From b0b4d5e26a5b88933e8d76ad63507d37d1899d8c Mon Sep 17 00:00:00 2001 From: Levko Kravets Date: Thu, 24 Jan 2019 16:24:58 +0200 Subject: [PATCH 018/177] Convert Angular services to CommonJS-style and use them in React components instead of injecting (#3331) * Refine Auth service: remove dead code and fix race condition * Export services in CommonJS style * Refine Users, Events and OfflineListener services * Refactor Notifications service - rewrite to CommonJS * Replace Angular service injection with imports in React components * Fix Footer tests * Events service -> recordEvent function * CR1 --- client/app/components/AutocompleteToggle.jsx | 2 +- client/app/components/DateInput.jsx | 5 +- client/app/components/DateRangeInput.jsx | 5 +- client/app/components/DateTimeInput.jsx | 5 +- client/app/components/DateTimeRangeInput.jsx | 5 +- client/app/components/Footer.jsx | 17 +-- client/app/components/Footer.test.js | 15 +-- client/app/components/ParameterValueInput.jsx | 55 ++-------- .../components/QueryBasedParameterInput.jsx | 4 +- client/app/components/QueryEditor.jsx | 20 ++-- .../dashboards/AddTextboxDialog.jsx | 6 +- .../components/dashboards/AddWidgetDialog.jsx | 17 +-- .../EditParameterMappingsDialog.jsx | 8 +- .../components/dynamic-form/DynamicForm.jsx | 2 +- .../tags-control/DashboardTagsControl.jsx | 2 +- .../tags-control/QueryTagsControl.jsx | 2 +- .../components/tags-control/TagsControl.jsx | 3 +- client/app/index.js | 3 +- client/app/pages/queries/view.js | 2 +- client/app/services/alert-dialog.js | 15 +-- client/app/services/alert-subscription.js | 14 ++- client/app/services/alert.js | 15 +-- client/app/services/auth.js | 98 ++++++++--------- client/app/services/dashboard.js | 11 +- client/app/services/data-source.js | 11 +- client/app/services/destination.js | 16 +-- client/app/services/events.js | 6 +- client/app/services/getTags.js | 2 +- client/app/services/group.js | 14 ++- client/app/services/http.js | 11 -- client/app/services/keyboard-shortcuts.js | 10 +- client/app/services/ng.js | 16 +++ client/app/services/notifications.js | 102 ++++++++---------- client/app/services/offline-listener.js | 36 +++---- client/app/services/organization-status.js | 10 +- client/app/services/query-snippet.js | 10 +- client/app/services/query.js | 39 ++++--- client/app/{lib => services}/recordEvent.js | 6 +- client/app/services/toastr.js | 10 -- client/app/services/user.js | 24 +++-- client/app/services/widget.js | 20 ++-- 41 files changed, 319 insertions(+), 355 deletions(-) delete mode 100644 client/app/services/http.js create mode 100644 client/app/services/ng.js rename client/app/{lib => services}/recordEvent.js (79%) delete mode 100644 client/app/services/toastr.js diff --git a/client/app/components/AutocompleteToggle.jsx b/client/app/components/AutocompleteToggle.jsx index e74e0a9047..5a4c9bff20 100644 --- a/client/app/components/AutocompleteToggle.jsx +++ b/client/app/components/AutocompleteToggle.jsx @@ -2,7 +2,7 @@ import React from 'react'; import Tooltip from 'antd/lib/tooltip'; import PropTypes from 'prop-types'; import '@/redash-font/style.less'; -import recordEvent from '@/lib/recordEvent'; +import recordEvent from '@/services/recordEvent'; export default function AutocompleteToggle({ state, disabled, onToggle }) { let tooltipMessage = 'Live Autocomplete Enabled'; diff --git a/client/app/components/DateInput.jsx b/client/app/components/DateInput.jsx index 695a2a1997..ff7812ed8e 100644 --- a/client/app/components/DateInput.jsx +++ b/client/app/components/DateInput.jsx @@ -3,12 +3,11 @@ import React from 'react'; import PropTypes from 'prop-types'; import { react2angular } from 'react2angular'; import DatePicker from 'antd/lib/date-picker'; +import { clientConfig } from '@/services/auth'; export function DateInput({ value, onSelect, - // eslint-disable-next-line react/prop-types - clientConfig, className, }) { const format = clientConfig.dateFormat || 'YYYY-MM-DD'; @@ -46,7 +45,7 @@ DateInput.defaultProps = { }; export default function init(ngModule) { - ngModule.component('dateInput', react2angular(DateInput, null, ['clientConfig'])); + ngModule.component('dateInput', react2angular(DateInput)); } init.init = true; diff --git a/client/app/components/DateRangeInput.jsx b/client/app/components/DateRangeInput.jsx index 1b1454bbb5..d8ccef48f7 100644 --- a/client/app/components/DateRangeInput.jsx +++ b/client/app/components/DateRangeInput.jsx @@ -4,14 +4,13 @@ import React from 'react'; import PropTypes from 'prop-types'; import { react2angular } from 'react2angular'; import DatePicker from 'antd/lib/date-picker'; +import { clientConfig } from '@/services/auth'; const { RangePicker } = DatePicker; export function DateRangeInput({ value, onSelect, - // eslint-disable-next-line react/prop-types - clientConfig, className, }) { const format = clientConfig.dateFormat || 'YYYY-MM-DD'; @@ -53,7 +52,7 @@ DateRangeInput.defaultProps = { }; export default function init(ngModule) { - ngModule.component('dateRangeInput', react2angular(DateRangeInput, null, ['clientConfig'])); + ngModule.component('dateRangeInput', react2angular(DateRangeInput)); } init.init = true; diff --git a/client/app/components/DateTimeInput.jsx b/client/app/components/DateTimeInput.jsx index d95fd60884..92fb81f104 100644 --- a/client/app/components/DateTimeInput.jsx +++ b/client/app/components/DateTimeInput.jsx @@ -3,13 +3,12 @@ import React from 'react'; import PropTypes from 'prop-types'; import { react2angular } from 'react2angular'; import DatePicker from 'antd/lib/date-picker'; +import { clientConfig } from '@/services/auth'; export function DateTimeInput({ value, withSeconds, onSelect, - // eslint-disable-next-line react/prop-types - clientConfig, className, }) { const format = (clientConfig.dateFormat || 'YYYY-MM-DD') + @@ -51,7 +50,7 @@ DateTimeInput.defaultProps = { }; export default function init(ngModule) { - ngModule.component('dateTimeInput', react2angular(DateTimeInput, null, ['clientConfig'])); + ngModule.component('dateTimeInput', react2angular(DateTimeInput)); } init.init = true; diff --git a/client/app/components/DateTimeRangeInput.jsx b/client/app/components/DateTimeRangeInput.jsx index d0fa5ecb39..51f6c62ddc 100644 --- a/client/app/components/DateTimeRangeInput.jsx +++ b/client/app/components/DateTimeRangeInput.jsx @@ -4,6 +4,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { react2angular } from 'react2angular'; import DatePicker from 'antd/lib/date-picker'; +import { clientConfig } from '@/services/auth'; const { RangePicker } = DatePicker; @@ -11,8 +12,6 @@ export function DateTimeRangeInput({ value, withSeconds, onSelect, - // eslint-disable-next-line react/prop-types - clientConfig, className, }) { const format = (clientConfig.dateFormat || 'YYYY-MM-DD') + @@ -58,7 +57,7 @@ DateTimeRangeInput.defaultProps = { }; export default function init(ngModule) { - ngModule.component('dateTimeRangeInput', react2angular(DateTimeRangeInput, null, ['clientConfig'])); + ngModule.component('dateTimeRangeInput', react2angular(DateTimeRangeInput)); } init.init = true; diff --git a/client/app/components/Footer.jsx b/client/app/components/Footer.jsx index bd1f06efda..7e45562fe1 100644 --- a/client/app/components/Footer.jsx +++ b/client/app/components/Footer.jsx @@ -1,11 +1,10 @@ import React from 'react'; -import PropTypes from 'prop-types'; - import { react2angular } from 'react2angular'; +import { clientConfig, currentUser } from '@/services/auth'; import frontendVersion from '../version.json'; -export function Footer({ clientConfig, currentUser }) { +export function Footer() { const backendVersion = clientConfig.version; const newVersionAvailable = clientConfig.newVersionAvailable && currentUser.isAdmin; const separator = ' \u2022 '; @@ -31,18 +30,8 @@ export function Footer({ clientConfig, currentUser }) { ); } -Footer.propTypes = { - clientConfig: PropTypes.shape({ - version: PropTypes.string, - newVersionAvailable: PropTypes.bool, - }).isRequired, - currentUser: PropTypes.shape({ - isAdmin: PropTypes.bool, - }).isRequired, -}; - export default function init(ngModule) { - ngModule.component('footer', react2angular(Footer, [], ['clientConfig', 'currentUser'])); + ngModule.component('footer', react2angular(Footer)); } init.init = true; diff --git a/client/app/components/Footer.test.js b/client/app/components/Footer.test.js index 81a157ebfc..519a9e5732 100644 --- a/client/app/components/Footer.test.js +++ b/client/app/components/Footer.test.js @@ -1,16 +1,19 @@ +import { extend } from 'lodash'; import React from 'react'; import renderer from 'react-test-renderer'; +import { clientConfig, currentUser } from '../services/auth'; import { Footer } from './Footer'; test('Footer renders', () => { - const clientConfig = { + // TODO: Properly mock this + extend(clientConfig, { version: '5.0.1', newVersionAvailable: true, - }; - const currentUser = { - isAdmin: true, - }; - const component = renderer.create(
          ); + }); + extend(currentUser, { + permissions: ['admin'], + }); + const component = renderer.create(
          ); const tree = component.toJSON(); expect(tree).toMatchSnapshot(); }); diff --git a/client/app/components/ParameterValueInput.jsx b/client/app/components/ParameterValueInput.jsx index c16edcc7af..301e83fc91 100644 --- a/client/app/components/ParameterValueInput.jsx +++ b/client/app/components/ParameterValueInput.jsx @@ -31,99 +31,69 @@ export class ParameterValueInput extends React.Component { }; renderDateTimeWithSecondsInput() { - const { - value, - onSelect, - clientConfig, // eslint-disable-line react/prop-types - } = this.props; + const { value, onSelect } = this.props; return ( ); } renderDateTimeInput() { - const { - value, - onSelect, - clientConfig, // eslint-disable-line react/prop-types - } = this.props; + const { value, onSelect } = this.props; return ( ); } renderDateInput() { - const { - value, - onSelect, - clientConfig, // eslint-disable-line react/prop-types - } = this.props; + const { value, onSelect } = this.props; return ( ); } renderDateTimeRangeWithSecondsInput() { - const { - value, - onSelect, - clientConfig, // eslint-disable-line react/prop-types - } = this.props; + const { value, onSelect } = this.props; return ( ); } renderDateTimeRangeInput() { - const { - value, - onSelect, - clientConfig, // eslint-disable-line react/prop-types - } = this.props; + const { value, onSelect } = this.props; return ( ); } renderDateRangeInput() { - const { - value, - onSelect, - clientConfig, // eslint-disable-line react/prop-types - } = this.props; + const { value, onSelect } = this.props; return ( ); } @@ -146,19 +116,13 @@ export class ParameterValueInput extends React.Component { } renderQueryBasedInput() { - const { - value, - onSelect, - queryId, - Query, // eslint-disable-line react/prop-types - } = this.props; + const { value, onSelect, queryId } = this.props; return ( ); } @@ -212,10 +176,7 @@ export default function init(ngModule) { }; }, }); - ngModule.component( - 'parameterValueInputImpl', - react2angular(ParameterValueInput, null, ['clientConfig', 'Query']), - ); + ngModule.component('parameterValueInputImpl', react2angular(ParameterValueInput)); } init.init = true; diff --git a/client/app/components/QueryBasedParameterInput.jsx b/client/app/components/QueryBasedParameterInput.jsx index f9ef4ebace..8c82bda54e 100644 --- a/client/app/components/QueryBasedParameterInput.jsx +++ b/client/app/components/QueryBasedParameterInput.jsx @@ -3,6 +3,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { react2angular } from 'react2angular'; import Select from 'antd/lib/select'; +import { Query } from '@/services/query'; const { Option } = Select; @@ -79,7 +80,6 @@ export class QueryBasedParameterInput extends React.Component { _loadOptions(queryId) { if (queryId && (queryId !== this.state.queryId)) { - const Query = this.props.Query; // eslint-disable-line react/prop-types this.setState({ loading: true }); Query.resultById({ id: queryId }, (result) => { if (this.props.queryId === queryId) { @@ -117,7 +117,7 @@ export class QueryBasedParameterInput extends React.Component { } export default function init(ngModule) { - ngModule.component('queryBasedParameterInput', react2angular(QueryBasedParameterInput, null, ['Query'])); + ngModule.component('queryBasedParameterInput', react2angular(QueryBasedParameterInput)); } init.init = true; diff --git a/client/app/components/QueryEditor.jsx b/client/app/components/QueryEditor.jsx index f9e2499f8f..c86b704a1c 100644 --- a/client/app/components/QueryEditor.jsx +++ b/client/app/components/QueryEditor.jsx @@ -14,6 +14,10 @@ import 'brace/mode/sql'; import 'brace/theme/textmate'; import 'brace/ext/searchbox'; +import { Query } from '@/services/query'; +import { QuerySnippet } from '@/services/query-snippet'; +import { KeyboardShortcuts } from '@/services/keyboard-shortcuts'; + import localOptions from '@/lib/localOptions'; import AutocompleteToggle from '@/components/AutocompleteToggle'; import keywordBuilder from './keywordBuilder'; @@ -152,8 +156,7 @@ class QueryEditor extends React.Component { } }); - // eslint-disable-next-line react/prop-types - this.props.QuerySnippet.query((snippets) => { + QuerySnippet.query((snippets) => { const snippetManager = snippetsModule.snippetManager; const m = { snippetText: '', @@ -194,7 +197,7 @@ class QueryEditor extends React.Component { const selectedQueryText = (rawSelectedQueryText.length > 1) ? rawSelectedQueryText : null; this.setState({ selectedQueryText }); this.props.updateSelectedQuery(selectedQueryText); - } + }; updateQuery = (queryText) => { this.props.updateQuery(queryText); @@ -202,9 +205,7 @@ class QueryEditor extends React.Component { }; formatQuery = () => { - // eslint-disable-next-line react/prop-types - const format = this.props.Query.format; - format(this.props.dataSource.syntax || 'sql', this.props.queryText) + Query.format(this.props.dataSource.syntax || 'sql', this.props.queryText) .then(this.updateQuery) .catch(error => toastr.error(error)); }; @@ -212,11 +213,10 @@ class QueryEditor extends React.Component { toggleAutocomplete = (state) => { this.setState({ autocompleteQuery: state }); localOptions.set('liveAutocomplete', state); - } + }; render() { - // eslint-disable-next-line react/prop-types - const modKey = this.props.KeyboardShortcuts.modKey; + const modKey = KeyboardShortcuts.modKey; const isExecuteDisabled = this.props.queryExecuting || !this.props.canExecuteQuery(); @@ -320,7 +320,7 @@ class QueryEditor extends React.Component { } export default function init(ngModule) { - ngModule.component('queryEditor', react2angular(QueryEditor, null, ['QuerySnippet', 'Query', 'KeyboardShortcuts'])); + ngModule.component('queryEditor', react2angular(QueryEditor)); } init.init = true; diff --git a/client/app/components/dashboards/AddTextboxDialog.jsx b/client/app/components/dashboards/AddTextboxDialog.jsx index 97fead0cc8..6d9510ae51 100644 --- a/client/app/components/dashboards/AddTextboxDialog.jsx +++ b/client/app/components/dashboards/AddTextboxDialog.jsx @@ -3,6 +3,8 @@ import { debounce } from 'lodash'; import React from 'react'; import PropTypes from 'prop-types'; import { react2angular } from 'react2angular'; +import { toastr } from '@/services/ng'; +import { Widget } from '@/services/widget'; class AddTextboxDialog extends React.Component { static propTypes = { @@ -38,8 +40,6 @@ class AddTextboxDialog extends React.Component { } saveWidget() { - const Widget = this.props.Widget; // eslint-disable-line react/prop-types - const toastr = this.props.toastr; // eslint-disable-line react/prop-types const dashboard = this.props.dashboard; this.setState({ saveInProgress: true }); @@ -148,7 +148,7 @@ export default function init(ngModule) { dismiss: '&', }, }); - ngModule.component('addTextboxDialogImpl', react2angular(AddTextboxDialog, null, ['toastr', 'Widget'])); + ngModule.component('addTextboxDialogImpl', react2angular(AddTextboxDialog)); } init.init = true; diff --git a/client/app/components/dashboards/AddWidgetDialog.jsx b/client/app/components/dashboards/AddWidgetDialog.jsx index 6d51a35e90..ea351575f4 100644 --- a/client/app/components/dashboards/AddWidgetDialog.jsx +++ b/client/app/components/dashboards/AddWidgetDialog.jsx @@ -10,6 +10,10 @@ import { editableMappingsToParameterMappings, } from '@/components/ParameterMappingInput'; +import { toastr } from '@/services/ng'; +import { Widget } from '@/services/widget'; +import { Query } from '@/services/query'; + const { Option, OptGroup } = Select; class AddWidgetDialog extends React.Component { @@ -38,7 +42,6 @@ class AddWidgetDialog extends React.Component { }; // Don't show draft (unpublished) queries - const Query = this.props.Query; // eslint-disable-line react/prop-types Query.recent().$promise.then((items) => { this.setState({ recentQueries: items.filter(item => !item.is_draft), @@ -62,7 +65,6 @@ class AddWidgetDialog extends React.Component { }); if (queryId) { - const Query = this.props.Query; // eslint-disable-line react/prop-types Query.get({ id: queryId }, (query) => { if (query) { const existingParamNames = map( @@ -95,7 +97,6 @@ class AddWidgetDialog extends React.Component { return; } - const Query = this.props.Query; // eslint-disable-line react/prop-types Query.query({ q: term }, (results) => { // If user will type too quick - it's possible that there will be // several requests running simultaneously. So we need to check @@ -117,8 +118,6 @@ class AddWidgetDialog extends React.Component { } saveWidget() { - const Widget = this.props.Widget; // eslint-disable-line react/prop-types - const toastr = this.props.toastr; // eslint-disable-line react/prop-types const dashboard = this.props.dashboard; this.setState({ saveInProgress: true }); @@ -278,9 +277,6 @@ class AddWidgetDialog extends React.Component { } render() { - const clientConfig = this.props.clientConfig; // eslint-disable-line react/prop-types - const Query = this.props.Query; // eslint-disable-line react/prop-types - const existingParams = map( this.props.dashboard.getParametersDefs(), ({ name, type }) => ({ name, type }), @@ -313,8 +309,6 @@ class AddWidgetDialog extends React.Component { mappings={this.state.parameterMappings} existingParams={existingParams} onChange={mappings => this.updateParamMappings(mappings)} - clientConfig={clientConfig} - Query={Query} />, ] } @@ -358,8 +352,7 @@ export default function init(ngModule) { dismiss: '&', }, }); - ngModule.component('addWidgetDialogImpl', react2angular(AddWidgetDialog, null, [ - 'toastr', 'Widget', 'Query', 'clientConfig'])); + ngModule.component('addWidgetDialogImpl', react2angular(AddWidgetDialog)); } init.init = true; diff --git a/client/app/components/dashboards/EditParameterMappingsDialog.jsx b/client/app/components/dashboards/EditParameterMappingsDialog.jsx index 2230224933..776be76f6c 100644 --- a/client/app/components/dashboards/EditParameterMappingsDialog.jsx +++ b/client/app/components/dashboards/EditParameterMappingsDialog.jsx @@ -60,9 +60,6 @@ class EditParameterMappingsDialog extends React.Component { } render() { - const clientConfig = this.props.clientConfig; // eslint-disable-line react/prop-types - const Query = this.props.Query; // eslint-disable-line react/prop-types - const existingParams = map( this.props.dashboard.getParametersDefs(), ({ name, type }) => ({ name, type }), @@ -89,8 +86,6 @@ class EditParameterMappingsDialog extends React.Component { mappings={this.state.parameterMappings} existingParams={existingParams} onChange={mappings => this.updateParamMappings(mappings)} - clientConfig={clientConfig} - Query={Query} /> }
          @@ -134,8 +129,7 @@ export default function init(ngModule) { dismiss: '&', }, }); - ngModule.component('editParameterMappingsDialogImpl', react2angular(EditParameterMappingsDialog, null, [ - 'Query', 'clientConfig'])); + ngModule.component('editParameterMappingsDialogImpl', react2angular(EditParameterMappingsDialog)); } init.init = true; diff --git a/client/app/components/dynamic-form/DynamicForm.jsx b/client/app/components/dynamic-form/DynamicForm.jsx index a35ede9107..329e2493a7 100644 --- a/client/app/components/dynamic-form/DynamicForm.jsx +++ b/client/app/components/dynamic-form/DynamicForm.jsx @@ -8,7 +8,7 @@ import Button from 'antd/lib/button'; import Upload from 'antd/lib/upload'; import Icon from 'antd/lib/icon'; import { react2angular } from 'react2angular'; -import { toastr } from '@/services/toastr'; +import { toastr } from '@/services/ng'; import { Field, Action, AntdForm } from '../proptypes'; import helper from './dynamicFormHelper'; diff --git a/client/app/components/tags-control/DashboardTagsControl.jsx b/client/app/components/tags-control/DashboardTagsControl.jsx index 1a535d4994..7337964308 100644 --- a/client/app/components/tags-control/DashboardTagsControl.jsx +++ b/client/app/components/tags-control/DashboardTagsControl.jsx @@ -6,7 +6,7 @@ export class DashboardTagsControl extends ModelTagsControl { } export default function init(ngModule) { - ngModule.component('dashboardTagsControl', react2angular(DashboardTagsControl, null, ['$uibModal'])); + ngModule.component('dashboardTagsControl', react2angular(DashboardTagsControl)); } init.init = true; diff --git a/client/app/components/tags-control/QueryTagsControl.jsx b/client/app/components/tags-control/QueryTagsControl.jsx index cd071e2308..9b56c26700 100644 --- a/client/app/components/tags-control/QueryTagsControl.jsx +++ b/client/app/components/tags-control/QueryTagsControl.jsx @@ -6,7 +6,7 @@ export class QueryTagsControl extends ModelTagsControl { } export default function init(ngModule) { - ngModule.component('queryTagsControl', react2angular(QueryTagsControl, null, ['$uibModal'])); + ngModule.component('queryTagsControl', react2angular(QueryTagsControl)); } init.init = true; diff --git a/client/app/components/tags-control/TagsControl.jsx b/client/app/components/tags-control/TagsControl.jsx index c486ac78af..0a28c0f98d 100644 --- a/client/app/components/tags-control/TagsControl.jsx +++ b/client/app/components/tags-control/TagsControl.jsx @@ -1,6 +1,7 @@ import { map, trim } from 'lodash'; import React from 'react'; import PropTypes from 'prop-types'; +import { $uibModal } from '@/services/ng'; export default class TagsControl extends React.Component { static propTypes = { @@ -20,7 +21,7 @@ export default class TagsControl extends React.Component { }; editTags() { - const { getAvailableTags, onEdit, $uibModal } = this.props; // eslint-disable-line react/prop-types + const { getAvailableTags, onEdit } = this.props; // eslint-disable-line react/prop-types const tags = map(this.props.tags, trim); getAvailableTags().then((availableTags) => { diff --git a/client/app/index.js b/client/app/index.js index 11699ee39c..5b24c90750 100644 --- a/client/app/index.js +++ b/client/app/index.js @@ -13,8 +13,7 @@ ngModule.config(($locationProvider, $compileProvider, uiSelectConfig, toastrConf }); // Update ui-select's template to use Font-Awesome instead of glyphicon. -// eslint-disable-next-line no-unused-vars -ngModule.run(($templateCache, OfflineListener) => { +ngModule.run(($templateCache) => { const templateName = 'bootstrap/match.tpl.html'; let template = $templateCache.get(templateName); template = template.replace('glyphicon glyphicon-remove', 'fa fa-remove'); diff --git a/client/app/pages/queries/view.js b/client/app/pages/queries/view.js index 76fc36b991..d8c4f1aacb 100644 --- a/client/app/pages/queries/view.js +++ b/client/app/pages/queries/view.js @@ -1,6 +1,7 @@ import { pick, some, find, minBy, map, intersection, isArray, isObject } from 'lodash'; import { SCHEMA_NOT_SUPPORTED, SCHEMA_LOAD_ERROR } from '@/services/data-source'; import getTags from '@/services/getTags'; +import Notifications from '@/services/notifications'; import template from './query.html'; const DEFAULT_TAB = 'table'; @@ -16,7 +17,6 @@ function QueryViewCtrl( KeyboardShortcuts, Title, AlertDialog, - Notifications, clientConfig, toastr, $uibModal, diff --git a/client/app/services/alert-dialog.js b/client/app/services/alert-dialog.js index c64b48c30c..84b1c410a2 100644 --- a/client/app/services/alert-dialog.js +++ b/client/app/services/alert-dialog.js @@ -1,3 +1,5 @@ +export let AlertDialog = null; // eslint-disable-line import/no-mutable-exports + const AlertDialogComponent = { template: `
          @@ -23,8 +25,8 @@ const AlertDialogComponent = { }, }; -function AlertDialog($uibModal) { - const service = { +function AlertDialogService($uibModal) { + return { open(title, message, confirm) { return $uibModal.open({ component: 'alertDialog', @@ -36,14 +38,15 @@ function AlertDialog($uibModal) { }).result; }, }; - - return service; } export default function init(ngModule) { ngModule.component('alertDialog', AlertDialogComponent); - ngModule.factory('AlertDialog', AlertDialog); + ngModule.factory('AlertDialog', AlertDialogService); + + ngModule.run(($injector) => { + AlertDialog = $injector.get('AlertDialog'); + }); } init.init = true; - diff --git a/client/app/services/alert-subscription.js b/client/app/services/alert-subscription.js index a50effa6c5..81daae1745 100644 --- a/client/app/services/alert-subscription.js +++ b/client/app/services/alert-subscription.js @@ -1,11 +1,15 @@ -function AlertSubscription($resource) { - const resource = $resource('api/alerts/:alertId/subscriptions/:subscriberId', { alertId: '@alert_id', subscriberId: '@id' }); - return resource; +export let AlertSubscription = null; // eslint-disable-line import/no-mutable-exports + +function AlertSubscriptionService($resource) { + return $resource('api/alerts/:alertId/subscriptions/:subscriberId', { alertId: '@alert_id', subscriberId: '@id' }); } export default function init(ngModule) { - ngModule.factory('AlertSubscription', AlertSubscription); + ngModule.factory('AlertSubscription', AlertSubscriptionService); + + ngModule.run(($injector) => { + AlertSubscription = $injector.get('AlertSubscription'); + }); } init.init = true; - diff --git a/client/app/services/alert.js b/client/app/services/alert.js index 0f7ff38234..cdd34865fa 100644 --- a/client/app/services/alert.js +++ b/client/app/services/alert.js @@ -1,4 +1,6 @@ -function Alert($resource, $http) { +export let Alert = null; // eslint-disable-line import/no-mutable-exports + +function AlertService($resource, $http) { const actions = { save: { method: 'POST', @@ -15,14 +17,15 @@ function Alert($resource, $http) { }].concat($http.defaults.transformRequest), }, }; - const resource = $resource('api/alerts/:id', { id: '@id' }, actions); - - return resource; + return $resource('api/alerts/:id', { id: '@id' }, actions); } export default function init(ngModule) { - ngModule.factory('Alert', Alert); + ngModule.factory('Alert', AlertService); + + ngModule.run(($injector) => { + Alert = $injector.get('Alert'); + }); } init.init = true; - diff --git a/client/app/services/auth.js b/client/app/services/auth.js index 86f7ddaabc..0ed8e97cf5 100644 --- a/client/app/services/auth.js +++ b/client/app/services/auth.js @@ -1,32 +1,40 @@ import debug from 'debug'; +import { includes, extend } from 'lodash'; -const logger = debug('redash:auth'); -const SESSION_ITEM = 'session'; -const session = { loaded: false }; +// eslint-disable-next-line import/no-mutable-exports +export let Auth = null; -function storeSession(sessionData) { - logger('Updating session to be:', sessionData); - Object.assign(session, sessionData, { loaded: true }); -} +export const currentUser = { + canEdit(object) { + const userId = object.user_id || (object.user && object.user.id); + return this.hasPermission('admin') || (userId && userId === this.id); + }, + + hasPermission(permission) { + return includes(this.permissions, permission); + }, -function getLocalSessionData() { - if (session.loaded) { - return session; - } + get isAdmin() { + return this.hasPermission('admin'); + }, +}; - const sessionData = window.sessionStorage.getItem(SESSION_ITEM); - if (sessionData) { - storeSession(JSON.parse(sessionData)); - } +export const clientConfig = {}; - return session; +const logger = debug('redash:auth'); +const session = { loaded: false }; + +function updateSession(sessionData) { + logger('Updating session to be:', sessionData); + extend(session, sessionData, { loaded: true }); + extend(currentUser, session.user); + extend(clientConfig, session.client_config); } function AuthService($window, $location, $q, $http) { - const Auth = { + return { isAuthenticated() { - const sessionData = getLocalSessionData(); - return sessionData.loaded && sessionData.user.id; + return session.loaded && session.user.id; }, login() { const next = encodeURI($location.url()); @@ -35,27 +43,25 @@ function AuthService($window, $location, $q, $http) { }, logout() { logger('Logout.'); - window.sessionStorage.removeItem(SESSION_ITEM); $window.location.href = 'logout'; }, loadSession() { logger('Loading session'); - const sessionData = getLocalSessionData(); - if (sessionData.loaded && sessionData.user.id) { + if (session.loaded && session.user.id) { logger('Resolving with local value.'); - return $q.resolve(sessionData); + return $q.resolve(session); } this.setApiKey(null); return $http.get('api/session').then((response) => { - storeSession(response.data); + updateSession(response.data); return session; }); }, loadConfig() { logger('Loading config'); return $http.get('/api/config').then((response) => { - storeSession({ client_config: response.data.client_config, user: { permissions: [] } }); + updateSession({ client_config: response.data.client_config, user: { permissions: [] } }); return response.data; }); }, @@ -68,14 +74,14 @@ function AuthService($window, $location, $q, $http) { }, requireSession() { logger('Requested authentication'); - if (Auth.isAuthenticated()) { - return $q.when(getLocalSessionData()); + if (this.isAuthenticated()) { + return $q.when(session); } - return Auth.loadSession() + return this.loadSession() .then(() => { - if (Auth.isAuthenticated()) { + if (this.isAuthenticated()) { logger('Loaded session'); - return getLocalSessionData(); + return session; } logger('Need to login, redirecting'); this.login(); @@ -86,33 +92,12 @@ function AuthService($window, $location, $q, $http) { }); }, }; - - return Auth; -} - -function CurrentUserService() { - const sessionData = getLocalSessionData(); - Object.assign(this, sessionData.user); - - this.canEdit = (object) => { - const userId = object.user_id || (object.user && object.user.id); - return this.hasPermission('admin') || (userId && userId === this.id); - }; - - this.hasPermission = permission => this.permissions.indexOf(permission) !== -1; - - this.isAdmin = this.hasPermission('admin'); -} - -function ClientConfigService() { - Object.assign(this, getLocalSessionData().client_config); } function apiKeyHttpInterceptor($injector) { return { request(config) { - const Auth = $injector.get('Auth'); - const apiKey = Auth.getApiKey(); + const apiKey = $injector.get('Auth').getApiKey(); if (apiKey) { config.headers.Authorization = `Key ${apiKey}`; } @@ -124,14 +109,17 @@ function apiKeyHttpInterceptor($injector) { export default function init(ngModule) { ngModule.factory('Auth', AuthService); - ngModule.service('currentUser', CurrentUserService); - ngModule.service('clientConfig', ClientConfigService); + ngModule.value('currentUser', currentUser); + ngModule.value('clientConfig', clientConfig); ngModule.factory('apiKeyHttpInterceptor', apiKeyHttpInterceptor); ngModule.config(($httpProvider) => { $httpProvider.interceptors.push('apiKeyHttpInterceptor'); }); + + ngModule.run(($injector) => { + Auth = $injector.get('Auth'); + }); } init.init = true; - diff --git a/client/app/services/dashboard.js b/client/app/services/dashboard.js index bb63aea261..3898189297 100644 --- a/client/app/services/dashboard.js +++ b/client/app/services/dashboard.js @@ -1,5 +1,7 @@ import _ from 'lodash'; +export let Dashboard = null; // eslint-disable-line import/no-mutable-exports + function prepareWidgetsForDashboard(widgets) { // Default height for auto-height widgets. // Compute biggest widget size and choose between it and some magic number. @@ -44,7 +46,7 @@ function prepareWidgetsForDashboard(widgets) { return widgets; } -function Dashboard($resource, $http, $location, currentUser, Widget, dashboardGridOptions) { +function DashboardService($resource, $http, $location, currentUser, Widget, dashboardGridOptions) { function prepareDashboardWidgets(widgets) { return prepareWidgetsForDashboard(_.map(widgets, widget => new Widget(widget))); } @@ -183,8 +185,11 @@ function Dashboard($resource, $http, $location, currentUser, Widget, dashboardGr } export default function init(ngModule) { - ngModule.factory('Dashboard', Dashboard); + ngModule.factory('Dashboard', DashboardService); + + ngModule.run(($injector) => { + Dashboard = $injector.get('Dashboard'); + }); } init.init = true; - diff --git a/client/app/services/data-source.js b/client/app/services/data-source.js index 55b9697f7b..f1d69d5cbc 100644 --- a/client/app/services/data-source.js +++ b/client/app/services/data-source.js @@ -1,7 +1,9 @@ export const SCHEMA_NOT_SUPPORTED = 1; export const SCHEMA_LOAD_ERROR = 2; -function DataSource($q, $resource, $http) { +export let DataSource = null; // eslint-disable-line import/no-mutable-exports + +function DataSourceService($q, $resource, $http) { function fetchSchema(dataSourceId, refresh = false) { const params = {}; @@ -43,8 +45,11 @@ function DataSource($q, $resource, $http) { } export default function init(ngModule) { - ngModule.factory('DataSource', DataSource); + ngModule.factory('DataSource', DataSourceService); + + ngModule.run(($injector) => { + DataSource = $injector.get('DataSource'); + }); } init.init = true; - diff --git a/client/app/services/destination.js b/client/app/services/destination.js index 8225e05fda..9c3c6d2f61 100644 --- a/client/app/services/destination.js +++ b/client/app/services/destination.js @@ -1,17 +1,19 @@ -function Destination($resource) { +export let Destination = null; // eslint-disable-line import/no-mutable-exports + +function DestinationService($resource) { const actions = { get: { method: 'GET', cache: false, isArray: false }, query: { method: 'GET', cache: false, isArray: true }, }; - - const DestinationResource = $resource('api/destinations/:id', { id: '@id' }, actions); - - return DestinationResource; + return $resource('api/destinations/:id', { id: '@id' }, actions); } export default function init(ngModule) { - ngModule.factory('Destination', Destination); + ngModule.factory('Destination', DestinationService); + + ngModule.run(($injector) => { + Destination = $injector.get('Destination'); + }); } init.init = true; - diff --git a/client/app/services/events.js b/client/app/services/events.js index 18f26e6cb7..699a644f5e 100644 --- a/client/app/services/events.js +++ b/client/app/services/events.js @@ -1,9 +1,7 @@ -import recordEvent from '@/lib/recordEvent'; +import recordEvent from '@/services/recordEvent'; function Events() { - this.record = (action, objectType, objectId, additionalProperties) => { - recordEvent(action, objectType, objectId, additionalProperties); - }; + this.record = recordEvent; } export default function init(ngModule) { diff --git a/client/app/services/getTags.js b/client/app/services/getTags.js index d96edcb810..d5ad18e8eb 100644 --- a/client/app/services/getTags.js +++ b/client/app/services/getTags.js @@ -1,4 +1,4 @@ -import { $http } from '@/services/http'; +import { $http } from '@/services/ng'; function processTags(data) { return data.tags || []; diff --git a/client/app/services/group.js b/client/app/services/group.js index 5aab223b05..6751f9dc0a 100644 --- a/client/app/services/group.js +++ b/client/app/services/group.js @@ -1,4 +1,6 @@ -function Group($resource) { +export let Group = null; // eslint-disable-line import/no-mutable-exports + +function GroupService($resource) { const actions = { get: { method: 'GET', cache: false, isArray: false }, query: { method: 'GET', cache: false, isArray: true }, @@ -9,13 +11,15 @@ function Group($resource) { method: 'GET', cache: false, isArray: true, url: 'api/groups/:id/data_sources', }, }; - const resource = $resource('api/groups/:id', { id: '@id' }, actions); - return resource; + return $resource('api/groups/:id', { id: '@id' }, actions); } export default function init(ngModule) { - ngModule.factory('Group', Group); + ngModule.factory('Group', GroupService); + + ngModule.run(($injector) => { + Group = $injector.get('Group'); + }); } init.init = true; - diff --git a/client/app/services/http.js b/client/app/services/http.js deleted file mode 100644 index a04569294f..0000000000 --- a/client/app/services/http.js +++ /dev/null @@ -1,11 +0,0 @@ -// eslint-disable-next-line import/no-mutable-exports -export let $http = null; - -export default function init(ngModule) { - ngModule.run(($injector) => { - $http = $injector.get('$http'); - }); -} - -init.init = true; - diff --git a/client/app/services/keyboard-shortcuts.js b/client/app/services/keyboard-shortcuts.js index 7c25d33b2b..1e3b6cc2cb 100644 --- a/client/app/services/keyboard-shortcuts.js +++ b/client/app/services/keyboard-shortcuts.js @@ -2,6 +2,8 @@ import { each, trim, without } from 'lodash'; import Mousetrap from 'mousetrap'; import 'mousetrap/plugins/global-bind/mousetrap-global-bind'; +export let KeyboardShortcuts = null; // eslint-disable-line import/no-mutable-exports + const handlers = {}; function onShortcut(event, shortcut) { @@ -10,7 +12,7 @@ function onShortcut(event, shortcut) { each(handlers[shortcut], fn => fn()); } -function KeyboardShortcuts() { +function KeyboardShortcutsService() { this.modKey = /Mac|iPod|iPhone|iPad/.test(navigator.platform) ? 'Cmd' : 'Ctrl'; this.bind = function bind(keymap) { @@ -44,7 +46,11 @@ function KeyboardShortcuts() { } export default function init(ngModule) { - ngModule.service('KeyboardShortcuts', KeyboardShortcuts); + ngModule.service('KeyboardShortcuts', KeyboardShortcutsService); + + ngModule.run(($injector) => { + KeyboardShortcuts = $injector.get('KeyboardShortcuts'); + }); } init.init = true; diff --git a/client/app/services/ng.js b/client/app/services/ng.js new file mode 100644 index 0000000000..ce59976f82 --- /dev/null +++ b/client/app/services/ng.js @@ -0,0 +1,16 @@ +export let $http = null; // eslint-disable-line import/no-mutable-exports +export let $sanitize = null; // eslint-disable-line import/no-mutable-exports +export let $uibModal = null; // eslint-disable-line import/no-mutable-exports +export let toastr = null; // eslint-disable-line import/no-mutable-exports + +export default function init(ngModule) { + ngModule.run(($injector) => { + $http = $injector.get('$http'); + $sanitize = $injector.get('$sanitize'); + $uibModal = $injector.get('$uibModal'); + toastr = $injector.get('toastr'); + }); +} + +init.init = true; + diff --git a/client/app/services/notifications.js b/client/app/services/notifications.js index 0441df3362..da61c65d9a 100644 --- a/client/app/services/notifications.js +++ b/client/app/services/notifications.js @@ -1,86 +1,72 @@ +import { find } from 'lodash'; import debug from 'debug'; +import recordEvent from '@/services/recordEvent'; const logger = debug('redash:notifications'); -function Notifications(currentUser, Events) { - const notificationService = { pageVisible: true }; - - notificationService.monitorVisibility = function monitorVisibility() { - let hidden; - let visibilityChange; +const Notification = window.Notification || null; +if (!Notification) { + logger('HTML5 notifications are not supported.'); +} - if (typeof document.hidden !== 'undefined') { - hidden = 'hidden'; - visibilityChange = 'visibilitychange'; - } else if (typeof document.msHidden !== 'undefined') { - hidden = 'msHidden'; - visibilityChange = 'msvisibilitychange'; +const hidden = find( + ['hidden', 'webkitHidden', 'mozHidden', 'msHidden'], + prop => prop in document, +); +const visibilityChange = find( + ['visibilitychange', 'webkitvisibilitychange', 'mozvisibilitychange', 'msvisibilitychange'], + prop => prop in document, +); + +class NotificationsService { + constructor() { + this.pageVisible = false; + this.monitorVisibility(); + } + + // eslint-disable-next-line class-methods-use-this + getPermissions() { + if (Notification && (Notification.permission === 'default')) { + Notification.requestPermission((status) => { + if (Notification.permission !== status) { + Notification.permission = status; + } + }); } + } + monitorVisibility() { + this.pageVisible = !document[hidden]; let documentHidden = document[hidden]; document.addEventListener(visibilityChange, () => { if (documentHidden !== document[hidden]) { - if (document[hidden]) { - notificationService.pageVisible = false; - } else { - notificationService.pageVisible = true; - } - + this.pageVisible = !document[hidden]; documentHidden = document[hidden]; } }); - }; - - notificationService.monitorVisibility(); - - notificationService.isSupported = () => { - if ('Notification' in window) { - return true; - } + } - logger('HTML5 notifications are not supported.'); - return false; - }; - - notificationService.getPermissions = function getPermissions() { - if (!this.isSupported()) { - return; - } - - if (Notification.permission === 'default') { - Notification.requestPermission((status) => { - if (Notification.permission !== status) { - Notification.permission = status; - } - }); - } - }; - - notificationService.showNotification = function showNotification(title, content) { - if (!this.isSupported() || this.pageVisible || Notification.permission !== 'granted') { + showNotification(title, content) { + if (!Notification || this.pageVisible || (Notification.permission !== 'granted')) { return; } // using the 'tag' to avoid showing duplicate notifications - const notification = new Notification(title, { tag: title + content, body: content, icon: '/images/redash_icon_small.png' }); + const notification = new Notification(title, { + tag: title + content, + body: content, + icon: '/images/redash_icon_small.png', + }); setTimeout(() => { notification.close(); }, 3000); notification.onclick = function onClick() { window.focus(); this.close(); - Events.record('click', 'notification'); + recordEvent('click', 'notification'); }; - }; - - return notificationService; + } } - -export default function init(ngModule) { - ngModule.factory('Notifications', Notifications); -} - -init.init = true; - +export default new NotificationsService(); diff --git a/client/app/services/offline-listener.js b/client/app/services/offline-listener.js index cf4fae5b77..a7ddad91b5 100644 --- a/client/app/services/offline-listener.js +++ b/client/app/services/offline-listener.js @@ -1,25 +1,25 @@ -function OfflineListener(toastr) { - function addOnlineListener(toast) { - function onlineStateHandler() { - toastr.remove(toast.toastId); - window.removeEventListener('online', onlineStateHandler); - } - window.addEventListener('online', onlineStateHandler); - } +import { toastr } from '@/services/ng'; - window.addEventListener('offline', () => { - const toast = toastr.warning('
          Please check your Internet connection.
          ', '', { - allowHtml: true, - autoDismiss: false, - timeOut: false, - tapToDismiss: true, - }); - addOnlineListener(toast); - }); +function addOnlineListener(toast) { + function onlineStateHandler() { + toastr.remove(toast.toastId); + window.removeEventListener('online', onlineStateHandler); + } + window.addEventListener('online', onlineStateHandler); } export default function init(ngModule) { - ngModule.service('OfflineListener', OfflineListener); + ngModule.run(() => { + window.addEventListener('offline', () => { + const toast = toastr.warning('
          Please check your Internet connection.
          ', '', { + allowHtml: true, + autoDismiss: false, + timeOut: false, + tapToDismiss: true, + }); + addOnlineListener(toast); + }); + }); } init.init = true; diff --git a/client/app/services/organization-status.js b/client/app/services/organization-status.js index b091e0910f..81d827e92e 100644 --- a/client/app/services/organization-status.js +++ b/client/app/services/organization-status.js @@ -1,4 +1,6 @@ -function OrganizationStatus($http) { +export let OrganizationStatus = null; // eslint-disable-line import/no-mutable-exports + +function OrganizationStatusService($http) { this.objectCounters = {}; this.refresh = () => @@ -9,7 +11,11 @@ function OrganizationStatus($http) { } export default function init(ngModule) { - ngModule.service('OrganizationStatus', OrganizationStatus); + ngModule.service('OrganizationStatus', OrganizationStatusService); + + ngModule.run(($injector) => { + OrganizationStatus = $injector.get('OrganizationStatus'); + }); } init.init = true; diff --git a/client/app/services/query-snippet.js b/client/app/services/query-snippet.js index 7fe97d0845..0d4bb7f1f2 100644 --- a/client/app/services/query-snippet.js +++ b/client/app/services/query-snippet.js @@ -1,4 +1,6 @@ -function QuerySnippet($resource) { +export let QuerySnippet = null; // eslint-disable-line import/no-mutable-exports + +function QuerySnippetService($resource) { const resource = $resource('api/query_snippets/:id', { id: '@id' }); resource.prototype.getSnippet = function getSnippet() { let name = this.trigger; @@ -17,7 +19,11 @@ function QuerySnippet($resource) { } export default function init(ngModule) { - ngModule.factory('QuerySnippet', QuerySnippet); + ngModule.factory('QuerySnippet', QuerySnippetService); + + ngModule.run(($injector) => { + QuerySnippet = $injector.get('QuerySnippet'); + }); } init.init = true; diff --git a/client/app/services/query.js b/client/app/services/query.js index 23151cc910..57ece987dd 100644 --- a/client/app/services/query.js +++ b/client/app/services/query.js @@ -8,6 +8,8 @@ import { Mustache.escape = identity; // do not html-escape values +export let Query = null; // eslint-disable-line import/no-mutable-exports + const logger = debug('redash:services:query'); const DATETIME_FORMATS = { @@ -323,7 +325,7 @@ function QueryResource( QueryResultError, QueryResult, ) { - const Query = $resource( + const QueryService = $resource( 'api/queries/:id', { id: '@id' }, { @@ -371,8 +373,8 @@ function QueryResource( }, ); - Query.newQuery = function newQuery() { - return new Query({ + QueryService.newQuery = function newQuery() { + return new QueryService({ query: '', name: 'New Query', schedule: null, @@ -381,7 +383,7 @@ function QueryResource( }); }; - Query.format = function formatQuery(syntax, query) { + QueryService.format = function formatQuery(syntax, query) { if (syntax === 'json') { try { const formatted = JSON.stringify(JSON.parse(query), ' ', 4); @@ -396,19 +398,19 @@ function QueryResource( } }; - Query.prototype.getSourceLink = function getSourceLink() { + QueryService.prototype.getSourceLink = function getSourceLink() { return `/queries/${this.id}/source`; }; - Query.prototype.isNew = function isNew() { + QueryService.prototype.isNew = function isNew() { return this.id === undefined; }; - Query.prototype.hasDailySchedule = function hasDailySchedule() { + QueryService.prototype.hasDailySchedule = function hasDailySchedule() { return this.schedule && this.schedule.match(/\d\d:\d\d/) !== null; }; - Query.prototype.scheduleInLocalTime = function scheduleInLocalTime() { + QueryService.prototype.scheduleInLocalTime = function scheduleInLocalTime() { const parts = this.schedule.split(':'); return moment .utc() @@ -418,15 +420,15 @@ function QueryResource( .format('HH:mm'); }; - Query.prototype.hasResult = function hasResult() { + QueryService.prototype.hasResult = function hasResult() { return !!(this.latest_query_data || this.latest_query_data_id); }; - Query.prototype.paramsRequired = function paramsRequired() { + QueryService.prototype.paramsRequired = function paramsRequired() { return this.getParameters().isRequired(); }; - Query.prototype.getQueryResult = function getQueryResult(maxAge, selectedQueryText) { + QueryService.prototype.getQueryResult = function getQueryResult(maxAge, selectedQueryText) { if (!this.query) { return new QueryResultError("Can't execute empty query."); } @@ -476,7 +478,7 @@ function QueryResource( return this.queryResult; }; - Query.prototype.getUrl = function getUrl(source, hash) { + QueryService.prototype.getUrl = function getUrl(source, hash) { let url = `queries/${this.id}`; if (source) { @@ -502,11 +504,11 @@ function QueryResource( return url; }; - Query.prototype.getQueryResultPromise = function getQueryResultPromise() { + QueryService.prototype.getQueryResultPromise = function getQueryResultPromise() { return this.getQueryResult().toPromise(); }; - Query.prototype.getParameters = function getParameters() { + QueryService.prototype.getParameters = function getParameters() { if (!this.$parameters) { this.$parameters = new Parameters(this, $location.search()); } @@ -514,17 +516,20 @@ function QueryResource( return this.$parameters; }; - Query.prototype.getParametersDefs = function getParametersDefs() { + QueryService.prototype.getParametersDefs = function getParametersDefs() { return this.getParameters().get(); }; - return Query; + return QueryService; } export default function init(ngModule) { ngModule.factory('QueryResultError', QueryResultErrorFactory); ngModule.factory('Query', QueryResource); + + ngModule.run(($injector) => { + Query = $injector.get('Query'); + }); } init.init = true; - diff --git a/client/app/lib/recordEvent.js b/client/app/services/recordEvent.js similarity index 79% rename from client/app/lib/recordEvent.js rename to client/app/services/recordEvent.js index f4c2e2ff51..f501cde116 100644 --- a/client/app/lib/recordEvent.js +++ b/client/app/services/recordEvent.js @@ -1,5 +1,5 @@ -import { debounce } from 'lodash'; -import { $http } from '@/services/http'; +import { debounce, extend } from 'lodash'; +import { $http } from '@/services/ng'; let events = []; @@ -18,7 +18,7 @@ export default function recordEvent(action, objectType, objectId, additionalProp timestamp: Date.now() / 1000.0, screen_resolution: `${window.screen.width}x${window.screen.height}`, }; - Object.assign(event, additionalProperties); + extend(event, additionalProperties); events.push(event); post(); diff --git a/client/app/services/toastr.js b/client/app/services/toastr.js deleted file mode 100644 index c46f3728e5..0000000000 --- a/client/app/services/toastr.js +++ /dev/null @@ -1,10 +0,0 @@ -// eslint-disable-next-line import/no-mutable-exports -export let toastr = null; - -export default function init(ngModule) { - ngModule.run(($injector) => { - toastr = $injector.get('toastr'); - }); -} - -init.init = true; diff --git a/client/app/services/user.js b/client/app/services/user.js index f020480131..9921b7adb8 100644 --- a/client/app/services/user.js +++ b/client/app/services/user.js @@ -1,11 +1,13 @@ import { isString } from 'lodash'; -import { $http } from '@/services/http'; +import { $http, $sanitize, toastr } from '@/services/ng'; + +export let User = null; // eslint-disable-line import/no-mutable-exports function disableResource(user) { return `api/users/${user.id}/disable`; } -function enableUser(user, toastr, $sanitize) { +function enableUser(user) { const userName = $sanitize(user.name); return $http @@ -25,7 +27,7 @@ function enableUser(user, toastr, $sanitize) { }); } -function disableUser(user, toastr, $sanitize) { +function disableUser(user) { const userName = $sanitize(user.name); return $http .post(disableResource(user)) @@ -45,7 +47,7 @@ function disableUser(user, toastr, $sanitize) { }); } -function deleteUser(user, toastr, $sanitize) { +function deleteUser(user) { const userName = $sanitize(user.name); return $http .delete(`api/users/${user.id}`) @@ -63,7 +65,7 @@ function deleteUser(user, toastr, $sanitize) { }); } -function User($resource, $sanitize, toastr) { +function UserService($resource) { const actions = { get: { method: 'GET' }, save: { method: 'POST' }, @@ -75,15 +77,19 @@ function User($resource, $sanitize, toastr) { const UserResource = $resource('api/users/:id', { id: '@id' }, actions); - UserResource.enableUser = user => enableUser(user, toastr, $sanitize); - UserResource.disableUser = user => disableUser(user, toastr, $sanitize); - UserResource.deleteUser = user => deleteUser(user, toastr, $sanitize); + UserResource.enableUser = enableUser; + UserResource.disableUser = disableUser; + UserResource.deleteUser = deleteUser; return UserResource; } export default function init(ngModule) { - ngModule.factory('User', User); + ngModule.factory('User', UserService); + + ngModule.run(($injector) => { + User = $injector.get('User'); + }); } init.init = true; diff --git a/client/app/services/widget.js b/client/app/services/widget.js index 9966689882..822af3dbeb 100644 --- a/client/app/services/widget.js +++ b/client/app/services/widget.js @@ -1,6 +1,8 @@ import moment from 'moment'; import { each, pick, extend, isObject, truncate, keys, difference, filter, map } from 'lodash'; +export let Widget = null; // eslint-disable-line import/no-mutable-exports + function calculatePositionOptions(Visualization, dashboardGridOptions, widget) { widget.width = 1; // Backward compatibility, user on back-end @@ -68,7 +70,7 @@ export const ParameterMappingType = { }; function WidgetFactory($http, $location, Query, Visualization, dashboardGridOptions) { - class Widget { + class WidgetService { static MappingType = ParameterMappingType; constructor(data) { @@ -171,7 +173,7 @@ function WidgetFactory($http, $location, Query, Visualization, dashboardGridOpti isStaticParam(param) { const mappings = this.getParameterMappings(); const mappingType = mappings[param.name].type; - return mappingType === Widget.MappingType.StaticValue; + return mappingType === WidgetService.MappingType.StaticValue; } getParametersDefs() { @@ -182,8 +184,8 @@ function WidgetFactory($http, $location, Query, Visualization, dashboardGridOpti const queryParams = $location.search(); const localTypes = [ - Widget.MappingType.WidgetLevel, - Widget.MappingType.StaticValue, + WidgetService.MappingType.WidgetLevel, + WidgetService.MappingType.StaticValue, ]; return map( filter(params, param => localTypes.indexOf(mappings[param.name].type) >= 0), @@ -193,7 +195,7 @@ function WidgetFactory($http, $location, Query, Visualization, dashboardGridOpti result.title = mapping.title || param.title; result.locals = [param]; result.urlPrefix = `w${this.id}_`; - if (mapping.type === Widget.MappingType.StaticValue) { + if (mapping.type === WidgetService.MappingType.StaticValue) { result.setValue(mapping.value); } else { result.fromUrlParams(queryParams); @@ -218,7 +220,7 @@ function WidgetFactory($http, $location, Query, Visualization, dashboardGridOpti // should be mapped to a dashboard-level parameter with the same name this.options.parameterMappings[param.name] = { name: param.name, - type: param.global ? Widget.MappingType.DashboardLevel : Widget.MappingType.WidgetLevel, + type: param.global ? WidgetService.MappingType.DashboardLevel : WidgetService.MappingType.WidgetLevel, mapTo: param.name, // map to param with the same name value: null, // for StaticValue title: '', // Use parameter's title @@ -239,11 +241,15 @@ function WidgetFactory($http, $location, Query, Visualization, dashboardGridOpti } } - return Widget; + return WidgetService; } export default function init(ngModule) { ngModule.factory('Widget', WidgetFactory); + + ngModule.run(($injector) => { + Widget = $injector.get('Widget'); + }); } init.init = true; From d204c158a2bcc14a3798fec41608693c0a2c1676 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Fri, 25 Jan 2019 11:28:09 +0100 Subject: [PATCH 019/177] Allow query owners to hard-overwrite query content in case of overlap with other user (#2370) * Hard overwrite on conflict for query owners (re #283) * Use AlertDialog instead of custom global function. --- client/app/pages/queries/view.js | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/client/app/pages/queries/view.js b/client/app/pages/queries/view.js index d8c4f1aacb..80b7942b3f 100644 --- a/client/app/pages/queries/view.js +++ b/client/app/pages/queries/view.js @@ -234,6 +234,15 @@ function QueryViewCtrl( customOptions, ); + if (options.force) { + delete request.version; + } + + function overwrite() { + options.force = true; + $scope.saveQuery(options, data); + } + return Query.save( request, (updatedQuery) => { @@ -242,11 +251,20 @@ function QueryViewCtrl( }, (error) => { if (error.status === 409) { - toastr.error( - 'It seems like the query has been modified by another user. ' + - 'Please copy/backup your changes and reload this page.', - { autoDismiss: false }, - ); + const errorMessage = 'It seems like the query has been modified by another user.'; + + if ($scope.isQueryOwner) { + const title = 'Overwrite Query'; + const message = errorMessage + '
          Are you sure you want to overwrite the query with your version?'; + const confirm = { class: 'btn-warning', title: 'Overwrite' }; + + AlertDialog.open(title, message, confirm).then(overwrite); + } else { + toastr.error( + errorMessage + ' Please copy/backup your changes and reload this page.', + { autoDismiss: false }, + ); + } } else { toastr.error(options.errorMessage); } From 1fa58674f30046ac7f94770d495b86e9e7fa9c57 Mon Sep 17 00:00:00 2001 From: Levko Kravets Date: Fri, 25 Jan 2019 17:29:35 +0200 Subject: [PATCH 020/177] Refine SettingsMenu service and component (#3339) * Refine SettingsMenu service and component * Rename services/settingsMenu file to match default export name * CR1 --- client/app/components/settings-screen.html | 6 ++++- client/app/components/settings-screen.js | 10 ++----- client/app/lib/settings-menu.js | 15 ----------- client/app/pages/data-sources/list.js | 2 +- client/app/pages/destinations/list.js | 2 +- client/app/pages/groups/list.js | 2 +- client/app/pages/query-snippets/list.js | 2 +- client/app/pages/settings/organization.js | 2 +- client/app/pages/users/list.js | 4 +-- client/app/pages/users/show.js | 2 +- client/app/services/settingsMenu.js | 31 ++++++++++++++++++++++ 11 files changed, 46 insertions(+), 32 deletions(-) delete mode 100644 client/app/lib/settings-menu.js create mode 100644 client/app/services/settingsMenu.js diff --git a/client/app/components/settings-screen.html b/client/app/components/settings-screen.html index fb0510dc5e..d3a3c0a9ed 100644 --- a/client/app/components/settings-screen.html +++ b/client/app/components/settings-screen.html @@ -3,7 +3,11 @@
            -
          • +
          • {{menuItem.title}}
            • diff --git a/client/app/components/settings-screen.js b/client/app/components/settings-screen.js index d6e424a781..ad2ba158e3 100644 --- a/client/app/components/settings-screen.js +++ b/client/app/components/settings-screen.js @@ -1,5 +1,4 @@ -import settingsMenu from '@/lib/settings-menu'; -import { isFunction } from 'lodash'; +import settingsMenu from '@/services/settingsMenu'; import template from './settings-screen.html'; export default function init(ngModule) { @@ -8,12 +7,7 @@ export default function init(ngModule) { template, controller($location, currentUser) { this.settingsMenu = settingsMenu; - this.isActive = (menuItem) => { - if (isFunction(menuItem.isActive)) { - return menuItem.isActive($location); - } - return $location.path().startsWith(menuItem.pathPrefix); - }; + this.isActive = menuItem => menuItem.isActive($location.path()); this.isAvailable = permission => permission === undefined || currentUser.hasPermission(permission); }, }); diff --git a/client/app/lib/settings-menu.js b/client/app/lib/settings-menu.js deleted file mode 100644 index 6bfc2cc844..0000000000 --- a/client/app/lib/settings-menu.js +++ /dev/null @@ -1,15 +0,0 @@ -import { sortBy } from 'lodash'; - -const settingsMenu = { - menus: [], - add(menu) { - if (menu.pathPrefix === undefined) { - menu.pathPrefix = `/${menu.path}`; - } - - this.menus.push(menu); - this.menus = sortBy(this.menus, 'order'); - }, -}; - -export default settingsMenu; diff --git a/client/app/pages/data-sources/list.js b/client/app/pages/data-sources/list.js index 558357e6f1..f1d64e1e5d 100644 --- a/client/app/pages/data-sources/list.js +++ b/client/app/pages/data-sources/list.js @@ -1,4 +1,4 @@ -import settingsMenu from '@/lib/settings-menu'; +import settingsMenu from '@/services/settingsMenu'; import template from './list.html'; function DataSourcesCtrl(Policy, DataSource) { diff --git a/client/app/pages/destinations/list.js b/client/app/pages/destinations/list.js index d35139bcba..72c3857312 100644 --- a/client/app/pages/destinations/list.js +++ b/client/app/pages/destinations/list.js @@ -1,4 +1,4 @@ -import settingsMenu from '@/lib/settings-menu'; +import settingsMenu from '@/services/settingsMenu'; import template from './list.html'; function DestinationsCtrl($scope, $location, toastr, currentUser, Destination) { diff --git a/client/app/pages/groups/list.js b/client/app/pages/groups/list.js index 6795116a98..c097a91fc6 100644 --- a/client/app/pages/groups/list.js +++ b/client/app/pages/groups/list.js @@ -1,4 +1,4 @@ -import settingsMenu from '@/lib/settings-menu'; +import settingsMenu from '@/services/settingsMenu'; import { Paginator } from '@/lib/pagination'; import template from './list.html'; diff --git a/client/app/pages/query-snippets/list.js b/client/app/pages/query-snippets/list.js index 1a05ced632..547792b423 100644 --- a/client/app/pages/query-snippets/list.js +++ b/client/app/pages/query-snippets/list.js @@ -1,4 +1,4 @@ -import settingsMenu from '@/lib/settings-menu'; +import settingsMenu from '@/services/settingsMenu'; import { Paginator } from '@/lib/pagination'; import template from './list.html'; diff --git a/client/app/pages/settings/organization.js b/client/app/pages/settings/organization.js index 749a019732..e826497aed 100644 --- a/client/app/pages/settings/organization.js +++ b/client/app/pages/settings/organization.js @@ -1,4 +1,4 @@ -import settingsMenu from '@/lib/settings-menu'; +import settingsMenu from '@/services/settingsMenu'; import template from './organization.html'; function OrganizationSettingsCtrl($http, toastr, clientConfig, Events) { diff --git a/client/app/pages/users/list.js b/client/app/pages/users/list.js index 9dda5f648b..ffdeba3541 100644 --- a/client/app/pages/users/list.js +++ b/client/app/pages/users/list.js @@ -1,6 +1,6 @@ import { extend } from 'lodash'; import ListCtrl from '@/lib/list-ctrl'; -import settingsMenu from '@/lib/settings-menu'; +import settingsMenu from '@/services/settingsMenu'; import template from './list.html'; class UsersListCtrl extends ListCtrl { @@ -33,7 +33,7 @@ export default function init(ngModule) { permission: 'list_users', title: 'Users', path: 'users', - isActive: $location => $location.path().startsWith('/users') && $location.path() !== '/users/me', + isActive: path => path.startsWith('/users') && (path !== '/users/me'), order: 2, }); diff --git a/client/app/pages/users/show.js b/client/app/pages/users/show.js index 318b197960..b5bfbd39b5 100644 --- a/client/app/pages/users/show.js +++ b/client/app/pages/users/show.js @@ -1,5 +1,5 @@ import { each } from 'lodash'; -import settingsMenu from '@/lib/settings-menu'; +import settingsMenu from '@/services/settingsMenu'; import { absoluteUrl } from '@/services/utils'; import template from './show.html'; import './settings.less'; diff --git a/client/app/services/settingsMenu.js b/client/app/services/settingsMenu.js new file mode 100644 index 0000000000..45ee63015e --- /dev/null +++ b/client/app/services/settingsMenu.js @@ -0,0 +1,31 @@ +import { isFunction, extend, omit, sortBy } from 'lodash'; + +class SettingsMenuItem { + constructor(menuItem) { + extend( + this, + { pathPrefix: `/${menuItem.path}` }, + omit(menuItem, ['isActive']), + ); + if (isFunction(menuItem.isActive)) { + this.isActive = menuItem.isActive; + } + } + + isActive(path) { + return path.startsWith(this.pathPrefix); + } +} + +class SettingsMenu { + constructor() { + this.items = []; + } + + add(item) { + this.items.push(new SettingsMenuItem(item)); + this.items = sortBy(this.items, 'order'); + } +} + +export default new SettingsMenu(); From c31cb0106531df775d2c91a255f86b1336a7f16a Mon Sep 17 00:00:00 2001 From: Arik Fraimovich Date: Mon, 28 Jan 2019 09:37:47 +0200 Subject: [PATCH 021/177] Move BigQueryGCE to its own file (#3356) * Move BigQueryGCE to its own file * Add missing import --- redash/query_runner/big_query.py | 58 --------------------- redash/query_runner/big_query_gce.py | 75 ++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 58 deletions(-) create mode 100644 redash/query_runner/big_query_gce.py diff --git a/redash/query_runner/big_query.py b/redash/query_runner/big_query.py index 594d79d203..274f63da8a 100644 --- a/redash/query_runner/big_query.py +++ b/redash/query_runner/big_query.py @@ -18,7 +18,6 @@ from apiclient.discovery import build from apiclient.errors import HttpError from oauth2client.service_account import ServiceAccountCredentials - from oauth2client.contrib import gce enabled = True except ImportError: @@ -312,61 +311,4 @@ def run_query(self, query, user): return json_data, error -class BigQueryGCE(BigQuery): - @classmethod - def type(cls): - return "bigquery_gce" - - @classmethod - def enabled(cls): - try: - # check if we're on a GCE instance - requests.get('http://metadata.google.internal') - except requests.exceptions.ConnectionError: - return False - - return True - - @classmethod - def configuration_schema(cls): - return { - 'type': 'object', - 'properties': { - 'totalMBytesProcessedLimit': { - "type": "number", - 'title': 'Total MByte Processed Limit' - }, - 'userDefinedFunctionResourceUri': { - "type": "string", - 'title': 'UDF Source URIs (i.e. gs://bucket/date_utils.js, gs://bucket/string_utils.js )' - }, - 'useStandardSql': { - "type": "boolean", - 'title': "Use Standard SQL", - "default": True, - }, - 'location': { - "type": "string", - "title": "Processing Location", - "default": "US", - }, - 'loadSchema': { - "type": "boolean", - "title": "Load Schema" - } - } - } - - def _get_project_id(self): - return requests.get('http://metadata/computeMetadata/v1/project/project-id', headers={'Metadata-Flavor': 'Google'}).content - - def _get_bigquery_service(self): - credentials = gce.AppAssertionCredentials(scope='https://www.googleapis.com/auth/bigquery') - http = httplib2.Http() - http = credentials.authorize(http) - - return build("bigquery", "v2", http=http) - - register(BigQuery) -register(BigQueryGCE) diff --git a/redash/query_runner/big_query_gce.py b/redash/query_runner/big_query_gce.py new file mode 100644 index 0000000000..2fb7d9db05 --- /dev/null +++ b/redash/query_runner/big_query_gce.py @@ -0,0 +1,75 @@ +import requests +import httplib2 + +try: + from apiclient.discovery import build + from oauth2client.contrib import gce + + enabled = True +except ImportError: + enabled = False + +from redash.query_runner import register +from .big_query import BigQuery + + +class BigQueryGCE(BigQuery): + @classmethod + def type(cls): + return "bigquery_gce" + + @classmethod + def enabled(cls): + if not enabled: + return False + + try: + # check if we're on a GCE instance + requests.get('http://metadata.google.internal') + except requests.exceptions.ConnectionError: + return False + + return True + + @classmethod + def configuration_schema(cls): + return { + 'type': 'object', + 'properties': { + 'totalMBytesProcessedLimit': { + "type": "number", + 'title': 'Total MByte Processed Limit' + }, + 'userDefinedFunctionResourceUri': { + "type": "string", + 'title': 'UDF Source URIs (i.e. gs://bucket/date_utils.js, gs://bucket/string_utils.js )' + }, + 'useStandardSql': { + "type": "boolean", + 'title': "Use Standard SQL", + "default": True, + }, + 'location': { + "type": "string", + "title": "Processing Location", + "default": "US", + }, + 'loadSchema': { + "type": "boolean", + "title": "Load Schema" + } + } + } + + def _get_project_id(self): + return requests.get('http://metadata/computeMetadata/v1/project/project-id', headers={'Metadata-Flavor': 'Google'}).content + + def _get_bigquery_service(self): + credentials = gce.AppAssertionCredentials(scope='https://www.googleapis.com/auth/bigquery') + http = httplib2.Http() + http = credentials.authorize(http) + + return build("bigquery", "v2", http=http) + + +register(BigQueryGCE) From 37821ee0082a84e3baeaf9f2c812cc20d806484a Mon Sep 17 00:00:00 2001 From: Gabriel Dutra Date: Mon, 28 Jan 2019 06:21:42 -0200 Subject: [PATCH 022/177] Add Percy Page Screenshots (#3338) * Add Percy Page Screenshots * Add missing space --- .../data-source/create_data_source_spec.js | 3 --- cypress/integration/percy/page_screenshots.js | 21 +++++++++++++++++++ .../integration/query/create_query_spec.js | 2 +- cypress/integration/user/login_spec.js | 2 +- 4 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 cypress/integration/percy/page_screenshots.js diff --git a/cypress/integration/data-source/create_data_source_spec.js b/cypress/integration/data-source/create_data_source_spec.js index e286a334e6..52adef85fc 100644 --- a/cypress/integration/data-source/create_data_source_spec.js +++ b/cypress/integration/data-source/create_data_source_spec.js @@ -14,8 +14,5 @@ describe('Create Data Source', () => { cy.getByTestId('Database Name').type('postgres{enter}'); cy.contains('Saved.'); - - cy.wait(1000); - cy.percySnapshot('Create Data Source page'); }); }); diff --git a/cypress/integration/percy/page_screenshots.js b/cypress/integration/percy/page_screenshots.js new file mode 100644 index 0000000000..8170944007 --- /dev/null +++ b/cypress/integration/percy/page_screenshots.js @@ -0,0 +1,21 @@ +const pages = [ + { name: 'Create Data Source - Types', url: '/data_sources/new' }, + { name: 'Edit Data Source - PostgreSQL', url: '/data_sources/1' }, + { name: 'Users', url: '/users' }, + { name: 'Groups', url: '/groups' }, + { name: 'Group', url: '/groups/1' }, + { name: 'Create Destination - Types', url: '/destinations/new' }, + { name: 'Organization Settings', url: '/settings/organization' }, + { name: 'User Profile', url: '/users/me' }, +]; + +describe('Percy Page Screenshots', () => { + pages.forEach((page) => { + it(`takes a screenshot of ${page.name}`, () => { + cy.login(); + cy.visit(page.url); + cy.wait(1000); + cy.percySnapshot(page.name); + }); + }); +}); diff --git a/cypress/integration/query/create_query_spec.js b/cypress/integration/query/create_query_spec.js index 844a0501a6..7ec734feed 100644 --- a/cypress/integration/query/create_query_spec.js +++ b/cypress/integration/query/create_query_spec.js @@ -16,6 +16,6 @@ describe('Create Query', () => { cy.getByTestId('ExecuteButton').click(); cy.getByTestId('DynamicTable').should('exist'); - cy.percySnapshot('Edit Query page'); + cy.percySnapshot('Edit Query'); }); }); diff --git a/cypress/integration/user/login_spec.js b/cypress/integration/user/login_spec.js index bc759567a3..46cb45f67e 100644 --- a/cypress/integration/user/login_spec.js +++ b/cypress/integration/user/login_spec.js @@ -7,7 +7,7 @@ describe('Login', () => { cy.contains('h3', 'Login to Redash'); cy.wait(1000); - cy.percySnapshot('Login page'); + cy.percySnapshot('Login'); }); it('shows message on failed login', () => { From c0859642fd2a84e298daa0520347b4dc0ce67bcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zsolt=20Kocsm=C3=A1rszky?= Date: Mon, 28 Jan 2019 13:20:55 +0100 Subject: [PATCH 023/177] WIP: Add dashboard details section for dashboard owner and more (#2934) Show dashboard creator on dashboard page --- client/app/pages/dashboards/dashboard.html | 4 ++++ client/app/pages/dashboards/dashboard.less | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/client/app/pages/dashboards/dashboard.html b/client/app/pages/dashboards/dashboard.html index 0e5a675f9e..c28ec8ebd9 100644 --- a/client/app/pages/dashboards/dashboard.html +++ b/client/app/pages/dashboards/dashboard.html @@ -5,9 +5,13 @@

            + + {{$ctrl.dashboard.user.name}} + +
          diff --git a/client/app/pages/dashboards/dashboard.less b/client/app/pages/dashboards/dashboard.less index a226e3832f..bb685b4fbf 100644 --- a/client/app/pages/dashboards/dashboard.less +++ b/client/app/pages/dashboards/dashboard.less @@ -92,6 +92,13 @@ } } +.profile__image_thumb--dashboard { + width: 16px; + height: 16px; + border-radius: 100%; + margin: 3px 5px 0 0; +} + .dashboard-header, .page-header--query { .tags-control a { opacity: 0; From 69301063802d9d723847eaa11a2b92c62f5eeb9d Mon Sep 17 00:00:00 2001 From: Levko Kravets Date: Mon, 28 Jan 2019 15:59:49 +0200 Subject: [PATCH 024/177] getredash/redash#3355 Widget params: Date/Date range value empty in static param input (#3357) --- client/app/components/ParameterMappingInput.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/app/components/ParameterMappingInput.jsx b/client/app/components/ParameterMappingInput.jsx index 54487b7abc..3b1b620998 100644 --- a/client/app/components/ParameterMappingInput.jsx +++ b/client/app/components/ParameterMappingInput.jsx @@ -1,6 +1,6 @@ /* eslint react/no-multi-comp: 0 */ -import { extend, map, includes, findIndex, find, fromPairs, isNull, isUndefined } from 'lodash'; +import { extend, map, includes, findIndex, find, fromPairs } from 'lodash'; import React from 'react'; import PropTypes from 'prop-types'; import Select from 'antd/lib/select'; @@ -163,7 +163,7 @@ export class ParameterMappingInput extends React.Component { this.updateParamMapping(mapping, { value })} From 7278d4b1fcf5f8dbf451bea35a0286d3cad1d4da Mon Sep 17 00:00:00 2001 From: Levko Kravets Date: Mon, 28 Jan 2019 16:46:26 +0200 Subject: [PATCH 025/177] Refactor Policy and OrganizationStatus services (#3345) * Refactor Policy and OrganizationStatus services --- .../dashboards/edit-dashboard-dialog.js | 5 +- .../app/components/empty-state/empty-state.js | 13 +-- client/app/config/index.js | 8 +- client/app/pages/dashboards/dashboard.js | 4 +- client/app/pages/data-sources/list.js | 5 +- client/app/pages/queries/view.js | 4 +- client/app/pages/users/list.js | 5 +- client/app/services/ng.js | 2 + client/app/services/organization-status.js | 22 ----- client/app/services/organizationStatus.js | 17 ++++ client/app/services/policy.js | 84 ------------------- client/app/services/policy/DefaultPolicy.js | 49 +++++++++++ client/app/services/policy/index.js | 8 ++ 13 files changed, 99 insertions(+), 127 deletions(-) delete mode 100644 client/app/services/organization-status.js create mode 100644 client/app/services/organizationStatus.js delete mode 100644 client/app/services/policy.js create mode 100644 client/app/services/policy/DefaultPolicy.js create mode 100644 client/app/services/policy/index.js diff --git a/client/app/components/dashboards/edit-dashboard-dialog.js b/client/app/components/dashboards/edit-dashboard-dialog.js index 2253f1b067..a1c765dec7 100644 --- a/client/app/components/dashboards/edit-dashboard-dialog.js +++ b/client/app/components/dashboards/edit-dashboard-dialog.js @@ -1,4 +1,5 @@ import { isEmpty } from 'lodash'; +import { policy } from '@/services/policy'; import template from './edit-dashboard-dialog.html'; const EditDashboardDialog = { @@ -8,11 +9,11 @@ const EditDashboardDialog = { dismiss: '&', }, template, - controller($location, $http, Policy, Events) { + controller($location, $http, Events) { 'ngInject'; this.dashboard = this.resolve.dashboard; - this.policy = Policy; + this.policy = policy; this.isFormValid = () => !isEmpty(this.dashboard.name); diff --git a/client/app/components/empty-state/empty-state.js b/client/app/components/empty-state/empty-state.js index 98af5b1d7c..5db8948af4 100644 --- a/client/app/components/empty-state/empty-state.js +++ b/client/app/components/empty-state/empty-state.js @@ -1,3 +1,4 @@ +import organizationStatus from '@/services/organizationStatus'; import './empty-state.less'; import template from './empty-state.html'; @@ -15,14 +16,14 @@ const EmptyStateComponent = { showInviteStep: '<', onboardingMode: '<', }, - controller($uibModal, OrganizationStatus, currentUser) { + controller($uibModal, currentUser) { this.isAdmin = currentUser.isAdmin; - this.dataSourceStepCompleted = OrganizationStatus.objectCounters.data_sources > 0; - this.queryStepCompleted = OrganizationStatus.objectCounters.queries > 0; - this.dashboardStepCompleted = OrganizationStatus.objectCounters.dashboards > 0; - this.alertStepCompleted = OrganizationStatus.objectCounters.alerts > 0; - this.inviteStepCompleted = OrganizationStatus.objectCounters.users > 1; + this.dataSourceStepCompleted = organizationStatus.objectCounters.data_sources > 0; + this.queryStepCompleted = organizationStatus.objectCounters.queries > 0; + this.dashboardStepCompleted = organizationStatus.objectCounters.dashboards > 0; + this.alertStepCompleted = organizationStatus.objectCounters.alerts > 0; + this.inviteStepCompleted = organizationStatus.objectCounters.users > 1; this.shouldShowOnboarding = () => { if (!this.onboardingMode) { diff --git a/client/app/config/index.js b/client/app/config/index.js index ee8905009d..2ce76b5e69 100644 --- a/client/app/config/index.js +++ b/client/app/config/index.js @@ -24,6 +24,8 @@ import { each, isFunction, extend } from 'lodash'; import '@/lib/sortable'; +import organizationStatus from '@/services/organizationStatus'; + import * as filters from '@/filters'; import registerDirectives from '@/directives'; import markdownFilter from '@/filters/markdown'; @@ -110,11 +112,7 @@ function registerPages() { route.authenticated = true; route.resolve = extend( { - __organizationStatus: (OrganizationStatus) => { - 'ngInject'; - - return OrganizationStatus.refresh(); - }, + __organizationStatus: () => organizationStatus.refresh(), }, route.resolve, ); diff --git a/client/app/pages/dashboards/dashboard.js b/client/app/pages/dashboards/dashboard.js index 9e77d1e57a..4cdf8c07a8 100644 --- a/client/app/pages/dashboards/dashboard.js +++ b/client/app/pages/dashboards/dashboard.js @@ -1,6 +1,7 @@ import * as _ from 'lodash'; import PromiseRejectionError from '@/lib/promise-rejection-error'; import getTags from '@/services/getTags'; +import { policy } from '@/services/policy'; import { durationHumanize } from '@/filters'; import template from './dashboard.html'; import shareDashboardTemplate from './share-dashboard.html'; @@ -36,7 +37,6 @@ function DashboardCtrl( clientConfig, Events, toastr, - Policy, ) { this.saveInProgress = false; @@ -83,7 +83,7 @@ function DashboardCtrl( enabled: true, })); - const allowedIntervals = Policy.getDashboardRefreshIntervals(); + const allowedIntervals = policy.getDashboardRefreshIntervals(); if (_.isArray(allowedIntervals)) { _.each(this.refreshRates, (rate) => { rate.enabled = allowedIntervals.indexOf(rate.rate) >= 0; diff --git a/client/app/pages/data-sources/list.js b/client/app/pages/data-sources/list.js index f1d64e1e5d..c81bc46c0d 100644 --- a/client/app/pages/data-sources/list.js +++ b/client/app/pages/data-sources/list.js @@ -1,8 +1,9 @@ import settingsMenu from '@/services/settingsMenu'; +import { policy } from '@/services/policy'; import template from './list.html'; -function DataSourcesCtrl(Policy, DataSource) { - this.policy = Policy; +function DataSourcesCtrl(DataSource) { + this.policy = policy; this.dataSources = DataSource.query(); } diff --git a/client/app/pages/queries/view.js b/client/app/pages/queries/view.js index 80b7942b3f..758ef9facb 100644 --- a/client/app/pages/queries/view.js +++ b/client/app/pages/queries/view.js @@ -1,6 +1,7 @@ import { pick, some, find, minBy, map, intersection, isArray, isObject } from 'lodash'; import { SCHEMA_NOT_SUPPORTED, SCHEMA_LOAD_ERROR } from '@/services/data-source'; import getTags from '@/services/getTags'; +import { policy } from '@/services/policy'; import Notifications from '@/services/notifications'; import template from './query.html'; @@ -21,7 +22,6 @@ function QueryViewCtrl( toastr, $uibModal, currentUser, - Policy, Query, DataSource, Visualization, @@ -451,7 +451,7 @@ function QueryViewCtrl( $scope.openVisualizationEditor(); } const intervals = clientConfig.queryRefreshIntervals; - const allowedIntervals = Policy.getQueryRefreshIntervals(); + const allowedIntervals = policy.getQueryRefreshIntervals(); $scope.refreshOptions = isArray(allowedIntervals) ? intersection(intervals, allowedIntervals) : intervals; $scope.updateQueryMetadata = changes => diff --git a/client/app/pages/users/list.js b/client/app/pages/users/list.js index ffdeba3541..ee1e165ac8 100644 --- a/client/app/pages/users/list.js +++ b/client/app/pages/users/list.js @@ -1,12 +1,13 @@ import { extend } from 'lodash'; +import { policy } from '@/services/policy'; import ListCtrl from '@/lib/list-ctrl'; import settingsMenu from '@/services/settingsMenu'; import template from './list.html'; class UsersListCtrl extends ListCtrl { - constructor($scope, $location, currentUser, clientConfig, Policy, User) { + constructor($scope, $location, currentUser, clientConfig, User) { super($scope, $location, currentUser, clientConfig); - this.policy = Policy; + this.policy = policy; this.enableUser = user => User.enableUser(user).then(this.update); this.disableUser = user => User.disableUser(user).then(this.update); this.deleteUser = user => User.deleteUser(user).then(this.update); diff --git a/client/app/services/ng.js b/client/app/services/ng.js index ce59976f82..de32a79f45 100644 --- a/client/app/services/ng.js +++ b/client/app/services/ng.js @@ -1,5 +1,6 @@ export let $http = null; // eslint-disable-line import/no-mutable-exports export let $sanitize = null; // eslint-disable-line import/no-mutable-exports +export let $q = null; // eslint-disable-line import/no-mutable-exports export let $uibModal = null; // eslint-disable-line import/no-mutable-exports export let toastr = null; // eslint-disable-line import/no-mutable-exports @@ -7,6 +8,7 @@ export default function init(ngModule) { ngModule.run(($injector) => { $http = $injector.get('$http'); $sanitize = $injector.get('$sanitize'); + $q = $injector.get('$q'); $uibModal = $injector.get('$uibModal'); toastr = $injector.get('toastr'); }); diff --git a/client/app/services/organization-status.js b/client/app/services/organization-status.js deleted file mode 100644 index 81d827e92e..0000000000 --- a/client/app/services/organization-status.js +++ /dev/null @@ -1,22 +0,0 @@ -export let OrganizationStatus = null; // eslint-disable-line import/no-mutable-exports - -function OrganizationStatusService($http) { - this.objectCounters = {}; - - this.refresh = () => - $http.get('api/organization/status').then(({ data }) => { - this.objectCounters = data.object_counters; - return this; - }); -} - -export default function init(ngModule) { - ngModule.service('OrganizationStatus', OrganizationStatusService); - - ngModule.run(($injector) => { - OrganizationStatus = $injector.get('OrganizationStatus'); - }); -} - -init.init = true; - diff --git a/client/app/services/organizationStatus.js b/client/app/services/organizationStatus.js new file mode 100644 index 0000000000..d849ad7c67 --- /dev/null +++ b/client/app/services/organizationStatus.js @@ -0,0 +1,17 @@ +import { $http } from '@/services/ng'; + +class OrganizationStatus { + constructor() { + this.objectCounters = {}; + } + + refresh() { + return $http.get('api/organization/status').then(({ data }) => { + this.objectCounters = data.object_counters; + return this; + }); + } +} + +export default new OrganizationStatus(); + diff --git a/client/app/services/policy.js b/client/app/services/policy.js deleted file mode 100644 index 366c06fd3e..0000000000 --- a/client/app/services/policy.js +++ /dev/null @@ -1,84 +0,0 @@ -import { isFunction, isArray } from 'lodash'; - -export class Policy { - constructor($injector) { - this.$injector = $injector; - } - - get user() { - return this.$injector.get('currentUser'); - } - - get organizationStatus() { - return this.$injector.get('OrganizationStatus'); - } - - refresh() { - const $q = this.$injector.get('$q'); - return $q.resolve(this); - } - - canCreateDataSource() { - return this.user.hasPermission('admin'); - } - - isCreateDataSourceEnabled() { - return this.user.hasPermission('admin'); - } - - canCreateDashboard() { - return this.user.hasPermission('create_dashboard'); - } - - isCreateDashboardEnabled() { - return this.user.hasPermission('create_dashboard'); - } - - // eslint-disable-next-line class-methods-use-this - canCreateAlert() { - return true; - } - - canCreateUser() { - return this.user.hasPermission('admin'); - } - - isCreateUserEnabled() { - return this.user.hasPermission('admin'); - } - - getDashboardRefreshIntervals() { - const clientConfig = this.$injector.get('clientConfig'); - const result = clientConfig.dashboardRefreshIntervals; - return isArray(result) ? result : null; - } - - getQueryRefreshIntervals() { - const clientConfig = this.$injector.get('clientConfig'); - const result = clientConfig.queryRefreshIntervals; - return isArray(result) ? result : null; - } -} - -export default function init(ngModule) { - let appInjector = null; - - ngModule.run(($injector) => { - 'ngInject'; - - appInjector = $injector; - }); - - ngModule.provider('Policy', function policyProvider() { - let PolicyClass = Policy; - - this.setPolicyClass = (policyClass) => { - PolicyClass = policyClass; - }; - - this.$get = () => (isFunction(PolicyClass) ? new PolicyClass(appInjector) : null); - }); -} - -init.init = true; - diff --git a/client/app/services/policy/DefaultPolicy.js b/client/app/services/policy/DefaultPolicy.js new file mode 100644 index 0000000000..b1101addbe --- /dev/null +++ b/client/app/services/policy/DefaultPolicy.js @@ -0,0 +1,49 @@ +import { isArray } from 'lodash'; +import { $q } from '@/services/ng'; +import { currentUser, clientConfig } from '@/services/auth'; + +/* eslint-disable class-methods-use-this */ + +export default class DefaultPolicy { + refresh() { + return $q.resolve(this); + } + + canCreateDataSource() { + return currentUser.isAdmin; + } + + isCreateDataSourceEnabled() { + return currentUser.isAdmin; + } + + canCreateDashboard() { + return currentUser.hasPermission('create_dashboard'); + } + + isCreateDashboardEnabled() { + return currentUser.hasPermission('create_dashboard'); + } + + canCreateAlert() { + return true; + } + + canCreateUser() { + return currentUser.isAdmin; + } + + isCreateUserEnabled() { + return currentUser.isAdmin; + } + + getDashboardRefreshIntervals() { + const result = clientConfig.dashboardRefreshIntervals; + return isArray(result) ? result : null; + } + + getQueryRefreshIntervals() { + const result = clientConfig.queryRefreshIntervals; + return isArray(result) ? result : null; + } +} diff --git a/client/app/services/policy/index.js b/client/app/services/policy/index.js new file mode 100644 index 0000000000..9a4ebd0b1d --- /dev/null +++ b/client/app/services/policy/index.js @@ -0,0 +1,8 @@ +import DefaultPolicy from './DefaultPolicy'; + +// eslint-disable-next-line import/no-mutable-exports +export let policy = new DefaultPolicy(); + +export function setPolicy(newPolicy) { + policy = newPolicy; +} From ff42ec2cc6700023e48c85fde387a955700b507a Mon Sep 17 00:00:00 2001 From: Arik Fraimovich Date: Mon, 28 Jan 2019 17:54:24 +0200 Subject: [PATCH 026/177] Cypress tests: preset the admin API key to a static value (#3358) --- .circleci/config.yml | 2 ++ cypress/cypress.js | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ac7e5bb0d1..1242d7cf18 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -73,6 +73,8 @@ jobs: command: | npm run cypress start docker-compose run cypress node ./cypress/cypress.js db-seed + # Make sure the API key is the same so Percy snapshots are consistent + docker-compose -p cypress run postgres psql -U postgres -h postgres -c "update users set api_key = 'secret' where email ='admin@redash.io';" - run: name: Execute Cypress tests command: npm run cypress run-ci diff --git a/cypress/cypress.js b/cypress/cypress.js index 3363b437e1..0dda6e4cff 100644 --- a/cypress/cypress.js +++ b/cypress/cypress.js @@ -36,7 +36,10 @@ function runCypressCI() { if (process.env.PERCY_TOKEN_ENCODED) { process.env.PERCY_TOKEN = atob(`${process.env.PERCY_TOKEN_ENCODED}`); } - execSync('docker-compose run cypress ./node_modules/.bin/percy exec -- ./node_modules/.bin/cypress run --browser chrome', { stdio: 'inherit' }); + execSync( + 'docker-compose run cypress ./node_modules/.bin/percy exec -- ./node_modules/.bin/cypress run --browser chrome', + { stdio: 'inherit' }, + ); } const command = process.argv[2] || 'all'; From 371b319e923fda457783a108d2f4fa3e1f191d0d Mon Sep 17 00:00:00 2001 From: Omer Lachish Date: Tue, 29 Jan 2019 09:18:07 +0200 Subject: [PATCH 027/177] Server-side parameter validation (#3315) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * stop testing `collect_query_parameters`, it's an implementation detail * add tests for `missing_query_params` * rename SQLQuery -> ParameterizedSqlQuery * rename sql_query.py to parameterized_query.py * split to parameterized queries and parameterized SQL queries, where parameterized queries only do templating and parameterized SQL queries add tree validation on top of it * move missing parameter detection to ParameterizedQuery * get rid of some old code * fix tests * set syntax to `custom` * revert the max-age-related refactoring * 👋 tree validations 😢 * BaseQueryRunner is no longer a factory for ParameterizedQuery, for now * add an endpoint for running a query by its id and (optional) parameters without having to provide the query text * adds parameter schema to ParameterizedQuery * adds parameter schema validation (currently for strings) * validate number parameters * validate date parameters * validate parameters on POST /api/queries//results * validate enum parameters * validate date range parameters * validate query-based dropdowns by preprocessing them at the handler level and converting them to a populated enum * change _is_date_range to be a tad more succinct * a single assignment with a `map` is sufficiently explanatory * Update redash/utils/parameterized_query.py Co-Authored-By: rauchy * Update redash/utils/parameterized_query.py Co-Authored-By: rauchy * Update redash/utils/parameterized_query.py Co-Authored-By: rauchy * Update redash/utils/parameterized_query.py Co-Authored-By: rauchy * Update redash/handlers/query_results.py Co-Authored-By: rauchy * Update redash/utils/parameterized_query.py Co-Authored-By: rauchy * build error message inside the error * support all types of numbers as number parameters * check for permissions when populating query-based dropdowns * check for access to query before running it * check for empty rows when populating query-based enums * don't bother loading query results if user doesn't have access * 💥 on unexpected parameter types * parameter schema default is a list, not a dictionary * remove redundant null guards --- redash/handlers/query_results.py | 27 ++++++-- redash/utils/parameterized_query.py | 58 ++++++++++++++-- tests/utils/test_parameterized_query.py | 92 ++++++++++++++++++++++++- 3 files changed, 168 insertions(+), 9 deletions(-) diff --git a/redash/handlers/query_results.py b/redash/handlers/query_results.py index 575f576653..a3e83fad52 100644 --- a/redash/handlers/query_results.py +++ b/redash/handlers/query_results.py @@ -10,7 +10,7 @@ require_permission, view_only) from redash.tasks import QueryTask from redash.tasks.queries import enqueue_query -from redash.utils import (collect_parameters_from_request, gen_query_hash, json_dumps, utcnow) +from redash.utils import (collect_parameters_from_request, gen_query_hash, json_dumps, json_loads, utcnow) from redash.utils.parameterized_query import ParameterizedQuery @@ -64,7 +64,7 @@ def run_query_sync(data_source, parameter_values, query_text, max_age=0): return None -def run_query(data_source, parameter_values, query_text, query_id, max_age=0): +def run_query(data_source, parameter_values, query_text, query_id, max_age=0, parameter_schema=None): if data_source.paused: if data_source.pause_reason: message = '{} is paused ({}). Please try later.'.format(data_source.name, data_source.pause_reason) @@ -73,7 +73,7 @@ def run_query(data_source, parameter_values, query_text, query_id, max_age=0): return error_response(message) - query = ParameterizedQuery(query_text).apply(parameter_values) + query = ParameterizedQuery(query_text, parameter_schema).apply(parameter_values) if query.missing_params: return error_response(u'Missing parameter value for: {}'.format(u", ".join(query.missing_params))) @@ -154,6 +154,23 @@ def options(self, query_id=None, query_result_id=None, filetype='json'): return make_response("", 200, headers) + def _fetch_rows(self, query_id): + query = models.Query.get_by_id_and_org(query_id, self.current_org) + require_access(query.data_source.groups, self.current_user, view_only) + + query_result = models.QueryResult.get_by_id_and_org(query.latest_query_data_id, self.current_org) + + return json_loads(query_result.data)["rows"] + + def _convert_queries_to_enums(self, definition): + if definition["type"] == "query": + definition["type"] = "enum" + + rows = self._fetch_rows(definition.pop("queryId")) + definition["enumOptions"] = [row.get('value', row.get(row.keys()[0])) for row in rows if row] + + return definition + @require_permission('execute_query') def post(self, query_id): """ @@ -171,11 +188,13 @@ def post(self, query_id): max_age = int(params.get('max_age', 0)) query = get_object_or_404(models.Query.get_by_id_and_org, query_id, self.current_org) + parameter_schema = map(self._convert_queries_to_enums, + query.options.get("parameters", [])) if not has_access(query.data_source.groups, self.current_user, not_view_only): return {'job': {'status': 4, 'error': 'You do not have permission to run queries with this data source.'}}, 403 else: - return run_query(query.data_source, parameters, query.query_text, query_id, max_age) + return run_query(query.data_source, parameters, query.query_text, query_id, max_age, parameter_schema=parameter_schema) @require_permission('view_query') def get(self, query_id=None, query_result_id=None, filetype='json'): diff --git a/redash/utils/parameterized_query.py b/redash/utils/parameterized_query.py index 4f9a873518..c1ec2d38bd 100644 --- a/redash/utils/parameterized_query.py +++ b/redash/utils/parameterized_query.py @@ -1,7 +1,8 @@ import pystache +from numbers import Number from redash.utils import mustache_render from funcy import distinct - +from dateutil.parser import parse def _collect_key_names(nodes): keys = [] @@ -33,17 +34,60 @@ def _parameter_names(parameter_values): return names +def _is_date(string): + try: + parse(string) + return True + except ValueError: + return False + + +def _is_date_range(obj): + try: + return _is_date(obj["start"]) and _is_date(obj["end"]) + except (KeyError, TypeError): + return False + + class ParameterizedQuery(object): - def __init__(self, template): + def __init__(self, template, schema=None): + self.schema = schema or [] self.template = template self.query = template self.parameters = {} def apply(self, parameters): - self.parameters.update(parameters) - self.query = mustache_render(self.template, self.parameters) + invalid_parameter_names = [key for (key, value) in parameters.iteritems() if not self._valid(key, value)] + if invalid_parameter_names: + raise InvalidParameterError(invalid_parameter_names) + else: + self.parameters.update(parameters) + self.query = mustache_render(self.template, self.parameters) + return self + def _valid(self, name, value): + definition = next((definition for definition in self.schema if definition["name"] == name), None) + + if not definition: + return True + + validators = { + "text": lambda value: isinstance(value, basestring), + "number": lambda value: isinstance(value, Number), + "enum": lambda value: value in definition["enumOptions"], + "date": _is_date, + "datetime-local": _is_date, + "datetime-with-seconds": _is_date, + "date-range": _is_date_range, + "datetime-range": _is_date_range, + "datetime-range-with-seconds": _is_date_range, + } + + validate = validators.get(definition["type"], lambda x: False) + + return validate(value) + @property def missing_params(self): query_parameters = set(_collect_query_parameters(self.template)) @@ -52,3 +96,9 @@ def missing_params(self): @property def text(self): return self.query + + +class InvalidParameterError(Exception): + def __init__(self, parameters): + message = u"The following parameter values are incompatible with their type definitions: {}".format(", ".join(parameters)) + super(InvalidParameterError, self).__init__(message) diff --git a/tests/utils/test_parameterized_query.py b/tests/utils/test_parameterized_query.py index e076dfae11..c63acc96d4 100644 --- a/tests/utils/test_parameterized_query.py +++ b/tests/utils/test_parameterized_query.py @@ -1,6 +1,7 @@ from unittest import TestCase +import pytest -from redash.utils.parameterized_query import ParameterizedQuery +from redash.utils.parameterized_query import ParameterizedQuery, InvalidParameterError class TestParameterizedQuery(TestCase): @@ -41,3 +42,92 @@ def test_handles_objects(self): } }) self.assertEqual(set([]), query.missing_params) + + def test_raises_on_invalid_text_parameters(self): + schema = [{"name": "bar", "type": "text"}] + query = ParameterizedQuery("foo", schema) + + with pytest.raises(InvalidParameterError): + query.apply({"bar": 7}) + + def test_validates_text_parameters(self): + schema = [{"name": "bar", "type": "text"}] + query = ParameterizedQuery("foo {{bar}}", schema) + + query.apply({"bar": u"baz"}) + + self.assertEquals("foo baz", query.text) + + def test_raises_on_invalid_number_parameters(self): + schema = [{"name": "bar", "type": "number"}] + query = ParameterizedQuery("foo", schema) + + with pytest.raises(InvalidParameterError): + query.apply({"bar": "baz"}) + + def test_validates_number_parameters(self): + schema = [{"name": "bar", "type": "number"}] + query = ParameterizedQuery("foo {{bar}}", schema) + + query.apply({"bar": 7}) + + self.assertEquals("foo 7", query.text) + + def test_raises_on_invalid_date_parameters(self): + schema = [{"name": "bar", "type": "date"}] + query = ParameterizedQuery("foo", schema) + + with pytest.raises(InvalidParameterError): + query.apply({"bar": "baz"}) + + def test_validates_date_parameters(self): + schema = [{"name": "bar", "type": "date"}] + query = ParameterizedQuery("foo {{bar}}", schema) + + query.apply({"bar": "2000-01-01 12:00:00"}) + + self.assertEquals("foo 2000-01-01 12:00:00", query.text) + + def test_raises_on_invalid_enum_parameters(self): + schema = [{"name": "bar", "type": "enum", "enumOptions": ["baz", "qux"]}] + query = ParameterizedQuery("foo", schema) + + with pytest.raises(InvalidParameterError): + query.apply({"bar": 7}) + + def test_raises_on_unlisted_enum_value_parameters(self): + schema = [{"name": "bar", "type": "enum", "enumOptions": ["baz", "qux"]}] + query = ParameterizedQuery("foo", schema) + + with pytest.raises(InvalidParameterError): + query.apply({"bar": "shlomo"}) + + def test_validates_enum_parameters(self): + schema = [{"name": "bar", "type": "enum", "enumOptions": ["baz", "qux"]}] + query = ParameterizedQuery("foo {{bar}}", schema) + + query.apply({"bar": "baz"}) + + self.assertEquals("foo baz", query.text) + + def test_raises_on_invalid_date_range_parameters(self): + schema = [{"name": "bar", "type": "date-range"}] + query = ParameterizedQuery("foo", schema) + + with pytest.raises(InvalidParameterError): + query.apply({"bar": "baz"}) + + def test_validates_date_range_parameters(self): + schema = [{"name": "bar", "type": "date-range"}] + query = ParameterizedQuery("foo {{bar.start}} {{bar.end}}", schema) + + query.apply({"bar": {"start": "2000-01-01 12:00:00", "end": "2000-12-31 12:00:00"}}) + + self.assertEquals("foo 2000-01-01 12:00:00 2000-12-31 12:00:00", query.text) + + def test_raises_on_unexpected_param_types(self): + schema = [{"name": "bar", "type": "burrito"}] + query = ParameterizedQuery("foo", schema) + + with pytest.raises(InvalidParameterError): + query.apply({"bar": "baz"}) From 2da511021e610567b29a1464faaaf7a6fdca9bee Mon Sep 17 00:00:00 2001 From: koooge Date: Wed, 30 Jan 2019 00:25:58 +0900 Subject: [PATCH 028/177] Frontend lint update (#3253) * client: Add lint command Signed-off-by: koooge * client: Override eslint rule object-curly-newline to keep current style Signed-off-by: koooge * client: Override eslint rule no-else-return to keep current style Signed-off-by: koooge * client: Fix eslint import/named Signed-off-by: koooge * client: eslint-5 Signed-off-by: koooge * codeclimate: Delete the old setting Signed-off-by: koooge * client: Downgrade eslint 5 to 4 in codeclimate Signed-off-by: koooge * client: npx install-peerdeps --dev eslint-config-airbnb Signed-off-by: koooge * client: Enbale .jsx lint Signed-off-by: koooge * client: Set warn Signed-off-by: koooge * client: Fix lint indent, implicit-arrow-linebreak, lines-between-class-members Signed-off-by: koooge * client: Disable eslint operator-linebreak Signed-off-by: koooge * Revert "client: Downgrade eslint 5 to 4 in codeclimate" This reverts commit f0fb0f005992a8b3c92eae505fcc2767b9d55266. * client: Fix react/button-has-type Signed-off-by: koooge * client: Disable an eslint rule react/jsx-one-expression-per-line Signed-off-by: koooge * codeclimate: Disable no-multiple-empty-lines Signed-off-by: koooge * client: Disable eslint react/destructuring-assignment Signed-off-by: koooge --- .codeclimate.yml | 6 +- client/.eslintrc.js | 11 +- client/app/components/EditInPlace.jsx | 16 +- .../app/components/ParameterMappingInput.jsx | 4 +- client/app/components/QueryEditor.jsx | 2 +- client/app/components/app-view/index.js | 7 +- .../app/components/queries/ScheduleDialog.jsx | 2 +- client/app/components/tags-list/tags-list.js | 1 + client/app/filters/datetime.js | 21 +- client/app/filters/markdown.js | 21 +- client/app/pages/data-sources/show.js | 6 +- client/app/pages/queries/view.js | 9 +- client/app/pages/settings/organization.js | 4 +- client/app/services/query-result.js | 35 +- client/app/services/query.js | 1 + client/app/visualizations/chart/index.js | 3 +- client/app/visualizations/sankey/index.js | 5 +- package-lock.json | 712 ++++++++++-------- package.json | 11 +- 19 files changed, 483 insertions(+), 394 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index c17ce2e20a..dc8e299291 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -3,12 +3,14 @@ engines: enabled: true eslint: enabled: true - channel: "eslint-3" + channel: "eslint-5" config: config: client/.eslintrc.js checks: import/no-unresolved: enabled: false + no-multiple-empty-lines: # TODO: Enable + enabled: false ratings: paths: - "redash/**/*.py" @@ -16,7 +18,5 @@ ratings: exclude_paths: - tests/**/*.py - migrations/**/*.py -- old_migrations/**/*.py - setup/**/* - bin/**/* - diff --git a/client/.eslintrc.js b/client/.eslintrc.js index 17552fcd15..4b14b07263 100644 --- a/client/.eslintrc.js +++ b/client/.eslintrc.js @@ -26,15 +26,22 @@ module.exports = { "no-lonely-if": "off", "consistent-return": "off", "no-control-regex": "off", + 'no-multiple-empty-lines': 'warn', "no-script-url": "off", // some tags should have href="javascript:void(0)" + 'operator-linebreak': 'off', + 'react/destructuring-assignment': 'off', "react/jsx-filename-extension": "off", + 'react/jsx-one-expression-per-line': 'off', "react/jsx-uses-react": "error", "react/jsx-uses-vars": "error", + 'react/jsx-wrap-multilines': 'warn', + 'react/no-access-state-in-setstate': 'warn', "react/prefer-stateless-function": "warn", "react/forbid-prop-types": "warn", "react/prop-types": "warn", "jsx-a11y/anchor-is-valid": "off", "jsx-a11y/click-events-have-key-events": "off", + 'jsx-a11y/label-has-associated-control': 'warn', "jsx-a11y/label-has-for": "off", "jsx-a11y/no-static-element-interactions": "off", "max-len": ['error', 120, 2, { @@ -43,6 +50,8 @@ module.exports = { ignoreRegExpLiterals: true, ignoreStrings: true, ignoreTemplateLiterals: true, - }] + }], + "no-else-return": ["error", {"allowElseIf": true}], + "object-curly-newline": ["error", {"consistent": true}] } }; diff --git a/client/app/components/EditInPlace.jsx b/client/app/components/EditInPlace.jsx index 369f5d470b..5d06dbd87a 100644 --- a/client/app/components/EditInPlace.jsx +++ b/client/app/components/EditInPlace.jsx @@ -18,6 +18,7 @@ export class EditInPlace extends React.Component { placeholder: '', value: '', }; + constructor(props) { super(props); this.state = { @@ -67,14 +68,13 @@ export class EditInPlace extends React.Component { ); - renderEdit = () => - React.createElement(this.props.editor, { - ref: this.inputRef, - className: 'rd-form-control', - defaultValue: this.props.value, - onBlur: this.stopEditing, - onKeyDown: this.keyDown, - }); + renderEdit = () => React.createElement(this.props.editor, { + ref: this.inputRef, + className: 'rd-form-control', + defaultValue: this.props.value, + onBlur: this.stopEditing, + onKeyDown: this.keyDown, + }); render() { return ( diff --git a/client/app/components/ParameterMappingInput.jsx b/client/app/components/ParameterMappingInput.jsx index 3b1b620998..afd68647ec 100644 --- a/client/app/components/ParameterMappingInput.jsx +++ b/client/app/components/ParameterMappingInput.jsx @@ -260,8 +260,8 @@ export class ParameterMappingListInput extends React.Component {
          {this.props.mappings.map((mapping, index) => { const existingParamsNames = this.props.existingParams - .filter(({ type }) => type === mapping.param.type) // exclude mismatching param types - .map(({ name }) => name); // keep names only + .filter(({ type }) => type === mapping.param.type) // exclude mismatching param types + .map(({ name }) => name); // keep names only return (
          diff --git a/client/app/components/QueryEditor.jsx b/client/app/components/QueryEditor.jsx index c86b704a1c..a09aa9f406 100644 --- a/client/app/components/QueryEditor.jsx +++ b/client/app/components/QueryEditor.jsx @@ -285,7 +285,7 @@ class QueryEditor extends React.Component { {this.props.canEdit ? ( -
          diff --git a/client/app/components/tags-list/tags-list.js b/client/app/components/tags-list/tags-list.js index 85dcea6b9b..d7defc102e 100644 --- a/client/app/components/tags-list/tags-list.js +++ b/client/app/components/tags-list/tags-list.js @@ -11,6 +11,7 @@ class TagsList { this.allTags = tags; }); } + toggleTag($event, tag) { if ($event.shiftKey) { // toggle tag diff --git a/client/app/filters/datetime.js b/client/app/filters/datetime.js index 5d8b8f4626..90d146509d 100644 --- a/client/app/filters/datetime.js +++ b/client/app/filters/datetime.js @@ -3,20 +3,19 @@ import moment from 'moment'; export default function init(ngModule) { ngModule.filter('toMilliseconds', () => value => value * 1000.0); - ngModule.filter('dateTime', clientConfig => - function dateTime(value) { - if (!value) { - return ''; - } + ngModule.filter('dateTime', clientConfig => function dateTime(value) { + if (!value) { + return ''; + } - const parsed = moment(value); + const parsed = moment(value); - if (!parsed.isValid()) { - return '-'; - } + if (!parsed.isValid()) { + return '-'; + } - return parsed.format(clientConfig.dateTimeFormat); - }); + return parsed.format(clientConfig.dateTimeFormat); + }); } init.init = true; diff --git a/client/app/filters/markdown.js b/client/app/filters/markdown.js index 237ba944e9..09a7df3094 100644 --- a/client/app/filters/markdown.js +++ b/client/app/filters/markdown.js @@ -1,19 +1,18 @@ import { markdown } from 'markdown'; export default function init(ngModule) { - ngModule.filter('markdown', ($sce, clientConfig) => - function parseMarkdown(text) { - if (!text) { - return ''; - } + ngModule.filter('markdown', ($sce, clientConfig) => function parseMarkdown(text) { + if (!text) { + return ''; + } - let html = markdown.toHTML(String(text)); - if (clientConfig.allowScriptsInUserInput) { - html = $sce.trustAsHtml(html); - } + let html = markdown.toHTML(String(text)); + if (clientConfig.allowScriptsInUserInput) { + html = $sce.trustAsHtml(html); + } - return html; - }); + return html; + }); } init.init = true; diff --git a/client/app/pages/data-sources/show.js b/client/app/pages/data-sources/show.js index b6446659ed..5d938a6918 100644 --- a/client/app/pages/data-sources/show.js +++ b/client/app/pages/data-sources/show.js @@ -3,12 +3,12 @@ import debug from 'debug'; import template from './show.html'; const logger = debug('redash:http'); -const deleteConfirm = { class: 'btn-warning', title: 'Delete' }; -function logAndToastrError(deleteObject, httpResponse, toastr) { +export const deleteConfirm = { class: 'btn-warning', title: 'Delete' }; +export function logAndToastrError(deleteObject, httpResponse, toastr) { logger('Failed to delete ' + deleteObject + ': ', httpResponse.status, httpResponse.statusText, httpResponse.data); toastr.error('Failed to delete ' + deleteObject + '.'); } -function toastrSuccessAndPath(deleteObject, deletePath, toastr, $location) { +export function toastrSuccessAndPath(deleteObject, deletePath, toastr, $location) { toastr.success(deleteObject + ' deleted successfully.'); $location.path('/' + deletePath + '/'); } diff --git a/client/app/pages/queries/view.js b/client/app/pages/queries/view.js index 758ef9facb..61ed3bd234 100644 --- a/client/app/pages/queries/view.js +++ b/client/app/pages/queries/view.js @@ -454,11 +454,10 @@ function QueryViewCtrl( const allowedIntervals = policy.getQueryRefreshIntervals(); $scope.refreshOptions = isArray(allowedIntervals) ? intersection(intervals, allowedIntervals) : intervals; - $scope.updateQueryMetadata = changes => - $scope.$apply(() => { - $scope.query = Object.assign($scope.query, changes); - $scope.saveQuery(); - }); + $scope.updateQueryMetadata = changes => $scope.$apply(() => { + $scope.query = Object.assign($scope.query, changes); + $scope.saveQuery(); + }); $scope.showScheduleForm = false; $scope.openScheduleForm = () => { if (!$scope.canEdit || !$scope.canScheduleQuery) { diff --git a/client/app/pages/settings/organization.js b/client/app/pages/settings/organization.js index e826497aed..9b2ead407c 100644 --- a/client/app/pages/settings/organization.js +++ b/client/app/pages/settings/organization.js @@ -26,8 +26,8 @@ function OrganizationSettingsCtrl($http, toastr, clientConfig, Events) { this.dateFormatList = clientConfig.dateFormatList; this.googleLoginEnabled = clientConfig.googleLoginEnabled; - this.disablePasswordLoginToggle = () => - (clientConfig.googleLoginEnabled || this.settings.auth_saml_enabled) === false; + // eslint-disable-next-line max-len + this.disablePasswordLoginToggle = () => (clientConfig.googleLoginEnabled || this.settings.auth_saml_enabled) === false; } export default function init(ngModule) { diff --git a/client/app/services/query-result.js b/client/app/services/query-result.js index 22fcdfe5ed..1d096d5538 100644 --- a/client/app/services/query-result.js +++ b/client/app/services/query-result.js @@ -237,25 +237,24 @@ function QueryResultService($resource, $timeout, $q, QueryResultError) { } }); - this.filteredData = this.query_result.data.rows.filter(row => - filters.reduce((memo, filter) => { - if (!isArray(filter.current)) { - filter.current = [filter.current]; - } + this.filteredData = this.query_result.data.rows.filter(row => filters.reduce((memo, filter) => { + if (!isArray(filter.current)) { + filter.current = [filter.current]; + } - return ( - memo && - some(filter.current, (v) => { - const value = row[filter.name]; - if (moment.isMoment(value)) { - return value.isSame(v); - } - // We compare with either the value or the String representation of the value, - // because Select2 casts true/false to "true"/"false". - return v === value || String(value) === v; - }) - ); - }, true)); + return ( + memo && + some(filter.current, (v) => { + const value = row[filter.name]; + if (moment.isMoment(value)) { + return value.isSame(v); + } + // We compare with either the value or the String representation of the value, + // because Select2 casts true/false to "true"/"false". + return v === value || String(value) === v; + }) + ); + }, true)); } else { this.filteredData = this.query_result.data.rows; } diff --git a/client/app/services/query.js b/client/app/services/query.js index 57ece987dd..740e339b21 100644 --- a/client/app/services/query.js +++ b/client/app/services/query.js @@ -145,6 +145,7 @@ class Parameter { get ngModel() { return this.normalizedValue; } + set ngModel(value) { this.setValue(value); } diff --git a/client/app/visualizations/chart/index.js b/client/app/visualizations/chart/index.js index ab2f26a301..8075e2aa4c 100644 --- a/client/app/visualizations/chart/index.js +++ b/client/app/visualizations/chart/index.js @@ -231,8 +231,7 @@ function ChartEditor(ColorPalette, clientConfig) { scope.form = { yAxisColumns: [], - seriesList: sortBy(keys(scope.options.seriesOptions), name => - scope.options.seriesOptions[name].zIndex), + seriesList: sortBy(keys(scope.options.seriesOptions), name => scope.options.seriesOptions[name].zIndex), valuesList: keys(scope.options.valuesOptions), }; diff --git a/client/app/visualizations/sankey/index.js b/client/app/visualizations/sankey/index.js index b2c59cacdc..6ca87ccbc3 100644 --- a/client/app/visualizations/sankey/index.js +++ b/client/app/visualizations/sankey/index.js @@ -120,10 +120,7 @@ function createSankey(element, data) { const color = d3.scale.category20(); data = graph(data); - data.nodes = _.map(data.nodes, d => - _.extend(d, { - color: color(d.name.replace(/ .*/, '')), - })); + data.nodes = _.map(data.nodes, d => _.extend(d, { color: color(d.name.replace(/ .*/, '')) })); // append the svg canvas to the page const svg = d3 diff --git a/package-lock.json b/package-lock.json index d44c23c8f8..45a925c6f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -626,21 +626,10 @@ } }, "acorn-jsx": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", - "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", - "dev": true, - "requires": { - "acorn": "^3.0.4" - }, - "dependencies": { - "acorn": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", - "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", - "dev": true - } - } + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz", + "integrity": "sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==", + "dev": true }, "acorn-walk": { "version": "6.1.0", @@ -673,15 +662,29 @@ } }, "ajv": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz", - "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz", + "integrity": "sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==", "dev": true, "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", - "json-schema-traverse": "^0.3.0", - "json-stable-stringify": "^1.0.1" + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "dependencies": { + "fast-deep-equal": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + } } }, "ajv-errors": { @@ -691,9 +694,9 @@ "dev": true }, "ajv-keywords": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz", - "integrity": "sha1-opbhf3v658HOT34N5T0pyzIWLfA=", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz", + "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=", "dev": true }, "align-text": { @@ -975,14 +978,6 @@ "requires": { "ast-types-flow": "0.0.7", "commander": "^2.11.0" - }, - "dependencies": { - "commander": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz", - "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==", - "dev": true - } } }, "arr-diff": { @@ -1283,9 +1278,9 @@ "optional": true }, "axobject-query": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.1.tgz", - "integrity": "sha1-Bd+nBa2orZ25k/polvItOVsLCgc=", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz", + "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==", "dev": true, "requires": { "ast-types-flow": "0.0.7" @@ -4547,21 +4542,6 @@ "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=" }, - "del": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", - "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", - "dev": true, - "requires": { - "globby": "^5.0.0", - "is-path-cwd": "^1.0.0", - "is-path-in-cwd": "^1.0.0", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "rimraf": "^2.2.8" - } - }, "delaunay-triangulate": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/delaunay-triangulate/-/delaunay-triangulate-1.1.6.tgz", @@ -4712,14 +4692,6 @@ "dev": true, "requires": { "esutils": "^2.0.2" - }, - "dependencies": { - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true - } } }, "dom-align": { @@ -5261,123 +5233,115 @@ } }, "eslint": { - "version": "4.19.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz", - "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.3.0.tgz", + "integrity": "sha512-N/tCqlMKkyNvAvLu+zI9AqDasnSLt00K+Hu8kdsERliC9jYEc8ck12XtjvOXrBKu8fK6RrBcN9bat6Xk++9jAg==", "dev": true, "requires": { - "ajv": "^5.3.0", - "babel-code-frame": "^6.22.0", + "ajv": "^6.5.0", + "babel-code-frame": "^6.26.0", "chalk": "^2.1.0", - "concat-stream": "^1.6.0", - "cross-spawn": "^5.1.0", + "cross-spawn": "^6.0.5", "debug": "^3.1.0", "doctrine": "^2.1.0", - "eslint-scope": "^3.7.1", + "eslint-scope": "^4.0.0", + "eslint-utils": "^1.3.1", "eslint-visitor-keys": "^1.0.0", - "espree": "^3.5.4", - "esquery": "^1.0.0", + "espree": "^4.0.0", + "esquery": "^1.0.1", "esutils": "^2.0.2", "file-entry-cache": "^2.0.0", "functional-red-black-tree": "^1.0.1", "glob": "^7.1.2", - "globals": "^11.0.1", - "ignore": "^3.3.3", + "globals": "^11.7.0", + "ignore": "^4.0.2", "imurmurhash": "^0.1.4", - "inquirer": "^3.0.6", - "is-resolvable": "^1.0.0", - "js-yaml": "^3.9.1", + "inquirer": "^5.2.0", + "is-resolvable": "^1.1.0", + "js-yaml": "^3.11.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.3.0", - "lodash": "^4.17.4", - "minimatch": "^3.0.2", + "lodash": "^4.17.5", + "minimatch": "^3.0.4", "mkdirp": "^0.5.1", "natural-compare": "^1.4.0", "optionator": "^0.8.2", "path-is-inside": "^1.0.2", "pluralize": "^7.0.0", "progress": "^2.0.0", - "regexpp": "^1.0.1", + "regexpp": "^2.0.0", "require-uncached": "^1.0.3", - "semver": "^5.3.0", + "semver": "^5.5.0", + "string.prototype.matchall": "^2.0.0", "strip-ansi": "^4.0.0", - "strip-json-comments": "~2.0.1", - "table": "4.0.2", - "text-table": "~0.2.0" + "strip-json-comments": "^2.0.1", + "table": "^4.0.3", + "text-table": "^0.2.0" }, "dependencies": { - "ajv": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "dev": true, - "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" - } - }, "ansi-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "color-convert": "^1.9.0" + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "eslint-scope": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz", + "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" } }, "esprima": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", - "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", - "dev": true - }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true }, "globals": { - "version": "11.7.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz", - "integrity": "sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==", + "version": "11.10.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.10.0.tgz", + "integrity": "sha512-0GZF1RiPKU97IHUO5TORo9w1PwrH/NBPl+fS7oMLdaTRiYmYbwK4NWoZWrAdd0/abG9R2BU+OiwyQpTpE6pdfQ==", "dev": true }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", "dev": true }, "js-yaml": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz", - "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", + "version": "3.12.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz", + "integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==", "dev": true, "requires": { "argparse": "^1.0.7", "esprima": "^4.0.0" } }, + "semver": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", + "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==", + "dev": true + }, "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", @@ -5386,34 +5350,29 @@ "requires": { "ansi-regex": "^3.0.0" } - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } } } }, "eslint-config-airbnb": { - "version": "16.1.0", - "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-16.1.0.tgz", - "integrity": "sha512-zLyOhVWhzB/jwbz7IPSbkUuj7X2ox4PHXTcZkEmDqTvd0baJmJyuxlFPDlZOE/Y5bC+HQRaEkT3FoHo9wIdRiw==", + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-17.1.0.tgz", + "integrity": "sha512-R9jw28hFfEQnpPau01NO5K/JWMGLi6aymiF6RsnMURjTk+MqZKllCqGK/0tOvHkPi/NWSSOU2Ced/GX++YxLnw==", "dev": true, "requires": { - "eslint-config-airbnb-base": "^12.1.0" + "eslint-config-airbnb-base": "^13.1.0", + "object.assign": "^4.1.0", + "object.entries": "^1.0.4" }, "dependencies": { "eslint-config-airbnb-base": { - "version": "12.1.0", - "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-12.1.0.tgz", - "integrity": "sha512-/vjm0Px5ZCpmJqnjIzcFb9TKZrKWz0gnuG/7Gfkt0Db1ELJR51xkZth+t14rYdqWgX836XbuxtArbIHlVhbLBA==", + "version": "13.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.1.0.tgz", + "integrity": "sha512-XWwQtf3U3zIoKO1BbHh6aUhJZQweOwSt4c2JrPDg9FP3Ltv3+YfEv7jIDB8275tVnO/qOHbfuYg3kzw6Je7uWw==", "dev": true, "requires": { - "eslint-restricted-globals": "^0.1.1" + "eslint-restricted-globals": "^0.1.1", + "object.assign": "^4.1.0", + "object.entries": "^1.0.4" } } } @@ -5428,13 +5387,13 @@ } }, "eslint-import-resolver-node": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.1.tgz", - "integrity": "sha512-yUtXS15gIcij68NmXmP9Ni77AQuCN0itXbCc/jWd8C6/yKZaSNXicpC8cgvjnxVdmfsosIXrjpzFq7GcDryb6A==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz", + "integrity": "sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==", "dev": true, "requires": { - "debug": "^2.6.8", - "resolve": "^1.2.0" + "debug": "^2.6.9", + "resolve": "^1.5.0" }, "dependencies": { "debug": { @@ -5445,6 +5404,21 @@ "requires": { "ms": "2.0.0" } + }, + "path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "dev": true + }, + "resolve": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.9.0.tgz", + "integrity": "sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } } } }, @@ -5587,9 +5561,9 @@ } }, "eslint-module-utils": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.1.1.tgz", - "integrity": "sha512-jDI/X5l/6D1rRD/3T43q8Qgbls2nq5km5KSqiwlyUbGo5+04fXhMKdCPhjwbqAa6HXWaMxj8Q4hQDIh7IadJQw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz", + "integrity": "sha1-snA2LNiLGkitMIl2zn+lTphBF0Y=", "dev": true, "requires": { "debug": "^2.6.8", @@ -5653,21 +5627,21 @@ } }, "eslint-plugin-import": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.7.0.tgz", - "integrity": "sha512-HGYmpU9f/zJaQiKNQOVfHUh2oLWW3STBrCgH0sHTX1xtsxYlH1zjLh8FlQGEIdZSdTbUMaV36WaZ6ImXkenGxQ==", + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz", + "integrity": "sha512-FpuRtniD/AY6sXByma2Wr0TXvXJ4nA/2/04VPlfpmUDPOpOY264x+ILiwnrk/k4RINgDAyFZByxqPUbSQ5YE7g==", "dev": true, "requires": { - "builtin-modules": "^1.1.1", "contains-path": "^0.1.0", "debug": "^2.6.8", "doctrine": "1.5.0", "eslint-import-resolver-node": "^0.3.1", - "eslint-module-utils": "^2.1.1", + "eslint-module-utils": "^2.2.0", "has": "^1.0.1", - "lodash.cond": "^4.3.0", + "lodash": "^4.17.4", "minimatch": "^3.0.3", - "read-pkg-up": "^2.0.0" + "read-pkg-up": "^2.0.0", + "resolve": "^1.6.0" }, "dependencies": { "debug": { @@ -5689,17 +5663,26 @@ "isarray": "^1.0.0" } }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true - }, "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true + }, + "path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "dev": true + }, + "resolve": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.9.0.tgz", + "integrity": "sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } } } }, @@ -5710,9 +5693,9 @@ "dev": true }, "eslint-plugin-jsx-a11y": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.1.0.tgz", - "integrity": "sha512-hnhf28u7Z9zlh7Y56tETrwnPeBvXgcqlP7ntHvZsWQs/n/p/vPnfNMNFWTqJAFcbd8PrDEifX1NRGHsjnUmqMw==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.1.2.tgz", + "integrity": "sha512-7gSSmwb3A+fQwtw0arguwMdOdzmKUgnUcbSNlo+GjKLAQFuC2EZxWqG9XHRI8VscBJD5a8raz3RuxQNFW+XJbw==", "dev": true, "requires": { "aria-query": "^3.0.0", @@ -5737,15 +5720,18 @@ } }, "eslint-plugin-react": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.10.0.tgz", - "integrity": "sha512-18rzWn4AtbSUxFKKM7aCVcj5LXOhOKdwBino3KKWy4psxfPW0YtIbE8WNRDUdyHFL50BeLb6qFd4vpvNYyp7hw==", + "version": "7.12.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.12.3.tgz", + "integrity": "sha512-WTIA3cS8OzkPeCi4KWuPmjR33lgG9r9Y/7RmnLTRw08MZKgAfnK/n3BO4X0S67MPkVLazdfCNT/XWqcDu4BLTA==", "dev": true, "requires": { + "array-includes": "^3.0.3", "doctrine": "^2.1.0", "has": "^1.0.3", "jsx-ast-utils": "^2.0.1", - "prop-types": "^15.6.2" + "object.fromentries": "^2.0.0", + "prop-types": "^15.6.2", + "resolve": "^1.9.0" }, "dependencies": { "has": { @@ -5757,6 +5743,12 @@ "function-bind": "^1.1.1" } }, + "path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "dev": true + }, "prop-types": { "version": "15.6.2", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz", @@ -5766,6 +5758,15 @@ "loose-envify": "^1.3.1", "object-assign": "^4.1.1" } + }, + "resolve": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.9.0.tgz", + "integrity": "sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } } } }, @@ -5785,6 +5786,12 @@ "estraverse": "^4.1.1" } }, + "eslint-utils": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz", + "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==", + "dev": true + }, "eslint-visitor-keys": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", @@ -5792,19 +5799,20 @@ "dev": true }, "espree": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz", - "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz", + "integrity": "sha512-I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w==", "dev": true, "requires": { - "acorn": "^5.5.0", - "acorn-jsx": "^3.0.0" + "acorn": "^6.0.2", + "acorn-jsx": "^5.0.0", + "eslint-visitor-keys": "^1.0.0" }, "dependencies": { "acorn": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz", - "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==", + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.5.tgz", + "integrity": "sha512-i33Zgp3XWtmZBMNvCr4azvOFeWVw1Rk6p3hfi3LUDvIFraOMywb1kAtrbi+med14m4Xfpqm3zRZMT+c0FNE7kg==", "dev": true } } @@ -6522,14 +6530,14 @@ } }, "flat-cache": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz", - "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz", + "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==", "dev": true, "requires": { "circular-json": "^0.3.1", - "del": "^2.0.2", "graceful-fs": "^4.1.2", + "rimraf": "~2.6.2", "write": "^0.2.1" } }, @@ -6788,7 +6796,8 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true + "bundled": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -6806,11 +6815,13 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -6823,15 +6834,18 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -6934,7 +6948,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -6944,6 +6959,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -6956,17 +6972,20 @@ "minimatch": { "version": "3.0.4", "bundled": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -6983,6 +7002,7 @@ "mkdirp": { "version": "0.5.1", "bundled": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -7055,7 +7075,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -7065,6 +7086,7 @@ "once": { "version": "1.4.0", "bundled": true, + "optional": true, "requires": { "wrappy": "1" } @@ -7140,7 +7162,8 @@ }, "safe-buffer": { "version": "5.1.1", - "bundled": true + "bundled": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -7170,6 +7193,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7187,6 +7211,7 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -7225,11 +7250,13 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true + "bundled": true, + "optional": true }, "yallist": { "version": "3.0.2", - "bundled": true + "bundled": true, + "optional": true } } }, @@ -7798,20 +7825,6 @@ "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", "dev": true }, - "globby": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", - "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", - "dev": true, - "requires": { - "array-union": "^1.0.1", - "arrify": "^1.0.0", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, "glsl-face-normal": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/glsl-face-normal/-/glsl-face-normal-1.0.2.tgz", @@ -8799,22 +8812,21 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, "inquirer": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", - "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz", + "integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==", "dev": true, "requires": { "ansi-escapes": "^3.0.0", "chalk": "^2.0.0", "cli-cursor": "^2.1.0", "cli-width": "^2.0.0", - "external-editor": "^2.0.4", + "external-editor": "^2.1.0", "figures": "^2.0.0", "lodash": "^4.3.0", "mute-stream": "0.0.7", "run-async": "^2.2.0", - "rx-lite": "^4.0.8", - "rx-lite-aggregates": "^4.0.8", + "rxjs": "^5.5.2", "string-width": "^2.1.0", "strip-ansi": "^4.0.0", "through": "^2.3.6" @@ -8826,32 +8838,6 @@ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", @@ -8860,15 +8846,6 @@ "requires": { "ansi-regex": "^3.0.0" } - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } } } }, @@ -10549,6 +10526,7 @@ "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", "dev": true, + "optional": true, "requires": { "jsonify": "~0.0.0" } @@ -10598,7 +10576,8 @@ "version": "0.0.0", "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", - "dev": true + "dev": true, + "optional": true }, "jsprim": { "version": "1.4.1", @@ -11041,12 +11020,6 @@ "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", "dev": true }, - "lodash.cond": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz", - "integrity": "sha1-9HGh2khr5g9quVXRcRVSPdHSVdU=", - "dev": true - }, "lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", @@ -12592,6 +12565,77 @@ } } }, + "object.fromentries": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.0.tgz", + "integrity": "sha512-9iLiI6H083uiqUuvzyY6qrlmc/Gz8hLQFOcb/Ri/0xXFkSNS3ctV+CbE6yM2+AnkYfOB3dGjdzC0wrMLIhQICA==", + "dev": true, + "requires": { + "define-properties": "^1.1.2", + "es-abstract": "^1.11.0", + "function-bind": "^1.1.1", + "has": "^1.0.1" + }, + "dependencies": { + "es-abstract": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz", + "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.0", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "is-callable": "^1.1.4", + "is-regex": "^1.0.4", + "object-keys": "^1.0.12" + }, + "dependencies": { + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "requires": { + "function-bind": "^1.1.1" + } + } + } + }, + "es-to-primitive": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", + "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, + "is-callable": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", + "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", + "dev": true + }, + "is-symbol": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", + "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", + "dev": true, + "requires": { + "has-symbols": "^1.0.0" + } + }, + "object-keys": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz", + "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==", + "dev": true + } + } + }, "object.getownpropertydescriptors": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz", @@ -14114,9 +14158,9 @@ "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" }, "progress": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz", - "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", "dev": true }, "promise": { @@ -15320,10 +15364,19 @@ } } }, + "regexp.prototype.flags": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz", + "integrity": "sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==", + "dev": true, + "requires": { + "define-properties": "^1.1.2" + } + }, "regexpp": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz", - "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", + "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", "dev": true }, "regexpu-core": { @@ -15897,19 +15950,13 @@ "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz", "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=" }, - "rx-lite": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", - "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", - "dev": true - }, - "rx-lite-aggregates": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz", - "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=", + "rxjs": { + "version": "5.5.12", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz", + "integrity": "sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==", "dev": true, "requires": { - "rx-lite": "*" + "symbol-observable": "1.0.1" } }, "safe-buffer": { @@ -17099,6 +17146,76 @@ } } }, + "string.prototype.matchall": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-2.0.0.tgz", + "integrity": "sha512-WoZ+B2ypng1dp4iFLF2kmZlwwlE19gmjgKuhL1FJfDgCREWb3ye3SDVHSzLH6bxfnvYmkCxbzkmWcQZHA4P//Q==", + "dev": true, + "requires": { + "define-properties": "^1.1.2", + "es-abstract": "^1.10.0", + "function-bind": "^1.1.1", + "has-symbols": "^1.0.0", + "regexp.prototype.flags": "^1.2.0" + }, + "dependencies": { + "es-abstract": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz", + "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.0", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "is-callable": "^1.1.4", + "is-regex": "^1.0.4", + "object-keys": "^1.0.12" + } + }, + "es-to-primitive": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", + "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "requires": { + "function-bind": "^1.1.1" + } + }, + "is-callable": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", + "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", + "dev": true + }, + "is-symbol": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", + "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", + "dev": true, + "requires": { + "has-symbols": "^1.0.0" + } + }, + "object-keys": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz", + "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==", + "dev": true + } + } + }, "string.prototype.trim": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz", @@ -17248,6 +17365,12 @@ } } }, + "symbol-observable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz", + "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=", + "dev": true + }, "symbol-tree": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz", @@ -17255,54 +17378,17 @@ "dev": true }, "table": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz", - "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/table/-/table-4.0.3.tgz", + "integrity": "sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==", "dev": true, "requires": { - "ajv": "^5.2.3", - "ajv-keywords": "^2.1.0", + "ajv": "^6.0.1", + "ajv-keywords": "^3.0.0", "chalk": "^2.1.0", "lodash": "^4.17.4", "slice-ansi": "1.0.0", "string-width": "^2.1.1" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } } }, "tapable": { diff --git a/package.json b/package.json index 8bbcaa21f6..7fb86300d6 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "watch": "webpack --watch --progress --colors -d", "analyze": "npm run clean && BUNDLE_ANALYZER=on webpack", "analyze:build": "npm run clean && NODE_ENV=production BUNDLE_ANALYZER=on webpack", + "lint": "eslint --config ./client/.eslintrc.js --ext .js --ext .jsx ./client/app", "test": "TZ=Asia/Jerusalem jest", "test:watch": "jest --watch", "cypress:install": "npm install --no-save cypress @percy/cypress", @@ -98,16 +99,16 @@ "enzyme": "^3.8.0", "enzyme-adapter-react-16": "^1.7.1", "enzyme-to-json": "^3.3.5", - "eslint": "^4.19.1", - "eslint-config-airbnb": "^16.1.0", + "eslint": "^5.3.0", + "eslint-config-airbnb": "^17.1.0", "eslint-config-airbnb-base": "^12.0.1", "eslint-import-resolver-webpack": "^0.8.3", "eslint-loader": "^2.1.1", "eslint-plugin-cypress": "^2.0.1", - "eslint-plugin-import": "^2.7.0", + "eslint-plugin-import": "^2.14.0", "eslint-plugin-jest": "^21.25.1", - "eslint-plugin-jsx-a11y": "^6.0.3", - "eslint-plugin-react": "^7.7.0", + "eslint-plugin-jsx-a11y": "^6.1.2", + "eslint-plugin-react": "^7.12.3", "file-loader": "^2.0.0", "html-webpack-plugin": "^3.2.0", "identity-obj-proxy": "^3.0.0", From 53aecdc6075c5a194a9c7e1e7c954b418d9aa342 Mon Sep 17 00:00:00 2001 From: Vladislav Denisov Date: Tue, 29 Jan 2019 19:17:13 +0300 Subject: [PATCH 029/177] yandex_metrica: changed auth from params to headers (#3360) --- redash/query_runner/yandex_metrica.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/redash/query_runner/yandex_metrica.py b/redash/query_runner/yandex_metrica.py index 814b1b8662..82f47d8565 100644 --- a/redash/query_runner/yandex_metrica.py +++ b/redash/query_runner/yandex_metrica.py @@ -115,7 +115,11 @@ def test_connection(self): def _send_query(self, path='stat/v1/data', **kwargs): token = kwargs.pop('oauth_token', self.configuration['token']) - r = requests.get('{0}/{1}'.format(self.host, path), params=dict(oauth_token=token, **kwargs)) + r = requests.get( + '{0}/{1}'.format(self.host, path), + headers={'Authorization': 'OAuth {}'.format(token)}, + params=kwargs + ) if r.status_code != 200: raise Exception(r.text) return r.json() From 61e7cdaa8107443f0cc59d9dadf575278f4aea7a Mon Sep 17 00:00:00 2001 From: Aidarbek Suleimenov Date: Tue, 29 Jan 2019 23:47:43 +0600 Subject: [PATCH 030/177] Filename set when /results called directly (#3359) * filename set when /results called directly * /results filename changed from query name to id * Long line shortened --- redash/handlers/query_results.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/redash/handlers/query_results.py b/redash/handlers/query_results.py index a3e83fad52..45be31301f 100644 --- a/redash/handlers/query_results.py +++ b/redash/handlers/query_results.py @@ -223,6 +223,7 @@ def get(self, query_id=None, query_result_id=None, filetype='json'): max_age = int(request.args.get('maxAge', 0)) query_result = None + query = None if query_result_id: query_result = get_object_or_404(models.QueryResult.get_by_id_and_org, query_result_id, self.current_org) @@ -276,6 +277,16 @@ def get(self, query_id=None, query_result_id=None, filetype='json'): if should_cache: response.headers.add_header('Cache-Control', 'private,max-age=%d' % ONE_YEAR) + str_date = query_result.retrieved_at.strftime("%Y_%m_%d") + str_id = None + if query is not None: + str_id = str(query.id) + else: + str_id = str(query_result.id) + filename = "{}_{}.{}".format(str_id, str_date, filetype,) + + response.headers.add_header("Content-Disposition", 'attachment; filename="{}"'.format(filename,)) + return response else: From 9e2f8e2461799ffd4c882b7b8a05601064d1fd10 Mon Sep 17 00:00:00 2001 From: Ran Byron Date: Wed, 30 Jan 2019 10:43:38 +0200 Subject: [PATCH 031/177] Fix: Escape button in tag edit modal (#3363) --- .../components/tags-control/TagsControl.jsx | 82 ++++++++------ .../tags-control/TagsEditorModal.jsx | 100 ++++++------------ 2 files changed, 82 insertions(+), 100 deletions(-) diff --git a/client/app/components/tags-control/TagsControl.jsx b/client/app/components/tags-control/TagsControl.jsx index 0a28c0f98d..f514577261 100644 --- a/client/app/components/tags-control/TagsControl.jsx +++ b/client/app/components/tags-control/TagsControl.jsx @@ -1,7 +1,7 @@ import { map, trim } from 'lodash'; -import React from 'react'; +import React, { Fragment } from 'react'; import PropTypes from 'prop-types'; -import { $uibModal } from '@/services/ng'; +import TagsEditorModal from './TagsEditorModal'; export default class TagsControl extends React.Component { static propTypes = { @@ -15,27 +15,36 @@ export default class TagsControl extends React.Component { static defaultProps = { tags: [], canEdit: false, - getAvailableTags: () => {}, + getAvailableTags: () => Promise.resolve([]), onEdit: () => {}, className: '', }; - editTags() { - const { getAvailableTags, onEdit } = this.props; // eslint-disable-line react/prop-types - const tags = map(this.props.tags, trim); + constructor(props) { + super(props); + + this.state = { + showModal: false, + }; - getAvailableTags().then((availableTags) => { - $uibModal - .open({ - component: 'tagsEditorModal', - resolve: { - tags: () => tags, - availableTags: () => availableTags, - }, - }).result.then((newTags) => { - onEdit(newTags); - }); - }); + // get available tags + this.props.getAvailableTags() + .then((tags) => { + this.availableTags = tags; + }); + } + + onTagsChanged = (newTags) => { + this.props.onEdit(newTags); + this.closeEditModal(); + } + + openEditModal = () => { + this.setState({ showModal: true }); + } + + closeEditModal = () => { + this.setState({ showModal: false }); } // eslint-disable-next-line class-methods-use-this @@ -55,19 +64,32 @@ export default class TagsControl extends React.Component { } renderEditButton() { - if (this.props.canEdit) { - return (this.props.tags.length > 0) ? ( -           this.editTags()}> - - - ) : ( - this.editTags()}> - - Add tag - - ); + if (!this.props.canEdit) { + return null; } - return null; + + const tags = map(this.props.tags, trim); + + const buttonLabel = tags.length > 0 + ? + : Add tag; + + return ( + + + {buttonLabel} + + {this.state.showModal + ? + : null + } + + ); } render() { diff --git a/client/app/components/tags-control/TagsEditorModal.jsx b/client/app/components/tags-control/TagsEditorModal.jsx index 0b24ad8494..0ed0fc6ffe 100644 --- a/client/app/components/tags-control/TagsEditorModal.jsx +++ b/client/app/components/tags-control/TagsEditorModal.jsx @@ -1,12 +1,12 @@ -import { map, trim, uniq } from 'lodash'; +import { map, trim, chain } from 'lodash'; import React from 'react'; import PropTypes from 'prop-types'; -import { react2angular } from 'react2angular'; import Select from 'antd/lib/select'; +import Modal from 'antd/lib/modal'; const { Option } = Select; -class TagsEditorModal extends React.Component { +export default class TagsEditorModal extends React.Component { static propTypes = { tags: PropTypes.arrayOf(PropTypes.string), availableTags: PropTypes.arrayOf(PropTypes.string), @@ -23,81 +23,41 @@ class TagsEditorModal extends React.Component { constructor(props) { super(props); + this.state = { - result: uniq(map(this.props.tags, trim)), + result: chain(this.props.tags).map(trim).uniq().value(), }; - this.selectRef = React.createRef(); - } - componentDidMount() { - // `autoFocus` does not work on Select because its `componentDidMount` is fired before the component - // is actually visible, so it cannot get focus. This hack should be replaced with `autoFocus` prop - // when Angular will finally gone - setTimeout(() => { - if ( - this.selectRef.current && - this.selectRef.current.rcSelect && - this.selectRef.current.rcSelect.inputRef - ) { - this.selectRef.current.rcSelect.inputRef.focus(); - } - }); + this.selectOptions = + chain(this.props.availableTags) + .map(trim) + .uniq() + .map(tag => ) + .value(); } render() { - const { - availableTags, - close, - dismiss, - } = this.props; - - const uniqueAvailableTags = uniq(map(availableTags, trim)); + const { close, dismiss } = this.props; + const { result } = this.state; return ( -
          -
          - -

          Add/Edit Tags

          -
          -
          - -
          -
          - - -
          -
          + close(result)} + onCancel={dismiss} + > + + ); } } - -export default function init(ngModule) { - ngModule.component('tagsEditorModal', { - template: ` - - `, - bindings: { - resolve: '<', - close: '&', - dismiss: '&', - }, - }); - ngModule.component('tagsEditorModalImpl', react2angular(TagsEditorModal)); -} - -init.init = true; From 13bc910d7c966e339296b05f1c0930588688c448 Mon Sep 17 00:00:00 2001 From: koooge Date: Wed, 30 Jan 2019 17:51:32 +0900 Subject: [PATCH 032/177] Update CodeClimate configuration format to Version 2 (#3286) * codeclimate: Update format v2 * codeclimate: Ignore generated files --- .codeclimate.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index dc8e299291..119550ee58 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -1,4 +1,5 @@ -engines: +version: "2" +plugins: pep8: enabled: true eslint: @@ -11,12 +12,11 @@ engines: enabled: false no-multiple-empty-lines: # TODO: Enable enabled: false -ratings: - paths: - - "redash/**/*.py" - - "client/**/*.js" -exclude_paths: -- tests/**/*.py -- migrations/**/*.py -- setup/**/* -- bin/**/* +exclude_patterns: +- "tests/**/*.py" +- "migrations/**/*.py" +- "setup/**/*" +- "bin/**/*" +- "**/node_modules/" +- "client/dist/" +- "**/*.pyc" From 0b9f575dab5a71c84aeb15ac6ae5e5aba9b92e17 Mon Sep 17 00:00:00 2001 From: Aidarbek Suleimenov Date: Wed, 30 Jan 2019 15:17:43 +0600 Subject: [PATCH 033/177] Fix: make ClickHouse password and username truly optional (#3362) * clickhouse optional password * clickhouse URL and user made optional --- redash/query_runner/clickhouse.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/redash/query_runner/clickhouse.py b/redash/query_runner/clickhouse.py index a51328531a..8a07b3634a 100644 --- a/redash/query_runner/clickhouse.py +++ b/redash/query_runner/clickhouse.py @@ -68,13 +68,13 @@ def _get_tables(self, schema): def _send_query(self, data, stream=False): r = requests.post( - self.configuration['url'], + self.configuration.get('url', "http://127.0.0.1:8123"), data=data.encode("utf-8"), stream=stream, timeout=self.configuration.get('timeout', 30), params={ - 'user': self.configuration['user'], - 'password': self.configuration['password'], + 'user': self.configuration.get('user', "default"), + 'password': self.configuration.get('password', ""), 'database': self.configuration['dbname'] } ) From 0d959116d851b63ec6b887076a3623bf89d04a85 Mon Sep 17 00:00:00 2001 From: Levko Kravets Date: Wed, 30 Jan 2019 17:22:54 +0200 Subject: [PATCH 034/177] Migrate FavoritesControl component to React --- client/app/components/FavoritesControl.jsx | 89 +++++++++++++++++++ .../app/components/favorites-control/index.js | 41 --------- client/app/lib/list-ctrl.js | 5 ++ client/app/services/ng.js | 2 + 4 files changed, 96 insertions(+), 41 deletions(-) create mode 100644 client/app/components/FavoritesControl.jsx delete mode 100644 client/app/components/favorites-control/index.js diff --git a/client/app/components/FavoritesControl.jsx b/client/app/components/FavoritesControl.jsx new file mode 100644 index 0000000000..8908a3a751 --- /dev/null +++ b/client/app/components/FavoritesControl.jsx @@ -0,0 +1,89 @@ +import { isFunction } from 'lodash'; +import React from 'react'; +import PropTypes from 'prop-types'; +import { react2angular } from 'react2angular'; +import { $rootScope } from '@/services/ng'; + +function toggleItem(event, item, callback) { + event.preventDefault(); + event.stopPropagation(); + + if (item) { + if (item.is_favorite) { + item.$unfavorite().then(() => { + item.is_favorite = false; + $rootScope.$broadcast('reloadFavorites'); + if (isFunction(callback)) { + callback(); + } + }); + } else { + item.$favorite().then(() => { + item.is_favorite = true; + $rootScope.$broadcast('reloadFavorites'); + if (isFunction(callback)) { + callback(); + } + }); + } + } +} + +export function FavoritesControl({ item, onChange }) { + const icon = item.is_favorite ? 'fa-star' : 'fa-star-o'; + const title = item.is_favorite ? 'Remove from favorites' : 'Add to favorites'; + return ( + toggleItem(event, item, onChange)} + > +