Revize f01a1530

Improved filtering deletion (refs #7559)

sources/imiger-core/src/main/webapp/js/components/filterModalWindow.js

@@ -403 +403 @@
 	_onFilterFormReset() {
 		this._onBaseFilterChange('nodeType');
 
-		let nodeList = app.nodeList;
-		let edgeList = app.edgeList;
-		nodeList.filter(node => node._rootElement.style.display === 'none').forEach(node => node._rootElement.style.display = '');
-		edgeList.filter(edge => edge._rootElement.style.display === 'none').forEach(edge => edge._rootElement.style.display = '');
+		this.resetFilter();
+	}
+
+	resetFilter() {
+		var n = app.nodeList;
+		var v = app.vertexList;
+		var e = app.edgeList;
+		app.deletedNodeList.forEach(node =>{
+			n.push(node);
+		});
+		app.deletedVertexList.forEach(vertex => {
+			v.push(vertex);
+		});
+		app.deletedEdgeList.forEach(edge => {
+			e.push(edge);
+		});
+		n.filter(node => node._rootElement.style.display === 'none').forEach(node => node._rootElement.style.display = '');
+		e.filter(edge => edge._rootElement.style.display === 'none').forEach(edge => edge._rootElement.style.display = '');
+		app.deletedEdgeList = [];
+		app.deletedVertexList = [];
+		app.deletedNodeList = [];
 	}
 
 	_displayFilter(formData) {
@@ -483 +500 @@
 		}
 
 		nodeFilter.run(app.nodeList).forEach(node => {
-			//node.isFound = true;
 			node._rootElement.style.display = 'none';
 			app.edgeList.forEach(edge => {
 				if(edge.from.id === node.id || edge.to.id === node.id) {
@@ -491 +507 @@
 				}
 			});
 		});
+
+		var newNodeList = [];
+		var newVertexList = [];
+		var newEdgeList = [];
+
+		app.nodeList.forEach(node => {
+			if(node._rootElement.style.display !== 'none') {
+				newNodeList.push(node);
+			} else {
+				app.deletedNodeList.push(node);
+			}
+		});
+		app.vertexList.forEach(vertex => {
+			if(vertex._rootElement.style.display !== 'none') {
+				newVertexList.push(vertex);
+			} else {
+				app.deletedVertexList.push(vertex);
+			}
+		});
+		app.edgeList.forEach(edge => {
+			if(edge._rootElement.style.display !== 'none') {
+				newEdgeList.push(edge);
+			} else {
+				app.deletedEdgeList.push(edge);
+			}
+		});
+
+		app.nodeList = newNodeList;
+		app.vertexList = newVertexList;
+		app.edgeList = newEdgeList;
 	}
 
 	setDateBounds(minDate, maxDate) {

sources/imiger-core/src/main/webapp/js/components/navbar.js

@@ -11 +11 @@
 			this._createSeparatorListItem(),
 
 			this._createSearchListItem(),
-			this._createSeparatorListItem(),
 
 			this._createFilterListItem(),
 			this._createSeparatorListItem(),
@@ -187 +186 @@
 
 		function resetSearch() {
 			let nodeList = app.nodeList;
-			let edgeList = app.edgeList;
-			nodeList.filter(node => node._rootElement.style.display === 'none').forEach(node => node._rootElement.style.display = '');
-			edgeList.filter(edge => edge._rootElement.style.display === 'none').forEach(edge => edge._rootElement.style.display = '');
+			nodeList.filter(node => node.isFound === true).forEach(node => node.isFound = false);
 
 			searchInput.value = '';
 			searchCounter.innerText = 0;
@@ -207 +204 @@
 		const filterButton = DOM.h('button', {
 			class: 'filter',
 			id: 'filterButton',
-			innerText: 'Filter nodes',
+			innerText: 'Select nodes',
 			onClick: () => app.filterModalWindowComponent.open(),
 		});
 

sources/imiger-core/src/main/webapp/js/services/filters/VertexArchetypeFilter.js

@@ -34 +34 @@
 		switch (this._operation) {
 			case EnumFilterOperation.EQ:
 				filterFn = vertex => {
-					return filterValues.indexOf(vertex.archetype) < 0; //> -1
+					return filterValues.indexOf(vertex.archetype) > -1;
 				};
 				break;
 
 			case EnumFilterOperation.NEQ:
 				filterFn = vertex => {
-					return filterValues.indexOf(vertex.archetype) > -1; //< 0
+					return filterValues.indexOf(vertex.archetype) < 0;
 				};
 				break;
 

sources/imiger-core/src/main/webapp/js/services/filters/VertexAttributeFilter.js

@@ -184 +184 @@
 			filterFn = vertex => {
 				const attribute = vertex.attributes.find(attribute => attribute[0] === filterAttributeName);
 				const attributeValue = parseFloat(attribute[1]);
-				return (attributeValue >= filterValueFrom) && (attributeValue <= filterValueTo);
+				return (attributeValue < filterValueFrom) || (attributeValue > filterValueTo);
 			};
 
 		} else {

sources/imiger-core/src/main/webapp/js/showGraphApp.js

@@ -30 +30 @@
 		/** @prop {Node} activeNode */
 		this.activeNode = null;
 
+		this.deletedNodeList = [];
+		this.deletedVertexList = [];
+		this.deletedEdgeList = [];
+
+
 		/** @prop {Diagram} diagram */
 		this.diagram = null;