[Search] SearchProvider and Tree Search enhancements/fixes (#3400)

* update generic search compostion load to new version for testing

* logging

* removing logging adding check for undefined child

* reverting genericsearchprovider

* testing using object service instead of modelservice for search

* modified the animations for sliding children in and out to be more reliable, pr updates

* removing unneccessary code
This commit is contained in:
Jamie V
2020-09-29 10:06:58 -07:00
committed by GitHub
parent 56120ba1bb
commit 505796d9f0
4 changed files with 47 additions and 36 deletions

View File

@@ -104,7 +104,7 @@ define([
"depends": [
"$q",
"$log",
"modelService",
"objectService",
"workerService",
"topic",
"GENERIC_SEARCH_ROOTS",

View File

@@ -38,16 +38,16 @@ define([
* @constructor
* @param $q Angular's $q, for promise consolidation.
* @param $log Anglar's $log, for logging.
* @param {ModelService} modelService the model service.
* @param {ObjectService} objectService the object service.
* @param {WorkerService} workerService the workerService.
* @param {TopicService} topic the topic service.
* @param {Array} ROOTS An array of object Ids to begin indexing.
*/
function GenericSearchProvider($q, $log, modelService, workerService, topic, ROOTS, USE_LEGACY_INDEXER, openmct) {
function GenericSearchProvider($q, $log, objectService, workerService, topic, ROOTS, USE_LEGACY_INDEXER, openmct) {
var provider = this;
this.$q = $q;
this.$log = $log;
this.modelService = modelService;
this.objectService = objectService;
this.openmct = openmct;
this.indexedIds = {};
@@ -218,12 +218,12 @@ define([
provider = this;
this.pendingRequests += 1;
this.modelService
.getModels([idToIndex])
.then(function (models) {
this.objectService
.getObjects([idToIndex])
.then(function (objects) {
delete provider.pendingIndex[idToIndex];
if (models[idToIndex]) {
provider.index(idToIndex, models[idToIndex]);
if (objects[idToIndex]) {
provider.index(idToIndex, objects[idToIndex].model);
}
}, function () {
provider