ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-01 00:45:41 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
6,279 Commits 997 Branches 212 Tags 193 MiB
Commit Graph

6279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshi
666459be87 Merge branch 'master' of https://github.com/nasa/openmct into fix-telemetryview-styles 2020-04-02 10:30:07 -07:00
Shefali Joshi
8f553f6327
Merge pull request #2848 from nasa/fix-any-telemetry 
Fix LAD requests for any/all telemetry
 2020-04-02 10:23:26 -07:00
Shefali Joshi
58b4a6ebf5
Merge branch 'master' into fix-any-telemetry 2020-04-02 10:06:37 -07:00
Shefali Joshi
9d45080526
Merge pull request #2858 from nasa/dave/conditionals-request-default 
request LAD for default condition
 2020-04-02 10:05:42 -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
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
David Tsay
a946325e95 request LAD for default condition 2020-04-01 13:58:27 -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
Nikhil
250fee125a
Merge pull request #2854 from nasa/notebook-preview-action-fix 
[Notebook] Embed preview action fix
V-R4.4-RC4 		2020-04-01 10:13:01 -07:00
Joshi
956029c786 Merge branch 'fix-any-telemetry' of https://github.com/nasa/openmct into fix-any-telemetry 2020-04-01 10:11: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
Shefali Joshi
3034ec016a
Merge branch 'master' into fix-any-telemetry 2020-04-01 09:55:03 -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
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
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
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
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
David Tsay
a5326a7b95
Merge pull request #2810 from nasa/toolbar-fixes-32720 
[Toolbar] fix errors when navigated away from a layout that uses toolbar
 2020-03-30 11:13:17 -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
David Tsay
389589d7f7
Merge pull request #2806 from nasa/preserve-user-input 
Preserve user input when changing criterion comparison
 2020-03-29 15:59:31 -07:00
David Tsay
c02cbd1ba7
Merge pull request #2804 from nasa/criterion-type-change 
Criterion field change causing incorrect input type
 2020-03-29 15:46:18 -07:00
Joel McKinnon
90b475e17b addressed review comments 2020-03-29 14:03:49 -07:00
Deep Tailor
6b00af6ece fix errors when navigated away from a layout that uses toolbar 2020-03-27 10:15:09 -07:00
Joel McKinnon
5f061001d6 fixed updateOperations, clearDependentFields, removed unnecessary ref 2020-03-27 08:52:23 -07:00
Joel McKinnon
ef3c4ccf47 clear dependent fields when field selector is changed 2020-03-27 08:09:04 -07:00
Joel McKinnon
1a86204637 used lodash cloneDeep for criteria, conditions 2020-03-27 07:31:41 -07:00
Joel McKinnon
bf947a8835
reverted to espresso (#2797) 2020-03-26 15:12:43 -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
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