Commit Graph

6390 Commits

Author SHA1 Message Date
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
Nikhil
250fee125a
Merge pull request #2854 from nasa/notebook-preview-action-fix
[Notebook] Embed preview action fix
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
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
Shefali Joshi
3956cd1c06
Merge pull request #2829 from nasa/topic-conditionals-master-merge
Topic conditionals master merge
2020-03-31 14:25:16 -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
Shefali Joshi
e4c9f156a7
Merge pull request #2800 from nasa/any-all-telemetry
Any all telemetry option for conditions.
2020-03-31 11:49:23 -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
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
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
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
Joshi
0a1959df38 Fixes linting issues 2020-03-26 23:00:59 -07:00