Shefali Joshi
abc2cd2413
Merge branch 'master' into fix-telemetryview-styles
2020-04-08 14:40:54 -07:00
David Tsay
5d74882646
Merge pull request #2871 from nasa/dave/conditionals-own-results
...
[Conditionals] Request and subscription results are mutually exclusive
2020-04-08 14:21:31 -07:00
David Tsay
9fe7f230e6
Merge branch 'master' into dave/conditionals-own-results
2020-04-08 14:16:50 -07:00
Shefali Joshi
de4c5b3729
Disables conditional and static styles for hyperlinks and summary widgets. ( #2887 )
2020-04-08 12:30:59 -07:00
Deep Tailor
2a7901914a
Merge branch 'master' into fix-telemetryview-styles
2020-04-08 11:57:33 -07:00
Joshi
73b0fc6f79
Removes preventNone as per conversation with UX designer.
2020-04-08 11:46:12 -07:00
Charles Hacskaylo
ddef16795c
Conditionals and Notebook UI fixes ( #2868 )
...
- Significant fixes for Safari-compatible Flex layout in Condition Set
view;
- Changed visual approach to current-value section;
- Firefox scrollbar coloring
- Fix layout issues in Firefox;
- Consolidate Conditionals styles into single scss file;
- Fix test datum elements layout, better wrapping;
- Better approach to presence/absence of URL property in Condition
Widget;
- Fixes #2853 ;
- Fix errors in URL property handling in Condition Widget;
- Fixes #2853 ;
- Fixes #2867 - hide the View Switcher when an object is being edited;
- Refined titling on View Switcher and Notebook menu button;
- Cleaned up styles in l-browse-bar and moved into
ui/layout/layout.scss;
- Removed styles/_layout.scss;
- Hide the main view Edit button when in mobile
2020-04-08 09:36:23 -07:00
David Tsay
d188b9a056
do not mutate function args for criteria results either
2020-04-07 13:22:03 -07:00
Joshi
f510f3edd0
Removes missed code
2020-04-07 11:59:24 -07:00
Joshi
e05b0bb562
Address review comments:
...
Fixes telemetry view visibility and styling issue
Removes none option for border and background styles for drawing objects
2020-04-07 11:34:48 -07:00
David Tsay
713c5e9fb7
Merge branch 'master' into dave/conditionals-own-results
2020-04-06 18:56:08 -07:00
David Tsay
17bca04560
do not mutate function args
2020-04-06 18:53:48 -07:00
Charles Hacskaylo
61bdadc33c
Fixes #2878 ( #2879 )
...
- Remove background from `elementStatusColors` mixin;
- Change Indicators to use more correct style of `.s-status-on`;
2020-04-06 15:36:52 -07:00
David Tsay
e0c5bca47d
fix unit tests
2020-04-06 14:25:55 -07:00
Joshi
cdc7c1af64
Removes unused data
2020-04-06 14:04:11 -07:00
Joshi
3158baa998
Merge branch 'fix-telemetryview-styles' of https://github.com/nasa/openmct into fix-telemetryview-styles
2020-04-06 14:02:45 -07:00
Joshi
698508fde4
Use the subobject view type to determine where styles should be saved
2020-04-06 14:02:06 -07:00
Shefali Joshi
68a96989e1
Merge branch 'master' into fix-telemetryview-styles
2020-04-06 13:57:41 -07:00
Joshi
46a6a43234
Merge branch 'master' of https://github.com/nasa/openmct into fix-telemetryview-styles
2020-04-06 13:56:30 -07:00
David Tsay
d41fc27b55
subscriptions should use latest timestamp
2020-04-06 11:17:59 -07:00
David Tsay
24bb96cc90
WIP detach request data from subscription data
...
extract getLatestTimestamp function
2020-04-03 18:39:26 -07:00
David Tsay
483ee173d6
pass correct args into off listener
2020-04-02 16:34:40 -07:00
Joel McKinnon
469e93d916
Merge pull request #2865 from nasa/criterion-delete
...
Criterion delete
2020-04-02 10:51:12 -07:00
Joshi
f96dfcc942
Reassign ids for criteria when we clone conditions
2020-04-02 10:45:37 -07:00
Joshi
063a6c0e51
Merge branch 'criterion-delete' of https://github.com/nasa/openmct into criterion-delete
2020-04-02 10:40:57 -07:00
Joshi
7c289d76b6
Revert object.assign change
2020-04-02 10:40:39 -07:00
Joshi
c617a440eb
Merge branch 'master' of https://github.com/nasa/openmct into criterion-delete
2020-04-02 10:40:32 -07:00
Joshi
8f81a45b9b
Removes coverage branch
2020-04-02 10:30:23 -07:00
Joshi
666459be87
Merge branch 'master' of https://github.com/nasa/openmct into fix-telemetryview-styles
2020-04-02 10:30:07 -07:00
Shefali Joshi
53df89aa5d
Merge branch 'master' into criterion-delete
2020-04-02 10:26:57 -07:00
Shefali Joshi
8f553f6327
Merge pull request #2848 from nasa/fix-any-telemetry
...
Fix LAD requests for any/all telemetry
2020-04-02 10:23:26 -07:00
Joshi
f91a64483b
Adds missing id during create condition
2020-04-02 10:18:41 -07:00
Joshi
de8d63c09d
Merge branch 'master' of https://github.com/nasa/openmct into criterion-delete
2020-04-02 10:11:42 -07:00
Shefali Joshi
58b4a6ebf5
Merge branch 'master' into fix-any-telemetry
2020-04-02 10:06:37 -07:00
Shefali Joshi
9d45080526
Merge pull request #2858 from nasa/dave/conditionals-request-default
...
request LAD for default condition
2020-04-02 10:05:42 -07:00
Joshi
d3fe2a6811
Merge branch 'master' of https://github.com/nasa/openmct into fix-telemetryview-styles
2020-04-01 15:52:55 -07:00
Joshi
97b37edce4
Store telemetry styles on their container domain objects.
2020-04-01 15:51:40 -07:00
Joel McKinnon
d3443518d6
reverted changes unrelated to id
2020-04-01 15:08:31 -07:00
Joel McKinnon
c33314a4bf
added uuid to addCriteria, cloneCriteria, changed key of v-for to criteria.id
2020-04-01 14:56:32 -07:00
David Tsay
59eb034ab4
Merge branch 'master' into dave/conditionals-request-default
2020-04-01 14:42:21 -07:00
Nikhil
67d53fb62b
[Notebook]: When notebook is not default new entry button does not add new entry #2841 ( #2855 )
...
Co-authored-by: Deep Tailor <deep.j.tailor@nasa.gov>
2020-04-01 14:28:52 -07:00
Nikhil
0fd637c0e9
[Notebook]: Error in nextTick: "TypeError: Cannot read property 'focus' of null" #2845 ( #2857 )
2020-04-01 14:22:11 -07:00
Joel McKinnon
169cc6617a
added uuid() in conditionManager
2020-04-01 13:58:58 -07:00
David Tsay
a946325e95
request LAD for default condition
2020-04-01 13:58:27 -07:00
Joel McKinnon
1beba78111
removed call to checkTelemetry in computed prop, removed if in persist(), changed key in v-for for criteria
2020-04-01 13:34:17 -07:00
Joel McKinnon
2edfeaa606
added checkTelemetry call in inputCount computed prop
2020-04-01 12:15:02 -07:00
Joel McKinnon
2a1f9fd063
removed recursive call
2020-04-01 11:10:10 -07:00
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
