feat: change routing for settings (#799)

* feat: change routing for settings * refactor: routing settings * refactor: remove old ui-stuff related to settings --------- Co-authored-by: Stephan Girod <[email protected]>
liimaorg · Nov 19, 2024 · 4bddb3e · 4bddb3e
1 parent caf3d22
commit 4bddb3e
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 580 deletions.
diff --git a/AMW_angular/io/src/app/navigation/navigation.component.ts b/AMW_angular/io/src/app/navigation/navigation.component.ts
@@ -44,7 +44,7 @@ import { NgbCollapse } from '@ng-bootstrap/ng-bootstrap';
               <a class="nav-link" href="#/deployments/">Deploy</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="/AMW_web/pages/settings.xhtml">Settings</a>
+              <a class="nav-link" href="#/settings">Settings</a>
             </li>
             <li class="nav-item">
               <a class="nav-link" href="{{ logoutUrl }}">Logout</a>

diff --git a/AMW_angular/io/src/app/settings/settings.component.spec.ts b/AMW_angular/io/src/app/settings/settings.component.spec.ts
@@ -1,9 +1,8 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { RouterTestingModule } from '@angular/router/testing';
 import { SettingsComponent } from './settings.component';
-import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
-import { HttpClient, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 describe('SettingsComponent', () => {
   let component: SettingsComponent;

diff --git a/AMW_angular/io/src/app/settings/settings.routes.ts b/AMW_angular/io/src/app/settings/settings.routes.ts
@@ -14,6 +14,7 @@ export const settingsRoutes = [
     component: SettingsComponent,
     title: 'Settings',
     children: [
+      { path: '', component: EnvironmentsPageComponent },
       { path: 'releases', component: ReleasesComponent },
       { title: 'Settings - Tags', path: 'tags', component: TagsComponent },
       {

diff --git a/...rc/main/java/ch/puzzle/itc/mobiliar/presentation/environments/EnvironmentsController.java b/...rc/main/java/ch/puzzle/itc/mobiliar/presentation/environments/EnvironmentsController.java
diff --git a/.../main/java/ch/puzzle/itc/mobiliar/presentation/environments/EnvironmentsDataProvider.java b/.../main/java/ch/puzzle/itc/mobiliar/presentation/environments/EnvironmentsDataProvider.java
diff --git a/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/settings/SettingsDataProvider.java b/AMW_web/src/main/java/ch/puzzle/itc/mobiliar/presentation/settings/SettingsDataProvider.java