ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-21 14:07:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,928 Commits 989 Branches 212 Tags 191 MiB
b6ce9c6ed7
Commit Graph

5928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Shefali Joshi
67919ece16
Merge pull request #2656 from nasa/condition-ui-redo 
Condition ui redo
 2020-02-04 15:11:02 -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
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
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
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
bc9cadaa77 fixed reorder bugs 2020-01-27 09:34:50 -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
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