diff --git a/app/azure/_module.js b/app/azure/_module.js index 30fd789b9..10c6cf60c 100644 --- a/app/azure/_module.js +++ b/app/azure/_module.js @@ -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 }); } }); diff --git a/app/docker/__module.js b/app/docker/__module.js index 94e7e969c..a34a8e4cd 100644 --- a/app/docker/__module.js +++ b/app/docker/__module.js @@ -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 }); } diff --git a/app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatableController.js b/app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatableController.js index 8a0c12765..f71f6d330 100644 --- a/app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatableController.js +++ b/app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatableController.js @@ -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; } diff --git a/app/edge/views/edge-jobs/edgeJob/edgeJobController.js b/app/edge/views/edge-jobs/edgeJob/edgeJobController.js index f88e9576d..190f45fb4 100644 --- a/app/edge/views/edge-jobs/edgeJob/edgeJobController.js +++ b/app/edge/views/edge-jobs/edgeJob/edgeJobController.js @@ -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 = () => { diff --git a/app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackViewController.js b/app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackViewController.js index db2c9fa46..6fe162470 100644 --- a/app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackViewController.js +++ b/app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackViewController.js @@ -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'); } } } diff --git a/app/kubernetes/__module.js b/app/kubernetes/__module.js index 3e854bead..7bb3d3739 100644 --- a/app/kubernetes/__module.js +++ b/app/kubernetes/__module.js @@ -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 }); } }); diff --git a/app/kubernetes/endpoint/service.js b/app/kubernetes/endpoint/service.js index 196f9c588..1df8a3e4f 100644 --- a/app/kubernetes/endpoint/service.js +++ b/app/kubernetes/endpoint/service.js @@ -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); } } diff --git a/app/kubernetes/views/cluster/clusterController.js b/app/kubernetes/views/cluster/clusterController.js index 1c695d042..2d649df18 100644 --- a/app/kubernetes/views/cluster/clusterController.js +++ b/app/kubernetes/views/cluster/clusterController.js @@ -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'); } } diff --git a/app/kubernetes/views/cluster/node/nodeController.js b/app/kubernetes/views/cluster/node/nodeController.js index bb5c3a90f..9a726add7 100644 --- a/app/kubernetes/views/cluster/node/nodeController.js +++ b/app/kubernetes/views/cluster/node/nodeController.js @@ -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'); } } diff --git a/app/kubernetes/views/configure/configureController.js b/app/kubernetes/views/configure/configureController.js index 8e41a3848..4e38cd27d 100644 --- a/app/kubernetes/views/configure/configureController.js +++ b/app/kubernetes/views/configure/configureController.js @@ -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; } diff --git a/app/portainer/__module.js b/app/portainer/__module.js index d5a29f75e..a2432ba9b 100644 --- a/app/portainer/__module.js +++ b/app/portainer/__module.js @@ -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; } diff --git a/app/portainer/components/forms/group-form/groupFormController.js b/app/portainer/components/forms/group-form/groupFormController.js index 1f2c7b54d..9f9eb7acf 100644 --- a/app/portainer/components/forms/group-form/groupFormController.js +++ b/app/portainer/components/forms/group-form/groupFormController.js @@ -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')); } } diff --git a/app/portainer/components/information-panel-offline/informationPanelOfflineController.js b/app/portainer/components/information-panel-offline/informationPanelOfflineController.js index d4096c1c5..14329ca72 100644 --- a/app/portainer/components/information-panel-offline/informationPanelOfflineController.js +++ b/app/portainer/components/information-panel-offline/informationPanelOfflineController.js @@ -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'); }); } }, diff --git a/app/portainer/services/api/endpointService.js b/app/portainer/services/api/endpointService.js index 852d398f9..827b40b60 100644 --- a/app/portainer/services/api/endpointService.js +++ b/app/portainer/services/api/endpointService.js @@ -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; diff --git a/app/portainer/services/api/stackService.js b/app/portainer/services/api/stackService.js index da3a1a545..33ee75401 100644 --- a/app/portainer/services/api/stackService.js +++ b/app/portainer/services/api/stackService.js @@ -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; diff --git a/app/portainer/services/modalService.js b/app/portainer/services/modalService.js index 7e03ba7bb..9203d6248 100644 --- a/app/portainer/services/modalService.js +++ b/app/portainer/services/modalService.js @@ -154,9 +154,9 @@ angular.module('portainer.app').factory('ModalService', [ service.confirmDeassociate = function (callback) { const message = - '

De-associating this Edge endpoint will mark it as non associated and will clear the registered Edge ID.

' + - '

Any agent started with the Edge key associated to this endpoint will be able to re-associate with this endpoint.

' + - '

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.

'; + '

De-associating this Edge environment will mark it as non associated and will clear the registered Edge ID.

' + + '

Any agent started with the Edge key associated to this environment will be able to re-associate with this environment.

' + + '

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.

'; 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', diff --git a/app/portainer/services/stateManager.js b/app/portainer/services/stateManager.js index 9e9dbd383..337c4c7d2 100644 --- a/app/portainer/services/stateManager.js +++ b/app/portainer/services/stateManager.js @@ -195,7 +195,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; diff --git a/app/portainer/views/auth/authController.js b/app/portainer/views/auth/authController.js index e132f7dae..1735c66bd 100644 --- a/app/portainer/views/auth/authController.js +++ b/app/portainer/views/auth/authController.js @@ -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'); } } diff --git a/app/portainer/views/endpoints/access/endpointAccessController.js b/app/portainer/views/endpoints/access/endpointAccessController.js index e16b56442..6d7e2329e 100644 --- a/app/portainer/views/endpoints/access/endpointAccessController.js +++ b/app/portainer/views/endpoints/access/endpointAccessController.js @@ -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'); } } diff --git a/app/portainer/views/endpoints/create/createEndpointController.js b/app/portainer/views/endpoints/create/createEndpointController.js index dde612ab5..828ecbae9 100644 --- a/app/portainer/views/endpoints/create/createEndpointController.js +++ b/app/portainer/views/endpoints/create/createEndpointController.js @@ -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; } diff --git a/app/portainer/views/endpoints/edit/endpointController.js b/app/portainer/views/endpoints/edit/endpointController.js index 2318a9509..f28cb28c9 100644 --- a/app/portainer/views/endpoints/edit/endpointController.js +++ b/app/portainer/views/endpoints/edit/endpointController.js @@ -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'); } }); } diff --git a/app/portainer/views/endpoints/endpointsController.js b/app/portainer/views/endpoints/endpointsController.js index 83f9bfd0a..efbe35675 100644 --- a/app/portainer/views/endpoints/endpointsController.js +++ b/app/portainer/views/endpoints/endpointsController.js @@ -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; } diff --git a/app/portainer/views/groups/groupsController.js b/app/portainer/views/groups/groupsController.js index 67fc81af6..b261968d4 100644 --- a/app/portainer/views/groups/groupsController.js +++ b/app/portainer/views/groups/groupsController.js @@ -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 = []; }); } diff --git a/app/portainer/views/home/homeController.js b/app/portainer/views/home/homeController.js index b629a6bea..9083090e4 100644 --- a/app/portainer/views/home/homeController.js +++ b/app/portainer/views/home/homeController.js @@ -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; } diff --git a/app/portainer/views/init/endpoint/initEndpointController.js b/app/portainer/views/init/endpoint/initEndpointController.js index 235390a23..510982ac2 100644 --- a/app/portainer/views/init/endpoint/initEndpointController.js +++ b/app/portainer/views/init/endpoint/initEndpointController.js @@ -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'); } } diff --git a/app/portainer/views/registries/registriesController.js b/app/portainer/views/registries/registriesController.js index 568516de7..0fe991f30 100644 --- a/app/portainer/views/registries/registriesController.js +++ b/app/portainer/views/registries/registriesController.js @@ -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) { diff --git a/app/portainer/views/stacks/edit/stackController.js b/app/portainer/views/stacks/edit/stackController.js index 4c9289fed..f11546a34 100644 --- a/app/portainer/views/stacks/edit/stackController.js +++ b/app/portainer/views/stacks/edit/stackController.js @@ -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({ diff --git a/test/e2e/cypress/integration/ci_basic_tests/init.spec.js b/test/e2e/cypress/integration/ci_basic_tests/init.spec.js index b0440ea0a..a1cb21ff0 100644 --- a/test/e2e/cypress/integration/ci_basic_tests/init.spec.js +++ b/test/e2e/cypress/integration/ci_basic_tests/init.spec.js @@ -8,7 +8,7 @@ context('Init admin user test', () => { cy.url().should('include', 'init/endpoint'); cy.saveLocalStorage(); }); - it('Select local docker endpoint and init', function () { + it('Select local docker environment and init', function () { cy.initEndpoint(); cy.url().should('include', 'home'); }); diff --git a/test/e2e/cypress/integration/init.spec.js b/test/e2e/cypress/integration/init.spec.js index f1c69b4a0..7a0bce690 100644 --- a/test/e2e/cypress/integration/init.spec.js +++ b/test/e2e/cypress/integration/init.spec.js @@ -8,7 +8,7 @@ context('Init admin & local docker endpoint', () => { cy.url().should('include', 'init/endpoint'); cy.saveLocalStorage(); }); - it('Select local docker endpoint and init', function () { + it('Select local docker environment and init', function () { cy.initEndpoint(); cy.url().should('include', 'home'); });