Commit Graph

911 Commits

Author SHA1 Message Date
Charles Hacskaylo
682601477c
Add glyphs (#2667)
- icon-flag for use with VISTA Frame Accountability;
- icon-conditional, and bg-icon-conditional for Conditionals;
2020-02-13 13:11:24 -08:00
Joel McKinnon
b6b5cfe403 fixed default state of output selector 2020-02-13 10:52:37 -08:00
Joel McKinnon
b6ce9c6ed7 trigger label and add divider 2020-02-12 15:58:17 -08:00
Joel McKinnon
6e5e8f0ce8 refactored setOutput 2020-02-12 13:31:55 -08:00
Joel McKinnon
2415d785cc fixed set output field 2020-02-12 12:45:38 -08:00
Joel McKinnon
2b5d6beb84 resolved conflicts 2020-02-12 11:14:17 -08:00
Joel McKinnon
86316d8940 Add multiple criteria, set and persist inputs 2020-02-12 10:41:43 -08:00
Joel McKinnon
1f2b5ec5c8 WIP: separating criterion level logic to its own component 2020-02-11 10:28:59 -08:00
David Tsay
379e37c881
Merge branch 'master' into pane-persistence 2020-02-06 16:17:59 -08:00
Joel McKinnon
8db6f8f633 criteria component WIP 2020-02-06 15:22:56 -08:00
Joel McKinnon
79557165a3 refactored condition and conditionEdit components into single component named condition 2020-02-06 11:53:31 -08:00
Joel McKinnon
ec1d4abde9 before Deep comments 2020-02-06 07:23:32 -08:00
Joshi
07c5e2800a Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into condition-clone 2020-02-04 15:19:11 -08:00
Joshi
79811d6662 Merge condition-ui branch into this. 2020-02-04 15:12:33 -08:00
Joshi
7029dcf09e Merge commit 'e580734c9593ab863f397b52ec9662f045fc7b61' of https://github.com/nasa/openmct into condition-ui-redo 2020-02-04 14:37:39 -08:00
Deep Tailor
b6220288ac
Merge branch 'master' into f#2594 2020-02-03 13:36:29 -08:00
Joel McKinnon
fc03b3a79d updateTemetry failing to return object on line 328 2020-02-02 08:22:23 -08:00
Joel McKinnon
096d6371f1 add condition no errors 2020-02-01 10:07:40 -08:00
Shefali Joshi
e580734c95
Set criteria options (#2630)
* Set criteria options on condition edit

* Persists telemetry options correctly and loads them on mount

* Fixes saving the input value for criteria

* Display active condition's output in read only view

* Destroy classes and unsubscribe when condition set view is destroyed

* Fixes saving the input value for a criteria

* Handle telemetry removal

* Fixes tests

* Addresses comments - change function names, consolidate compute function

* Addresses review comments
- Use camelCase for events (did not change properties as eslint complains)
- Reduce repeated property access by assigning to a variable
- Use descriptive variable name

* Addressing comments - improves input value field visibility logic

* Change variable name to reflect intent
2020-01-31 14:44:28 -08:00
Joel McKinnon
2690156a9d changed kebab-case event names to camelCase 2020-01-31 13:44:07 -08:00
Joel McKinnon
7ac7a40b1b resolve merge conflicts 2020-01-31 13:21:31 -08:00
Joshi
dc9e572052 Change variable name to reflect intent 2020-01-31 13:10:36 -08:00
Joshi
b15ebfd492 Addressing comments - improves input value field visibility logic 2020-01-31 13:08:41 -08:00
Joel McKinnon
8baee7a0c9 WIP: debugging 2020-01-31 09:54:37 -08:00
Joel McKinnon
dc85063467 added isDragging prop to prevent other drag actions 2020-01-31 08:08:39 -08:00
Joel McKinnon
be428b326e Merge branch 'condition-ui' of https://github.com/nasa/openmct into condition-ui 2020-01-30 15:12:34 -08:00
Joel McKinnon
dd0e360709 addressed review comments 2020-01-30 15:11:47 -08:00
Joel McKinnon
04da88e3b4 addressed review comments 2020-01-30 14:53:19 -08:00
Joel McKinnon
9bcab02e35 WIP add criteria 2020-01-30 12:02:08 -08:00
Joshi
1ff4d41b7c Addresses review comments
- Use camelCase for events (did not change properties as eslint complains)
- Reduce repeated property access by assigning to a variable
- Use descriptive variable name
2020-01-30 11:06:25 -08:00
Joel McKinnon
04a5c8f69f resolve merge 2020-01-29 16:23:13 -08:00
Joel McKinnon
8886a94a01 fixed merge conflict 2020-01-29 14:48:22 -08:00
Joshi
f25eebdf3f WIP - Adding criteria using this.currentCriteria 2020-01-29 14:43:12 -08:00
Joel McKinnon
f9ba46fe85 added button and set up iteratable render of criteria 2020-01-29 12:45:34 -08:00
Joshi
6f6fb859d6 Merge branch 'condition-ui' of https://github.com/nasa/openmct into set-criteria-options 2020-01-28 16:33:38 -08:00
Joel McKinnon
1e3389b427 Merge branch 'condition-reorder' of https://github.com/nasa/openmct into condition-reorder 2020-01-28 16:32:07 -08:00
Joel McKinnon
c977c64139 added drag image and grab cursor 2020-01-28 16:31:01 -08:00
Joshi
e419149378 Addresses comments - change function names, consolidate compute function 2020-01-28 16:27:30 -08:00
Joshi
a5a3e41d21 Merge branch 'condition-ui' of https://github.com/nasa/openmct into condition-clone 2020-01-28 13:03:43 -08:00
Joshi
ecef8eaf86 Merge branch 'condition-ui' of https://github.com/nasa/openmct into condition-reorder 2020-01-28 12:40:33 -08:00
Joshi
de03cfbe64 Merge branch 'condition-ui' of https://github.com/nasa/openmct into condition-ui 2020-01-28 12:36:57 -08:00
Joel McKinnon
03a6de55d6 typo in comment 2020-01-28 12:16:18 -08:00
Joel McKinnon
3c5047df5e passed definition prop instead of just name 2020-01-28 12:10:21 -08:00
Joel McKinnon
3cc630d4c2 added testdata toggle control 2020-01-28 11:44:29 -08:00
Joshi
b3488c54cd Fixes tests 2020-01-28 10:36:13 -08:00
Joel McKinnon
01b1d66bea duplicate condition complete 2020-01-28 10:05:58 -08:00
David Tsay
2e82edb306 remove unused var 2020-01-27 13:44:56 -08:00
David Tsay
8f0e773ac1 remove storing navigated to local storage 2020-01-27 13:43:13 -08:00
David Tsay
223a0feada comments to describe localStorage implementation 2020-01-27 10:17:27 -08:00
Joel McKinnon
bc9cadaa77 fixed reorder bugs 2020-01-27 09:34:50 -08:00
David Tsay
0fd0da8331 rework local storage mechanisms
* use one navigated local storage item instead one per node

* use one expanded local storage item instead of one per node

* fix navigated

* collapse children when node collapsed
2020-01-27 01:06:40 -08:00
Joshi
f42ec7e2c5 Handle telemetry removal 2020-01-26 23:30:19 -08:00
Joshi
d6a422fbdb Fixes saving the input value for a criteria 2020-01-26 22:56:21 -08:00
Joshi
d98b54bea7 Destroy classes and unsubscribe when condition set view is destroyed 2020-01-26 22:21:06 -08:00
Joshi
0beda1d053 Display active condition's output in read only view 2020-01-26 22:19:27 -08:00
Joshi
e912ab8f4e Fixes saving the input value for criteria 2020-01-26 22:14:26 -08:00
Joel McKinnon
5055a18ca1 reorder wip 2020-01-25 12:46:15 -08:00
David Tsay
fa21911287 persist expanded and navigated state of node to local storage 2020-01-25 00:52:36 -08:00
Joel McKinnon
96746f4042 drag to reorder conditions 2020-01-24 13:23:02 -08:00
Joshi
b22ad3ded9 Persists telemetry options correctly and loads them on mount 2020-01-24 11:26:31 -08:00
Joel McKinnon
7e0f475c63 style changes for dnd 2020-01-23 16:13:28 -08:00
Joshi
efb3c2b71e Merge branch 'condition-ui' of https://github.com/nasa/openmct into set-criteria-options 2020-01-23 15:54:24 -08:00
Joshi
862ea6986f Set criteria options on condition edit 2020-01-23 15:51:08 -08:00
Joel McKinnon
cfa5dcb02e drag wip 2020-01-23 12:16:16 -08:00
Joshi
23aaada79d Evaluate telemetry criterion results and display the output of conditions accordingly 2020-01-23 12:08:28 -08:00
Joel McKinnon
9e4458db10 fix merge conflicts 2020-01-23 10:28:59 -08:00
Joel McKinnon
a8da06033c condition view with highlighting of current condition, add/remove condition, change name, output and persist 2020-01-23 10:24:53 -08:00
Joshi
0bf3597147 Display the current output based on the first condition that has evaluated to true.
Fix remove condition
2020-01-22 21:35:22 -08:00
Joshi
cfd9730055 Adds missing updated method
Adds definition property to CurrentOutput
2020-01-22 13:45:32 -08:00
Joshi
e88ead30dc Merge branch 'condition-from-identifier' of https://github.com/nasa/openmct into conditionSet-ui-merge 2020-01-22 13:39:08 -08:00
Joshi
67b24ce846 Persist conditionCollection to the conditionSet
Populate persisted operation
2020-01-22 13:29:01 -08:00
Joel McKinnon
709c3fff65 no current output rendered 2020-01-22 13:15:44 -08:00
Joshi
ab6e87ae6b Updates to operation show up in conditionclass 2020-01-22 13:01:23 -08:00
Joshi
cdb7066bed Moves condition class initialization to conditionEdit component
sets correct condition output in condition edit component
2020-01-22 12:07:14 -08:00
Joel McKinnon
73d0507f1f persist name change 2020-01-22 11:15:49 -08:00
Joel McKinnon
4d263bcf32 added persist for remove 2020-01-22 08:53:25 -08:00
Joel McKinnon
2d8f61172d fixed remove 2020-01-22 08:17:03 -08:00
Joel McKinnon
621c1dc11e renders current output section 2020-01-21 16:00:21 -08:00
Joel McKinnon
dd136a5ff4 WIP: set current condition 2020-01-21 13:37:36 -08:00
Joshi
82be503f4f Fix broken rendering 2020-01-17 13:00:41 -08:00
Joshi
7feb933519 Fix errors after converting conditionCollection to persist identifiers only 2020-01-17 11:26:46 -08:00
Joshi
7b7c7b528a 1. Persist the condition domain object — done
2. Persist the condition identifier only in configuration.conditionCollection array, not the domain object — done
3. WIP - Retrieve the condition domain object and instantiate the condition classes on load
2020-01-16 16:11:23 -08:00
Joshi
bf1efaf912 Merge branch 'condition-class' of https://github.com/nasa/openmct into conditionSet-with-classes 2020-01-16 15:47:34 -08:00
Joshi
ff2bc41317 Merge branch 'telemetry-criterion' of https://github.com/nasa/openmct into conditionSet-with-classes 2020-01-16 15:47:04 -08:00
Joshi
bdaf8aff15 Merge branch 'condition-view' of https://github.com/nasa/openmct into conditionSet-with-classes 2020-01-16 15:46:28 -08:00
Joshi
1dc4f9f6bb Fixes this for the handleConditionUpdated function 2020-01-16 15:44:59 -08:00
Joshi
d6320f5da1 Fixes this for initilize function 2020-01-16 15:43:33 -08:00
Joshi
276be5e857 Merge branch 'condition-class' of https://github.com/nasa/openmct into conditionSet-with-classes 2020-01-16 15:36:29 -08:00
Joshi
3101e77ecc Merge branch 'telemetry-criterion' of https://github.com/nasa/openmct into conditionSet-with-classes 2020-01-16 15:34:53 -08:00
Joshi
ab6dae16f1 Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionSet-with-classes 2020-01-16 15:32:40 -08:00
Joshi
36222d79c6 Updates copyright, jsdocs, small refactor 2020-01-16 15:30:49 -08:00
Joel McKinnon
08656a6674 persist output string selection 2020-01-16 15:29:07 -08:00
Joshi
8034317796 Merge branch 'telemetry-criterion' of https://github.com/nasa/openmct into condition-class 2020-01-16 15:08:15 -08:00
Joshi
a59f3a550e Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into condition-class 2020-01-16 15:07:57 -08:00
Joshi
415b967c0b Addresses code review comments
- Change copyright to 2020
- Fix class parameters, tests
2020-01-16 15:03:14 -08:00
Joel McKinnon
642499d519 added string output field 2020-01-16 09:56:17 -08:00
Joel McKinnon
fa0a54eee7 css fixes and add any/all control 2020-01-16 09:13:43 -08:00
Joel McKinnon
82f175f6c7 fixed style issues and added default select labels 2020-01-15 17:59:51 -08:00
Shefali Joshi
8df549e8d9 Addresses comments from PR: https://github.com/nasa/openmct/pull/2621 (#2623)
* Addresses comments from PR: https://github.com/nasa/openmct/pull/2621

* Fixes import path.
2020-01-15 15:39:31 -08:00
Joshi
9fd720777b Merge branch 'conditionSet-view' of https://github.com/nasa/openmct into conditionSet-with-classes 2020-01-15 11:28:18 -08:00
Joshi
4c68c725b1 Adding telemetry options to ConditionEdit 2020-01-15 10:51:45 -08:00
Joel McKinnon
06a5207c6d deriving current output from current (blue) condition output and persisting 2020-01-14 17:07:32 -08:00
Joel McKinnon
78b885c508 using current condition output for current output label 2020-01-14 13:44:19 -08:00
Joshi
a18a3b6099 Adds telemetry objects on composition add 2020-01-14 13:32:13 -08:00
Joshi
654333dabe Removes fdescribe 2020-01-14 10:59:11 -08:00
Joshi
81b8a76f1b (WIP) Fixes cyclic error while saving conditionCollection 2020-01-14 10:57:00 -08:00
Joshi
31736fa194 Merge branch 'conditionSet-view' of https://github.com/nasa/openmct into conditionSet-with-classes 2020-01-14 10:27:10 -08:00
Joshi
33632ef1dc (WIP) conditionSets using ConditionClasses 2020-01-14 09:52:12 -08:00
Joel McKinnon
94305ed82c persist data changes on update 2020-01-14 09:29:00 -08:00
Joel McKinnon
c8abc45e25 add default condition only when none present 2020-01-14 08:38:12 -08:00
Joshi
cd25459ac9 Merge branch 'conditionSet-telemetry' of https://github.com/nasa/openmct into conditionSet-view 2020-01-13 22:53:45 -08:00
Joshi
aaf1eb8059 Merge branch 'condition-class' of https://github.com/nasa/openmct into conditionSet-view 2020-01-13 22:52:51 -08:00
Joshi
1589e4236a Merge branch 'conditionSet-telemetry' of https://github.com/nasa/openmct into condition-class 2020-01-13 22:51:13 -08:00
Joshi
8ca202d0a9 Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into condition-class 2020-01-13 22:48:08 -08:00
Joshi
d2f7904118 Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionSet-telemetry 2020-01-13 22:47:52 -08:00
Joshi
8bbd7898bb Updates conditionSet composition policy to allow only telemetry since we're no longer using composition for condition domain objects 2020-01-13 14:59:45 -08:00
Nikhil Mandlik
ea6f8c9a50 small fixes 2020-01-13 14:45:00 -08:00
Joshi
d152440436 Fixes careless mistake - undefined object. 2020-01-13 14:12:05 -08:00
Joshi
1ffe76a525 Fixes linting issue. 2020-01-13 14:09:59 -08:00
Joshi
a6825f530c Fixes failing test. 2020-01-13 14:05:43 -08:00
Joshi
7cf6dc386f Removes use of createOpenMCT and uses mock object for openmct instead. 2020-01-13 13:58:25 -08:00
Joshi
5d8252bb07 Adds tests for condition class 2020-01-13 13:55:54 -08:00
Joel McKinnon
e1e1e0fb2f temp 2020-01-13 13:52:26 -08:00
Joel McKinnon
4f7345563f temp 2020-01-13 13:40:43 -08:00
Joel McKinnon
68a2b9f3a8 added Default name 2020-01-10 16:45:20 -08:00
Joel McKinnon
d79402c568 name property WIP 2020-01-10 15:58:16 -08:00
Joel McKinnon
d0e8f650be remove condition with persistance 2020-01-10 12:59:43 -08:00
Joel McKinnon
d819c6efe2 add condition button working with persistance 2020-01-10 12:22:05 -08:00
Joshi
91c877f234 Adds tests for Condition class 2020-01-10 10:43:55 -08:00
Joshi
55a674ba7b Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into condition-class 2020-01-09 06:46:27 -08:00
Joshi
36055b7c04 Changes name of emitted event 2020-01-09 06:44:19 -08:00
Joshi
fe3cc661d3 Fixes tests. 2020-01-08 12:20:17 -08:00
Joshi
eb7efae1cc Persist condition to conditionSet. Remove extra condition unshift in addCondition method. 2020-01-07 11:56:24 -08:00
Joshi
63f8fb54d4 conditions added to conditioncollection 2020-01-07 11:42:31 -08:00
Joshi
097fa2e655 condition collection add to composition 2020-01-07 08:44:30 -08:00
Joshi
3d0b4d51c2 Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into telemetry-criterion 2020-01-06 13:10:58 -08:00
Joel McKinnon
6ccc0b4fbf added TODO comments 2020-01-06 12:04:19 -08:00
Joel McKinnon
79fe95372d fix lint errors 2020-01-06 10:44:09 -08:00
Joel McKinnon
c094e6c6f4 change icon 2020-01-06 10:35:10 -08:00
Joshi
8c796b4e57 Allows adding new conditions and associated criteria.
Stub for evaluating conditions.
2020-01-06 10:09:47 -08:00
Joel McKinnon
c08e9a89ff add condition 2020-01-06 09:48:11 -08:00
Deep Tailor
03829af2ad check if filters are not equal before refetching 2020-01-05 20:56:53 -08:00
Joshi
cc8ba18ccc Fixes condition plugin tests 2020-01-03 11:27:06 -08:00
Joel McKinnon
57c671a42e combined tests in one pluginSpec file 2020-01-03 09:13:17 -08:00
Joel McKinnon
1ee6ecf3ae removed conditionSet folder and fixed lint errors 2020-01-03 08:39:13 -08:00
Joel McKinnon
5f80b3773b restructured folders 2020-01-02 15:19:57 -08:00
Joel McKinnon
8452455050 WIP: all condition set UI elements in place - started condition form elements 2020-01-02 12:59:32 -08:00
Joel McKinnon
e5d8f60cdb WIP: all condition set UI elements in place except condition form elements 2019-12-31 11:33:33 -08:00
Joel McKinnon
de466000a0 WIP: styling for conditionSet and condition 2019-12-30 18:26:59 -08:00
Joel McKinnon
49664c011c component styling and expand funcitonality 2019-12-27 18:17:56 -08:00
Joel McKinnon
e52f6ce099 WIP: styling components 2019-12-27 14:19:39 -08:00
Joel McKinnon
d38e2c49cb WIP: current output styling 2019-12-27 13:20:21 -08:00
Joshi
f8464fa76f Adds telemetry criterion class and related tests 2019-12-27 12:57:30 -08:00
Joel McKinnon
308ae2cb2e added CurrentOutput and TestData components 2019-12-26 16:07:55 -08:00
Joel McKinnon
88219659fb renamed Conditions component to ConditionSet 2019-12-26 13:40:58 -08:00
Joel McKinnon
c34c2df061 remove fdescribe 2019-12-26 12:36:58 -08:00
Joel McKinnon
99c7bd4c10 added conditions and condition components 2019-12-26 12:25:30 -08:00
Deep Tailor
322cd94be7
add a check for filters on initialize to prevent refetching with empty filters (#2609) 2019-12-26 11:52:01 -08:00
Joel McKinnon
f93d5a6fbf skeletal html mockup 2019-12-26 08:25:58 -08:00
Joel McKinnon
cd116667be change to inject domainObject 2019-12-23 14:32:57 -08:00
Joel McKinnon
2f2de3952d addressed review comments 2019-12-23 12:14:35 -08:00
Joel McKinnon
45e56798c5 removed fit 2019-12-23 11:24:25 -08:00
Joel McKinnon
0664d480e6 conditionSet provider with tests 2019-12-23 11:19:56 -08:00
krynju
5d31806fb7 fix #2596 2019-12-22 01:31:23 +01:00
Joel McKinnon
283599ddf5 Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionSet-view-provider 2019-12-20 09:56:26 -08:00
Joshi
87f76ebfe4 Addresses comments. 2019-12-19 21:20:38 -08:00
David Tsay
384f0efcb3 by default add new frame to end of container (#2603) 2019-12-19 16:59:41 -08:00
Joshi
55a195b841 Adds ConditionSet composition policy. Allows conditions to be added to conditionSets 2019-12-19 12:33:11 -08:00
Joel McKinnon
c7946fd7b3 refactor conditionSet pluginSpec 2019-12-19 11:14:55 -08:00
Joel McKinnon
5d3ba3199c Merge remote-tracking branch 'origin/topic-conditionals' into conditionSet-view-provider 2019-12-19 09:07:44 -08:00
Joel McKinnon
f0d10306fc completing merge 2019-12-19 09:06:19 -08:00
Shefali Joshi
e545043a26
Merge branch 'topic-conditionals' into condition-type 2019-12-18 15:52:46 -08:00
Joshi
1f9d4708b3 Adds copyright 2019-12-18 13:19:21 -08:00
Joshi
162809e081 [#2570] adds new condition type and plugin. Also adds tests 2019-12-18 13:13:54 -08:00
Joel McKinnon
482c871ac2 removed fdescribe 2019-12-18 13:10:29 -08:00
Joel McKinnon
f0b3311630 fixed merge conflicts 2019-12-18 13:01:28 -08:00
Joel McKinnon
656d6d6c3f addressed review comments 2019-12-18 12:48:05 -08:00
Joel McKinnon
ea45f0f4aa WIP 2019-12-18 12:16:25 -08:00
Joel McKinnon
6a25cb0a58 renaming 2019-12-18 11:50:10 -08:00
Joel McKinnon
4a1901420d removed fdescribe 2019-12-18 11:44:40 -08:00
Joel McKinnon
ad64f00608 WIP renaming 2019-12-18 11:43:20 -08:00
Joel McKinnon
65aea29cb9 renamed conditionCollection to conditionSet and made all filenames and references consistent 2019-12-18 11:23:37 -08:00
Joel McKinnon
7981424e9a WIP: - preparing to rename branch 2019-12-18 11:08:21 -08:00
Joel McKinnon
10c4340475 completed tests for condition collection object 2019-12-17 13:24:34 -08:00
Joel McKinnon
0a95db1a51 fixed missing commas 2019-12-17 08:15:15 -08:00
Joel McKinnon
ace77dce65 WIP 2019-12-17 08:10:35 -08:00
Joel McKinnon
c1d58bb25f fixed another minor merge conflict 2019-12-16 16:55:26 -08:00
Joel McKinnon
fbcafe0f62 mfixed merge conflicts 2019-12-16 16:50:57 -08:00
Joel McKinnon
9a9d9222a9
Merge branch 'master' into condition-object-type 2019-12-16 14:52:48 -08:00
Joel McKinnon
221e5b4f6c Added tests for ConditionPlugin 2019-12-16 14:42:19 -08:00
Joshi
5df74aee68 [test-framework] Adds basic test for condition plugin 2019-12-16 11:06:19 -08:00
Nikhil
3b195e9c7d Example imagery vue (#2525)
* WIP: imagery vue refactor

* cleaup

* show orange border when paused.

* resize image and thumbs wrappers.

* scrollToBottom fixed.

* fixed lint errors

* use multipane vue component for resize + cleanup + style adjustments.

* added min-height to image pane and thumbs-layout pane.

* remove old plugin and using es6 const.

* using ES6 imports.

* clean up + formatting changes.

* updated as per review comments.

* extracted styles from vue component.

* fixed lint errors.

* updated as per review comments + cleanup.
2019-12-13 15:36:01 -08:00
Joel McKinnon
17838d8040 WIP: setting up test framework for conditionals 2019-12-12 14:36:24 -08:00
Andrew Henry
ef3bae1312 Merge branch 'topic-core-refactor' into tcr-master 2019-12-11 15:56:24 -08:00
Nikhil
37a8cf071c https://github.com/nasa/openmct/issues/2577 (#2580)
* https://github.com/nasa/openmct/issues/2577
* Remove notebook.scss import. Move to vue-styles.scss
2019-12-11 15:56:00 -08:00
Andrew Henry
98c9cc92b8 Merge branch 'topic-core-refactor' into tcr-master 2019-12-11 14:52:11 -08:00
Deep Tailor
490cb2225d Move check for linestyle to plotseries fetch function (#2561) 2019-12-11 14:49:12 -08:00
Andrew Henry
ecd8372efa Fixed merged conflict 2019-12-11 14:40:53 -08:00
Nikhil
50173a4413 Theming (#2567)
* Separate Vue component styles out from SFCs.
* Added 'MCT.prototype.getAssetPath' and using 'openmct.setAssetPath' to get relative path for assets.
* Re-implements `openmct.plugins.Snow()`, and `openmct.plugins.Espresso()` (as well as a new theme `openmct.plugins.Maelstron()`)
2019-12-11 14:27:13 -08:00
Charles Hacskaylo
a16a44208a Fixes Notebook and Inspector layout issues (#2568)
* Fix linting-related issues
* Fix Notebook overlay display issues
2019-12-10 16:44:54 -08:00
Joel McKinnon
f82ca91a61 changed node mules path 2019-12-06 15:13:03 -08:00
Joel McKinnon
b06c234b59 import path for vue component 2019-12-06 13:02:23 -08:00
Joel McKinnon
31a7ebd4f1 basic skeleton for conditions code 2019-12-06 12:05:36 -08:00
Andrew Henry
c83e44ff1c Merged from master 2019-12-06 09:45:21 -08:00
Deep Tailor
28d2194d51 fix bugs caused by shouldUseMinMax reported by VISTA (#2555) 2019-12-05 18:07:30 -08:00
David Tsay
b3bc618bb0 fix template markup after lint merge mutilation (#2558) 2019-12-05 18:04:24 -08:00
David Tsay
14a0f84c1b Feature/eslint plugin vue (#2548)
* Use eslint-plugin-vue to lint vue files
2019-12-04 12:39:09 -08:00
Deep Tailor
14ce5e159b Webpage plugin vue (#2440)
* Move table cell selection to table cell component

* move webpage from angular to vue

* make review requested changes

* fix npm install error

* change cache version

* change cache version

* rename view provider

* rename file to WebPageViewProvider

* change webpage vue file

* change webpage vue file
2019-12-02 18:55:08 -08:00
Andrew Henry
c51fd21847
Experimental unit tests for the Telemetry Table component (#2533)
* Initial commit of telemetry table spec
* Added example directory to linter paths. Fixed outstanding linting issues
2019-11-27 16:04:52 -08:00
Nikhil
8825a458dc fixed console error with save + using this.$nextTick instead of setTimeout. (#2516) 2019-11-21 08:32:42 -08:00
Nikhil
cab51f2665 Code that ignores duplicate points for plotting is removing non-duplicate points (#2515)
* Code that ignores duplicate points for plotting is removing non-duplicate points

* updated as per suggestion: use generic way of reading Y value.
2019-11-21 08:31:05 -08:00
Nikhil
c6f83dea8d Save and Finish blocking modal dialog Refactor and Styles #2500 (#2501)
* Save and Finish blocking modal dialog Refactor and Styles #2500

* created new template for ProgressDialogComponent

* Tweaks for #2501

- Normalized dialog icon size;
- Enhanced text formatting in dialog;
- Changed "Saving..." to remove ellipsis;
2019-11-20 11:46:03 -08:00
Charles Hacskaylo
bdd55b3db0
Merge branch 'topic-core-refactor' into modal-improvement 2019-11-20 11:42:11 -08:00
Charles Hacskaylo
700ca90c8e Added new icon-history glyph for Time Conductor (#2545)
## Reviewer Checklist

* Changes appear to address issue? Y
* Appropriate unit tests included? N/A - Icon changes only
* Code style and in-line documentation are appropriate? Y
* Commit messages meet standards?
2019-11-20 11:37:53 -08:00
Charles Hacskaylo
360881cf66
Merge branch 'topic-core-refactor' into modal-improvement 2019-11-19 14:11:45 -08:00
Shefali Joshi
a4c2e944b3 Fixes issue #2537 Removes unused isEditing parameter for the view method of ViewProviders. (#2542) 2019-11-18 10:27:05 -08:00
Charles Hacskaylo
93abb09419 Styling to support Plotly integration (#2532)
* Mods to support NIRVSS spectra plot enhancements

- Plot legend can display a header element, related styles;
- Remove unneeded margin from propertiesHeader mixin;

* Mods to support NIRVSS spectra plot enhancements

- Finessing plot legend header styling;
- New theme constants for plot legend header;
- Increased size of plot color swatches;

* Mods to support NIRVSS spectra plot enhancements

- Major progress on Plotly style overrides;

* New glyphs for Spectra and Commands

* Icon backgrounds added for new glyphs

- bg-icon-spectra, -spectra-telemetry and -command;

* Plot legend enhancements

- Make selector for .hover-value-enabled less selective;

* Move plotly SCSS into its own file
2019-11-13 09:46:56 -08:00
Charles Hacskaylo
e58e9d3a26 Fix Plot Legend placement (#2527)
* Push test

* Enhance plot legend placement for #2486

- Left and right legends now maintain position when expanded;

* Update index.html

- Remove erroneously committed temp change ;
2019-11-08 15:31:29 -08:00
David Tsay
527c5ec7dd src/selection/Selection.js (#2535) 2019-11-06 15:14:05 -08:00
David Tsay
286d6e5082 Issue 2472 Disable selection in layouts when previewing (#2530)
* ISSUE-2472: disable selection in layouts during preview
2019-11-05 16:20:26 -08:00
Nikhil
fab8bb516a Plot label height adjustment. (#2524)
* Plot label height adjustment.

* initialize xaxis label.

* Plot label height adjustment.

* initialize xaxis label.

* Fixes incorrect width applied to the plot's X axis wrapper
2019-10-30 18:09:56 -07:00
Joel McKinnon
6d526eaf42 Fix lint errors (#2520)
* Fixed linting errors
* Disabled broken test
2019-10-29 15:49:55 -07:00
Deep Tailor
8b715f331c Search indexer (#2445)
* add a bare bones indexer
* use constant to fallback to legacy indexer
2019-10-22 16:53:06 -07:00
Nikhil
d6950a0976 Added listener that reacts to changes on interpolate + fetch data using correct strategy value. (#2469) 2019-10-21 10:27:52 -07:00
Nikhil
68f3436792 set deep property as true on watch (#2521) 2019-10-21 10:26:09 -07:00
Andrew Henry
4414161faf Fixes to enable testing by third party applications (#2523)
* Initial commit of telemetry table spec

* Fix errors found by running Open MCT app headless

* Do not double install import-export plugin

* Changes to allow Open MCT to be initialized more than once without binding to window.document

* Remove table spec accidentally added
2019-10-21 10:24:46 -07:00
Andrew Henry
7477536478 Disable broken unit tests (#2519)
* Disabling broken unit tests

* Removed legacy RemoveAction
2019-10-10 16:23:29 -07:00
Nikhil Mandlik
2dd7307fce Overlay Improvement #2517 2019-10-10 15:45:07 -07:00
Nikhil Mandlik
6b2f2b758d Multiple modal instances on 'Enter' button #2513 2019-10-10 15:04:14 -07:00
Deep Tailor
c13b07e648 separate search div from main tree, show search div when search value is present, else show main tree (#2512) 2019-10-10 12:48:50 -07:00
Nikhil
2ecff75da5 [Tables] Filtering fails when one or more cells contain undefined value #2493 (#2510)
* [Tables] Filtering fails when one or more cells contain undefined value #2493

* refactored to handle edge cases first
2019-10-10 12:46:25 -07:00
Nikhil
9b7a986475 Add a sticky telemetry point select to on-click plot behavior #2379 (#2471)
* Add a sticky telemetry point select to on-click plot behavior #2379

* changed class 'lock-highlight-point' on parent element to drive lock/unlock feature on highlight points.

* Styling for sticky-telemetry-point

- New glyph: icon-cursor-lock;
- Better layout and SCSS for overlaid state indicators in plot area;

* single click on plot, lock/unlock highlight points.

* cleanup + added lock icon on legends.

* fixed panning does not end on mouse up.
2019-10-07 13:55:47 -07:00
Nikhil
c054914a9c [Plots] Zooming on plot causes console errors - Duplicates in a repeater are not allowed #2473 (#2474) 2019-09-24 16:33:16 -07:00
Charles Hacskaylo
45164a2f68 Fix status bubbles (#2503)
- Status indicator bubbles now right-align;
2019-09-19 18:44:35 -07:00
Andrew Henry
b189a887e6 Emit refresh event when data cleared (#2502) 2019-09-19 18:37:09 -07:00
Nikhil
71abfbc336 Save and Finish no longer shows blocking modal dialog #2496 (#2498) 2019-09-19 18:16:41 -07:00
Charles Hacskaylo
ee690545fb VISTA Fixes 4 (#2499)
- Fixed is-selected styling so that if overrides table row EVR, limit
styling;
- Fix Summary Widget grippys #2494;
- Fix indent in Global filters UI: #2488;
- Fix Summary Widget overflow problem: #2495;
- Added new c-input-number--no-spinners class for https://github.jpl.nasa.gov/MissionControl/vista/issues/673
2019-09-19 17:56:17 -07:00
Charles Hacskaylo
fcf3c76aa1
Merge pull request #2492 from nasa/y-axis-label-fix
[Plot] Y axis label is not displayed when editing #2487
2019-09-18 15:05:23 -07:00
Nikhil
5dbd77d10c [Summary Widgets] Adding a new condition to a rule deletes the input value from previous ones #2411 (#2481)
* [Summary Widgets] Adding a new condition to a rule deletes the input value from previous ones #2411

* Summary Widget Rule conditions not persisting numeric values #2491
2019-09-18 13:19:26 -07:00
Nikhil
43515ca84e [Summary Widget] Adding a rule without setting anything in the rule causes error #2401 (#2478) 2019-09-18 13:18:55 -07:00
Nikhil Mandlik
54fe881e71 [Plot] Y axis label is not displayed when editing #2487 2019-09-17 11:50:17 -07:00
Andrew Henry
7c32700b69 [Import JSON] Support namespaces (#2483)
* Retain target namespace in generated identifiers

* Also replace identifier objects

* Do not duplicate newIds when replacing. Rename ID to Id
2019-09-13 13:45:32 -07:00
Charles Hacskaylo
e98d0cc7c5 UI Various 2 (#2480)
- Fixes icon-gear margin for #2477;
- Now applies mixed visual style to toggle frame visibility button in
Layout toolbar for #2460;
- Change Status area Indicators to right-justify;
- Adjust Status area collapse toggle button margin;
2019-09-13 13:34:08 -07:00
Andrew Henry
2200503e48 Hide filter fields if filtering not supported by view (#2479) 2019-09-11 11:16:50 -07:00
Deep Tailor
8f0081acc8 Clear data changes for tables and plots (#2475) 2019-09-06 17:17:24 -07:00
Andrew Henry
003c3e9fbe Do not attempt to select cells with no column defined 2019-09-06 15:54:44 -07:00
Charles Hacskaylo
02ef58ced1 Fixes normalize.min.css (#2467)
- Add as slightly renamed .scss file to avoid issues arising from
.gitignore excluding .css files;
2019-09-03 13:33:24 -07:00
Charles Hacskaylo
e89881c266 Fix Y axis plot label control (#2465)
* Fix Y axis plot label control
* Now uses writing-mode: vertical-lr instead of transform for vertical
text;
* Text overflow: hidden prevents scrollbars;
* Select displayed on hover over Y axis area;
* Dynamically adds icon-gear when Y axis can be configured;
* use child plot div for image exports
2019-09-03 11:10:02 -07:00
Charles Hacskaylo
fa66289d5c Misc UI 10 (#2441)
* Misc UI 10

- Add .c-input--sm CSS class for VISTA auto-clear input;

* Misc UI 10

- WIP!
- Add new glyohs: suitcase and clear data;
- Change icon-database to icon-suitcase;
- Need to unit test!

* Misc UI 10

- Refinements to shell__head Indicators layout;
- Refinements to collapse-buttons;
- Better color for Snow theme caution;

* Misc UI 10

- Better Open MCT logo for Snow theme;
- Renamed logo-app.svg to logo-openmct.svg;
- Removed unused image files;

* Misc UI 10

- Remove title attr from Angular indicator, interferes with hover
element;

* Misc UI 10

- Fix favicons, updated art;
- Removed favicon.ico;

* Misc UI 10

- Rebuild of Icomoon JSON file, which appeared to have gotten
damaged, probably due to merging;
- Font files updated, added .svg font back to repo;
- Font metrics modified to now use 20% baseline height;

* Misc UI 10

- Fix class in plot for control-bar element;
- Fix CSS in ObjectFrame.vue;

* Misc UI 10

- Rename folder styles-new to styles;

* Misc UI 10

- Remove unused src/fonts folder;

* Misc UI 10

- Symbols font now using baseline of 20%;
2019-08-30 15:51:52 -07:00
Deep Tailor
4f3a3befe0 Fix Row marking (#2458)
Fix row marking issue discovered during r4.2 testing
2019-08-30 15:46:36 -07:00