Clean

Author: oodamien

ui/src/app/about/info/info.component.html

@@ -136,10 +136,6 @@ <h3>{{ 'about.info.runtimeSkipperDeployer' | translate }}</h3>
           <strong>{{ 'about.info.platformType' | translate }}: </strong>
           {{ about.runtimeEnvironment.appDeployer.platformType || 'N/A' }}
         </li>
-        <li>
-          <strong>{{ 'about.info.springBootVersion' | translate }}: </strong>
-          {{ about.runtimeEnvironment.appDeployer.springBootVersion || 'N/A' }}
-        </li>
         <li>
           <strong>{{ 'about.info.springVersion' | translate }}: </strong>
           {{ about.runtimeEnvironment.appDeployer.springVersion || 'N/A' }}
@@ -203,9 +199,6 @@ <h3>{{ 'about.info.runtimeTaskLauncher' | translate }}</h3>
               <li>
                 <strong>{{ 'about.info.platformType' | translate }}: </strong> {{ item.platformType }}
               </li>
-              <li>
-                <strong>{{ 'about.info.springBootVersion' | translate }}: </strong> {{ item.springBootVersion }}
-              </li>
               <li>
                 <strong>{{ 'about.info.springVersion' | translate }}: </strong> {{ item.springVersion }}
               </li>

ui/src/app/apps/add/register/register.component.ts

@@ -14,7 +14,6 @@ import {TranslateService} from '@ngx-translate/core';
 export class RegisterComponent implements OnInit {
   forms: UntypedFormGroup[] = [];
   applicationTypes = ApplicationType;
-  bootVersions: Array<string>;
   defaultBoot: string;
   submitted = false;
   isImporting = false;
@@ -28,11 +27,7 @@ export class RegisterComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
-    this.appService.getBootVersions().subscribe((data: any) => {
-      this.bootVersions = data.versions;
-      this.defaultBoot = data.defaultSchemaVersion;
-      this.newForm();
-    });
+    this.newForm();
   }
 
   register(): void {

ui/src/app/apps/app/app.component.html

@@ -68,14 +68,6 @@ <h1 class="page-title">
                   <span *ngIf="defaultApp" class="label">{{ detailedApp.version }}</span>
                 </div>
               </div>
-              <div class="row">
-                <div class="key">{{ 'applications.main.bootVersion' | translate }}</div>
-                <div class="value">
-                  <span *ngIf="defaultApp" class="label">{{
-                    'applications.main.bootVersions.' + detailedApp.bootVersion | translate
-                  }}</span>
-                </div>
-              </div>
               <div *ngIf="detailedApp.uri" class="row">
                 <div class="key">{{ 'applications.main.uri' | translate }}</div>
                 <div class="value">{{ detailedApp.uri }}</div>

ui/src/app/apps/app/app.component.ts

@@ -75,7 +75,7 @@ export class AppComponent implements OnInit {
       this.detailedApp.version = app.version;
       this.detailedApp.defaultVersion = app.defaultVersion;
     }
-    this.appsService.getApp(app.name, app.type, app.version, app.version).subscribe(
+    this.appsService.getApp(app.name, app.type, app.version).subscribe(
       (detailedApp: DetailedApp) => {
         this.tooManyProperties = detailedApp.options.length > 50;
         this.showAllProperties = !this.tooManyProperties;

ui/src/app/shared/api/app.service.spec.ts

@@ -39,10 +39,10 @@ describe('shared/api/app.service.ts', () => {
 
   it('getApp with spring boot version in parameter', () => {
     mockHttp.get.and.returnValue(of(jsonData));
-    appService.getApp('foo', 'processor' as any as ApplicationType, '', '3');
+    appService.getApp('foo', 'processor' as any as ApplicationType, '');
     const httpUri = mockHttp.get.calls.mostRecent().args[0];
     const headerArgs = mockHttp.get.calls.mostRecent().args[1].headers;
-    expect(httpUri).toEqual('/apps/processor/foo?bootVersion=3');
+    expect(httpUri).toEqual('/apps/processor/foo');
     expect(headerArgs.get('Content-Type')).toEqual('application/json');
     expect(headerArgs.get('Accept')).toEqual('application/json');
   });

ui/src/app/shared/api/app.service.ts

@@ -42,17 +42,11 @@ export class AppService {
       .pipe(map(AppPage.parse), catchError(ErrorUtils.catchError));
   }
 
-  getApp(
-    name: string,
-    type: ApplicationType,
-    appVersion?: string,
-    bootVersion?: string
-  ): Observable<DetailedApp | unknown> {
+  getApp(name: string, type: ApplicationType, appVersion?: string): Observable<DetailedApp | unknown> {
     const headers = HttpUtils.getDefaultHttpHeaders();
-    const bootVersionConfig = bootVersion ? `?bootVersion=${bootVersion}` : ``;
-    let url = UrlUtilities.calculateBaseApiUrl() + `apps/${type}/${name}${bootVersionConfig}`;
+    let url = UrlUtilities.calculateBaseApiUrl() + `apps/${type}/${name}`;
     if (appVersion) {
-      url = UrlUtilities.calculateBaseApiUrl() + `apps/${type}/${name}/${appVersion}${bootVersionConfig}`;
+      url = UrlUtilities.calculateBaseApiUrl() + `apps/${type}/${name}/${appVersion}`;
     }
     return this.httpClient.get(url, {headers}).pipe(map(DetailedApp.parse), catchError(ErrorUtils.catchError));
   }
@@ -65,12 +59,6 @@ export class AppService {
     );
   }
 
-  getBootVersions(): Observable<any> {
-    const headers = HttpUtils.getDefaultHttpHeaders();
-    const url = UrlUtilities.calculateBaseApiUrl() + `schema/versions`;
-    return this.httpClient.get(url, {headers}).pipe(catchError(ErrorUtils.catchError));
-  }
-
   unregisterApp(app: App): Observable<any> {
     const headers = HttpUtils.getDefaultHttpHeaders();
     let url = UrlUtilities.calculateBaseApiUrl() + `apps/${app.type}/${app.name}`;

ui/src/app/shared/model/app.model.ts

@@ -30,7 +30,6 @@ export class App {
   version: string;
   defaultVersion: boolean;
   versions: Array<string>;
-  bootVersion?: string;
 
   public static parse(input: any): App {
     const app = new App();
@@ -40,7 +39,6 @@ export class App {
     app.version = input.version;
     app.defaultVersion = input.defaultVersion;
     app.versions = input.versions;
-    app.bootVersion = input.bootVersion;
     return app;
   }
 

ui/src/app/shared/model/detailed-app.model.ts

@@ -81,7 +81,6 @@ export class DetailedApp extends App {
     app.name = input.name;
     app.type = input.type as ApplicationType;
     app.uri = input.uri;
-    app.bootVersion = input.bootVersion;
     app.version = input.version;
     app.versions = input.versions;
     app.defaultVersion = input.defaultVersion;

ui/src/app/shared/store/about.reducer.ts

@@ -22,7 +22,6 @@ export interface RuntimeEnvironmentState {
   platformHostVersion: string;
   platformSpecificInfo: any;
   platformType: string;
-  springBootVersion: string;
   springVersion: string;
 }
 

ui/src/app/shared/store/about.support.ts

@@ -31,7 +31,6 @@ const parseRuntimeEnvironment = (input: any): RuntimeEnvironmentState => ({
   platformHostVersion: input.platformHostVersion,
   platformSpecificInfo: parsePlatformSpecificInfo(input.platformSpecificInfo),
   platformType: input.platformType,
-  springBootVersion: input.springBootVersion,
   springVersion: input.springVersion
 });
 

ui/src/app/tests/api/app.service.mock.ts

@@ -26,13 +26,6 @@ export class AppServiceMock {
     return of(GET_APP).pipe(delay(1), map(DetailedApp.parse), catchError(ErrorUtils.catchError));
   }
 
-  getBootVersions(): Observable<any> {
-    return of({
-      defaultSchemaVersion: '2',
-      versions: ['2', '3']
-    });
-  }
-
   getAppVersions(name: string, type: ApplicationType): Observable<App[]> {
     return of(GET_APP_VERSIONS).pipe(
       map(AppPage.parse),

ui/src/app/tests/data/about.ts

@@ -28,7 +28,6 @@ export const LOAD = {
       platformHostVersion: '',
       platformSpecificInfo: {default: 'local'},
       platformType: 'Skipper Managed',
-      springBootVersion: '2.3.2.RELEASE',
       springVersion: '5.2.8.RELEASE'
     },
     taskLaunchers: [
@@ -42,7 +41,6 @@ export const LOAD = {
         platformHostVersion: '4.19.76-linuxkit',
         platformSpecificInfo: {},
         platformType: 'Local',
-        springBootVersion: '2.3.2.RELEASE',
         springVersion: '5.2.8.RELEASE'
       }
     ]