Joel McKinnon
f8b3899bb9
addressed review comments and lint errors
2020-03-02 12:30:28 -08:00
Joel McKinnon
97f829da9f
added dragstop listener and dragStop method
2020-03-02 11:46:16 -08:00
Joel McKinnon
71424dcf8d
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into firefox-drag-fix
2020-02-28 14:39:02 -08:00
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
Joshi
ba780981a5
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionals-refactor
2020-02-28 11:09:41 -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
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
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
Joel McKinnon
1a409afb03
wip: addressing review comments
2020-02-27 16:32:38 -08:00
Joel McKinnon
3aec9ec6ff
add setData on dragStart for FF support
2020-02-27 14:36:21 -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
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
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
43056c4068
implimented clone criterion
2020-02-26 11:42:06 -08:00
Joel McKinnon
614206b10c
remove criterion working
2020-02-26 11:42:06 -08:00
Joel McKinnon
30a493d038
resolved merge conflict
2020-02-26 11:40:52 -08:00
Joshi
7d2256d70f
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionals-refactor
2020-02-24 15:44:07 -08:00
Joshi
6ab84c0bc3
Refactoring conditionals
...
Move logic for conditions into conditionManager out of conditionCollection.vue
2020-02-24 15:05:33 -08:00
Joel McKinnon
6db78af69f
fixed condition name persistance
2020-02-23 09:58:32 -08:00
Joel McKinnon
038489256c
updated Condition.vue with modifications to ConditionEdit.vue and deleted ConditionEdit as it is no longer used
2020-02-23 09:06:37 -08:00
Joel McKinnon
44fc62e0ba
fix reordering
2020-02-20 14:17:15 -08:00
Joel McKinnon
d425bd564c
fixed merge conflicts
2020-02-19 13:29:14 -08:00
Joshi
93e3065b3e
Fixes subscription of telelemtry when new criteria is added to a condition
2020-02-19 12:51:24 -08:00
Joshi
f4468a8233
Fixing condition output
2020-02-18 16:04: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
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
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
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
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
Joel McKinnon
a8da06033c
condition view with highlighting of current condition, add/remove condition, change name, output and persist
2020-01-23 10:24:53 -08:00
Joshi
e88ead30dc
Merge branch 'condition-from-identifier' of https://github.com/nasa/openmct into conditionSet-ui-merge
2020-01-22 13:39:08 -08:00
Joel McKinnon
709c3fff65
no current output rendered
2020-01-22 13:15:44 -08:00
Joshi
ab6e87ae6b
Updates to operation show up in conditionclass
2020-01-22 13:01:23 -08:00
Joel McKinnon
73d0507f1f
persist name change
2020-01-22 11:15:49 -08:00
Joel McKinnon
621c1dc11e
renders current output section
2020-01-21 16:00:21 -08:00
Joshi
7feb933519
Fix errors after converting conditionCollection to persist identifiers only
2020-01-17 11:26:46 -08:00
