Commit Graph

6390 Commits

Author SHA1 Message Date
Joshi
05f94edb49 Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into topic-conditionals 2020-03-18 09:29:10 -07:00
Joshi
e22458f09e Merge branch 'master' of https://github.com/nasa/openmct into topic-conditionals 2020-03-18 09:28:53 -07:00
Joel McKinnon
cc2df8401b vue style render of description 2020-03-17 17:36:55 -07:00
Shefali Joshi
43a82ec05f
Conditional styles for drawing objects (#2740)
* Hardcoded prototype - conditional styles for display layout or generator domain objects only.
* Adds background colors list
* Show conditional styles for subObjectViews and telemetryViews
* Uses telemetry provider to determine which style is active
* Removes hardcoded conditionSet work used for prototype
* Add default styles to conditionalStyles when a condition set is added to the domain object.
* Use EventEmitter alias instead of eventEmitter3 in imports
* Change StyleRuleManager to accept conditionStyle objects instead of domainObjects
* Uses a map for conditional styles instead of a list in order to improve performance
* Use in-built api to check for identifier equality
* Removes unnecessary object get call.
* Adds conditional styles for drawing objects
* Removes hard coded conditionSetIdentifier
* Fixes small conditionManager bug
2020-03-17 14:42:15 -07:00
David Tsay
fe2e29d69b
Merge pull request #2753 from nasa/remove-ConditionSetView-telemetry
Remove telemetry subscription from conditionSet edit view
2020-03-17 13:49:25 -07:00
David Tsay
60aecfe27e Merge branch 'topic-conditionals' into dave/conditions-telemetry 2020-03-17 12:00:57 -07:00
Joshi
5d21a8b6fe Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into remove-ConditionSetView-telemetry 2020-03-17 11:06:51 -07:00
Shefali Joshi
500ab52476
Merge pull request #2754 from nasa/conditions-observables
[Conditions] Remove uneccessary update function
2020-03-17 11:05:46 -07:00
Joel McKinnon
b0bb723357 resolve merge, address review comments 2020-03-17 10:31:19 -07:00
David Tsay
b7fffeab1c conditionManager controls subscriptions 2020-03-16 21:57:42 -07:00
David Tsay
e339d743ed remove uneccessary update call 2020-03-16 16:01:12 -07:00
David Tsay
84f0d49d6f code is documentation 2020-03-16 15:35:13 -07:00
David Tsay
090e89d524 remove testing aid 2020-03-16 15:34:12 -07:00
David Tsay
90dd53e954 Merge branch 'topic-conditionals' into dave/condition-telemetry-request 2020-03-16 15:31:19 -07:00
Joshi
6ab60ab52e ConditionSet view listens to a listener from conditionCollection to display current output. 2020-03-16 15:00:16 -07:00
Joshi
8975bc8c55 Handles enum meta data for criteria
Ensures metadata with sources are also handled correctly
2020-03-16 13:36:33 -07:00
David Tsay
55e5c49f6e
Merge pull request #2747 from nasa/conditions-do-refactor
Conditions refactor - not domain objects anymore
2020-03-16 10:59:31 -07:00
Joshi
f090f7ffe7 Removes comment. 2020-03-16 10:51:33 -07:00
Joshi
94b5617e63 Since we're observing for changes to the conditionSet domain object, we don't need to re-fetch it with persist. 2020-03-16 10:50:11 -07:00
David Tsay
41c79c6032
[Conditions] ConditionManager should observe its own mutations (#2748)
* change blur listener to change listener to watch for immediate updates to input

* move observe ConditionManager logic into ConditionManager
2020-03-16 10:14:46 -07:00
Joshi
83c648cc26 Addresses comments 2020-03-13 14:24:47 -07:00
Joshi
76e7fec1a0 Ensures the conditionManager is in sync with outside changes so that composition is not thrown away. 2020-03-13 14:08:14 -07:00
Joshi
09bfd80f69 Fix bug with telemetry disappearing 2020-03-13 12:50:06 -07:00
David Tsay
15a7d03e74 rename function for clarity 2020-03-13 09:36:17 -07:00
David Tsay
1dc9743484 remove unecessary get call 2020-03-13 09:26:46 -07:00
Joshi
8f05c57d1a Fixes clone condition bug 2020-03-13 09:09:50 -07:00
Joshi
81caa27cba Fixes failing tests 2020-03-12 14:38:39 -07:00
Joshi
74a7ef2565 Fix bug with removeCondition 2020-03-12 14:06:43 -07:00
Joshi
649575fd2d Moves domain object observe logic to the condition set telemetry provider 2020-03-12 13:29:50 -07:00
Joel McKinnon
b75b7a958a added input types and fixed bug for isDefined, isUndefined comparisons 2020-03-12 13:14:54 -07:00
Joshi
625b39d722 Fix typo 2020-03-12 13:06:56 -07:00
Joshi
65f80f4c45 Resubscribe to the conditionSet telemetry provider when the condition set domain object changes. 2020-03-12 13:05:03 -07:00
Joshi
02cd3048c8 Removed conditions as domain objects 2020-03-12 12:33:04 -07:00
Joel McKinnon
63feaef988 reinitialize rule string in forEach 2020-03-11 15:22:17 -07:00
David Tsay
6095872682 remove logging 2020-03-10 10:08:53 -07:00
David Tsay
dba55867f4 fix broken unit tests 2020-03-10 09:59:12 -07:00
David Tsay
0da80c2a67 move var declaration around for clarity 2020-03-10 09:58:57 -07:00
David Tsay
084df5329a Merge branch 'topic-conditionals' into dave/condition-telemetry-request 2020-03-09 16:33:55 -07:00
David Tsay
49ff0c79db tidy up condition manager use in telemetry provider 2020-03-09 16:15:53 -07:00
David Tsay
7a4b967a01 condition sets with no telemetry points should not provide telemetry 2020-03-09 13:28:37 -07:00
Andrew Henry
ddfa611c44
Merge branch 'master' into swg-randomness 2020-03-09 13:11:31 -07:00
Joel McKinnon
efca7c8e58 added descriptions to conditions 2020-03-09 12:42:44 -07:00
Joel McKinnon
8900072239 added computed property and method to get description 2020-03-09 11:50:11 -07:00
David Tsay
a7e57c62f4
linting fixes (#2733) 2020-03-09 11:15:15 -07:00
David Tsay
24bade2284 provide correct data to getLatestTimestamp call 2020-03-09 10:59:05 -07:00
Deep Tailor
5fcc4eebe1
Add a re-calculate column width button (#2719)
* Add a recalculate Column width button

* Tweaks to telemetry table for recalculateColumnWidths

- Recalc button now hidden if isAutosizeEnabled === false;
- Recalc button label, title edited for clarity;
- Normalized button titles for other table buttons;
- Fixed `.c-separator` height issue;

* toggle between expand and autosize

* Tweaked button title text

* remove nested loop

* fix lint errors

* remove unecessary promise and use clientWidth instead of offsetWidth

Co-authored-by: charlesh88 <charlesh88@gmail.com>
2020-03-09 10:31:26 -07:00
Charles Hacskaylo
27a09239e3
Integrate Conditionals styling into topic-conditionals (try 2) (#2730)
* Styling for Conditionals WIP

- Condition Set markup and styling WIP;

* Styling for Conditionals WIP

- Condition Set markup and styling WIP;

* Styling for Conditionals WIP

- Main layout and container styling refinement, simplification and
normalization;

* Styling for Conditionals WIP

- Begin styling for individual condition elements;

* Styling for Conditionals WIP

- Condition styling, very initial;

* Conditionals styling WIP

- Redo work done previously and lost due to merging;
- Overall layout in edit mode;
- Styling for hint element;

* Conditionals styling WIP

- Major progress on Conditionals edit-view styling;
- Grid layout WIP in condition element;
- Added new `.c-grippy` class;

* Conditionals styling WIP

- discreteItem theme constants refined, add
`$colorDiscreteItemCurrentBg` color value;
- `.c-grippy` enhanced;
- Condition layout significantly refined;

* Conditionals styling WIP

- Styling for browse view in Condition Set;
- Refined alignment and styles for condition header;

* Conditionals styling WIP

- Cleanups;
- Significant improvements to flex layout;
- Test Data layout and element formatting;

* Conditionals styling WIP

- Better approach to condition set hinting;

* Conditionals styling WIP

- Merge and integrate changes from Joel;
- 'Add Criteria' button now disabled until telemetry has been added;
- Fix JS configuration error with help from Joel;

* Conditionals styling WIP

- Much better flex approach to sections layout;
- Sanding and shimming;

* Conditionals styling WIP

- Fixed some linting;

* Conditionals styling WIP

- Tweaks for layouts issues;
2020-03-09 10:08:39 -07:00
Nikhil
8d86c914a1
Merge pull request #2732 from nasa/minmax-fix-382020
Revert minMax to minmax
2020-03-09 10:05:42 -07:00
Deep Tailor
fab04519c6 fix minmax typo 2020-03-08 20:11:04 -07:00
David Tsay
4a5e106709 request LAD for conditions provides telemetry 2020-03-06 17:33:21 -08:00