ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2024-12-29 17:28:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

I change all url everywhere like /servers => /controllers and /server/ => /controller/

Browse Source
This commit is contained in:
Rajnikant Lodhi 2022-07-18 14:01:09 +05:30
parent 9f80df4360
commit 99e022bed8
72 changed files with 169 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/helpers/server.po.ts
View File

@ -9,7 +9,7 @@ export class ServersPage {
}
navigateToServersPage() {
return browser.get('/servers');
return browser.get('/controllers');
}
getAddServerNotificationText() {

2
e2e/projects.e2e-spec.ts
View File

@ -28,6 +28,6 @@ describe('Projects page', () => {
helper.sleep(2000);
//assert
expect(helper.getCurrentUrl()).toMatch('server/1/project/');
expect(helper.getCurrentUrl()).toMatch('controller/1/project/');
});
});

108
src/app/app-routing.module.ts
View File

@ -63,14 +63,14 @@ const routes: Routes = [
path: '',
component: DefaultLayoutComponent,
children: [
{ path: '', redirectTo: 'servers', pathMatch: 'full' },
{ path: 'servers', component: ServersComponent },
{ path: '', redirectTo: 'controllers', pathMatch: 'full' },
{ path: 'controllers', component: ServersComponent },
{ path: 'bundled', component: BundledServerFinderComponent },
{ path: 'server/:server_id/login', component: LoginComponent },
{ path: 'server/:server_id/loggeduser', component: LoggedUserComponent },
{path : 'server/:server_id/image-manager', component: ImageManagerComponent},
{ path: 'controller/:server_id/login', component: LoginComponent },
{ path: 'controller/:server_id/loggeduser', component: LoggedUserComponent },
{path : 'controller/:server_id/image-manager', component: ImageManagerComponent},
{
path: 'server/:server_id/projects',
path: 'controller/:server_id/projects',
component: ProjectsComponent,
canActivate: [LoginGuard],
resolve: { server: ServerResolve },
@ -79,134 +79,134 @@ const routes: Routes = [
{ path: 'settings', component: SettingsComponent },
{ path: 'settings/console', component: ConsoleComponent },
{ path: 'installed-software', component: InstalledSoftwareComponent },
{ path: 'server/:server_id/systemstatus', component: SystemStatusComponent, canActivate: [LoginGuard] },
{ path: 'controller/:server_id/systemstatus', component: SystemStatusComponent, canActivate: [LoginGuard] },
{ path: 'server/:server_ip/:server_port/project/:project_id', component: DirectLinkComponent, canActivate: [LoginGuard] },
{ path: 'controller/:server_ip/:server_port/project/:project_id', component: DirectLinkComponent, canActivate: [LoginGuard] },
{
path: 'server/:server_id/project/:project_id/snapshots',
path: 'controller/:server_id/project/:project_id/snapshots',
component: ListOfSnapshotsComponent,
canActivate: [LoginGuard],
resolve: { server: ServerResolve },
},
{ path: 'server/:server_id/preferences', component: PreferencesComponent, canActivate: [LoginGuard] },
// { path: 'server/:server_id/preferences/general', component: GeneralPreferencesComponent },
{ path: 'server/:server_id/preferences/builtin', component: BuiltInPreferencesComponent, canActivate: [LoginGuard] },
{ path: 'controller/:server_id/preferences', component: PreferencesComponent, canActivate: [LoginGuard] },
// { path: 'controller/:server_id/preferences/general', component: GeneralPreferencesComponent },
{ path: 'controller/:server_id/preferences/builtin', component: BuiltInPreferencesComponent, canActivate: [LoginGuard] },
{ path: 'server/:server_id/preferences/builtin/ethernet-hubs', component: EthernetHubsTemplatesComponent, canActivate: [LoginGuard] },
{ path: 'controller/:server_id/preferences/builtin/ethernet-hubs', component: EthernetHubsTemplatesComponent, canActivate: [LoginGuard] },
{
path: 'server/:server_id/preferences/builtin/ethernet-hubs/addtemplate',
path: 'controller/:server_id/preferences/builtin/ethernet-hubs/addtemplate',
component: EthernetHubsAddTemplateComponent,
canActivate: [LoginGuard]
},
{
path: 'server/:server_id/preferences/builtin/ethernet-hubs/:template_id',
path: 'controller/:server_id/preferences/builtin/ethernet-hubs/:template_id',
component: EthernetHubsTemplateDetailsComponent,
canActivate: [LoginGuard]
},
{
path: 'server/:server_id/preferences/builtin/ethernet-switches',
path: 'controller/:server_id/preferences/builtin/ethernet-switches',
component: EthernetSwitchesTemplatesComponent,
canActivate: [LoginGuard]
},
{
path: 'server/:server_id/preferences/builtin/ethernet-switches/addtemplate',
path: 'controller/:server_id/preferences/builtin/ethernet-switches/addtemplate',
component: EthernetSwitchesAddTemplateComponent,
canActivate: [LoginGuard]
},
{
path: 'server/:server_id/preferences/builtin/ethernet-switches/:template_id',
path: 'controller/:server_id/preferences/builtin/ethernet-switches/:template_id',
component: EthernetSwitchesTemplateDetailsComponent,
canActivate: [LoginGuard]
},
{ path: 'server/:server_id/preferences/builtin/cloud-nodes', component: CloudNodesTemplatesComponent, canActivate: [LoginGuard] },
{ path: 'controller/:server_id/preferences/builtin/cloud-nodes', component: CloudNodesTemplatesComponent, canActivate: [LoginGuard] },
{
path: 'server/:server_id/preferences/builtin/cloud-nodes/addtemplate',
path: 'controller/:server_id/preferences/builtin/cloud-nodes/addtemplate',
component: CloudNodesAddTemplateComponent,
canActivate: [LoginGuard]
},
{
path: 'server/:server_id/preferences/builtin/cloud-nodes/:template_id',
path: 'controller/:server_id/preferences/builtin/cloud-nodes/:template_id',
component: CloudNodesTemplateDetailsComponent,
canActivate: [LoginGuard]
},
//{ path: 'server/:server_id/preferences/dynamips', component: DynamipsPreferencesComponent },
{ path: 'server/:server_id/preferences/dynamips/templates', component: IosTemplatesComponent, canActivate: [LoginGuard] },
{ path: 'server/:server_id/preferences/dynamips/templates/addtemplate', component: AddIosTemplateComponent, canActivate: [LoginGuard] },
{ path: 'server/:server_id/preferences/dynamips/templates/:template_id', component: IosTemplateDetailsComponent, canActivate: [LoginGuard] },
//{ path: 'controller/:server_id/preferences/dynamips', component: DynamipsPreferencesComponent },
{ path: 'controller/:server_id/preferences/dynamips/templates', component: IosTemplatesComponent, canActivate: [LoginGuard] },
{ path: 'controller/:server_id/preferences/dynamips/templates/addtemplate', component: AddIosTemplateComponent, canActivate: [LoginGuard] },
{ path: 'controller/:server_id/preferences/dynamips/templates/:template_id', component: IosTemplateDetailsComponent, canActivate: [LoginGuard] },
{
path: 'server/:server_id/preferences/dynamips/templates/:template_id/copy',
path: 'controller/:server_id/preferences/dynamips/templates/:template_id/copy',
component: CopyIosTemplateComponent,
canActivate: [LoginGuard]
},
// { path: 'server/:server_id/preferences/qemu', component: QemuPreferencesComponent },
{ path: 'server/:server_id/preferences/qemu/templates', component: QemuVmTemplatesComponent, canActivate: [LoginGuard] },
// { path: 'controller/:server_id/preferences/qemu', component: QemuPreferencesComponent },
{ path: 'controller/:server_id/preferences/qemu/templates', component: QemuVmTemplatesComponent, canActivate: [LoginGuard] },
{
path: 'server/:server_id/preferences/qemu/templates/:template_id/copy',
path: 'controller/:server_id/preferences/qemu/templates/:template_id/copy',
component: CopyQemuVmTemplateComponent,
canActivate: [LoginGuard]
},
{ path: 'server/:server_id/preferences/qemu/templates/:template_id', component: QemuVmTemplateDetailsComponent, canActivate: [LoginGuard] },
{ path: 'server/:server_id/preferences/qemu/addtemplate', component: AddQemuVmTemplateComponent, canActivate: [LoginGuard] },
{ path: 'controller/:server_id/preferences/qemu/templates/:template_id', component: QemuVmTemplateDetailsComponent, canActivate: [LoginGuard] },
{ path: 'controller/:server_id/preferences/qemu/addtemplate', component: AddQemuVmTemplateComponent, canActivate: [LoginGuard] },
// { path: 'server/:server_id/preferences/vpcs', component: VpcsPreferencesComponent },
{ path: 'server/:server_id/preferences/vpcs/templates', component: VpcsTemplatesComponent, canActivate: [LoginGuard] },
{ path: 'server/:server_id/preferences/vpcs/templates/:template_id', component: VpcsTemplateDetailsComponent, canActivate: [LoginGuard] },
{ path: 'server/:server_id/preferences/vpcs/addtemplate', component: AddVpcsTemplateComponent, canActivate: [LoginGuard] },
// { path: 'controller/:server_id/preferences/vpcs', component: VpcsPreferencesComponent },
{ path: 'controller/:server_id/preferences/vpcs/templates', component: VpcsTemplatesComponent, canActivate: [LoginGuard] },
{ path: 'controller/:server_id/preferences/vpcs/templates/:template_id', component: VpcsTemplateDetailsComponent, canActivate: [LoginGuard] },
{ path: 'controller/:server_id/preferences/vpcs/addtemplate', component: AddVpcsTemplateComponent, canActivate: [LoginGuard] },
// { path: 'server/:server_id/preferences/virtualbox', component: VirtualBoxPreferencesComponent },
{ path: 'server/:server_id/preferences/virtualbox/templates', component: VirtualBoxTemplatesComponent, canActivate: [LoginGuard] },
// { path: 'controller/:server_id/preferences/virtualbox', component: VirtualBoxPreferencesComponent },
{ path: 'controller/:server_id/preferences/virtualbox/templates', component: VirtualBoxTemplatesComponent, canActivate: [LoginGuard] },
{
path: 'server/:server_id/preferences/virtualbox/templates/:template_id',
path: 'controller/:server_id/preferences/virtualbox/templates/:template_id',
component: VirtualBoxTemplateDetailsComponent,
canActivate: [LoginGuard]
},
{ path: 'server/:server_id/preferences/virtualbox/addtemplate', component: AddVirtualBoxTemplateComponent, canActivate: [LoginGuard] },
{ path: 'controller/:server_id/preferences/virtualbox/addtemplate', component: AddVirtualBoxTemplateComponent, canActivate: [LoginGuard] },
// { path: 'server/:server_id/preferences/vmware', component: VmwarePreferencesComponent },
{ path: 'server/:server_id/preferences/vmware/templates', component: VmwareTemplatesComponent, canActivate: [LoginGuard] },
// { path: 'controller/:server_id/preferences/vmware', component: VmwarePreferencesComponent },
{ path: 'controller/:server_id/preferences/vmware/templates', component: VmwareTemplatesComponent, canActivate: [LoginGuard] },
{
path: 'server/:server_id/preferences/vmware/templates/:template_id',
path: 'controller/:server_id/preferences/vmware/templates/:template_id',
component: VmwareTemplateDetailsComponent,
canActivate: [LoginGuard]
},
{ path: 'server/:server_id/preferences/vmware/addtemplate', component: AddVmwareTemplateComponent, canActivate: [LoginGuard] },
{ path: 'controller/:server_id/preferences/vmware/addtemplate', component: AddVmwareTemplateComponent, canActivate: [LoginGuard] },
{ path: 'server/:server_id/preferences/docker/templates', component: DockerTemplatesComponent, canActivate: [LoginGuard] },
{ path: 'controller/:server_id/preferences/docker/templates', component: DockerTemplatesComponent, canActivate: [LoginGuard] },
{
path: 'server/:server_id/preferences/docker/templates/:template_id',
path: 'controller/:server_id/preferences/docker/templates/:template_id',
component: DockerTemplateDetailsComponent,
canActivate: [LoginGuard]
},
{
path: 'server/:server_id/preferences/docker/templates/:template_id/copy',
path: 'controller/:server_id/preferences/docker/templates/:template_id/copy',
component: CopyDockerTemplateComponent,
canActivate: [LoginGuard]
},
{ path: 'server/:server_id/preferences/docker/addtemplate', component: AddDockerTemplateComponent, canActivate: [LoginGuard] },
{ path: 'controller/:server_id/preferences/docker/addtemplate', component: AddDockerTemplateComponent, canActivate: [LoginGuard] },
{ path: 'server/:server_id/preferences/iou/templates', component: IouTemplatesComponent, canActivate: [LoginGuard] },
{ path: 'server/:server_id/preferences/iou/templates/:template_id', component: IouTemplateDetailsComponent, canActivate: [LoginGuard] },
{ path: 'server/:server_id/preferences/iou/templates/:template_id/copy', component: CopyIouTemplateComponent, canActivate: [LoginGuard] },
{ path: 'server/:server_id/preferences/iou/addtemplate', component: AddIouTemplateComponent, canActivate: [LoginGuard] },
{ path: 'controller/:server_id/preferences/iou/templates', component: IouTemplatesComponent, canActivate: [LoginGuard] },
{ path: 'controller/:server_id/preferences/iou/templates/:template_id', component: IouTemplateDetailsComponent, canActivate: [LoginGuard] },
{ path: 'controller/:server_id/preferences/iou/templates/:template_id/copy', component: CopyIouTemplateComponent, canActivate: [LoginGuard] },
{ path: 'controller/:server_id/preferences/iou/addtemplate', component: AddIouTemplateComponent, canActivate: [LoginGuard] },
],
},
{
path: 'server/:server_id/project/:project_id',
path: 'controller/:server_id/project/:project_id',
component: ProjectMapComponent,
canActivate: [LoginGuard],
canDeactivate: [ConsoleGuard],
},
{
path: 'server/:server_id/project/:project_id/nodes/:node_id',
path: 'controller/:server_id/project/:project_id/nodes/:node_id',
component: WebConsoleFullWindowComponent,
canActivate: [LoginGuard]
},
{
path: 'static/web-ui/server/:server_id/project/:project_id/nodes/:node_id',
path: 'static/web-ui/controller/:server_id/project/:project_id/nodes/:node_id',
component: WebConsoleFullWindowComponent,
canActivate: [LoginGuard]
},

2
src/app/components/bundled-server-finder/bundled-server-finder.component.spec.ts
View File

@ -60,7 +60,7 @@ describe('BundledServerFinderComponent', () => {
fixture.detectChanges()
fixture.whenStable().then(() => {
expect(serverServiceMock.getLocalServer).toHaveBeenCalledWith('vps3.gns3.net',3000);
expect(router.navigate).toHaveBeenCalledWith(['/server', 99, 'projects']);
expect(router.navigate).toHaveBeenCalledWith(['/controller', 99, 'projects']);
})
service = TestBed.inject(ServerService);
}));

2
src/app/components/bundled-server-finder/bundled-server-finder.component.ts
View File

@ -32,7 +32,7 @@ export class BundledServerFinderComponent implements OnInit {
}
this.serverService.getLocalServer(this.document.location.hostname, port).then((server: Server) => {
this.router.navigate(['/server', server.id, 'projects']);
this.router.navigate(['/controller', server.id, 'projects']);
this.progressService.deactivate();
});
}, 100);

4
src/app/components/direct-link/direct-link.component.ts
View File

@ -60,7 +60,7 @@ export class DirectLinkComponent implements OnInit {
const server = servers.filter((server) => server.host === this.serverIp && server.port === this.serverPort)[0];
if (server) {
this.router.navigate(['/server', server.id, 'project', this.projectId]);
this.router.navigate(['/controller', server.id, 'project', this.projectId]);
} else {
this.serverOptionsVisibility = true;
}
@ -81,7 +81,7 @@ export class DirectLinkComponent implements OnInit {
serverToAdd.protocol = this.serverForm.get('protocol').value;
this.serverService.create(serverToAdd).then((addedServer: Server) => {
this.router.navigate(['/server', addedServer.id, 'project', this.projectId]);
this.router.navigate(['/controller', addedServer.id, 'project', this.projectId]);
});
}
}

4
src/app/components/login/login.component.ts
View File

@ -49,7 +49,7 @@ export class LoginComponent implements OnInit, DoCheck {
this.server = server;
if (server.authToken) {
this.router.navigate(['/server', this.server.id, 'projects']);
this.router.navigate(['/controller', this.server.id, 'projects']);
}
this.versionService.get(this.server).subscribe((version: Version) => {
@ -88,7 +88,7 @@ export class LoginComponent implements OnInit, DoCheck {
await this.serverService.update(server);
if (this.returnUrl.length <= 1) {
this.router.navigate(['/server', this.server.id, 'projects']);
this.router.navigate(['/controller', this.server.id, 'projects']);
} else {
this.router.navigateByUrl(this.returnUrl);
}

2
src/app/components/page-not-found/page-not-found.component.html
View File

@ -2,6 +2,6 @@
<div class="default-header">
<br />
<h1>404 Page not found</h1>
<button mat-button routerLink="/servers">Navigate to homepage</button>
<button mat-button routerLink="/controllers">Navigate to homepage</button>
</div>
</div>

8
src/app/components/preferences/built-in/built-in-preferences.component.html
View File

@ -2,7 +2,7 @@
<div class="default-header">
<div class="row">
<h1 class="col">Built-in preferences</h1>
<button class="top-button" class="cancel-button" routerLink="/server/{{ serverId }}/preferences" mat-button>
<button class="top-button" class="cancel-button" routerLink="/controller/{{ serverId }}/preferences" mat-button>
Back
</button>
</div>
@ -10,13 +10,13 @@
<div class="default-content">
<div class="listcontainer mat-elevation-z8">
<mat-nav-list>
<mat-list-item routerLink="/server/{{ serverId }}/preferences/builtin/ethernet-hubs">
<mat-list-item routerLink="/controller/{{ serverId }}/preferences/builtin/ethernet-hubs">
Ethernet hubs
</mat-list-item>
<mat-list-item routerLink="/server/{{ serverId }}/preferences/builtin/ethernet-switches">
<mat-list-item routerLink="/controller/{{ serverId }}/preferences/builtin/ethernet-switches">
Ethernet switches
</mat-list-item>
<mat-list-item routerLink="/server/{{ serverId }}/preferences/builtin/cloud-nodes"> Cloud nodes </mat-list-item>
<mat-list-item routerLink="/controller/{{ serverId }}/preferences/builtin/cloud-nodes"> Cloud nodes </mat-list-item>
</mat-nav-list>
</div>
</div>

2
src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts
View File

@ -51,7 +51,7 @@ describe('CloudNodesAddTemplateComponent', () => {
CommonModule,
NoopAnimationsModule,
RouterTestingModule.withRoutes([
{ path: 'server/1/preferences/builtin/cloud-nodes', component: CloudNodesAddTemplateComponent },
{ path: 'controller/1/preferences/builtin/cloud-nodes', component: CloudNodesAddTemplateComponent },
]),
],
providers: [

2
src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts
View File

@ -51,7 +51,7 @@ export class CloudNodesAddTemplateComponent implements OnInit {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'builtin', 'cloud-nodes']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'builtin', 'cloud-nodes']);
}
addTemplate() {

2
src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.ts
View File

@ -70,7 +70,7 @@ export class CloudNodesTemplateDetailsComponent implements OnInit {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'builtin', 'cloud-nodes']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'builtin', 'cloud-nodes']);
}
getConfiguration() {

4
src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.html
View File

@ -6,7 +6,7 @@
*ngIf="server"
class="top-button"
class="cancel-button"
routerLink="/server/{{ server.id }}/preferences/builtin"
routerLink="/controller/{{ server.id }}/preferences/builtin"
mat-button
>
Back
@ -14,7 +14,7 @@
<button
*ngIf="server"
class="top-button"
routerLink="/server/{{ server.id }}/preferences/builtin/cloud-nodes/addtemplate"
routerLink="/controller/{{ server.id }}/preferences/builtin/cloud-nodes/addtemplate"
mat-raised-button
color="primary"
>

2
src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts
View File

@ -51,7 +51,7 @@ describe('EthernetHubsAddTemplateComponent', () => {
CommonModule,
NoopAnimationsModule,
RouterTestingModule.withRoutes([
{ path: 'server/1/preferences/builtin/ethernet-hubs', component: EthernetHubsAddTemplateComponent },
{ path: 'controller/1/preferences/builtin/ethernet-hubs', component: EthernetHubsAddTemplateComponent },
]),
],
providers: [

2
src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts
View File

@ -52,7 +52,7 @@ export class EthernetHubsAddTemplateComponent implements OnInit {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'builtin', 'ethernet-hubs']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'builtin', 'ethernet-hubs']);
}
addTemplate() {

2
src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.ts
View File

@ -55,7 +55,7 @@ export class EthernetHubsTemplateDetailsComponent implements OnInit {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'builtin', 'ethernet-hubs']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'builtin', 'ethernet-hubs']);
}
onSave() {

4
src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.html
View File

@ -6,7 +6,7 @@
*ngIf="server"
class="top-button"
class="cancel-button"
routerLink="/server/{{ server.id }}/preferences/builtin"
routerLink="/controller/{{ server.id }}/preferences/builtin"
mat-button
>
Back
@ -14,7 +14,7 @@
<button
*ngIf="server"
class="top-button"
routerLink="/server/{{ server.id }}/preferences/builtin/ethernet-hubs/addtemplate"
routerLink="/controller/{{ server.id }}/preferences/builtin/ethernet-hubs/addtemplate"
mat-raised-button
color="primary"
>

2
src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.spec.ts
View File

@ -51,7 +51,7 @@ describe('EthernetSwitchesAddTemplateComponent', () => {
CommonModule,
NoopAnimationsModule,
RouterTestingModule.withRoutes([
{ path: 'server/1/preferences/builtin/ethernet-switches', component: EthernetSwitchesAddTemplateComponent },
{ path: 'controller/1/preferences/builtin/ethernet-switches', component: EthernetSwitchesAddTemplateComponent },
]),
],
providers: [

2
src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts
View File

@ -46,7 +46,7 @@ export class EthernetSwitchesAddTemplateComponent implements OnInit {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'builtin', 'ethernet-switches']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'builtin', 'ethernet-switches']);
}
setServerType(serverType: string) {

2
src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.ts
View File

@ -60,7 +60,7 @@ export class EthernetSwitchesTemplateDetailsComponent implements OnInit {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'builtin', 'ethernet-switches']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'builtin', 'ethernet-switches']);
}
onSave() {

4
src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.html
View File

@ -6,7 +6,7 @@
*ngIf="server"
class="top-button"
class="cancel-button"
routerLink="/server/{{ server.id }}/preferences/builtin"
routerLink="/controller/{{ server.id }}/preferences/builtin"
mat-button
>
Back
@ -14,7 +14,7 @@
<button
*ngIf="server"
class="top-button"
routerLink="/server/{{ server.id }}/preferences/builtin/ethernet-switches/addtemplate"
routerLink="/controller/{{ server.id }}/preferences/builtin/ethernet-switches/addtemplate"
mat-raised-button
color="primary"
>

2
src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts
View File

@ -67,7 +67,7 @@ xdescribe('AddDockerTemplateComponent', () => {
CommonModule,
NoopAnimationsModule,
RouterTestingModule.withRoutes([
{ path: 'server/1/preferences/docker/templates', component: AddDockerTemplateComponent },
{ path: 'controller/1/preferences/docker/templates', component: AddDockerTemplateComponent },
]),
],
providers: [

2
src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts
View File

@ -86,7 +86,7 @@ export class AddDockerTemplateComponent implements OnInit {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'docker', 'templates']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'docker', 'templates']);
}
addTemplate() {

2
src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.ts
View File

@ -46,7 +46,7 @@ export class CopyDockerTemplateComponent implements OnInit {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'docker', 'templates']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'docker', 'templates']);
}
addTemplate() {

2
src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts
View File

@ -65,7 +65,7 @@ export class DockerTemplateDetailsComponent implements OnInit {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'docker', 'templates']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'docker', 'templates']);
}
onSave() {

4
src/app/components/preferences/docker/docker-templates/docker-templates.component.html
View File

@ -6,7 +6,7 @@
*ngIf="server"
class="top-button"
class="cancel-button"
routerLink="/server/{{ server.id }}/preferences"
routerLink="/controller/{{ server.id }}/preferences"
mat-button
>
Back
@ -14,7 +14,7 @@
<button
*ngIf="server"
class="top-button"
routerLink="/server/{{ server.id }}/preferences/docker/addtemplate"
routerLink="/controller/{{ server.id }}/preferences/docker/addtemplate"
mat-raised-button
color="primary"
>

2
src/app/components/preferences/docker/docker-templates/docker-templates.component.ts
View File

@ -47,7 +47,7 @@ export class DockerTemplatesComponent implements OnInit {
copyTemplate(template: DockerTemplate) {
this.router.navigate([
'/server',
'/controller',
this.server.id,
'preferences',
'docker',

2
src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts
View File

@ -62,7 +62,7 @@ xdescribe('AddIosTemplateComponent', () => {
CommonModule,
NoopAnimationsModule,
RouterTestingModule.withRoutes([
{ path: 'server/1/preferences/dynamips/templates', component: AddIosTemplateComponent },
{ path: 'controller/1/preferences/dynamips/templates', component: AddIosTemplateComponent },
]),
],
providers: [

2
src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts
View File

@ -237,7 +237,7 @@ export class AddIosTemplateComponent implements OnInit, OnDestroy {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'dynamips', 'templates']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'dynamips', 'templates']);
}
onImageChosen() {

2
src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.ts
View File

@ -46,7 +46,7 @@ export class CopyIosTemplateComponent implements OnInit {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'dynamips', 'templates']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'dynamips', 'templates']);
}
addTemplate() {

2
src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.ts
View File

@ -130,7 +130,7 @@ export class IosTemplateDetailsComponent implements OnInit {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'dynamips', 'templates']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'dynamips', 'templates']);
}
chooseSymbol() {

4
src/app/components/preferences/dynamips/ios-templates/ios-templates.component.html
View File

@ -6,7 +6,7 @@
*ngIf="server"
class="top-button"
class="cancel-button"
routerLink="/server/{{ server.id }}/preferences"
routerLink="/controller/{{ server.id }}/preferences"
mat-button
>
Back
@ -14,7 +14,7 @@
<button
*ngIf="server"
class="top-button"
routerLink="/server/{{ server.id }}/preferences/dynamips/templates/addtemplate"
routerLink="/controller/{{ server.id }}/preferences/dynamips/templates/addtemplate"
mat-raised-button
color="primary"
>

2
src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts
View File

@ -48,7 +48,7 @@ export class IosTemplatesComponent implements OnInit {
copyTemplate(template: IosTemplate) {
this.router.navigate([
'/server',
'/controller',
this.server.id,
'preferences',
'dynamips',

2
src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts
View File

@ -62,7 +62,7 @@ xdescribe('AddIouTemplateComponent', () => {
CommonModule,
NoopAnimationsModule,
RouterTestingModule.withRoutes([
{ path: 'server/1/preferences/iou/templates', component: AddIouTemplateComponent },
{ path: 'controller/1/preferences/iou/templates', component: AddIouTemplateComponent },
]),
],
providers: [

2
src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts
View File

@ -145,7 +145,7 @@ export class AddIouTemplateComponent implements OnInit, OnDestroy {
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'iou', 'templates']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'iou', 'templates']);
}
addTemplate() {

2
src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.ts
View File

@ -46,7 +46,7 @@ export class CopyIouTemplateComponent implements OnInit {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'iou', 'templates']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'iou', 'templates']);
}
addTemplate() {

2
src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.ts
View File

@ -69,7 +69,7 @@ export class IouTemplateDetailsComponent implements OnInit {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'iou', 'templates']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'iou', 'templates']);
}
onSave() {

4
src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.html
View File

@ -6,7 +6,7 @@
*ngIf="server"
class="top-button"
class="cancel-button"
routerLink="/server/{{ server.id }}/preferences"
routerLink="/controller/{{ server.id }}/preferences"
mat-button
>
Back
@ -14,7 +14,7 @@
<button
*ngIf="server"
class="top-button"
routerLink="/server/{{ server.id }}/preferences/iou/addtemplate"
routerLink="/controller/{{ server.id }}/preferences/iou/addtemplate"
mat-raised-button
color="primary"
>

2
src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts
View File

@ -46,6 +46,6 @@ export class IouTemplatesComponent implements OnInit {
}
copyTemplate(template: IouTemplate) {
this.router.navigate(['/server', this.server.id, 'preferences', 'iou', 'templates', template.template_id, 'copy']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'iou', 'templates', template.template_id, 'copy']);
}
}

16
src/app/components/preferences/preferences.component.html
View File

@ -7,14 +7,14 @@
<div class="default-content">
<div class="listcontainer mat-elevation-z8">
<mat-nav-list>
<mat-list-item routerLink="/server/{{ serverId }}/preferences/builtin"> Built-in </mat-list-item>
<mat-list-item routerLink="/server/{{ serverId }}/preferences/dynamips/templates"> Dynamips </mat-list-item>
<mat-list-item routerLink="/server/{{ serverId }}/preferences/iou/templates"> IOS on Unix </mat-list-item>
<mat-list-item routerLink="/server/{{ serverId }}/preferences/vpcs/templates"> VPCS </mat-list-item>
<mat-list-item routerLink="/server/{{ serverId }}/preferences/qemu/templates"> QEMU </mat-list-item>
<mat-list-item routerLink="/server/{{ serverId }}/preferences/virtualbox/templates"> VirtualBox </mat-list-item>
<mat-list-item routerLink="/server/{{ serverId }}/preferences/vmware/templates"> VMware </mat-list-item>
<mat-list-item routerLink="/server/{{ serverId }}/preferences/docker/templates"> Docker </mat-list-item>
<mat-list-item routerLink="/controller/{{ serverId }}/preferences/builtin"> Built-in </mat-list-item>
<mat-list-item routerLink="/controller/{{ serverId }}/preferences/dynamips/templates"> Dynamips </mat-list-item>
<mat-list-item routerLink="/controller/{{ serverId }}/preferences/iou/templates"> IOS on Unix </mat-list-item>
<mat-list-item routerLink="/controller/{{ serverId }}/preferences/vpcs/templates"> VPCS </mat-list-item>
<mat-list-item routerLink="/controller/{{ serverId }}/preferences/qemu/templates"> QEMU </mat-list-item>
<mat-list-item routerLink="/controller/{{ serverId }}/preferences/virtualbox/templates"> VirtualBox </mat-list-item>
<mat-list-item routerLink="/controller/{{ serverId }}/preferences/vmware/templates"> VMware </mat-list-item>
<mat-list-item routerLink="/controller/{{ serverId }}/preferences/docker/templates"> Docker </mat-list-item>
</mat-nav-list>
</div>
</div>

2
src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts
View File

@ -71,7 +71,7 @@ xdescribe('AddQemuVmTemplateComponent', () => {
CommonModule,
NoopAnimationsModule,
RouterTestingModule.withRoutes([
{ path: 'server/1/preferences/qemu/templates', component: AddQemuVmTemplateComponent },
{ path: 'controller/1/preferences/qemu/templates', component: AddQemuVmTemplateComponent },
]),
],
providers: [

2
src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts
View File

@ -169,7 +169,7 @@ export class AddQemuVmTemplateComponent implements OnInit {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'qemu', 'templates']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'qemu', 'templates']);
}
addTemplate() {

2
src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.ts
View File

@ -48,7 +48,7 @@ export class CopyQemuVmTemplateComponent implements OnInit {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'qemu', 'templates']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'qemu', 'templates']);
}
addTemplate() {

2
src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.html
View File

@ -5,7 +5,7 @@
<button
*ngIf="server"
class="top-button"
routerLink="/server/{{ server.id }}/preferences/qemu/templates"
routerLink="/controller/{{ server.id }}/preferences/qemu/templates"
mat-raised-button
color="primary"
>

2
src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts
View File

@ -134,7 +134,7 @@ export class QemuVmTemplateDetailsComponent implements OnInit {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'qemu', 'templates']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'qemu', 'templates']);
}
onSave() {

4
src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.html
View File

@ -6,7 +6,7 @@
*ngIf="server"
class="top-button"
class="cancel-button"
routerLink="/server/{{ server.id }}/preferences"
routerLink="/controller/{{ server.id }}/preferences"
mat-button
>
Back
@ -14,7 +14,7 @@
<button
*ngIf="server"
class="top-button"
routerLink="/server/{{ server.id }}/preferences/qemu/addtemplate"
routerLink="/controller/{{ server.id }}/preferences/qemu/addtemplate"
mat-raised-button
color="primary"
>

2
src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts
View File

@ -46,6 +46,6 @@ export class QemuVmTemplatesComponent implements OnInit {
}
copyTemplate(template: QemuTemplate) {
this.router.navigate(['/server', this.server.id, 'preferences', 'qemu', 'templates', template.template_id, 'copy']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'qemu', 'templates', template.template_id, 'copy']);
}
}

2
src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts
View File

@ -52,7 +52,7 @@ describe('AddVirtualBoxTemplateComponent', () => {
CommonModule,
NoopAnimationsModule,
RouterTestingModule.withRoutes([
{ path: 'server/1/preferences/virtualbox/templates', component: AddVirtualBoxTemplateComponent },
{ path: 'controller/1/preferences/virtualbox/templates', component: AddVirtualBoxTemplateComponent },
]),
],
providers: [

2
src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.ts
View File

@ -52,7 +52,7 @@ export class AddVirtualBoxTemplateComponent implements OnInit {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'virtualbox', 'templates']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'virtualbox', 'templates']);
}
addTemplate() {

2
src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts
View File

@ -115,7 +115,7 @@ export class VirtualBoxTemplateDetailsComponent implements OnInit {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'virtualbox', 'templates']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'virtualbox', 'templates']);
}
onSave() {

4
src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.html
View File

@ -6,7 +6,7 @@
*ngIf="server"
class="top-button"
class="cancel-button"
routerLink="/server/{{ server.id }}/preferences"
routerLink="/controller/{{ server.id }}/preferences"
mat-button
>
Back
@ -14,7 +14,7 @@
<button
*ngIf="server"
class="top-button"
routerLink="/server/{{ server.id }}/preferences/virtualbox/addtemplate"
routerLink="/controller/{{ server.id }}/preferences/virtualbox/addtemplate"
mat-raised-button
color="primary"
>

2
src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.ts
View File

@ -52,7 +52,7 @@ export class AddVmwareTemplateComponent implements OnInit {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'vmware', 'templates']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'vmware', 'templates']);
}
addTemplate() {

2
src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts
View File

@ -53,7 +53,7 @@ describe('AddVmwareTemplateComponent', () => {
CommonModule,
NoopAnimationsModule,
RouterTestingModule.withRoutes([
{ path: 'server/1/preferences/vmware/templates', component: AddVmwareTemplateComponent },
{ path: 'controller/1/preferences/vmware/templates', component: AddVmwareTemplateComponent },
]),
],
providers: [

2
src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts
View File

@ -68,7 +68,7 @@ export class VmwareTemplateDetailsComponent implements OnInit {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'vmware', 'templates']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'vmware', 'templates']);
}
onSave() {

4
src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.html
View File

@ -6,7 +6,7 @@
*ngIf="server"
class="top-button"
class="cancel-button"
routerLink="/server/{{ server.id }}/preferences"
routerLink="/controller/{{ server.id }}/preferences"
mat-button
>
Back
@ -14,7 +14,7 @@
<button
*ngIf="server"
class="top-button"
routerLink="/server/{{ server.id }}/preferences/vmware/addtemplate"
routerLink="/controller/{{ server.id }}/preferences/vmware/addtemplate"
mat-raised-button
color="primary"
>

2
src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec.ts
View File

@ -56,7 +56,7 @@ describe('AddVpcsTemplateComponent', () => {
CommonModule,
NoopAnimationsModule,
RouterTestingModule.withRoutes([
{ path: 'server/1/preferences/vpcs/templates', component: AddVpcsTemplateComponent },
{ path: 'controller/1/preferences/vpcs/templates', component: AddVpcsTemplateComponent },
]),
],
providers: [

2
src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts
View File

@ -51,7 +51,7 @@ export class AddVpcsTemplateComponent implements OnInit {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'vpcs', 'templates']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'vpcs', 'templates']);
}
addTemplate() {

2
src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.ts
View File

@ -57,7 +57,7 @@ export class VpcsTemplateDetailsComponent implements OnInit {
}
goBack() {
this.router.navigate(['/server', this.server.id, 'preferences', 'vpcs', 'templates']);
this.router.navigate(['/controller', this.server.id, 'preferences', 'vpcs', 'templates']);
}
onSave() {

4
src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.html
View File

@ -6,7 +6,7 @@
*ngIf="server"
class="top-button"
class="cancel-button"
routerLink="/server/{{ server.id }}/preferences"
routerLink="/controller/{{ server.id }}/preferences"
mat-button
>
Back
@ -14,7 +14,7 @@
<button
*ngIf="server"
class="top-button"
routerLink="/server/{{ server.id }}/preferences/vpcs/addtemplate"
routerLink="/controller/{{ server.id }}/preferences/vpcs/addtemplate"
mat-raised-button
color="primary"
>

16
src/app/components/project-map/project-map.component.html
View File

@ -68,7 +68,7 @@
</div>
<div>
<button
matTooltip="Toggle topology/servers summary"
matTooltip="Toggle topology/controllers summary"
matTooltipClass="custom-tooltip"
[ngClass]="{
unmarkedLight: !isTopologySummaryVisible && isLightThemeEnabled,
@ -83,19 +83,19 @@
<!-- GNS3 menu -->
<mat-menu #mainMenu="matMenu" [overlapTrigger]="false">
<button mat-menu-item [routerLink]="['/server', server.id, 'projects']">
<button mat-menu-item [routerLink]="['/controller', server.id, 'projects']">
<mat-icon>work</mat-icon>
<span>Go to projects</span>
</button>
<button mat-menu-item [routerLink]="['/servers']">
<button mat-menu-item [routerLink]="['/controllers']">
<mat-icon>developer_board</mat-icon>
<span>Go to servers</span>
<span>Go to controllers</span>
</button>
<button mat-menu-item routerLink="/server/{{ server.id }}/preferences">
<button mat-menu-item routerLink="/controller/{{ server.id }}/preferences">
<mat-icon>settings_applications</mat-icon>
<span>Go to preferences</span>
</button>
<button mat-menu-item routerLink="/server/{{ server.id }}/systemstatus">
<button mat-menu-item routerLink="/controller/{{ server.id }}/systemstatus">
<mat-icon>info</mat-icon>
<span>Go to system status</span>
</button>
@ -103,7 +103,7 @@
<mat-icon>settings</mat-icon>
<span>Go to settings</span>
</button>
<button mat-menu-item [routerLink]="['/server', server.id, 'image-manager']">
<button mat-menu-item [routerLink]="['/controller', server.id, 'image-manager']">
<mat-icon>collections</mat-icon>
<span>Image manager</span>
</button>
@ -166,7 +166,7 @@
Show console </mat-checkbox
><br />
<mat-checkbox [ngModel]="isTopologySummaryVisible" (change)="toggleShowTopologySummary($event.checked)">
Show topology/servers summary </mat-checkbox
Show topology/controllers summary </mat-checkbox
><br />
<mat-checkbox [ngModel]="notificationsVisibility" (change)="toggleNotifications($event.checked)">
Show notifications </mat-checkbox

12
src/app/components/project-map/project-map.component.ts
View File

@ -334,7 +334,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
from(this.serverService.get(server_id))
.pipe(
mergeMap((server: Server) => {
if (!server) this.router.navigate(['/servers']);
if (!server) this.router.navigate(['/controllers']);
this.server = server;
return this.projectService.get(server, paramMap.get('project_id')).pipe(
map((project) => {
@ -344,7 +344,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
}),
mergeMap((project: Project) => {
this.project = project;
if (!project) this.router.navigate(['/servers']);
if (!project) this.router.navigate(['/controllers']);
this.projectService.open(this.server, this.project.project_id);
this.title.setTitle(this.project.name);
@ -416,7 +416,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
Mousetrap.bind('ctrl+shift+s', (event: Event) => {
event.preventDefault();
this.router.navigate(['/server', this.server.id, 'preferences']);
this.router.navigate(['/controller', this.server.id, 'preferences']);
});
Mousetrap.bind('del', (event: Event) => {
@ -974,7 +974,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
const bottomSheetSubscription = bottomSheetRef.afterDismissed().subscribe((result: boolean) => {
if (result) {
this.projectService.open(this.server, uuid).subscribe(() => {
this.router.navigate(['/server', this.server.id, 'project', uuid]);
this.router.navigate(['/controller', this.server.id, 'project', uuid]);
});
}
});
@ -1043,7 +1043,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
const bottomSheetSubscription = bottomSheetRef.afterDismissed().subscribe((result: boolean) => {
if (result) {
this.projectService.close(this.server, this.project.project_id).subscribe(() => {
this.router.navigate(['/server', this.server.id, 'projects']);
this.router.navigate(['/controller', this.server.id, 'projects']);
});
}
});
@ -1056,7 +1056,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
const bottomSheetSubscription = bottomSheetRef.afterDismissed().subscribe((result: boolean) => {
if (result) {
this.projectService.delete(this.server, this.project.project_id).subscribe(() => {
this.router.navigate(['/server', this.server.id, 'projects']);
this.router.navigate(['/controller', this.server.id, 'projects']);
});
}
});

2
src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts
View File

@ -74,7 +74,7 @@ export class AddBlankProjectDialogComponent implements OnInit {
.subscribe((project: Project) => {
this.dialogRef.close();
this.toasterService.success(`Project ${project.name} added`);
this.router.navigate(['/server', this.server.id, 'project', project.project_id]);
this.router.navigate(['/controller', this.server.id, 'project', project.project_id]);
});
}

2
src/app/components/projects/projects.component.html
View File

@ -25,7 +25,7 @@
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Name </mat-header-cell>
<mat-cell *matCellDef="let row">
<a [routerLink]="['/server', server.id, 'project', row.project_id]" class="table-link">{{ row.name }}</a>
<a [routerLink]="['/controller', server.id, 'project', row.project_id]" class="table-link">{{ row.name }}</a>
</mat-cell>
</ng-container>

8
src/app/components/projects/projects.component.ts
View File

@ -51,7 +51,7 @@ export class ProjectsComponent implements OnInit {
ngOnInit() {
this.server = this.route.snapshot.data['server'];
if (!this.server) this.router.navigate(['/servers']);
if (!this.server) this.router.navigate(['/controllers']);
this.recentlyOpenedProjectService.setServerIdProjectList(this.server.id.toString());
this.refresh();
@ -67,13 +67,13 @@ export class ProjectsComponent implements OnInit {
goToPreferences() {
this.router
.navigate(['/server', this.server.id, 'preferences'])
.navigate(['/controller', this.server.id, 'preferences'])
.catch((error) => this.toasterService.error('Cannot navigate to the preferences'));
}
goToSystemStatus() {
this.router
.navigate(['/server', this.server.id, 'systemstatus'])
.navigate(['/controller', this.server.id, 'systemstatus'])
.catch((error) => this.toasterService.error('Cannot navigate to the system status'));
}
@ -181,7 +181,7 @@ export class ProjectsComponent implements OnInit {
const bottomSheetSubscription = bottomSheetRef.afterDismissed().subscribe((result: boolean) => {
if (result) {
this.projectService.open(this.server, uuid).subscribe(() => {
this.router.navigate(['/server', this.server.id, 'project', uuid]);
this.router.navigate(['/controller', this.server.id, 'project', uuid]);
});
}
});

2
src/app/components/servers/servers.component.html
View File

@ -15,7 +15,7 @@
<mat-cell *matCellDef="let row">
<a
*ngIf="getServerStatus(row) === 'running' || row.location === 'remote' || row.location === 'bundled'"
[routerLink]="['/server', row.id, 'login']"
[routerLink]="['/controller', row.id, 'login']"
class="table-link"
>{{ row.name }}</a
>

2
src/app/components/servers/servers.component.ts
View File

@ -110,7 +110,7 @@ export class ServersComponent implements OnInit, OnDestroy {
}
openProjects(server) {
this.router.navigate(['/server', server.id, 'projects']);
this.router.navigate(['/controller', server.id, 'projects']);
}
createModal() {

2
src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.html
View File

@ -5,7 +5,7 @@
class="top-button"
color="accent"
(click)="onNoClick()"
routerLink="/server/{{ server?.id }}/project/{{ project?.project_id }}/snapshots"
routerLink="/controller/{{ server?.id }}/project/{{ project?.project_id }}/snapshots"
>
Go to snapshots
</button>

2
src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts
View File

@ -80,7 +80,7 @@ describe('ListOfSnapshotsComponent', () => {
NoopAnimationsModule,
RouterTestingModule.withRoutes([
{
path: 'server/:server_id/project/:project_id/snapshots',
path: 'controller/:server_id/project/:project_id/snapshots',
component: ListOfSnapshotsComponent,
resolve: { server: ServerResolve },
},

2
src/app/components/template/template-list-dialog/template-list-dialog.component.html
View File

@ -5,7 +5,7 @@
class="top-button"
color="accent"
(click)="onNoClick()"
routerLink="/server/{{ server?.id }}/preferences"
routerLink="/controller/{{ server?.id }}/preferences"
>
Go to template preferences
</button>

2
src/app/guards/login-guard.ts
View File

@ -19,7 +19,7 @@ export class LoginGuard implements CanActivate {
if (server.authToken && !server.tokenExpired) {
return true;
}
this.router.navigate(['/server', server.id, 'login'], { queryParams: { returnUrl: state.url } });
this.router.navigate(['/controller', server.id, 'login'], { queryParams: { returnUrl: state.url } });
});
}
}

4
src/app/layouts/default-layout/default-layout.component.html
View File

@ -2,7 +2,7 @@
<mat-toolbar color="primary">
<button mat-icon-button><mat-icon svgIcon="gns3"></mat-icon></button>
<button mat-button routerLink="/servers">Controllers</button>
<button mat-button routerLink="/controllers">Controllers</button>
<button *ngIf="!recentlyOpenedProjectId && serverIdProjectList" mat-button (click)="listProjects()">
Projects
@ -14,7 +14,7 @@
<span class="fill-space"></span>
<button mat-button *ngIf="!isLoginPage && router.url !='/servers'" [matMenuTriggerFor]="menu">
<button mat-button *ngIf="!isLoginPage && router.url !='/controllers'" [matMenuTriggerFor]="menu">
<mat-icon>more_vert</mat-icon>
</button>

14
src/app/layouts/default-layout/default-layout.component.ts
View File

@ -70,14 +70,14 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
}
goToUserInfo() {
let serverId = this.router.url.split("/server/")[1].split("/")[0];
let serverId = this.router.url.split("/controller/")[1].split("/")[0];
this.serverService.get(+serverId).then((server: Server) => {
this.router.navigate(['/server', server.id, 'loggeduser']);
this.router.navigate(['/controller', server.id, 'loggeduser']);
});
}
goToDocumentation() {
let serverId = this.router.url.split("/server/")[1].split("/")[0];
let serverId = this.router.url.split("/controller/")[1].split("/")[0];
this.serverService.get(+serverId).then((server: Server) => {
(window as any).open(`http://${server.host}:${server.port}/docs`);
});
@ -92,22 +92,22 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
}
logout() {
let serverId = this.router.url.split("/server/")[1].split("/")[0];
let serverId = this.router.url.split("/controller/")[1].split("/")[0];
this.serverService.get(+serverId).then((server: Server) => {
server.authToken = null;
this.serverService.update(server).then(val => this.router.navigate(['/server', server.id, 'login']));
this.serverService.update(server).then(val => this.router.navigate(['/controller', server.id, 'login']));
});
}
listProjects() {
this.router
.navigate(['/server', this.serverIdProjectList, 'projects'])
.navigate(['/controller', this.serverIdProjectList, 'projects'])
.catch((error) => this.toasterService.error('Cannot list projects'));
}
backToProject() {
this.router
.navigate(['/server', this.recentlyOpenedServerId, 'project', this.recentlyOpenedProjectId])
.navigate(['/controller', this.recentlyOpenedServerId, 'project', this.recentlyOpenedProjectId])
.catch((error) => this.toasterService.error('Cannot navigate to the last opened project'));
}