Commit Graph

1662 Commits

Author SHA1 Message Date
slhale
31337eaf4f [Search] Text clear size & hover
The search bar clear button now gets
highlighted when hovered over, and the
click area is slightly larger.
2015-08-14 15:38:02 -07:00
Victor Woeltjen
3e8ea972c2 [Code Style] Use prototypes in persistence bundles
WTD-1482
2015-08-14 15:26:24 -07:00
slhale
0f6287e715 [Search] Fix overflow
Fixed the text positioning in the filter
options display so that the text does not
overflow the bottom.
2015-08-14 15:22:53 -07:00
slhale
0cfd881510 [Search] Menu transition and highlights
The search menu fades in and out when open
and closed. Hovering over 'ALL' in the
menu now highlights it.
2015-08-14 15:05:54 -07:00
Victor Woeltjen
edca2a9f03 [Code Style] Use prototypes in framework layer
WTD-1482
2015-08-14 14:50:48 -07:00
slhale
cc05c50769 [Search] Smaller checkbox size
in the search menu.
2015-08-14 14:11:26 -07:00
slhale
adbb3486c5 [Search] Added ClickAwayController test
Added a test for the click away controller. Because
the controller was copied from
platform/commonUI/general, so was the test.
2015-08-14 13:56:27 -07:00
slhale
ced1609e51 [Search] Update tests
Updated SearchController test for the addition of the
controller's dependency on types[].
2015-08-14 13:52:57 -07:00
Victor Woeltjen
7fe866060b [Code Style] Use prototypes in forms bundle
WTD-1482.
2015-08-14 13:44:08 -07:00
slhale
7bc9b83aac [Search] Remove unused watch 2015-08-14 13:35:49 -07:00
slhale
d6d16f8f1c [Search] Font and spacing
Use em for filter options positioning. Cursor
as pointer for menu. Results list padding fix.
2015-08-14 11:58:32 -07:00
slhale
bcea3832ed [Search] Search menu & display tweaks
Clicking on names of options in the search
menu will now toggle the checkboxes. The
filter options display now says when no
filters are selected. Slightly moved the
search menu to the left.
2015-08-14 11:06:40 -07:00
slhale
94662cb904 [Search] Search filter options display style
Created a box around the options display.
2015-08-14 10:52:03 -07:00
slhale
26ab9af911 [Search] Dynamic positioning and height
The scroll bar for the search results changes
height according to how many filter options
are displayed above it, without dissapearing
below the bottom of the page.
2015-08-14 10:19:13 -07:00
slhale
f38b89a582 [Search] style 2015-08-13 16:56:58 -07:00
slhale
c17ec19f97 [Search] Filter options display styling 2015-08-13 16:54:15 -07:00
slhale
2ca7a175bd [Search] Relative positioning
Search results list now displays below the
filter options display dynamically.
2015-08-13 16:40:51 -07:00
slhale
371b690072 [Search] Fix filter display names
Changed form type keys to names
2015-08-13 16:23:13 -07:00
slhale
c62e73f863 [Search] Checkbox style
Changed the checkboxes to be not blue.
2015-08-13 16:06:10 -07:00
slhale
5726dd0e0c [Search] Filter display
Added display below the search bar of what
search filters are currently active.
Not yet correctly aligned wrt search
results list.
2015-08-13 15:11:22 -07:00
Victor Woeltjen
1c187c3914 [Code Style] Begin refactoring forms bundle
WTD-1482
2015-08-13 14:44:27 -07:00
slhale
74cf4d73d5 [Search] Hover transitions 2015-08-13 14:22:07 -07:00
slhale
c8694f182a [Search] Menu opening
Menu opens when icon is pressed. Closes when
cliked away from, but not when clicked on.
2015-08-13 13:59:56 -07:00
slhale
2e767c94c4 [Search] Update load-more, add check-all
Make the 'Load more' button work with the
new filtered results. Added 'ALL' to the top
of the search menu which allows the user to
toggle all of the filtering options easily.
2015-08-13 13:19:25 -07:00
Victor Woeltjen
6302eee17e [Code Style] Use prototypes in Scrolling List bundle
WTD-1482.
2015-08-13 12:35:48 -07:00
Victor Woeltjen
820c15d74c [Code Style] Use prototypes in Plot bundle
WTD-1482.
2015-08-13 12:12:15 -07:00
slhale
b26aa3cab7 [Search] Filter search
Filtering search using the search menu works.
Load more does not work with this yet.
2015-08-13 11:45:46 -07:00
slhale
c51856522c [Search] Menu checkboxes and labels
Added checkboxes with styling to the menu. Set
up a types list for the menu.
2015-08-13 10:59:12 -07:00
Victor Woeltjen
aefad6fdd3 [Code Style] Continue refactor of Plot bundle
Continue refactoring Plot bundle to use prototypes,
WTD-1482
2015-08-13 10:26:04 -07:00
slhale
a9c85d5241 [Search] Search menu style
Added caret to top of menu.
2015-08-12 16:38:38 -07:00
slhale
edf52f32ad [Search] Search menu
Creating a search menu which will allow for
more specific search options.
So far have started top-down with styling.
In progress.
2015-08-12 16:13:36 -07:00
Victor Woeltjen
18bc7d3637 [Code Style] Begin using prototypes in Plot bundle
WTD-1482
2015-08-12 14:49:03 -07:00
Victor Woeltjen
175490e1f7 [Code Style] Use prototypes in Web Page bundle
WTD-1482
2015-08-12 14:32:05 -07:00
Victor Woeltjen
3492cd3942 [Code Style] Fix bug introduced by refactor
Do some extra checking, since capabilities may have
properties which are note methods. WTD-1482.
2015-08-12 13:57:17 -07:00
Victor Woeltjen
ed53808556 [Code Style] Use prototypes in Layout bundle
WTD-1482
2015-08-12 13:45:48 -07:00
slhale
41ddb76385 [Search] Remove unnecissary line 2015-08-12 13:24:39 -07:00
slhale
94531a39d0 Merge branch 'master' of https://github.com/nasa/openmctweb into searchservice 2015-08-12 13:17:17 -07:00
slhale
eefc746567 [Search] Fix results display
Search results are now properly displayed again.
2015-08-12 13:05:30 -07:00
slhale
0218bad9e8 [Search] Clear icon padding and transition 2015-08-12 12:58:22 -07:00
slhale
dd993c81a7 [Search] Clear icon working
Clicking on the clear icon now clears
the input text in the search bar.
2015-08-12 12:46:01 -07:00
slhale
a76e54483a [Search] Clear icon tweaks
Comments and CSS. Still not clickable.
2015-08-12 11:20:02 -07:00
slhale
515470fa6a [Search] Timeout length & indexed check
Changed timeout to 0 ms. Changed check for
already indexed to an empty return.
2015-08-12 11:03:10 -07:00
slhale
cab675c8ca [Search] Timeout length & indexed check
Changed timeout to 0 ms. Changed check for
already indexed to an empty return.
2015-08-12 10:57:37 -07:00
slhale
3555f41f3e [Search] Adding clear text button
It is in place, but clicking on it does nothing yet.
2015-08-12 10:27:34 -07:00
slhale
9dd520f17b [Search] Break up item indexing
Use timeouts to make the generic search's item
indexing not block up the page.
Updated tests accordingly.
2015-08-12 10:06:27 -07:00
Victor Woeltjen
a9e2d48036 [Code Style] Use prototypes in Imagery bundle
WTD-1482
2015-08-12 09:57:05 -07:00
slhale
0520f1c70c [Search] Update tests
Test creation of the generic search provider
provides mock timeout argument. Slight change to
tree indexing test due to use of useCapability
function.
2015-08-12 09:53:23 -07:00
slhale
3b62f1a979 [Search] Break up item indexing
Use timeouts to make the generic search's item
indexing not block up the page.
2015-08-12 09:42:21 -07:00
Victor Woeltjen
d701567b70 [Code Style] Use prototypes for Events bundle
WTD-1482
2015-08-11 16:01:16 -07:00
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
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
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
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
slhale
5fa6db72d2 [Search] More controller tweaking 2015-08-04 16:50:50 -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
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
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
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