From 8a15b4134b6146b9d28d273c0bdfc27173c71519 Mon Sep 17 00:00:00 2001 From: ocshawn Date: Tue, 30 Mar 2021 22:43:52 -0500 Subject: [PATCH 1/3] feat/removeEmptyFieldLists: add hideEmptyFilterSection flag --- src/components/ConnectedFilter/index.jsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/ConnectedFilter/index.jsx b/src/components/ConnectedFilter/index.jsx index e3b7d9cf..7b62a4f3 100644 --- a/src/components/ConnectedFilter/index.jsx +++ b/src/components/ConnectedFilter/index.jsx @@ -232,6 +232,7 @@ class ConnectedFilter extends React.Component { this.state.initialAggsData, this.state.adminAppliedPreFilters, this.props.guppyConfig, this.arrayFields) } + hideEmptyFilterSection={this.props.hideEmptyFilterSection} tierAccessLimit={this.props.tierAccessLimit} lockedTooltipMessage={this.props.lockedTooltipMessage} disabledTooltipMessage={this.props.disabledTooltipMessage} @@ -306,6 +307,7 @@ ConnectedFilter.propTypes = { accessibleFieldCheckList: PropTypes.arrayOf(PropTypes.string), hideZero: PropTypes.bool, hidden: PropTypes.bool, + hideEmptyFilterSection: PropTypes.bool, }; ConnectedFilter.defaultProps = { @@ -322,6 +324,7 @@ ConnectedFilter.defaultProps = { accessibleFieldCheckList: undefined, hideZero: false, hidden: false, + hideEmptyFilterSection: false, }; export default ConnectedFilter; From e2f6026483983f15629a69e017c17574f64fd9c4 Mon Sep 17 00:00:00 2001 From: ocshawn Date: Wed, 31 Mar 2021 16:55:19 -0500 Subject: [PATCH 2/3] feat/removeEmptyFieldLists: updating ui-component to version 0.7.0 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2c890b0e..9daba37b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "ISC", "dependencies": { "@elastic/elasticsearch": "^7.0.0-rc.1", - "@gen3/ui-component": "^0.6.5", + "@gen3/ui-component": "^0.7.0", "apollo-server": "^2.4.8", "apollo-server-express": "^2.4.8", "array.prototype.flat": "^1.2.2", @@ -1565,9 +1565,9 @@ "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" }, "node_modules/@gen3/ui-component": { - "version": "0.6.6", - "resolved": "https://registry.npmjs.org/@gen3/ui-component/-/ui-component-0.6.6.tgz", - "integrity": "sha512-OcO8syLCYWrSeIB2v3ss4LGWHfivrG+SLQklzNj+jxm6xIMkk6/2Bn8hXVvuky9TDMkOF+S2IXOzqsV0hApUUQ==", + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@gen3/ui-component/-/ui-component-0.7.0.tgz", + "integrity": "sha512-euKgWcIkBYd24V4l/pbQJJnyeIVfQ2nnXQsvdLnb2mB/1dhIdyBGLegSw15oPFSSustllC7FHjglQRGyO/5DvQ==", "dependencies": { "@storybook/addon-actions": "^5.0.0", "@storybook/react": "^5.0.0", @@ -28660,9 +28660,9 @@ "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" }, "@gen3/ui-component": { - "version": "0.6.6", - "resolved": "https://registry.npmjs.org/@gen3/ui-component/-/ui-component-0.6.6.tgz", - "integrity": "sha512-OcO8syLCYWrSeIB2v3ss4LGWHfivrG+SLQklzNj+jxm6xIMkk6/2Bn8hXVvuky9TDMkOF+S2IXOzqsV0hApUUQ==", + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@gen3/ui-component/-/ui-component-0.7.0.tgz", + "integrity": "sha512-euKgWcIkBYd24V4l/pbQJJnyeIVfQ2nnXQsvdLnb2mB/1dhIdyBGLegSw15oPFSSustllC7FHjglQRGyO/5DvQ==", "requires": { "@storybook/addon-actions": "^5.0.0", "@storybook/react": "^5.0.0", diff --git a/package.json b/package.json index ae495e91..0085d221 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "homepage": "https://github.com/uc-cdis/guppy#readme", "dependencies": { "@elastic/elasticsearch": "^7.0.0-rc.1", - "@gen3/ui-component": "^0.6.5", + "@gen3/ui-component": "^0.7.0", "apollo-server": "^2.4.8", "apollo-server-express": "^2.4.8", "array.prototype.flat": "^1.2.2", From e955976dcc935f1fdaf6e606c7b1d1259e24e85d Mon Sep 17 00:00:00 2001 From: ocshawn Date: Wed, 31 Mar 2021 16:55:32 -0500 Subject: [PATCH 3/3] 0.11.3 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9daba37b..11162812 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@gen3/guppy", - "version": "0.11.2", + "version": "0.11.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@gen3/guppy", - "version": "0.11.2", + "version": "0.11.3", "license": "ISC", "dependencies": { "@elastic/elasticsearch": "^7.0.0-rc.1", diff --git a/package.json b/package.json index 0085d221..08e56c30 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@gen3/guppy", - "version": "0.11.2", + "version": "0.11.3", "description": "Server that support GraphQL queries on data from elasticsearch", "main": "src/server/server.js", "directories": {