From 174e28b850aa3ef0cade6d27e1b9baeb71de7828 Mon Sep 17 00:00:00 2001
From: xAt0mZ <baron_l@epitech.eu>
Date: Mon, 26 Oct 2020 19:47:23 +0100
Subject: [PATCH] feat(k8s/application): app details for pods

---
 .../containers-datatable/containersDatatable.html    |  4 ++--
 .../containers-datatable/containersDatatable.js      |  1 +
 app/kubernetes/converters/application.js             |  4 ----
 .../views/applications/edit/application.html         | 12 +++++++++---
 .../views/applications/edit/applicationController.js |  5 +++--
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html b/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html
index 8c291971d..1d77ab609 100644
--- a/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html
+++ b/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html
@@ -57,7 +57,7 @@
         <table class="table table-hover nowrap-cells">
           <thead>
             <tr>
-              <th>
+              <th ng-if="!$ctrl.isPod">
                 <a ng-click="$ctrl.changeOrderBy('PodName')">
                   Pod
                   <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'PodName' && !$ctrl.state.reverseOrder"></i>
@@ -107,7 +107,7 @@
               dir-paginate="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit: $ctrl.tableKey))"
               pagination-id="$ctrl.tableKey"
             >
-              <td>{{ item.PodName }}</td>
+              <td ng-if="!$ctrl.isPod">{{ item.PodName }}</td>
               <td>{{ item.Name }}</td>
               <td>{{ item.Image }}</td>
               <td
diff --git a/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.js b/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.js
index 6d8b5ca99..f7b31912d 100644
--- a/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.js
+++ b/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.js
@@ -8,5 +8,6 @@ angular.module('portainer.kubernetes').component('kubernetesContainersDatatable'
     tableKey: '@',
     orderBy: '@',
     refreshCallback: '<',
+    isPod: '<',
   },
 });
diff --git a/app/kubernetes/converters/application.js b/app/kubernetes/converters/application.js
index 8e603cdf0..201451f82 100644
--- a/app/kubernetes/converters/application.js
+++ b/app/kubernetes/converters/application.js
@@ -221,10 +221,6 @@ class KubernetesApplicationConverter {
     const res = new KubernetesApplication();
     KubernetesApplicationConverter.applicationCommon(res, data, pods, service, ingresses);
     res.ApplicationType = KubernetesApplicationTypes.POD;
-    // res.DeploymentType = KubernetesApplicationDeploymentTypes.REPLICATED;
-    // res.DataAccessPolicy = KubernetesApplicationDataAccessPolicies.SHARED;
-    // res.RunningPodsCount = data.status.availableReplicas || data.status.replicas - data.status.unavailableReplicas || 0;
-    // res.TotalPodsCount = data.spec.replicas;
     return res;
   }
 
diff --git a/app/kubernetes/views/applications/edit/application.html b/app/kubernetes/views/applications/edit/application.html
index 197a3e5ea..822ef9adc 100644
--- a/app/kubernetes/views/applications/edit/application.html
+++ b/app/kubernetes/views/applications/edit/application.html
@@ -43,16 +43,21 @@
                     </tr>
                     <tr>
                       <td>Status</td>
-                      <td>
+                      <td ng-if="ctrl.application.ApplicationType !== ctrl.KubernetesApplicationTypes.POD">
                         <span ng-if="ctrl.application.DeploymentType === ctrl.KubernetesApplicationDeploymentTypes.REPLICATED">Replicated</span>
                         <span ng-if="ctrl.application.DeploymentType === ctrl.KubernetesApplicationDeploymentTypes.GLOBAL">Global</span>
                         <code>{{ ctrl.application.RunningPodsCount }}</code> / <code>{{ ctrl.application.TotalPodsCount }}</code>
                       </td>
+                      <td ng-if="ctrl.application.ApplicationType === ctrl.KubernetesApplicationTypes.POD">
+                        {{ ctrl.application.Pods[0].Status }}
+                      </td>
                     </tr>
                     <tr ng-if="ctrl.application.Requests.Cpu || ctrl.application.Requests.Memory">
                       <td>
                         <div>Resource reservations</div>
-                        <div class="text-muted small">per instance</div>
+                        <div ng-if="ctrl.application.ApplicationType !== ctrl.KubernetesApplicationTypes.POD" class="text-muted small">
+                          per instance
+                        </div>
                       </td>
                       <td>
                         <div ng-if="ctrl.application.Requests.Cpu">CPU {{ ctrl.application.Requests.Cpu | kubernetesApplicationCPUValue }}</div>
@@ -557,7 +562,8 @@
         title-icon="fa-server"
         dataset="ctrl.allContainers"
         table-key="kubernetes.application.containers"
-        order-by="PodName"
+        is-pod="ctrl.application.ApplicationType === ctrl.KubernetesApplicationTypes.POD"
+        order-by="{{ ctrl.application.ApplicationType === ctrl.KubernetesApplicationTypes.POD ? 'Name' : 'PodName' }}"
       >
       </kubernetes-containers-datatable>
     </div>
diff --git a/app/kubernetes/views/applications/edit/applicationController.js b/app/kubernetes/views/applications/edit/applicationController.js
index b3304df8c..773e2099c 100644
--- a/app/kubernetes/views/applications/edit/applicationController.js
+++ b/app/kubernetes/views/applications/edit/applicationController.js
@@ -1,7 +1,7 @@
 import angular from 'angular';
 import * as _ from 'lodash-es';
 import * as JsonPatch from 'fast-json-patch';
-import { KubernetesApplicationDataAccessPolicies, KubernetesApplicationDeploymentTypes } from 'Kubernetes/models/application/models';
+import { KubernetesApplicationDataAccessPolicies, KubernetesApplicationDeploymentTypes, KubernetesApplicationTypes } from 'Kubernetes/models/application/models';
 import KubernetesEventHelper from 'Kubernetes/helpers/eventHelper';
 import KubernetesApplicationHelper from 'Kubernetes/helpers/application';
 import { KubernetesServiceTypes } from 'Kubernetes/models/service/models';
@@ -123,6 +123,8 @@ class KubernetesApplicationController {
 
     this.KubernetesNamespaceHelper = KubernetesNamespaceHelper;
 
+    this.KubernetesApplicationDeploymentTypes = KubernetesApplicationDeploymentTypes;
+    this.KubernetesApplicationTypes = KubernetesApplicationTypes;
     this.ApplicationDataAccessPolicies = KubernetesApplicationDataAccessPolicies;
     this.KubernetesServiceTypes = KubernetesServiceTypes;
     this.KubernetesPodContainerTypes = KubernetesPodContainerTypes;
@@ -340,7 +342,6 @@ class KubernetesApplicationController {
       SelectedRevision: undefined,
     };
 
-    this.KubernetesApplicationDeploymentTypes = KubernetesApplicationDeploymentTypes;
     await this.getApplication();
     await this.getEvents();
     this.state.viewReady = true;