ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-27 08:32:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,243 Commits 989 Branches 212 Tags 191 MiB
f990a14a3c
Commit Graph

950 Commits

Author SHA1 Message Date
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
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