From 8b5c2cc4096831f4e61a6a095bf7d917a1e56fb8 Mon Sep 17 00:00:00 2001 From: Minasokoni Date: Thu, 13 Jul 2017 21:48:20 -0700 Subject: [PATCH 1/5] moved filter search to layout --- src/core/components/layouts/base.jsx | 26 +++++++++++++++++++++++++- src/plugins/topbar/topbar.jsx | 4 ---- src/style/_layout.scss | 12 ++++++++++++ 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/src/core/components/layouts/base.jsx b/src/core/components/layouts/base.jsx index 3e6c7139..f90dd848 100644 --- a/src/core/components/layouts/base.jsx +++ b/src/core/components/layouts/base.jsx @@ -13,8 +13,13 @@ export default class BaseLayout extends React.Component { getComponent: PropTypes.func.isRequired } + onFilterChange =(e) => { + let {target: {value}} = e + this.props.layoutActions.updateFilter(value) + } + render() { - let { specSelectors, specActions, getComponent } = this.props + let { specSelectors, specActions, getComponent, layoutSelectors } = this.props let info = specSelectors.info() let url = specSelectors.url() @@ -31,6 +36,15 @@ export default class BaseLayout extends React.Component { let Row = getComponent("Row") let Col = getComponent("Col") let Errors = getComponent("errors", true) + + let isLoading = specSelectors.loadingStatus() === "loading" + let isFailed = specSelectors.loadingStatus() === "failed" + let filter = layoutSelectors.currentFilter() + + let inputStyle = {} + if(isFailed) inputStyle.color = "red" + if(isLoading) inputStyle.color = "#aaa" + const Schemes = getComponent("schemes") const isSpecEmpty = !specSelectors.specStr() @@ -57,6 +71,7 @@ export default class BaseLayout extends React.Component { { schemes && schemes.size ? ( ) : null } + { securityDefinitions ? ( ) : null } @@ -64,6 +79,15 @@ export default class BaseLayout extends React.Component { ) : null } + { + filter === null || filter === false ? null : +
+ + + +
+ } + diff --git a/src/plugins/topbar/topbar.jsx b/src/plugins/topbar/topbar.jsx index 314e1d4e..c764e54f 100644 --- a/src/plugins/topbar/topbar.jsx +++ b/src/plugins/topbar/topbar.jsx @@ -135,10 +135,6 @@ export default class Topbar extends React.Component { Swagger UX swagger - { - filter === null || filter === false ? null : - - }
{control}
diff --git a/src/style/_layout.scss b/src/style/_layout.scss index 78e09249..61efe855 100644 --- a/src/style/_layout.scss +++ b/src/style/_layout.scss @@ -327,6 +327,18 @@ body } } +.filter +{ + .operation-filter-input + { + width: 100%; + margin: 20px 0; + padding: 10px 10px; + + border: 2px solid #d8dde7; + } +} + .tab { From d7c28912e07f49ce16b0ff8a5073cca189b5f356 Mon Sep 17 00:00:00 2001 From: Minasokoni Date: Thu, 13 Jul 2017 21:50:19 -0700 Subject: [PATCH 2/5] updated input styling --- src/style/_topbar.scss | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/style/_topbar.scss b/src/style/_topbar.scss index b1427c78..d3b76aa6 100644 --- a/src/style/_topbar.scss +++ b/src/style/_topbar.scss @@ -29,12 +29,6 @@ padding: 0 10px; } } - .operation-filter-input - { - border: 2px solid #547f00; - border-right: none; - border-radius: 4px 0 0 4px; - } .download-url-wrapper { @@ -49,7 +43,6 @@ margin: 0; border: 2px solid #547f00; - border-radius: 0 0 0 0; outline: none; } From d698aef1cde3e574e3be81b228a50a2a333fec76 Mon Sep 17 00:00:00 2001 From: shockey Date: Thu, 13 Jul 2017 21:57:49 -0700 Subject: [PATCH 3/5] "Filter Operations" -> "Filter by tag" --- src/core/components/layouts/base.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/components/layouts/base.jsx b/src/core/components/layouts/base.jsx index f90dd848..bbd7edbd 100644 --- a/src/core/components/layouts/base.jsx +++ b/src/core/components/layouts/base.jsx @@ -83,7 +83,7 @@ export default class BaseLayout extends React.Component { filter === null || filter === false ? null :
- +
} From 2ae61e85b8f673c85ea0e05b2d5a09978c6da288 Mon Sep 17 00:00:00 2001 From: shockey Date: Thu, 13 Jul 2017 22:00:16 -0700 Subject: [PATCH 4/5] Update base.jsx --- src/core/components/layouts/base.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/components/layouts/base.jsx b/src/core/components/layouts/base.jsx index bbd7edbd..f502b88f 100644 --- a/src/core/components/layouts/base.jsx +++ b/src/core/components/layouts/base.jsx @@ -83,7 +83,7 @@ export default class BaseLayout extends React.Component { filter === null || filter === false ? null :
- +
} From f916e3c208bcfb4e3a460f470f3d97ce2820fe56 Mon Sep 17 00:00:00 2001 From: shockey Date: Thu, 13 Jul 2017 22:19:17 -0700 Subject: [PATCH 5/5] Topbar: Remove unused `filter` and `layoutSelectors` --- src/plugins/topbar/topbar.jsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugins/topbar/topbar.jsx b/src/plugins/topbar/topbar.jsx index c764e54f..fd3654bb 100644 --- a/src/plugins/topbar/topbar.jsx +++ b/src/plugins/topbar/topbar.jsx @@ -7,7 +7,6 @@ import Logo from "./logo_small.png" export default class Topbar extends React.Component { static propTypes = { - layoutSelectors: PropTypes.object.isRequired, layoutActions: PropTypes.object.isRequired } @@ -91,13 +90,12 @@ export default class Topbar extends React.Component { } render() { - let { getComponent, specSelectors, getConfigs, layoutSelectors } = this.props + let { getComponent, specSelectors, getConfigs } = this.props const Button = getComponent("Button") const Link = getComponent("Link") let isLoading = specSelectors.loadingStatus() === "loading" let isFailed = specSelectors.loadingStatus() === "failed" - let filter = layoutSelectors.currentFilter() let inputStyle = {} if(isFailed) inputStyle.color = "red"