Commit Graph

1151 Commits

Author SHA1 Message Date
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
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
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
Shefali Joshi
4675fc8ae6
Conditional styles (#2718)
* 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.
2020-03-06 14:09:52 -08:00
David Tsay
cf9336dae9 WIP receive criterion results and compute condition results 2020-03-06 11:01:15 -08:00
David Tsay
7f32d196e4 WIP request gets to telemetry criterion before erroring 2020-03-05 23:11:20 -08:00
David Tsay
897d05276a WIP continue to add support for LAD request
TODO conditionCollection needs to load before condition requests can be made
2020-03-05 16:42:31 -08:00
David Tsay
3e6509ce6f WIP add support for LAD request 2020-03-05 12:14:27 -08:00
Joshi
576b843bd5 Merge branch 'master' of https://github.com/nasa/openmct into topic-conditionals 2020-03-05 10:00:54 -08:00
David Tsay
5b00246cc0 fix failing unit test 2020-03-04 12:00:42 -08:00
David Tsay
34a149661c keep track of latest timestamp 2020-03-03 17:34:27 -08:00
David Tsay
4c4b587d9c pass timestamp datum through to ConditionManager 2020-03-03 14:37:11 -08:00
David Tsay
b8b838f490 get all timesystems 2020-03-03 12:50:40 -08:00
David Tsay
8cb29ba4a9 add handleConditionUpdated back 2020-03-03 11:34:30 -08:00
Shefali Joshi
ece6223b23
Merge pull request #2704 from nasa/dave/provide-conditions-telemetry
[Conditions] Conditions to provide telemetry
2020-03-02 14:56:10 -08:00
David Tsay
ecabd00b0c fix failing unit tests 2020-03-02 14:48:24 -08:00
Joel McKinnon
f8b3899bb9 addressed review comments and lint errors 2020-03-02 12:30:28 -08:00
Shefali Joshi
3b046db4f8
Merge pull request #2695 from nasa/firefox-drag-fix
Add setData on dragStart for FF support
2020-03-02 11:57:45 -08:00
Joel McKinnon
97f829da9f added dragstop listener and dragStop method 2020-03-02 11:46:16 -08:00
Shefali Joshi
fb1eed1982
Merge pull request #2706 from nasa/current-output-refactor
Refactored CurrentOutput component into ConditionSet
2020-03-02 11:28:51 -08:00
Deep Tailor
dd9b567025 revert alternate control bar for telemetry table 2020-03-02 11:09:50 -08:00
Joel McKinnon
fa83b4867c removed extra div 2020-03-02 06:17:27 -08:00
Joel McKinnon
47d4fc9103 removed CurrentOutput component 2020-02-28 15:32:40 -08:00
David Tsay
dabd0bff29 only listen for condition updates in telemetry provider 2020-02-28 15:18:14 -08:00
David Tsay
51c70d02d7 fix naming bug 2020-02-28 15:17:27 -08:00
David Tsay
b74733bf3f
Add back id and conditionId required for styling 2020-02-28 15:05:27 -08:00
David Tsay
84ae65536b
remove unused var 2020-02-28 14:40:12 -08:00
Joel McKinnon
71424dcf8d Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into firefox-drag-fix 2020-02-28 14:39:02 -08:00
David Tsay
2c40396139
refactor for clarity 2020-02-28 14:35:57 -08:00
Joel McKinnon
5498ba8e1e changed computeResults 2020-02-28 13:51:46 -08:00
David Tsay
0f9d7d2832 fix default condition edge case 2020-02-28 13:10:06 -08:00
David Tsay
9bd1c51a6e always use timestamp from latest datum 2020-02-28 13:06:57 -08:00
David Tsay
fd74fb0ec4 remove unused var 2020-02-28 12:50:17 -08:00
David Tsay
3626ff9947 fix linting issues 2020-02-28 12:47:34 -08:00
David Tsay
fd568409d3 Merge branch 'topic-conditionals' into dave/provide-conditions-telemetry 2020-02-28 12:28:59 -08:00
David Tsay
14e3500a88 add timestamps for default condition 2020-02-28 12:27:51 -08:00
Joel McKinnon
83d08ae369 resolve merge conflicts 2020-02-28 12:17:12 -08:00
Joel McKinnon
39bf601ee1 Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into firefox-drag-fix 2020-02-28 11:43:17 -08:00
charlesh88
629ca089cf Fixes for table's alternateControlBar
- Fixed hide/show of controls for better UX;
- Unit tested click select/deselect toggling;
2020-02-28 11:31:23 -08:00
David Tsay
89ae6ef8c7 provide telemetry with timestamps 2020-02-28 11:15:19 -08:00
Deep Tailor
300acd6ec8 remove row if user unmarks in showMarkedRowsOnly mode 2020-02-28 11:12:49 -08:00
Joshi
ba780981a5 Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionals-refactor 2020-02-28 11:09:41 -08:00
Deep Tailor
62774678a7 enable alternatte control bar in telemetry tables for charles 2020-02-28 11:04:34 -08:00
Joshi
e526626e09 Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into condition-trigger 2020-02-28 10:49:56 -08:00
Joel McKinnon
371a7d3a3e removed disabled inputs with no telemetry 2020-02-28 10:04:10 -08:00
Joel McKinnon
8539d60562 enable trigger 2020-02-28 10:01:37 -08:00
Joel McKinnon
d333fd5822 disabled add or edit condition set without telemetry 2020-02-28 10:01:37 -08:00
Joshi
364191eddc Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionals-refactor 2020-02-28 09:57:00 -08:00
David Tsay
583f4dac85 Merge branch 'conditionals-refactor' into dave/provide-conditions-telemetry 2020-02-28 09:56:25 -08:00
Shefali Joshi
28255dce01
Merge pull request #2687 from nasa/remove-criteria
Added controls for remove and duplicate criteria
2020-02-28 09:53:53 -08:00
Joshi
c9419d3e2d Fix for when input is not an array. This will be handled differently in an upcoming code change. 2020-02-28 09:47:58 -08:00
Joel McKinnon
d2a45e46f1 modified getOperationFormat 2020-02-28 08:37:20 -08:00
Deep Tailor
8125a4f321 emit event when rows are marked - useful for other components using telemetry tables 2020-02-27 17:05:02 -08:00
Joel McKinnon
1a409afb03 wip: addressing review comments 2020-02-27 16:32:38 -08:00
Joel McKinnon
e57c18fd69 removed unused isDefault prop 2020-02-27 14:55:52 -08:00
Joel McKinnon
3aec9ec6ff add setData on dragStart for FF support 2020-02-27 14:36:21 -08:00
David Tsay
0e9bf74332 Merge branch 'conditionals-refactor' into dave/provide-conditions-telemetry 2020-02-27 13:36:46 -08:00
Joshi
2609a41ee8 Addresses comments
Removes console log statements
Fixes import paths
2020-02-27 11:21:40 -08:00
Joshi
b8dc5acf00 Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionals-refactor 2020-02-27 11:19:35 -08:00
Nikhil
b0edb19239
Merge branch 'master' into f#2594 2020-02-27 11:06:59 -08:00
Deep Tailor
85902b878e
Update telemetry table for multisession (#2686)
* update telemetry table to ingest marked row data, add a new alterntate bar with includes row name, selected rows and show selected rows toggle

* Enhancements for alternate toolbar in telem tables

- .c-control-bar adds style enhancements and `__label` element;
- Added `label` prop, markup and styling to ToggleSwitch;
- ToggleSwitch layout enhanced;
- Unit tested in main view and placed in Display Layout;

* made improvements to row marking

* bug fixes for marking

* fix linting issues

* -Make reviewer requested changes
-Clarify prop for marking
-Include alternateControlBar in the marking prop
- - since it only makes sense for making

Co-authored-by: Charles Hacskaylo <charlesh88@gmail.com>
2020-02-27 10:27:57 -08:00
David Tsay
9d5c7a4015 destroy conditionManager instance on stop providing telemetry 2020-02-26 15:26:39 -08:00
David Tsay
fc53e855c4 Merge branch 'conditionals-refactor' into dave/provide-conditions-telemetry 2020-02-26 15:15:22 -08:00
Joel McKinnon
a51c0d5139 addressed review comments 2020-02-26 12:31:37 -08:00
Joel McKinnon
d46310ca7d handle multiple inputs in telemetryCriterion 2020-02-26 12:31:37 -08:00
Joel McKinnon
8f87cc78e8 rendering correct number of input fields depending on operation and persisting values 2020-02-26 12:31:37 -08:00
Joel McKinnon
ee6e0f310e changed default input to array and clear downstream selection lists on change 2020-02-26 12:31:37 -08:00
Joel McKinnon
f328a1078e filter comparison list based on field selected 2020-02-26 12:31:37 -08:00
Joel McKinnon
b4cf81a0ef wip: filtering select comparison 2020-02-26 12:31:37 -08:00
Joel McKinnon
1b9b7e2345 added hid/show selects 2020-02-26 12:31:37 -08:00
David Tsay
4456633010 output telemetry to views 2020-02-26 12:27:28 -08:00
Joel McKinnon
463ec47af6 changed classname of controls div 2020-02-26 12:21:53 -08:00
Joel McKinnon
ec4d121a98 changed classname of controls div 2020-02-26 11:59:04 -08:00
Joel McKinnon
598d2b31e9 remove criterion working 2020-02-26 11:51:41 -08:00
Joel McKinnon
25e28ab97c added controls for remove and duplicate criteria 2020-02-26 11:49:17 -08:00
Joel McKinnon
43056c4068 implimented clone criterion 2020-02-26 11:42:06 -08:00
Joel McKinnon
614206b10c remove criterion working 2020-02-26 11:42:06 -08:00
Joel McKinnon
30a493d038 resolved merge conflict 2020-02-26 11:40:52 -08:00
Shefali Joshi
96e433beaa
Merge pull request #2677 from nasa/condition-clone-name
Condition clone name persistance
2020-02-26 11:32:48 -08:00
David Tsay
0915aaea3b allow conditions to be dropped into telemetry views 2020-02-26 11:31:26 -08:00
David Tsay
80656c1be0 Merge branch 'topic-conditionals' into dave/provide-conditions-telemetry 2020-02-26 11:11:48 -08:00
David Tsay
acd75f86f4 add name to conditions view 2020-02-26 11:07:25 -08:00
David Tsay
486dae54bd add metadata provider 2020-02-25 17:27:08 -08:00
David Tsay
92ecf3af1d provide telemetry
* listen to realtime data
2020-02-25 16:37:43 -08:00
Joshi
3109c8d825 Destroy condition manager when the ConditionSet vue is destroyed 2020-02-25 15:06:45 -08:00
Joshi
78cf75323f Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionals-refactor 2020-02-25 12:31:44 -08:00
Joshi
b744467f21 Bug fixes:
Ensures that the default condition emits a condition result update
Fixes remove condition
2020-02-25 12:29:47 -08:00
Charles Hacskaylo
a0b7999ea2
Imagery fixes (#2668)
* Fix imagery-related styles and markup

- VERY WIP!!!
- Style modernizing;
- Also, padding fixes for pane.scss - unit test for regressions!

* Fix imagery-related styles and markup

- VERY WIP!!!
- Style modernizing WIP;
- Fixes to pane classes for better padding in vertical panes;

* Fix imagery-related styles and markup

- Migrated all imagery CSS into imagery-view-layout.scss from _legacy
.scss;
- CSS cleanups;
- Refactoring/simplification of thumb layout;
- Color fixed for $colorPausedFg in theme constants;

* Scroll to right instead of bottom, on autoscroll.

* Fix imagery-related styles and markup

- Make the most recent thumb visually distinct;
- Clicking a selected thumb now deselects it and unpauses the view;

* Imagery fixes

- Fixed thumb click logic to properly toggle paused when clicking a selected thumb;
- Improved CSS so that `selected` updates more quickly when selecting the latest thumb;
- Clicking the main image pause button now selects the proper thumb;

* Fix linting errors

Co-authored-by: Nikhil <nikhil.k.mandlik@nasa.gov>
2020-02-25 11:47:27 -08:00
Shefali Joshi
2bb2bb6a1b
Adds conditional style inspector provider (#2655)
* resolved conflicts

* Revert "Condition reorder"

* Adds conditional style inspector provider
Adds condition style tabbed view (this needs to be extended to allow more than one pane per tab in a separate issue)

* Fixes linting issues

* Merge from topic-conditionals

* In order to accomodate two tab layout for the Conditionals feature, rename the following:
- openmct.inspectorViews registry to openmct.propertiesInspector
- InspectorViewRegistry.prototype.addProvider to InspectorViewRegistry.prototype.addViewProvider.
Replace occurances of the same to the new names.

In a subsequent commit expect a new view registry for the styles inspector view registry.

* Use 'styles' property on domain objects to indicate that they should have a styles inspector tab - Note that this will not show up on existing objects but only ones that are created after this feature is added.
Use 'styles' property on domain objects to determine if a styles view can be viewed
Removed the TabbedInspectorView and repurposed the InspectorViews to show both a properties or a styles registry.
Simplified markup in Inspector.vue

* Addresses review comments:
1. Go back to using inspectorViews
2. Remove stylesInspector registry
3. Hardcode Styles Inspector component view
4. Styles tab can be viewed for all creatable objects except for the folders, webPages and conditionSets
5. ConditionalStylesInspectorViewProvider is no longer needed because we are hardcoding the styles view component.

Co-authored-by: Joel McKinnon <JoelMcKinnon@users.noreply.github.com>
2020-02-25 10:41:58 -08:00
Joshi
7d2256d70f Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionals-refactor 2020-02-24 15:44:07 -08:00
Joshi
5814d2a35e Updates conditionManager.js to emit the output of the winning condition instead of the identifier of that condition 2020-02-24 15:43:03 -08:00
Joshi
6ab84c0bc3 Refactoring conditionals
Move logic for conditions into conditionManager out of conditionCollection.vue
2020-02-24 15:05:33 -08:00
Joel McKinnon
6db78af69f fixed condition name persistance 2020-02-23 09:58:32 -08:00
Joel McKinnon
038489256c updated Condition.vue with modifications to ConditionEdit.vue and deleted ConditionEdit as it is no longer used 2020-02-23 09:06:37 -08:00
Joel McKinnon
50b331c451 fixed condition clone 2020-02-20 14:45:30 -08:00
Joel McKinnon
44fc62e0ba fix reordering 2020-02-20 14:17:15 -08:00
Joel McKinnon
d425bd564c fixed merge conflicts 2020-02-19 13:29:14 -08:00
Joshi
93e3065b3e Fixes subscription of telelemtry when new criteria is added to a condition 2020-02-19 12:51:24 -08:00
Joshi
0ad2d59924 Fixes tests 2020-02-19 12:51:15 -08:00
Joshi
f4468a8233 Fixing condition output 2020-02-18 16:04:14 -08:00
Joshi
dc08877bbb Persists the condition domain object so that we can retrieve it with it's identifier in child components like condition.vue 2020-02-18 15:35:03 -08:00
Joel McKinnon
f08caa6135 addressed review comments 2020-02-18 12:40:33 -08:00
Joel McKinnon
ad7d029ce8 addressed review comments 2020-02-18 11:14:50 -08:00
Joel McKinnon
387912b4d3 WIP fixing telemetry subscribe 2020-02-18 11:05:54 -08:00
Joel McKinnon
53e0ed4d4a refactored to address review comments 2020-02-14 15:23:15 -08:00
Joel McKinnon
11c205b5c4 addressed review comments 2020-02-14 14:46:14 -08:00
Joel McKinnon
4ede6351ec addressed some review comments 2020-02-14 12:45:32 -08:00
Joel McKinnon
24bbcb466f wip: fixing add criteria 2020-02-13 16:13:29 -08:00
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