Commit Graph

6351 Commits

Author SHA1 Message Date
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
Shefali Joshi
96e433beaa
Merge pull request #2677 from nasa/condition-clone-name
Condition clone name persistance
2020-02-26 11:32:48 -08:00
David Tsay
0915aaea3b allow conditions to be dropped into telemetry views 2020-02-26 11:31:26 -08:00
David Tsay
80656c1be0 Merge branch 'topic-conditionals' into dave/provide-conditions-telemetry 2020-02-26 11:11:48 -08:00
David Tsay
acd75f86f4 add name to conditions view 2020-02-26 11:07:25 -08:00
David Tsay
486dae54bd add metadata provider 2020-02-25 17:27:08 -08:00
David Tsay
92ecf3af1d provide telemetry
* listen to realtime data
2020-02-25 16:37:43 -08:00
Joel McKinnon
fd0c19026d addressed review comments 2020-02-25 15:36:37 -08:00
Joshi
3109c8d825 Destroy condition manager when the ConditionSet vue is destroyed 2020-02-25 15:06:45 -08:00
Joshi
78cf75323f Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionals-refactor 2020-02-25 12:31:44 -08:00
Joshi
b744467f21 Bug fixes:
Ensures that the default condition emits a condition result update
Fixes remove condition
2020-02-25 12:29:47 -08:00
Charles Hacskaylo
a0b7999ea2
Imagery fixes (#2668)
* Fix imagery-related styles and markup

- VERY WIP!!!
- Style modernizing;
- Also, padding fixes for pane.scss - unit test for regressions!

* Fix imagery-related styles and markup

- VERY WIP!!!
- Style modernizing WIP;
- Fixes to pane classes for better padding in vertical panes;

* Fix imagery-related styles and markup

- Migrated all imagery CSS into imagery-view-layout.scss from _legacy
.scss;
- CSS cleanups;
- Refactoring/simplification of thumb layout;
- Color fixed for $colorPausedFg in theme constants;

* Scroll to right instead of bottom, on autoscroll.

* Fix imagery-related styles and markup

- Make the most recent thumb visually distinct;
- Clicking a selected thumb now deselects it and unpauses the view;

* Imagery fixes

- Fixed thumb click logic to properly toggle paused when clicking a selected thumb;
- Improved CSS so that `selected` updates more quickly when selecting the latest thumb;
- Clicking the main image pause button now selects the proper thumb;

* Fix linting errors

Co-authored-by: Nikhil <nikhil.k.mandlik@nasa.gov>
2020-02-25 11:47:27 -08:00
Shefali Joshi
2bb2bb6a1b
Adds conditional style inspector provider (#2655)
* resolved conflicts

* Revert "Condition reorder"

* Adds conditional style inspector provider
Adds condition style tabbed view (this needs to be extended to allow more than one pane per tab in a separate issue)

* Fixes linting issues

* Merge from topic-conditionals

* In order to accomodate two tab layout for the Conditionals feature, rename the following:
- openmct.inspectorViews registry to openmct.propertiesInspector
- InspectorViewRegistry.prototype.addProvider to InspectorViewRegistry.prototype.addViewProvider.
Replace occurances of the same to the new names.

In a subsequent commit expect a new view registry for the styles inspector view registry.

* Use 'styles' property on domain objects to indicate that they should have a styles inspector tab - Note that this will not show up on existing objects but only ones that are created after this feature is added.
Use 'styles' property on domain objects to determine if a styles view can be viewed
Removed the TabbedInspectorView and repurposed the InspectorViews to show both a properties or a styles registry.
Simplified markup in Inspector.vue

* Addresses review comments:
1. Go back to using inspectorViews
2. Remove stylesInspector registry
3. Hardcode Styles Inspector component view
4. Styles tab can be viewed for all creatable objects except for the folders, webPages and conditionSets
5. ConditionalStylesInspectorViewProvider is no longer needed because we are hardcoding the styles view component.

Co-authored-by: Joel McKinnon <JoelMcKinnon@users.noreply.github.com>
2020-02-25 10:41:58 -08:00
Joel McKinnon
11ed7027e7 enable trigger 2020-02-25 09:31:29 -08:00
Joel McKinnon
36bcfd5a41 disabled add or edit condition set without telemetry 2020-02-25 08:25:02 -08:00
Joel McKinnon
70b5c627ca handle multiple inputs in telemetryCriterion 2020-02-24 16:48:27 -08:00
Joel McKinnon
f4f1d0387b rendering correct number of input fields depending on operation and persisting values 2020-02-24 16:31:59 -08:00
Joel McKinnon
a1bf4a92e5 changed default input to array and clear downstream selection lists on change 2020-02-24 15:50:01 -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
5814d2a35e Updates conditionManager.js to emit the output of the winning condition instead of the identifier of that condition 2020-02-24 15:43:03 -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
a7fc9b3caa filter comparison list based on field selected 2020-02-23 15:19:03 -08:00
Joel McKinnon
67f493f012 rebased with topic-conditionals and resolved conflict 2020-02-23 11:30:01 -08:00
Joel McKinnon
0686e6d38f implimented clone criterion 2020-02-23 11:26:58 -08:00
Joel McKinnon
7fc825949c remove criterion working 2020-02-23 11:26:58 -08:00
Joel McKinnon
2a9ccdcffd added controls for remove and duplicate criteria 2020-02-23 11:26:58 -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
53b785269b wip: filtering select comparison 2020-02-21 06:43:16 -08:00
Joel McKinnon
007b14b5c9 added hid/show selects 2020-02-20 14:59:04 -08:00
Joel McKinnon
50b331c451 fixed condition clone 2020-02-20 14:45:30 -08:00
Joel McKinnon
44fc62e0ba fix reordering 2020-02-20 14:17:15 -08:00
Shefali Joshi
2635f085f0
Merge pull request #2665 from nasa/add-criteria
Add multiple criteria and persist inputs
2020-02-20 13:51:31 -08:00
Joel McKinnon
22161fce7f implimented clone criterion 2020-02-20 12:44:50 -08:00
Joel McKinnon
386fc75047 remove criterion working 2020-02-20 12:23:18 -08:00
Joel McKinnon
fa6dd84945 added controls for remove and duplicate criteria 2020-02-20 07:23:38 -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
0ad2d59924 Fixes tests 2020-02-19 12:51:15 -08:00
Joshi
f4468a8233 Fixing condition output 2020-02-18 16:04:14 -08:00
Joshi
dc08877bbb Persists the condition domain object so that we can retrieve it with it's identifier in child components like condition.vue 2020-02-18 15:35:03 -08:00
Joel McKinnon
f08caa6135 addressed review comments 2020-02-18 12:40:33 -08:00
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