David Tsay
d188b9a056
do not mutate function args for criteria results either
2020-04-07 13:22:03 -07:00
Joshi
f510f3edd0
Removes missed code
2020-04-07 11:59:24 -07:00
Joshi
e05b0bb562
Address review comments:
...
Fixes telemetry view visibility and styling issue
Removes none option for border and background styles for drawing objects
2020-04-07 11:34:48 -07:00
David Tsay
713c5e9fb7
Merge branch 'master' into dave/conditionals-own-results
2020-04-06 18:56:08 -07:00
David Tsay
17bca04560
do not mutate function args
2020-04-06 18:53:48 -07:00
Charles Hacskaylo
61bdadc33c
Fixes #2878 ( #2879 )
...
- Remove background from `elementStatusColors` mixin;
- Change Indicators to use more correct style of `.s-status-on`;
2020-04-06 15:36:52 -07:00
David Tsay
e0c5bca47d
fix unit tests
2020-04-06 14:25:55 -07:00
Joshi
cdc7c1af64
Removes unused data
2020-04-06 14:04:11 -07:00
Joshi
3158baa998
Merge branch 'fix-telemetryview-styles' of https://github.com/nasa/openmct into fix-telemetryview-styles
2020-04-06 14:02:45 -07:00
Joshi
698508fde4
Use the subobject view type to determine where styles should be saved
2020-04-06 14:02:06 -07:00
Shefali Joshi
68a96989e1
Merge branch 'master' into fix-telemetryview-styles
2020-04-06 13:57:41 -07:00
Joshi
46a6a43234
Merge branch 'master' of https://github.com/nasa/openmct into fix-telemetryview-styles
2020-04-06 13:56:30 -07:00
David Tsay
d41fc27b55
subscriptions should use latest timestamp
2020-04-06 11:17:59 -07:00
David Tsay
24bb96cc90
WIP detach request data from subscription data
...
extract getLatestTimestamp function
2020-04-03 18:39:26 -07:00
David Tsay
483ee173d6
pass correct args into off listener
2020-04-02 16:34:40 -07:00
Joshi
f96dfcc942
Reassign ids for criteria when we clone conditions
2020-04-02 10:45:37 -07:00
Joshi
7c289d76b6
Revert object.assign change
2020-04-02 10:40:39 -07:00
Joshi
c617a440eb
Merge branch 'master' of https://github.com/nasa/openmct into criterion-delete
2020-04-02 10:40:32 -07:00
Joshi
666459be87
Merge branch 'master' of https://github.com/nasa/openmct into fix-telemetryview-styles
2020-04-02 10:30:07 -07:00
Joshi
f91a64483b
Adds missing id during create condition
2020-04-02 10:18:41 -07:00
Joshi
de8d63c09d
Merge branch 'master' of https://github.com/nasa/openmct into criterion-delete
2020-04-02 10:11:42 -07:00
Shefali Joshi
58b4a6ebf5
Merge branch 'master' into fix-any-telemetry
2020-04-02 10:06:37 -07:00
Joshi
d3fe2a6811
Merge branch 'master' of https://github.com/nasa/openmct into fix-telemetryview-styles
2020-04-01 15:52:55 -07:00
Joshi
97b37edce4
Store telemetry styles on their container domain objects.
2020-04-01 15:51:40 -07:00
Joel McKinnon
d3443518d6
reverted changes unrelated to id
2020-04-01 15:08:31 -07:00
Joel McKinnon
c33314a4bf
added uuid to addCriteria, cloneCriteria, changed key of v-for to criteria.id
2020-04-01 14:56:32 -07:00
David Tsay
59eb034ab4
Merge branch 'master' into dave/conditionals-request-default
2020-04-01 14:42:21 -07:00
Nikhil
67d53fb62b
[Notebook]: When notebook is not default new entry button does not add new entry #2841 ( #2855 )
...
Co-authored-by: Deep Tailor <deep.j.tailor@nasa.gov>
2020-04-01 14:28:52 -07:00
Nikhil
0fd637c0e9
[Notebook]: Error in nextTick: "TypeError: Cannot read property 'focus' of null" #2845 ( #2857 )
2020-04-01 14:22:11 -07:00
Joel McKinnon
169cc6617a
added uuid() in conditionManager
2020-04-01 13:58:58 -07:00
David Tsay
a946325e95
request LAD for default condition
2020-04-01 13:58:27 -07:00
Joel McKinnon
1beba78111
removed call to checkTelemetry in computed prop, removed if in persist(), changed key in v-for for criteria
2020-04-01 13:34:17 -07:00
Joel McKinnon
2edfeaa606
added checkTelemetry call in inputCount computed prop
2020-04-01 12:15:02 -07:00
Joel McKinnon
2a1f9fd063
removed recursive call
2020-04-01 11:10:10 -07:00
Joel McKinnon
63fe92f8ea
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into criterion-delete
2020-04-01 10:37:01 -07:00
Joel McKinnon
35f303ffa4
changed inputCount to computed property
2020-04-01 10:35:49 -07:00
Joshi
dd70bb470f
Merge branch 'master' of https://github.com/nasa/openmct into fix-telemetryview-styles
2020-04-01 10:18:30 -07:00
Joshi
b9ab599c35
Fix description and errors for all/any telemetry
2020-04-01 10:10:31 -07:00
Deep Tailor
5a690932e9
Merge branch 'master' of https://github.com/nasa/openmct into notebook-preview-action-fix
2020-04-01 09:59:57 -07:00
Deep Tailor
b00757150e
use objectPathJSON
2020-04-01 09:58:30 -07:00
Joshi
8515a411bd
Merge branch 'master' of https://github.com/nasa/openmct into fix-any-telemetry
2020-04-01 09:55:55 -07:00
David Tsay
a81af1ce34
check format first ( #2851 )
...
default to number
2020-03-31 21:04:52 -07:00
Deep Tailor
64c5725687
pass correct object path, and remove notebook snapshot button from preview
2020-03-31 20:59:20 -07:00
Joshi
72a3248123
Fix LAD requests for any/all telemetry
2020-03-31 16:48:59 -07:00
Shefali Joshi
ee4a81bdfd
Conditionals feature ( #2830 )
...
Introduces conditional styling feature.
2020-03-31 15:56:06 -07:00
Joshi
b90eb80584
Addresses review comments: Rename file, change copyright year, remove commented out code
2020-03-31 15:50:30 -07:00
Charles Hacskaylo
ebaf702c59
Topic conditionals master merge ( #2833 )
...
- Restore updated symbols font file for Condition Widget icon glyph;
- Change "All telemetry | Any telemetry" to all lowercase;
- Fix cursor styles for Condition Widget;
- Fix Safari layout problems with Condition Set/section styles;
2020-03-31 15:36:50 -07:00
Joshi
064cf6747e
Adds copyright text
2020-03-31 14:21:30 -07:00
Joshi
8512b634c7
Merge branch 'master' of https://github.com/nasa/openmct into topic-conditionals
2020-03-31 12:54:12 -07:00
David Tsay
4220a8a68a
[Conditionals] default condition handling ( #2827 )
...
* Sisplay default condition output by... default
2020-03-31 12:32:06 -07:00
Nikhil
e7e5116773
[Notebook] V2.0 development #2666 ( #2755 )
...
* Notebook v2.0
Co-authored-by: charlesh88 <charlesh88@gmail.com>
2020-03-31 12:11:11 -07:00
David Tsay
079201273e
Merge branch 'master' into topic-conditionals
2020-03-31 12:02:37 -07:00
Joshi
42eeeea374
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into any-all-telemetry
2020-03-31 11:00:00 -07:00
Charles Hacskaylo
7b060509f5
c-object-label changes brought over from topic-conditionals
( #2823 )
...
- SCSS mods;
- Markup in select objects
2020-03-30 17:30:53 -07:00
Deep Tailor
3ca9e9ae56
When view params change, get a new copy of the domainObject ( #2813 )
...
Update browseObject on object change
2020-03-30 17:27:10 -07:00
Joel McKinnon
984bede43b
Removed image properties button from display layouts toolbar ( #2809 )
...
Removed image properties button from display layouts toolbar
2020-03-30 16:58:46 -07:00
Deep Tailor
87d838c690
[Tables] Use parsed data to sort ( #2785 )
...
* Use parsed values when sorting
2020-03-30 16:57:20 -07:00
Joshi
072bf361de
Store styles for telemetry on domain objects
2020-03-30 16:20:22 -07:00
Shefali Joshi
4e39d9fb84
Test data for condition sets ( #2807 )
...
* Test Data
* Persist testData and apply it to the conditionSet
* Do not persist the applied flag, but persist test data
Co-authored-by: charlesh88 <charlesh88@gmail.com>
2020-03-30 15:45:07 -07:00
Joshi
14eaf4e899
Addresses comments: Fixes dropdown logic
2020-03-30 12:17:49 -07:00
Shefali Joshi
a31d10e708
Adds NOT and XOR triggers for conditions ( #2816 )
...
* Adds XOR and NOT triggers for conditions
* Adds unit tests and fixes linting issues
2020-03-30 12:09:50 -07:00
Charles Hacskaylo
f9e88321a3
Condition Widget refinements ( #2814 )
...
* New Condition Widget
* Add new glyphs and symbols font files
2020-03-30 11:59:27 -07:00
David Tsay
9e12203b86
Merge branch 'master' into topic-conditionals
2020-03-30 11:19:45 -07:00
Shefali Joshi
84874f22e6
Cast number inputs to a Number so that operations evaluate correctly ( #2799 )
...
* Cast number inputs to a Number so that operations evaluate correctly
2020-03-30 10:37:55 -07:00
David Tsay
d00e8b68a5
Merge pull request #2802 from nasa/clone-condition-issues
...
Clone condition, criteria issues
2020-03-30 09:40:00 -07:00
Joel McKinnon
2907d6d79c
moved opy to cloneCondition
2020-03-30 07:13:15 -07:00
Joel McKinnon
a5a4bb87c5
Removed extra if statement, copied only config
2020-03-30 07:06:03 -07:00
Joel McKinnon
90b475e17b
addressed review comments
2020-03-29 14:03:49 -07:00
Joshi
89a298f5b3
Removes name string fix
2020-03-27 15:25:24 -07:00
Joshi
f990a14a3c
Remove duplicate metadata options
2020-03-27 15:22:50 -07:00
Deep Tailor
6b00af6ece
fix errors when navigated away from a layout that uses toolbar
2020-03-27 10:15:09 -07:00
Joshi
5ec8ac95c1
Fixes linting issues
2020-03-27 09:42:18 -07:00
Joel McKinnon
5f061001d6
fixed updateOperations, clearDependentFields, removed unnecessary ref
2020-03-27 08:52:23 -07:00
Joel McKinnon
1a86204637
used lodash cloneDeep for criteria, conditions
2020-03-27 07:31:41 -07:00
Joshi
0a1959df38
Fixes linting issues
2020-03-26 23:00:59 -07:00
Joshi
03a690a158
Fixes import
2020-03-26 22:56:39 -07:00
Joshi
459a055455
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into any-all-telemetry
2020-03-26 22:55:44 -07:00
Joshi
502d29dd25
Add all and any options for telemetry
2020-03-26 16:44:44 -07:00
Shefali Joshi
f0fd0a9cc7
Use parsed telemetry data values for condition evaluations ( #2783 )
...
* Use parsed telemetry data values for condition evaluations
* Addresses comments - handles undefined value and implements format and validate formatter methods
* Merge topic-conditionals
2020-03-26 15:11:29 -07:00
Joel McKinnon
7282792da1
fixed refs and ev bugs
2020-03-26 14:57:55 -07:00
Joshi
ec0291c54d
Implement any telemetry and all telemetry options
2020-03-26 14:01:02 -07:00
Charles Hacskaylo
4413c29abb
Merge pull request #2793 from nasa/new-widget
...
Add Condition Widget
2020-03-26 13:26:47 -07:00
Joshi
91e1a144ed
Merge branch 'master' of https://github.com/nasa/openmct into topic-conditionals
2020-03-26 13:22:59 -07:00
Shefali Joshi
53440c31d5
Handles remove telemetry from condition set - this resets criterion properties ( #2791 )
...
Handles remove condition from a condition set that's being used in a conditional style.
Fixes a small bug with stye rule manager request lad results
2020-03-26 13:12:22 -07:00
charlesh88
5128af2531
New Condition Widget, WIP
...
- Remove temp test styling;
2020-03-26 13:08:44 -07:00
Shefali Joshi
eedc0f13bc
adds formatting for strings ( #2792 )
2020-03-26 13:08:28 -07:00
Joel McKinnon
7c200df4c4
resolved merge conflict
2020-03-26 12:39:50 -07:00
charlesh88
d1b28e079a
Merge branch 'topic-conditionals' into new-widget
2020-03-26 12:34:56 -07:00
David Tsay
23ec838643
Merge pull request #2764 from nasa/condition-persist
...
Telemetry stickiness issue
2020-03-26 12:34:37 -07:00
Joel McKinnon
271c619c63
Merge pull request #2789 from nasa/fix-description
...
Fixes description for enums
2020-03-26 12:23:40 -07:00
Joel McKinnon
0552769670
change back to refs
2020-03-26 11:30:00 -07:00
Deep Tailor
4b535ade31
metadataManager should check for a values array
...
before calling map on it
2020-03-26 10:25:04 -07:00
Shefali Joshi
de8f8088e2
Merge pull request #2786 from nasa/issue-2773
...
[Conditions] cleanup subscriptions in style rule manager
2020-03-26 09:53:16 -07:00
Joshi
32c16416d3
Fixes description for enums
2020-03-26 09:45:44 -07:00
Shefali Joshi
0cf27c349b
Merge pull request #2768 from nasa/conditionset-multi-value-operations
...
Implements two new operations - is one of and is not one of
2020-03-26 09:43:08 -07:00
Joshi
015aa8c637
Checks for input before processing it.
2020-03-26 09:37:52 -07:00
Joel McKinnon
4a07ddbefc
added persist call to change enum input
2020-03-26 09:03:32 -07:00
Joel McKinnon
a81009541c
Merge branch 'condition-persist' of https://github.com/nasa/openmct into criterion-enum-persist
2020-03-26 08:22:59 -07:00
Joel McKinnon
1b680cfaca
moved persist call into change event method and removed check on $ref
2020-03-26 08:10:35 -07:00
David Tsay
311ff003c0
Merge pull request #2784 from nasa/fix-conditionals
...
Fixes error while getting metadata when telemetry is not yet available for a criterion
2020-03-25 21:39:45 -07:00
charlesh88
0cae61444d
New Condition Widget, WIP
...
- Refine base styling;
- Fix so that edited properties are reactive;
2020-03-25 19:47:21 -07:00
charlesh88
28a603def8
New Condition Widget, WIP
...
- Add condition-widget.scss file;
- Add type definitions to control display behaviors in layouts;
- Refine widget structure;
2020-03-25 18:24:14 -07:00
David Tsay
d2b7407674
add request for LAD data
2020-03-25 17:41:33 -07:00
David Tsay
fff89a6384
delete unsubscribe method on destroy
2020-03-25 17:36:27 -07:00
charlesh88
953b95f79c
Merge branch 'topic-conditionals' into new-widget
2020-03-25 17:22:43 -07:00
charlesh88
6ff5ce78e1
Merge remote-tracking branch 'origin' into new-widget
2020-03-25 17:16:23 -07:00
charlesh88
0857fd95a7
New Condition Widget, WIP
...
- Rename `c-object-view` to `u-angular-object-view-wrapper` and fix to
allow style settings to be applied to it;
2020-03-25 17:15:56 -07:00
charlesh88
b7cea7b955
New Condition Widget, WIP
...
- Normalize usage of `c-object-label` across components;
2020-03-25 16:34:11 -07:00
charlesh88
32da19a486
New Condition Widget, WIP
...
- Add new Vue components, mod configs;
2020-03-25 16:19:46 -07:00
Joshi
39d7dc8372
Adds unit tests for isOneOf and isNotOneOf
2020-03-25 15:50:16 -07:00
Joel McKinnon
f76f537be7
removed extraneous emits and handlers
2020-03-25 15:27:48 -07:00
Joshi
a681d67e05
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionset-multi-value-operations
2020-03-25 14:14:23 -07:00
Joshi
0a634eb490
Fixes unit tests
2020-03-25 14:08:33 -07:00
Joshi
fcca8fa8d9
Fixes error while getting metadata when telemetry is not yet available for a criterion
2020-03-25 13:44:26 -07:00
Joel McKinnon
829eecf1ae
resolved merge conflicts
2020-03-25 13:24:43 -07:00
Joshi
dc7f83754a
Adds parse treatment for string format.
...
Adds format property to sine wave generator's name metadata
2020-03-25 12:05:24 -07:00
David Tsay
6dbdebbe05
Merge branch 'master' into global-filters-no-request-bug-fix
2020-03-25 11:54:45 -07:00
Deep Tailor
761ca7ad56
remove console log
2020-03-25 11:16:25 -07:00
charlesh88
7f49a7bc99
Conditionals fixes and tweaks
...
- Fixes #2772 ;
- Remove styling toolbar icons in Display Layouts;
- Fix regression error in tree items that was only allowing clicks on
the name to navigate;
2020-03-25 11:12:54 -07:00
Deep Tailor
ca022b8a28
make a copy of filters before checking isEqual
...
- to prevent using same pointer
2020-03-25 11:11:17 -07:00
Joshi
6f500d0d0b
Resolves ##2741
...
Uses parsed telemetry data values for comparisons
2020-03-25 10:45:28 -07:00
charlesh88
07d101ac1c
Conditionals fixes and tweaks
...
- Legacy wrapper fixes to allow color styling to be applied as expected;
- New `$mainViewPad` constant;
- Fix `c-control-bar` element spacing in plots;
- TODO: check for regressions, particularly with plot views;
- Fixes #2772 : better `is-style-invisible` css for `c-style-thumbs`;
2020-03-24 23:45:25 -07:00
charlesh88
cdf0dd0c10
Conditionals fixes and tweaks
...
- Fixes multiple items in #2772 ;
- Fix missing wrapping markup, convert empty span to template;
- Add INPUT_TYPES object to allow proper setting of 'text' input type;
- Fix padding on <selects> for better inline alignment with other input
types;
2020-03-24 19:41:31 -07:00
charlesh88
c27c347d29
Conditionals fixes and tweaks
...
- Fixes #2778 ;
2020-03-24 18:17:13 -07:00
Joshi
dc54eef2c9
Resolves #2776
...
Adds null checks for telemetry and domain object configuration
2020-03-24 15:40:33 -07:00
Shefali Joshi
57a68a24de
Apply condition sets to drawing objects in a layout + Static styling for objects. ( #2767 )
...
* Hardcoded prototype - conditional styles for display layout or generator domain objects only.
Needs Architectural review
* Updates to ConditionalStylesView
* 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
* Fixes failing test
* Add default styles to conditionalStyles when a condition set is added to the domain object.
* Use EventEmitter alias instead of eventEmitter3 in imports
Change variable name for better readability and clarity
Remove unused code
* 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
Pass missing arguments
* Removes unnecessary object get call.
* Conditionals styling WIP
- Tweaks for layout/overflow issues;
- Better header alignment;
- Much better approach to "accordion" spacing;
* Adds conditional styles for drawing objects
* Fixes small bugs while adding or removing nested conditional styling
* Removes hard coded conditionSetIdentifier
* Fixes small conditionManager bug
* WIP - Adds condition set selection dialog
* WIP - Add condition set
* Styling for tree dialog in selector
- New `.c-selector` class;
- Markup added to tree-item.vue to fix missing `c-object-label` wrapper;
* Adds image url to styles inspector view
* Adds highlight for selected conditionSet in selection dialog.
* Conditionals Inspector styling WIP
- Simplified Inspector markup;
- Refined `.c-inspector` layout strategy;
- Refined `.l-multipane` classes for better layout and scroll handling;
- TODOs: styling for 'styles' section; unit test, find regressions, fix;
* Read-only mode changes for the styles inspector
* Adds basic styling for styles inspector view
* Removes unused code
* Displays condition set name
* Display description for conditions
* Conditionals Inspector styling WIP
- Add new ObjectName component to Inspector;
- Add supporting styles;
* Conditionals Inspector styling WIP
- Refactor for better usage of c-object-label;
- Refactor `c-properties` classes to `c-inspect-properties`;
* Conditionals Inspector styling WIP
- Introduce `c-inspect-styles` class;
- Markup refined in ConditionalStylesView.vue;
* Conditionals Inspector styling WIP
- Fix unintended regression in `c-object-label`;
* Makes inspector view tabs sticky.
Shows errors if either telemetry or conditions are missing
Refresh conditionStyles when styles inspector is loaded to show new conditions that might be added to the conditionSet
* Conditionals styling WIP
- Added title to Condition Set selector dialog;
* Conditionals styling WIP
- CSS and markup changes;
* Conditionals styling WIP
- Markup changes;
* Componentize conditional style editor, condition description and condition error
* Conditionals styling WIP
- Conditional styling elements in Inspector, significant refinements;
- Condition description formatting;
- Significant markup simplification in StyleEditor.vue;
- Moved `.c-inspect-styles` into conditional-styles.scss;
* Conditionals styling WIP
- Added menu positioning css;
* Conditionals styling WIP
- Display images in StyleEditor `c-style-thumb` element;
* Use the condition description component to show the condition description in condition set views
* Conditionals styling WIP
- New `u-alert` and `u-error` classes and mixin;
- New $colorError theme constants;
* Conditionals styling WIP
- Fixed background: cover or c-style-thumbs;
* Conditionals styling WIP
- Add navigate-or-preview functionality to attached Condition Set used
for conditional styling (thank you Deep!);
- Better theme-compliant box-shadowing on c-style-thumb;
- Added default color property to cClickIcon SCSS mixin;
* Fixes ConditionDescription and ConditionErrors views
* Allow static styles for domain Objects and display layout items
* Consolidate handling of 'none' style to the object styles mixin
* Adds visibility option to child items
* Conditionals styling WIP
- Add `is-style-invisible` class;
- Better color approach for table headers to support domain object
styling;
* Change visibility to isInvisible class
* Fixes visibility for object views and telemetry views
* Fixes selection of condition set from tree view
* Conditionals styling WIP
- Added new $glyph-icon-eye-disabled font symbol and related class;
- Modded glyphs used for visibility toggle button;
- Modded StyleEditor thumb preview to reflect visibility setting;
- Tweaked `is-style-invisible` opacity property;
- Code cleanup;
* Conditionals styling WIP
- Display disabled toolbar for Inspector styles in Browse mode;
- Better approach to 'is-style-invisible' `c-style-thumb` with new
bgCheckerboard mixin;
- Moved `$controlDisabledOpacity` into a theme constant;
- Refined spacing in Inspector grid;
* Fixes linting issues
* Fixes telemetry metadata name
* criterion descriptions is now an array of strings
* Fixes spacing
* Removes commented out code.
* Remove v-if
Co-authored-by: charlesh88 <charlesh88@gmail.com>
2020-03-24 13:09:21 -07:00
David Tsay
437e8a0263
always load composition
2020-03-24 11:15:58 -07:00
Joel McKinnon
0a2e912091
removed refs from dom elements and added index to call to isLastCriterion
2020-03-24 09:43:54 -07:00
Joel McKinnon
87513a14b7
removed log
2020-03-23 17:47:35 -07:00
Joel McKinnon
168c040f3c
fix sticky telemetry selection issue
2020-03-23 16:16:58 -07:00
David Tsay
78487a48f6
restrict conditionManager instances to one per domainObject
2020-03-23 16:04:37 -07:00
David Tsay
a5a197680d
remove debug
2020-03-23 15:58:01 -07:00
David Tsay
d42bd44485
remove logging statement
2020-03-23 15:24:24 -07:00
David Tsay
77b705ecc8
add telemetry object back for criterion
2020-03-23 15:21:51 -07:00
David Tsay
48af39a584
Merge branch 'topic-conditionals' into dave/conditions-telemetry
2020-03-23 14:58:32 -07:00
Deep Tailor
ec978f3a35
when a time system is changed, it emits a timeSystem update as well as a bounds update, this caused telemetry table to request data twice when users changed time systems
2020-03-23 14:21:46 -07:00
David Tsay
f13714e0c4
rename telemetry subscription calls
2020-03-23 13:53:19 -07:00
Joshi
42ac3ef9af
Implements two new operations - is one of and is not one of that evaluates to true if telemetry matches one of many values
2020-03-23 13:21:22 -07:00
David Tsay
26ffe8efde
remove comment
2020-03-23 13:05:48 -07:00
David Tsay
1f19f480ce
fix unit tests
2020-03-20 17:38:29 -07:00
Joel McKinnon
44f48a3e2a
moved persist calls to events, used emit to save name and fieldname props
2020-03-20 17:37:48 -07:00
David Tsay
60fce4a003
remove completed TODO comments
2020-03-20 17:08:55 -07:00
David Tsay
f04b5b689e
suppress plot view on view condition sets
2020-03-20 17:08:23 -07:00
David Tsay
05d981768e
change string output to enum for plot views
2020-03-20 17:07:51 -07:00
David Tsay
e4a6c21101
load composition using less code
2020-03-20 15:08:45 -07:00
David Tsay
d51dd8b7d0
fix broken tests
2020-03-20 15:00:24 -07:00
David Tsay
aed5377ad2
use existing var instead of recalculating
...
on listener should be off in destroy()
2020-03-20 11:44:05 -07:00
David Tsay
cbeb25c583
request telemetry from all conditions
...
if conditions have no criteria (isDefault) then nothing will be requested
2020-03-20 10:16:02 -07:00
David Tsay
b38a9ad4ce
exclude default condition when requesting telemetry
2020-03-20 10:12:02 -07:00
David Tsay
ecf3e19f16
remove listener on destroy
2020-03-19 20:30:27 -07:00
David Tsay
3b82fd5d8b
Merge branch 'topic-conditionals' into dave/conditions-telemetry
2020-03-19 20:28:40 -07:00
David Tsay
1f3ec77bf1
Merge branch 'topic-conditionals' into fix-enum-metadata
2020-03-19 20:15:05 -07:00
David Tsay
3f61db2067
pass telemetry down to criteria. criteria listens to corresponding endpoints.
2020-03-19 17:30:02 -07:00
Joshi
5332d136b7
Fix small bug with inputCount
2020-03-19 15:16:12 -07:00
Joshi
983ed7f0e7
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into fix-enum-metadata
2020-03-19 14:06:25 -07:00
David Tsay
11978cd869
remove straggler call
...
linting fix
2020-03-19 10:22:48 -07:00
David Tsay
00d1b5e69f
avoid multiple instantiations of condtionManager if possible
2020-03-19 10:18:57 -07:00
David Tsay
6731283cf8
Merge pull request #2734 from nasa/condition-description
...
Condition dynamic summary description based on criteria
2020-03-18 15:25:19 -07:00
David Tsay
6b4cd25417
Merge branch 'topic-conditionals' into dave/conditions-telemetry
2020-03-18 10:58:17 -07:00
Joel McKinnon
0cd2799d00
added isLastCriterion comp method
2020-03-18 10:24:43 -07:00
David Tsay
243b9cac24
subscribe to telemetry
2020-03-18 10:21:53 -07:00
Joel McKinnon
316e0f24cf
added fieldName prop to telemetry object, computed props for canEvaluateCriteria, getConjunction, simplified getRule method
2020-03-18 10:18:42 -07:00
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
60aecfe27e
Merge branch 'topic-conditionals' into dave/conditions-telemetry
2020-03-17 12:00:57 -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
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
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