Merge pull request #1321 from CachetHQ/component-group-lowest-status

Display a status circle next to component groups. Closes #1317
This commit is contained in:
James Brooks
2016-01-03 12:14:01 +00:00
3 changed files with 105 additions and 3 deletions

View File

@@ -12,9 +12,11 @@
namespace CachetHQ\Cachet\Models;
use AltThree\Validator\ValidatingTrait;
use CachetHQ\Cachet\Presenters\ComponentGroupPresenter;
use Illuminate\Database\Eloquent\Model;
use McCool\LaravelAutoPresenter\HasPresenter;
class ComponentGroup extends Model
class ComponentGroup extends Model implements HasPresenter
{
use ValidatingTrait;
@@ -46,6 +48,13 @@ class ComponentGroup extends Model
'order' => 'int',
];
/**
* The relations to eager load on every query.
*
* @var string[]
*/
protected $with = ['enabled_components'];
/**
* A group can have many components.
*
@@ -55,4 +64,24 @@ class ComponentGroup extends Model
{
return $this->hasMany(Component::class, 'group_id', 'id');
}
/**
* Return all of the enabled components.
*
* @return \Illuminate\Database\Eloquent\Builder
*/
public function enabled_components()
{
return $this->components()->enabled();
}
/**
* Get the presenter class.
*
* @return string
*/
public function getPresenterClass()
{
return ComponentGroupPresenter::class;
}
}

View File

@@ -0,0 +1,69 @@
<?php
/*
* This file is part of Cachet.
*
* (c) Alt Three Services Limited
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace CachetHQ\Cachet\Presenters;
use CachetHQ\Cachet\Presenters\Traits\TimestampsTrait;
class ComponentGroupPresenter extends AbstractPresenter
{
use TimestampsTrait;
/**
* Returns the lowest component status.
*
* @return string|null
*/
public function lowest_status()
{
if ($enabledComponents = $this->wrappedObject->enabled_components()->orderBy('status', 'desc')->first()) {
return $enabledComponents->status;
}
}
/**
* Returns the lowest component status, readable by humans.
*
* @return string|null
*/
public function lowest_human_status()
{
if ($enabledComponents = $this->wrappedObject->enabled_components()->orderBy('status', 'desc')->first()) {
return $enabledComponents->human_status;
}
}
/**
* Returns the lowest component status color.
*
* @return string|null
*/
public function lowest_status_color()
{
if ($enabledComponents = $this->wrappedObject->enabled_components()->orderBy('status', 'desc')->first()) {
return $enabledComponents->status_color;
}
}
/**
* Convert the presenter instance to an array.
*
* @return string[]
*/
public function toArray()
{
return array_merge($this->wrappedObject->toArray(), [
'created_at' => $this->created_at(),
'updated_at' => $this->updated_at(),
'lowest_human_status' => $this->lowest_human_status(),
]);
}
}

View File

@@ -1,14 +1,18 @@
<ul class="list-group components">
@if($component_groups->count() > 0)
@foreach($component_groups as $componentGroup)
@if($componentGroup->components()->enabled()->count() > 0)
@if($componentGroup->enabled_components->count() > 0)
<li class="list-group-item group-name">
<i class="ion-ios-minus-outline group-toggle"></i>
<strong>{{ $componentGroup->name }}</strong>
<div class="pull-right">
<i class="ion-ios-circle-filled text-component-{{ $componentGroup->lowest_status }} {{ $componentGroup->lowest_status_color }}" data-toggle="tooltip" title="{{ $componentGroup->lowest_human_status }}"></i>
</div>
</li>
<div class="group-items">
@foreach($componentGroup->components()->enabled()->orderBy('order')->get() as $component)
@foreach($componentGroup->enabled_components()->orderBy('order')->get() as $component)
@include('partials.component', compact($component))
@endforeach
</div>