I removed static version and define in evviroment file

This commit is contained in:
Rajnikant 2022-05-23 11:06:00 +05:30
parent 0120a1281c
commit 434bf57cd1
9 changed files with 14 additions and 5 deletions

View File

@ -1,4 +1,5 @@
import { Injectable } from '@angular/core';
import { environment } from 'environments/environment';
import { Observable } from 'rxjs';
import { Appliance } from '../models/appliance';
import { Server } from '../models/server';
@ -17,7 +18,7 @@ export class ApplianceService {
}
getUploadPath(server: Server, emulator: string, filename: string) {
return `${server.protocol}//${server.host}:${server.port}/v3/images/upload/${filename}`;
return `${server.protocol}//${server.host}:${server.port}/${environment.current_Version}/images/upload/${filename}`;
}
updateAppliances(server: Server): Observable<Appliance[]> {

View File

@ -8,6 +8,7 @@ import { getTestServer } from './testing';
import { ImageManagerService } from './image-manager.service';
import { Image } from "../models/images";
import { environment } from 'environments/environment';
describe('ImageManagerService', () => {
let httpClient: HttpClient;
@ -34,7 +35,7 @@ describe('ImageManagerService', () => {
it('should be get Images', inject([ImageManagerService], (service: ImageManagerService) => {
service.getImages(server).subscribe();
const req = httpTestingController.expectOne('http://127.0.0.1:3080/v3/images');
const req = httpTestingController.expectOne(`http://127.0.0.1:3080/${environment.current_Version}/images`);
expect(req.request.method).toEqual('GET');
expect(service).toBeTruthy();
}));
@ -53,7 +54,7 @@ describe('ImageManagerService', () => {
};
service.uploadedImage(server, install_appliance, image.filename, image).subscribe();
const req = httpTestingController.expectOne('http://127.0.0.1:3080/v3/images/upload/?install_appliances=true');
const req = httpTestingController.expectOne(`http://127.0.0.1:3080/${environment.current_Version}/images/upload/?install_appliances=true`);
expect(req.request.method).toEqual('POST');
expect(req.request.body).toEqual(image);
}));

View File

@ -1,4 +1,5 @@
import { Injectable } from '@angular/core';
import { environment } from 'environments/environment';
import { Observable } from 'rxjs';
import { IosImage } from '../models/images/ios-image';
import { Server } from '../models/server';
@ -14,7 +15,7 @@ export class IosService {
}
getImagePath(server: Server, filename: string): string {
return `${server.protocol}//${server.host}:${server.port}/v3/images/upload/${filename}`;
return `${server.protocol}//${server.host}:${server.port}/${environment.current_Version}/images/upload/${filename}`;
}
getTemplates(server: Server): Observable<IosTemplate[]> {

View File

@ -1,4 +1,5 @@
import { Injectable } from '@angular/core';
import { environment } from 'environments/environment';
import { Observable } from 'rxjs';
import { IouImage } from '../models/iou/iou-image';
import { Server } from '../models/server';
@ -22,7 +23,7 @@ export class IouService {
}
getImagePath(server: Server, filename: string): string {
return `${server.protocol}//${server.host}:${server.port}/v3/images/upload/${filename}`;
return `${server.protocol}//${server.host}:${server.port}/${environment.current_Version}/images/upload/${filename}`;
}
addTemplate(server: Server, iouTemplate: any): Observable<any> {

View File

@ -2,4 +2,5 @@ export const environment = {
solarputty_download_url: '',
production: true,
electron: true,
current_Version:'v3'
};

View File

@ -2,4 +2,5 @@ export const environment = {
production: false,
electron: true,
solarputty_download_url: '',
current_Version:'v3'
};

View File

@ -3,4 +3,5 @@ export const environment = {
electron: false,
githubio: true,
solarputty_download_url: '',
current_Version:'v3'
};

View File

@ -3,4 +3,5 @@ export const environment = {
electron: false,
githubio: false,
solarputty_download_url: '',
current_Version:'v3'
};

View File

@ -7,6 +7,7 @@ export const environment = {
electron: false,
githubio: false,
solarputty_download_url: '',
current_Version:'v3'
};
/*