diff --git a/src/portal/src/app/config/config.component.ts b/src/portal/src/app/config/config.component.ts
index 533970227..5d04d8e35 100644
--- a/src/portal/src/app/config/config.component.ts
+++ b/src/portal/src/app/config/config.component.ts
@@ -13,7 +13,7 @@
// limitations under the License.
import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core';
import { Subscription } from "rxjs";
-import { Configuration, StringValueItem, SystemSettingsComponent, VulnerabilityConfigComponent } from '@harbor/ui';
+import { Configuration, StringValueItem, SystemSettingsComponent, VulnerabilityConfigComponent} from '@harbor/ui';
import { ConfirmationTargets, ConfirmationState } from '../shared/shared.const';
import { SessionService } from '../shared/session.service';
@@ -24,6 +24,7 @@ import { MessageHandlerService } from '../shared/message-handler/message-handler
import { AppConfigService } from '../app-config.service';
import { ConfigurationAuthComponent } from './auth/config-auth.component';
import { ConfigurationEmailComponent } from './email/config-email.component';
+import { GcComponent} from './gc/gc.component';
import { ConfigurationService } from './config.service';
@@ -34,6 +35,7 @@ const TabLinkContentMap = {
'config-email': 'email',
'config-system': 'system_settings',
'config-vulnerability': 'vulnerability',
+ 'config-gc': 'gc',
'config-label': 'system_label',
};
@@ -53,6 +55,7 @@ export class ConfigurationComponent implements OnInit, OnDestroy {
@ViewChild(SystemSettingsComponent) systemSettingsConfig: SystemSettingsComponent;
@ViewChild(VulnerabilityConfigComponent) vulnerabilityConfig: VulnerabilityConfigComponent;
+ @ViewChild(GcComponent) gcConfig: GcComponent;
@ViewChild(ConfigurationEmailComponent) mailConfig: ConfigurationEmailComponent;
@ViewChild(ConfigurationAuthComponent) authConfig: ConfigurationAuthComponent;
@@ -201,7 +204,7 @@ export class ConfigurationComponent implements OnInit, OnDestroy {
}
public get hideBtn(): boolean {
- return this.currentTabId === 'config-label';
+ return this.currentTabId === 'config-label' || this.currentTabId === 'config-gc';
}
public get hideMailTestingSpinner(): boolean {
diff --git a/src/portal/src/app/config/config.module.ts b/src/portal/src/app/config/config.module.ts
index 4a74ee4f7..1d1531251 100644
--- a/src/portal/src/app/config/config.module.ts
+++ b/src/portal/src/app/config/config.module.ts
@@ -19,6 +19,12 @@ import { ConfigurationComponent } from './config.component';
import { ConfigurationService } from './config.service';
import { ConfigurationAuthComponent } from './auth/config-auth.component';
import { ConfigurationEmailComponent } from './email/config-email.component';
+import { GcComponent } from './gc/gc.component';
+import { GcRepoService } from './gc/gc.service';
+import { GcApiRepository } from './gc/gc.api.repository';
+import { GcViewModelFactory } from './gc/gc.viewmodel.factory';
+import { GcUtility } from './gc/gc.utility';
+
@NgModule({
imports: [
@@ -29,8 +35,9 @@ import { ConfigurationEmailComponent } from './email/config-email.component';
ConfigurationComponent,
ConfigurationAuthComponent,
ConfigurationEmailComponent,
+ GcComponent
],
exports: [ConfigurationComponent],
- providers: [ConfigurationService]
+ providers: [ConfigurationService, GcRepoService, GcApiRepository, GcViewModelFactory, GcUtility ]
})
export class ConfigurationModule { }
diff --git a/src/portal/src/app/config/gc/gc.api.repository.ts b/src/portal/src/app/config/gc/gc.api.repository.ts
new file mode 100644
index 000000000..04de55d38
--- /dev/null
+++ b/src/portal/src/app/config/gc/gc.api.repository.ts
@@ -0,0 +1,49 @@
+
+import { Injectable } from '@angular/core';
+import { Http } from '@angular/http';
+import { Observable } from 'rxjs';
+import { catchError, map } from 'rxjs/operators';
+
+
+@Injectable()
+export class GcApiRepository {
+
+ constructor(
+ private http: Http,
+ ) {
+ }
+
+ public postSchedule(param): Observable
{
+ return this.http.post("/api/system/gc/schedule", param)
+ .pipe(catchError(err => Observable.throw(err)));
+ }
+
+ public putSchedule(param): Observable {
+ return this.http.put("/api/system/gc/schedule", param)
+ .pipe(catchError(err => Observable.throw(err)));
+ }
+
+ public getSchedule(): Observable {
+ return this.http.get("/api/system/gc/schedule")
+ .pipe(catchError(err => Observable.throw(err)))
+ .pipe(map(response => response.json()));
+ }
+
+ public getLog(id): Observable {
+ return this.http.get("/api/system/gc/" + id + "/log")
+ .pipe(catchError(err => Observable.throw(err)));
+ }
+
+ public getStatus(id): Observable {
+ return this.http.get("/api/system/gc/" + id)
+ .pipe(catchError(err => Observable.throw(err)))
+ .pipe(map(response => response.json()));
+ }
+
+ public getJobs(): Observable {
+ return this.http.get("/api/system/gc")
+ .pipe(catchError(err => Observable.throw(err)))
+ .pipe(map(response => response.json()));
+ }
+
+}
diff --git a/src/portal/src/app/config/gc/gc.component.html b/src/portal/src/app/config/gc/gc.component.html
new file mode 100644
index 000000000..3b228aa05
--- /dev/null
+++ b/src/portal/src/app/config/gc/gc.component.html
@@ -0,0 +1,50 @@
+
+ {{'GC.CURRENT_SCHEDULE' | translate}}
+ {{(originScheduleType ? 'SCHEDULE.'+ originScheduleType.toUpperCase(): "") | translate}}
+ {{'GC.ON' | translate}} {{originWeekDay.text | translate}}
+ {{'GC.AT' | translate}} {{originOffTime.text}}
+
+
+
+
+
+
+
+
+ {{'GC.ON' | translate}}
+
+
+
+
+
+