Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-09-26 20:42:43 +02:00
Code Issues Projects Releases Wiki Activity

Add querry parameter for setting.json (#16081)

Browse Source 
Signed-off-by: AllForNothing <sshijun@vmware.com>
This commit is contained in:
孙世军 2021-12-14 11:20:34 +08:00 committed by GitHub
parent 3d26bbc2e2
commit d711f02401
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/portal/src/app/services/skinable-config.service.spec.ts
View File

@ -41,7 +41,7 @@ describe('SkinableConfig', () => {
expect(res).toEqual(mockCustomSkinData); expect(res).toEqual(mockCustomSkinData);
}); });
const req = httpMock.expectOne('setting.json'); const req = httpMock.expectOne('setting.json?buildTimeStamp=0');
expect(req.request.method).toBe('GET'); expect(req.request.method).toBe('GET');
req.flush(mockCustomSkinData); req.flush(mockCustomSkinData);
expect(service.getSkinConfig()).toEqual(mockCustomSkinData); expect(service.getSkinConfig()).toEqual(mockCustomSkinData);

3
src/portal/src/app/services/skinable-config.service.ts
View File

@ -5,6 +5,7 @@ import { map, catchError } from "rxjs/operators";
import { Observable, throwError as observableThrowError } from "rxjs"; import { Observable, throwError as observableThrowError } from "rxjs";
import { CustomStyle } from "./theme"; import { CustomStyle } from "./theme";
import { DOCUMENT } from "@angular/common"; import { DOCUMENT } from "@angular/common";
import { environment } from "src/environments/environment";
@Injectable() @Injectable()
export class SkinableConfig { export class SkinableConfig {
private customSkinData: CustomStyle; private customSkinData: CustomStyle;
@ -12,7 +13,7 @@ export class SkinableConfig {
@Inject(DOCUMENT) private document: Document) {} @Inject(DOCUMENT) private document: Document) {}
public getCustomFile(): Observable<any> { public getCustomFile(): Observable<any> {
return this.http.get('setting.json') return this.http.get(`setting.json?buildTimeStamp=${environment?.buildTimestamp}`)
.pipe(map(response => this.customSkinData = response as CustomStyle) .pipe(map(response => this.customSkinData = response as CustomStyle)
, catchError((error: any) => { , catchError((error: any) => {
console.error('custom skin json file load failed'); console.error('custom skin json file load failed');