From 9376110176f929d1a6ff05c92cd3442e61c4abdb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jan 2022 08:26:40 +0000 Subject: [PATCH 01/11] :arrow_up: Bump follow-redirects from 1.14.1 to 1.14.7 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.1 to 1.14.7. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.1...v1.14.7) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 22067f1..0ebf77f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4794,9 +4794,9 @@ flatted@^3.1.0: integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== follow-redirects@^1.0.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43" - integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg== + version "1.14.7" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" + integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== font-awesome@^4.7.0: version "4.7.0" From b3cb23e641b51e8380dbdb59f189d8c99bc16a00 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 22 Jan 2022 03:27:06 +0000 Subject: [PATCH 02/11] :arrow_up: Bump nanoid from 3.1.23 to 3.2.0 Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.23 to 3.2.0. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.1.23...3.2.0) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 0ebf77f..ba2b92b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6940,9 +6940,9 @@ nan@^2.12.1: integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== nanoid@^3.1.23: - version "3.1.23" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81" - integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw== + version "3.2.0" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c" + integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA== nanomatch@^1.2.9: version "1.2.13" From 008cb1524fd529c3c617f2095a7787280da89864 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 13 Feb 2022 11:07:18 +0000 Subject: [PATCH 03/11] :arrow_up: Bump follow-redirects from 1.14.7 to 1.14.8 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index ba2b92b..d2f5d3e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4794,9 +4794,9 @@ flatted@^3.1.0: integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== follow-redirects@^1.0.0: - version "1.14.7" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" - integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== + version "1.14.8" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" + integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA== font-awesome@^4.7.0: version "4.7.0" From 0eadc3b63b4d6f5d31c476b53ffadd1ba8ad1949 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 19 Feb 2022 00:48:33 +0000 Subject: [PATCH 04/11] :arrow_up: Bump url-parse from 1.5.3 to 1.5.7 Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.3 to 1.5.7. - [Release notes](https://github.com/unshiftio/url-parse/releases) - [Commits](https://github.com/unshiftio/url-parse/compare/1.5.3...1.5.7) --- updated-dependencies: - dependency-name: url-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index d2f5d3e..a825df2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10120,9 +10120,9 @@ url-parse-lax@^3.0.0: prepend-http "^2.0.0" url-parse@^1.4.3, url-parse@^1.5.1: - version "1.5.3" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862" - integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ== + version "1.5.7" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.7.tgz#00780f60dbdae90181f51ed85fb24109422c932a" + integrity sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA== dependencies: querystringify "^2.1.1" requires-port "^1.0.0" From ac4e3ea6be9f09a9f7e36ffe3bc0177a13d98542 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Feb 2022 04:42:47 +0000 Subject: [PATCH 05/11] :arrow_up: Bump url-parse from 1.5.7 to 1.5.10 Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.7 to 1.5.10. - [Release notes](https://github.com/unshiftio/url-parse/releases) - [Commits](https://github.com/unshiftio/url-parse/compare/1.5.7...1.5.10) --- updated-dependencies: - dependency-name: url-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index a825df2..c7eeaa8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10120,9 +10120,9 @@ url-parse-lax@^3.0.0: prepend-http "^2.0.0" url-parse@^1.4.3, url-parse@^1.5.1: - version "1.5.7" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.7.tgz#00780f60dbdae90181f51ed85fb24109422c932a" - integrity sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA== + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== dependencies: querystringify "^2.1.1" requires-port "^1.0.0" From b5dcc7126749cc0073d93f91054c1f8361ee29b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Mar 2022 01:24:49 +0000 Subject: [PATCH 06/11] :arrow_up: Bump plist from 3.0.2 to 3.0.4 Bumps [plist](https://github.com/TooTallNate/node-plist) from 3.0.2 to 3.0.4. - [Release notes](https://github.com/TooTallNate/node-plist/releases) - [Changelog](https://github.com/TooTallNate/plist.js/blob/master/History.md) - [Commits](https://github.com/TooTallNate/node-plist/commits) --- updated-dependencies: - dependency-name: plist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/yarn.lock b/yarn.lock index c7eeaa8..e05b6b3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7752,13 +7752,12 @@ pkg-up@^3.1.0: find-up "^3.0.0" plist@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.2.tgz#74bbf011124b90421c22d15779cee60060ba95bc" - integrity sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ== + version "3.0.4" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz#a62df837e3aed2bb3b735899d510c4f186019cbe" + integrity sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg== dependencies: base64-js "^1.5.1" xmlbuilder "^9.0.7" - xmldom "^0.5.0" plur@^2.1.2: version "2.1.2" @@ -10574,11 +10573,6 @@ xmlbuilder@^9.0.7, xmlbuilder@~9.0.1: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= -xmldom@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e" - integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA== - xregexp@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" From 54fab6ae3688fc37e5d3c68bafb3da8dc7e8d0be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 00:14:15 +0000 Subject: [PATCH 07/11] :arrow_up: Bump minimist from 1.2.5 to 1.2.6 in /c-pac Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- c-pac/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/c-pac/yarn.lock b/c-pac/yarn.lock index 93c8dbc..54368a2 100644 --- a/c-pac/yarn.lock +++ b/c-pac/yarn.lock @@ -1905,9 +1905,9 @@ mime-types@^2.1.27: mime-db "1.47.0" minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== ms@2.0.0: version "2.0.0" From 2a9942877133bb600fd28499a3b32edaf4924a92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 13:11:36 +0000 Subject: [PATCH 08/11] :arrow_up: Bump minimist from 1.2.5 to 1.2.6 Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index e05b6b3..df86469 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6867,9 +6867,9 @@ minimist-options@4.1.0: kind-of "^6.0.3" minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: version "2.9.0" From 70ac39cf4479a93a4e84b253bb3b2ef4f46cac43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 13:18:56 +0000 Subject: [PATCH 09/11] :arrow_up: Bump plist from 3.0.4 to 3.0.5 Bumps [plist](https://github.com/TooTallNate/node-plist) from 3.0.4 to 3.0.5. - [Release notes](https://github.com/TooTallNate/node-plist/releases) - [Changelog](https://github.com/TooTallNate/plist.js/blob/master/History.md) - [Commits](https://github.com/TooTallNate/node-plist/commits) --- updated-dependencies: - dependency-name: plist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index e05b6b3..dcc4aa7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7752,9 +7752,9 @@ pkg-up@^3.1.0: find-up "^3.0.0" plist@^3.0.1: - version "3.0.4" - resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz#a62df837e3aed2bb3b735899d510c4f186019cbe" - integrity sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg== + version "3.0.5" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.5.tgz#2cbeb52d10e3cdccccf0c11a63a85d830970a987" + integrity sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA== dependencies: base64-js "^1.5.1" xmlbuilder "^9.0.7" From 5ad6968d6b024191e6426253ee81e464b0f2ba88 Mon Sep 17 00:00:00 2001 From: Jon Clucas Date: Tue, 30 Aug 2022 17:10:19 -0400 Subject: [PATCH 10/11] :bug: Strip '.dev' before checking semver --- app/components/PipelineCard.jsx | 189 +++++++++++++------------------- app/components/PipelineStep.jsx | 32 ++++++ 2 files changed, 107 insertions(+), 114 deletions(-) create mode 100644 app/components/PipelineStep.jsx diff --git a/app/components/PipelineCard.jsx b/app/components/PipelineCard.jsx index b1dad22..bde9acd 100644 --- a/app/components/PipelineCard.jsx +++ b/app/components/PipelineCard.jsx @@ -1,20 +1,16 @@ import React, { Component } from 'react'; -import { connect } from 'react-redux'; -import { withRouter, Link } from 'react-router-dom'; +import { withRouter } from 'react-router-dom'; import Immutable from 'immutable'; import PropTypes from 'prop-types'; import semver from 'semver'; -import clsx from 'clsx' -import { formatMs, withStyles } from '@material-ui/core/styles'; +import { withStyles } from '@material-ui/core/styles'; import { Map } from 'immutable'; -import Grid from '@material-ui/core/Grid'; import Card from '@material-ui/core/Card'; import CardHeader from '@material-ui/core/CardHeader'; -import CardMedia from '@material-ui/core/CardMedia'; import CardContent from '@material-ui/core/CardContent'; import CardActions from '@material-ui/core/CardActions'; @@ -22,28 +18,14 @@ import List from '@material-ui/core/List'; import ListItem from '@material-ui/core/ListItem'; import ListItemIcon from '@material-ui/core/ListItemIcon'; import ListItemText from '@material-ui/core/ListItemText'; -import ListItemSecondaryAction from '@material-ui/core/ListItemSecondaryAction'; - -import Typography from '@material-ui/core/Typography'; import Avatar from '@material-ui/core/Avatar'; import IconButton from '@material-ui/core/IconButton'; -import Button from '@material-ui/core/Button'; import Tooltip from '@material-ui/core/Tooltip'; import { - EnvironmentIcon, PipelineIcon, - PipelineStepIcon, - PipelineExecutionTimeIcon, - SubjectIcon, - RunIcon, - LaunchIcon, - SettingsIcon, NavigateNextIcon, PlayArrowIcon, - TimerIcon, - LogIcon, - BrainIcon, DeleteIcon, DeprecatedIcon, DownloadIcon, @@ -51,12 +33,18 @@ import { } from './icons'; import { formatLabel } from '../containers/pipeline/parts/PipelinePart'; import { isADefault } from '../containers/PipelinePage'; +import PipelineStep from './PipelineStep'; import cpac from '@internal/c-pac'; const cardSteps = ['anatomical_preproc', 'functional_preproc', 'surface_analysis']; -/** A card component to show a pipeline configuration available to view/edit, duplicate, and/or delete. */ +function stripDevSuffix(version) { + return version.endsWith('.dev') ? version.slice(0, -4) : version; +} + +/** A card component to show a pipeline configuration available to view/edit, duplicate, and/or + * delete. */ class PipelineCard extends Component { static propTypes = { /** Inherited style */ @@ -100,36 +88,36 @@ class PipelineCard extends Component { const configuration = pipeline.getIn(['versions', version, 'configuration']); const cpacVersion = pipeline.getIn(['versions', version, 'version']); - var blob = new Blob( + const blob = new Blob( [cpac.pipeline.dump( configuration.toJS(), pipelineName, version, cpacVersion )], - { type: "text/yaml;charset=utf-8" } + { type: 'text/yaml;charset=utf-8' } ); - var anchor = document.createElement('a'); + const anchor = document.createElement('a'); anchor.href = window.URL.createObjectURL(blob); anchor.target = '_blank'; - anchor.download = pipelineName + '.yml' + anchor.download = `${pipelineName}.yml`; anchor.click(); } handleOpen = (pipeline) => { - this.props.history.push(`/pipelines/${pipeline}`) + this.props.history.push(`/pipelines/${pipeline}`); } render() { - const { classes, pipeline } = this.props + const { classes, pipeline } = this.props; const pipelineIsADefault = isADefault(pipeline.get('id')); - let versionId = '0' - const versions = pipeline.get('versions') - if (!versions.has("0")) { - versionId = versions.keySeq().max() + let versionId = '0'; + const versions = pipeline.get('versions'); + if (!versions.has('0')) { + versionId = versions.keySeq().max(); } - const version = versions.get(versionId) - const configuration = version.getIn(['configuration', ]); + const version = versions.get(versionId); + const configuration = version.getIn(['configuration']); let derivatives = []; Object.keys(configuration.toJS()).forEach(step => { @@ -138,15 +126,15 @@ class PipelineCard extends Component { } else { const tabStep = configuration.getIn([step]); if (Map.isMap(tabStep)) { - let [...stepKeys] = tabStep.keys(); + const [...stepKeys] = tabStep.keys(); if (stepKeys.includes('run')) { const runswitch = configuration.getIn([step, 'run']); if ( - !cardSteps.includes(step) && - runswitch && - ( - typeof(runswitch) === 'boolean' || - (Array.isArray(runswitch) && runswitch.includes(true)) + !cardSteps.includes(step) + && runswitch + && ( + typeof runswitch === 'boolean' + || (Array.isArray(runswitch) && runswitch.includes(true)) ) ) { derivatives.push(step); } } @@ -154,43 +142,43 @@ class PipelineCard extends Component { console.warn(`Tab "${step}" seems to be malformed in pipeline "${pipeline.get('name')}"`); } } - }) + }); derivatives = Array.from(derivatives); derivatives = derivatives ? derivatives.length : 0; let cardSubheader = `C-PAC ${version.get('version')}`; - if (configuration.hasOwnProperty('importedPipeline')) { - cardSubheader = `FROM '${configuration.importedPipeline}' (${cardSubheader})` + if (Object.prototype.hasOwnProperty.call(configuration, 'importedPipeline')) { + cardSubheader = `FROM '${configuration.importedPipeline}' (${cardSubheader})`; } - if (semver.gte(version.get('version'), '1.8.0')) { + if (semver.gte(stripDevSuffix(version.get('version')), '1.8.0')) { return ( - } + )} title={pipeline.get('name')} subheader={cardSubheader} /> - {cardSteps.map(step =>{ + {cardSteps.map(step => { const runKey = 'run'; return ( - ) + ); })} @@ -202,14 +190,13 @@ class PipelineCard extends Component { - { !pipelineIsADefault ? + { !pipelineIsADefault ? ( this.props.onDelete(pipeline.get('id'))}> - : null - } + ) : null } this.handleOpen(pipeline.get('id'))}> @@ -218,74 +205,48 @@ class PipelineCard extends Component { - ) - } else { - return ( - - - - - } - title={pipeline.get('name')} - subheader={cardSubheader} - /> - + ); + } + return ( + + + + + )} + title={pipeline.get('name')} + subheader={cardSubheader} + /> + - + - + - - - - - this.handleDownload(pipeline.get('id'))}> - - - - - - this.props.onDelete(pipeline.get('id'))}> - - - - - - - ) - }; - } -} - -/** A row to indicate s broad pipeline step on a pipeline card */ -class PipelineStep extends Component { - static propTypes = { - /** Whether the step is On in the pipeline configuration */ - stepKey: PropTypes.bool.isRequired, - /** Text to display for step */ - label: PropTypes.string, - /** Inherited style */ - classes: PropTypes.object - } - - render() { - const { stepKey, label, classes } = this.props; - const enabledStyle = {root: stepKey ? classes.featEnabled : classes.featDisabled}; - return ( - - - - - - - ) + + + + + this.handleDownload(pipeline.get('id'))}> + + + + + + this.props.onDelete(pipeline.get('id'))}> + + + + + + + ); } } export default withRouter(withStyles(PipelineCard.styles)(PipelineCard)); -export { cardSteps }; \ No newline at end of file +export { cardSteps }; diff --git a/app/components/PipelineStep.jsx b/app/components/PipelineStep.jsx new file mode 100644 index 0000000..9581fdd --- /dev/null +++ b/app/components/PipelineStep.jsx @@ -0,0 +1,32 @@ +/** A row to indicate a broad pipeline step on a pipeline card */ +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; + +import { ListItem, ListItemIcon, ListItemText } from '@material-ui/core'; +import { PipelineStepIcon } from './icons'; + +class PipelineStep extends Component { + static propTypes = { + /** Whether the step is On in the pipeline configuration */ + stepKey: PropTypes.bool.isRequired, + /** Text to display for step */ + label: PropTypes.string, + /** Inherited style */ + classes: PropTypes.object + } + + render() { + const { stepKey, label, classes } = this.props; + const enabledStyle = {root: stepKey ? classes.featEnabled : classes.featDisabled}; + return ( + + + + + + + ); + } +} + +export default PipelineStep; From c736d17f7aa3ad4baa97d5c6e22b23685319c701 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 21:35:57 +0000 Subject: [PATCH 11/11] :arrow_up: Bump decode-uri-component from 0.2.0 to 0.2.2 Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2. - [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases) - [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2) --- updated-dependencies: - dependency-name: decode-uri-component dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 24b1647..c02382e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3457,9 +3457,9 @@ decamelize@^1.1.0, decamelize@^1.2.0: integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= + version "0.2.2" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" + integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ== decompress-response@^3.3.0: version "3.3.0"