Fixed Switches table in Hub view, made human readable attributes fo… (

#89) * Fixed `Switches` table in Hub view, made human readable attributes for Hub Details * Removed phpdoc
hiqdev · May 22, 2019 · fa7f1f1 · fa7f1f1
1 parent c340e2d
commit fa7f1f1
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 10 deletions.
diff --git a/src/controllers/HubController.php b/src/controllers/HubController.php
@@ -72,6 +72,13 @@ public function actions()
                         ]);
                 },
                 'class' => ViewAction::class,
+                'data' => function () {
+                    return [
+                        'snmpOptions' => $this->getSnmpOptions(),
+                        'digitalCapacityOptions' => $this->getDigitalCapacityOptions(),
+                        'nicMediaOptions' => $this->getNicMediaOptions(),
+                    ];
+                },
             ],
             'validate-form' => [
                 'class' => ValidateFormAction::class,

diff --git a/src/grid/HubGridView.php b/src/grid/HubGridView.php
@@ -10,6 +10,7 @@
 
 namespace hipanel\modules\server\grid;
 
+use hipanel\grid\BoxedGridView;
 use hipanel\grid\MainColumn;
 use hipanel\grid\RefColumn;
 use hipanel\modules\client\grid\ClientColumn;
@@ -20,13 +21,29 @@
 use Yii;
 use yii\helpers\Html;
 
-class HubGridView extends \hipanel\grid\BoxedGridView
+class HubGridView extends BoxedGridView
 {
     use ColorizeGrid;
 
+    /**
+     * @var array
+     */
+    public $extraOptions = [];
+
     public function columns()
     {
-        return array_merge(parent::columns(), [
+        $extraColumns = [];
+        foreach (['snmp_version_id', 'digit_capacity_id', 'nic_media'] as $attribute) {
+            $extraColumns[$attribute] = [
+                'attribute' => $attribute,
+                'enableSorting' => false,
+                'value' => function (Hub $hub) use ($attribute): string {
+                    return $this->extraOptions[$attribute][$hub->{$attribute}];
+                }
+            ];
+        }
+
+        return array_merge(parent::columns(), $extraColumns, [
             'inn' => [
                 'enableSorting'     => false,
                 'filterOptions'     => ['class' => 'narrow-filter'],

diff --git a/src/views/hub/view.php b/src/views/hub/view.php
@@ -1,14 +1,20 @@
 <?php
 
+use hipanel\modules\server\grid\BindingColumn;
 use hipanel\modules\server\grid\HubGridView;
 use hipanel\modules\server\grid\ServerGridView;
 use hipanel\modules\server\menus\HubDetailMenu;
+use hipanel\modules\server\models\Binding;
 use hipanel\widgets\Box;
 use hipanel\widgets\MainDetails;
 use hipanel\widgets\Pjax;
 use hipanel\widgets\SettingsModal;
 use yii\helpers\Html;
 
+/** @var array $snmpOptions */
+/** @var array $digitalCapacityOptions */
+/** @var array $nicMediaOptions */
+
 $this->title = Html::encode($model->name);
 $this->params['breadcrumbs'][] = ['label' => Yii::t('hipanel:server', 'Switches'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
@@ -40,14 +46,12 @@
                 echo ServerGridView::detailView([
                     'model' => $model,
                     'boxed' => false,
-                    'columns' => [
-                        'net',
-                        'kvm',
-                        'location',
-                        'pdu',
-                        'rack',
-                        'ipmi',
-                    ],
+                    'columns' => array_map(function (Binding $binding) {
+                        return [
+                            'class' => BindingColumn::class,
+                            'attribute' => $binding->typeWithNo,
+                        ];
+                    }, $model->bindings),
                 ]);
                 $box->endBody();
                 $box->end();
@@ -67,6 +71,13 @@
                 echo HubGridView::detailView([
                     'model' => $model,
                     'boxed' => false,
+                    'gridOptions' => [
+                        'extraOptions' => [
+                            'snmp_version_id' => $snmpOptions,
+                            'digit_capacity_id' => $digitalCapacityOptions,
+                            'nic_media' => $nicMediaOptions,
+                        ],
+                    ],
                     'columns' => [
                         'switch',
                         'inn',