From 06911ad2c6ec5561673a02bde62264f5cd180271 Mon Sep 17 00:00:00 2001
From: xAt0mZ <xAt0mZ@users.noreply.github.com>
Date: Wed, 10 Jun 2020 21:59:11 +0200
Subject: [PATCH] refactor(app): remove all VMWARE_VIC related code (#3914)

---
 app/docker/helpers/infoHelper.js                          | 6 +-----
 app/docker/views/containers/stats/containerstats.html     | 2 +-
 app/docker/views/images/edit/imageController.js           | 3 +--
 app/docker/views/networks/edit/networkController.js       | 5 +----
 app/docker/views/volumes/create/createVolumeController.js | 3 +--
 app/portainer/views/sidebar/sidebar.html                  | 2 +-
 6 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/app/docker/helpers/infoHelper.js b/app/docker/helpers/infoHelper.js
index 3ec824793..7bd7bcfff 100644
--- a/app/docker/helpers/infoHelper.js
+++ b/app/docker/helpers/infoHelper.js
@@ -18,11 +18,7 @@ angular.module('portainer.docker').factory('InfoHelper', [
       }
 
       if (!info.Swarm || _.isEmpty(info.Swarm.NodeID)) {
-        if (info.ID === 'vSphere Integrated Containers') {
-          mode.provider = 'VMWARE_VIC';
-        } else {
-          mode.provider = 'DOCKER_STANDALONE';
-        }
+        mode.provider = 'DOCKER_STANDALONE';
       } else {
         mode.provider = 'DOCKER_SWARM_MODE';
         if (info.Swarm.ControlAvailable) {
diff --git a/app/docker/views/containers/stats/containerstats.html b/app/docker/views/containers/stats/containerstats.html
index c4d800b9a..0a9d019c8 100644
--- a/app/docker/views/containers/stats/containerstats.html
+++ b/app/docker/views/containers/stats/containerstats.html
@@ -80,7 +80,7 @@
     </rd-widget>
   </div>
 
-  <div class="col-sm-12" ng-if="applicationState.endpoint.mode.provider !== 'VMWARE_VIC'">
+  <div class="col-sm-12">
     <container-processes-datatable
       title-text="Processes"
       title-icon="fa-tasks"
diff --git a/app/docker/views/images/edit/imageController.js b/app/docker/views/images/edit/imageController.js
index 6a0471445..f30f8673c 100644
--- a/app/docker/views/images/edit/imageController.js
+++ b/app/docker/views/images/edit/imageController.js
@@ -147,10 +147,9 @@ angular.module('portainer.docker').controller('ImageController', [
 
     function initView() {
       HttpRequestHelper.setPortainerAgentTargetHeader($transition$.params().nodeName);
-      var endpointProvider = $scope.applicationState.endpoint.mode.provider;
       $q.all({
         image: ImageService.image($transition$.params().id),
-        history: endpointProvider !== 'VMWARE_VIC' ? ImageService.history($transition$.params().id) : [],
+        history: ImageService.history($transition$.params().id),
       })
         .then(function success(data) {
           $scope.image = data.image;
diff --git a/app/docker/views/networks/edit/networkController.js b/app/docker/views/networks/edit/networkController.js
index fb99dae4c..76d17b4bd 100644
--- a/app/docker/views/networks/edit/networkController.js
+++ b/app/docker/views/networks/edit/networkController.js
@@ -99,10 +99,7 @@ angular.module('portainer.docker').controller('NetworkController', [
       NetworkService.network($transition$.params().id)
         .then(function success(data) {
           $scope.network = data;
-          var endpointProvider = $scope.applicationState.endpoint.mode.provider;
-          if (endpointProvider !== 'VMWARE_VIC') {
-            getContainersInNetwork(data);
-          }
+          getContainersInNetwork(data);
           $scope.network.IPAM.IPV4Configs = DockerNetworkHelper.getIPV4Configs($scope.network.IPAM.Config);
           $scope.network.IPAM.IPV6Configs = DockerNetworkHelper.getIPV6Configs($scope.network.IPAM.Config);
         })
diff --git a/app/docker/views/volumes/create/createVolumeController.js b/app/docker/views/volumes/create/createVolumeController.js
index 781200e3f..50486b141 100644
--- a/app/docker/views/volumes/create/createVolumeController.js
+++ b/app/docker/views/volumes/create/createVolumeController.js
@@ -130,9 +130,8 @@ angular.module('portainer.docker').controller('CreateVolumeController', [
 
     function initView() {
       var apiVersion = $scope.applicationState.endpoint.apiVersion;
-      var endpointProvider = $scope.applicationState.endpoint.mode.provider;
 
-      PluginService.volumePlugins(apiVersion < 1.25 || endpointProvider === 'VMWARE_VIC')
+      PluginService.volumePlugins(apiVersion < 1.25)
         .then(function success(data) {
           $scope.availableVolumeDrivers = data;
         })
diff --git a/app/portainer/views/sidebar/sidebar.html b/app/portainer/views/sidebar/sidebar.html
index 2ba2696af..030856121 100644
--- a/app/portainer/views/sidebar/sidebar.html
+++ b/app/portainer/views/sidebar/sidebar.html
@@ -18,7 +18,7 @@
         ng-if="applicationState.endpoint.mode && applicationState.endpoint.mode.provider !== 'AZURE'"
         endpoint-api-version="applicationState.endpoint.apiVersion"
         swarm-management="applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE' && applicationState.endpoint.mode.role === 'MANAGER'"
-        standalone-management="applicationState.endpoint.mode.provider === 'DOCKER_STANDALONE' || applicationState.endpoint.mode.provider === 'VMWARE_VIC'"
+        standalone-management="applicationState.endpoint.mode.provider === 'DOCKER_STANDALONE'"
         admin-access="isAdmin"
         offline-mode="endpointState.OfflineMode"
       ></docker-sidebar-content>