Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/metabase/metabase into da…
Browse files Browse the repository at this point in the history
…shboards-list
  • Loading branch information
attekei committed Apr 11, 2017
2 parents 37bd412 + b892677 commit f57f3b4
Show file tree
Hide file tree
Showing 459 changed files with 1,801 additions and 715 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"rules": {
"strict": [2, "never"],
"no-undef": 2,
"no-unused-vars": [1, {"vars": "all", "args": "none", "varsIgnorePattern": "^(React|PropTypes|Component)$"}],
"no-unused-vars": [1, {"vars": "all", "args": "none"}],
"import/no-commonjs": 1,
"quotes": 0,
"camelcase": 0,
Expand Down
9 changes: 5 additions & 4 deletions OSX/Metabase/Backend/TaskHealthChecker.m
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
#import "TaskHealthChecker.h"

/// Check out health every this many seconds
static const CGFloat HealthCheckIntervalSeconds = 1.2f;
static const CGFloat HealthCheckIntervalSeconds = 2.0f;

/// This number should be lower than HealthCheckIntervalSeconds so requests don't end up piling up
static const CGFloat HealthCheckRequestTimeout = 0.25f;
static const CGFloat HealthCheckRequestTimeout = 1.75f;

/// After this many seconds of being unhealthy, consider the task timed out so it can be killed
static const CFTimeInterval TimeoutIntervalSeconds = 60.0f;
Expand Down Expand Up @@ -50,7 +50,7 @@ - (void)start {

[self resetTimeout];

dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
self.healthCheckTimer = [NSTimer timerWithTimeInterval:HealthCheckIntervalSeconds target:self selector:@selector(checkHealth) userInfo:nil repeats:YES];
self.healthCheckTimer.tolerance = HealthCheckIntervalSeconds / 2.0f;
[[NSRunLoop mainRunLoop] addTimer:self.healthCheckTimer forMode:NSRunLoopCommonModes];
Expand Down Expand Up @@ -91,8 +91,9 @@ - (void)checkHealth:(void(^)(BOOL healthy))completion {
}

- (void)checkHealth {
// run the health check on the high-priorty GCD queue because it's imperative that it complete so we can get an accurate picture of Mac App health
__weak TaskHealthChecker *weakSelf = self;
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
[weakSelf checkHealth:^(BOOL healthy) {
if (!healthy) NSLog(@"😷");
if (healthy && !weakSelf.healthy) NSLog(@"");
Expand Down
15 changes: 15 additions & 0 deletions docs/operations-guide/start.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,21 @@ If this happens, setting a few JVM options should fix your issue:

Alternatively, you can upgrade to Java 8 instead, which will fix the issue as well.

### Metabase fails to connect to H2 Database on Windows 10

In some situations the Metabase JAR needs to be unblocked so it has permissions to create local files for the application database.

On Windows 10, if you see an error message like

Exception in thread "main" java.lang.AssertionError: Assert failed: Unable to connect to Metabase DB.

when running the JAR, you can unblock the file by right-clicking, clicking "Properties", and then clicking "Unblock".
See Microsoft's documentation [here](https://blogs.msdn.microsoft.com/delay/p/unblockingdownloadedfile/) for more details on unblocking downloaded files.

There are a few other reasons why Metabase might not be able to connect to your H2 DB. Metabase connects to the DB over a TCP port, and it's possible
that something in your `ipconfig` configuration is blocking the H2 port. See the discussion [here](https://github.com/metabase/metabase/issues/1871) for
details on how to resolve this issue.


# Configuring the Metabase Application Database

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/metabase/App.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* @flow weak */

import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import { connect } from "react-redux";

import Navbar from "metabase/nav/containers/Navbar.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { Link } from "react-router";

import ModalContent from "metabase/components/ModalContent.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import cx from "classnames";
import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper.jsx";
import DatabaseDetailsForm from "metabase/components/DatabaseDetailsForm.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import ModalContent from "metabase/components/ModalContent.jsx";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint "react/prop-types": "warn" */
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { connect } from "react-redux";

import MetabaseSettings from "metabase/lib/settings";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { connect } from "react-redux";
import { Link } from "react-router";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";

import cx from "classnames";
import { formDomOnlyProps } from "metabase/lib/redux";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

export default class FormLabel extends Component {
static propTypes = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";

import cx from "classnames";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { Link } from "react-router";

import Icon from "metabase/components/Icon.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import ReactDOM from "react-dom";

import ActionButton from "metabase/components/ActionButton.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import GuiQueryEditor from "metabase/query_builder/components/GuiQueryEditor.jsx";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import Input from "metabase/components/Input.jsx";
import Select from "metabase/components/Select.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import ColumnItem from "./ColumnItem.jsx";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import SaveStatus from "metabase/components/SaveStatus.jsx";
import Toggle from "metabase/components/Toggle.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

export default class MetadataSchema extends Component {
static propTypes = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";

import Icon from "metabase/components/Icon.jsx";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import MetricsList from "./MetricsList.jsx";
import ColumnsList from "./ColumnsList.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import ProgressBar from "metabase/components/ProgressBar.jsx";
import Icon from "metabase/components/Icon.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import MetadataTableList from "./MetadataTableList.jsx";
import MetadataSchemaList from "./MetadataSchemaList.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import ObjectActionSelect from "../ObjectActionSelect.jsx";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { Link } from "react-router";

import MetricItem from "./MetricItem.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import ObjectActionSelect from "../ObjectActionSelect.jsx";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { Link } from "react-router";

import SegmentItem from "./SegmentItem.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper.jsx";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import RevisionDiff from "./RevisionDiff.jsx";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import TextDiff from "./TextDiff.jsx";
import QueryDiff from "./QueryDiff.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import Revision from "./Revision.jsx";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*eslint-env node */

import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import { diffWords } from 'diff';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { connect } from "react-redux";

import _ from "underscore";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import { connect } from "react-redux";
import { push } from "react-router-redux";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import { Link } from "react-router";

import FormLabel from "../components/FormLabel.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import { connect } from "react-redux";

import RevisionHistory from "../components/revisions/RevisionHistory.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import { connect } from "react-redux";
import { push } from "react-router-redux";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import { Link } from "react-router";

import FormLabel from "../components/FormLabel.jsx";
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/metabase/admin/people/components/AddRow.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Component, PropTypes } from "react";
import React from "react";

import cx from "classnames";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint "react/prop-types": "warn" */
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import ReactDOM from "react-dom";

import FormField from "metabase/components/form/FormField.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Component, PropTypes } from "react";
import React from "react";

import CheckBox from "metabase/components/CheckBox.jsx";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Component, PropTypes } from "react";
import React from "react";

import _ from "underscore";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint "react/prop-types": "warn" */
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import Icon from "metabase/components/Icon.jsx";
import MetabaseSettings from "metabase/lib/settings";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint "react/prop-types": "warn" */
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import cx from "classnames";

import Icon from "metabase/components/Icon.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint "react/prop-types": "warn" */
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";

import { LeftNavPane, LeftNavPaneItem } from "metabase/components/LeftNavPane.jsx";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint "react/prop-types": "warn" */
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import PropTypes from "prop-types";
import { Link } from "react-router";
import _ from "underscore";
import { connect } from "react-redux";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable react/display-name */

import React, { Component, PropTypes } from "react";
import React from "react";

import { Grid, ScrollSync } from 'react-virtualized'
import 'react-virtualized/styles.css';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Component, PropTypes } from "react";
import React from "react";

import { inflect } from "metabase/lib/formatting";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Component, PropTypes } from "react";
import React from "react";

import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper.jsx";
import Confirm from "metabase/components/Confirm.jsx";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable react/display-name */

import React, { Component, PropTypes } from "react";
import React, { Component } from "react";

import { Link } from "react-router";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Component, PropTypes } from "react";
import React, { Component } from "react";
import { connect } from "react-redux";

import PermissionsEditor from "../components/PermissionsEditor.jsx";
Expand Down
Loading

0 comments on commit f57f3b4

Please sign in to comment.