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

Commit

Permalink
Added check for selected_crawled_data tags when selecting other facets
Browse files Browse the repository at this point in the history
  • Loading branch information
@yamsgithub
yamsgithub committed May 31, 2017
1 parent 20f353c commit b687904
Showing 1 changed file with 29 additions and 20 deletions.
49 changes: 29 additions & 20 deletions client/src/components/FiltersTabs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -692,11 +692,7 @@ class FiltersTabs extends React.Component {
this.state = {
slideIndex: 0,
sessionString:"",
session: {},
tldString:"",
atermString:"",
tagString:"",
modelTagString:"",
session: {},
flat:false,
};
this.queryFromSearch=true;
Expand Down Expand Up @@ -731,13 +727,15 @@ class FiltersTabs extends React.Component {
var sessionTemp = this.props.session;
var newQuery = checked.toString();
if(newQuery !== ""){
if (sessionTemp['selected_tags']!=="" || sessionTemp['selected_tlds']!=="" || sessionTemp['selected_model_tags'] !== ""){
if (sessionTemp['selected_tags']!=="" || sessionTemp['selected_tlds']!=="" || sessionTemp['selected_model_tags'] !== "" || sessionTemp['selected_crawled_tags'] !== ""){
sessionTemp['newPageRetrievalCriteria'] = "Multi";
sessionTemp['pageRetrievalCriteria'] = {"query":newQuery};
if(sessionTemp['selected_tags']!=="")
sessionTemp['pageRetrievalCriteria']['tag'] = sessionTemp['selected_tags'];
if(sessionTemp['selected_model_tags']!=="")
sessionTemp['pageRetrievalCriteria']['model_tag'] = sessionTemp['selected_model_tags'];
sessionTemp['pageRetrievalCriteria']['model_tag'] = sessionTemp['selected_model_tags'];
if(sessionTemp['selected_crawled_tags']!=="")
sessionTemp['pageRetrievalCriteria']['crawled_tag'] = sessionTemp['selected_crawled_tags'];
if(sessionTemp['selected_tlds']!=="")
sessionTemp['pageRetrievalCriteria']['domain'] = sessionTemp['selected_tlds'];
}
Expand All @@ -750,7 +748,7 @@ class FiltersTabs extends React.Component {
}

sessionTemp['selected_queries']=newQuery;
if(sessionTemp['selected_queries'] === "" && sessionTemp['selected_tags'] === "" && sessionTemp['selected_model_tags'] === "" && sessionTemp['selected_tlds'] === "" && sessionTemp['selected_aterms'] === ""){
if(sessionTemp['selected_queries'] === "" && sessionTemp['selected_tags'] === "" && sessionTemp['selected_model_tags'] === "" && sessionTemp['selected_crawled_tags'] === "" && sessionTemp['selected_tlds'] === "" && sessionTemp['selected_aterms'] === ""){
sessionTemp['pageRetrievalCriteria'] = "Most Recent";
}
this.props.updateSession(sessionTemp);
Expand All @@ -761,15 +759,18 @@ class FiltersTabs extends React.Component {
var newTLDs = checked.toString();

if(newTLDs !== ""){
if(sessionTemp['selected_queries']!=="" || sessionTemp['selected_tags']!=="" || sessionTemp['selected_model_tags']!==""){
if(sessionTemp['selected_queries']!=="" || sessionTemp['selected_tags']!=="" || sessionTemp['selected_model_tags']!=="" || sessionTemp['selected_crawled_tags'] !== ""){
sessionTemp['newPageRetrievalCriteria'] = "Multi";
sessionTemp['pageRetrievalCriteria'] = {'domain':newTLDs};
if(sessionTemp['selected_queries']!=="")
sessionTemp['pageRetrievalCriteria']['query'] = sessionTemp['selected_queries'];
if(sessionTemp['selected_tags']!=="")
sessionTemp['pageRetrievalCriteria']['tag'] = sessionTemp['selected_tags'];
if(sessionTemp['selected_model_tags']!=="")
sessionTemp['pageRetrievalCriteria']['model_tag'] = sessionTemp['selected_model_tags'];
sessionTemp['pageRetrievalCriteria']['model_tag'] = sessionTemp['selected_model_tags'];
if(sessionTemp['selected_crawled_tags']!=="")
sessionTemp['pageRetrievalCriteria']['crawled_tag'] = sessionTemp['selected_crawled_tags'];

}
else{
sessionTemp['newPageRetrievalCriteria'] = "one";
Expand All @@ -780,7 +781,7 @@ class FiltersTabs extends React.Component {
}

sessionTemp['selected_tlds']=newTLDs;
if(sessionTemp['selected_queries'] === "" && sessionTemp['selected_tags'] === "" && sessionTemp['selected_model_tags'] === "" && sessionTemp['selected_tlds'] === "" && sessionTemp['selected_aterms'] === ""){
if(sessionTemp['selected_queries'] === "" && sessionTemp['selected_tags'] === "" && sessionTemp['selected_model_tags'] === "" && sessionTemp['selected_crawled_tags'] === "" && sessionTemp['selected_tlds'] === "" && sessionTemp['selected_aterms'] === ""){
sessionTemp['pageRetrievalCriteria'] = "Most Recent";
}

Expand All @@ -801,7 +802,7 @@ class FiltersTabs extends React.Component {
sessionTemp['filter'] = null;//null
}
else {
if(sessionTemp['selected_queries']!=="" || sessionTemp['selected_tags']!=="" || sessionTemp['selected_tlds']!=="" || sessionTemp['selected_model_tags'] !== ""){
if(sessionTemp['selected_queries']!=="" || sessionTemp['selected_tags']!=="" || sessionTemp['selected_tlds']!=="" || sessionTemp['selected_model_tags'] !== "" || sessionTemp['selected_crawled_tags'] !== ""){
sessionTemp['newPageRetrievalCriteria'] = "Multi";
sessionTemp['filter'] = labelTerm;
sessionTemp['pageRetrievalCriteria'] = {};
Expand All @@ -812,11 +813,14 @@ class FiltersTabs extends React.Component {
if(sessionTemp['selected_tags']!=="")
sessionTemp['pageRetrievalCriteria']['tag'] = sessionTemp['selected_tags'];
if(sessionTemp['selected_model_tags']!=="")
sessionTemp['pageRetrievalCriteria']['model_tag'] = sessionTemp['selected_model_tags'];
sessionTemp['pageRetrievalCriteria']['model_tag'] = sessionTemp['selected_model_tags'];
if(sessionTemp['selected_crawled_tags']!=="")
sessionTemp['pageRetrievalCriteria']['crawled_tag'] = sessionTemp['selected_crawled_tags'];

} else sessionTemp['filter']=labelTerm;
}
sessionTemp['selected_aterms']=newTerms;
if(sessionTemp['selected_queries'] === "" && sessionTemp['selected_tags'] === "" && sessionTemp['selected_model_tags'] === "" && sessionTemp['selected_tlds'] === "" && sessionTemp['selected_aterms'] === ""){
if(sessionTemp['selected_queries'] === "" && sessionTemp['selected_tags'] === "" && sessionTemp['selected_model_tags'] === "" && sessionTemp['selected_crawled_tags'] === "" && sessionTemp['selected_tlds'] === "" && sessionTemp['selected_aterms'] === ""){
sessionTemp['pageRetrievalCriteria'] = "Most Recent";
}
this.props.updateSession(sessionTemp);
Expand All @@ -826,15 +830,17 @@ class FiltersTabs extends React.Component {
var sessionTemp = this.props.session;
var newTags = checked.toString();
if(newTags !== ""){
if(sessionTemp['selected_queries']!=="" || sessionTemp['selected_tlds']!=="" || sessionTemp['selected_model_tags'] != ""){
if(sessionTemp['selected_queries']!=="" || sessionTemp['selected_tlds']!=="" || sessionTemp['selected_model_tags'] != "" || sessionTemp['selected_crawled_tags'] !== ""){
sessionTemp['newPageRetrievalCriteria'] = "Multi";
sessionTemp['pageRetrievalCriteria'] = {'tag':newTags};
if(sessionTemp['selected_queries']!=="")
sessionTemp['pageRetrievalCriteria']['query'] = sessionTemp['selected_queries'];
if(sessionTemp['selected_tlds']!=="")
sessionTemp['pageRetrievalCriteria']['domain'] = sessionTemp['selected_tlds'];
if(sessionTemp['selected_model_tags']!=="")
sessionTemp['pageRetrievalCriteria']['model_tag'] = sessionTemp['selected_model_tags'];
sessionTemp['pageRetrievalCriteria']['model_tag'] = sessionTemp['selected_model_tags'];
if(sessionTemp['selected_crawled_tags']!=="")
sessionTemp['pageRetrievalCriteria']['crawled_tag'] = sessionTemp['selected_crawled_tags'];
}
else{
sessionTemp['newPageRetrievalCriteria'] = "one";
Expand All @@ -844,7 +850,7 @@ class FiltersTabs extends React.Component {
delete sessionTemp['pageRetrievalCriteria']['tag'];
}
sessionTemp['selected_tags']=newTags;
if(sessionTemp['selected_queries'] === "" && sessionTemp['selected_tags'] === "" && sessionTemp['selected_model_tags'] === "" && sessionTemp['selected_tlds'] === "" && sessionTemp['selected_aterms'] === ""){
if(sessionTemp['selected_queries'] === "" && sessionTemp['selected_tags'] === "" && sessionTemp['selected_model_tags'] === "" && sessionTemp['selected_crawled_tags'] === "" && sessionTemp['selected_tlds'] === "" && sessionTemp['selected_aterms'] === ""){
sessionTemp['pageRetrievalCriteria'] = "Most Recent";
}
this.props.updateSession(sessionTemp);
Expand All @@ -854,15 +860,18 @@ class FiltersTabs extends React.Component {
var sessionTemp = this.props.session;
var newTags = checked.toString();
if(newTags !== ""){
if(sessionTemp['selected_queries']!=="" || sessionTemp['selected_tlds']!=="" || sessionTemp['selected_tags'] !== ""){
if(sessionTemp['selected_queries']!=="" || sessionTemp['selected_tlds']!=="" || sessionTemp['selected_tags'] !== "" || sessionTemp['selected_crawled_tags'] !== ""){
sessionTemp['newPageRetrievalCriteria'] = "Multi";
sessionTemp['pageRetrievalCriteria'] = {'model_tag':newTags};
if(sessionTemp['selected_queries']!=="")
sessionTemp['pageRetrievalCriteria']['query'] = sessionTemp['selected_queries'];
if(sessionTemp['selected_tlds']!=="")
sessionTemp['pageRetrievalCriteria']['domain'] = sessionTemp['selected_tlds'];
if(sessionTemp['selected_tags']!=="")
sessionTemp['pageRetrievalCriteria']['tag'] = sessionTemp['selected_tags'];
sessionTemp['pageRetrievalCriteria']['tag'] = sessionTemp['selected_tags'];
if(sessionTemp['selected_crawled_tags']!=="")
sessionTemp['pageRetrievalCriteria']['crawled_tag'] = sessionTemp['selected_crawled_tags'];

} else{
sessionTemp['newPageRetrievalCriteria'] = "one";
sessionTemp['pageRetrievalCriteria'] = "Model Tags";
Expand All @@ -872,7 +881,7 @@ class FiltersTabs extends React.Component {
}

sessionTemp['selected_model_tags']=newTags;
if(sessionTemp['selected_queries'] === "" && sessionTemp['selected_tags'] === "" && sessionTemp['selected_model_tags'] === "" && sessionTemp['selected_tlds'] === "" && sessionTemp['selected_aterms'] === ""){
if(sessionTemp['selected_queries'] === "" && sessionTemp['selected_tags'] === "" && sessionTemp['selected_model_tags'] === "" && sessionTemp['selected_crawled_tags'] === "" && sessionTemp['selected_tlds'] === "" && sessionTemp['selected_aterms'] === ""){
sessionTemp['pageRetrievalCriteria'] = "Most Recent";
}
this.props.updateSession(sessionTemp);
Expand Down

0 comments on commit b687904

Please sign in to comment.