From ee95ad0b6849f9e322644ad17f3512316fd34416 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Tue, 28 Jul 2020 16:55:49 -0700 Subject: [PATCH 1/8] Add caret to menu and hide pagination in list viewer, both based on properties passed on creation --- .../interface/listViewer/ListViewer.js | 2 +- js/components/interface/menu/MenuSection.js | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/js/components/interface/listViewer/ListViewer.js b/js/components/interface/listViewer/ListViewer.js index 5f8fa6cc1..b1ddf92e1 100644 --- a/js/components/interface/listViewer/ListViewer.js +++ b/js/components/interface/listViewer/ListViewer.js @@ -265,7 +265,7 @@ export default class ListViewer extends React.Component { return ({ Table, Pagination, Filter, SettingsWrapper }) => (
- + { this.props.showPagination === true ? : null } ); } diff --git a/js/components/interface/menu/MenuSection.js b/js/components/interface/menu/MenuSection.js index 56e2ee2a7..baa0c2612 100644 --- a/js/components/interface/menu/MenuSection.js +++ b/js/components/interface/menu/MenuSection.js @@ -108,7 +108,22 @@ class MenuSection extends React.Component { onClick={this.handleClick} onMouseOver={this.handleOver} onMouseOut={this.handleOut}> - {this.props.button.icon !== "" ? : undefined} + { this.props.button.icon !== "" + ? this.props.button.caret + ? this.props.button.caret.show + ? + + + + : undefined + : + + + : undefined + } {this.props.button.label} From 2b4e708ab3a5c0c602b34f941818a8beb76bb8f5 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 29 Jul 2020 16:18:45 -0700 Subject: [PATCH 2/8] Add way to change Menu control color, pass as a property --- js/components/interface/menu/MenuSection.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/components/interface/menu/MenuSection.js b/js/components/interface/menu/MenuSection.js index baa0c2612..4d978fe0f 100644 --- a/js/components/interface/menu/MenuSection.js +++ b/js/components/interface/menu/MenuSection.js @@ -111,7 +111,7 @@ class MenuSection extends React.Component { { this.props.button.icon !== "" ? this.props.button.caret ? this.props.button.caret.show - ? + ? : undefined - : - + : + : undefined } From 8976bdf5f8da2bccd35f3db81acd6893685321b7 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Fri, 28 Aug 2020 15:03:39 -0700 Subject: [PATCH 3/8] merge development --- geppetto-ui/src/list-viewer/ListViewer.js | 2 +- geppetto-ui/src/menu/MenuSection.js | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/geppetto-ui/src/list-viewer/ListViewer.js b/geppetto-ui/src/list-viewer/ListViewer.js index ddb0f04e4..40dd0e1df 100644 --- a/geppetto-ui/src/list-viewer/ListViewer.js +++ b/geppetto-ui/src/list-viewer/ListViewer.js @@ -348,7 +348,7 @@ export default class ListViewer extends React.Component {
- + { this.props.showPagination === false ? null : } ); } diff --git a/geppetto-ui/src/menu/MenuSection.js b/geppetto-ui/src/menu/MenuSection.js index 4a86cc896..20cfe90a8 100644 --- a/geppetto-ui/src/menu/MenuSection.js +++ b/geppetto-ui/src/menu/MenuSection.js @@ -140,7 +140,24 @@ class MenuSection extends React.Component { aria-describedby={id} onClick={this.handleClick} onMouseOver={this.handleOver} - onMouseOut={this.handleOut} + onMouseOut={this.handleOut}> + { this.props.button.icon !== "" + ? this.props.button.caret + ? this.props.button.caret.show + ? + + + + : undefined + : + + + : undefined + } + {this.props.button.label} > {this.props.button.icon !== '' ? ( From f8e96b88f5564f2e1f61159e4cbd8c31ffa9f06f Mon Sep 17 00:00:00 2001 From: jrmartin Date: Fri, 28 Aug 2020 15:10:17 -0700 Subject: [PATCH 4/8] merge development --- geppetto-ui/src/menu/MenuSection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geppetto-ui/src/menu/MenuSection.js b/geppetto-ui/src/menu/MenuSection.js index 20cfe90a8..d5d4ef27b 100644 --- a/geppetto-ui/src/menu/MenuSection.js +++ b/geppetto-ui/src/menu/MenuSection.js @@ -157,7 +157,7 @@ class MenuSection extends React.Component { : undefined } - {this.props.button.label} + {this.props.button.label} > {this.props.button.icon !== '' ? ( From f394c1b8060e0f7b747aad74d1106244b789193d Mon Sep 17 00:00:00 2001 From: jrmartin Date: Fri, 28 Aug 2020 15:11:15 -0700 Subject: [PATCH 5/8] merge development --- .project | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 .project diff --git a/.project b/.project deleted file mode 100644 index f290d8186..000000000 --- a/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - geppetto-client - - - - - - - - From ba3bda6102c9cf7eaf5f8df1bbcd382b8e1dafc8 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 9 Sep 2020 07:44:57 -0700 Subject: [PATCH 6/8] Removing margin and widths from component, and other improvements. --- geppetto-ui/src/list-viewer/ListViewer.js | 4 ++++ geppetto-ui/src/menu/MenuSection.js | 9 +++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/geppetto-ui/src/list-viewer/ListViewer.js b/geppetto-ui/src/list-viewer/ListViewer.js index 40dd0e1df..7e94b8dce 100644 --- a/geppetto-ui/src/list-viewer/ListViewer.js +++ b/geppetto-ui/src/list-viewer/ListViewer.js @@ -417,4 +417,8 @@ ListViewer.propTypes = { * Components passed in with a matching name will override the default in Griddle */ customComponents: PropTypes.object, + /** + * Show Pagination button, used for changing pages + */ + showPagination: PropTypes.bool }; diff --git a/geppetto-ui/src/menu/MenuSection.js b/geppetto-ui/src/menu/MenuSection.js index d5d4ef27b..efbbda292 100644 --- a/geppetto-ui/src/menu/MenuSection.js +++ b/geppetto-ui/src/menu/MenuSection.js @@ -145,14 +145,11 @@ class MenuSection extends React.Component { ? this.props.button.caret ? this.props.button.caret.show ? - - + {this.props.button.icon ? this.props.button.icon : null} + {this.props.button.caret.icon ? this.props.button.caret.icon : } : undefined - : + : : undefined From 1a7c72f37010daa448a5246a8a303e53c133e95d Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 9 Sep 2020 09:04:48 -0700 Subject: [PATCH 7/8] Improve icon assignment by making it a property instead of setting an element with className --- geppetto-ui/src/menu/MenuSection.js | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/geppetto-ui/src/menu/MenuSection.js b/geppetto-ui/src/menu/MenuSection.js index efbbda292..2984345d7 100644 --- a/geppetto-ui/src/menu/MenuSection.js +++ b/geppetto-ui/src/menu/MenuSection.js @@ -140,28 +140,24 @@ class MenuSection extends React.Component { aria-describedby={id} onClick={this.handleClick} onMouseOver={this.handleOver} - onMouseOut={this.handleOut}> + onMouseOut={this.handleOut} + > { this.props.button.icon !== "" ? this.props.button.caret ? this.props.button.caret.show ? {this.props.button.icon ? this.props.button.icon : null} - {this.props.button.caret.icon ? this.props.button.caret.icon : } + {this.props.menuOpen ? this.props.button.caret.closedIcon : this.props.button.caret.expandedIcon } + + : + {this.props.button.icon ? this.props.button.icon : null} - : undefined : - + {this.props.button.icon ? this.props.button.icon : null} : undefined } {this.props.button.label} - > - {this.props.button.icon !== '' ? ( - - - - ) : undefined} - {this.props.button.label} Date: Fri, 18 Sep 2020 13:02:31 -0700 Subject: [PATCH 8/8] Listviewer className can be assigned by property pass on creation --- geppetto-ui/src/list-viewer/ListViewer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geppetto-ui/src/list-viewer/ListViewer.js b/geppetto-ui/src/list-viewer/ListViewer.js index 7e94b8dce..3034b4824 100644 --- a/geppetto-ui/src/list-viewer/ListViewer.js +++ b/geppetto-ui/src/list-viewer/ListViewer.js @@ -379,7 +379,7 @@ export default class ListViewer extends React.Component { : {}; const { events, ...others } = this.props; return ( -
+