From 20de243299078dddd9c30b5f6cc10decd0820479 Mon Sep 17 00:00:00 2001 From: Oscar Zhou <100548325+oscarzhou-portainer@users.noreply.github.com> Date: Fri, 12 Jul 2024 08:45:44 +1200 Subject: [PATCH] fix(host): show clear host info message [EE-7075] (#12010) --- .../host-overview/host-overview.html | 1 - .../components/host-overview/host-overview.js | 1 - .../disks-panel/disks-panel.html | 5 +++- .../host-details-panel-controller.js | 27 ------------------- .../host-details-panel/host-details-panel.js | 4 --- .../docker-features-configuration.html | 8 ++++-- app/docker/views/host/host-view.html | 1 - .../AgentTab/DeploymentScripts.tsx | 1 + 8 files changed, 11 insertions(+), 37 deletions(-) delete mode 100644 app/docker/components/host-view-panels/host-details-panel/host-details-panel-controller.js diff --git a/app/docker/components/host-overview/host-overview.html b/app/docker/components/host-overview/host-overview.html index 2e4fd4331..5b133d3b4 100644 --- a/app/docker/components/host-overview/host-overview.html +++ b/app/docker/components/host-overview/host-overview.html @@ -3,7 +3,6 @@ diff --git a/app/docker/components/host-overview/host-overview.js b/app/docker/components/host-overview/host-overview.js index be93a3309..d446d71f5 100644 --- a/app/docker/components/host-overview/host-overview.js +++ b/app/docker/components/host-overview/host-overview.js @@ -10,7 +10,6 @@ angular.module('portainer.docker').component('hostOverview', { refreshUrl: '@', browseUrl: '@', hostFeaturesEnabled: '<', - environmentId: '<', }, transclude: true, }); diff --git a/app/docker/components/host-view-panels/disks-panel/disks-panel.html b/app/docker/components/host-view-panels/disks-panel/disks-panel.html index 6f1b2f06c..9653cd4db 100644 --- a/app/docker/components/host-view-panels/disks-panel/disks-panel.html +++ b/app/docker/components/host-view-panels/disks-panel/disks-panel.html @@ -15,9 +15,12 @@ {{ disk.Vendor }} {{ disk.Size | humansize }} - + Loading... + + Failed to load devices. + No disks available. diff --git a/app/docker/components/host-view-panels/host-details-panel/host-details-panel-controller.js b/app/docker/components/host-view-panels/host-details-panel/host-details-panel-controller.js deleted file mode 100644 index 36a4fb1d5..000000000 --- a/app/docker/components/host-view-panels/host-details-panel/host-details-panel-controller.js +++ /dev/null @@ -1,27 +0,0 @@ -const ROOT_PATH = '/host'; - -export class HostDetailsPanelController { - /* @ngInject */ - constructor($async, HostBrowserService) { - Object.assign(this, { $async, HostBrowserService }); - - this.getFilesForPath = this.getFilesForPath.bind(this); - this.getFilesForPathAsync = this.getFilesForPathAsync.bind(this); - } - - getFilesForPath(path) { - return this.$async(this.getFilesForPathAsync, path); - } - - async getFilesForPathAsync(path) { - const isBrowseEnabledOrig = this.isBrowseEnabled; - this.isBrowseEnabled = false; - - await this.HostBrowserService.ls(this.environmentId, path); - this.isBrowseEnabled = isBrowseEnabledOrig; - } - - $onInit() { - this.getFilesForPath(ROOT_PATH); - } -} diff --git a/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js index 1b8f4085f..7fd43efc0 100644 --- a/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js +++ b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js @@ -1,12 +1,8 @@ -import { HostDetailsPanelController } from './host-details-panel-controller'; - angular.module('portainer.docker').component('hostDetailsPanel', { templateUrl: './host-details-panel.html', - controller: HostDetailsPanelController, bindings: { host: '<', isBrowseEnabled: '<', browseUrl: '@', - environmentId: '<', }, }); diff --git a/app/docker/views/docker-features-configuration/docker-features-configuration.html b/app/docker/views/docker-features-configuration/docker-features-configuration.html index 745fd29fc..9e3bf854f 100644 --- a/app/docker/views/docker-features-configuration/docker-features-configuration.html +++ b/app/docker/views/docker-features-configuration/docker-features-configuration.html @@ -6,10 +6,14 @@
Host and filesystem
-
+
- These features are only available for an Agent enabled environments. + The environment must be running the Portainer Agent to use this functionality, and the root of the host must be + bind-mounted to /host in the agent deployment. Check + our documentation for more information.
diff --git a/app/docker/views/host/host-view.html b/app/docker/views/host/host-view.html index 2efe5e489..8895ae018 100644 --- a/app/docker/views/host/host-view.html +++ b/app/docker/views/host/host-view.html @@ -8,5 +8,4 @@ refresh-url="docker.host" browse-url="docker.host.browser" host-features-enabled="$ctrl.state.enableHostManagementFeatures" - environment-id="$ctrl.endpoint.Id" > diff --git a/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/AgentTab/DeploymentScripts.tsx b/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/AgentTab/DeploymentScripts.tsx index e450a952e..2a52ed419 100644 --- a/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/AgentTab/DeploymentScripts.tsx +++ b/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/AgentTab/DeploymentScripts.tsx @@ -120,6 +120,7 @@ docker service create \\ --constraint 'node.platform.os == linux' \\ --mount type=bind,src=//var/run/docker.sock,dst=/var/run/docker.sock \\ --mount type=bind,src=//var/lib/docker/volumes,dst=/var/lib/docker/volumes \\ + --mount type=bind,src=//,dst=/host \\ portainer/agent:${agentVersion} `; }