Skip to content
This repository has been archived by the owner on Dec 12, 2021. It is now read-only.

Commit

Permalink
Fixed issue #31: tagging pages with the filter 'neutral'. When the us…
Browse files Browse the repository at this point in the history 
…er uses 'Tag All' (for example 'Neutral' tag) and all snippets desapear, instead of show an empty page, ddt will display snippets for pages that are still neutral.
  • Loading branch information
@soniacq
soniacq committed Aug 4, 2017
1 parent 4a997d3 commit e9d3001
Showing 1 changed file with 63 additions and 30 deletions.
93 changes: 63 additions & 30 deletions client/src/components/Views.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ class ViewTabSnippets extends React.Component{
currentPagination:0,
allRelevant:false,
lengthTotalPages:0,
lengthPages:0,
custom_tag_val:"",
flatKeyBoard:false,
openMultipleSelection: false,
Expand All @@ -291,6 +292,7 @@ class ViewTabSnippets extends React.Component{
this.check_click_down=false;
this.availableTags = [];
this.items= [];
this.updatedUrls=false;
}

getAvailableTags(){
Expand All @@ -313,7 +315,7 @@ class ViewTabSnippets extends React.Component{
componentWillMount(){
this.getAvailableTags();
this.setState({
session:this.props.session, sessionString: JSON.stringify(this.props.session), pages:this.props.pages, currentPagination:this.props.currentPagination, offset:this.props.offset, lengthTotalPages:this.props.lengthTotalPages,
session:this.props.session, sessionString: JSON.stringify(this.props.session), pages:this.props.pages, currentPagination:this.props.currentPagination, offset:this.props.offset, lengthPages:this.props.lengthPages, lengthTotalPages:this.props.lengthTotalPages,
});
this.updateOnlineClassifier(this.props.session);
this.keyboardListener();
Expand Down Expand Up @@ -342,6 +344,8 @@ class ViewTabSnippets extends React.Component{

componentWillReceiveProps(nextProps, nextState){
if (JSON.stringify(nextProps.session) !== this.state.sessionString || this.props.queryFromSearch) {
if(this.props.internalUpdating){return ;}

if(!this.props.queryFromSearch) $("div").scrollTop(0);
this.setState({
session: nextProps.session,
Expand All @@ -359,6 +363,7 @@ class ViewTabSnippets extends React.Component{

shouldComponentUpdate(nextProps, nextState) {
if ( nextState.currentPagination!== this.state.currentPagination || nextState.accuracyOnlineLearning !== this.state.accuracyOnlineLearning || JSON.stringify(nextProps.session) !== this.state.sessionString || nextState.pages !== this.state.pages || this.props.queryFromSearch ) {
if(this.props.internalUpdating){return false;}
return true;
}
return false;
Expand Down Expand Up @@ -396,7 +401,7 @@ class ViewTabSnippets extends React.Component{
this.setState({
accuracyOnlineLearning:accuracy,
});
this.updateOnlineAccuracy(accuracy);
this.updateOnlineAccuracy(accuracy);
}

}.bind(this)
Expand All @@ -411,7 +416,7 @@ class ViewTabSnippets extends React.Component{
{'session': JSON.stringify(session)},
function(pages) {
this.newPages=true;
this.setState({session:session, pages:pages["data"]["results"], sessionString: JSON.stringify(session), lengthTotalPages:pages['data']['total'], });
this.setState({ pages:pages["data"]["results"], lengthPages:Object.keys(pages['data']["results"]).length, });
this.forceUpdate();
}.bind(this)
);
Expand All @@ -426,13 +431,18 @@ class ViewTabSnippets extends React.Component{
let selected = data.selected; //current page (number)
let offset = Math.ceil(selected * this.perPage);
this.setState({offset: offset, currentPagination:data.selected, pages:[]});
this.props.handlePageClick(offset, data.selected);
this.props.handlePageClick(offset, data.selected);
//Returns dictionary from server in the format: {url1: {snippet, image_url, title, tags, retrieved}} (tags are a list, potentially empty)
var tempSession = JSON.parse(JSON.stringify(this.props.session));
tempSession["from"] = offset;
this.getPages(tempSession);
}

//Updating the urls into the current page (pagination) when there is not more urls in that page.
updateUrlsIntoPage(currentPage){
this.updatedUrls=true;
}

//Remove or Add tags from elasticSearch
removeAddTagElasticSearch(urls, current_tag, applyTagFlag ){
$.post(
Expand All @@ -442,6 +452,15 @@ class ViewTabSnippets extends React.Component{
//updateing filters Tags
this.props.reloadFilters();
this.updateOnlineClassifier(this.props.session);
if(this.updatedUrls){
let selected = this.state.currentPagination; //current page (number)
let offset = Math.ceil(selected * this.perPage);
//Returns dictionary from server in the format: {url1: {snippet, image_url, title, tags, retrieved}} (tags are a list, potentially empty)
var tempSession = JSON.parse(JSON.stringify(this.props.session));
tempSession["from"] = offset;
this.getPages(tempSession);
}
this.updatedUrls=false;
this.forceUpdate();
}.bind(this)
);
Expand Down Expand Up @@ -489,6 +508,9 @@ class ViewTabSnippets extends React.Component{
if(!this.props.session['selected_tags'].split(",").includes(tag) && this.props.session['selected_tags'] !== "" ){
totalTagRemoved++;
delete updatedPages[url];
this.props.updateTotalUrlsPerPage(this.state.lengthTotalPages - totalTagRemoved);
if(Object.keys(updatedPages).length===0)
this.updateUrlsIntoPage(this.state.currentPagination);
}
}
this.setState({ pages:updatedPages, lengthTotalPages: this.state.lengthTotalPages - totalTagRemoved});
Expand Down Expand Up @@ -574,6 +596,9 @@ class ViewTabSnippets extends React.Component{
if(!this.props.session['selected_tags'].split(",").includes(tag) && this.props.session['selected_tags'] !== "" ){
this.setState({ pages:updatedPages, lengthTotalPages: this.state.lengthTotalPages - 1});
delete updatedPages[url];
this.props.updateTotalUrlsPerPage(this.state.lengthTotalPages - 1);
if(Object.keys(updatedPages).length===0)
this.updateUrlsIntoPage(this.state.currentPagination);
}

// setTimeout(function(){ $(nameIdButton).css('background-color','silver'); }, 500);
Expand Down Expand Up @@ -976,18 +1001,18 @@ class ViewTabSnippets extends React.Component{
</List>
<div style={{display: "table", marginRight: "auto", marginLeft: "auto",}}>
<ReactPaginate previousLabel={"previous"}
nextLabel={"next"}
initialPage={0}
forcePage={this.state.currentPagination}
breakLabel={<a >...</a>}
breakClassName={"break-me"}
pageCount={currentPageCount}
marginPagesDisplayed={3}
pageRangeDisplayed={8}
onPageChange={this.handlePageClick.bind(this)}
containerClassName={"pagination"}
subContainerClassName={"pages pagination"}
activeClassName={"active"} />
nextLabel={"next"}
initialPage={0}
forcePage={this.state.currentPagination}
breakLabel={<a >...</a>}
breakClassName={"break-me"}
pageCount={currentPageCount}
marginPagesDisplayed={3}
pageRangeDisplayed={8}
onPageChange={this.handlePageClick.bind(this)}
containerClassName={"pagination"}
subContainerClassName={"pages pagination"}
activeClassName={"active"} />
</div>
</div>
<Dialog title="Tag Selected?" actions={actionsCancelMultipleSelection} modal={false} open={this.state.openMultipleSelection} onRequestClose={this.handleCloseMultipleSelection.bind(this)}>
Expand Down Expand Up @@ -1016,27 +1041,29 @@ class Views extends React.Component {
sessionString:"",
session:{},
chipData: [],
lengthPages: 1,
lengthTotalPages:0,
offset:0,
currentPagination:0,
accuracyOnlineLearning:0,
lengthPages: 0,
lengthTotalPages:0,
offset:0,
currentPagination:0,
accuracyOnlineLearning:0,
internalUpdating:false,
};
this.newPages = true;
this.queryFromSearch=true;
}

//Returns dictionary from server in the format: {url1: {snippet, image_url, title, tags, retrieved}} (tags are a list, potentially empty)
getPages(session){
var tempSession = session;
tempSession["from"]=this.state.offset;
tempSession['pagesCap'] = "12";
$.post(
var tempSession = session;
tempSession["from"]=this.state.offset;
tempSession['pagesCap'] = "12";
$.post(
'/getPages',
{'session': JSON.stringify(tempSession)},
function(pages) {
this.newPages=true;
this.setState({session:tempSession, pages:pages["data"]["results"], sessionString: JSON.stringify(tempSession), lengthPages : Object.keys(pages['data']["results"]).length, lengthTotalPages:pages['data']['total'], });
this.setState({session:tempSession, pages:pages["data"]["results"], sessionString: JSON.stringify(tempSession), lengthPages : Object.keys(pages['data']["results"]).length, lengthTotalPages:pages['data']['total'],internalUpdating:false });
this.forceUpdate();
}.bind(this)
);
}
Expand All @@ -1063,10 +1090,15 @@ class Views extends React.Component {
this.setState({offset: offset, currentPagination:currentPagination});
}
//Update the online accuracy
updateOnlineAccuracy(accuracy){
updateOnlineAccuracy(accuracy){
this.setState({accuracyOnlineLearning: accuracy});
this.forceUpdate();
}
//update the lengthTotalPages.
updateTotalUrlsPerPage(updatedTotalUrls){
this.setState({lengthTotalPages: updatedTotalUrls, internalUpdating:true});
this.forceUpdate();
}

//If there are any change in the session like a new filter, then getPages() is called.
componentWillReceiveProps(nextProps, nextState){
Expand All @@ -1078,6 +1110,7 @@ class Views extends React.Component {
if (JSON.stringify(nextProps.session) !== this.state.sessionString || this.queryFromSearch) {
this.newPages = false;
this.loadPages(nextProps.session);

}else{
return;
}
Expand Down Expand Up @@ -1117,9 +1150,9 @@ class Views extends React.Component {
}
var messageSearch = (this.queryFromSearch)? "Searching..." :searchOtherEngine;
//if(!this.queryFromSearch && this.state.lengthTotalPages==0)
var showPages = (Object.keys(this.state.pages).length>0)?<ViewTabSnippets
handlePageClick={this.handlePageClick.bind(this)} updateOnlineAccuracy={this.updateOnlineAccuracy.bind(this)} accuracyOnlineLearning={this.state.accuracyOnlineLearning} offset={this.state.offset} currentPagination={this.state.currentPagination} lengthTotalPages={this.state.lengthTotalPages} session={this.state.session} pages={this.state.pages} deletedFilter={this.deletedFilter.bind(this)}
reloadFilters={this.reloadFilters.bind(this)} queryFromSearch={this.queryFromSearch} availableCrawlerButton={this.availableCrawlerButton.bind(this)}/>
var showPages = (Object.keys(this.state.pages).length>0)?<ViewTabSnippets internalUpdating={this.state.internalUpdating}
handlePageClick={this.handlePageClick.bind(this)} updateOnlineAccuracy={this.updateOnlineAccuracy.bind(this)} accuracyOnlineLearning={this.state.accuracyOnlineLearning} offset={this.state.offset} currentPagination={this.state.currentPagination} lengthPages={this.state.lengthPages} lengthTotalPages={this.state.lengthTotalPages} session={this.state.session} pages={this.state.pages} deletedFilter={this.deletedFilter.bind(this)}
reloadFilters={this.reloadFilters.bind(this)} queryFromSearch={this.queryFromSearch} availableCrawlerButton={this.availableCrawlerButton.bind(this)} updateTotalUrlsPerPage={this.updateTotalUrlsPerPage.bind(this)} />
: (this.state.lengthPages===0)? <div style={{paddingTop:"20px", paddingLeft:"8px",}}> {messageSearch}</div> : <CircularProgressSimple />;

/* lengthTotalPages={this.state.lengthTotalPages} session={this.state.session} pages={this.state.pages} deletedFilter={this.deletedFilter.bind(this)}
Expand Down

0 comments on commit e9d3001

Please sign in to comment.