mirror of https://github.com/rancher/ui.git
Fix catalog layout issue
This commit is contained in:
parent
19532786fb
commit
b1ec523a1e
|
|
@ -21,12 +21,26 @@ export default Controller.extend({
|
|||
filteredApps: computed('model.apps.@each.{type,isFromCatalog,tags,state}', 'tags', function() {
|
||||
var needTags = get(this, 'tags');
|
||||
|
||||
var out = get(this, 'model.apps').filter((ns) => !C.REMOVEDISH_STATES.includes(get(ns, 'state')));
|
||||
var apps = get(this, 'model.apps').filter((ns) => !C.REMOVEDISH_STATES.includes(get(ns, 'state')));
|
||||
|
||||
if ( needTags && needTags.length ) {
|
||||
out = out.filter((obj) => obj.hasTags(needTags));
|
||||
apps = apps.filter((obj) => obj.hasTags(needTags));
|
||||
}
|
||||
|
||||
return out.sortBy('displayName');
|
||||
apps = apps.sortBy('displayName');
|
||||
|
||||
const group = [];
|
||||
let dataIndex = 0;
|
||||
|
||||
apps.forEach((app, index) => {
|
||||
if ( index % 2 === 0 ) {
|
||||
group.push([app]);
|
||||
dataIndex++;
|
||||
} else {
|
||||
group[dataIndex - 1].push(app);
|
||||
}
|
||||
});
|
||||
|
||||
return group;
|
||||
}),
|
||||
});
|
||||
|
|
|
|||
|
|
@ -7,8 +7,14 @@
|
|||
</section>
|
||||
|
||||
<section class="pl-0 pr-0">
|
||||
{{#each filteredApps as |ns|}}
|
||||
{{namespace-app model=ns}}
|
||||
{{#each filteredApps as |group|}}
|
||||
<div class="row flex">
|
||||
{{#each group as |ns|}}
|
||||
<div class="col span-6 mt-0">
|
||||
{{namespace-app model=ns}}
|
||||
</div>
|
||||
{{/each}}
|
||||
</div>
|
||||
{{else}}
|
||||
{{empty-table disabled=(rbac-prevents resource="app" scope="project" permission="create") resource="container" newRoute="catalog-tab" newTranslationKey="nav.apps.launch"}}
|
||||
{{/each}}
|
||||
|
|
|
|||
|
|
@ -132,6 +132,9 @@
|
|||
display: block !important;
|
||||
}
|
||||
|
||||
.flex {
|
||||
display:flex;
|
||||
}
|
||||
|
||||
.inline-block {
|
||||
display: inline-block !important;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
.namespace-app {
|
||||
margin-bottom: 20px;
|
||||
position: relative;
|
||||
float: left;
|
||||
width: calc(50% - 15px);
|
||||
margin: 15px 0 15px 15px;
|
||||
height: 100%;
|
||||
|
||||
&:last-child {
|
||||
margin-bottom: 0;
|
||||
|
|
@ -11,6 +9,7 @@
|
|||
.stack-info {
|
||||
display: table;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
.catalog-icon {
|
||||
@include catalog-img(transparent);
|
||||
|
|
|
|||
Loading…
Reference in New Issue