mirror of
https://github.com/ansible/awx.git
synced 2026-01-11 10:00:01 -03:30
[system_tracking] Truncate long values in nested facts
This commit is contained in:
parent
52dc039013
commit
fc361336da
@ -8,6 +8,7 @@ import listGenerator from './list-generator/main';
|
||||
import title from './title.directive';
|
||||
import lodashAsPromised from './lodash-as-promised';
|
||||
import stringFilters from './string-filters/main';
|
||||
import truncatedText from './truncated-text.directive';
|
||||
|
||||
export default
|
||||
angular.module('shared',
|
||||
@ -15,4 +16,5 @@ export default
|
||||
stringFilters.name
|
||||
])
|
||||
.factory('lodashAsPromised', lodashAsPromised)
|
||||
.directive('truncatedText', truncatedText)
|
||||
.directive('title', title);
|
||||
|
||||
43
awx/ui/static/js/shared/truncated-text.directive.js
Normal file
43
awx/ui/static/js/shared/truncated-text.directive.js
Normal file
@ -0,0 +1,43 @@
|
||||
/* jshint unused: vars */
|
||||
|
||||
function link($compile, scope, element, attrs) {
|
||||
|
||||
function elementTextWillWrap(element) {
|
||||
var fullTextWidth = element[0].scrollWidth;
|
||||
var elementWidth = element.outerWidth();
|
||||
|
||||
if(fullTextWidth > elementWidth) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
function getText() {
|
||||
return element.text();
|
||||
}
|
||||
|
||||
function addTitleIfWrapping(text) {
|
||||
if (elementTextWillWrap(element)) {
|
||||
element
|
||||
.addClass('u-truncatedText')
|
||||
.removeAttr('truncated-text')
|
||||
.attr('title', text);
|
||||
|
||||
$compile(element)(scope);
|
||||
}
|
||||
}
|
||||
|
||||
scope.$watch(getText, addTitleIfWrapping);
|
||||
}
|
||||
|
||||
export default
|
||||
['$compile',
|
||||
function($compile) {
|
||||
return {
|
||||
priority: 1000, // make sure this gets compiled
|
||||
// before `title`
|
||||
link: _.partial(link, $compile)
|
||||
};
|
||||
}
|
||||
];
|
||||
@ -24,6 +24,7 @@
|
||||
&-column {
|
||||
padding: 0.5em 0;
|
||||
flex: 1;
|
||||
white-space: nowrap;
|
||||
&--offsetLeft {
|
||||
margin-left: 33%;
|
||||
}
|
||||
|
||||
@ -84,27 +84,27 @@
|
||||
<div class="FactDataGroup-facts" data-facts="{{group.facts}}">
|
||||
<div class="FactDataTable-arrayGroup" ng-if="group.isFactArray" ng-repeat="arrayGroup in group.facts" data-array-group="{{arrayGroup}}">
|
||||
<div class="FactDataTable-row FactDatum" ng-class="{'FactDatum--divergent': fact.isDivergent }" ng-repeat="fact in arrayGroup" data-fact="{{fact}}">
|
||||
<p class="FactDatum-keyName FactDataTable-column">
|
||||
<span class="FactDatum-keyName FactDataTable-column">
|
||||
{{fact.keyName}}
|
||||
</p>
|
||||
<p class="FactDatum-value FactDataTable-column" style="word-break: break-all">
|
||||
</span>
|
||||
<span class="FactDatum-value FactDataTable-column u-truncatedText">
|
||||
{{fact.value1}}
|
||||
</p>
|
||||
<p class="FactDatum-value FactDataTable-column" style="word-break: break-all">
|
||||
</span>
|
||||
<span class="FactDatum-value FactDataTable-column u-truncatedText">
|
||||
{{fact.value2}}
|
||||
</p>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="FactDataTable-row FactDatum" ng-class="{'FactDatum--divergent': fact.isDivergent }" ng-repeat="fact in group.facts" ng-unless="group.isFactArray" data-fact="{{fact}}">
|
||||
<p class="FactDataTable-column FactDatum-keyName">
|
||||
<span class="FactDataTable-column FactDatum-keyName">
|
||||
{{fact.keyName}}
|
||||
</p>
|
||||
<p class="FactDataTable-column FactDatum-value" style="word-break: break-all">
|
||||
</span>
|
||||
<span class="FactDataTable-column FactDatum-value" truncated-text>
|
||||
{{fact.value1}}
|
||||
</p>
|
||||
<p class="FactDataTable-column FactDatum-value" style="word-break: break-all">
|
||||
</span>
|
||||
<span class="FactDataTable-column FactDatum-value" truncated-text>
|
||||
{{fact.value2}}
|
||||
</p>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -78,6 +78,10 @@ a.red-txt:active {
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
.tooltip {
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
blockquote {
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user