diff options
author | 2018-12-03 17:34:43 +0200 | |
---|---|---|
committer | 2018-12-05 11:19:51 +0000 | |
commit | 102f00d76ea26c5d449b9993269151bc8bb53a6c (patch) | |
tree | 2bf5a4e656b343bd6cc9585301ee62c88a714a84 /workflow-designer-ui/src/main/frontend | |
parent | 016ae9fea4e54f82e04427851f483729263e42cd (diff) |
Workflow- added getWorkflow call to catalog
Issue-ID: SDC-1963
Change-Id: Icacc4d1e7511adde514ecec3fb7dab1cad6a3b33
Signed-off-by: Yarin Dekel <yarind@amdocs.com>
Diffstat (limited to 'workflow-designer-ui/src/main/frontend')
-rw-r--r-- | workflow-designer-ui/src/main/frontend/src/features/catalog/CatalogView.jsx | 15 | ||||
-rw-r--r-- | workflow-designer-ui/src/main/frontend/src/shared/scroll/InfiniteScroll.js | 23 |
2 files changed, 27 insertions, 11 deletions
diff --git a/workflow-designer-ui/src/main/frontend/src/features/catalog/CatalogView.jsx b/workflow-designer-ui/src/main/frontend/src/features/catalog/CatalogView.jsx index 3eed4ed1..6c346a2e 100644 --- a/workflow-designer-ui/src/main/frontend/src/features/catalog/CatalogView.jsx +++ b/workflow-designer-ui/src/main/frontend/src/features/catalog/CatalogView.jsx @@ -32,10 +32,22 @@ class CatalogView extends Component { componentDidMount() { const { clearWorkflow } = this.props; - clearWorkflow(); + this.fetchWorkflows(); } + fetchWorkflows = () => { + const { + catalog: { sort, status, searchNameFilter }, + handleFetchWorkflow + } = this.props; + handleFetchWorkflow({ + sort, + searchNameFilter, + status + }); + }; + handleAlphabeticalOrderByClick = e => { e.preventDefault(); @@ -68,6 +80,7 @@ class CatalogView extends Component { status: value }); }; + handleScroll = () => { const { catalog: { diff --git a/workflow-designer-ui/src/main/frontend/src/shared/scroll/InfiniteScroll.js b/workflow-designer-ui/src/main/frontend/src/shared/scroll/InfiniteScroll.js index 8db3d841..04d00120 100644 --- a/workflow-designer-ui/src/main/frontend/src/shared/scroll/InfiniteScroll.js +++ b/workflow-designer-ui/src/main/frontend/src/shared/scroll/InfiniteScroll.js @@ -18,10 +18,16 @@ import React from 'react'; import PropTypes from 'prop-types'; class InfiniteScroll extends React.Component { + constructor(props) { + super(props); + this.state = { + initialLoad: false + }; + } componentDidMount() { - this.pageLoaded = this.props.pageStart; this.scrollEl = this.getScrollElement(); this.attachScrollListener(); + this.setState({ initialLoad: true }); } componentDidUpdate() { @@ -70,9 +76,7 @@ class InfiniteScroll extends React.Component { this.scrollEl.addEventListener('scroll', this.scrollListener, options); window.addEventListener('resize', this.scrollListener, options); - if (this.props.initialLoad) { - this.scrollListener(); - } + this.scrollListener(); } scrollListener = () => { @@ -105,8 +109,11 @@ class InfiniteScroll extends React.Component { if (offset < Number(this.props.threshold) && el.offsetParent !== null) { this.detachScrollListener(); // Call loadMore after detachScrollListener to allow for non-async loadMore functions - if (typeof this.props.loadMore === 'function') { - this.props.loadMore((this.pageLoaded += 1)); + if ( + typeof this.props.loadMore === 'function' && + this.state.initialLoad + ) { + this.props.loadMore(); } } }; @@ -137,9 +144,7 @@ InfiniteScroll.propTypes = { children: PropTypes.node.isRequired, element: PropTypes.node, hasMore: PropTypes.bool, - initialLoad: PropTypes.bool, loadMore: PropTypes.func.isRequired, - pageStart: PropTypes.number, threshold: PropTypes.number, useCapture: PropTypes.bool, useWindow: PropTypes.bool @@ -148,8 +153,6 @@ InfiniteScroll.propTypes = { InfiniteScroll.defaultProps = { element: 'div', hasMore: false, - initialLoad: true, - pageStart: 0, threshold: 250, useWindow: true, useCapture: false |