Merge pull request #2 from getredash/master

Update from getredash/redash

.circleci/config.yml

@@ -70,6 +70,8 @@ jobs:
       COMPOSE_FILE: .circleci/docker-compose.cypress.yml
       COMPOSE_PROJECT_NAME: cypress
       PERCY_TOKEN_ENCODED: ZGRiY2ZmZDQ0OTdjMzM5ZWE0ZGQzNTZiOWNkMDRjOTk4Zjg0ZjMxMWRmMDZiM2RjOTYxNDZhOGExMjI4ZDE3MA==
+      CYPRESS_PROJECT_ID_ENCODED: OTI0Y2th
+      CYPRESS_RECORD_KEY_ENCODED: YzA1OTIxMTUtYTA1Yy00NzQ2LWEyMDMtZmZjMDgwZGI2ODgx
     docker:
       - image: circleci/node:8
     steps:

.circleci/docker-compose.cypress.yml

@@ -39,6 +39,8 @@ services:
       PERCY_BRANCH: ${CIRCLE_BRANCH}
       PERCY_COMMIT: ${CIRCLE_SHA1}
       PERCY_PULL_REQUEST: ${CIRCLE_PR_NUMBER}
+      CYPRESS_PROJECT_ID: ${CYPRESS_PROJECT_ID}
+      CYPRESS_RECORD_KEY: ${CYPRESS_RECORD_KEY}
   redis:
     image: redis:3.0-alpine
     restart: unless-stopped

bin/docker-entrypoint

@@ -4,9 +4,10 @@ set -e
 worker() {
   WORKERS_COUNT=${WORKERS_COUNT:-2}
   QUEUES=${QUEUES:-queries,scheduled_queries,celery,schemas}
+  WORKER_EXTRA_OPTIONS=${WORKER_EXTRA_OPTIONS:-}
 
   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
+  exec /usr/local/bin/celery worker --app=redash.worker -c$WORKERS_COUNT -Q$QUEUES -linfo --max-tasks-per-child=10 -Ofair $WORKER_EXTRA_OPTIONS
 }
 
 scheduler() {
@@ -16,7 +17,7 @@ scheduler() {
 
   echo "Starting scheduler and $WORKERS_COUNT workers for queues: $QUEUES..."
 
-  exec /usr/local/bin/celery worker --app=redash.worker --beat -s$SCHEDULE_DB -c$WORKERS_COUNT -Q$QUEUES -linfo --maxtasksperchild=10 -Ofair
+  exec /usr/local/bin/celery worker --app=redash.worker --beat -s$SCHEDULE_DB -c$WORKERS_COUNT -Q$QUEUES -linfo --max-tasks-per-child=10 -Ofair
 }
 
 server() {

client/.babelrc

@@ -1,7 +1,10 @@
 {
   "presets": [
     ["@babel/preset-env", {
-      "targets": "> 0.5%, last 2 versions, Firefox ESR, ie 11, not dead",
+      "exclude": [
+        "@babel/plugin-transform-async-to-generator",
+        "@babel/plugin-transform-arrow-functions"
+      ],
       "useBuiltIns": "usage"
     }],
     "@babel/preset-react"

client/.eslintrc.js

@@ -1,6 +1,7 @@
 module.exports = {
   root: true,
-  extends: ["airbnb"],
+  extends: ["airbnb", "plugin:compat/recommended"],
+  plugins: ["jest", "compat"],
   settings: {
     "import/resolver": "webpack"
   },

client/app/assets/less/ant.less

@@ -20,7 +20,10 @@
 @import '~antd/lib/tag/style/index';
 @import '~antd/lib/grid/style/index';
 @import '~antd/lib/switch/style/index';
+@import '~antd/lib/empty/style/index';
 @import '~antd/lib/drawer/style/index';
+@import '~antd/lib/card/style/index';
+@import '~antd/lib/steps/style/index';
 @import '~antd/lib/divider/style/index';
 @import '~antd/lib/dropdown/style/index';
 @import '~antd/lib/menu/style/index';
@@ -249,11 +252,15 @@
   z-index: 1000; // make sure it doesn't cover drawer
 }
 
-// flexible width for notifications
+// Notification overrides
 .@{notification-prefix-cls} {
-  width: auto;
+  // vertical centering
+  &-notice-close {
+    top: 20px;
+    right: 20px;
+  }
 
-  &-notice {
-    padding-right: 48px;
+  &-notice-description {
+    max-width: 484px;
   }
 }

client/app/assets/less/inc/ant-variables.less

@@ -72,3 +72,9 @@
 @table-row-hover-bg: fade(@redash-gray, 5%);
 @table-padding-vertical: 7px;
 @table-padding-horizontal: 10px;
+
+/* --------------------------------------------------------
+    Notification
+-----------------------------------------------------------*/
+@notification-padding: @notification-padding-vertical 48px @notification-padding-vertical 17px;
+@notification-width: auto;

client/app/assets/less/inc/base.less

@@ -21,16 +21,11 @@ html, body {
 body {
     padding-top: @header-height;
     position: relative;
-    padding-bottom: @footer-height;
     &.headless {
         padding-top: 0;
-        padding-bottom: 0;
         .nav.app-header {
             display: none;
         }
-        div#footer {
-            display: none;
-        }
     }
 }
 

client/app/assets/less/inc/misc.less

@@ -225,4 +225,13 @@
     height: 37px;
     border-radius: 2px;
     width: 37px;
+}
+
+/* --------------------------------------------------------
+    Percy
+-----------------------------------------------------------*/
+@media only percy {
+    .hide-in-percy, .pace {
+        visibility: hidden;
+    }
 }

client/app/assets/less/inc/print.less

@@ -12,7 +12,6 @@
 
 
     #header,
-    #footer,
     #sidebar,
     #chat,
     .growl-animated,

client/app/assets/less/inc/variables.less

@@ -17,7 +17,6 @@
     Template Variables
 -----------------------------------------------------------*/
 @header-height:                         60px;
-@footer-height:                         95px;
 @sidebar-left-width:                    240px;
 @sidebar-left-mid-width:                64px;
 @logo-width:                            @sidebar-left-width;

client/app/assets/less/main.less

@@ -44,7 +44,6 @@
 @import 'inc/jumbotron';
 @import 'inc/profile';
 @import 'inc/404';
-@import 'inc/footer';
 @import 'inc/ie-warning';
 @import 'inc/navbar';
 @import 'inc/edit-in-place';

client/app/assets/less/redash/redash-newstyle.less

@@ -28,10 +28,6 @@ body {
     .navbar {
       display: none !important;
     }
-
-    div#footer {
-      display: none;
-    }
   }
 }
 
@@ -242,110 +238,6 @@ body {
   float: right;
 }
 
-.database-source {
-  display: inline-flex;
-  flex-wrap: wrap;
-  justify-content: center;
-}
-
-.visual-card {
-  background: #FFFFFF;
-  border: 1px solid fade(@redash-gray, 15%);
-  border-radius: 3px;
-  margin: 5px;
-  width: 212px;
-  padding: 15px 5px;
-  cursor: pointer;
-  box-shadow: none;
-  transition: transform 0.12s ease-out;
-  transition-duration: 0.3s;
-  transition-property: box-shadow;
-
-  display: flex;
-  //flex-direction: row;
-  align-items: center;
-
-  &:hover {
-    box-shadow: rgba(102, 136, 153, 0.15) 0px 4px 9px -3px;
-  }
-
-  img {
-    width: 64px !important;
-    height: 64px !important;
-    margin-right: 5px;
-  }
-
-  h3 {
-    font-size: 13px;
-    color: #323232;
-    margin: 0 !important;
-    text-overflow: ellipsis;
-    overflow: hidden;
-  }
-}
-
-.visual-card--selected {
-  background: fade(@redash-gray, 3%);
-  border: 1px solid fade(@redash-gray, 15%);
-  border-radius: 3px;
-  padding: 0 15px;
-  box-shadow: none;
-
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-
-  justify-content: space-around;
-  margin-bottom: 15px;
-  width: 100%;
-
-  img {
-    width: 64px;
-    height: 64px;
-  }
-
-  a {
-    cursor: pointer;
-  }
-}
-
-@media (max-width: 1200px) {
-  .visual-card {
-    width: 217px;
-  }
-}
-
-@media (max-width: 755px) {
-  .visual-card {
-    width: 47%;
-  }
-}
-
-@media (max-width: 515px) {
-  .visual-card {
-    width: 47%;
-
-    img {
-      width: 48px;
-      height: 48px;
-    }
-  }
-}
-
-@media (max-width: 408px) {
-  .visual-card {
-    width: 100%;
-    padding: 5px;
-    margin: 5px 0;
-
-    img {
-      width: 48px;
-      height: 48px;
-    }
-  }
-}
-
-
 .t-header:not(.th-alt) {
   padding: 15px;
 
@@ -355,12 +247,6 @@ body {
   }
 }
 
-#footer {
-  height: auto;
-  line-height: 3;
-  padding: 20px;
-}
-
 .page-header-wrapper, .page-header--new {
   h3 {
     margin: 0.2em 0;
@@ -975,4 +861,8 @@ text.slicetext {
 .table-data .label-tag {
   display: inline-block;
   max-width: 135px;
+}
+
+.markdown strong {
+  font-weight: bold;
 }