ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-03 03:46:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Search] Finds root folder

Browse Source 
The search controller will now search from
the root folder (My Items) even when the view
is initiated from a folder inside of the tree.
This commit is contained in:
shale 2015-07-10 10:32:58 -07:00
parent e339ee1dd1
commit 4e39c4f900
1 changed files with 75 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
platform/features/search/src/SearchController.js
View File

@ -28,31 +28,10 @@ define(function () {
"use strict"; "use strict";
function SearchController($scope, objectService) { function SearchController($scope, objectService) {
var items = [],
searchResults = [];
// Converts the filetree into a list
// Eventually, plan to call search service
// (but do here for now)
function listify() {
// For now, we want this view to only be in the My Items folder
if ($scope.domainObject.getId() === 'mine') {
var list = listHelper($scope.domainObject);
//debugger;
//console.log('out ', out);
return list.then(function (c) {
//console.log('c ', c);
return c;
});
}
// Fallback if we aren't in My Items
return items;
}
// Recursive helper function to go through the tree // Recursive helper function to go through the tree
function listHelper(current) { function listHelper(current) {
var composition; var composition;
if (current.hasCapability('composition')) { if (current.hasCapability('composition')) {
composition = current.getCapability('composition'); composition = current.getCapability('composition');
} else { } else {
@ -62,29 +41,55 @@ define(function () {
// Recursive case. Is asynchronous. // Recursive case. Is asynchronous.
return composition.invoke().then(function (children) { return composition.invoke().then(function (children) {
console.log('children (pre) ', children);
var subList = [current], //(children.forEach(listHelper)).then(function (subList) {
i; // console.log('children (post) ', children);
for (i = 0; i < children.length; i += 1) { // return [current].concat(children);
subList.push(listHelper(children[i])); //});
//console.log('subList', subList, 'index', i); children.forEach(listHelper);
} console.log('children (post) ', children);
//console.log('sublist ', subList); return [current].concat(children);
return subList;
/* /*
var array = [current].concat(children.forEach(listHelper)); var subList = [current];
console.log('array ', array); console.log('children ', children);
return array; for (var i = 0; i < children.length; i += 1) {
console.log('children[', i, ']', children[i]);
//subList.push(listHelper(children[i]));
listHelper(children[i]).then(function (c) {
subList.concat(c);
});
console.log('subList', subList, 'index', i);
}
console.log('sublist ', subList);
return subList;
*/ */
}); });
} }
// Search through items for items which have the search term // Converts the filetree into a list
// Eventually, plan to call search service (but do here for now)
function listify() {
// Aquire My Items (root folder)
return objectService.getObjects(['mine']).then(function (objects) {
console.log(' ');
return listHelper(objects.mine).then(function (c) {
console.log('final result ', c);
return c;
});
});
}
// Search through items for items which contain the search term
// in the title // in the title
function search(term) { function search(term) {
// modify searchResults var searchResults = [],
itemsLength = $scope.items.length, // Slight time optimization
i;
for (i = 0; i < itemsLength; i += 1) {
if ($scope.items[i].includes(term)) {
searchResults.push($scope.items[i]);
}
}
return searchResults; return searchResults;
} }
@ -124,4 +129,37 @@ define(function () {
*/ */
// Recursive search
/*
var subList = [current],
i;
console.log('children ', children);
for (i = 0; i < children.length; i += 1) {
console.log('children[', i, ']', children[i]);
subList.push(listHelper(children[i]));
console.log('subList', subList, 'index', i);
}
console.log('sublist ', subList);
return subList;
*/
/*
var array = [current].concat(children.forEach(listHelper));
console.log('array ', array);
return array;
*/
/*
// For now, we want this view to only be in the My Items folder
if ($scope.domainObject.getId() === 'mine') {
var list = listHelper($scope.domainObject);
//debugger;
console.log(' ');
console.log('list ', list);
return list.then(function (c) {
console.log('final result ', c);
return c;
});
}
*/