-
Notifications
You must be signed in to change notification settings - Fork 356
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add widget-report component and method to get data #1805
Merged
himdel
merged 6 commits into
ManageIQ:master
from
ZitaNemeckova:widget_report_component
Aug 18, 2017
+50
−13
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
b175711
Add widget-report component and method to get data
ZitaNemeckova 1031eb2
Remove old widget-report layout
ZitaNemeckova 27a5d44
Replace trustAsHTML with getTrustedHTML
ZitaNemeckova 6e9d3b0
Fix HTML
ZitaNemeckova a895866
Add minimize
ZitaNemeckova 9b29df6
Add RBAC check
ZitaNemeckova File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
ManageIQ.angular.app.component('widgetReport', { | ||
bindings: { | ||
id: '<', | ||
}, | ||
controllerAs: 'vm', | ||
controller: ['$http', 'miqService', '$sce', function($http, miqService, $sce) { | ||
var vm = this; | ||
vm.widgetReportModel = {}; | ||
|
||
this.$onInit = function() { | ||
$http.get('/dashboard/widget_report_data/' + vm.id) | ||
.then(function(response) { vm.widgetReportModel.content = $sce.getTrustedHtml(response.data.content);}) | ||
.catch(miqService.handleFailure); | ||
vm.div_id = "dd_w" + vm.id + "_box"; | ||
}; | ||
|
||
vm.contentPresent = function() { | ||
return vm.widgetReportModel.content !== undefined; | ||
}; | ||
}], | ||
template: [ | ||
'<div class="mc" id="{{vm.div_id}}" ng-class="{ hidden: vm.widgetReportModel.minimized }">', | ||
' <div class="blank-slate-pf " style="padding: 10px" ng-if="!vm.contentPresent()">', | ||
' <div class="blank-slate-pf-icon">', | ||
' <i class="fa fa-cog">', | ||
' </i>', | ||
' <h1>', | ||
__('No report data found.'), | ||
' </h1>', | ||
' </div>', | ||
' </div>', | ||
' <div ng-if="vm.contentPresent()">', | ||
' <div ng-bind-html="vm.widgetReportModel.content">', | ||
' </div>', | ||
' </div>', | ||
'</div>', | ||
|
||
].join("\n"), | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1087,6 +1087,7 @@ | |
timeline | ||
timeline_data | ||
widget_to_pdf | ||
widget_report_data | ||
start_url | ||
widget_menu_data | ||
), | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But.. you're sure about
getTrustedHtml
, right? (vstrustAsHtml
)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So far it wasn't problem. I like
getTrustedHtml
safety buttrustAsHtml
will work for "anything". What do you think?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed,
getTrustedHtml
is definitely safer, it doesn't seem to remove colors from reports.. let's keep it until someone complains :)