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

feat(wizard): replace-the-add-envs-button-with-env-wizard-button EE-3001 (#7013) 

* feat(envs): on env click, direct user to wizard
remotes/origin/fix/EE-2141/add-pagination-to-kubeconfig-download-dialog
Ali 2022-06-03 22:33:17 +12:00 committed by GitHub
parent 0522032515
commit eb4ff12744
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/portainer/__module.js
View File

@ -202,17 +202,6 @@ angular
},
};
var endpointCreation = {
name: 'portainer.endpoints.new',
url: '/new',
views: {
'content@': {
templateUrl: './views/endpoints/create/createendpoint.html',
controller: 'CreateEndpointController',
},
},
};
var edgeDeviceCreation = {
name: 'portainer.endpoints.newEdgeDevice',
url: '/newEdgeDevice',
@ -498,7 +487,6 @@ angular
$stateRegistryProvider.register(endpointAccess);
$stateRegistryProvider.register(endpointKVM);
$stateRegistryProvider.register(edgeDeviceCreation);
$stateRegistryProvider.register(endpointCreation);
$stateRegistryProvider.register(deviceImport);
$stateRegistryProvider.register(addFDOProfile);
$stateRegistryProvider.register(editFDOProfile);

2
app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html
View File

@ -14,7 +14,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">
<button type="button" class="btn btn-sm btn-primary" ng-click="$ctrl.setRefferer()" ui-sref="portainer.wizard.endpoints" data-cy="endpoint-addEndpointButton">
<i class="fa fa-plus-circle space-right" aria-hidden="true"></i>Add environment
</button>
</div>

4
app/portainer/components/datatables/endpoints-datatable/endpointsDatatableController.js
View File

@ -34,6 +34,10 @@ angular.module('portainer.app').controller('EndpointsDatatableController', [
this.paginationChanged();
};
this.setRefferer = function () {
window.localStorage.setItem('wizardRefferer', 'environments');
};
/**
* Overridden
*/

6
app/portainer/home/EnvironmentList/NoEnvironmentsInfoPanel.tsx
View File

@ -8,9 +8,9 @@ export function NoEnvironmentsInfoPanel({ isAdmin }: { isAdmin: boolean }) {
<TextTip>
{isAdmin ? (
<span>
No environment available for management. Please head over the
<Link to="portainer.endpoints.new"> environments view </Link>
to add an environment.
No environment available for management. Please head over the{' '}
<Link to="portainer.wizard.endpoints">environment wizard</Link> to
add an environment.
</span>
) : (
<span>

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

@ -73,7 +73,7 @@
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']"
children-paths="['portainer.endpoints.endpoint', 'portainer.wizard', 'portainer.endpoints.endpoint.access', 'portainer.groups', 'portainer.groups.group', 'portainer.groups.group.access', 'portainer.groups.new', 'portainer.tags']"
>
<sidebar-menu-item path="portainer.groups" class-name="sidebar-sublist" data-cy="portainerSidebar-endpointGroups" title="Groups">Groups</sidebar-menu-item>
<sidebar-menu-item path="portainer.tags" class-name="sidebar-sublist" data-cy="portainerSidebar-endpointTags" title="Tags">Tags</sidebar-menu-item>

5
app/react/portainer/environments/wizard/EnvironmentsCreationView/EnvironmentsCreationView.tsx
View File

@ -118,6 +118,11 @@ export function EnvironmentCreationView() {
])
),
});
if (localStorage.getItem('wizardRefferer') === 'environments') {
localStorage.removeItem('wizardRefferer');
router.stateService.go('portainer.endpoints');
return;
}
router.stateService.go('portainer.home');
}
}