Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-02-18 04:41:26 +01:00
Code Issues Projects Releases Wiki Activity

Remove cache for project policy updating (#19068)

Browse Source 
1. Fixes #19065

Signed-off-by: AllForNothing <sshijun@vmware.com>
This commit is contained in:
Shijun Sun 2023-08-01 15:31:32 +08:00 committed by GitHub
parent 5e130bd06c
commit 28e6a99eb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/portal/src/app/services/routing-resolvers/artifact-detail-routing-resolver.service.ts
View File

@ -42,7 +42,7 @@ export class ArtifactDetailRoutingResolverService {
const projectId: string = route.params['id']; const projectId: string = route.params['id'];
const repositoryName: string = route.params['repo']; const repositoryName: string = route.params['repo'];
const artifactDigest: string = route.params['digest']; const artifactDigest: string = route.params['digest'];
return this.projectService.getProject(projectId).pipe( return this.projectService.getProjectFromCache(projectId).pipe(
mergeMap((project: Project) => { mergeMap((project: Project) => {
return forkJoin([ return forkJoin([
this.artifactService.getArtifact({ this.artifactService.getArtifact({

2
src/portal/src/app/services/routing-resolvers/project-routing-resolver.service.ts
View File

@ -43,7 +43,7 @@ export class ProjectRoutingResolver {
if (!projectId) { if (!projectId) {
projectId = route.queryParams['project_id']; projectId = route.queryParams['project_id'];
} }
return this.projectService.getProject(projectId).pipe( return this.projectService.getProjectFromCache(projectId).pipe(
map( map(
(project: Project) => { (project: Project) => {
if (project) { if (project) {

2
src/portal/src/app/shared/router-guard/member-guard-activate.service.ts
View File

@ -72,7 +72,7 @@ export class MemberGuard {
route: ActivatedRouteSnapshot route: ActivatedRouteSnapshot
): Observable<boolean> { ): Observable<boolean> {
// Note: current user will have the permission to visit the project when the user can get response from GET /projects/:id API. // Note: current user will have the permission to visit the project when the user can get response from GET /projects/:id API.
return this.projectService.getProject(projectId).pipe( return this.projectService.getProjectFromCache(projectId).pipe(
map(() => { map(() => {
return true; return true;
}), }),

25
src/portal/src/app/shared/services/project.service.ts
View File

@ -31,6 +31,19 @@ export abstract class ProjectService {
*/ */
abstract getProject(projectId: number | string): Observable<Project>; abstract getProject(projectId: number | string): Observable<Project>;
/**
* Get info about a specific Project from cache, if no cache, get it from the back end then store it in cache.
*
* @abstract
* ** deprecated param {string|number} [projectId]
* returns {(Observable<Project> )}
*
* @memberOf ProjectService
*/
abstract getProjectFromCache(
projectId: number | string
): Observable<Project>;
/** /**
* Update the specified project. * Update the specified project.
* *
@ -95,12 +108,22 @@ export class ProjectDefaultService extends ProjectService {
constructor(private http: HttpClient) { constructor(private http: HttpClient) {
super(); super();
} }
@CacheObservable({ maxAge: 1000 * 60 })
public getProject(projectId: number | string): Observable<Project> { public getProject(projectId: number | string): Observable<Project> {
if (!projectId) { if (!projectId) {
return observableThrowError('Bad argument'); return observableThrowError('Bad argument');
} }
let baseUrl: string = CURRENT_BASE_HREF + '/projects'; let baseUrl: string = CURRENT_BASE_HREF + '/projects';
return this.http
.get<Project>(`${baseUrl}/${projectId}`, HTTP_GET_OPTIONS)
.pipe(catchError(error => observableThrowError(error)));
}
@CacheObservable({ maxAge: 1000 * 30 })
public getProjectFromCache(
projectId: number | string
): Observable<Project> {
const baseUrl: string = CURRENT_BASE_HREF + '/projects';
if (this._sharedProjectObservableMap[projectId]) { if (this._sharedProjectObservableMap[projectId]) {
return this._sharedProjectObservableMap[projectId]; return this._sharedProjectObservableMap[projectId];
} }