Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-05 05:45:22 +02:00
Code Issues Releases Activity

feat(ui):rename endpoint(s) to environment(s) EE-1206 (#5588)

Browse source 
* rename endpoints to environments EE-1206
This commit is contained in:
Richard Wei 2021-09-08 20:42:17 +12:00 • committed by GitHub
parent 1543ad4c42
commit 9f179fe3ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
151 changed files with 474 additions and 474 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/azure/_module.js
View file

@ -20,7 +20,7 @@ angular.module('portainer.azure', ['portainer.app']).config([
EndpointProvider.setOfflineModeFromStatus(endpoint.Status);
await StateManager.updateEndpointState(endpoint, []);
} catch (e) {
Notifications.error('Failed loading endpoint', e);
Notifications.error('Failed loading environment', e);
$state.go('portainer.home', {}, { reload: true });
}
});

6
app/docker/__module.js
View file

@ -24,10 +24,10 @@ angular.module('portainer.docker', ['portainer.app']).config([
if (status === 2) {
if (!endpoint.Snapshots[0]) {
throw new Error('Endpoint is unreachable and there is no snapshot available for offline browsing.');
throw new Error('Environment is unreachable and there is no snapshot available for offline browsing.');
}
if (endpoint.Snapshots[0].Swarm) {
throw new Error('Endpoint is unreachable. Connect to another swarm manager.');
throw new Error('Environment is unreachable. Connect to another swarm manager.');
}
}
@ -38,7 +38,7 @@ angular.module('portainer.docker', ['portainer.app']).config([
const extensions = await LegacyExtensionManager.initEndpointExtensions(endpoint);
await StateManager.updateEndpointState(endpoint, extensions);
} catch (e) {
Notifications.error('Failed loading endpoint', e);
Notifications.error('Failed loading environment', e);
$state.go('portainer.home', {}, { reload: true });
}

6
app/docker/views/dashboard/dashboard.html
View file

@ -1,6 +1,6 @@
<rd-header>
<rd-header-title title-text="Dashboard"></rd-header-title>
<rd-header-content>Endpoint summary</rd-header-content>
<rd-header-content>Environment summary</rd-header-content>
</rd-header>
<div class="row" ng-if="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'">
@ -34,12 +34,12 @@
<div class="row" ng-if="(!applicationState.endpoint.mode.agentProxy || applicationState.endpoint.mode.provider !== 'DOCKER_SWARM_MODE') && info && endpoint">
<div class="col-sm-12">
<rd-widget>
<rd-widget-header icon="fa-tachometer-alt" title-text="Endpoint info"></rd-widget-header>
<rd-widget-header icon="fa-tachometer-alt" title-text="Environment info"></rd-widget-header>
<rd-widget-body classes="no-padding">
<table class="table">
<tbody>
<tr>
<td>Endpoint</td>
<td>Environment</td>
<td>
{{ endpoint.Name }}
<span class="small text-muted space-left">

2
app/docker/views/docker-features-configuration/docker-features-configuration.html
View file

@ -14,7 +14,7 @@
<div ng-if="!$ctrl.isAgent" class="form-group">
<span class="col-sm-12 text-muted small">
<i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
These features are only available for an Agent enabled endpoints.
These features are only available for an Agent enabled environments.
</span>
</div>
<div class="form-group">

2
app/edge/components/associated-endpoints-datatable/associatedEndpointsDatatable.html
View file

@ -52,7 +52,7 @@
<td colspan="5" class="text-center text-muted">Loading...</td>
</tr>
<tr ng-if="!$ctrl.state.loading && $ctrl.state.filteredDataSet.length === 0">
<td colspan="5" class="text-center text-muted">No endpoint available.</td>
<td colspan="5" class="text-center text-muted">No environment available.</td>
</tr>
</tbody>
</table>

6
app/edge/components/edge-job-form/edgeJobForm.html
View file

@ -75,7 +75,7 @@
<input class="form-control" moment-picker ng-model="$ctrl.formValues.datetime" format="YYYY-MM-DD HH:mm" />
</div>
<div class="col-sm-12 small text-muted" style="margin-top: 10px;">
Time should be set according to the chosen endpoints' timezone.
Time should be set according to the chosen environments' timezone.
</div>
<div ng-show="edgeJobForm.datepicker.$invalid">
<div class="col-sm-12 small text-warning">
@ -130,7 +130,7 @@
/>
</div>
<div class="col-sm-12 small text-muted" style="margin-top: 10px;">
Time should be set according to the chosen endpoints' timezone.
Time should be set according to the chosen environments' timezone.
</div>
</div>
<div class="form-group" ng-show="edgeJobForm.edgejob_cron.$invalid && edgeJobForm.edgejob_cron.$dirty">
@ -215,7 +215,7 @@
</div>
<!-- !upload -->
<div class="col-sm-12 form-section-title">
Target endpoints
Target environments
</div>
<!-- node-selection -->
<associated-endpoints-selector

2
app/edge/components/edge-job-results-datatable/edgeJobResultsDatatable.html
View file

@ -19,7 +19,7 @@
<a ng-click="$ctrl.changeOrderBy('Endpoint')">
<i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Endpoint' && !$ctrl.state.reverseOrder"></i>
<i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Endpoint' && $ctrl.state.reverseOrder"></i>
Endpoint
Environment
</a>
</th>
<th>

2
app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatable.html
View file

@ -57,7 +57,7 @@
<td colspan="5" class="text-center text-muted">Loading...</td>
</tr>
<tr ng-if="!$ctrl.state.loading && $ctrl.state.filteredDataSet.length === 0">
<td colspan="5" class="text-center text-muted">No endpoint available.</td>
<td colspan="5" class="text-center text-muted">No environment available.</td>
</tr>
</tbody>
</table>

2
app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatableController.js
View file

@ -101,7 +101,7 @@ export class EdgeStackEndpointsDatatableController {
this.state.filteredDataSet = endpoints;
this.state.totalFilteredDataSet = totalCount;
} catch (err) {
this.Notifications.error('Failure', err, 'Unable to retrieve endpoints');
this.Notifications.error('Failure', err, 'Unable to retrieve environments');
} finally {
this.state.loading = false;
}

6
app/edge/components/edge-stack-status/edgeStackStatus.html
View file

@ -1,3 +1,3 @@
<span class="status" title="Acknowledged endpoints"><i class="acknowledged icon"></i>{{ $ctrl.status.acknowledged || 0 }}</span>
<span class="status" title="Successful endpoints"><i class="ok icon"></i>{{ $ctrl.status.ok || 0 }}</span>
<span class="status" title="Failed endpoints"><i class="error icon"></i>{{ $ctrl.status.error || 0 }}</span>
<span class="status" title="Acknowledged environments"><i class="acknowledged icon"></i>{{ $ctrl.status.acknowledged || 0 }}</span>
<span class="status" title="Successful environments"><i class="ok icon"></i>{{ $ctrl.status.ok || 0 }}</span>
<span class="status" title="Failed environments"><i class="error icon"></i>{{ $ctrl.status.error || 0 }}</span>

16
app/edge/components/group-form/groupForm.html
View file

@ -30,7 +30,7 @@
<i class="fa fa-list-ol" aria-hidden="true" style="margin-right: 2px;"></i>
Static
</div>
<p>Manually select Edge endpoints</p>
<p>Manually select Edge environments</p>
</label>
</div>
<div class="boxselector">
@ -40,7 +40,7 @@
<i class="fa fa-tags" aria-hidden="true" style="margin-right: 2px;"></i>
Dynamic
</div>
<p>Automatically associate endpoints via tags</p>
<p>Automatically associate environments via tags</p>
</label>
</div>
</div>
@ -49,9 +49,9 @@
<!-- StaticGroup -->
<div ng-if="!$ctrl.model.Dynamic">
<div ng-if="!$ctrl.noEndpoints">
<!-- endpoints -->
<!-- environments -->
<div class="col-sm-12 form-section-title">
Associated endpoints
Associated environments
</div>
<div class="form-group">
<associated-endpoints-selector
@ -65,7 +65,7 @@
</div>
</div>
<div class="form-group" ng-if="$ctrl.noEndpoints">
<div class="col-sm-12 small text-muted"> No Edge endpoints are available. Head over to the <a ui-sref="portainer.endpoints">Endpoints view</a> to add endpoints. </div>
<div class="col-sm-12 small text-muted"> No Edge environments are available. Head over to the <a ui-sref="portainer.endpoints">Environments view</a> to add environments. </div>
</div>
</div>
<!-- !StaticGroup -->
@ -84,7 +84,7 @@
<i class="fa fa-tag" aria-hidden="true" style="margin-right: 2px;"></i>
Partial match
</div>
<p>Associate any endpoint matching at least one of the selected tags</p>
<p>Associate any environment matching at least one of the selected tags</p>
</label>
</div>
<div class="boxselector">
@ -94,7 +94,7 @@
<i class="fa fa-tag" aria-hidden="true" style="margin-right: 2px;"></i>
Full match
</div>
<p>Associate any endpoint matching all of the selected tags</p>
<p>Associate any environment matching all of the selected tags</p>
</label>
</div>
</div>
@ -106,7 +106,7 @@
</div>
</div>
<div class="col-sm-12 form-section-title">
Associated endpoints by tags
Associated environments by tags
</div>
<div class="col-sm-12 form-group">
<group-association-table

2
app/edge/components/groups-datatable/groupsDatatable.html
View file

@ -45,7 +45,7 @@
</th>
<th>
<a ng-click="$ctrl.changeOrderBy('Endpoints.length')">
Endpoints Count
Environments Count
<i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Endpoints.length' && !$ctrl.state.reverseOrder"></i>
<i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Endpoints.length' && $ctrl.state.reverseOrder"></i>
</a>

2
app/edge/views/edge-jobs/edgeJob/edgeJobController.js
View file

@ -161,7 +161,7 @@ export class EdgeJobController {
this.results = results;
}
} catch (err) {
this.Notifications.error('Failure', err, 'Unable to retrieve endpoint list');
this.Notifications.error('Failure', err, 'Unable to retrieve environment list');
}
this.$window.onbeforeunload = () => {

4
app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackView.html
View file

@ -26,11 +26,11 @@
</div>
</uib-tab>
<uib-tab index="1" classes="btn-sm">
<uib-tab-heading> <i class="fa fa-plug space-right" aria-hidden="true"></i> Endpoints</uib-tab-heading>
<uib-tab-heading> <i class="fa fa-plug space-right" aria-hidden="true"></i> Environments</uib-tab-heading>
<div style="margin-top: 25px;">
<edge-stack-endpoints-datatable
title-text="Endpoints Status"
title-text="Environments Status"
dataset="$ctrl.endpoints"
title-icon="fa-plug"
table-key="edgeStackEndpoints"

2
app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackViewController.js
View file

@ -108,7 +108,7 @@ export class EditEdgeStackViewController {
});
return { endpoints, totalCount };
} catch (err) {
this.Notifications.error('Failure', err, 'Unable to retrieve endpoint information');
this.Notifications.error('Failure', err, 'Unable to retrieve environment information');
}
}
}

2
app/kubernetes/__module.js
View file

@ -38,7 +38,7 @@ angular.module('portainer.kubernetes', ['portainer.app', registriesModule, custo
await KubernetesNamespaceService.get();
} catch (e) {
Notifications.error('Failed loading endpoint', e);
Notifications.error('Failed loading environment', e);
$state.go('portainer.home', {}, { reload: true });
}
});

2
app/kubernetes/endpoint/service.js
View file

@ -20,7 +20,7 @@ class KubernetesEndpointService {
const data = await this.KubernetesEndpoints(namespace).get().$promise;
return _.map(data.items, (item) => KubernetesEndpointConverter.apiToEndpoint(item));
} catch (err) {
throw new PortainerError('Unable to retrieve endpoints', err);
throw new PortainerError('Unable to retrieve environments', err);
}
}

2
app/kubernetes/views/applications/create/createApplication.html
View file

@ -926,7 +926,7 @@
</p>
<p ng-if="ctrl.isAdmin">
Server metrics features must be enabled in the
<a ui-sref="portainer.endpoints.endpoint.kubernetesConfig({id: ctrl.endpoint.Id})" class="ctrl.isAdmin">endpoint configuration view</a>.
<a ui-sref="portainer.endpoints.endpoint.kubernetesConfig({id: ctrl.endpoint.Id})" class="ctrl.isAdmin">environment configuration view</a>.
</p>
</div>
</div>

2
app/kubernetes/views/cluster/clusterController.js
View file

@ -66,7 +66,7 @@ class KubernetesClusterController {
});
}
} catch (err) {
this.Notifications.error('Failure', err, 'Unable to retrieve endpoints');
this.Notifications.error('Failure', err, 'Unable to retrieve environments');
}
}

2
app/kubernetes/views/cluster/node/nodeController.js
View file

@ -238,7 +238,7 @@ class KubernetesNodeController {
});
}
} catch (err) {
this.Notifications.error('Failure', err, 'Unable to retrieve endpoints');
this.Notifications.error('Failure', err, 'Unable to retrieve environments');
}
}

2
app/kubernetes/views/configure/configure.html
View file

@ -1,5 +1,5 @@
<kubernetes-view-header title="Kubernetes features configuration" state="portainer.endpoints.endpoint.kubernetesConfig" view-ready="ctrl.state.viewReady">
<a ui-sref="portainer.endpoints">Endpoints</a> &gt; <a ui-sref="portainer.endpoints.endpoint({id: ctrl.endpoint.Id})">{{ ctrl.endpoint.Name }}</a> &gt; Kubernetes configuration
<a ui-sref="portainer.endpoints">Environment</a> &gt; <a ui-sref="portainer.endpoints.endpoint({id: ctrl.endpoint.Id})">{{ ctrl.endpoint.Name }}</a> &gt; Kubernetes configuration
</kubernetes-view-header>
<kubernetes-view-loading view-ready="ctrl.state.viewReady"></kubernetes-view-loading>

2
app/kubernetes/views/configure/configureController.js
View file

@ -294,7 +294,7 @@ class KubernetesConfigureController {
this.oldFormValues = Object.assign({}, this.formValues);
} catch (err) {
this.Notifications.error('Failure', err, 'Unable to retrieve endpoint configuration');
this.Notifications.error('Failure', err, 'Unable to retrieve environment configuration');
} finally {
this.state.viewReady = true;
}

6
app/kubernetes/views/dashboard/dashboard.html
View file

@ -1,5 +1,5 @@
<kubernetes-view-header title="Dashboard" state="kubernetes.dashboard" view-ready="ctrl.state.viewReady">
Endpoint summary
Environment summary
</kubernetes-view-header>
<kubernetes-view-loading view-ready="ctrl.state.viewReady"></kubernetes-view-loading>
@ -8,12 +8,12 @@
<div class="row" ng-if="ctrl.endpoint">
<div class="col-sm-12">
<rd-widget>
<rd-widget-header icon="fa-tachometer-alt" title-text="Endpoint info"></rd-widget-header>
<rd-widget-header icon="fa-tachometer-alt" title-text="Environment info"></rd-widget-header>
<rd-widget-body classes="no-padding">
<table class="table">
<tbody>
<tr>
<td>Endpoint</td>
<td>Environment</td>
<td>
{{ ctrl.endpoint.Name }}
</td>

4
app/kubernetes/views/resource-pools/access/resourcePoolAccess.html
View file

@ -38,8 +38,8 @@
</label>
<div class="col-sm-9 col-lg-4">
<span class="small text-muted" ng-if="ctrl.availableUsersAndTeams.length === 0">
No user nor team access has been set on the endpoint. Head over to the
<a ui-sref="portainer.endpoints.endpoint.access({id: ctrl.endpointId})">endpoint access view</a> to manage them.
No user nor team access has been set on the environment. Head over to the
<a ui-sref="portainer.endpoints.endpoint.access({id: ctrl.endpointId})">environment access view</a> to manage them.
</span>
<span
isteven-multi-select

2
app/kubernetes/views/resource-pools/create/createResourcePool.html
View file

@ -213,7 +213,7 @@
<div class="form-group" ng-if="$ctrl.formValues.IngressClasses.length === 0">
<div class="col-sm-12 small text-muted">
The ingress feature must be enabled in the
<a ui-sref="portainer.endpoints.endpoint.kubernetesConfig({id: $ctrl.endpoint.Id})">endpoint configuration view</a> to be able to register ingresses inside this
<a ui-sref="portainer.endpoints.endpoint.kubernetesConfig({id: $ctrl.endpoint.Id})">environment configuration view</a> to be able to register ingresses inside this
namespace.
</div>
</div>

2
app/kubernetes/views/resource-pools/edit/resourcePool.html
View file

@ -165,7 +165,7 @@
<div class="form-group" ng-if="ctrl.formValues.IngressClasses.length === 0">
<div class="col-sm-12 small text-muted">
The ingress feature must be enabled in the
<a ui-sref="portainer.endpoints.endpoint.kubernetesConfig({id: ctrl.endpoint.Id})">endpoint configuration view</a> to be able to register ingresses inside
<a ui-sref="portainer.endpoints.endpoint.kubernetesConfig({id: ctrl.endpoint.Id})">environment configuration view</a> to be able to register ingresses inside
this namespace.
</div>
</div>

2
app/portainer/__module.js
View file

@ -72,7 +72,7 @@ angular.module('portainer.app', ['portainer.oauth', componentsModule, settingsMo
return endpoint;
} catch (e) {
Notifications.error('Failed loading endpoint', e);
Notifications.error('Failed loading environment', e);
$state.go('portainer.home', {}, { reload: true });
return;
}

2
app/portainer/components/access-datatable/accessDatatable.html
View file

@ -3,7 +3,7 @@
<rd-widget-header icon="{{ $ctrl.titleIcon }}" title-text="{{ $ctrl.titleText }}"> </rd-widget-header>
<rd-widget-body classes="no-padding">
<div class="toolBar small" ng-if="$ctrl.inheritFrom">
Access tagged as <code>inherited</code> are inherited from the group access. They cannot be removed or modified at the endpoint level but they can be overriden.
Access tagged as <code>inherited</code> are inherited from the group access. They cannot be removed or modified at the environment level but they can be overriden.
</div>
<div class="toolBar small" ng-if="$ctrl.inheritFrom"> Access tagged as <code>override</code> are overriding the group access for the related users/teams. </div>
<div class="actionBar">

4
app/portainer/components/accessControlPanel/porAccessControlPanel.html
View file

@ -18,7 +18,7 @@
{{ $ctrl.resourceControl.Ownership }}
<portainer-tooltip
ng-if="$ctrl.resourceControl.Ownership === $ctrl.RCO.PUBLIC"
message="This resource can be managed by any user with access to this endpoint."
message="This resource can be managed by any user with access to this environment."
position="bottom"
style="margin-left: -3px;"
></portainer-tooltip>
@ -145,7 +145,7 @@
<i ng-class="'public' | ownershipicon" aria-hidden="true" style="margin-right: 2px;"></i>
Public
</div>
<p>I want any user with access to this endpoint to be able to manage this resource</p>
<p>I want any user with access to this environment to be able to manage this resource</p>
</label>
</div>
</div>

10
app/portainer/components/associated-endpoints-selector/associatedEndpointsSelector.html
View file

@ -1,11 +1,11 @@
<div class="col-sm-12 small text-muted">
You can select which endpoint should be part of this group by moving them to the associated endpoints table. Simply click on any endpoint entry to move it from one table to the
You can select which environment should be part of this group by moving them to the associated environments table. Simply click on any environment entry to move it from one table to the
other.
</div>
<div class="col-sm-12" style="margin-top: 20px;">
<!-- available-endpoints -->
<div class="col-sm-6">
<div class="text-center small text-muted">Available endpoints</div>
<div class="text-center small text-muted">Available environments</div>
<div style="margin-top: 10px;">
<group-association-table
loaded="$ctrl.loaded"
@ -15,7 +15,7 @@
dataset="$ctrl.endpoints.available"
entry-click="$ctrl.associateEndpoint"
pagination-state="$ctrl.state.available"
empty-dataset-message="No endpoint available"
empty-dataset-message="No environment available"
tags="$ctrl.tags"
show-tags="true"
groups="$ctrl.groups"
@ -28,7 +28,7 @@
<!-- !available-endpoints -->
<!-- associated-endpoints -->
<div class="col-sm-6">
<div class="text-center small text-muted">Associated endpoints</div>
<div class="text-center small text-muted">Associated environments</div>
<div style="margin-top: 10px;">
<group-association-table
loaded="$ctrl.loaded"
@ -38,7 +38,7 @@
dataset="$ctrl.endpoints.associated"
entry-click="$ctrl.dissociateEndpoint"
pagination-state="$ctrl.state.associated"
empty-dataset-message="No associated endpoint"
empty-dataset-message="No associated environment"
tags="$ctrl.tags"
show-tags="true"
groups="$ctrl.groups"

2
app/portainer/components/datatables/access-viewer-datatable/accessViewerDatatable.html
View file

@ -8,7 +8,7 @@
<thead>
<tr>
<th>
Endpoint
Environment
</th>
<th>
Role

4
app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html
View file

@ -15,7 +15,7 @@
<i class="fa fa-trash-alt space-right" aria-hidden="true"></i>Remove
</button>
<button type="button" class="btn btn-sm btn-primary" ui-sref="portainer.endpoints.new" data-cy="endpoint-addEndpointButton">
<i class="fa fa-plus space-right" aria-hidden="true"></i>Add endpoint
<i class="fa fa-plus space-right" aria-hidden="true"></i>Add environment
</button>
</div>
<div class="searchBar">
@ -102,7 +102,7 @@
<td colspan="5" class="text-center text-muted">Loading...</td>
</tr>
<tr ng-if="!$ctrl.state.loading && $ctrl.state.filteredDataSet.length === 0">
<td colspan="5" class="text-center text-muted">No endpoint available.</td>
<td colspan="5" class="text-center text-muted">No environment available.</td>
</tr>
</tbody>
</table>

10
app/portainer/components/datatables/roles-datatable/rolesDatatable.html
View file

@ -22,20 +22,20 @@
</thead>
<tbody>
<tr>
<td class="text-muted">Endpoint administrator</td>
<td class="text-muted">Full control of all resources in an endpoint</td>
<td class="text-muted">Environment administrator</td>
<td class="text-muted">Full control of all resources in an environment</td>
</tr>
<tr>
<td class="text-muted">Helpdesk</td>
<td class="text-muted">Read-only access of all resources in an endpoint</td>
<td class="text-muted">Read-only access of all resources in an environment</td>
</tr>
<tr>
<td class="text-muted">Read-only user</td>
<td class="text-muted">Read-only access of assigned resources in an endpoint</td>
<td class="text-muted">Read-only access of assigned resources in an environment</td>
</tr>
<tr>
<td class="text-muted">Standard user</td>
<td class="text-muted">Full control of assigned resources in an endpoint</td>
<td class="text-muted">Full control of assigned resources in an environment</td>
</tr>
</tbody>
</table>

2
app/portainer/components/datatables/stacks-datatable/stacksDatatable.html
View file

@ -180,7 +180,7 @@
tooltip-append-to-body="true"
tooltip-placement="bottom"
tooltip-class="portainer-tooltip"
uib-tooltip="This stack was created inside an endpoint that is no longer registered inside Portainer."
uib-tooltip="This stack was created inside an environment that is no longer registered inside Portainer."
>
Orphaned <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-left: 2px;"></i>
</span>

2
app/portainer/components/endpoint-list/endpointList.html
View file

@ -49,7 +49,7 @@
Loading...
</div>
<div ng-if="!$ctrl.state.loading && !$ctrl.state.filteredEndpoints.length" class="text-center text-muted" data-cy="home-noEndpoints">
No endpoint available.
No environment available.
</div>
</div>

2
app/portainer/components/endpoint-selector/endpointSelector.html
View file

@ -1,5 +1,5 @@
<ui-select ng-model="$ctrl.model">
<ui-select-match placeholder="Select an endpoint">
<ui-select-match placeholder="Select an environment">
<span>{{ $select.selected.Name }}</span>
</ui-select-match>
<ui-select-choices group-by="$ctrl.groupEndpoints" group-filter="$ctrl.sortGroups" repeat="endpoint in ($ctrl.endpoints | filter: $select.search) track by endpoint.Id">

2
app/portainer/components/endpointSecurity/porEndpointSecurity.html
View file

@ -4,7 +4,7 @@
<div class="col-sm-12">
<label for="tls" class="control-label text-left">
TLS
<portainer-tooltip position="bottom" message="Enable this option if you need to connect to the Docker endpoint with TLS."></portainer-tooltip>
<portainer-tooltip position="bottom" message="Enable this option if you need to connect to the Docker environment with TLS."></portainer-tooltip>
</label>
<label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="$ctrl.formData.TLS" /><i></i> </label>
</div>

18
app/portainer/components/forms/group-form/groupForm.html
View file

@ -36,20 +36,20 @@
></tag-selector>
</div>
<!-- !tags -->
<!-- endpoints -->
<!-- environments -->
<div ng-if="$ctrl.model.Id !== 1">
<div class="col-sm-12 form-section-title">
Associated endpoints
Associated environments
</div>
<div class="form-group">
<div class="col-sm-12 small text-muted">
You can select which endpoint should be part of this group by moving them to the associated endpoints table. Simply click on any endpoint entry to move it from one table to
You can select which environment should be part of this group by moving them to the associated environments table. Simply click on any environment entry to move it from one table to
the other.
</div>
<div class="col-sm-12" style="margin-top: 20px;">
<!-- available-endpoints -->
<div class="col-sm-6">
<div class="text-center small text-muted">Available endpoints</div>
<div class="text-center small text-muted">Available environments</div>
<div style="margin-top: 10px;">
<group-association-table
loaded="$ctrl.loaded"
@ -59,14 +59,14 @@
dataset="$ctrl.availableEndpoints"
entry-click="$ctrl.associateEndpoint"
pagination-state="$ctrl.state.available"
empty-dataset-message="No endpoint available"
empty-dataset-message="No environment available"
></group-association-table>
</div>
</div>
<!-- !available-endpoints -->
<!-- associated-endpoints -->
<div class="col-sm-6">
<div class="text-center small text-muted">Associated endpoints</div>
<div class="text-center small text-muted">Associated environments</div>
<div style="margin-top: 10px;">
<group-association-table
loaded="$ctrl.loaded"
@ -76,7 +76,7 @@
dataset="$ctrl.associatedEndpoints"
entry-click="$ctrl.dissociateEndpoint"
pagination-state="$ctrl.state.associated"
empty-dataset-message="No associated endpoint"
empty-dataset-message="No associated environment"
has-backend-pagination="this.pageType !== 'create'"
></group-association-table>
</div>
@ -87,7 +87,7 @@
</div>
<div ng-if="$ctrl.model.Id === 1">
<div class="col-sm-12 form-section-title">
Unassociated endpoints
Unassociated environments
</div>
<div style="margin-top: 10px;">
<group-association-table
@ -97,7 +97,7 @@
retrieve-page="$ctrl.getPaginatedEndpointsByGroup"
dataset="$ctrl.associatedEndpoints"
pagination-state="$ctrl.state.associated"
empty-dataset-message="No endpoint available"
empty-dataset-message="No environment available"
></group-association-table>
</div>
</div>

8
app/portainer/components/forms/group-form/groupFormController.js
View file

@ -38,10 +38,10 @@ class GroupFormController {
} else if (this.pageType === 'edit') {
this.GroupService.addEndpoint(this.model.Id, endpoint)
.then(() => {
this.Notifications.success('Success', 'Endpoint successfully added to group');
this.Notifications.success('Success', 'Environment successfully added to group');
this.reloadTablesContent();
})
.catch((err) => this.Notifications.error('Error', err, 'Unable to add endpoint to group'));
.catch((err) => this.Notifications.error('Error', err, 'Unable to add environment to group'));
}
}
@ -51,10 +51,10 @@ class GroupFormController {
} else if (this.pageType === 'edit') {
this.GroupService.removeEndpoint(this.model.Id, endpoint.Id)
.then(() => {
this.Notifications.success('Success', 'Endpoint successfully removed from group');
this.Notifications.success('Success', 'Environment successfully removed from group');
this.reloadTablesContent();
})
.catch((err) => this.Notifications.error('Error', err, 'Unable to remove endpoint from group'));
.catch((err) => this.Notifications.error('Error', err, 'Unable to remove environment from group'));
}
}

2
app/portainer/components/forms/stack-from-template-form/stackFromTemplateForm.html
View file

@ -65,7 +65,7 @@
<button type="button" class="btn btn-sm btn-default" ng-click="$ctrl.unselectTemplate($ctrl.template)">Hide</button>
<div class="cols-sm-12 small text-danger" ng-if="$ctrl.state.formValidationError" style="margin-left: 5px; margin-top: 5px;">{{ $ctrl.state.formValidationError }}</div>
<div class="cols-sm-12 small text-danger" ng-if="!$ctrl.state.deployable" style="margin-left: 5px; margin-top: 5px;"
>This template type cannot be deployed on this endpoint.</div
>This template type cannot be deployed on this environment.</div
>
</div>
</div>

2
app/portainer/components/information-panel-offline/informationPanelOffline.html
View file

@ -2,7 +2,7 @@
<span class="small">
<p class="text-muted">
<i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
This endpoint is currently offline (read-only). Data shown is based on the latest available snapshot.
This environment is currently offline (read-only). Data shown is based on the latest available snapshot.
</p>
<p class="text-muted">
<i class="fa fa-clock" aria-hidden="true" style="margin-right: 2px;"></i>

4
app/portainer/components/information-panel-offline/informationPanelOfflineController.js
View file

@ -18,7 +18,7 @@ angular.module('portainer.app').controller('InformationPanelOfflineController',
$state.reload();
})
.catch(function onError(err) {
Notifications.error('Failure', err, 'An error occured during endpoint snapshot');
Notifications.error('Failure', err, 'An error occured during environment snapshot');
});
}
@ -31,7 +31,7 @@ angular.module('portainer.app').controller('InformationPanelOfflineController',
ctrl.snapshotTime = data.Snapshots[0].Time;
})
.catch(function onError(err) {
Notifications.error('Failure', err, 'Unable to retrieve endpoint information');
Notifications.error('Failure', err, 'Unable to retrieve environment information');
});
}
},

8
app/portainer/services/api/endpointService.js
View file

@ -57,7 +57,7 @@ angular.module('portainer.app').factory('EndpointService', [
})
.catch(function error(err) {
deferred.notify({ upload: false });
deferred.reject({ msg: 'Unable to update endpoint', err: err });
deferred.reject({ msg: 'Unable to update environment', err: err });
});
return deferred.promise;
};
@ -84,7 +84,7 @@ angular.module('portainer.app').factory('EndpointService', [
deferred.resolve(response.data);
})
.catch(function error(err) {
deferred.reject({ msg: 'Unable to create endpoint', err: err });
deferred.reject({ msg: 'Unable to create environment', err: err });
});
return deferred.promise;
@ -131,7 +131,7 @@ angular.module('portainer.app').factory('EndpointService', [
deferred.resolve(response.data);
})
.catch(function error(err) {
deferred.reject({ msg: 'Unable to create endpoint', err: err });
deferred.reject({ msg: 'Unable to create environment', err: err });
});
return deferred.promise;
@ -145,7 +145,7 @@ angular.module('portainer.app').factory('EndpointService', [
deferred.resolve(response.data);
})
.catch(function error(err) {
deferred.reject({ msg: 'Unable to create endpoint', err: err });
deferred.reject({ msg: 'Unable to create environment', err: err });
});
return deferred.promise;

2
app/portainer/services/api/stackService.js
View file

@ -56,7 +56,7 @@ angular.module('portainer.app').factory('StackService', [
.then(function success(data) {
var swarm = data;
if (swarm.Id === stack.SwarmId) {
deferred.reject({ msg: 'Target endpoint is located in the same Swarm cluster as the current endpoint', err: null });
deferred.reject({ msg: 'Target environment is located in the same Swarm cluster as the current environment', err: null });
return;
}
return Stack.migrate({ id: stack.Id, endpointId: stack.EndpointId }, { EndpointID: targetEndpointId, SwarmID: swarm.Id, Name: newName }).$promise;

8
app/portainer/services/modalService.js
View file

@ -154,9 +154,9 @@ angular.module('portainer.app').factory('ModalService', [
service.confirmDeassociate = function (callback) {
const message =
'<p>De-associating this Edge endpoint will mark it as non associated and will clear the registered Edge ID.</p>' +
'<p>Any agent started with the Edge key associated to this endpoint will be able to re-associate with this endpoint.</p>' +
'<p>You can re-use the Edge ID and Edge key that you used to deploy the existing Edge agent to associate a new Edge device to this endpoint.</p>';
'<p>De-associating this Edge environment will mark it as non associated and will clear the registered Edge ID.</p>' +
'<p>Any agent started with the Edge key associated to this environment will be able to re-associate with this environment.</p>' +
'<p>You can re-use the Edge ID and Edge key that you used to deploy the existing Edge agent to associate a new Edge device to this environment.</p>';
service.confirm({
title: 'About de-associating',
message: $sanitize(message),
@ -258,7 +258,7 @@ angular.module('portainer.app').factory('ModalService', [
service.confirmEndpointSnapshot = function (callback) {
service.confirm({
title: 'Are you sure?',
message: 'Triggering a manual refresh will poll each endpoint to retrieve its information, this may take a few moments.',
message: 'Triggering a manual refresh will poll each environment to retrieve its information, this may take a few moments.',
buttons: {
confirm: {
label: 'Continue',

2
app/portainer/services/stateManager.js
View file

@ -200,7 +200,7 @@ angular.module('portainer.app').factory('StateManager', [
deferred.resolve();
})
.catch(function error(err) {
deferred.reject({ msg: 'Unable to connect to the Docker endpoint', err: err });
deferred.reject({ msg: 'Unable to connect to the Docker environment', err: err });
})
.finally(function final() {
state.loading = false;

2
app/portainer/settings/general/ssl-certificate/ssl-certificate.html
View file

@ -7,7 +7,7 @@
<span class="small">
<p class="text-muted">
<i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
Forcing HTTPs only will cause Portainer to stop listening on the HTTP port. Any edge agent endpoint that is using HTTP will no longer be available.
Forcing HTTPs only will cause Portainer to stop listening on the HTTP port. Any edge agent environment that is using HTTP will no longer be available.
</p>
</span>

2
app/portainer/views/auth/authController.js
View file

@ -129,7 +129,7 @@ class AuthenticationController {
return this.$state.go('portainer.home');
}
} catch (err) {
this.error(err, 'Unable to retrieve endpoints');
this.error(err, 'Unable to retrieve environments');
}
}

6
app/portainer/views/endpoints/access/endpointAccess.html
View file

@ -1,14 +1,14 @@
<rd-header>
<rd-header-title title-text="Endpoint access"></rd-header-title>
<rd-header-title title-text="Environment access"></rd-header-title>
<rd-header-content>
<a ui-sref="portainer.endpoints">Endpoints</a> &gt; <a ui-sref="portainer.endpoints.endpoint({id: ctrl.endpoint.Id})">{{ ctrl.endpoint.Name }}</a> &gt; Access management
<a ui-sref="portainer.endpoints">Environments</a> &gt; <a ui-sref="portainer.endpoints.endpoint({id: ctrl.endpoint.Id})">{{ ctrl.endpoint.Name }}</a> &gt; Access management
</rd-header-content>
</rd-header>
<div class="row" ng-if="ctrl.endpoint">
<div class="col-sm-12">
<rd-widget>
<rd-widget-header icon="fa-plug" title-text="Endpoint"></rd-widget-header>
<rd-widget-header icon="fa-plug" title-text="Environment"></rd-widget-header>
<rd-widget-body classes="no-padding">
<table class="table">
<tbody>

2
app/portainer/views/endpoints/access/endpointAccessController.js
View file

@ -20,7 +20,7 @@ class EndpointAccessController {
this.endpoint = await this.EndpointService.endpoint(this.$transition$.params().id);
this.group = await this.GroupService.group(this.endpoint.GroupId);
} catch (err) {
this.Notifications.error('Failure', err, 'Unable to retrieve endpoint information');
this.Notifications.error('Failure', err, 'Unable to retrieve environment information');
}
}

16
app/portainer/views/endpoints/create/createEndpointController.js
View file

@ -112,11 +112,11 @@ angular
$scope.state.actionInProgress = true;
EndpointService.createLocalEndpoint(name, URL, publicURL, groupId, tagIds)
.then(function success() {
Notifications.success('Endpoint created', name);
Notifications.success('Environment created', name);
$state.go('portainer.endpoints', {}, { reload: true });
})
.catch(function error(err) {
Notifications.error('Failure', err, 'Unable to create endpoint');
Notifications.error('Failure', err, 'Unable to create environment');
})
.finally(function final() {
$scope.state.actionInProgress = false;
@ -158,11 +158,11 @@ angular
$scope.state.actionInProgress = true;
EndpointService.createLocalKubernetesEndpoint(name, tagIds)
.then(function success(result) {
Notifications.success('Endpoint created', name);
Notifications.success('Environment created', name);
$state.go('portainer.endpoints.endpoint.kubernetesConfig', { id: result.Id });
})
.catch(function error(err) {
Notifications.error('Failure', err, 'Unable to create endpoint');
Notifications.error('Failure', err, 'Unable to create environment');
})
.finally(function final() {
$scope.state.actionInProgress = false;
@ -220,11 +220,11 @@ angular
$scope.state.actionInProgress = true;
EndpointService.createAzureEndpoint(name, applicationId, tenantId, authenticationKey, groupId, tagIds)
.then(function success() {
Notifications.success('Endpoint created', name);
Notifications.success('Environment created', name);
$state.go('portainer.endpoints', {}, { reload: true });
})
.catch(function error(err) {
Notifications.error('Failure', err, 'Unable to create endpoint');
Notifications.error('Failure', err, 'Unable to create environment');
})
.finally(function final() {
$scope.state.actionInProgress = false;
@ -251,7 +251,7 @@ angular
CheckinInterval
);
Notifications.success('Endpoint created', name);
Notifications.success('Environment created', name);
switch (endpoint.Type) {
case PortainerEndpointTypes.EdgeAgentOnDockerEnvironment:
case PortainerEndpointTypes.EdgeAgentOnKubernetesEnvironment:
@ -267,7 +267,7 @@ angular
return endpoint;
} catch (err) {
Notifications.error('Failure', err, 'Unable to create endpoint');
Notifications.error('Failure', err, 'Unable to create environment');
} finally {
$scope.state.actionInProgress = false;
}

34
app/portainer/views/endpoints/create/createendpoint.html
View file

@ -1,6 +1,6 @@
<rd-header>
<rd-header-title title-text="Create endpoint"></rd-header-title>
<rd-header-content> <a ui-sref="portainer.endpoints">Endpoints</a> &gt; Add endpoint </rd-header-content>
<rd-header-title title-text="Create environment"></rd-header-title>
<rd-header-content> <a ui-sref="portainer.endpoints">Environments</a> &gt; Add environment </rd-header-content>
</rd-header>
<div class="row">
@ -130,8 +130,8 @@
<div class="form-group">
<span class="col-sm-12 text-muted small">
<p>
Allows you to create an endpoint that can be registered with an Edge agent. The Edge agent will initiate the communications with the Portainer instance. All the
required information on how to connect an Edge agent to this endpoint will be available after endpoint creation.
Allows you to create an environment that can be registered with an Edge agent. The Edge agent will initiate the communications with the Portainer instance. All the
required information on how to connect an Edge agent to this environment will be available after environment creation.
</p>
<p> You can read more about the Edge agent in the userguide available <a href="https://downloads.portainer.io/edge_agent_guide.pdf">here.</a> </p>
</span>
@ -257,7 +257,7 @@
<div ng-if="(state.EnvironmentType === 'docker' && !formValues.ConnectSocket) || state.EnvironmentType === 'agent'">
<div class="form-group">
<label for="endpoint_url" class="col-sm-3 col-lg-2 control-label text-left">
Endpoint URL
Environment URL
<portainer-tooltip
position="bottom"
message="URL or IP address of a Docker host. The Docker API must be exposed over a TCP port. Please refer to the Docker documentation to configure it."
@ -328,7 +328,7 @@
Poll frequency
<portainer-tooltip
position="bottom"
message="Interval used by this Edge agent to check in with the Portainer instance. Affects Edge endpoint management and Edge compute features."
message="Interval used by this Edge agent to check in with the Portainer instance. Affects Edge environment management and Edge compute features."
>
</portainer-tooltip>
</label>
@ -350,7 +350,7 @@
Public IP
<portainer-tooltip
position="bottom"
message="URL or IP address where exposed containers will be reachable. This field is optional and will default to the endpoint URL."
message="URL or IP address where exposed containers will be reachable. This field is optional and will default to the environment URL."
>
</portainer-tooltip>
</label>
@ -487,8 +487,8 @@
analytics-event="portainer-endpoint-creation"
analytics-properties="{ metadata: { type: 'docker-api' } }"
>
<span ng-hide="state.actionInProgress"><i class="fa fa-plus" aria-hidden="true"></i> Add endpoint</span>
<span ng-show="state.actionInProgress">Creating endpoint...</span>
<span ng-hide="state.actionInProgress"><i class="fa fa-plus" aria-hidden="true"></i> Add environment</span>
<span ng-show="state.actionInProgress">Creating environment...</span>
</button>
<button
ng-if="state.EnvironmentType === 'agent'"
@ -499,8 +499,8 @@
button-spinner="state.actionInProgress"
data-cy="endpointCreate-createAgentEndpoint"
>
<span ng-hide="state.actionInProgress"><i class="fa fa-plus" aria-hidden="true"></i> Add endpoint</span>
<span ng-show="state.actionInProgress">Creating endpoint...</span>
<span ng-hide="state.actionInProgress"><i class="fa fa-plus" aria-hidden="true"></i> Add environment</span>
<span ng-show="state.actionInProgress">Creating environment...</span>
</button>
<button
ng-if="state.EnvironmentType === 'edge_agent'"
@ -515,8 +515,8 @@
analytics-event="portainer-endpoint-creation"
analytics-properties="{ metadata: { type: 'edge-agent' } }"
>
<span ng-hide="state.actionInProgress"><i class="fa fa-plus" aria-hidden="true"></i> Add endpoint</span>
<span ng-show="state.actionInProgress">Creating endpoint...</span>
<span ng-hide="state.actionInProgress"><i class="fa fa-plus" aria-hidden="true"></i> Add environment</span>
<span ng-show="state.actionInProgress">Creating environment...</span>
</button>
<button
ng-if="state.EnvironmentType === 'kubernetes'"
@ -530,8 +530,8 @@
analytics-event="portainer-endpoint-creation"
analytics-properties="{ metadata: { type: 'kubernetes-api' } }"
>
<span ng-hide="state.actionInProgress"><i class="fa fa-plus" aria-hidden="true"></i> Add endpoint</span>
<span ng-show="state.actionInProgress">Creating endpoint...</span>
<span ng-hide="state.actionInProgress"><i class="fa fa-plus" aria-hidden="true"></i> Add environment</span>
<span ng-show="state.actionInProgress">Creating environment...</span>
</button>
<button
ng-if="state.EnvironmentType === 'azure'"
@ -546,8 +546,8 @@
analytics-event="portainer-endpoint-creation"
analytics-properties="{ metadata: { type: 'azure-api' } }"
>
<span ng-hide="state.actionInProgress"><i class="fa fa-plus" aria-hidden="true"></i> Add endpoint</span>
<span ng-show="state.actionInProgress">Creating endpoint...</span>
<span ng-hide="state.actionInProgress"><i class="fa fa-plus" aria-hidden="true"></i> Add environment</span>
<span ng-show="state.actionInProgress">Creating environment...</span>
</button>
</div>
</div>

18
app/portainer/views/endpoints/edit/endpoint.html
View file

@ -1,11 +1,11 @@
<rd-header>
<rd-header-title title-text="Endpoint details">
<rd-header-title title-text="Environment details">
<a data-toggle="tooltip" title="Refresh" ui-sref="portainer.endpoints.endpoint({id: endpoint.Id})" ui-sref-opts="{reload: true}">
<i class="fa fa-sync" aria-hidden="true"></i>
</a>
</rd-header-title>
<rd-header-content>
<a ui-sref="portainer.endpoints">Endpoints</a> &gt; <a ui-sref="portainer.endpoints.endpoint({id: endpoint.Id})">{{ endpoint.Name }}</a>
<a ui-sref="portainer.endpoints">Environments</a> &gt; <a ui-sref="portainer.endpoints.endpoint({id: endpoint.Id})">{{ endpoint.Name }}</a>
</rd-header-content>
</rd-header>
@ -14,7 +14,7 @@
<span class="small text-muted">
<p>
<i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
This Edge endpoint is associated to an Edge environment {{ state.kubernetesEndpoint ? '(Kubernetes)' : '(Docker)' }}.
This Edge environment is associated to an Edge environment {{ state.kubernetesEndpoint ? '(Kubernetes)' : '(Docker)' }}.
</p>
<p>
Edge key: <code>{{ endpoint.EdgeKey }}</code>
@ -86,7 +86,7 @@
</div>
<p>
<i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
For those prestaging the edge agent, use the following join token to associate the Edge agent with this endpoint.
For those prestaging the edge agent, use the following join token to associate the Edge agent with this environment.
</p>
<p> You can read more about pre-staging in the userguide available <a href="https://downloads.portainer.io/edge_agent_guide.pdf">here.</a> </p>
<div style="margin-top: 10px; overflow-wrap: break-word;">
@ -128,7 +128,7 @@
<!-- endpoint-url-input -->
<div class="form-group" ng-if="!state.edgeEndpoint">
<label for="endpoint_url" class="col-sm-3 col-lg-2 control-label text-left">
Endpoint URL
Environment URL
<portainer-tooltip
position="bottom"
message="URL or IP address of a Docker host. The Docker API must be exposed over a TCP port. Please refer to the Docker documentation to configure it."
@ -153,7 +153,7 @@
Public IP
<portainer-tooltip
position="bottom"
message="URL or IP address where exposed containers will be reachable. This field is optional and will default to the endpoint URL."
message="URL or IP address where exposed containers will be reachable. This field is optional and will default to the environment URL."
>
</portainer-tooltip>
</label>
@ -166,7 +166,7 @@
Poll frequency
<portainer-tooltip
position="bottom"
message="Interval used by this Edge agent to check in with the Portainer instance. Affects Edge endpoint management and Edge compute features."
message="Interval used by this Edge agent to check in with the Portainer instance. Affects Edge environment management and Edge compute features."
></portainer-tooltip>
</label>
<div class="col-sm-10">
@ -220,8 +220,8 @@
ng-click="updateEndpoint()"
button-spinner="state.actionInProgress"
>
<span ng-hide="state.actionInProgress">Update endpoint</span>
<span ng-show="state.actionInProgress">Updating endpoint...</span>
<span ng-hide="state.actionInProgress">Update environment</span>
<span ng-show="state.actionInProgress">Updating environment...</span>
</button>
<a type="button" class="btn btn-default btn-sm" ui-sref="portainer.endpoints">Cancel</a>
</div>

10
app/portainer/views/endpoints/edit/endpointController.js
View file

@ -125,10 +125,10 @@ function EndpointController(
try {
$scope.state.actionInProgress = true;
await EndpointService.deassociateEndpoint(endpoint.Id);
Notifications.success('Endpoint de-associated', $scope.endpoint.Name);
Notifications.success('Environment de-associated', $scope.endpoint.Name);
$state.reload();
} catch (err) {
Notifications.error('Failure', err, 'Unable to de-associate endpoint');
Notifications.error('Failure', err, 'Unable to de-associate environment');
} finally {
$scope.state.actionInProgress = false;
}
@ -179,12 +179,12 @@ function EndpointController(
$scope.state.actionInProgress = true;
EndpointService.updateEndpoint(endpoint.Id, payload).then(
function success() {
Notifications.success('Endpoint updated', $scope.endpoint.Name);
Notifications.success('Environment updated', $scope.endpoint.Name);
EndpointProvider.setEndpointPublicURL(endpoint.PublicURL);
$state.go('portainer.endpoints', {}, { reload: true });
},
function error(err) {
Notifications.error('Failure', err, 'Unable to update endpoint');
Notifications.error('Failure', err, 'Unable to update environment');
$scope.state.actionInProgress = false;
},
function update(evt) {
@ -264,7 +264,7 @@ function EndpointController(
configureState();
} catch (err) {
Notifications.error('Failure', err, 'Unable to retrieve endpoint details');
Notifications.error('Failure', err, 'Unable to retrieve environment details');
}
});
}

6
app/portainer/views/endpoints/endpoints.html
View file

@ -1,16 +1,16 @@
<rd-header>
<rd-header-title title-text="Endpoints">
<rd-header-title title-text="Environments">
<a data-toggle="tooltip" title="Refresh" ui-sref="portainer.endpoints" ui-sref-opts="{reload: true}">
<i class="fa fa-sync" aria-hidden="true"></i>
</a>
</rd-header-title>
<rd-header-content>Endpoint management</rd-header-content>
<rd-header-content>Environment management</rd-header-content>
</rd-header>
<div class="row">
<div class="col-sm-12">
<endpoints-datatable
title-text="Endpoints"
title-text="Environments"
title-icon="fa-plug"
table-key="endpoints"
order-by="Name"

6
app/portainer/views/endpoints/endpointsController.js
View file

@ -15,9 +15,9 @@ function EndpointsController($q, $scope, $state, $async, EndpointService, GroupS
try {
await EndpointService.deleteEndpoint(endpoint.Id);
Notifications.success('Endpoint successfully removed', endpoint.Name);
Notifications.success('Environment successfully removed', endpoint.Name);
} catch (err) {
Notifications.error('Failure', err, 'Unable to remove endpoint');
Notifications.error('Failure', err, 'Unable to remove environment');
}
}
@ -38,7 +38,7 @@ function EndpointsController($q, $scope, $state, $async, EndpointService, GroupS
deferred.resolve({ endpoints: endpoints, totalCount: data.endpoints.totalCount });
})
.catch(function error(err) {
Notifications.error('Failure', err, 'Unable to retrieve endpoint information');
Notifications.error('Failure', err, 'Unable to retrieve environment information');
});
return deferred.promise;
}

2
app/portainer/views/groups/access/groupAccess.html
View file

@ -1,5 +1,5 @@
<rd-header>
<rd-header-title title-text="Endpoint group access"></rd-header-title>
<rd-header-title title-text="Environment group access"></rd-header-title>
<rd-header-content>
<a ui-sref="portainer.groups">Groups</a> &gt; <a ui-sref="portainer.groups.group({id: group.Id})">{{ group.Name }}</a> &gt; Access management
</rd-header-content>

4
app/portainer/views/groups/create/creategroup.html
View file

@ -1,6 +1,6 @@
<rd-header>
<rd-header-title title-text="Create endpoint group"></rd-header-title>
<rd-header-content> <a ui-sref="portainer.groups">Endpoint groups</a> &gt; Add group </rd-header-content>
<rd-header-title title-text="Create environment group"></rd-header-title>
<rd-header-content> <a ui-sref="portainer.groups">Environment groups</a> &gt; Add group </rd-header-content>
</rd-header>
<div class="row">

2
app/portainer/views/groups/edit/group.html
View file

@ -1,5 +1,5 @@
<rd-header>
<rd-header-title title-text="Endpoint group details"></rd-header-title>
<rd-header-title title-text="Environment group details"></rd-header-title>
<rd-header-content> <a ui-sref="portainer.groups">Groups</a> &gt; {{ ::group.Name }} </rd-header-content>
</rd-header>

6
app/portainer/views/groups/groups.html
View file

@ -1,14 +1,14 @@
<rd-header>
<rd-header-title title-text="Endpoint groups">
<rd-header-title title-text="Environment groups">
<a data-toggle="tooltip" title="Refresh" ui-sref="portainer.groups" ui-sref-opts="{reload: true}">
<i class="fa fa-sync" aria-hidden="true"></i>
</a>
</rd-header-title>
<rd-header-content>Endpoint group management</rd-header-content>
<rd-header-content>Environment group management</rd-header-content>
</rd-header>
<div class="row">
<div class="col-sm-12">
<groups-datatable title-text="Endpoint groups" title-icon="fa-object-group" dataset="groups" table-key="groups" order-by="Name" remove-action="removeAction"></groups-datatable>
<groups-datatable title-text="Environment groups" title-icon="fa-object-group" dataset="groups" table-key="groups" order-by="Name" remove-action="removeAction"></groups-datatable>
</div>
</div>

4
app/portainer/views/groups/groupsController.js
View file

@ -15,7 +15,7 @@ function GroupsController($scope, $state, $async, GroupService, Notifications) {
try {
await GroupService.deleteGroup(group.Id);
Notifications.success('Endpoint group successfully removed', group.Name);
Notifications.success('Environment group successfully removed', group.Name);
_.remove($scope.groups, group);
} catch (err) {
Notifications.error('Failure', err, 'Unable to remove group');
@ -31,7 +31,7 @@ function GroupsController($scope, $state, $async, GroupService, Notifications) {
$scope.groups = data;
})
.catch(function error(err) {
Notifications.error('Failure', err, 'Unable to retrieve endpoint groups');
Notifications.error('Failure', err, 'Unable to retrieve environment groups');
$scope.groups = [];
});
}

10
app/portainer/views/home/home.html
View file

@ -4,7 +4,7 @@
<i class="fa fa-sync" aria-hidden="true"></i>
</a>
</rd-header-title>
<rd-header-content>Endpoints</rd-header-content>
<rd-header-content>Environments</rd-header-content>
</rd-header>
<motd-panel ng-if="motd && motd.Message !== '' && applicationState.UI.dismissedInfoHash !== motd.Hash" motd="motd" dismiss-action="dismissImportantInformation(motd.Hash)">
@ -26,7 +26,7 @@
style="width: 100%; height: 100%; text-align: center; display: flex; flex-direction: column; align-items: center; justify-content: center;"
ng-if="state.connectingToEdgeEndpoint"
>
Connecting to the Edge endpoint...
Connecting to the Edge environment...
<i class="fa fa-cog fa-spin" style="margin-left: 5px;"></i>
</div>
@ -35,8 +35,8 @@
<p>
<i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
No environment available for management. Please head over the
<a ui-sref="portainer.endpoints.new"> endpoints view </a>
to add an endpoint.
<a ui-sref="portainer.endpoints.new"> environments view </a>
to add an environment.
</p>
</span>
</information-panel>
@ -44,7 +44,7 @@
<div class="row" ng-if="!state.connectingToEdgeEndpoint">
<div class="col-sm-12">
<endpoint-list
title-text="Endpoints"
title-text="Environments"
title-icon="fa-plug"
endpoints="endpoints"
table-key="home_endpoints"

6
app/portainer/views/home/homeController.js
View file

@ -63,11 +63,11 @@ angular
function triggerSnapshot() {
EndpointService.snapshotEndpoints()
.then(function success() {
Notifications.success('Success', 'Endpoints updated');
Notifications.success('Success', 'Environments updated');
$state.reload();
})
.catch(function error(err) {
Notifications.error('Failure', err, 'An error occured during endpoint snapshot');
Notifications.error('Failure', err, 'An error occured during environment snapshot');
});
}
@ -86,7 +86,7 @@ angular
deferred.resolve({ endpoints: endpoints, totalCount: data.endpoints.totalCount });
})
.catch(function error(err) {
Notifications.error('Failure', err, 'Unable to retrieve endpoint information');
Notifications.error('Failure', err, 'Unable to retrieve environment information');
});
return deferred.promise;
}

2
app/portainer/views/init/admin/initAdmin.html
View file

@ -126,7 +126,7 @@
<div class="form-group">
<div class="col-sm-9">
<span class="small text-muted">
This will restore the Portainer metadata which contains information about the endpoints, stacks and applications, as well as the configured users.
This will restore the Portainer metadata which contains information about the environments, stacks and applications, as well as the configured users.
</span>
</div>
</div>

16
app/portainer/views/init/endpoint/initEndpoint.html
View file

@ -8,10 +8,10 @@
<img ng-if="!ctrl.logo" src="~@/assets/images/logo_alt.png" class="simple-box-logo" alt="Portainer" />
</div>
<!-- !simple box logo -->
<!-- init-endpoint panel -->
<!-- init-environment panel -->
<div class="panel panel-default">
<div class="panel-body">
<!-- init-endpoint form -->
<!-- init-environment form -->
<form class="simple-box-form form-horizontal">
<!-- note -->
<div class="form-group">
@ -22,7 +22,7 @@
</div>
</div>
<!-- !note -->
<!-- endpoint-type -->
<!-- environment-type -->
<div class="form-group" style="margin-bottom: 0;">
<div class="boxselector_wrapper">
<div ng-repeat="type in ctrl.endpointSections">
@ -37,8 +37,8 @@
</div>
</div>
</div>
<!-- !endpoint-type -->
<!-- endpoint-type-details -->
<!-- !environment-type -->
<!-- environment-type-details -->
<div ng-if="ctrl.formValues.ConnectionType === ctrl.PortainerEndpointConnectionTypes.DOCKER_LOCAL">
<ng-include src="'app/portainer/views/init/endpoint/includes/localDocker.html'"></ng-include>
</div>
@ -48,7 +48,7 @@
<div ng-if="ctrl.formValues.ConnectionType === ctrl.PortainerEndpointConnectionTypes.AGENT">
<ng-include src="'app/portainer/views/init/endpoint/includes/agent.html'"></ng-include>
</div>
<!-- !endpoint-type-details -->
<!-- !environment-type-details -->
<!-- actions -->
<div class="form-group">
<div class="col-sm-12">
@ -69,10 +69,10 @@
</div>
<!-- !actions -->
</form>
<!-- !init-endpoint form -->
<!-- !init-environment form -->
</div>
</div>
<!-- !init-endpoint panel -->
<!-- !init-environment panel -->
</div>
</div>
<!-- !simple box -->

2
app/portainer/views/init/endpoint/initEndpointController.js
View file

@ -61,7 +61,7 @@ class InitEndpointController {
case PortainerEndpointConnectionTypes.AGENT:
return this.createAgentEndpoint();
default:
this.Notifications.error('Failure', 'Unable to determine which action to do to create endpoint');
this.Notifications.error('Failure', 'Unable to determine which action to do to create environment');
}
}

2
app/portainer/views/registries/registries.html
View file

@ -9,7 +9,7 @@
<information-panel title-text="Information">
<span class="small text-muted">
View registries via an endpoint to manage access for user(s) and/or team(s)
View registries via an environment to manage access for user(s) and/or team(s)
</span>
</information-panel>

2
app/portainer/views/registries/registriesController.js
View file

@ -23,7 +23,7 @@ angular.module('portainer.app').controller('RegistriesController', [
$scope.removeAction = function (selectedItems) {
const regAttrMsg = selectedItems.length > 1 ? 'hese' : 'his';
const registriesMsg = selectedItems.length > 1 ? 'registries' : 'registry';
const msg = `T${regAttrMsg} ${registriesMsg} might be used by applications inside one or more endpoints. Removing the ${registriesMsg} could lead to a service interruption for the applications using t${regAttrMsg} ${registriesMsg}. Do you want to remove the selected ${registriesMsg}?`;
const msg = `T${regAttrMsg} ${registriesMsg} might be used by applications inside one or more environments. Removing the ${registriesMsg} could lead to a service interruption for the applications using t${regAttrMsg} ${registriesMsg}. Do you want to remove the selected ${registriesMsg}?`;
ModalService.confirmDeletion(msg, function onConfirm(confirmed) {
if (!confirmed) {

2
app/portainer/views/roles/roles.html
View file

@ -45,7 +45,7 @@
<div>
<div class="small text-muted" style="margin-bottom: 15px;">
<i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
Effective role for each endpoint will be displayed for the selected user
Effective role for each environment will be displayed for the selected user
</div>
</div>
<access-viewer-datatable table-key="access_viewer" order-by="EndpointName"> </access-viewer-datatable>

2
app/portainer/views/settings/settings.html
View file

@ -94,7 +94,7 @@
Edge agent default poll frequency
<portainer-tooltip
position="bottom"
message="Interval used by default by each Edge agent to check in with the Portainer instance. Affects Edge endpoint management and Edge compute features."
message="Interval used by default by each Edge agent to check in with the Portainer instance. Affects Edge environment management and Edge compute features."
></portainer-tooltip>
</label>
<div class="col-sm-10">

2
app/portainer/views/sidebar/sidebar.html
View file

@ -80,7 +80,7 @@
<div ng-if="isAdmin">
<sidebar-menu
icon-class="fa-plug fa-fw"
label="Endpoints"
label="Environments"
path="portainer.endpoints"
is-sidebar-open="toggle"
children-paths="['portainer.endpoints.endpoint', 'portainer.endpoints.new', 'portainer.endpoints.endpoint.access', 'portainer.groups', 'portainer.groups.group', 'portainer.groups.group.access', 'portainer.groups.new', 'portainer.tags']"

6
app/portainer/views/stacks/edit/stack.html
View file

@ -26,7 +26,7 @@
<p class="text-muted">
<i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
<span ng-if="external">This stack was created outside of Portainer. Control over this stack is limited.</span>
<span ng-if="orphaned">This stack is orphaned. You can reassociate it with the current environment using the "Associate to this endpoint" feature.</span>
<span ng-if="orphaned">This stack is orphaned. You can reassociate it with the current environment using the "Associate to this environment" feature.</span>
</p>
</span>
</div>
@ -82,10 +82,10 @@
<!-- associate -->
<div ng-if="orphaned">
<div class="col-sm-12 form-section-title">
Associate to this endpoint
Associate to this environment
</div>
<p class="small text-muted">
This feature allows you to reassociate this stack to the current endpoint.
This feature allows you to reassociate this stack to the current environment.
</p>
<form class="form-horizontal">
<por-access-control-form form-data="formValues.AccessControlData" hide-title="true"></por-access-control-form>

8
app/portainer/views/stacks/edit/stackController.js
View file

@ -70,9 +70,9 @@ angular.module('portainer.app').controller('StackController', [
}
};
$scope.$on('$destroy', function() {
$scope.$on('$destroy', function () {
$scope.state.isEditorDirty = false;
})
});
$scope.handleEnvVarChange = handleEnvVarChange;
function handleEnvVarChange(value) {
@ -106,7 +106,7 @@ angular.module('portainer.app').controller('StackController', [
ModalService.confirm({
title: 'Are you sure?',
message:
'This action will deploy a new instance of this stack on the target endpoint, please note that this does NOT relocate the content of any persistent volumes that may be attached to this stack.',
'This action will deploy a new instance of this stack on the target environment, please note that this does NOT relocate the content of any persistent volumes that may be attached to this stack.',
buttons: {
confirm: {
label: 'Migrate',
@ -289,7 +289,7 @@ angular.module('portainer.app').controller('StackController', [
$scope.endpoints = data.value;
})
.catch(function error(err) {
Notifications.error('Failure', err, 'Unable to retrieve endpoints');
Notifications.error('Failure', err, 'Unable to retrieve environments');
});
$q.all({

2
app/portainer/views/users/edit/user.html
View file

@ -24,7 +24,7 @@
Administrator
<portainer-tooltip
position="bottom"
message="Administrators have access to Portainer settings management as well as full control over all defined endpoints and their resources."
message="Administrators have access to Portainer settings management as well as full control over all defined environments and their resources."
></portainer-tooltip>
</label>
<label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="formValues.Administrator" /><i></i> </label>

6
app/portainer/views/users/users.html
View file

@ -75,7 +75,7 @@
Administrator
<portainer-tooltip
position="bottom"
message="Administrators have access to Portainer settings management as well as full control over all defined endpoints and their resources."
message="Administrators have access to Portainer settings management as well as full control over all defined environments and their resources."
></portainer-tooltip>
</label>
<label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="formValues.Administrator" data-cy="user-adminCheckbox" /><i></i> </label>
@ -112,8 +112,8 @@
<div class="form-group" ng-if="isAdmin && !formValues.Administrator && formValues.Teams.length === 0">
<div class="col-sm-12">
<span class="small text-muted">
Note: non-administrator users who aren't in a team don't have access to any endpoints by default. Head over to the
<a ui-sref="portainer.endpoints">Endpoints view</a> to manage their accesses.
Note: non-administrator users who aren't in a team don't have access to any environments by default. Head over to the
<a ui-sref="portainer.endpoints">Environments view</a> to manage their accesses.
</span>
</div>
</div>