Commit 50e108a8 authored by Aaron Petkau's avatar Aaron Petkau

Merge branch 'fronted-packages-updates' into 'development'

Updated frontend dependencies

See merge request !1431
parents b1df782a cdefd798
Pipeline #7938 failed with stage
in 75 minutes
......@@ -30,6 +30,7 @@ Changes
* [Sync]: Project sync date will be updated at start of sync job to stop quickly repeating errored syncs.
* [UI]: IRIDA will now remove local samples when a synchronized remote sample is removed at its source.
* [UI]: New project line list page with inline editing.
* [Developer]: Updated Node, Yarn, and front-end webpack packages.
0.21.0 to 0.22.0
----------------
......
......@@ -1103,8 +1103,8 @@
<maven.site.plugin.version>3.4</maven.site.plugin.version>
<errorprone.version>2.5</errorprone.version>
<frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
<node.version>v8.10.0</node.version>
<yarn.version>v1.9.2</yarn.version>
<node.version>v10.13.0</node.version>
<yarn.version>v1.12.3</yarn.version>
<jgravatar.version>1.0</jgravatar.version>
<!-- project configuration -->
......
......@@ -3,15 +3,11 @@ module.exports = {
"eslint:recommended",
"plugin:import/errors",
"plugin:react/recommended",
"plugin:prettier/recommended",
"plugin:jsx-a11y/recommended",
"prettier",
"prettier/react"
],
plugins: [
"react",
"import",
"jsx-a11y"
],
plugins: ["react", "import", "jsx-a11y"],
parserOptions: {
ecmaVersion: 2018,
sourceType: "module",
......
......@@ -18,6 +18,7 @@
"last 2 versions"
],
"dependencies": {
"@babel/polyfill": "^7.0.0",
"@bassettsj/livestamp": "^2.0.0",
"@fortawesome/fontawesome-free": "^5.2.0",
"ag-grid": "^18.1.2",
......@@ -60,7 +61,7 @@
"phylocanvas": "^2.8.1",
"phylocanvas-plugin-export-svg": "^1.0.0",
"phylocanvas-plugin-metadata": "^2.0.1",
"prop-types": "^15.6.1",
"prop-types": "^15.6.2",
"qs": "^6.5.2",
"react": "16.6.0",
"react-dom": "16.6.0",
......@@ -79,9 +80,9 @@
"xlsx": "^0.13.0"
},
"devDependencies": {
"@babel/core": "^7.0.0",
"@babel/plugin-proposal-class-properties": "^7.0.0",
"@babel/plugin-proposal-decorators": "^7.0.0",
"@babel/core": "^7.1.5",
"@babel/plugin-proposal-class-properties": "^7.1.0",
"@babel/plugin-proposal-decorators": "^7.1.2",
"@babel/plugin-proposal-export-namespace-from": "^7.0.0",
"@babel/plugin-proposal-function-sent": "^7.0.0",
"@babel/plugin-proposal-json-strings": "^7.0.0",
......@@ -89,43 +90,41 @@
"@babel/plugin-proposal-throw-expressions": "^7.0.0",
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
"@babel/plugin-syntax-import-meta": "^7.0.0",
"@babel/polyfill": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-env": "^7.1.5",
"@babel/preset-react": "^7.0.0",
"autoprefixer": "^8.6.2",
"autoprefixer": "^9.3.1",
"babel-eslint": "^10.0.1",
"babel-loader": "^8.0.0",
"babel-plugin-import": "^1.7.0",
"babel-loader": "^8.0.4",
"babel-plugin-import": "^1.11.0",
"bootstrap-sass": "^3.3.7",
"bower": "^1.7.7",
"chromedriver": "2.33",
"clean-webpack-plugin": "^0.1.19",
"css-loader": "^0.28.11",
"cssnano": "^3.10.0",
"eslint": "5.6.0",
"eslint-config-prettier": "^3.0.1",
"eslint-loader": "2.1.0",
"eslint": "5.8.0",
"eslint-config-prettier": "^3.1.0",
"eslint-loader": "2.1.1",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jsx-a11y": "^6.1.1",
"eslint-plugin-jsx-a11y": "^6.1.2",
"eslint-plugin-prettier": "3.0.0",
"eslint-plugin-react": "^7.11.1",
"file-loader": "^1.1.11",
"husky": "^0.14.3",
"lint-staged": "^7.2.0",
"mini-css-extract-plugin": "^0.4.0",
"husky": "^1.1.3",
"lint-staged": "^8.0.4",
"mini-css-extract-plugin": "^0.4.4",
"node-sass": "^4.9.0",
"optimize-css-assets-webpack-plugin": "^4.0.2",
"postcss-loader": "^2.1.5",
"prettier": "^1.13.7",
"prop-types": "^15.6.1",
"resolve-url-loader": "^2.3.0",
"sass-loader": "^7.0.3",
"optimize-css-assets-webpack-plugin": "^5.0.1",
"postcss-loader": "^2.1.6",
"prettier": "^1.15.1",
"resolve-url-loader": "^3.0.0",
"sass-loader": "^7.1.0",
"source-map-loader": "^0.2.4",
"style-loader": "^0.21.0",
"uglifyjs-webpack-plugin": "^1.2.5",
"url-loader": "^1.0.1",
"webpack": "^4.17.2",
"webpack-cli": "^3.1.0",
"style-loader": "^0.23.1",
"uglifyjs-webpack-plugin": "^2.0.1",
"url-loader": "^1.1.2",
"webpack": "^4.25.1",
"webpack-cli": "^3.1.2",
"webpack-merge": "^4.1.4"
}
}
......@@ -12,8 +12,8 @@ export function SelectedCount(props) {
{props.count === 0
? i18n.linelist.selected.none
: props.count === 1
? i18n.linelist.selected.one
: i18n.linelist.selected.multiple.replace("_COUNT_", props.count)}
? i18n.linelist.selected.one
: i18n.linelist.selected.multiple.replace("_COUNT_", props.count)}
</span>
);
}
......
......@@ -147,8 +147,8 @@ export class LineListLayoutComponent extends React.Component {
this.state.filterCount
? this.state.filterCount
: this.props.entries
? this.props.entries.size
: 0
? this.props.entries.size
: 0
}
totalSamples={this.props.entries ? this.props.entries.size : 0}
/>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment