github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(dashboard) remove environment url from dashboard EE-2849 (#6955) 

* EE-2849 remove environment url from dashboard

* EE-2849 only remove edge env's url

* EE-2849 remove logging
pull/6977/head
Chao Geng 2022-05-23 17:05:37 +08:00 committed by GitHub
parent b031a30f62
commit 3aacaa7caf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/docker/views/dashboard/dashboard.html
View File

@ -51,7 +51,7 @@
>
</td>
</tr>
<tr>
<tr ng-if="showEnvUrl">
<td>URL</td>
<td>{{ endpoint.URL | stripprotocol }}</td>
</tr>

3
app/docker/views/dashboard/dashboardController.js
View File

@ -2,6 +2,7 @@ import angular from 'angular';
import _ from 'lodash';
import { isOfflineEndpoint } from '@/portainer/helpers/endpointHelper';
import { PortainerEndpointTypes } from 'Portainer/models/endpoint/models';
angular.module('portainer.docker').controller('DashboardController', [
'$scope',
@ -46,7 +47,7 @@ angular.module('portainer.docker').controller('DashboardController', [
$scope.endpoint = endpoint;
$scope.showStacks = await shouldShowStacks();
$scope.showEnvUrl = endpoint.Type !== PortainerEndpointTypes.EdgeAgentOnDockerEnvironment && endpoint.Type !== PortainerEndpointTypes.EdgeAgentOnKubernetesEnvironment;
$q.all({
containers: ContainerService.containers(1),
images: ImageService.images(false),

2
app/kubernetes/views/dashboard/dashboard.html
View File

@ -16,7 +16,7 @@
{{ ctrl.endpoint.Name }}
</td>
</tr>
<tr>
<tr ng-if="ctrl.showEnvUrl">
<td>URL</td>
<td>{{ ctrl.endpoint.URL | stripprotocol }}</td>
</tr>

2
app/kubernetes/views/dashboard/dashboardController.js
View File

@ -2,6 +2,7 @@ import angular from 'angular';
import _ from 'lodash-es';
import KubernetesConfigurationHelper from 'Kubernetes/helpers/configurationHelper';
import KubernetesNamespaceHelper from 'Kubernetes/helpers/namespaceHelper';
import { PortainerEndpointTypes } from 'Portainer/models/endpoint/models';
class KubernetesDashboardController {
/* @ngInject */
@ -34,6 +35,7 @@ class KubernetesDashboardController {
async getAllAsync() {
const isAdmin = this.Authentication.isAdmin();
const storageClasses = this.endpoint.Kubernetes.Configuration.StorageClasses;
this.showEnvUrl = this.endpoint.Type !== PortainerEndpointTypes.EdgeAgentOnDockerEnvironment && this.endpoint.Type !== PortainerEndpointTypes.EdgeAgentOnKubernetesEnvironment;
try {
const [pools, applications, configurations, volumes, tags] = await Promise.all([