Merge pull request #6962 from tamird/ui-next-update

tamird · tamird · commit 5baf8e92732c · 2016-05-31T13:49:29.000-04:00
ui/next: update dependencies
diff --git a/ui/next/app/app.tsx b/ui/next/app/app.tsx
@@ -1,4 +1,4 @@
-/// <reference path="../typings/main.d.ts" />
+/// <reference path="../typings/index.d.ts" />
 
 /**
  * UI/NEXT TODO LIST
diff --git a/ui/next/app/components/graphGroup.tsx b/ui/next/app/components/graphGroup.tsx
@@ -1,9 +1,9 @@
-/// <reference path="../../typings/main.d.ts" />
+/// <reference path="../../typings/index.d.ts" />
 import * as React from "react";
 
 import { MetricsDataProvider } from "../containers/metricsDataProvider";
 
-/** 
+/**
  * GraphGroup is a stateless react component that wraps a group of graphs (the
  * children of this component) in a MetricsDataProvider and some additional tags
  * relevant to the layout of our graphs pages.
diff --git a/ui/next/app/containers/cluster.tsx b/ui/next/app/containers/cluster.tsx
@@ -1,4 +1,4 @@
-/// <reference path="../../typings/main.d.ts" />
+/// <reference path="../../typings/index.d.ts" />
 import * as React from "react";
 
 import { IndexListLink, ListLink } from "../components/listLink.tsx";
diff --git a/ui/next/app/containers/clusterEvents.tsx b/ui/next/app/containers/clusterEvents.tsx
@@ -1,4 +1,4 @@
-/// <reference path="../../typings/main.d.ts" />
+/// <reference path="../../typings/index.d.ts" />
 import * as React from "react";
 
 /**
diff --git a/ui/next/app/containers/clusterOverview.tsx b/ui/next/app/containers/clusterOverview.tsx
@@ -1,4 +1,4 @@
-/// <reference path="../../typings/main.d.ts" />
+/// <reference path="../../typings/index.d.ts" />
 import * as React from "react";
 import * as d3 from "d3";
 import _ = require("lodash");
diff --git a/ui/next/app/containers/databases/databaseDetails.tsx b/ui/next/app/containers/databases/databaseDetails.tsx
@@ -1,4 +1,4 @@
-/// <reference path="../../../typings/main.d.ts" />
+/// <reference path="../../../typings/index.d.ts" />
 import * as React from "react";
 import { Link } from "react-router";
 import * as _ from "lodash";
diff --git a/ui/next/app/containers/databases/databaseList.tsx b/ui/next/app/containers/databases/databaseList.tsx
@@ -1,4 +1,4 @@
-/// <reference path="../../../typings/main.d.ts" />
+/// <reference path="../../../typings/index.d.ts" />
 import * as React from "react";
 import { Link } from "react-router";
 import * as _ from "lodash";
diff --git a/ui/next/app/containers/databases/databases.tsx b/ui/next/app/containers/databases/databases.tsx
@@ -1,4 +1,4 @@
-/// <reference path="../../../typings/main.d.ts" />
+/// <reference path="../../../typings/index.d.ts" />
 import * as React from "react";
 
 /**
diff --git a/ui/next/app/containers/databases/tableDetails.tsx b/ui/next/app/containers/databases/tableDetails.tsx
@@ -1,4 +1,4 @@
-/// <reference path="../../../typings/main.d.ts" />
+/// <reference path="../../../typings/index.d.ts" />
 import * as React from "react";
 import * as _ from "lodash";
 import { connect } from "react-redux";
diff --git a/ui/next/app/containers/helpus.tsx b/ui/next/app/containers/helpus.tsx
@@ -1,4 +1,4 @@
-/// <reference path="../../typings/main.d.ts" />
+/// <reference path="../../typings/index.d.ts" />
 import * as React from "react";
 
 /**
diff --git a/ui/next/app/containers/layout.tsx b/ui/next/app/containers/layout.tsx
@@ -1,4 +1,4 @@
-/// <reference path="../../typings/main.d.ts" />
+/// <reference path="../../typings/index.d.ts" />
 import * as React from "react";
 import _ = require("lodash");
 import { RouteComponentProps } from "react-router";
diff --git a/ui/next/app/containers/metricsDataProvider.tsx b/ui/next/app/containers/metricsDataProvider.tsx
@@ -1,4 +1,4 @@
-/// <reference path="../../typings/main.d.ts" />
+/// <reference path="../../typings/index.d.ts" />
 
 import * as React from "react";
 import { createSelector } from "reselect";
diff --git a/ui/next/app/containers/node.tsx b/ui/next/app/containers/node.tsx
@@ -1,4 +1,4 @@
-/// <reference path="../../typings/main.d.ts" />
+/// <reference path="../../typings/index.d.ts" />
 import * as React from "react";
 import { Link, RouteComponentProps } from "react-router";
 
diff --git a/ui/next/app/containers/nodeGraphs.tsx b/ui/next/app/containers/nodeGraphs.tsx
@@ -1,4 +1,4 @@
-/// <reference path="../../typings/main.d.ts" />
+/// <reference path="../../typings/index.d.ts" />
 import * as React from "react";
 import * as d3 from "d3";
 import { RouteComponentProps } from "react-router";
diff --git a/ui/next/app/containers/nodeLogs.tsx b/ui/next/app/containers/nodeLogs.tsx
@@ -1,4 +1,4 @@
-/// <reference path="../../typings/main.d.ts" />
+/// <reference path="../../typings/index.d.ts" />
 import * as React from "react";
 
 /**
diff --git a/ui/next/app/containers/nodeOverview.tsx b/ui/next/app/containers/nodeOverview.tsx
@@ -1,4 +1,4 @@
-/// <reference path="../../typings/main.d.ts" />
+/// <reference path="../../typings/index.d.ts" />
 import * as React from "react";
 
 /**
diff --git a/ui/next/app/containers/nodes.tsx b/ui/next/app/containers/nodes.tsx
@@ -1,4 +1,4 @@
-/// <reference path="../../typings/main.d.ts" />
+/// <reference path="../../typings/index.d.ts" />
 import * as React from "react";
 
 import { ListLink } from "../components/listLink.tsx";
diff --git a/ui/next/app/containers/nodesGraphs.tsx b/ui/next/app/containers/nodesGraphs.tsx
@@ -1,4 +1,4 @@
-/// <reference path="../../typings/main.d.ts" />
+/// <reference path="../../typings/index.d.ts" />
 import * as React from "react";
 import * as d3 from "d3";
 
diff --git a/ui/next/app/containers/nodesOverview.tsx b/ui/next/app/containers/nodesOverview.tsx
@@ -1,4 +1,4 @@
-/// <reference path="../../typings/main.d.ts" />
+/// <reference path="../../typings/index.d.ts" />
 import * as React from "react";
 import _ = require("lodash");
 import { Link } from "react-router";
diff --git a/ui/next/app/containers/timescale.tsx b/ui/next/app/containers/timescale.tsx
@@ -1,4 +1,4 @@
-/// <reference path="../../typings/main.d.ts" />
+/// <reference path="../../typings/index.d.ts" />
 
 import * as React from "react";
 import { connect } from "react-redux";
diff --git a/ui/next/app/containers/timewindow.tsx b/ui/next/app/containers/timewindow.tsx
@@ -1,4 +1,4 @@
-/// <reference path="../../typings/main.d.ts" />
+/// <reference path="../../typings/index.d.ts" />
 
 import * as React from "react";
 import { connect } from "react-redux";
diff --git a/ui/next/app/redux/databaseInfo.spec.ts b/ui/next/app/redux/databaseInfo.spec.ts
@@ -1,11 +1,12 @@
 import { assert } from "chai";
-import * as databases from "./databaseInfo";
-import * as protos from "../js/protos";
 import * as proxyquire from "proxyquire";
-import { Action } from "../interfaces/action";
 import { Dispatch } from "redux";
 import * as _ from "lodash";
 
+import * as databases from "./databaseInfo";
+import * as protos from "../js/protos";
+import { Action } from "../interfaces/action";
+
 type DatabasesResponse = cockroach.server.DatabasesResponse;
 
 type DatabaseDetailsRequest = cockroach.server.DatabaseDetailsRequest;
diff --git a/ui/next/app/redux/uiData.ts b/ui/next/app/redux/uiData.ts
@@ -1,5 +1,4 @@
 import _ = require("lodash");
-
 import { Dispatch } from "redux";
 import ByteBuffer = require("bytebuffer");
 
diff --git a/ui/next/app/util/api.spec.ts b/ui/next/app/util/api.spec.ts
@@ -1,9 +1,9 @@
 import { assert } from "chai";
 import _ = require("lodash");
 import * as fetchMock from "fetch-mock";
-import * as protos from "../js/protos";
 import Long = require("long");
 
+import * as protos from "../js/protos";
 import * as api from "./api";
 
 describe("rest api", function() {
diff --git a/ui/next/app/util/api.ts b/ui/next/app/util/api.ts
@@ -1,13 +1,14 @@
-/// <reference path="../../typings/main.d.ts" />
+/// <reference path="../../typings/index.d.ts" />
 
 /**
  * This module contains all the REST endpoints for communicating with the admin UI.
  */
 
 import "isomorphic-fetch";
-import * as protos from "../js/protos";
 import * as _ from "lodash";
 
+import * as protos from "../js/protos";
+
 let server = protos.cockroach.server;
 let ts = protos.cockroach.ts;
 
diff --git a/ui/next/app/util/find.ts b/ui/next/app/util/find.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../typings/main.d.ts" />
+/// <reference path="../../typings/index.d.ts" />
 import * as React from "react";
 
 /**
diff --git a/ui/next/app/util/proto.ts b/ui/next/app/util/proto.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../typings/main.d.ts" />
+/// <reference path="../../typings/index.d.ts" />
 import _ = require("lodash");
 
 type NodeStatus = cockroach.server.status.NodeStatus;
diff --git a/ui/next/config.js b/ui/next/config.js
diff --git a/ui/next/npm-shrinkwrap.json b/ui/next/npm-shrinkwrap.json
diff --git a/ui/next/package.json b/ui/next/package.json
diff --git a/ui/next/typings.json b/ui/next/typings.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/// <reference path="../typings/main.d.ts" />`
	`1`	`+/// <reference path="../typings/index.d.ts" />`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* UI/NEXT TODO LIST`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/// <reference path="../../typings/main.d.ts" />`
	`1`	`+/// <reference path="../../typings/index.d.ts" />`
`2`	`2`	`import * as React from "react";`
`3`	`3`
`4`	`4`	`import { IndexListLink, ListLink } from "../components/listLink.tsx";`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/// <reference path="../../../typings/main.d.ts" />`
	`1`	`+/// <reference path="../../../typings/index.d.ts" />`
`2`	`2`	`import * as React from "react";`
`3`	`3`	`import { Link } from "react-router";`
`4`	`4`	`import * as _ from "lodash";`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import _ = require("lodash");`
`2`		`-`
`3`	`2`	`import { Dispatch } from "redux";`
`4`	`3`	`import ByteBuffer = require("bytebuffer");`
`5`	`4`