+
\ No newline at end of file
diff --git a/src/ui_ng/src/app/replication/replication-page.component.html b/src/ui_ng/src/app/replication/replication-page.component.html
index 667be81c6..b2ebb01ba 100644
--- a/src/ui_ng/src/app/replication/replication-page.component.html
+++ b/src/ui_ng/src/app/replication/replication-page.component.html
@@ -1,3 +1,3 @@
-
\ No newline at end of file
diff --git a/src/ui_ng/src/app/replication/replication-rule/list-project-model/list-project-model.component.css b/src/ui_ng/src/app/replication/replication-rule/list-project-model/list-project-model.component.css
new file mode 100644
index 000000000..ab5ec9250
--- /dev/null
+++ b/src/ui_ng/src/app/replication/replication-rule/list-project-model/list-project-model.component.css
@@ -0,0 +1,5 @@
+.datagrid .datagrid-head{border: 0;}
+.option-right{ position: absolute; right: 30px; top: 55px;}
+:host >>> .datagrid-head{height: 0;border-width: 0;}
+:host >>> .datagrid-scroll-wrapper .datagrid{margin-top: 0;}
+.modal-body{height: 30em; overflow-y: auto; margin-top: 20px;}
diff --git a/src/ui_ng/src/app/replication/replication-rule/list-project-model/list-project-model.component.html b/src/ui_ng/src/app/replication/replication-rule/list-project-model/list-project-model.component.html
new file mode 100644
index 000000000..f4642b90f
--- /dev/null
+++ b/src/ui_ng/src/app/replication/replication-rule/list-project-model/list-project-model.component.html
@@ -0,0 +1,33 @@
+
+ {{'PROJECT.ALL_PROJECTS' | translate}}
+
+
+
+
+ {{projectTypes[0] | translate}}
+ {{projectTypes[1] | translate}}
+ {{projectTypes[2] | translate}}
+
+
+
+
+
+
+
+
+
+ {{project.name}}
+
+
+ {{pagination.firstItem + 1}} - {{pagination.lastItem +1 }} {{'PROJECT.OF' | translate}} {{pagination.totalItems }} {{'PROJECT.ITEMS' | translate}}
+
+
+
diff --git a/src/ui_ng/src/app/replication/replication-rule/list-project-model/list-project-model.component.ts b/src/ui_ng/src/app/replication/replication-rule/list-project-model/list-project-model.component.ts
new file mode 100644
index 000000000..a858b49c3
--- /dev/null
+++ b/src/ui_ng/src/app/replication/replication-rule/list-project-model/list-project-model.component.ts
@@ -0,0 +1,180 @@
+// Copyright (c) 2017 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+import {
+ Component,
+ Output,
+ Input,
+ ChangeDetectionStrategy,
+ ChangeDetectorRef,
+ OnDestroy, EventEmitter
+} from '@angular/core';
+import { Router, NavigationExtras } from '@angular/router';
+
+import { SessionService } from '../../../shared/session.service';
+import { SearchTriggerService } from '../../../base/global-search/search-trigger.service';
+import { ProjectTypes, RoleInfo} from '../../../shared/shared.const';
+import { CustomComparator, doFiltering, doSorting, calculatePage } from '../../../shared/shared.utils';
+
+import { Comparator, State } from 'clarity-angular';
+import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service';
+import { StatisticHandler } from '../../../shared/statictics/statistic-handler.service';
+import { Subscription } from 'rxjs/Subscription';
+import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service';
+import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message';
+import { ConfirmationTargets, ConfirmationState, ConfirmationButtons } from '../../../shared/shared.const';
+import {ProjectService} from "../../../project/project.service";
+import {Project} from "../../../project/project";
+
+@Component({
+ selector: 'list-project-model',
+ templateUrl: 'list-project-model.component.html',
+ styleUrls: ['list-project-model.component.css'],
+ changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class ListProjectModelComponent {
+ projectTypes = ProjectTypes;
+ loading: boolean = true;
+ projects: Project[] = [];
+ filteredType: number = 0;//All projects
+ searchKeyword: string = "";
+ ismodelOpen: boolean ;
+ currentFilteredType: number = 0;//all projects
+ projectName: string = "";
+ selectedProject: Project;
+
+ roleInfo = RoleInfo;
+ repoCountComparator: Comparator
= new CustomComparator("repo_count", "number");
+ timeComparator: Comparator = new CustomComparator("creation_time", "date");
+ accessLevelComparator: Comparator = new CustomComparator("public", "number");
+ roleComparator: Comparator = new CustomComparator("current_user_role_id", "number");
+ currentPage: number = 1;
+ totalCount: number = 0;
+ pageSize: number = 10;
+ currentState: State;
+ @Output() selectedPro = new EventEmitter();
+
+ constructor(
+ private session: SessionService,
+ private router: Router,
+ private searchTrigger: SearchTriggerService,
+ private proService: ProjectService,
+ private msgHandler: MessageHandlerService,
+ private statisticHandler: StatisticHandler,
+ private deletionDialogService: ConfirmationDialogService,
+ private ref: ChangeDetectorRef) {
+ }
+
+ get selecteType(): number {
+ return this.currentFilteredType;
+ }
+ set selecteType(_project: number) {
+ this.currentFilteredType = _project;
+ if (window.sessionStorage) {
+ window.sessionStorage['projectTypeValue'] = _project;
+ }
+ }
+
+
+ clrLoad(state: State) {
+ //Keep state for future filtering and sorting
+ this.currentState = state;
+
+ let pageNumber: number = calculatePage(state);
+ if (pageNumber <= 0) { pageNumber = 1; }
+
+ this.loading = true;
+
+ let passInFilteredType: number = undefined;
+ if (this.filteredType > 0) {
+ passInFilteredType = this.filteredType - 1;
+ }
+ this.proService.listProjects(this.searchKeyword, passInFilteredType, pageNumber, this.pageSize).toPromise()
+ .then(response => {
+ //Get total count
+ if (response.headers) {
+ let xHeader: string = response.headers.get("X-Total-Count");
+ if (xHeader) {
+ this.totalCount = parseInt(xHeader, 0);
+ }
+ }
+
+ this.projects = response.json() as Project[];
+ //Do customising filtering and sorting
+ this.projects = doFiltering(this.projects, state);
+ this.projects = doSorting(this.projects, state);
+
+ this.loading = false;
+ })
+ .catch(error => {
+ this.loading = false;
+ this.msgHandler.handleError(error);
+ });
+
+ //Force refresh view
+ let hnd = setInterval(() => this.ref.markForCheck(), 100);
+ setTimeout(() => clearInterval(hnd), 3000);
+ }
+
+ openModel(): void {
+ this.selectedProject = null;
+ this.ismodelOpen = true;
+ //Force refresh view
+ let hnd = setInterval(() => this.ref.markForCheck(), 100);
+ setTimeout(() => clearInterval(hnd), 2000);
+ }
+
+ refresh(): void {
+ this.currentPage = 1;
+ this.filteredType = 0;
+ this.searchKeyword = '';
+
+ this.reload();
+ }
+
+ doFilterProject(): void {
+ this.currentPage = 1;
+ this.filteredType = this.selecteType;
+ this.reload();
+ }
+
+ doSearchProject(proName: string): void {
+ this.projectName = proName;
+ this.currentPage = 1;
+ this.searchKeyword = proName;
+ this.reload();
+ }
+
+ reload(): void {
+ let st: State = this.currentState;
+ if (!st) {
+ st = {
+ page: {}
+ };
+ }
+ st.page.from = 0;
+ st.page.to = this.pageSize - 1;
+ st.page.size = this.pageSize;
+
+ this.clrLoad(st);
+ }
+
+ oKModel() {
+ this.ismodelOpen = false;
+ this.selectedPro.emit(this.selectedProject);
+ }
+
+ closeModel(): void {
+ this.ismodelOpen = false;
+ }
+}
diff --git a/src/ui_ng/src/app/replication/replication-rule/replication-rule.component.ts b/src/ui_ng/src/app/replication/replication-rule/replication-rule.component.ts
new file mode 100644
index 000000000..3a1f76a4d
--- /dev/null
+++ b/src/ui_ng/src/app/replication/replication-rule/replication-rule.component.ts
@@ -0,0 +1,531 @@
+import {Component, OnInit, OnDestroy, ViewChild, ChangeDetectorRef, AfterViewInit} from '@angular/core';
+import {ProjectService} from '../../project/project.service';
+import {Project} from '../../project/project';
+import {ActivatedRoute, Router} from '@angular/router';
+import {FormArray, FormBuilder, FormGroup, Validators} from "@angular/forms";
+import {ReplicationRuleServie} from "./replication-rule.service";
+import {MessageHandlerService} from "../../shared/message-handler/message-handler.service";
+import {Target, Filter, ReplicationRule} from "./replication-rule";
+import {ConfirmationDialogService} from "../../shared/confirmation-dialog/confirmation-dialog.service";
+import { ConfirmationTargets, ConfirmationState } from '../../shared/shared.const';
+import {Subscription} from "rxjs/Subscription";
+import {ConfirmationMessage} from "../../shared/confirmation-dialog/confirmation-message";
+import {Subject} from "rxjs/Subject";
+import {ListProjectModelComponent} from "./list-project-model/list-project-model.component";
+import {toPromise, isEmptyObject, compareValue} from "harbor-ui/src/utils";
+
+
+const ONE_HOUR_SECONDS: number = 3600;
+const ONE_DAY_SECONDS: number = 24 * ONE_HOUR_SECONDS;
+
+@Component ({
+ selector: 'repliction-rule',
+ templateUrl: 'replication-rule.html',
+ styleUrls: ['replication-rule.css']
+
+})
+export class ReplicationRuleComponent implements OnInit, AfterViewInit, OnDestroy {
+ _localTime: Date = new Date();
+ policyId: number;
+ targetList: Target[] = [];
+ isFilterHide: boolean = false;
+ weeklySchedule: boolean;
+ isScheduleOpt: boolean;
+ isImmediate: boolean = true;
+ filterCount: number = 0;
+ selectedprojectList: Project[] = [];
+ triggerNames: string[] = ['immediate', 'schedule', 'manual'];
+ scheduleNames: string[] = ['daily', 'weekly'];
+ weekly: string[] = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'];
+ filterSelect: string[] = ['repository', 'tag'];
+ ruleNameTooltip: string = 'TOOLTIP.EMPTY';
+ headerTitle: string = 'REPLICATION.ADD_POLICY';
+
+ filterListData: {[key: string]: any}[] = [];
+ inProgress: boolean = false;
+ inNameChecking: boolean = false;
+ isRuleNameExist: boolean = false;
+ nameChecker: Subject = new Subject();
+
+ confirmSub: Subscription;
+ ruleForm: FormGroup;
+ copyUpdateForm: ReplicationRule;
+
+ @ViewChild(ListProjectModelComponent)
+ projectListModel: ListProjectModelComponent;
+
+ baseFilterData(name: string, option: string[], state: boolean) {
+ return {
+ name: name,
+ options: option,
+ state: state,
+ isValid: true
+ };
+ }
+
+ constructor(public projectService: ProjectService,
+ private router: Router,
+ private fb: FormBuilder,
+ private repService: ReplicationRuleServie,
+ private route: ActivatedRoute,
+ private msgHandler: MessageHandlerService,
+ private confirmService: ConfirmationDialogService,
+ public ref: ChangeDetectorRef) {
+ this.createForm();
+
+ Promise.all([this.repService.getEndpoints(), this.repService.listProjects()])
+ .then(res => {
+ if (!res[0] || !res[1]) {
+ this.msgHandler.error('REPLICATION.BACKINFO');
+ setTimeout(() => {
+ this.router.navigate(['/harbor/replications']);
+ }, 2000);
+ };
+ if (res[0] && res[1]) {
+ this.targetList = res[0];
+ if (!this.policyId) {
+ this.setTarget([res[0][0]]);
+ this.setProject([res[1][0]]);
+ this.copyUpdateForm = Object.assign({}, this.ruleForm.value);
+ }
+ }
+ });
+ }
+
+ ngOnInit(): void {
+ this.policyId = +this.route.snapshot.params['id'];
+ if (this.policyId) {
+ this.headerTitle = 'REPLICATION.EDIT_POLICY_TITLE';
+ this.repService.getReplicationRule(this.policyId)
+ .then((response) => {
+ this.copyUpdateForm = Object.assign({}, response);
+ // set filter value is [] if callback fiter value is null.
+ this.copyUpdateForm.filters = response.filters ? response.filters : [];
+ this.updateForm(response);
+ }).catch(error => {
+ this.msgHandler.handleError(error);
+ });
+ }
+
+ this.nameChecker.debounceTime(500).distinctUntilChanged().subscribe((ruleName: string) => {
+ this.isRuleNameExist = false;
+ this.inNameChecking = true;
+ toPromise(this.repService.getReplicationRules(0, ruleName))
+ .then(response => {
+ if (response.some(rule => rule.name === ruleName)) {
+ this.ruleNameTooltip = 'TOOLTIP.RULE_USER_EXISTING';
+ this.isRuleNameExist = true;
+ }
+ this.inNameChecking = false;
+ }).catch(() => {
+ this.inNameChecking = false;
+ });
+ });
+ }
+
+ ngAfterViewInit(): void {
+ }
+
+ ngOnDestroy(): void {
+ if (this.confirmSub) {
+ this.confirmSub.unsubscribe();
+ }
+ if (this.nameChecker) {
+ this.nameChecker.unsubscribe();
+ }
+ }
+
+ createForm() {
+ this.ruleForm = this.fb.group({
+ name: ['', Validators.required],
+ description: '',
+ projects: this.fb.array([]),
+ targets: this.fb.array([]),
+ trigger: this.fb.group({
+ kind: this.triggerNames[0],
+ schedule_param: this.fb.group({
+ type: this.scheduleNames[0],
+ weekday: 1,
+ offtime: '08:00'
+ }),
+ }),
+ filters: this.fb.array([]),
+ replicate_existing_image_now: true,
+ replicate_deletion: false
+ });
+
+ }
+
+ updateForm(rule: ReplicationRule): void {
+ rule.trigger = this.updateTrigger(rule.trigger);
+ this.ruleForm.reset({
+ name: rule.name,
+ description: rule.description,
+ trigger: rule.trigger,
+ replicate_existing_image_now: rule.replicate_existing_image_now,
+ replicate_deletion: rule.replicate_deletion
+ });
+ this.setProject(rule.projects);
+ this.setTarget(rule.targets);
+ if (rule.filters) {
+ this.setFilter(rule.filters);
+ this.updateFilter(rule.filters);
+ }
+
+ // Force refresh view
+ let hnd = setInterval(() => this.ref.markForCheck(), 100);
+ setTimeout(() => clearInterval(hnd), 2000);
+ }
+
+ get projects(): FormArray {
+ return this.ruleForm.get('projects') as FormArray;
+ }
+ setProject(projects: Project[]) {
+ const projectFGs = projects.map(project => this.fb.group(project));
+ const projectFormArray = this.fb.array(projectFGs);
+ this.ruleForm.setControl('projects', projectFormArray);
+ }
+
+ get filters(): FormArray {
+ return this.ruleForm.get('filters') as FormArray;
+ }
+ setFilter(filters: Filter[]) {
+ const filterFGs = filters.map(filter => this.fb.group(filter));
+ const filterFormArray = this.fb.array(filterFGs);
+ this.ruleForm.setControl('filters', filterFormArray);
+ }
+
+ get targets(): FormArray {
+ return this.ruleForm.get('targets') as FormArray;
+ }
+ setTarget(targets: Target[]) {
+ const targetFGs = targets.map(target => this.fb.group(target));
+ const targetFormArray = this.fb.array(targetFGs);
+ this.ruleForm.setControl('targets', targetFormArray);
+ }
+
+ initFilter(name: string) {
+ return this.fb.group({
+ kind: name,
+ pattern: ['', Validators.required]
+ });
+ }
+
+ filterChange($event: any) {
+ if ($event && $event.target['value']) {
+ let id: number = $event.target.id;
+ let name: string = $event.target.name;
+ let value: string = $event.target['value'];
+
+ this.filterListData.forEach((data, index) => {
+ if (index === +id) {
+ data.name = $event.target.name = value;
+ }else {
+ data.options.splice(data.options.indexOf(value), 1);
+ }
+ if (data.options.indexOf(name) === -1) {
+ data.options.push(name);
+ }
+ });
+ }
+ }
+
+ targetChange($event: any) {
+ if ($event && $event.target && event.target['value']) {
+ let selecedTarget: Target = this.targetList.find(target => target.id === +$event.target['value']);
+ this.setTarget([selecedTarget]);
+ }
+ }
+
+ openProjectModel(): void {
+ this.projectListModel.openModel();
+ }
+
+ selectedProject(project: Project): void {
+ this.setProject([project]);
+ }
+
+ addNewFilter(): void {
+ if (this.filterCount === 0) {
+ this.filterListData.push(this.baseFilterData(this.filterSelect[0], this.filterSelect.slice(), true));
+ this.filters.push(this.initFilter(this.filterSelect[0]));
+
+ }else {
+ let nameArr: string[] = this.filterSelect.slice();
+ this.filterListData.forEach(data => {
+ nameArr.splice(nameArr.indexOf(data.name), 1);
+ });
+ // when add a new filter,the filterListData should change the options
+ this.filterListData.filter((data) => {
+ data.options.splice(data.options.indexOf(nameArr[0]), 1);
+ });
+ this.filterListData.push(this.baseFilterData(nameArr[0], nameArr, true));
+ this.filters.push(this.initFilter(nameArr[0]));
+ }
+ this.filterCount += 1;
+ if (this.filterCount >= this.filterSelect.length) {
+ this.isFilterHide = true;
+ }
+ }
+
+ // delete a filter
+ deleteFilter(i: number): void {
+ if (i || i === 0) {
+ let delfilter = this.filterListData.splice(i, 1)[0];
+ if (this.filterCount === this.filterSelect.length) {
+ this.isFilterHide = false;
+ }
+ this.filterCount -= 1;
+ if (this.filterListData.length) {
+ let optionVal = delfilter.name;
+ this.filterListData.filter(data => {
+ if (data.options.indexOf(optionVal) === -1) {
+ data.options.push(optionVal);
+ }
+ });
+ }
+ const control = this.ruleForm.controls['filters'];
+ control.removeAt(i);
+ }
+ }
+
+ selectTrigger($event: any): void {
+ if ($event && $event.target && $event.target['value']) {
+ let val: string = $event.target['value'];
+ if (val === this.triggerNames[1]) {
+ this.isScheduleOpt = true;
+ this.isImmediate = false;
+ }
+ if (val === this.triggerNames[0]) {
+ this.isScheduleOpt = false;
+ this.isImmediate = true;
+ }
+ if (val === this.triggerNames[2]) {
+ this.isScheduleOpt = false;
+ this.isImmediate = false;
+ }
+ }
+ }
+
+ // Replication Schedule select value exchange
+ selectSchedule($event: any): void {
+ if ($event && $event.target && $event.target['value']) {
+ switch ($event.target['value']) {
+ case this.scheduleNames[1]:
+ this.weeklySchedule = true;
+ this.ruleForm.patchValue({
+ trigger: {
+ schedule_param: {
+ weekday: 1,
+ }
+ }
+ })
+ break;
+ case this.scheduleNames[0]:
+ this.weeklySchedule = false;
+ break;
+ }
+ }
+ }
+
+ checkRuleName(): void {
+ let ruleName: string = this.ruleForm.controls['name'].value;
+ if (ruleName) {
+ this.nameChecker.next(ruleName);
+ } else {
+ this.ruleNameTooltip = 'TOOLTIP.EMPTY';
+ }
+ }
+
+ updateFilter(filters: any) {
+ let opt: string[] = this.filterSelect.slice();
+ filters.forEach((filter: any) => {
+ opt.splice(opt.indexOf(filter.kind), 1);
+ })
+ filters.forEach((filter: any) => {
+ let option: string [] = opt.slice();
+ option.unshift(filter.kind);
+ this.filterListData.push(this.baseFilterData(filter.kind, option, true));
+ });
+ this.filterCount = filters.length;
+ if (filters.length === this.filterSelect.length) {
+ this.isFilterHide = true;
+ }
+ }
+
+ updateTrigger(trigger: any) {
+ if (trigger['schedule_param']) {
+ this.isScheduleOpt = true;
+ this.isImmediate = false;
+ trigger['schedule_param']['offtime'] = this.getOfftime(trigger['schedule_param']['offtime']);
+ if (trigger['schedule_param']['weekday']) {
+ this.weeklySchedule = true;
+ }else {
+ // set default
+ trigger['schedule_param']['weekday'] = 1;
+ }
+ }else {
+ if (trigger['kind'] === this.triggerNames[2]) {
+ this.isImmediate = false;
+ }
+ trigger['schedule_param'] = { type: this.scheduleNames[0],
+ weekday: this.weekly[0],
+ offtime: '08:00'};
+ }
+ return trigger;
+ }
+
+ setTriggerVaule(trigger: any) {
+ if (!this.isScheduleOpt) {
+ delete trigger['schedule_param'];
+ return trigger;
+ }else {
+ if (!this.weeklySchedule) {
+ delete trigger['schedule_param']['weekday'];
+ }else {
+ trigger['schedule_param']['weekday'] = +trigger['schedule_param']['weekday'];
+ }
+ trigger['schedule_param']['offtime'] = this.setOfftime(trigger['schedule_param']['offtime']);
+ return trigger;
+ }
+ }
+
+ public hasFormChange(): boolean {
+ return !isEmptyObject(this.getChanges());
+ }
+
+
+ onSubmit() {
+ // add new Replication rule
+ let copyRuleForm: ReplicationRule = this.ruleForm.value;
+ copyRuleForm.trigger = this.setTriggerVaule(copyRuleForm.trigger);
+ if (!this.policyId) {
+ this.repService.createReplicationRule(copyRuleForm)
+ .then(() => {
+ this.msgHandler.showSuccess('REPLICATION.CREATED_SUCCESS');
+ this.inProgress = false;
+ setTimeout(() => {
+ this.copyUpdateForm = Object.assign({}, this.ruleForm.value);
+ this.router.navigate(['/harbor/replications']);
+ }, 2000);
+
+ }).catch((error: any) => {
+ this.inProgress = false;
+ this.msgHandler.handleError(error);
+ });
+ } else {
+ this.repService.updateReplicationRule(this.policyId, this.ruleForm.value)
+ .then(() => {
+ this.msgHandler.showSuccess('REPLICATION.UPDATED_SUCCESS');
+ this.inProgress = false;
+ setTimeout(() => {
+ this.copyUpdateForm = Object.assign({}, this.ruleForm.value);
+ this.router.navigate(['/harbor/replications']);
+ }, 2000);
+
+ }).catch((error: any) => {
+ this.inProgress = false;
+ this.msgHandler.handleError(error);
+ });
+ }
+ this.inProgress = true;
+ }
+
+ onCancel(): void {
+ this.router.navigate(['/harbor/replications']);
+ }
+
+ // UTC time
+ public getOfftime(daily_time: any): string {
+
+ let timeOffset: number = 0; // seconds
+ if (daily_time && typeof daily_time === 'number') {
+ timeOffset = +daily_time;
+ }
+
+ // Convert to current time
+ let timezoneOffset: number = this._localTime.getTimezoneOffset();
+ // Local time
+ timeOffset = timeOffset - timezoneOffset * 60;
+ if (timeOffset < 0) {
+ timeOffset = timeOffset + ONE_DAY_SECONDS;
+ }
+
+ if (timeOffset >= ONE_DAY_SECONDS) {
+ timeOffset -= ONE_DAY_SECONDS;
+ }
+
+ // To time string
+ let hours: number = Math.floor(timeOffset / ONE_HOUR_SECONDS);
+ let minutes: number = Math.floor((timeOffset - hours * ONE_HOUR_SECONDS) / 60);
+
+ let timeStr: string = '' + hours;
+ if (hours < 10) {
+ timeStr = '0' + timeStr;
+ }
+ if (minutes < 10) {
+ timeStr += ':0';
+ } else {
+ timeStr += ':';
+ }
+ timeStr += minutes;
+
+ return timeStr;
+ }
+ public setOfftime(v: string) {
+ if (!v || v === '') {
+ return;
+ }
+
+ let values: string[] = v.split(':');
+ if (!values || values.length !== 2) {
+ return;
+ }
+
+ let hours: number = +values[0];
+ let minutes: number = +values[1];
+ // Convert to UTC time
+ let timezoneOffset: number = this._localTime.getTimezoneOffset();
+ let utcTimes: number = hours * ONE_HOUR_SECONDS + minutes * 60;
+ utcTimes += timezoneOffset * 60;
+ if (utcTimes < 0) {
+ utcTimes += ONE_DAY_SECONDS;
+ }
+
+ if (utcTimes >= ONE_DAY_SECONDS) {
+ utcTimes -= ONE_DAY_SECONDS;
+ }
+
+ return utcTimes;
+ }
+
+ backReplication(): void {
+ this.router.navigate(['/harbor/replications']);
+ }
+
+ getChanges(): { [key: string]: any | any[] } {
+ let changes: { [key: string]: any | any[] } = {};
+ let ruleValue: { [key: string]: any | any[] } = this.ruleForm.value;
+ if (!ruleValue || !this.copyUpdateForm) {
+ return changes;
+ }
+ for (let prop in ruleValue) {
+ let field = this.copyUpdateForm[prop];
+ if (!compareValue(field, ruleValue[prop])) {
+ changes[prop] = ruleValue[prop];
+ //Number
+ if (typeof field === "number") {
+ changes[prop] = +changes[prop];
+ }
+
+ //Trim string value
+ if (typeof field === "string") {
+ changes[prop] = ('' + changes[prop]).trim();
+ }
+ }
+ }
+
+ return changes;
+ }
+
+}
diff --git a/src/ui_ng/src/app/replication/replication-rule/replication-rule.css b/src/ui_ng/src/app/replication/replication-rule/replication-rule.css
new file mode 100644
index 000000000..28e92dee5
--- /dev/null
+++ b/src/ui_ng/src/app/replication/replication-rule/replication-rule.css
@@ -0,0 +1,34 @@
+/**
+ * Created by pengf on 9/28/2017.
+ */
+
+.select{
+ width: 186px;
+}
+.select .optionMore{
+ background-color: #bfbaba;
+ height: 1.6em;
+ font-size: 1.2em;
+ cursor: pointer;
+ text-align: center;
+}
+.hideFilter{ display: none;}
+h4{
+ color: #666;
+}
+label:first-child {
+ font-size: 15px;
+ left: -10px !important;
+}
+.endpointSelect{ width: 290px;}
+.filterSelect{width: 320px;}
+.filterSelect label{width: 160px;}
+.filterSelect label input{width: 100%;}
+.cursor{cursor: pointer;}
+.padLeft0{padding-left: 0;}
+.floatSet {display: inline-block; float: left; width: 120px;margin-right: 10px;}
+.form-group{ min-height: 36px;}
+
+.projectInput{float: left;}
+.projectInput input{width: 185px;background-color: white;}
+.switchIcon{width:20px;height:20px; margin-top: 5px;margin-left: 15px;}
\ No newline at end of file
diff --git a/src/ui_ng/src/app/replication/replication-rule/replication-rule.html b/src/ui_ng/src/app/replication/replication-rule/replication-rule.html
new file mode 100644
index 000000000..c763a07cc
--- /dev/null
+++ b/src/ui_ng/src/app/replication/replication-rule/replication-rule.html
@@ -0,0 +1,122 @@
+
\ No newline at end of file
diff --git a/src/ui_ng/src/app/replication/replication-rule/replication-rule.service.ts b/src/ui_ng/src/app/replication/replication-rule/replication-rule.service.ts
new file mode 100644
index 000000000..fbe5a1c4c
--- /dev/null
+++ b/src/ui_ng/src/app/replication/replication-rule/replication-rule.service.ts
@@ -0,0 +1,75 @@
+/**
+ * Created by pengf on 12/5/2017.
+ */
+
+import {Injectable} from "@angular/core";
+import {Http, RequestOptions, Headers, URLSearchParams} from "@angular/http";
+import {Observable} from "rxjs/Observable";
+import {ReplicationRule, Target} from "./replication-rule";
+import {HTTP_GET_OPTIONS, HTTP_JSON_OPTIONS} from "../../shared/shared.utils";
+import {Project} from "../../project/project";
+
+@Injectable()
+export class ReplicationRuleServie {
+ headers = new Headers({'Content-type': 'application/json'});
+ options = new RequestOptions({'headers': this.headers});
+ baseurl = '/api/policies/replication';
+ targetUrl= '/api/targets';
+
+ constructor(private http: Http) {}
+
+ public createReplicationRule(replicationRule: ReplicationRule): Observable | Promise | any {
+ /*if (!this._isValidRule(replicationRule)) {
+ return Promise.reject('Bad argument');
+ }*/
+
+ return this.http.post(this.baseurl, JSON.stringify(replicationRule), this.options).toPromise()
+ .then(response => response)
+ .catch(error => Promise.reject(error));
+ }
+
+ public getReplicationRules(projectId?: number | string, ruleName?: string): Promise | ReplicationRule[] {
+ let queryParams = new URLSearchParams();
+ if (projectId) {
+ queryParams.set('project_id', '' + projectId);
+ }
+
+ if (ruleName) {
+ queryParams.set('name', ruleName);
+ }
+
+ return this.http.get(this.baseurl, {search: queryParams}).toPromise()
+ .then(response => response.json() as ReplicationRule[])
+ .catch(error => Promise.reject(error));
+ }
+
+ public getReplicationRule(policyId: number): Promise {
+ let url: string = `${this.baseurl}/${policyId}`;
+ return this.http.get(url, HTTP_GET_OPTIONS).toPromise()
+ .then(response => response.json() as ReplicationRule)
+ .catch(error => Promise.reject(error));
+ }
+
+
+ public getEndpoints(): Promise | Target[] {
+ return this.http
+ .get(this.targetUrl)
+ .toPromise()
+ .then(response => response.json())
+ .catch(error => Promise.reject(error));
+ }
+
+ public listProjects(): Promise | Project[] {
+ return this.http.get(`/api/projects`, HTTP_GET_OPTIONS).toPromise()
+ .then(response => response.json())
+ .catch(error => Promise.reject(error));
+ }
+
+ public updateReplicationRule(id: number, rep: {[key: string]: any | any[] }): Observable | Promise | any {
+ let url: string = `${this.baseurl}/${id}`;
+ return this.http.put(url, JSON.stringify(rep), HTTP_JSON_OPTIONS).toPromise()
+ .then(response => response)
+ .catch(error => Promise.reject(error));
+ }
+
+}
diff --git a/src/ui_ng/src/app/replication/replication-rule/replication-rule.ts b/src/ui_ng/src/app/replication/replication-rule/replication-rule.ts
new file mode 100644
index 000000000..9a02b8876
--- /dev/null
+++ b/src/ui_ng/src/app/replication/replication-rule/replication-rule.ts
@@ -0,0 +1,49 @@
+import {Project} from "../../project/project";
+/**
+ * Created by pengf on 12/7/2017.
+ */
+
+export class Target {
+ id: 0;
+ endpoint: 'string';
+ name: 'string';
+ username: 'string';
+ password: 'string';
+ type: 0;
+ insecure: true;
+ creation_time: 'string';
+ update_time: 'string';
+}
+
+export class Filter {
+ kind: string;
+ pattern: string;
+ constructor(kind: string, pattern: string) {
+ this.kind = kind;
+ this.pattern = pattern;
+ }
+}
+
+export class Trigger {
+ kind: string;
+ schedule_param: any | {
+ [key: string]: any | any[];
+ };
+ constructor(kind: string, param: any | { [key: string]: any | any[]; }) {
+ this.kind = kind;
+ this.schedule_param = param;
+ }
+}
+
+export interface ReplicationRule {
+ id?: number;
+ name: string;
+ description: string;
+ projects: Project[];
+ targets: Target[] ;
+ trigger: Trigger ;
+ filters: Filter[] ;
+ replicate_existing_image_now?: boolean;
+ replicate_deletion?: boolean;
+}
+
diff --git a/src/ui_ng/src/app/replication/replication.module.ts b/src/ui_ng/src/app/replication/replication.module.ts
index cd20fada9..06cfca749 100644
--- a/src/ui_ng/src/app/replication/replication.module.ts
+++ b/src/ui_ng/src/app/replication/replication.module.ts
@@ -20,22 +20,31 @@ import { TotalReplicationPageComponent } from './total-replication/total-replica
import { DestinationPageComponent } from './destination/destination-page.component';
import { SharedModule } from '../shared/shared.module';
+import {ReplicationRuleComponent} from "./replication-rule/replication-rule.component";
+import {ReactiveFormsModule} from "@angular/forms";
+import {ReplicationRuleServie} from "./replication-rule/replication-rule.service";
+import {ListProjectModelComponent} from "./replication-rule/list-project-model/list-project-model.component";
@NgModule({
imports: [
SharedModule,
- RouterModule
+ RouterModule,
+ ReactiveFormsModule
],
declarations: [
ReplicationPageComponent,
ReplicationManagementComponent,
TotalReplicationPageComponent,
- DestinationPageComponent
+ DestinationPageComponent,
+ ReplicationRuleComponent,
+ ListProjectModelComponent,
],
exports: [
ReplicationPageComponent,
DestinationPageComponent,
- TotalReplicationPageComponent
- ]
+ TotalReplicationPageComponent,
+ ReplicationRuleComponent,
+ ],
+ providers: [ReplicationRuleServie]
})
export class ReplicationModule { }
\ No newline at end of file
diff --git a/src/ui_ng/src/app/replication/total-replication/total-replication-page.component.html b/src/ui_ng/src/app/replication/total-replication/total-replication-page.component.html
index 9b0e1fb7f..18dcdc455 100644
--- a/src/ui_ng/src/app/replication/total-replication/total-replication-page.component.html
+++ b/src/ui_ng/src/app/replication/total-replication/total-replication-page.component.html
@@ -1,4 +1,4 @@
{{'SIDE_NAV.SYSTEM_MGMT.REPLICATION' | translate}}
-
-
+
+
\ No newline at end of file
diff --git a/src/ui_ng/src/app/replication/total-replication/total-replication-page.component.ts b/src/ui_ng/src/app/replication/total-replication/total-replication-page.component.ts
index 9716c07d7..6f89caa2a 100644
--- a/src/ui_ng/src/app/replication/total-replication/total-replication-page.component.ts
+++ b/src/ui_ng/src/app/replication/total-replication/total-replication-page.component.ts
@@ -14,7 +14,7 @@
import { Component } from '@angular/core';
import {Router,ActivatedRoute} from "@angular/router";
-import {ReplicationRule} from "harbor-ui";
+import {ReplicationRule} from "../replication-rule/replication-rule";
@Component({
selector: 'total-replication',
@@ -26,7 +26,15 @@ export class TotalReplicationPageComponent {
private activeRoute: ActivatedRoute){}
customRedirect(rule: ReplicationRule): void {
if (rule) {
- this.router.navigate(['../../projects', rule.project_id, "replications"], { relativeTo: this.activeRoute });
+ this.router.navigate(['../projects', rule.projects[0].project_id, 'replications'], { relativeTo: this.activeRoute });
}
}
-}
\ No newline at end of file
+
+ openEditPage(id: number): void {
+ this.router.navigate([id, 'rule'], { relativeTo: this.activeRoute });
+ }
+
+ openCreatePage(): void {
+ this.router.navigate(['new-rule'], { relativeTo: this.activeRoute });
+ }
+}
diff --git a/src/ui_ng/src/app/replication/total-replication/total-replication.component.css b/src/ui_ng/src/app/replication/total-replication/total-replication.component.css
index 23904eade..8d38880dd 100644
--- a/src/ui_ng/src/app/replication/total-replication/total-replication.component.css
+++ b/src/ui_ng/src/app/replication/total-replication/total-replication.component.css
@@ -2,4 +2,7 @@
padding-right: 16px;
margin-top: 36px;
margin-bottom: 11px;
-}
\ No newline at end of file
+}
+.custom-h2 {
+ margin-top: 0px !important;
+}
diff --git a/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.html b/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.html
index 4e74a1da7..5af5b73b8 100644
--- a/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.html
+++ b/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.html
@@ -29,7 +29,7 @@
{{'BUTTON.CANCEL' | translate}}
- {{'BUTTON.DELETE' | translate}}
+ {{'BUTTON.DELETE' | translate}}
{{'BUTTON.CLOSE' | translate}}
diff --git a/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts b/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts
index 0d8d693b2..9182f66cb 100644
--- a/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts
+++ b/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts
@@ -112,7 +112,7 @@ export class ConfirmationDialogComponent implements OnDestroy {
this.close();
}
- confirm(): void {
+ delete(): void {
if(!this.message){//Inproper condition
this.close();
return;
@@ -130,6 +130,21 @@ export class ConfirmationDialogComponent implements OnDestroy {
data,
target
));
+ }
+ confirm(): void {
+ if(!this.message){//Inproper condition
+ this.close();
+ return;
+ }
+
+ let data: any = this.message.data ? this.message.data : {};
+ let target = this.message.targetId ? this.message.targetId : ConfirmationTargets.EMPTY;
+ this.confirmationService.confirm(new ConfirmationAcknowledgement(
+ ConfirmationState.CONFIRMED,
+ data,
+ target
+ ));
+ this.close();
}
}
\ No newline at end of file
diff --git a/src/ui_ng/src/app/shared/route/leaving-new-rule-deactivate.service.ts b/src/ui_ng/src/app/shared/route/leaving-new-rule-deactivate.service.ts
new file mode 100644
index 000000000..60ea8de74
--- /dev/null
+++ b/src/ui_ng/src/app/shared/route/leaving-new-rule-deactivate.service.ts
@@ -0,0 +1,65 @@
+// Copyright (c) 2017 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+import { Injectable } from '@angular/core';
+import {
+ CanDeactivate, Router,
+ ActivatedRouteSnapshot,
+ RouterStateSnapshot
+} from '@angular/router';
+
+import { ConfirmationDialogService } from '../confirmation-dialog/confirmation-dialog.service';
+
+import { ConfigurationComponent } from '../../config/config.component';
+import { ConfirmationMessage } from '../confirmation-dialog/confirmation-message';
+import { ConfirmationState, ConfirmationTargets } from '../shared.const';
+import {ReplicationRuleComponent} from "../../replication/replication-rule/replication-rule.component";
+
+@Injectable()
+export class LeavingNewRuleRouteDeactivate implements CanDeactivate {
+ constructor(
+ private router: Router,
+ private confirmation: ConfirmationDialogService) { }
+
+ canDeactivate(
+ replicateRule: ReplicationRuleComponent,
+ route: ActivatedRouteSnapshot,
+ state: RouterStateSnapshot): Promise | boolean {
+ //Confirmation before leaving config route
+ return new Promise((resolve, reject) => {
+ if (replicateRule && replicateRule.hasFormChange()) {
+ let msg: ConfirmationMessage = new ConfirmationMessage(
+ "CONFIG.LEAVING_CONFIRMATION_TITLE",
+ "CONFIG.LEAVING_CONFIRMATION_SUMMARY",
+ '',
+ {},
+ ConfirmationTargets.CONFIG_ROUTE
+ );
+ this.confirmation.openComfirmDialog(msg);
+ return this.confirmation.confirmationConfirm$.subscribe(msg => {
+ if (msg && msg.source === ConfirmationTargets.CONFIG_ROUTE) {
+ if (msg.state === ConfirmationState.CONFIRMED) {
+ return resolve(true);
+ } else {
+ return resolve(false);//Prevent leading route
+ }
+ } else {
+ return resolve(true);//Should go on
+ }
+ });
+ } else {
+ return resolve(true);
+ }
+ });
+ }
+}
diff --git a/src/ui_ng/src/app/shared/shared.module.ts b/src/ui_ng/src/app/shared/shared.module.ts
index 20b360fcd..c50550921 100644
--- a/src/ui_ng/src/app/shared/shared.module.ts
+++ b/src/ui_ng/src/app/shared/shared.module.ts
@@ -58,6 +58,7 @@ import {
ErrorHandler,
HarborLibraryModule
} from 'harbor-ui';
+import {LeavingNewRuleRouteDeactivate} from "./route/leaving-new-rule-deactivate.service";
const uiLibConfig: IServiceConfig = {
enablei18Support: true,
@@ -123,6 +124,7 @@ const uiLibConfig: IServiceConfig = {
AuthCheckGuard,
SignInGuard,
LeavingConfigRouteDeactivate,
+ LeavingNewRuleRouteDeactivate,
MemberGuard,
MessageHandlerService,
StatisticHandler
diff --git a/src/ui_ng/src/i18n/lang/en-us-lang.json b/src/ui_ng/src/i18n/lang/en-us-lang.json
index ff23d35a0..a9121db86 100644
--- a/src/ui_ng/src/i18n/lang/en-us-lang.json
+++ b/src/ui_ng/src/i18n/lang/en-us-lang.json
@@ -57,7 +57,9 @@
"NUMBER_REQUIRED": "Field is required and should be numbers.",
"PORT_REQUIRED": "Field is required and should be valid port number.",
"EMAIL_EXISTING": "Email address already exists.",
- "USER_EXISTING": "Username is already in use."
+ "USER_EXISTING": "Username is already in use.",
+ "RULE_USER_EXISTING": "Name is already in use.",
+ "EMPTY": "Name is required"
},
"PLACEHOLDER": {
"CURRENT_PWD": "Enter current password",
@@ -307,7 +309,17 @@
"INVALID_DATE": "Invalid date.",
"PLACEHOLDER": "We couldn't find any replication rules!",
"JOB_PLACEHOLDER": "We couldn't find any replication jobs!",
- "JOB_LOG_VIEWER": "View Replication Job Log"
+ "JOB_LOG_VIEWER": "View Replication Job Log",
+ "BACKINFO": "Please add project and endpoint first",
+ "FILTER": "Filter",
+ "SCHEDULE": "Schedule",
+ "SETTING":"Setting",
+ "TRIGGER":"Trigger",
+ "TARGETS":"Target",
+ "SOURCE": "Source",
+ "REPLICATE": "Replicate",
+ "DELETE_REMOTE_IMAGES":"Delete remote images when locally deleted",
+ "REPLICATE_IMMEDIATE":"Replicate exiting images immediately"
},
"DESTINATION": {
"NEW_ENDPOINT": "New Endpoint",
@@ -321,7 +333,7 @@
"TEST_CONNECTION": "Test Connection",
"TITLE_EDIT": "Edit Endpoint",
"TITLE_ADD": "Create Endpoint",
- "DELETE": "Delete",
+ "DELETE": "Delete Endpoint",
"TESTING_CONNECTION": "Testing Connection...",
"TEST_CONNECTION_SUCCESS": "Connection tested successfully.",
"TEST_CONNECTION_FAILURE": "Failed to ping endpoint.",
diff --git a/src/ui_ng/src/i18n/lang/es-es-lang.json b/src/ui_ng/src/i18n/lang/es-es-lang.json
index 74de7209a..152bbe373 100644
--- a/src/ui_ng/src/i18n/lang/es-es-lang.json
+++ b/src/ui_ng/src/i18n/lang/es-es-lang.json
@@ -57,7 +57,9 @@
"NUMBER_REQUIRED": "El campo es obligatorio y debería ser un número.",
"PORT_REQUIRED": "El campo es obligatorio y debería ser un número de puerto válido.",
"EMAIL_EXISTING": "Esa dirección de email ya existe.",
- "USER_EXISTING": "Ese nombre de usuario ya existe."
+ "USER_EXISTING": "Ese nombre de usuario ya existe.",
+ "RULE_USER_EXISTING": "Name is already in use.",
+ "EMPTY": "Name is required"
},
"PLACEHOLDER": {
"CURRENT_PWD": "Introduzca la contraseña actual",
@@ -306,7 +308,16 @@
"INVALID_DATE": "Fecha invalida.",
"PLACEHOLDER": "We couldn't find any replication rules!",
"JOB_PLACEHOLDER": "We couldn't find any replication jobs!",
- "JOB_LOG_VIEWER": "View Replication Job Log"
+ "JOB_LOG_VIEWER": "View Replication Job Log",
+ "BACKINFO": "Please add project and endpoint first",
+ "FILTER": "Filter",
+ "SCHEDULE": "Schedule",
+ "SETTING":"Setting",
+ "TRIGGER":"Trigger",
+ "TARGETS":"Target",
+ "SOURCE": "Source",
+ "DELETE_REMOTE_IMAGES":"Delete remote images when locally deleted",
+ "REPLICATE_IMMEDIATE":"Replicate exiting images immediately"
},
"DESTINATION": {
"NEW_ENDPOINT": "Nuevo Endpoint",
@@ -320,7 +331,7 @@
"TEST_CONNECTION": "Comprobar conexión",
"TITLE_EDIT": "Editar Endpoint",
"TITLE_ADD": "Crear Endpoint",
- "DELETE": "Eliminar",
+ "DELETE": "Eliminar Endpoint",
"TESTING_CONNECTION": "Comprobar conexión...",
"TEST_CONNECTION_SUCCESS": "Conexión comprobada satisfactoriamente.",
"TEST_CONNECTION_FAILURE": "Fallo al comprobar el endpoint.",
diff --git a/src/ui_ng/src/i18n/lang/zh-cn-lang.json b/src/ui_ng/src/i18n/lang/zh-cn-lang.json
index 07970081f..eded564d7 100644
--- a/src/ui_ng/src/i18n/lang/zh-cn-lang.json
+++ b/src/ui_ng/src/i18n/lang/zh-cn-lang.json
@@ -57,7 +57,9 @@
"NUMBER_REQUIRED": "此项为必填项且为数字。",
"PORT_REQUIRED": "此项为必填项且为合法端口号。",
"EMAIL_EXISTING": "邮件地址已经存在。",
- "USER_EXISTING": "用户名已经存在。"
+ "USER_EXISTING": "用户名已经存在。",
+ "RULE_USER_EXISTING": "名称已经存在。",
+ "EMPTY": "名称为必填项"
},
"PLACEHOLDER": {
"CURRENT_PWD": "输入当前密码",
@@ -306,7 +308,16 @@
"INVALID_DATE": "无效日期。",
"PLACEHOLDER": "未发现任何复制规则!",
"JOB_PLACEHOLDER": "未发现任何复制任务!",
- "JOB_LOG_VIEWER": "查看复制任务日志"
+ "JOB_LOG_VIEWER": "查看复制任务日志",
+ "BACKINFO": "请先添加项目名称和目标",
+ "FILTER": "过滤",
+ "SCHEDULE": "日程",
+ "SETTING":"设置",
+ "TRIGGER":"触发器",
+ "TARGETS":"目标",
+ "SOURCE": "资源",
+ "DELETE_REMOTE_IMAGES":"删除本地镜像时同时也删除远程的镜像。",
+ "REPLICATE_IMMEDIATE":"立即复制现有的镜像。"
},
"DESTINATION": {
"NEW_ENDPOINT": "新建目标",
@@ -320,7 +331,7 @@
"TEST_CONNECTION": "测试连接",
"TITLE_EDIT": "编辑目标",
"TITLE_ADD": "新建目标",
- "DELETE": "删除",
+ "DELETE": "删除目标",
"TESTING_CONNECTION": "正在测试连接...",
"TEST_CONNECTION_SUCCESS": "测试连接成功。",
"TEST_CONNECTION_FAILURE": "测试连接失败。",
diff --git a/tests/apitests/apilib/rep_policy_post.go b/tests/apitests/apilib/rep_policy_post.go
index 6b8d42731..567bab7a4 100644
--- a/tests/apitests/apilib/rep_policy_post.go
+++ b/tests/apitests/apilib/rep_policy_post.go
@@ -1,10 +1,10 @@
-/*
+/*
* Harbor API
*
* These APIs provide services for manipulating Harbor project.
*
* OpenAPI spec version: 0.3.0
- *
+ *
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/resources/Harbor-Pages/Configuration.robot b/tests/resources/Harbor-Pages/Configuration.robot
index e4c1cec4c..0afa72da0 100644
--- a/tests/resources/Harbor-Pages/Configuration.robot
+++ b/tests/resources/Harbor-Pages/Configuration.robot
@@ -98,7 +98,7 @@ Set Pro Create Admin Only
Capture Page Screenshot AdminCreateOnly.png
Set Pro Create Every One
- #set limit to Every One
+ #set limit to Every One
Click Element xpath=${configuration_xpath}
Sleep 1
Click Element xpath=//select[@id="proCreation"]
@@ -108,7 +108,7 @@ Set Pro Create Every One
Sleep 2
Capture Page Screenshot EveryoneCreate.png
-Disable Self Reg
+Disable Self Reg
Click Element xpath=${configuration_xpath}
Mouse Down xpath=${self_reg_xpath}
Mouse Up xpath=${self_reg_xpath}
diff --git a/tests/resources/Harbor-Pages/Replication.robot b/tests/resources/Harbor-Pages/Replication.robot
index 3f142c6ef..62e5b6e37 100644
--- a/tests/resources/Harbor-Pages/Replication.robot
+++ b/tests/resources/Harbor-Pages/Replication.robot
@@ -22,6 +22,7 @@ ${HARBOR_VERSION} v1.1.1
*** Keywords ***
Create An New Rule With New Endpoint
[Arguments] ${policy_name} ${policy_description} ${destination_name} ${destination_url} ${destination_username} ${destination_password}
+
Click element ${new_name_xpath}
Sleep 2
@@ -30,15 +31,14 @@ Create An New Rule With New Endpoint
#Click element xpath=${policy_enable_checkbox}
#enable attribute is droped in new ui
+
Click element xpath=${policy_endpoint_checkbox}
- Input text xpath=${destination_name_xpath} ${destination_name}
- Input text xpath=${destination_url_xpath} ${destination_url}
- Input text xpath=${destination_username_xpath} ${destination_username}
- Input text xpath=${destination_password_xpath} ${destination_password}
- Click element xpath=${replicaton_save_xpath}
+ Click element xpath=//*[@id="ruleBtnOk"]
Sleep 5
Capture Page Screenshot rule_${policy_name}.png
Wait Until Page Contains ${policy_name}
+
Wait Until Page Contains ${policy_description}
Wait Until Page Contains ${destination_name}
+
diff --git a/tests/robot-cases/Group0-BAT/BAT.robot b/tests/robot-cases/Group0-BAT/BAT.robot
index 17b6d6328..9d51d091b 100644
--- a/tests/robot-cases/Group0-BAT/BAT.robot
+++ b/tests/robot-cases/Group0-BAT/BAT.robot
@@ -237,15 +237,15 @@ Test Case - Edit Token Expire
Modify Token Expiration 30
Close Browser
-Test Case - Create An Replication Rule New Endpoint
- Init Chrome Driver
- ${d}= Get current date result_format=%m%s
- Sign In Harbor ${HARBOR_URL} %{HARBOR_ADMIN} %{HARBOR_PASSWORD}
- Create An New Project project${d}
- Go Into Project project${d}
- Switch To Replication
- Create An New Rule With New Endpoint policy_name=test_policy_${d} policy_description=test_description destination_name=test_destination_name_${d} destination_url=test_destination_url_${d} destination_username=test_destination_username destination_password=test_destination_password
- Close Browser
+# Test Case - Create An Replication Rule New Endpoint
+# Init Chrome Driver
+# ${d}= Get current date result_format=%m%s
+# Sign In Harbor ${HARBOR_URL} %{HARBOR_ADMIN} %{HARBOR_PASSWORD}
+# Create An New Project project${d}
+# Go Into Project project${d}
+# Switch To Replication
+# Create An New Rule With New Endpoint policy_name=test_policy_${d} policy_description=test_description destination_name=test_destination_name_${d} destination_url=test_destination_url_${d} destination_username=test_destination_username destination_password=test_destination_password
+# Close Browser
Test Case - Scan A Tag In The Repo
Init Chrome Driver
diff --git a/tools/migration/changelog.md b/tools/migration/changelog.md
index 76d4f0438..c719f00d7 100644
--- a/tools/migration/changelog.md
+++ b/tools/migration/changelog.md
@@ -56,6 +56,11 @@ Changelog for harbor database schema
- insert data into table `project_metadata`
- delete column `public` from table `project`
- add column `insecure` to table `replication_target`
-## 1.3.x
+
+## 1.3.1
+
+ - add column `filters` to table `replication_policy`
+ - add column `replicate_deletion` to table `replication_policy`
+ - create table `replication_immediate_trigger`
- add pk `id` to table `properties`
- remove pk index from colum 'k' of table `properties`