Merge pull request #372 from cobbler/feature/group-actions

Cobbler-Frontend: Groups actions under /actions route
cobbler · Nov 13, 2024 · de00cda · de00cda
2 parents 802a7a8 + 10b00fd
commit de00cda
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 56 deletions.
diff --git a/projects/cobbler-frontend/src/app/app-routing.module.ts b/projects/cobbler-frontend/src/app/app-routing.module.ts
@@ -56,6 +56,61 @@ export const routes: Routes = [
     component: AppManageComponent,
     canActivate: [AuthGuardService],
   },
+  {
+    path: 'actions',
+    children: [
+      {
+        path: 'import',
+        component: ImportDVDComponent,
+        canActivate: [AuthGuardService],
+      },
+      {
+        path: 'sync',
+        component: SyncComponent,
+        canActivate: [AuthGuardService],
+      },
+      {
+        path: 'reposync',
+        component: RepoSyncComponent,
+        canActivate: [AuthGuardService],
+      },
+      {
+        path: 'buildiso',
+        component: BuildISOComponent,
+        canActivate: [AuthGuardService],
+      },
+      {
+        path: 'check',
+        component: CheckSysComponent,
+        canActivate: [AuthGuardService],
+      },
+      {
+        path: 'status',
+        component: StatusComponent,
+        canActivate: [AuthGuardService],
+      },
+      {
+        path: 'hardlink',
+        component: HardlinkComponent,
+        canActivate: [AuthGuardService],
+      },
+      {
+        path: 'mkloaders',
+        component: MkloadersComponent,
+        canActivate: [AuthGuardService],
+      },
+      {
+        path: 'validate-autoinstalls',
+        component: ValidateAutoinstallsComponent,
+        canActivate: [AuthGuardService],
+      },
+      {
+        path: 'replicate',
+        component: ReplicateComponent,
+        canActivate: [AuthGuardService],
+      },
+    ],
+  },
   {
     path: 'items',
     children: [
@@ -176,42 +231,6 @@ export const routes: Routes = [
     component: SettingsViewComponent,
     canActivate: [AuthGuardService],
   },
-  {
-    path: 'import',
-    component: ImportDVDComponent,
-    canActivate: [AuthGuardService],
-  },
-  { path: 'sync', component: SyncComponent, canActivate: [AuthGuardService] },
-  {
-    path: 'reposync',
-    component: RepoSyncComponent,
-    canActivate: [AuthGuardService],
-  },
-  {
-    path: 'buildiso',
-    component: BuildISOComponent,
-    canActivate: [AuthGuardService],
-  },
-  {
-    path: 'check',
-    component: CheckSysComponent,
-    canActivate: [AuthGuardService],
-  },
-  {
-    path: 'status',
-    component: StatusComponent,
-    canActivate: [AuthGuardService],
-  },
-  {
-    path: 'hardlink',
-    component: HardlinkComponent,
-    canActivate: [AuthGuardService],
-  },
-  {
-    path: 'mkloaders',
-    component: MkloadersComponent,
-    canActivate: [AuthGuardService],
-  },
   {
     path: 'events',
     component: AppEventsComponent,
@@ -222,16 +241,6 @@ export const routes: Routes = [
     component: SignaturesComponent,
     canActivate: [AuthGuardService],
   },
-  {
-    path: 'validate-autoinstalls',
-    component: ValidateAutoinstallsComponent,
-    canActivate: [AuthGuardService],
-  },
-  {
-    path: 'replicate',
-    component: ReplicateComponent,
-    canActivate: [AuthGuardService],
-  },
   { path: '404', component: NotFoundComponent },
   { path: '**', redirectTo: '/404' },
 ];
diff --git a/projects/cobbler-frontend/src/app/manage-menu/manage-menu.component.html b/projects/cobbler-frontend/src/app/manage-menu/manage-menu.component.html
@@ -134,7 +134,7 @@ <h2 matSubheader>Actions</h2>
       <a
         mat-list-item
         class="nav-link"
-        [routerLink]="['/import']"
+        [routerLink]="['/actions', 'import']"
         (click)="sidenav.close()"
       >
         <b class="symbol">&#9881;</b>
@@ -143,7 +143,7 @@ <h2 matSubheader>Actions</h2>
       <a
         mat-list-item
         class="nav-link"
-        [routerLink]="['/sync']"
+        [routerLink]="['/actions', 'sync']"
         (click)="sidenav.close()"
       >
         <b class="symbol">&#9881;</b>
@@ -152,23 +152,23 @@ <h2 matSubheader>Actions</h2>
       <a
         mat-list-item
         class="nav-link"
-        [routerLink]="['/reposync']"
+        [routerLink]="['/actions', 'reposync']"
         (click)="sidenav.close()"
         ><b class="symbol">&#9881;</b>
         Reposync
       </a>
       <a
         mat-list-item
         class="nav-link"
-        [routerLink]="['/buildiso']"
+        [routerLink]="['/actions', 'buildiso']"
         (click)="sidenav.close()"
         ><b class="symbol">&#9881;</b>
         Build ISO
       </a>
       <a
         mat-list-item
         class="nav-link"
-        [routerLink]="['/hardlink']"
+        [routerLink]="['/actions', 'hardlink']"
         (click)="sidenav.close()"
       >
         <b class="symbol">&#9881;</b>
@@ -177,7 +177,7 @@ <h2 matSubheader>Actions</h2>
       <a
         mat-list-item
         class="nav-link"
-        [routerLink]="['/mkloaders']"
+        [routerLink]="['/actions', 'mkloaders']"
         (click)="sidenav.close()"
       >
         <b class="symbol">&#9881;</b>
@@ -186,7 +186,7 @@ <h2 matSubheader>Actions</h2>
       <a
         mat-list-item
         class="nav-link"
-        [routerLink]="['/validate-autoinstalls']"
+        [routerLink]="['/actions', 'validate-autoinstalls']"
         (click)="sidenav.close()"
       >
         <b class="symbol">&#9881;</b>
@@ -195,7 +195,7 @@ <h2 matSubheader>Actions</h2>
       <a
         mat-list-item
         class="nav-link"
-        [routerLink]="['/replicate']"
+        [routerLink]="['/actions', 'replicate']"
         (click)="sidenav.close()"
       >
         <b class="symbol">&#9881;</b>
@@ -206,7 +206,7 @@ <h2 matSubheader>Cobbler</h2>
       <a
         mat-list-item
         class="nav-link"
-        [routerLink]="['/check']"
+        [routerLink]="['/actions', 'check']"
         (click)="sidenav.close()"
       >
         <b class="symbol">&#8646;</b>
@@ -215,7 +215,7 @@ <h2 matSubheader>Cobbler</h2>
       <a
         mat-list-item
         class="nav-link"
-        [routerLink]="['/status']"
+        [routerLink]="['/actions', 'status']"
         (click)="sidenav.close()"
       >
         <b class="symbol">&#8646;</b>