Commit Graph

1858 Commits

Author SHA1 Message Date
slhale
695582b30f [Search] Clean up 2015-08-03 11:38:47 -07:00
slhale
d0bad46627 [Search] Style
Removed use of the keyword 'catch' when dealing
with promises, and instead used the second
parameter of then.
2015-08-03 10:46:34 -07:00
slhale
eb0bdba666 [Search] Moved isLoading
Moved the isLoading function away from
the aggregator. It is now the controller's
responsibility. Corresponding tests
updated.
2015-08-03 10:45:30 -07:00
slhale
19b9668190 [Search] Restoring web worker tests 2015-08-03 10:21:50 -07:00
slhale
59d4c362f6 [Search] Temporarily remove web worker test 2015-08-03 10:13:00 -07:00
slhale
9be646f1e7 [Search] Moved search folder location
Moved search from platform/features/search to
platform/search. Added more style corrections.
2015-08-03 09:51:36 -07:00
slhale
164d5485e9 [Search] Wrote provider test
Completed tests for GenericSearchProvider.
Also fixed style in other tests.
2015-08-03 09:36:13 -07:00
slhale
7678289ead [Search] Wrote worker test
Completed tests for GenericSearchWorker.
2015-07-31 16:37:11 -07:00
slhale
2a62494296 [Search] Wrote provider test
Completed tests for ElasticsearchSearchProvider.
2015-07-31 15:27:02 -07:00
slhale
ae94ba73d7 [Search] Wrote aggregator test
Completed tests for SearchAggregator.
2015-07-31 11:33:58 -07:00
Shivam Dave
560a2e035e [Mobile] Info Button
Added info button to grid/list items
on mobile. When the button is pressed,
info bubble appears for 750ms or the
same infobutton is pressed to dismiss
immediately.
2015-07-31 11:13:52 -07:00
slhale
5b3f78287e [Search] Wrote controller tests
Completed tests for SearchController and
SearchItemController.
2015-07-31 10:40:16 -07:00
slhale
4bb000dd93 [Search] Writing tests
Created files for all the tests to write.
2015-07-31 09:38:45 -07:00
slhale
06d9b68406 [Search] Comments 2015-07-31 09:38:05 -07:00
Shivam Dave
eca52a8ca6 Merge remote-tracking branch 'upstream/master' into mobile_3 2015-07-31 09:09:31 -07:00
Victor Woeltjen
64e2de7aa6 [Documentation] Add a build step
Support generation of non-API docs using
npm run docs. Supports MissionControl/vista#21
2015-07-30 16:36:17 -07:00
slhale
3a3e98cc48 [Search] Update provider timeout
Added a timedOut property to the provider's
return object. Changed the generic search
worker to stop if it reaches timeout.
2015-07-30 16:35:26 -07:00
Victor Woeltjen
ee64ef5fc1 [Documentation] Generate docs with diagram
Convert Markdown+nomnoml -> HTML+PNG for
MissionControl/vista#21
2015-07-30 16:16:33 -07:00
slhale
6e11941ae9 [Search] ES Provider error checks
The elasticsearch provider returns an empty
result when elasticsearch throws an error
(probably a bad request). This prevents the
aggregator from thinking that ES is loading
infinitely.
2015-07-30 15:47:09 -07:00
Victor Woeltjen
ad482600de [Documentation] Begin adding doc generator
Begin adding Markdown->HTML documentation generation
with nomnoml embedded diagram support.

MissionControl/vista#21
2015-07-30 15:40:43 -07:00
slhale
7c89e4aa4a Merge branch 'master' of https://github.com/slhale/openmctweb into search 2015-07-30 15:08:33 -07:00
slhale
f8471bc944 [Search] Comments 2015-07-30 15:04:42 -07:00
slhale
15b7e3ac9b [Search] Aggregator returns result object
The aggregator now returns a result object similar
to that of the providers, but the hits array contains
domain objects rather than searchResult objects.
Also removed overly complicated filterRepeats
function from the aggregator and replaced it with a
simpler one.
2015-07-30 14:57:15 -07:00
Shivam Dave
2983ebb2c6 Merge branch 'mobile_3' into mobile 2015-07-30 14:11:08 -07:00
Shivam Dave
25e8bb44d2 [Mobile] Item Height
Adjusted item height in
folder/layout list to be
automatically same as the
list object, not flowing over.
Applied to both phones and tablets.
2015-07-30 14:10:43 -07:00
slhale
51bc7c6a7f [Search] Generic tracks total hits
The generic search worker keeps track of the total
number of search hits before truncating to match
the max results.
2015-07-30 14:06:35 -07:00
slhale
60dad014cc [Search] Changed provider return type
The provider now returns an object that has
a hits property which contains what it
previously returned, and also a total property
which contains the total number of results.
2015-07-30 13:54:56 -07:00
Shivam Dave
1a8eece90f Merge branch 'mobile_3' into mobile 2015-07-30 13:35:40 -07:00
Shivam Dave
85658d3d1f [Mobile] Tests
Removed tests causing incomplete
build.
2015-07-30 13:33:59 -07:00
slhale
a7cd6d8807 [Search] Removed name field form ES provider
Removed the name field from the ElasticSearch provider
search query string, so now it will check all of the
fields of the domain object (such as type).
2015-07-30 13:32:34 -07:00
Shivam Dave
ddce0f371d [Mobile] Test
Removed extra mockEvent from test.
2015-07-30 13:32:24 -07:00
Shivam Dave
495cd06ed5 [Mobile] Tests
adjusted test to fill empty
functions.
2015-07-30 13:30:03 -07:00
Shivam Dave
1624866656 [Mobile/Bug] RemoveAction
When removing object you have
openned, now compares the currentObj
id with the removed obj id, resulting
in navigating to parent if they are the
same.
2015-07-30 13:27:56 -07:00
slhale
bce56c53ed [Search] Clean up
Updated comments and documentation. Changed the generic
worker to return results as {id: score} key value pairs
rather than {id: {score: score}} format. Removed unused
getLatestResults and getLatestTimestamps functions from
the providers.
2015-07-30 13:27:45 -07:00
Victor Woeltjen
0b3170d2ef [Tests] Remove logs
Remove protractor logs, WTD-1489
2015-07-30 12:54:26 -07:00
Shivam Dave
2d1aa65d63 [Mobile] Test
BrowseController test adjusted to
repeat less code.
2015-07-30 12:50:39 -07:00
Victor Woeltjen
7e7754f9aa [Tests] Add license headers
Add license headers to protractor test scripts,
WTD-1489.
2015-07-30 12:50:13 -07:00
Victor Woeltjen
3a96a246a4 [Tests] Ignore protractor in build
Ignore protractor test folder from command line build,
WTD-1489
2015-07-30 12:44:49 -07:00
Victor Woeltjen
24682c5f7a [Tests] Add protractor instructions
Add protractor instructions to top-level README, WTD-1489.
2015-07-30 12:42:50 -07:00
Victor Woeltjen
28365602f0 [Tests] Comment out failing tests
WTD-1489.
2015-07-30 12:39:05 -07:00
slhale
2c5da44e5e [Search] Clean up
Removed the timestamp as an optional parameter
of the search aggregator's query(), and now it
instead automattically generates one before
querying the providers.
Also attempted to fix loading, but did not
complete (commented out).
2015-07-30 12:38:03 -07:00
Victor Woeltjen
a03046400c [Tests] Separate out page launcher
WTD-1287
2015-07-30 12:29:02 -07:00
Jesse
d5c835e777 Fixed Delete not working in protractor 2015-07-30 12:28:40 -07:00
Jesse
af630d1b3e Add Protractor Directory 2015-07-30 12:28:29 -07:00
Shivam Dave
c333a2e70a [Mobile] Test
Repeat of test variable deleted.
2015-07-29 16:31:38 -07:00
slhale
6b613f234b [Search] Clean up comments 2015-07-29 15:22:46 -07:00
slhale
1619f236cf [Search] Updated search service interface
The search service's interface now just consists
of the two functions query() and isLoading().
query() returns a promise for an array or results,
which eliminates the need for timeout polling like
was previously done. The search providers
have also been changed to reutrn promises.
2015-07-29 15:07:13 -07:00
Shivam Dave
906354764b [Mobile] Tests
Has way to make isMobile call
true or false for mobile/nonmobile
devices.
2015-07-29 15:06:39 -07:00
Shivam Dave
12ec293f3d [Mobile] Tests
Changed BrowseController and RemoveActionSpec to account
for grandparent and navigation usage. Also changed
RemoveAction variable name.
2015-07-29 13:57:11 -07:00
Shivam Dave
bdf8b4d3f1 [Mobile] Test for Back Arrow
Added tests for the backarrow and
when it appears/disappears.
2015-07-29 13:22:47 -07:00