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
0a9d23d86f
Merge pull request #2633 from nasa/pane-persistence
...
[Navigation Tree] save current state of navigation tree
2020-02-06 16:23:19 -08:00
David Tsay
379e37c881
Merge branch 'master' into pane-persistence
2020-02-06 16:17:59 -08:00
David Tsay
37ef269dce
Merge pull request #2611 from nasa/filters-fetch-bug-fix
...
Check if filters are not equal before refetching
2020-02-06 16:16:12 -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
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
Deep Tailor
38deef6e72
Merge branch 'master' into filters-fetch-bug-fix
2020-02-03 13:45:26 -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
