ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-29 01:18:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,247 Commits 988 Branches 212 Tags 191 MiB
ee314ab387
Commit Graph

2014 Commits

Author SHA1 Message Date
Victor Woeltjen
7911909c5f [Code Style] Use prototypes for execution bundle 
WTD-1482.
 2015-08-11 15:02:52 -07:00
Victor Woeltjen
b93d752c88 [Code Style] Use prototypes in entanglement bundle 
WTD-1482
 2015-08-11 14:58:31 -07:00
Victor Woeltjen
5e4dcc1e35 [Code Style] Fix typo 
Fix typo in JSDoc annotation, WTD-1482
 2015-08-11 14:53:45 -07:00
slhale
9939c809be [Search] Adjust result list padding 2015-08-11 14:43:06 -07:00
slhale
89cb6867bd Merge branch 'master' of https://github.com/nasa/openmctweb into search 2015-08-11 14:32:39 -07:00
slhale
98801cb5d6 [Search] Remove unnecissary 2015-08-11 14:31:12 -07:00
slhale
48693df51f [Search] Input checks 
More checks to see if the input is empty
before doing search computations.
 2015-08-11 13:52:23 -07:00
slhale
23bc246a48 [Search] Search icon 
Search icon now is not visible when text is
entered in the search bar, even when the bar
is not in focus.
 2015-08-11 13:18:05 -07:00
slhale
11a45e4db0 [Search] Input checks 
More checks to see if the input is empty
before doing search computations.
 2015-08-11 13:08:58 -07:00
Victor Woeltjen
c450c22ddd [Code Style] Satisfy JSLint 
Add missing semicolons etc. to satisfy JSLint after
changes for WTD-1482.
 2015-08-11 13:03:06 -07:00
Victor Woeltjen
b7765ff388 [Code Style] Use prototypes in platform 
WTD-1482
 2015-08-11 12:57:31 -07:00
Victor Woeltjen
f377c7cb71 [Code Style] Use prototypes in containment bundle 
WTD-1482.
 2015-08-11 11:01:13 -07:00
Victor Woeltjen
aa08db1050 [Code Style] Avoid copying window/scope 
Avoids Angular errors; WTD-1482.
 2015-08-11 11:00:56 -07:00
slhale
a48a0820ad [Search] Search icon transition 2015-08-11 10:56:31 -07:00
slhale
109d933945 [Search] Fix test file path 2015-08-11 10:42:10 -07:00
slhale
7b471e5379 [Search] Search icon 
Moved the search icon to appear within the
text input area, and dissapears when the
input area is focused.
 2015-08-11 10:35:08 -07:00
Victor Woeltjen
de291ad3b1 [Code Style] Use prototypes in inspection bundle 
WTD-1482
 2015-08-11 10:00:56 -07:00
Victor Woeltjen
140d767026 [Code Style] Use prototypes in general UI bundle 
WTD-1482.
 2015-08-11 09:47:54 -07:00
Victor Woeltjen
be5cad212a [Code Style] Use prototypes in Edit bundle 
WTD-1482.
 2015-08-10 16:38:13 -07:00
Victor Woeltjen
efc42aa8f2 [Code Style] Use prototypes in Dialog bundle 
WTD-1482.
 2015-08-10 12:53:55 -07:00
Victor Woeltjen
f8a0ddb484 [Code Style] Avoid retaining reference to window 
Avoid https://docs.angularjs.org/error/ng/cpws
by changing way reference to  is retained.
WTD-1482.
 2015-08-10 12:39:56 -07:00
Victor Woeltjen
3a0ba4f5a6 [Framework] Allow prototype-style constructors 
WTD-1482.
 2015-08-10 12:31:44 -07:00
Victor Woeltjen
a77920bd18 [Code Style] Use prototypes in Browse bundle 
WTD-1482.
 2015-08-10 11:52:23 -07:00
Victor Woeltjen
78146d97f8 [Code Style] Use prototypes in About bundle 
WTD-1482.
 2015-08-10 10:19:02 -07:00
Victor Woeltjen
2d5ec97dc3 [Menu] Listen to element directly 
Add listener to menu element directly instead of
using ng-click to aid in testing (and for consistency
with related listeners.) WTD-1506.
 2015-08-07 14:39:59 -07:00
Victor Woeltjen
87aa0cfce2 [Menus] Dismiss menu when clicked 
Addresses WTD-1506 (context menu does not disappear after
action is chosen); listen for click events on the menu
itself and dismiss the menu when these occur.
 2015-08-07 14:34:27 -07:00
Victor Woeltjen
0b9b936368 [JSDoc] Add missing class doc 
WTD-1482.
 2015-08-07 13:35:07 -07:00
Victor Woeltjen
a7a1ac70e5 [JSDoc] Remove obsolete module references 
WTD-1482.
 2015-08-07 12:14:40 -07:00
Victor Woeltjen
31eb366e7f [JSDoc] Add namespace docs 
WTD-1482.
 2015-08-07 12:13:15 -07:00
Victor Woeltjen
eaaa1a19ca [JSDoc] Remove obsolete module references 
WTD-1482
 2015-08-07 11:55:38 -07:00
Victor Woeltjen
c08a460d30 [JSDoc] Add annotations 
Bulk-add JSDoc annotations, WTD-1482.
 2015-08-07 11:44:54 -07:00
slhale
7141c2818a [Search] Search icon near input 
Added a search icon next to the search bar
input.
 2015-08-06 16:59:09 -07:00
Pete Richards
058a0d393d [Compatibility] Store reference instead of binding 2015-08-06 16:55:15 -07:00
Pete Richards
b0a23590d4 Revert "[Build] Bump PhantomJS Version" 
This reverts commit 62f335573a.
 2015-08-06 16:53:42 -07:00
Pete Richards
48a9eef924 Merge branch 'open-master' into open-965 2015-08-06 16:13:37 -07:00
Pete Richards
62f335573a [Build] Bump PhantomJS Version 
Bump PhantomJS version to latest (for ES5 support) and upgrade
dependencies as necessary.
 2015-08-06 16:04:58 -07:00
Pete Richards
c80e9bfa26 [Style] JSLint Compliance 2015-08-06 15:21:28 -07:00
Pete Richards
ec62c27f36 [Representations] grid-item and label display links 
grid-item and label representations now use the "location" capability
to determine whether or not to show a link indicator.
 2015-08-06 15:12:02 -07:00
Pete Richards
19b80ded16 Merge remote-tracking branch 'origin/open1423' into open-965 2015-08-06 15:10:52 -07:00
Pete Richards
f72f88adfa [Location] Use parent id as location 
Use the parent id as the location for a model.

This greatly reduces the recursive work that must be done
during move operations to keep the location accurate.

Additionally, the locationService now implements a method
`persistLocation` which can be used to persist the current object
location as it's original location.
 2015-08-06 15:05:47 -07:00
Pete Richards
f083d019a3 [Entanglement] Move service recursively updates locations 
When moving an object that supports composition, child objects which
are originals must have their location updated as well.  Children which
are links should not have their location updated, nor should any of
their children be updated.
 2015-08-06 15:05:47 -07:00
Pete Richards
10ec30ba76 [Entanglement] MoveService updates the location of moved objects 
The move service updates the location of moved objects when those
objects are originals.
 2015-08-06 15:05:46 -07:00
Pete Richards
3fb4296d23 [Testing] MockLinkService returns linked object 
MockLinkService.perform returns a promise for the linked domainObject.

When resolving the promise and not specifying an object to resolve it
with, it will resolve it with the domainObject that was originally
passed to it.
 2015-08-06 15:05:46 -07:00
Pete Richards
197ec0eb2c [Tests] Update Link Service Tests 2015-08-06 15:05:42 -07:00
Pete Richards
1d162888dd [Tests] Fix location capability tests 2015-08-06 15:05:00 -07:00
Pete Richards
3783ed69d7 [Entanglement] Move updates location of originals 
When moving original objects, the location is updated to match the new
location.
 2015-08-06 15:03:08 -07:00
slhale
1d2cd4745c [Search] Update tests 
Updated generic provider test for more general
mock capability object.
 2015-08-06 15:01:45 -07:00
slhale
ee2d7efae2 [Search] Index checks for changes 
When indexing items initially, the generic
provider listens for mutations in case an
item's composition changes, so it can then
index the new children.
 2015-08-06 15:01:17 -07:00
Pete Richards
4a755e259f [Entanglement] Link service returns object in new context 
The link service return the object in the new context.
 2015-08-06 14:55:50 -07:00
Pete Richards
4c56e4ffdc [Test] add a synchronous controlled promise for testing 
Add ControlledPromise, a synchronous promise that can be controlled,
allowing for easier testing of promise resolution flow.
 2015-08-06 14:53:59 -07:00
slhale
7cad3ba0bc [Search] Update tests 
Updated generic provider test for more general
mock capability object.
 2015-08-06 14:52:54 -07:00
Pete Richards
449db4f3a9 [Templates] Add stubs for link indicator 
Update templates to use the location capability to show an indicator.
 2015-08-06 14:52:42 -07:00
slhale
168a805e8e [Search] Index checks for changes 
When indexing items initially, the generic
provider listens for mutations in case an
item's composition changes, so it can then
index the new children.
 2015-08-06 14:41:47 -07:00
Shivam Dave
63a99f26f6 Merge branch 'mobile_3' into mobile 2015-08-06 14:13:13 -07:00
Shivam Dave
7ca15a9de2 [Mobile] Representation 
Edited grid item to center
shared button.
 2015-08-06 14:11:59 -07:00
Shivam Dave
7ac1d2458a Merge remote-tracking branch 'origin/mobile_3' into mobile 2015-08-06 13:45:45 -07:00
Shivam Dave
0bc4f2dc6e Merge remote-tracking branch 'upstream/master' into mobile 2015-08-06 13:45:37 -07:00
Shivam Dave
6802484ad8 Merge remote-tracking branch 'upstream/master' 2015-08-06 13:45:24 -07:00
Shivam Dave
dcd7d61c9a [Mobile] Tests 
Completed ContextMenu and InfoButton
Gesture tests where elements/body
touch events occur.
 2015-08-06 13:43:56 -07:00
slhale
e0a0d293fa [Search] Update test 
Fully calls through the controller's search().
 2015-08-06 10:35:57 -07:00
slhale
1a4d7618c1 [Search] Infinite cycle check 
in indexItems in the generic provider.
 2015-08-06 10:33:17 -07:00
slhale
a2eabc1b08 [Search] Infinite cycle check 
in indexItems in the generic provider.
 2015-08-06 10:25:02 -07:00
slhale
f76f6548a5 [Search] Type checking 
Added type checking for arrays to indexItems.
 2015-08-06 10:13:32 -07:00
slhale
44dce05ec5 [Search] Correct test file paths 2015-08-06 10:12:44 -07:00
slhale
e729a966c7 [Search] Type checking 
Added type checking for arrays to indexItems.
 2015-08-06 10:12:34 -07:00
slhale
836c508698 [Search] Style compliance 2015-08-06 09:55:08 -07:00
slhale
1fe492cc3d [Search] New item indexer 
This one (hopefully) doesn't fill up the
call stack when there are lots of items.
 2015-08-06 09:51:09 -07:00
slhale
8923f23f70 [Search] New item indexer 
This one (hopefully) doesn't fill up the
call stack when there are lots of items.
 2015-08-06 09:49:29 -07:00
Pete Richards
37cd73c6e8 [Template] Move ng-click to parent node 
Move the ng-click directive to the li element to match the element that receives
hover styles.

Fixes nasa/openmctweb#60.
 2015-08-05 17:11:30 -07:00
Shivam Dave
7c17581659 Merge remote-tracking branch 'origin/mobile_3' into mobile 
Merged fixes regarding circleci check failure
 2015-08-05 12:27:20 -07:00
Shivam Dave
0a39984c4f [Mobile] Clean Up 
Fixed InfoService having 0 in
wrong spot. Also correctly compared
the UserAgent device to iPhone for
isMobile function in AgentService.
 2015-08-05 12:26:09 -07:00
slhale
ae763d000c [Search] Remove ES provider from bundle 
Removed the ElasticSearch search provider from its
bundle definition, but left its file in.
 2015-08-05 12:23:40 -07:00
Shivam Dave
a146185bd2 Merge remote-tracking branch 'origin/mobile_3' into mobile 2015-08-05 12:17:49 -07:00
Shivam Dave
0b635afcf7 [Mobile] Tests 
ContextMenu and InfoButton Gesture
tests remain.
 2015-08-05 12:14:16 -07:00
slhale
6407a66d30 [Search] Worker test correction 
Removed unused parameter. Made path to worker
not relative.
 2015-08-05 10:26:16 -07:00
slhale
6a0bd10d5b [Search] Worker test correction 
Removed unused parameter. Made path to worker
not relative.
 2015-08-05 10:18:10 -07:00
Shivam Dave
f46a0853b9 [Mobile] Tests 
Removed mockMenu from ContextMenuGestureSpec.
 2015-08-04 16:58:37 -07:00
Shivam Dave
7f486f739d Merge remote-tracking branch 'upstream/master' 2015-08-04 16:54:14 -07:00
Shivam Dave
66c81ce3d6 Merge remote-tracking branch 'upstream/master' into mobile 2015-08-04 16:53:45 -07:00
slhale
5fa6db72d2 [Search] More controller tweaking 2015-08-04 16:50:50 -07:00
Shivam Dave
6b65ae77e7 [Mobile] Tests 
Completed tests for AgentService,
InfoService, and ContextMenuAction.
ContextMenu and InfoButton Gesture
tests remain. Also resized info button
icon.
 2015-08-04 16:48:41 -07:00
slhale
e43e14ec00 [Search] Remove unused dependency 
Removed the generic search worker's dependency on
the object service, which it does not use.
 2015-08-04 16:45:23 -07:00
slhale
c9acfc9f89 [Search] Tweak controller loading 
Changed the controller to update the tree
display status when the search result
promise is fufilled, not before making the
search query.
Also chagned the loading increment from
5 to 20.
 2015-08-04 16:40:31 -07:00
Shivam Dave
66408eeec8 [Mobile] Gestures 
Now to dismiss bubble, touch anywhere
the touch will not fire other gestures
(such as the pressing of another object).
 2015-08-04 13:41:48 -07:00
slhale
d23f4de36a [Search] Cleanup 
Variable names, and unused parameters.
 2015-08-04 13:16:29 -07:00
slhale
d82be0deef [Search] Remove unused parameter 2015-08-04 13:14:20 -07:00
slhale
eab140df48 [Search] Generic search roots constant 
Made a constant for the generic search roots,
rather than depending on roots[].
 2015-08-04 13:10:29 -07:00
slhale
15e39e00c2 [Search] Search aggregator return type 
The search service returns objects containing
searchResult objects.
 2015-08-04 13:07:47 -07:00
slhale
077a0ce3e3 [Search] Changed array to dictionary 
for faster lookup times in the search aggregator's
filterDuplicated function.
 2015-08-04 13:06:04 -07:00
slhale
5711b2b241 [Search] Fixed file paths 2015-08-04 13:04:52 -07:00
slhale
d9a1b9d530 [Search] Moving files 
Moved the elasticsearch provider to
platform/persistence/elastic. Then moved
the search aggregator and the generic
provider into a services folder within
the search folder.
 2015-08-04 13:03:34 -07:00
slhale
b6c1eadb91 [Search] Generic search roots constant 
Made a constant for the generic search roots,
rather than depending on roots[].
 2015-08-04 11:48:28 -07:00
slhale
56265c2277 [Search] Search aggregator return type 
The search service returns objects containing
searchResult objects.
 2015-08-04 11:39:09 -07:00
larkin
9ea1d24121 [Entanglement] Add LocationCapability 
DomainObjects with a context capability also gain a LocationCapability.

This capability allows you to determine the location of the current
instance of a domain object, and also provides methods for determining
if the current instance of a domain object is a link, or if it is an
original.
 2015-08-04 11:24:50 -07:00
larkin
40e85b718d [Creation] Store location of new objects 
The creation service stores the location (the full path) to
the domain object as "model.location"
 2015-08-04 11:24:50 -07:00
slhale
bbce5c3154 [Search] Changed array to dictionary 
for faster lookup times in the search aggregator's
filterDuplicated function.
 2015-08-04 11:19:34 -07:00
slhale
c869aaf91a [Search] Fix file paths 2015-08-04 11:10:49 -07:00
slhale
5b0bf0a0ba [Search] Moving files 
Moved the elasticsearch provider to
platform/persistence/elastic. Then moved
the generic provider out of its folder.
 2015-08-04 11:05:32 -07:00
slhale
ec87ac7652 [Search] Comments 2015-08-04 10:37:47 -07:00
slhale
8f65c73c8a [Search] Recompile CSS 
To make changes to the Sass reflected.
 2015-08-04 10:36:46 -07:00
slhale
35316dc31c [Search] Clean up 
Removed additional reference to searhc UI, as well
as correct persistence provider.
 2015-08-04 10:35:15 -07:00
slhale
b6bb689ccc [Search] Remove search UI files 
Leaving only search service related files.
 2015-08-04 10:31:52 -07:00
Shivam Dave
3d524d7572 [Mobile] AgentService 
Replaced name queryService with agentService.
 2015-08-04 10:11:25 -07:00
slhale
45bedb20c1 [Search] Comments and style 2015-08-04 10:01:54 -07:00
Victor Woeltjen
2ca3c6ea93 [Layout] Use consistent whitespace 
Use consistent whitespace in array literals, WTD-1424.
 2015-08-04 10:00:44 -07:00
Shivam Dave
9b922913a0 [Mobile] Gestures 
Added styling to back and selection
arrow (tree). Also increased the space
allowed for selection arrow on tree item.
Info Button created on grid items for mobile.
Info bubble appears on tablet like desktop.
Also on mobile, info bubble fits to width.
New QueryService that returns if on iPhone.
Also formatted dialog box so that their is no
margin and takes up fullscreen on mobile.
 2015-08-04 09:59:08 -07:00
slhale
4439e1680d [Search] Update CSS 
Scrolling now does not move the search input
field. Load more text always stays on one line.
 2015-08-03 13:49:53 -07:00
slhale
5569ef8b2d Revert "[Search] Update CSS" 
This reverts commit e05f16d780.
 2015-08-03 13:39:22 -07:00
slhale
e05f16d780 [Search] Update CSS 
Slight tweak to the padding of the search view,
which affects where the top of the scroll bar
appears. Also removed the search scroll div
because it was unused.
 2015-08-03 13:26:29 -07:00
Victor Woeltjen
a4c704a5a2 [Layout] Ensure minimum frame size 
Ensure default frame size in a layout is not small,
even if the grid size for the layout is very small.
WTD-1424.
 2015-08-03 12:18:49 -07:00
slhale
e928e02b1c [Search] Update tests 
Updated the search controller test to work with
the changes to loadMore
 2015-08-03 11:48:50 -07:00
slhale
1cd6685b36 [Search] Update loadMore 
The controller's loadMore function now sends
new queries to the search service if the
controller's full results list does not have
enough results in it to load more.
 2015-08-03 11:44:56 -07:00
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
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
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
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
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
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
Shivam Dave
2d1aa65d63 [Mobile] Test 
BrowseController test adjusted to
repeat less code.
 2015-07-30 12:50:39 -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
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
slhale
5ee8dd239b [Search] Comments 2015-07-29 13:17:50 -07:00
Shivam Dave
6e60088b11 [Mobile] RemoveAction 
Removed console and added
navigationService (mock) to the
spec version.
 2015-07-29 11:58:53 -07:00
Shivam Dave
97bf530b1d [Mobile] BackArrow 
Removed the BackArrow console log
that was getting called in the
BrowseController.
 2015-07-29 11:41:10 -07:00
Shivam Dave
18348476c6 [Mobile] RemoveAction Tweak 
If you remove an object you are
currently within/opened, then on
removal of it you navigate to the
parent of whatever you removed.
 2015-07-29 11:38:47 -07:00
Shivam Dave
7e35e55f0b [Mobile] Hide Back Button 
When you are at the highest level the
back button fades out and is unclickable.
When you are able to go up a level the
back button appears/fades in and is
pressable. Also removed the object type
name from the header.
 2015-07-29 11:13:09 -07:00
slhale
f2cd55d6cd [Search] Cleaning up 
Cleaning up code in generic serach provider. Removed
unnecissary return statements. Moved indexing via web
worker from getItems() loop to within itemsHelper().
Commented out timeout, becuase seems unnecissary.
Changed all date.getTime() to Date.now(). Indexing
has undefined checking.
 2015-07-29 11:01:38 -07:00
Shivam Dave
28a2a5b92a [Mobile] Tweaks to layout 
Removed the user-select option
for the context menu and bottom bar
on mobile. Also edited the folder
grid item so that its icon rep
size is not overly large.
 2015-07-29 10:39:17 -07:00
slhale
639cf1cf59 [Search] Generic indexes once 
Changed the generic search provider to index the
file tree only once when it is initially called.
This assumes that the contents of the file tree
will not change significantly within the course
of a use session (and some changes may be caught
by other search providers).
 2015-07-29 10:28:07 -07:00
Shivam Dave
d262520594 [Mobile] Tree menu Open 
Tree menu select arrow button's width
is now size of full button. Prior to this
the pressable area was less and therefore
less responsive.
 2015-07-29 10:25:09 -07:00
Shivam Dave
7cc14a195b [Mobile] Tests/Header 
Removes back arrow on desktops.
Also added queryService to tests
for the context menu action and
gesture.
 2015-07-29 10:00:03 -07:00
Shivam Dave
84b9e4d781 [Mobile] Context Menu 
Context menu next to object header
now dismisses when touching away
from it. Also, when long touching
an object, the context menu appears.
Set on 500ms timeout.
 2015-07-28 17:09:15 -07:00
slhale
495d8c9830 [Search] Search term processing 
The search term processor for ElasticSearch now
removes extra spaces from inside of the search
term (to avoid some ES errors).
 2015-07-28 17:04:29 -07:00
Shivam Dave
356fa73c91 [Mobile] Tests 
Test created for backArrow
that spies on all objects
used to find parent.
 2015-07-28 15:55:22 -07:00
Shivam Dave
a073ef69ac [Mobile] Back Arrow 
Shifted Back Arrow down to
align with header.
 2015-07-28 15:15:42 -07:00
Shivam Dave
3c6c420023 [Mobile] Back Arrow 
Back Arrow implemented
by getting parent and then
navigating to it.
 2015-07-28 15:08:14 -07:00
slhale
32b58715c6 [Search] Fixed scrolling and layout edit 
Changed the CSS so that scrolling for the tree and
search results works again. Additionally, layout
editing works again.
 2015-07-28 12:33:22 -07:00
slhale
1a9dd2f144 [Search] Comments 
Updated documentation. Removed unnecissary dependency
fom generic provider.
 2015-07-28 11:33:29 -07:00
Shivam Dave
2a4943f584 [Mobile] Console 
Removed call to console so
mvn clean install would compile.
 2015-07-28 10:58:22 -07:00
Shivam Dave
e32403a75f [Mobile] Clean-Up 
Cleaned the unused code for the
backArrow and long touch gestures.
Commented out functions for later use
Currently shows the back arrow, however,
only will print to console on press.
Edited tests where mobile checks were breaking
and fixed.
 2015-07-28 10:56:29 -07:00
slhale
d6a7dc9820 Merge branch 'search' of https://github.com/slhale/openmctweb into search 2015-07-28 10:17:15 -07:00
slhale
dc53cf60d1 [Search] Style 
Made style compliance changes.
 2015-07-28 10:15:05 -07:00
slhale
e0e5ad1347 [Search] Removed console output 
Accidentally left in a console.log statement
 2015-07-28 10:04:31 -07:00
slhale
a6b11354cd [Search] Removed console output 
Accidentally left in a console.log statement
 2015-07-28 10:03:22 -07:00
slhale
561d671181 [Search] Fix to pass test 
Changing TreeNodeController's isSelected function
back to original, so that it doesn't break tests.
 2015-07-28 09:50:50 -07:00
Shivam Dave
b0c42c12b7 [Mobile] Back Arrow 
Changes URL correctly that
is printed to the console. Is the
url to up one level of objects.
However not navigating to that
object.
 2015-07-27 17:01:30 -07:00
Shivam Dave
621ccc25ec [Mobile] Back Arrow HTML 
Created HTMl for back arrow,
next neew to hook up a click.
 2015-07-27 15:31:47 -07:00
Shivam Dave
617df739ee [Mobile] persistence 
Removed elasticsearch.
 2015-07-27 15:26:09 -07:00
Shivam Dave
6e43a92191 [Mobile] Merge 
Fix Conflicts.
 2015-07-27 15:21:59 -07:00
shale
84486f2086 [Search] Fixed empty search 
Pressing enter on the searchbar before putting
any input would before hide the filtree when
it shouldn't. Now it does not.
 2015-07-27 14:12:49 -07:00
shale
dc79f460e5 [Search] Fixing conflicts 2015-07-27 13:34:12 -07:00
shale
7cac858697 [Search] Cleanup 
Updated documentation. Removed most unused funtions.
Removed references to the search service in the
search template -- necissary functions added to
the search controller.
(Search in a 'working' state again.)
 2015-07-27 13:25:35 -07:00
shale
a3977a18f0 [Search] Results polling in aggregator 
Moved the polling for most recent results
from the search controller to the search
aggregator.
Also changed ng-change back to ng-keyup
in the search template.
 2015-07-27 12:59:32 -07:00
shale
5e858f73d5 [Search] Changed ng-keyup to ng-change 
In the search template. Also small comment change.
 2015-07-27 11:55:42 -07:00
Shivam Dave
a9418fd2c7 Merge remote-tracking branch 'upstream/master' 2015-07-27 11:32:41 -07:00
Shivam Dave
1d7a0fa48d [Mobile] Removed InfoGesture 
Commented out infogesture.
 2015-07-27 11:30:29 -07:00
Shivam Dave
30c530178a [Mobile] No ContextMenu 
Removed context menu code
started to be used for the
long hold gesture.
 2015-07-27 11:01:03 -07:00
Shivam Dave
3d0795cde3 [Mobile] Starting Context 
Added check to make sure
user is touching only one object.
Started contextmenugesture to be
long touch, however currently long
touch is still infogesture.
 2015-07-27 10:20:08 -07:00
shale
181fb32a2a [Search] Responsibility change (in progress) 
Attempting to move some responsibility from
the search controller to the aggregator.
(Committing for save before possible revert.)
 2015-07-27 10:04:09 -07:00
shale
232a648fbd Merge branch 'master' of https://github.com/nasa/openmctweb into search 2015-07-27 09:14:52 -07:00
Victor Woeltjen
77edb07333 Merge pull request #52 from nasa/continuous-deployment 
Support continuous deployment of open source Open MCT Web.
 2015-07-27 07:51:54 -07:00
shale
d35a149108 [Search] Remove unused controll 
Removed searchbar controll, as the control to
use would be the provided textfield control.
 2015-07-24 16:52:55 -07:00
Shivam Dave
c85a3787c0 [Mobile] User-Select 
Edited user-select used in
panes' layout to only
happen on phones and tablets
(just to be safe).
 2015-07-24 16:46:45 -07:00
Shivam Dave
066258ab83 [Mobile] User-Select 
Removes the copy/define
mobile safari menu that
appears during some touch events.
Only apply to left and right panes.
 2015-07-24 16:19:15 -07:00
Shivam Dave
ddc2295ec3 [Mobile] Touch Hold Gesture 
Rough touch hold gesture added
to the info gesture. Currently
if you hold on an item (that you
would normally hover over) for
500ms, you get the info gesture pop
up.
 2015-07-24 16:02:06 -07:00
Shivam Dave
011e6fc512 [Mobile] Clean Up 
Moved Mobile check in InfoGesture to
call on mouseEnter.
 2015-07-24 15:27:33 -07:00
shale
dca0014862 [Search] Removed unused 
Removed incorrect 'uses' statements from
bundle.json. Also removed unused controller
ToggleController. Edited some comments.
 2015-07-24 15:08:43 -07:00
shale
6b02295bf4 Merge branch 'master' of https://github.com/nasa/openmctweb into search 2015-07-24 14:20:27 -07:00
Victor Woeltjen
9435e75461 Merge remote-tracking branch 'slhale/open33' into open47b 
Fix merge conflict in preparation to integrate nasa/openmctweb#47

Conflicts:
	platform/commonUI/browse/res/templates/browse/object-header.html
 2015-07-24 13:46:37 -07:00
shale
05c43db6fe [Search] Search input using the model 
Made the search bar text input go to ngModel.input,
rather than getting the text manually from the DOM
element. Additionally, removed the search service
from the search controller's scope.
 2015-07-24 13:04:48 -07:00
shale
9143f5febd [Search] Comments and errors 
Changed TreeNodeController slightly to do error
checking. Also updated some comments.
 2015-07-24 13:03:18 -07:00
Shivam Dave
91bd58215a [Mobile] Size Adjustment 
Moved hamburger icon slightly up
using the padding instead of
margin.
 2015-07-24 12:38:01 -07:00
Shivam Dave
b37ee19fbc [Mobile] Size Adjustment 
Adjusted indentation size
on the tree. Also change size of the
hamburger icon to match the
object icon and moved it slightly
down.
 2015-07-24 12:35:19 -07:00
Shivam Dave
2355d354b3 [Mobile] Items List 
Flushes items left and
vertically centers the
title/details. Also cleaned
up the items classes in sass
files.
 2015-07-24 11:46:58 -07:00
shale
300280e03e [Search] Moving responsibility 
Moving the responsibility of polling for updates
from the search controller to the search aggregator.

In progress. Previously this prototype was what
could be called semi-stable, but now it is no longer.
 2015-07-23 16:58:25 -07:00
Shivam Dave
200c6e49fc [Mobile] Test 
QueryService (mock) added to the
ContextMenuGestureSpec to account
for isMobile call that allows/
disallows use of contextmenu
gesture.
 2015-07-23 16:55:45 -07:00
Shivam Dave
a89f9eed42 [Mobile] Grid List/Gestures 
Context menu only shown with contextmenu
click on desktops (non-mobile devices). Also
edited items list in a folder's representation
to show the icon on the left side, with text
centered horizontally (only mobile).
 2015-07-23 16:47:57 -07:00
shale
341218e8f6 [Search] Tree hide change 
The tree is now hidden whenever there is
text in the search bar. (This allows for
the case when there are no search results,
but text in the search bar.)
 2015-07-23 16:24:38 -07:00
shale
33e8084852 [Search] Getting input text 
The controller now gets the input text from the
DOM element ID, then passes that string along
to the search service, instead of passing the
raw ID.
 2015-07-23 16:13:26 -07:00
shale
7d495f6389 [Search] Hide tree 
The tree is hidden when there are
search results.
 2015-07-23 15:55:20 -07:00
shale
f4d34a2a9c [Search] mctControl for searchbar 
Attempting to generalize the searchbar using
mct-control. In progress.
 2015-07-23 15:29:19 -07:00
shale
0feab1965c [Search] Attempt at scroll bars 
Attempted to make the search results scroll,
but failed for now. Created a div for the
search results, load icon, and load more
button, which are the elements desired to
be scrolled. Did not work because search
result labels have absolute position text.
 2015-07-23 15:12:13 -07:00
Shivam Dave
7993e4c03f [Mobile] Gestures 
Removed the hover coloring on
the tree menu on mobile by changing
original** scss code. Also added
check in ContextMenuGesture that
will only allow context menu to appear
in non-mobile browser.
 2015-07-23 15:01:14 -07:00
Shivam Dave
b592b89dc8 [Mobile] Clean Up 
Removed unnecessary transitions.:
 2015-07-23 14:15:01 -07:00
Shivam Dave
d115166dde [Mobile] Comments 
Added comments and removed
unwanted spec test code for
BrowseController.
 2015-07-23 13:48:21 -07:00
Shivam Dave
d176f9f811 [Mobile] Test 
Fixed BrowseControllerSpec.js to
account for the .treeslide
call and added a new test for thatasds
 2015-07-23 13:46:46 -07:00
shale
aa17d3034e [Search] Fixed excessive calls to setSelection 
There were excessive calls to TreeNodeController's
setSelection() due to a modification for search
compatibility. Changed to not call as often.
 2015-07-23 13:32:15 -07:00
shale
52a9fcf5d6 [Search] Changed highlight size 
The search item highlight when selected or
hovered over is now talled, and the margin
between search items is reduced to
counteract any effect to spacing.
 2015-07-23 13:29:11 -07:00
Shivam Dave
143e3eeb6c [Mobile] CleanUp/Tests 
Added tests inside spec files
for the QueryService, TreeNodeController,
and InfoGesture. Also cleaned up the
tree so that padding is used between
buttons instead of margins.
 2015-07-23 13:19:58 -07:00
shale
7b271dcb6b [Search] Highlight transitions 
Added transitions for when objects get
highlighted from selection or hover.
 2015-07-23 13:14:20 -07:00
shale
2680e466fa [Search] Tree selection syncs 
Selecting something in the search results now
also makes it selected in the filetree. It
remains selected even when the search results
are cleared. (The filetree does not
automatically expand to that position though.)
 2015-07-23 12:47:21 -07:00
shale
29d5535e7c [Search] Changed search load time 
Changed how frequently the search controller
checks for updates. This makes the load icon
dissapear faster, and looks more natural. But,
may affect performance.
Also changed the point at which the loading
status becomes 'true'. Made it earlier, at
the beginning of the controller's update().
 2015-07-23 11:48:19 -07:00
shale
ebb5474b34 [Search] Hover and loading 
Added styling to result items when they are
hovered over.
Also added a loading icon.
 2015-07-23 11:41:17 -07:00
shale
4759162bb7 [Search] Added right padding 
Added padding to the right side of the
search holder to match the tree holder's
padding.
 2015-07-23 11:08:31 -07:00
shale
deba184103 [Search] Selection remains across queries 
The selected object in the search results now
remains selected even after a new search is made.
It also will remain selected if it is clicked
on the file tree, but the file tree version is
not yet selected if it is clicked on the search
results list.
 2015-07-23 10:56:38 -07:00
shale
c65a278fcf [Search] Selecting results works 
Can now click on search results. The view will
be updated, as well as the selected object
being higlighted.
 2015-07-23 10:50:00 -07:00
Shivam Dave
1a1eecb4c3 Merge remote-tracking branch 'upstream/master' 2015-07-23 09:51:10 -07:00
Shivam Dave
b3bc8b6876 [Mobile[ Tests 
Added jasmine test for

QUerySerivce and adjusted
the InfoGestureSpec to
account for use of
QueryService.
 2015-07-23 09:28:36 -07:00
shale
8c08f7b93e [Search] Less space above tree 
Removed the awkward spacing between the filetree
and the search bar. Now 'My Items' appears just
below the search bar.
Also added .search-holder to the sass, but haven't
done anything with it yet.
 2015-07-23 09:25:10 -07:00
shale
501e426868 [Search] Centered load more button 
More correctly centered the load more button,
so that when the left panel is resized,
the button remains in the middle.
Additionally, added more comments to the sass.
 2015-07-22 16:35:41 -07:00
shale
8f1f4eb177 [Search] Generic search gets all roots 
Generic search now automatically finds all
the roots before searching.
 2015-07-22 16:21:38 -07:00
shale
b0e7dca985 [Search] Empty search resets results 
When there is no input into the search bar
no results are displayed/displayed results
are removed. This is because the search
providers were changed to return empty
arrays for empty search strings.
 2015-07-22 16:09:14 -07:00
shale
b16af5fe3e [Search] Renaming search and searchbar 
Changed what was previously just 'search' and
renamed to 'search view'. Then, took what was
previously 'searchbar' and renamed to
'search'.
 2015-07-22 15:43:28 -07:00
Shivam Dave
1f7ba70ad7 [Mobile] Scroll Bug 
Removed scrollbar that appears in landscape
mode in tree menu.
 2015-07-22 15:21:34 -07:00
shale
1dbe039be8 [Search] Load more button style 
Styled the load more button to match
the general theme.
 2015-07-22 15:17:27 -07:00
shale
d82538a799 [Search] Item background highlight 
Each result item now has a highlighted
background, with correct rounding of
edges. Need to now detect when to
highlight (on selection).
 2015-07-22 14:48:14 -07:00
shale
57d45b24be [Search] Removed Search View 
Removed the search view from bundle.json because
the search in the left panel is the actualy
UI for searching. The search view is temporary.
 2015-07-22 13:46:40 -07:00
shale
dcd4006017 [Search] Positioning fixed 
Fixed the search results so that they
now display correctly, with overflow
hidden, and no unusual positioning.
Also changed font size to 0.8em.
 2015-07-22 13:43:54 -07:00
Shivam Dave
7aba3b6672 [Mobile] Clean Up 
Removed gap below bottom bar. Moved
around constants for the resizing
of the tree. Also added comments in
layout and reformatted that slightly.
 2015-07-22 12:53:49 -07:00
shale
3ae681c79c [Search] Colors and positioning 
Corrected the colors back to the normal
style. Also made the text on the same
line as the icon, but this fix is a
temporary one.
 2015-07-22 12:33:20 -07:00
shale
ab3d3ec45b [Search] Overflow text 
Overflow text on the search item labels
is now hidden, with ellipses.
New problem: Text is  on a different
line than the icon.
 2015-07-22 11:48:13 -07:00
shale
ff3770c9ee [Search] Added css classes 
Added classes to the HTML so that CSS and
Sass could get access to style the
searchbar items. The structure for styling
is now mostly set up.
 2015-07-22 11:21:14 -07:00
shale
bcc1e2e26f [Search] Starting front-end 
Starting to modify the front-end so that
the searchbar appears in the tree view
area. Made the tree holder have relative
position so that the searchbar is visibile
for now. (Later will be different.)
 2015-07-22 10:38:56 -07:00
Shivam Dave
926b3d075c [Mobile] Clean Up 
Cleaned up scss files. Removed
repeated statements and added
comments. Also commented js files
like QueryService and InfoGesture.
 2015-07-22 10:25:21 -07:00
shale
b5f8e6d90c [Search] Updating searchbar 
Updating the searchbar to be again more
similar to the search view. It now has
a 'load more' button, but it is not
clickable for some reason. In progress.
 2015-07-21 16:21:23 -07:00
Shivam Dave
827cb27f28 [Mobile] Menu 
Added margin to top of tree list items.
Also removed hovering Info coming
up on mobile devices.
 2015-07-21 16:19:59 -07:00
shale
739fa423c5 [Search] Added wildcards to generic 
Added wildcard support to the generic
search provider. In this case, wildcards
behave just like spaces.
 2015-07-21 16:10:35 -07:00
shale
5f30249065 [Search] Load more option 
Made the search view have a 'Load more'
button. Added functionalty to allow this
to happen.
 2015-07-21 15:56:28 -07:00
shale
4191bc1ac3 [Search] Comments 
Updated the documentation.
 2015-07-21 15:31:23 -07:00
shale
92df11acc1 [Search] Readded ElasticSearch provider 
Previously had removed the elasticsearch provider
from bundle.json so could work on the generic
search web worker. Now have modified the
elasticsearch provider to match the new interface
with the aggregator, and it works.

At this point, search is 'working'
 2015-07-21 15:14:07 -07:00
shale
416bd82589 [Search] Cleanup 
Removed a couple of unnecissary things, and fixed
up the comments.
 2015-07-21 15:05:08 -07:00
shale
7934e8d425 [Search] Changed worker result implementation 
The interface remains the same, but the web worker
returns a pseudo dictionary (actually an object)
after being told the search. The key value pairs
for this dictionary are ids and scores.
 2015-07-21 14:55:44 -07:00
Pete Richards
cb56bbe569 [Documentation] Fix JSDoc syntax errors 2015-07-21 14:30:00 -07:00
Shivam Dave
0842f464db [Mobile] Menu Adjustment 
Makes highlight go all the way to right.
Also makes the arrow be absolute on the
right side, making it aligned to right.
 2015-07-21 14:29:13 -07:00
shale
5a93e5a2bc [Search] Correct search updating 
The search controller now updates the display
results list, then repeatedly asks the
aggregator to update until the timestamps
all are at least as new as the one that the
controller originally gave for the query.
Basically, the search now updates correctly
without having to press enter again.
 2015-07-21 14:24:37 -07:00
Shivam Dave
56e51ea32a [Mobile] Reformat of menu 
Reformats menu to move the
arrow to the right and now
that is what selects an object.
Pressing the actual menu item will
enact the dropdown menu. This
only happens on mobile platforms.
 2015-07-21 13:29:45 -07:00
shale
41c38f202d [Search] Comments 
Removed extra commented out code.
 2015-07-21 13:04:03 -07:00
shale
f0f396f656 [Search] Needs more updating 
The search aggregator now correctly gets
from the providers, but because of not
sync, the display is effectively one press
behind the correct search results.
Still, working to some extent.
 2015-07-21 12:59:52 -07:00
shale
a5febf8f0f [Search] Removed paging 
Removed the paging from the search view,
because later instead of paging there will
be a 'view more' option.
Also made the generic search provider
return searchResult objects instead of
raw domain objects.
 2015-07-21 12:44:14 -07:00
shale
4f4af87285 [Search] Added timestamp to queries 
(Temporariliy removed the elasticsearch provider
from bundle.json)
Added a timestamp parameter to the query so that
the aggregator can tell when the results were last
updated. Created a separate function for getting
the results list. GenericSearch now converts back
from models to domain objects after the web worker
does its work.
 2015-07-21 12:34:08 -07:00
shale
1b5fbccc06 [Search] Removed validType function 
Removed the validType function which previously
was a paraemter to the search providers. It
was no longer used, and is not necissary.
 2015-07-21 11:17:45 -07:00
shale
fc123cd367 [Search] In progress webworker 
Connecting GenericSearch to the web worker is still
in progress. The aggregator currently gets the
results before the web worker is finished. In process
of fixing sync issue.
 2015-07-21 11:14:13 -07:00
shale
a0f4b98eed [Search] Webworker search 
The web worker's search() appears to work. Now
we just need to link it in to the GenericSearch
as the primary means of searching.
 2015-07-21 10:35:33 -07:00
shale
7adcfc221a [Serach] Webworker indexes items 
The indexItem() part of the web worker seems
to be working at this point.
 2015-07-21 10:10:34 -07:00
shale
c1dcd8ea5b [Search] Framework of webworker implementation 
Made a basic outline of the desired web worker
implementation. (Functions present, now need to
implement them.)
 2015-07-21 09:58:19 -07:00
shale
74961e1106 [Search] Starting on workers 
Starting to work on using web workers to
do some of the work of GenericSearch.
Changed bundle.json accordingly.
 2015-07-21 09:44:14 -07:00
shale
c79d1f2648 [Search] Choose higher score & optional parameters 
Changed the search aggregator's filterRepeats
function to choose the version of the searchResult
object that has the higher score, when it
encounters multiple searchResult objects
corresponding to a domain object ID.
Also changed the search providers and aggregator
such that the validType parameter is now optional,
with a function that always returns true as the
defualt.
 2015-07-21 09:41:52 -07:00
shale
f4bd7d7a44 [Search] Revert to earlier commit 
Reverted to before implementing next(). May re add
back some changes, such as removing validType and
then adding web workers.
 2015-07-20 17:02:08 -07:00
shale
1891b24bde [Search] Dump before revert 
Commtting changes so far before revering
to a previous commit. Most changes to make
next() have been unneccsiary. We no longer
want next().
 2015-07-20 16:56:39 -07:00
shale
5520037908 [Search] Partial loading 
Changed the providers to return only the first
search result. Each searchResult object has a
function next() which returns the next search
result. This allows the search aggregator to
load more results without making a whole new
search query. (Still requuires some cleaning
up.)
 2015-07-20 14:30:22 -07:00
shale
c0c0371451 [Search] Timeout passed from SearchAggregator 
The timeout value is now an optional
parameter of the providers, and
the search aggregator now passes a
common default value to all of them.
 2015-07-20 11:21:55 -07:00
shale
ed956d351d [Search] Elasticsearch timeout 
Added a term to the elasticsearch query
that should make it time out. Apparently
this only works sometimes, as ES uses a
'best effort' timeout.
 2015-07-20 11:08:43 -07:00
shale
e9e9ca146b [Search] Generic search timeout 
Added a time limit for generic search's indexing
of the filetree, at which point it will just
return the portion of the filetree it has
indexed.
Additioanlly attempted to move this part of
the functionality to a webworker, but is not
working because of unclonability of the
objects. (Commented out)
Also updated some documentation comments.
 2015-07-20 10:59:02 -07:00
Shivam Dave
dcdafbaebf [Mobile] Fix Shift 
Shifting occurring during transition
fixed by making transition backface-
visibility hidden during the
transition.
 2015-07-20 10:25:27 -07:00
Shivam Dave
f98915cddd [Mobile] Comments 
Added comments to the mixin list.
 2015-07-20 09:51:37 -07:00
Shivam Dave
4e6c307684 [Mobile] Transition 
Adjusts transition time on fade.
 2015-07-20 09:48:12 -07:00
Shivam Dave
ce6d74390e [Mobile] Clean-Up 
Removed unnecessary classes. Also added
comments and adjusted menu sizes.
 2015-07-20 09:39:06 -07:00
Shivam Dave
6e406fd060 [Mobile] Right Pane sets 
Right pane sets the size of itself,
causing the left pane to re-adjust
to fit the screen based on it. Also
transitions work on the slide and the
fade in.
 2015-07-20 09:16:28 -07:00
Shivam Dave
2614427e0e [Mobile] Fix 
Fixed to open menu fully.
 2015-07-17 14:32:33 -07:00
shale
e8b662571b [Search] Not case sensitive 
Made sure that generic search's matching is
not case sensitive.
 2015-07-17 14:06:48 -07:00
shale
2a784115d5 Merge branch 'master' of https://github.com/nasa/openmctweb into search 2015-07-17 13:49:19 -07:00
shale
9f5f14826b [Search] Changed generic's matching implementation 
Changed how the generic search provider determines
search matches. It now splits the search input into
search terms by spliting at spaces, and then scores
the results by how many of the terms appear as
substrings in the result.
 2015-07-17 13:49:09 -07:00
shale
c75d94289b [Serach] Callbacks and renaming 
Added validType() as a callback parameter to the search
providers. It is defined in the search aggregator, and
is used to put any restrictions on object type in the
displayed search results.
Renamed EverythingSearchProvider to GenericSearchProvider.
 2015-07-17 11:26:44 -07:00
Victor Woeltjen
2e2e7ee876 Merge branch 'open1444b' into open-master 2015-07-17 11:05:25 -07:00
Victor Woeltjen
affd5f8d29 Merge branch 'open1426' into open-master 2015-07-17 10:56:09 -07:00
Shivam Dave
272c6bca97 [Mobile] Create Menu 
Create menu's is specified/overwritten
with 1000% (change) to fit on mobile).
Also gets rid of the right bar in that view.
 2015-07-17 10:50:02 -07:00
Shivam Dave
0d7387080d [Mobile] Create Menu 
Create menu text has ellipsis
attribute now, so if text is cut off
it will have a '...' appended to it.
Also added comments to mixins.
 2015-07-17 10:28:19 -07:00
shale
492dbcbc51 [Search] Comments and keypress 
Changed the controller for the search input
to respond on keypress rather than keyup.
Added comments better explaining searchResult
objects to the search aggregator.
 2015-07-17 09:33:10 -07:00
Victor Woeltjen
deed95d8d1 [Plot] Don't allocate charts for empty plots 
Don't allocate WebGL charts for empty plots, WTD-1444.
 2015-07-17 09:13:20 -07:00
Shivam Dave
1e2e20b145 [Mobile] Comments 
Added comments to the mixins.
 2015-07-17 09:04:39 -07:00
shale
c82163fa7b [Search] Comments and style 2015-07-16 16:54:53 -07:00
shale
cf3169dd68 [Search] More generalized restrictions 
Moved the EverythingSearchProvider's term to item
matching to new functions, so that they can be
more easily modified later.
 2015-07-16 16:50:11 -07:00
shale
c1ebd50e4c [Search] Result paging 
The search view now can page the
results when there are many.
 2015-07-16 16:31:54 -07:00
Shivam Dave
488829a20c [Mobile] Header 
Removed type from header
along with the right side buttons.
 2015-07-16 16:13:58 -07:00
Shivam Dave
85c7a36e25 [Mobile] Cleaned up 
Set the width of the create menu
text/components to fit the menu
however it gets cuttoff sometimes.
Next steps are to Clean up screen,
change the create menu to fit the left side,
and fix bottom space.
 2015-07-16 15:21:17 -07:00
shale
442a1979e7 [Search] Rudimentary scroing for manual 
Created a rudimentary scoring function for
the EverythingSearchProvider. Also corrected
the sorting by score function.
 2015-07-16 14:36:02 -07:00
Shivam Dave
d99b4d75d8 [Mobile] Fix 
Fixed the desktop version breaking.
CUrrent issue is hte menu is getting cut off.
 2015-07-16 14:07:25 -07:00
shale
922a724e36 [Search] Removed unused file 
Removed SearchService.js, as now the searchService
is implemented using the aggregator and providers.
 2015-07-16 13:26:23 -07:00
Shivam Dave
15a88967d0 [Mobile] Transition/Create Fix 
Fix the create button to work and
also transition well. Added transition mixin
to stay DRY.
 2015-07-16 13:22:07 -07:00
shale
15a9d2380c [Search] Removed unnecissary dependency 
Removed an unnecissary parameter from the
search aggregator ($q).
 2015-07-16 13:11:00 -07:00
shale
80e0bd875a [Search] Aggregator merges results 
The search aggregator now merges search
results from different providers better.
It removed duplicate results, and orders
the list of results from highest to
lowest score.
 2015-07-16 13:08:05 -07:00
Shivam Dave
6e6fbe0d65 [Mobile] Transitions 
Made transitions properly work for
create button.
 2015-07-16 12:54:10 -07:00
Shivam Dave
180e5f14ae [Mobile] Cleaned up 
Made pane sass code more DRY by
using the phoneandtablet mixin
on repeated conditions.
 2015-07-16 12:25:06 -07:00
Shivam Dave
e9314898d2 [Mobile] Portrait & Landsc. 
Specifies amounts based on phone and tablet's
orientation. Not tested for the actual device,
but emulator. Also currently makes the create
button appear/disappear instead of smoothly sliding.
 2015-07-16 11:50:55 -07:00
shale
bc2072b8c6 [Search] Removed unused search provider 
WARP search provider should not be
implemented here. And was not yet
implemented or used at all anyway.
 2015-07-16 11:33:36 -07:00
shale
25208a9074 [Search] Aggregator aggregates 
The search aggregator now combines the search
results from each search provider and returns
that. Objects may appear in the list more
than once.
 2015-07-16 11:31:30 -07:00
Shivam Dave
ce75d19480 [Mobile] Desktop 
Cleans up the _layout by making the different
pane sizes device specific. Also adds a new
sass class just for desktop versions.
 2015-07-16 10:44:20 -07:00
shale
cd3c2312a5 [Search] Basic aggregator works 
The search view now behaves as it
previously did. The search aggregator
is set to just use ElasticSearch, but
it works.
 2015-07-16 10:35:26 -07:00
shale
6f2ad0dadc [Search] Renaming and adding files 
Renamed QueryService as SearchService and changed
the corresponding references to it. Added a
SearchAggregator file and related files. Not
yet begun with the implementation.
 2015-07-16 10:10:07 -07:00
shale
1e05ebbfd7 [Search] Modified default input funct 
Renamed isDefaultInput() to isDefaultFormat(). It
currently just checks for 'name' or 'type' tags,
but it may be completely unneeded.
 2015-07-16 09:56:55 -07:00
shale
c5c3546b92 [Search] Relaxed quote rules 
Allowed quotes more often in search terms.
When there are quotes, that space-separated
term will not get the fuzzy identifier.
 2015-07-15 17:02:51 -07:00
Shivam Dave
a9dd1f9828 [Mobile] Transistions 
Cleaned up and added transitions.
 2015-07-15 16:57:36 -07:00
Shivam Dave
4b5540830b [Mobile] Slide menu 
Rouch menu using important to
overwrite splitter setting of
amounts. Also has default values
for now for all devices.
 2015-07-15 16:49:16 -07:00
shale
672fa74321 [Search] Changed default max results 
Changed the default number of max results to
be 100 results.
 2015-07-15 16:46:38 -07:00
shale
3fcf061679 Merge branch 'master' of https://github.com/nasa/openmctweb into search-explore 2015-07-15 16:15:25 -07:00
Victor Woeltjen
e400f211c4 Merge remote-tracking branch 'nasa/open1404' into open1427 
Merge in preparation for review/integration, WTD-1427

Conflicts:
	platform/commonUI/general/res/templates/containers/accordion.html
 2015-07-15 13:45:37 -07:00
Shivam Dave
ee35976c92 [Mobile] Tree Mobile 
Added mobile/_tree.scss and edited
normal tree.scss to accomodate for
future sass that adjusts the tree
menu.
 2015-07-15 13:30:06 -07:00
shale
b94ef695e2 [Search] Creating searchbar 
Starting to create a search bar which lives
in the same side of the divder as the file
tree does.
 2015-07-15 13:29:45 -07:00
Shivam Dave
54b6cd1100 [Mobile] Debug 
Added debug statement to print
to console.
 2015-07-15 13:28:42 -07:00
shale
759eaa3b35 [Search] Comments 2015-07-15 12:39:22 -07:00
shale
eee9309650 [Search] Fuzziness operator 
Insead of wildcards, adding the fuzziness
operator to searches to ensure completeness
of the search results.
 2015-07-15 12:14:30 -07:00
shale
e634d77a8e [Search] Add wildcards 
Added wildcards to most searches at the
front and end of each word that is separated
by spaces.
 2015-07-15 11:39:02 -07:00
shale
06b26b799e [Search] Comments 2015-07-15 11:10:04 -07:00
shale
d6720884f1 [Search] Elasticsearch search options 
Changed the search term processor to allow
the name and type options again (for
elasticsearch).
 2015-07-15 10:52:27 -07:00
shale
eb5946c1c1 [Search] Documentation 
Gave more verbose descriptions of queryManual
and queryElasticsearch.
 2015-07-15 10:49:24 -07:00
shale
227cb42ba7 [Search] Comments 2015-07-15 10:24:43 -07:00
shale
3420eb69d3 [Search] Manual max results option 
Manual search now takes a max number of
results option, just like the elasticsearch
version.
 2015-07-15 10:17:59 -07:00
shale
6b3088f241 [Search] Manual search works 
Manual search which does not use elasticsearch
implemented. It matches based on if the name
contains the search term as a substring.
 2015-07-15 10:13:14 -07:00
shale
fdcc6432f1 [Search] Reduced term processing 
Term processing may be unnecissary. Now it
is limited to removed spcaes from the front
and end.
 2015-07-15 09:25:10 -07:00
shale
f8e028a5d1 [Search] Outlined new function 
Started a new search function which manually
indexes all of the items in the tree. Still
not fully functional.
 2015-07-14 17:06:55 -07:00
Victor Woeltjen
ea19bde1e7 [Telemetry] Provide empty series 
Provide an empty series when a historical telemetry request
does not return anything for a given telemetry point.
Addresses WTD-1426.
 2015-07-14 15:51:13 -07:00
shale
5e6f1214fb [Search] Live search 
As the user types, search happens with each
new keypress, so the user does not need to
press enter. (But can press enter as well.)
 2015-07-14 15:24:51 -07:00
shale
0371e2e314 [Search] Made maxResults bigger 
Made it so that the default maximum
number of results is a larger number.
 2015-07-14 14:26:45 -07:00
Shivam Dave
0f89e98a71 [Mobile] Clean up 
Cleaned up layout and added phone only hider.
Also added tree.scss file, where all tree
node classes will be placed.
 2015-07-14 14:14:12 -07:00
shale
aa091a9d26 [Browse] Update tests 
Removed reference to destroy() in the
context menu action test. #33, #47.
 2015-07-14 13:53:00 -07:00
shale
1455e5d8b5 [Browse] Removed destroy functions 
Removed destroy functions from menu arrow
controller and contetxt menu action as
suggested. #33, #47.
 2015-07-14 13:25:25 -07:00
shale
d1b55bd43e Merge branch 'master' of https://github.com/nasa/openmctweb into open33 2015-07-14 13:20:37 -07:00
Shivam Dave
6f07a21bb8 [Mobile] Clean-up 
Cleaned up scss and also, the
edit/new tab/full screen buttons are
hidden in mobile, temporarily.
 2015-07-14 13:10:28 -07:00
shale
dcb5af87a7 [Search] Moved result processing 
Moved result processing to its own function.
 2015-07-14 13:09:06 -07:00
shale
35d038e826 [Search] Processing as separate function 
Moved the search term processing to be its
own separate function.
 2015-07-14 12:55:00 -07:00
shale
27c7410318 [Search] Moved hard coding 
Moved where the search type is
prepended to the search term, to
allow future changes to it.
 2015-07-14 12:39:00 -07:00
shale
7c627fae8f [Search] More search options 
If the user searches with quotes (" or ') around
the search term, then the term processor will
not put wildcards around the search term.
 2015-07-14 12:32:56 -07:00
shale
bf0e6692f5 [Search] Comments 
Added comments to better explain how
input processing works.
 2015-07-14 11:41:23 -07:00
shale
1d0d2302d8 [Search] Moved functionality into QueryService 
Moved the actual searching implementation
into the query service. The search view
controller now just calls the query service.
 2015-07-14 11:31:53 -07:00
shale
1a8fd38430 [Search] Max results 
Changed the default number of results to be
a max of 25, and added a parameter to allow
the user to set this. (May be used in an
advaned search later?) Because folders are
filtered out, the number displayed is not
necissarily exact.
 2015-07-14 10:56:52 -07:00
shale
503811f69c [Search] Search behaves as expected 
Seaching any substring of a domain
object title now will give the domian
object as a search result. Still not
case sensitive. Empty string will
return all results. Special characters
do not search correctly. Still has
result number cap.
 2015-07-14 10:51:03 -07:00
shale
5892594668 [Search] More robust search 
Seach now searches using terms, which
are the domain objects' names split
at the spaces. Still does not work with
any substring, must be space separated.
Not case sensitive.
 2015-07-14 10:37:57 -07:00
shale
b9f8f6e33d [Search] Code style 2015-07-14 10:02:27 -07:00
shale
457193657f [Search] Added input ID parameter 
Added a parameter to the controller's search
function so that the html side can clearly
see/choose which input ID is being used as
the search input.
 2015-07-14 09:59:48 -07:00
shale
c92d15ba42 [Search] Cleanup 
Added and removed some comments, for clarity
 2015-07-14 09:55:26 -07:00
shale
d7dd53c2da [Search] Checks for folders 
Search now (again) checks to not add
folders to the results list. This later
should be made into a policy.
 2015-07-14 09:45:31 -07:00
shale
b35fddefc0 [Search] Removed getObjectByID 
Was no longer necissary with the current
method of search() getting objects.
 2015-07-14 09:38:44 -07:00
shale
07e08c283a [Search] Partway works 
The search function now returns actual
objects are results. They may not be the
correct results though.
 2015-07-14 09:36:58 -07:00
shale
89d0ea6506 [Search] Fixed uninitialized array bug 2015-07-14 09:17:14 -07:00
shale
75ce5cd0e9 [Search] Changed variable names 
Because of the async funtion, changed
variable names in serach2 to make more clear.
 2015-07-13 17:05:23 -07:00
Shivam Dave
9a7bbd92bd [Mobile] Cleaned up 
Cleaned up the transistion css to
be more DRY.
 2015-07-13 17:04:14 -07:00
shale
b994b2a862 [Search] Style 2015-07-13 16:57:27 -07:00
shale
3cb0b41b22 [Search] Poking around EasticSearch 
Sucessfully queries elasticsearch, but displaying the
results poses problems because of asych things.
 2015-07-13 16:53:48 -07:00
Shivam Dave
edcafc5835 [Mobile] Remove Bar 
Remove the splitter bar on mobile
and tablets.
 2015-07-13 13:56:44 -07:00
Shivam Dave
7d09df9a85 [Mobile] Constants 
Re-edited media query constants
to be cleaner and consistent.
 2015-07-13 13:11:27 -07:00
Shivam Dave
b00eee00fc [Mobile] Redefine 
Renames variables to be clearer.
Breaks up constants into parts to be
cleaners and straightforward. Also
removed the ratio.
 2015-07-13 13:02:57 -07:00
Shivam Dave
c0d83f9395 [Mobile] Format 
Reformatted the rwd media
query rules.
 2015-07-13 12:39:09 -07:00
Shivam Dave
be757066f5 [Mobile] Desktop adjusted 
Adjusted the desktop to accomodate browser
orientation changes. Done so by forgoing
checking the orientation because the
actual device can be in landscape, but it
reads orientation based on the viewport.
 2015-07-13 11:18:51 -07:00
shale
5980575918 [Search] Fixed results display problem 
Fixed problem with search results not
properly being displayed in the search
view. (Checked that things were defined
before calling them.)
 2015-07-13 11:14:02 -07:00
shale
409d12aa75 [Search] Created QueryService 
Created a query service which handles the
creation of the searchable list of items.
This has partially broken the search view.
 2015-07-13 10:34:06 -07:00
Shivam Dave
885433390e [Mobile] Fix for emu and act 
Adds 2 landscape conditions for tablets and
phones to check if they are in landscape, in
the actual tablet, or in an emulate of the tablet,
then it displays.
 2015-07-13 10:32:58 -07:00
Shivam Dave
687f810475 [Mobile] Constants 
Fixed width constant to work for laptop.
 2015-07-13 10:23:28 -07:00
Shivam Dave
137a60f510 [Mobile] Constants 
Fixed constants to work for laptop.
 2015-07-13 10:16:52 -07:00
Dave
46d5a1431f [Mobile] Added Constants 
Rixed mis-initialized desktop
constant
 2015-07-13 09:24:01 -07:00
Dave
404d02ec23 [Mobile] Added Constants 
Re-edited constants to set min
ones for the desktop screen, that
is based on the device size.
 2015-07-13 09:17:59 -07:00
shale
03c0678cbe [Search] Syle modifications 
Changed 'i += 1' in for loops to 'i++'
 2015-07-10 16:54:42 -07:00
shale
04257aedae [Search] Gets user input 
Now sucessfully gets user input for the
search term.
 2015-07-10 16:52:00 -07:00
shale
33b30f7583 [Search] Removed unnecissary variable 
Removed $scope.items, because it was unnecissary.
 2015-07-10 15:16:50 -07:00
shale
8eda495aa7 [Search] Results without folders 
Folders are now no longer included in
the results list.
 2015-07-10 15:06:19 -07:00
shale
a337e04fae [Search] Removed unnecessary file 
Removed search-item.html, as it was the same as
grid-item.html. Now search.html uses grid-item.html.
 2015-07-10 14:51:18 -07:00
shale
2e7f23a766 [Search] Results list displayed 
After searching, a results list is displayed.
The list is composed of grid-items.
 2015-07-10 14:48:15 -07:00
shale
6d1cb85a07 [Search] Not case sensitive 
Search is no longer case sensitive.
 2015-07-10 14:20:04 -07:00
shale
b5756d2b99 [Search] Items list updating 
The search results now updates the items
list when called to make sure that it gets
all of the recently added items.
 2015-07-10 12:53:12 -07:00
Shivam Dave
eec955317a revert back to 
4d9dc3624b
 2015-07-10 12:47:00 -07:00
shale
efba0f0236 [Search] Search results by name 
doSearch() does search by getting each
object's name. Still buggy.
 2015-07-10 12:44:07 -07:00
Dave
67890a7298 [Mobile] Test 2015-07-10 12:38:04 -07:00
Dave
dd457f26c6 [Mobile] Device 
Added max width to tablet check.
 2015-07-10 12:32:34 -07:00
Dave
85c6bda5c9 [Mobile] Device 
Adjusted Tablet slide Constant.
 2015-07-10 12:21:13 -07:00
Dave
b7b5f87002 [Mobile] Device 
Adjusted Comp Constant.
 2015-07-10 12:16:43 -07:00
Dave
b0c5d807e7 [Mobile] Device 
Removes splits desktop
settings into 2, one
for landscape and another
for portrait.
 2015-07-10 11:51:56 -07:00
Dave
4d4776e0ef [Mobile] Device 
Removes desktop mixin settings
that do not use device width and
height.
 2015-07-10 11:40:57 -07:00
Dave
61e1aeb1d8 [Mobile] Device 
Removes desktop mixin settings
that do not use device width and
height.
 2015-07-10 11:40:14 -07:00
Dave
9caa603a65 [Mobile] Device 
Removes desktop mixin settings
that do not use device width and
height.
 2015-07-10 11:36:45 -07:00
Dave
5c99e469d5 [Mobile] Device Change 
Now instead of min-width, max-width,
... etc, uses the device-width/height.
This allows the devices to use the slide
menu while the browser on a desktop
consistently stays as desktop mode, no
matter if it is resized. As a result of this
the rwd is clear on phones/tablets, but not if
user resizes browser super small.
 2015-07-10 11:29:30 -07:00
Dave
4d9dc3624b [Mobile] Items 
Item icons disappear now on
tablets and mobile devices.
Adjusted _items.scss to adjust the
icon class display for phones and
tablets.
 2015-07-10 11:12:09 -07:00
Dave
d3ae4b729f [Mobile] More consistent 
More consistent when moving from
landscape to portrait and
vice-versa on devices. However
still encountering issue with
the browser being resized.
 2015-07-10 10:56:48 -07:00
shale
4e39c4f900 [Search] Finds root folder 
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.
 2015-07-10 10:32:58 -07:00
Dave
30bed434fe [Mobile] Moved variables 
Moved variables used for amount of
side bar and slide amount into the
mobile/_constants.scss file.
 2015-07-10 09:02:46 -07:00
Dave
3e4ae4d38d [Mobile] 
Reverted changes to original controller file.
 2015-07-09 15:38:53 -07:00
Dave
7414275a85 [Mobile] 
Reverted changes to original scss file.
 2015-07-09 15:37:03 -07:00
Dave
fcb0033864 [Mobile] 
Reverted changes to css file.
 2015-07-09 15:32:41 -07:00
Dave
f079471a18 [Mobile] 
Reverted changes to scss file.
 2015-07-09 15:31:35 -07:00
Dave
1fb1174c0a [Mobile] Clean-Up 
Removed unused scss constant
.
 2015-07-09 15:19:29 -07:00
Dave
635e1eda69 [Mobile] Clean-Up 
Removed unused menu button and
cleaned up treeCl to be treeClass.
 2015-07-09 15:14:36 -07:00
Dave
40d53f941f [Mobile] TreeMenuController 
Removed the TreeMenuController.js file
and from the bundle. What this achieves
is already done in BrowseController.js
 2015-07-09 14:46:36 -07:00
shale
e339ee1dd1 [Search] Asynchronous recursion 
The list creation now sucessfully goes 1 level
deep into the tree for objects. Still needs
more work to delve into subfolders.
 2015-07-09 14:40:52 -07:00
Dave
684a0e88a2 [Mobile] Constants 
Added constants to the
mobile one with device
height.
 2015-07-09 14:26:02 -07:00
Dave
30a4f15330 [Mobile] Adjusted 
Adjusted the _layout.scss to
have a function that makes
something disappear on phone
and tablet.
 2015-07-09 14:11:51 -07:00
Dave
dfd08000f1 [Mobile] Adjust 
Adjusted the tablet amount
that the slide occurs.
 2015-07-09 13:42:07 -07:00