Merge pull request #1 from getredash/master

update

Author: Feeeenng

.circleci/Dockerfile.cypress

@@ -3,7 +3,7 @@ FROM cypress/browsers:chrome67
 ENV APP /usr/src/app
 WORKDIR $APP
 
-RUN npm install --no-save cypress @percy/cypress > /dev/null
+RUN npm install --no-save puppeteer@1.10.0 cypress@^3.1.5 @percy/cypress@^0.2.3 atob@2.1.2 > /dev/null
 
 COPY cypress $APP/cypress
 COPY cypress.json $APP/cypress.json

.circleci/config.yml

@@ -58,7 +58,7 @@ jobs:
     environment:
       COMPOSE_FILE: .circleci/docker-compose.cypress.yml
       COMPOSE_PROJECT_NAME: cypress
-      PERCY_TOKEN_ENCODED: MWM3OGUzNzk4ZWQ2NTE4YTBhMDAwZDNiNWE1Nzc4ZjEzZjYyMzY1MjE0NjY0NDRiOGE5ODc5ZGYzYTU4ZmE4NQ==
+      PERCY_TOKEN_ENCODED: ZGRiY2ZmZDQ0OTdjMzM5ZWE0ZGQzNTZiOWNkMDRjOTk4Zjg0ZjMxMWRmMDZiM2RjOTYxNDZhOGExMjI4ZDE3MA==
     docker:
       - image: circleci/node:8
     steps:
@@ -96,9 +96,7 @@ jobs:
       - setup_remote_docker
       - checkout
       - run: .circleci/update_version
-      - run: docker login -u $DOCKER_USER -p $DOCKER_PASS
-      - run: docker build -t redash/redash:$(.circleci/docker_tag) .
-      - run: docker push redash/redash:$(.circleci/docker_tag)
+      - run: .circleci/docker_build
 workflows:
   version: 2
   build:
@@ -109,21 +107,23 @@ workflows:
       - frontend-unit-tests
       - frontend-e2e-tests
       - build-tarball:
-           requires:
-             - backend-unit-tests
-           filters:
-             tags:
-               only: /v[0-9]+(\.[0-9\-a-z]+)*/
-             branches:
-               only:
-                 - master
-                 - /release\/.*/
+          requires:
+            - backend-unit-tests
+            - frontend-unit-tests
+            - frontend-e2e-tests
+          filters:
+            branches:
+              only:
+                - master
+                - /release\/.*/
       - build-docker-image:
-           requires:
-             - backend-unit-tests
-           filters:
-             branches:
-               only:
-                 - master
-                 - preview-build
-                 - /release\/.*/
+          requires:
+            - backend-unit-tests
+            - frontend-unit-tests
+            - frontend-e2e-tests
+          filters:
+            branches:
+              only:
+                - master
+                - preview-image
+                - /release\/.*/

.circleci/docker-compose.cypress.yml

@@ -23,7 +23,7 @@ services:
       REDASH_LOG_LEVEL: "INFO"
       REDASH_REDIS_URL: "redis://redis:6379/0"
       REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
-      QUEUES: "queries,scheduled_queries,celery"
+      QUEUES: "queries,scheduled_queries,celery,schemas"
       WORKERS_COUNT: 2
   cypress:
     build:

.circleci/docker_build

@@ -0,0 +1,17 @@
+#!/bin/bash
+VERSION=$(jq -r .version package.json)
+VERSION_TAG=$VERSION.b$CIRCLE_BUILD_NUM
+
+docker login -u $DOCKER_USER -p $DOCKER_PASS
+
+if [ $CIRCLE_BRANCH = master ] || [ $CIRCLE_BRANCH = preview-image ]
+then
+    docker build -t redash/redash:preview -t redash/preview:$VERSION_TAG .
+    docker push redash/redash:preview
+    docker push redash/preview:$VERSION_TAG
+else
+    docker build -t redash/redash:$VERSION_TAG .
+    docker push redash/redash:$VERSION_TAG
+fi
+
+echo "Built: $VERSION_TAG"

.circleci/docker_tag

@@ -1,22 +1,38 @@
-engines:
+version: "2"
+checks:
+  complex-logic:
+    enabled: false
+  file-lines:
+    enabled: false
+  method-complexity:
+    enabled: false
+  method-count:
+    enabled: false
+  method-lines:
+    config:
+      threshold: 100
+  nested-control-flow:
+    enabled: false
+  identical-code:
+    enabled: false
+plugins:
   pep8:
     enabled: true
   eslint:
     enabled: true
-    channel: "eslint-3"
+    channel: "eslint-5"
     config:
       config: client/.eslintrc.js
     checks:
       import/no-unresolved:
         enabled: false
-ratings:
-  paths:
-  - "redash/**/*.py"
-  - "client/**/*.js"
-exclude_paths:
-- tests/**/*.py
-- migrations/**/*.py
-- old_migrations/**/*.py
-- setup/**/*
-- bin/**/*
-
+      no-multiple-empty-lines: # TODO: Enable
+        enabled: false
+exclude_patterns:
+- "tests/**/*.py"
+- "migrations/**/*.py"
+- "setup/**/*"
+- "bin/**/*"
+- "**/node_modules/"
+- "client/dist/"
+- "**/*.pyc"

.codeclimate.yml

@@ -3,4 +3,12 @@ client/dist/
 node_modules/
 .tmp/
 .venv/
+venv/
 .git/
+/.codeclimate.yml
+/.coverage
+/coverage.xml
+/.circleci/
+/.github/
+/netlify.toml
+/setup/

.dockerignore

@@ -0,0 +1,15 @@
+## What type of PR is this? (check all applicable)
+<!-- Please leave only what's applicable -->
+
+- [ ] Refactor
+- [ ] Feature
+- [ ] Bug Fix
+- [ ] New Query Runner (Data Source)
+- [ ] New Alert Destination
+- [ ] Other
+
+## Description
+
+## Related Tickets & Documents
+
+## Mobile & Desktop Screenshots/Recordings (if there are UI changes)

.github/PULL_REQUEST_TEMPLATE.md

@@ -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

.github/support.yml

@@ -0,0 +1,7 @@
+# Configuration for weekly-digest - https://github.com/apps/weekly-digest
+publishDay: mon
+canPublishIssues: true
+canPublishPullRequests: true
+canPublishContributors: true
+canPublishStargazers: true
+canPublishCommits: true

.github/weekly-digest.yml

@@ -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/)
@@ -61,7 +60,7 @@ If you would like to suggest an enhancement or ask for a new feature:
 
 ### Documentation
 
-The project's documentation can be found at [https://redash.io/help/](https://redash.io/help/). The [documentation sources](https://github.com/getredash/website/tree/master/website/_kb) are hosted on GitHub. To contribute edits / new pages, you can use GitHub's interface. Click the "Edit on GitHub" link on the documentation page to quickly open the edit interface.
+The project's documentation can be found at [https://redash.io/help/](https://redash.io/help/). The [documentation sources](https://github.com/getredash/website/tree/master/src/pages/kb) are hosted on GitHub. To contribute edits / new pages, you can use GitHub's interface. Click the "Edit on GitHub" link on the documentation page to quickly open the edit interface.
 
 ## Additional Notes
 

CONTRIBUTING.md

@@ -3,7 +3,7 @@ set -e
 
 worker() {
   WORKERS_COUNT=${WORKERS_COUNT:-2}
-  QUEUES=${QUEUES:-queries,scheduled_queries,celery}
+  QUEUES=${QUEUES:-queries,scheduled_queries,celery,schemas}
 
   echo "Starting $WORKERS_COUNT workers for queues: $QUEUES..."
   exec /usr/local/bin/celery worker --app=redash.worker -c$WORKERS_COUNT -Q$QUEUES -linfo --maxtasksperchild=10 -Ofair
@@ -27,6 +27,10 @@ create_db() {
   exec /app/manage.py database create_tables
 }
 
+celery_healthcheck() {
+  exec /usr/local/bin/celery inspect ping --app=redash.worker -d celery@$HOSTNAME
+}
+
 help() {
   echo "Redash Docker."
   echo ""
@@ -36,9 +40,11 @@ help() {
   echo "server -- start Redash server (with gunicorn)"
   echo "worker -- start Celery worker"
   echo "scheduler -- start Celery worker with a beat (scheduler) process"
+  echo "celery_healthcheck -- runs a Celery healthcheck. Useful for Docker's HEALTHCHECK mechanism."
   echo ""
   echo "shell -- open shell"
   echo "dev_server -- start Flask development server with debugger and auto reload"
+  echo "debug -- start Flask development server with remote debugger via ptvsd"
   echo "create_db -- create database tables"
   echo "manage -- CLI to manage redash"
   echo "tests -- run tests"
@@ -72,6 +78,11 @@ case "$1" in
     export FLASK_DEBUG=1
     exec /app/manage.py runserver --debugger --reload -h 0.0.0.0
     ;;
+  debug)
+    export FLASK_DEBUG=1
+    export REMOTE_DEBUG=1
+    exec /app/manage.py runserver --debugger --no-reload -h 0.0.0.0
+    ;;
   shell)
     exec /app/manage.py shell
     ;;

bin/docker-entrypoint

@@ -1,8 +1,15 @@
 {
-  "presets": ["env", "react", "stage-2"],
+  "presets": [
+    ["@babel/preset-env", {
+      "targets": "> 0.5%, last 2 versions, Firefox ESR, ie 11, not dead",
+      "useBuiltIns": "usage"
+    }],
+    "@babel/preset-react"
+  ],
   "plugins": [
     "angularjs-annotate",
-    "transform-object-assign",
+    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-transform-object-assign",
     ["babel-plugin-transform-builtin-extend", {
       "globals": ["Error"]
     }]

client/.babelrc

@@ -18,6 +18,7 @@ module.exports = {
     'no-param-reassign': 0,
     'no-mixed-operators': 0,
     'no-underscore-dangle': 0,
+    "no-use-before-define": ["error", "nofunc"],
     "prefer-destructuring": "off",
     "prefer-template": "off",
     "no-restricted-properties": "off",
@@ -26,15 +27,24 @@ module.exports = {
     "no-lonely-if": "off",
     "consistent-return": "off",
     "no-control-regex": "off",
+    'no-multiple-empty-lines': 'warn',
     "no-script-url": "off", // some <a> 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", {
+      "controlComponents": true
+    }],
     "jsx-a11y/label-has-for": "off",
     "jsx-a11y/no-static-element-interactions": "off",
     "max-len": ['error', 120, 2, {
@@ -43,6 +53,8 @@ module.exports = {
       ignoreRegExpLiterals: true,
       ignoreStrings: true,
       ignoreTemplateLiterals: true,
-    }]
+    }],
+    "no-else-return": ["error", {"allowElseIf": true}],
+    "object-curly-newline": ["error", {"consistent": true}],
   }
 };