Merge pull request #2052 from jlmitch5/fixInstancesList

instance list fixes
This commit is contained in:
John Mitchell
2018-06-11 10:05:21 -04:00
committed by GitHub
4 changed files with 16 additions and 2 deletions

View File

@@ -263,6 +263,12 @@
}
}
@media screen and (max-width: @at-breakpoint-instances-wrap) {
.at-Row-items--instances {
margin-bottom: @at-padding-bottom-instances-wrap;
}
}
@media screen and (max-width: @at-breakpoint-compact-list) {
.at-Row-actions {
flex-direction: column;

View File

@@ -247,6 +247,7 @@
@at-padding-list-row-item-tag: 0 @at-space-2x;
@at-padding-list-row-action: 7px;
@at-padding-list-row: 10px 20px 10px 10px;
@at-padding-bottom-instances-wrap: 30px;
@at-margin-input-message: @at-space;
@at-margin-item-column: @at-space-3x;
@@ -332,3 +333,4 @@
@at-breakpoint-mobile-layout: @at-breakpoint-sm;
@at-breakpoint-compact-list: @at-breakpoint-sm;
@at-breakpoint-instances-wrap: 1036px;

View File

@@ -58,7 +58,7 @@
</div>
</div>
<div class="at-Row-items">
<div class="at-Row-items at-Row-items--instances">
<at-row-item header-value="{{ instance.hostname }}"></at-row-item>
<at-row-item
label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_RUNNING_JOBS') }}"

View File

@@ -251,7 +251,13 @@ function InstanceGroupsRun ($stateExtender, strings, ComponentsStrings) {
}
},
resolve: {
resolvedModels: InstanceGroupsResolve
resolvedModels: InstanceGroupsResolve,
Dataset: ['GetBasePath', 'QuerySet', '$stateParams',
function(GetBasePath, qs, $stateParams) {
let path = `${GetBasePath('instance_groups')}${$stateParams.instance_group_id}/instances`;
return qs.search(path, $stateParams[`instance_search`]);
}
]
}
});