Fixed bug in eclipse toolset to exclude mappings in repository search…

… result
eclipse-vorto · Sep 26, 2016 · 425a939 · 425a939
1 parent f4c815f
commit 425a939
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/...es/org.eclipse.vorto.repository/src/org/eclipse/vorto/repository/RestModelRepository.java b/...es/org.eclipse.vorto.repository/src/org/eclipse/vorto/repository/RestModelRepository.java
@@ -14,6 +14,8 @@
  */
 package org.eclipse.vorto.repository;
 
+import java.net.URL;
+import java.net.URLEncoder;
 import java.util.List;
 import java.util.Objects;
 import java.util.Observable;
@@ -76,11 +78,14 @@ public RestModelRepository(ConnectionInfo connectionUrlSupplier) {
 	@Override
 	public List<ModelResource> search(String expression) {
 		try {
-			String searchExpr = expression;
+			String searchExpr = null;
 			if (Strings.isNullOrEmpty(expression)) {
-				searchExpr = "*";
+				searchExpr = "-Mapping";
+			} else {
+				searchExpr = expression + " -Mapping";
 			}
-			List<ModelView> result = httpClient.executeGet("model/query=" + searchExpr, searchResultConverter);
+			searchExpr = searchExpr.replaceAll(" ", "%20");
+			List<ModelView> result = httpClient.executeGet(("model/query=" + searchExpr), searchResultConverter);
 
 			// Convert the searchResult in result to return type
 			return Lists.transform(result, modelViewToModelResource);

diff --git a/server/repo/repo-ui/src/main/resources/static/js/controllers.js b/server/repo/repo-ui/src/main/resources/static/js/controllers.js
@@ -20,7 +20,7 @@ repositoryControllers.controller('SearchController', [ '$scope','$http', '$locat
   	$scope.search = function() {
   		var filter = null;
   		if ($scope.modelType === 'all') {
-  			filter = $scope.queryFilter + "-Mapping";
+  			filter = $scope.queryFilter + " -Mapping";
   		} else {
   			filter = $scope.queryFilter + " -Mapping "+$scope.modelType;
   		}