Commit Graph

5959 Commits

Author SHA1 Message Date
Joshi
770951c6da Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into condition-class 2020-01-17 11:02:27 -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
Shefali Joshi
a554aa20f8 Addresses code review comments (#2624)
* Addresses code review comments
- Change copyright to 2020
- Fix class parameters, tests

* Fixes this for initilize function
2020-01-16 15:56:58 -08:00
Joshi
ff1ef1f184 fixes typo 2020-01-16 15:48:40 -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
Joel McKinnon
68949e070c
Merge pull request #2621 from nasa/conditionSet-telemetry
Updates conditionSet composition policy to allow only telemetry since…
2020-01-14 11:04:46 -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
Joel McKinnon
2d059fb856
Merge pull request #2610 from nasa/telemetry-criterion
Adds telemetry criterion class and related tests
2020-01-13 16:07:32 -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