ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-28 08:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,351 Commits 988 Branches 212 Tags 191 MiB
1842d3923c
Commit Graph

6351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joel McKinnon
cfafecdd64
Merge pull request #2685 from nasa/conditionals-refactor 
Conditionals refactor
 2020-02-28 11:35:09 -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
Shefali Joshi
ac13bc5850
Merge pull request #2688 from nasa/condition-trigger 
Condition Any/All criteria match enabled
 2020-02-28 10:53:02 -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
564be6f8ba Merge branch 'condition-trigger' of https://github.com/nasa/openmct into condition-trigger 2020-02-28 10:05:11 -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
b386275330 removed disabled inputs with no telemetry 2020-02-28 08:55:59 -08:00
Joel McKinnon
d2a45e46f1 modified getOperationFormat 2020-02-28 08:37:20 -08:00
Nikhil
35d1727dbf
Merge pull request #2696 from nasa/marking-improvement-tables 
An improvement for components using telemetry tables
 2020-02-27 17:20:08 -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
fbbdf8cff7
Merge pull request #2607 from krynju/f#2594 
Time x-axis tick labels reversed - fix #2596
 2020-02-27 11:11:05 -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
467c57b7c6 Merge branch 'criterion-multi-input' of https://github.com/nasa/openmct into criterion-multi-input 2020-02-26 12:32:21 -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
cda97d142a Merge branch 'condition-trigger' of https://github.com/nasa/openmct into condition-trigger 2020-02-26 12:23:03 -08:00
Joel McKinnon
858199e396 enable trigger 2020-02-26 12:22:29 -08:00
Joel McKinnon
f504a335af disabled add or edit condition set without telemetry 2020-02-26 12:22:29 -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
fea6d2df96 Merge branch 'remove-criteria' of https://github.com/nasa/openmct into remove-criteria 2020-02-26 11:53:09 -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