Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3470 from influxdata/fixes/replace-fixed-data-table 

Replace fixed-data-table with fixed-data-table-2
pull/10616/head
Brandon Farmer 2018-05-16 10:34:55 -07:00 committed by GitHub
parent eca3f5c707 de559b32b6
commit 83ba3ffa61
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/package.json
View File

@ -129,7 +129,7 @@
"enzyme-adapter-react-16": "^1.1.1", "enzyme-adapter-react-16": "^1.1.1",
"eslint-plugin-babel": "^4.1.2", "eslint-plugin-babel": "^4.1.2",
"fast.js": "^0.1.1", "fast.js": "^0.1.1",
"fixed-data-table": "^0.6.1", "fixed-data-table-2": "^0.8.13",
"he": "^1.1.1", "he": "^1.1.1",
"lodash": "^4.3.0", "lodash": "^4.3.0",
"moment": "^2.13.0", "moment": "^2.13.0",

2
ui/src/data_explorer/components/Table.tsx
View File

@ -3,7 +3,7 @@ import React, {PureComponent, CSSProperties} from 'react'
import Dimensions from 'react-dimensions' import Dimensions from 'react-dimensions'
import _ from 'lodash' import _ from 'lodash'
import {Table, Column, Cell} from 'fixed-data-table' import {Table, Column, Cell} from 'fixed-data-table-2'
import Dropdown from 'src/shared/components/Dropdown' import Dropdown from 'src/shared/components/Dropdown'
import CustomCell from 'src/data_explorer/components/CustomCell' import CustomCell from 'src/data_explorer/components/CustomCell'
import TabItem from 'src/data_explorer/components/TableTabItem' import TabItem from 'src/data_explorer/components/TableTabItem'

14
ui/yarn.lock
View File

@ -2151,7 +2151,7 @@ create-jest-runner@^0.3.0:
throat "4.1.0" throat "4.1.0"
worker-farm "1.5.0" worker-farm "1.5.0"
create-react-class@^15.5.1, create-react-class@^15.5.x, create-react-class@^15.6.2: create-react-class@^15.5.1, create-react-class@^15.5.2, create-react-class@^15.5.x:
version "15.6.3" version "15.6.3"
resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036" resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036"
dependencies: dependencies:
@ -3459,12 +3459,12 @@ find-up@^2.0.0, find-up@^2.1.0:
dependencies: dependencies:
locate-path "^2.0.0" locate-path "^2.0.0"
fixed-data-table@^0.6.1: fixed-data-table-2@^0.8.13:
version "0.6.5" version "0.8.13"
resolved "https://registry.yarnpkg.com/fixed-data-table/-/fixed-data-table-0.6.5.tgz#10f83adcf29f5fcf3f465b22ff297aba34c17b26" resolved "https://registry.yarnpkg.com/fixed-data-table-2/-/fixed-data-table-2-0.8.13.tgz#d08bbb19917d9f6c819f9d020fd23d1263272cb6"
dependencies: dependencies:
create-react-class "^15.6.2" create-react-class "^15.5.2"
prop-types "^15.5.0" prop-types "^15.5.8"
flat-cache@^1.2.1: flat-cache@^1.2.1:
version "1.3.0" version "1.3.0"
@ -6955,7 +6955,7 @@ prop-types@15.5.8:
dependencies: dependencies:
fbjs "^0.8.9" fbjs "^0.8.9"
prop-types@15.x, prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.6.0, prop-types@^15.6.1: prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1:
version "15.6.1" version "15.6.1"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
dependencies: dependencies: