From 35489e40ff88184f3c12ef99dfc91bd4b285ed52 Mon Sep 17 00:00:00 2001 From: kunw Date: Mon, 24 Apr 2017 18:48:35 +0800 Subject: [PATCH 1/5] Fix UI defered issues. --- .../src/app/log/audit-log.component.html | 6 +- .../create-project.component.html | 17 ++-- .../project/create-project/create-project.css | 9 -- .../app/project/member/member.component.css | 4 - .../app/project/member/member.component.html | 6 +- .../app/project/member/member.component.ts | 2 +- .../project-detail.component.css | 4 + .../src/app/project/project.component.html | 2 +- .../replication-management.component.css | 4 + .../replication/replication.component.html | 86 +++++++++---------- .../app/replication/replication.component.ts | 42 +++++---- 11 files changed, 92 insertions(+), 90 deletions(-) diff --git a/src/ui_ng/src/app/log/audit-log.component.html b/src/ui_ng/src/app/log/audit-log.component.html index 39e2b726e..d787c1cf5 100644 --- a/src/ui_ng/src/app/log/audit-log.component.html +++ b/src/ui_ng/src/app/log/audit-log.component.html @@ -14,7 +14,11 @@
- {{f.description | translate}} + + + + {{f.description | translate}} +
diff --git a/src/ui_ng/src/app/project/create-project/create-project.component.html b/src/ui_ng/src/app/project/create-project/create-project.component.html index 97f838bb2..48117cbc4 100644 --- a/src/ui_ng/src/app/project/create-project/create-project.component.html +++ b/src/ui_ng/src/app/project/create-project/create-project.component.html @@ -4,10 +4,10 @@
-
- +
+
-
- +
+
+ + + {{'PROJECT.INLINE_HELP_PUBLIC' | translate }} +
-

- {{'PROJECT.INLINE_HELP_PUBLIC' | translate }} -

diff --git a/src/ui_ng/src/app/project/create-project/create-project.css b/src/ui_ng/src/app/project/create-project/create-project.css index 526c33101..0bcac82e9 100644 --- a/src/ui_ng/src/app/project/create-project/create-project.css +++ b/src/ui_ng/src/app/project/create-project/create-project.css @@ -1,12 +1,3 @@ -.inline-help-public { - color: #CCCCCC; - font-size: 12px; - line-height: 1.5em; - letter-spacing: 0.01em; - margin-top: 0; - padding: 0 14px; -} - .form-group-label-override { font-size: 14px; font-weight: 400; diff --git a/src/ui_ng/src/app/project/member/member.component.css b/src/ui_ng/src/app/project/member/member.component.css index c782e3827..ab3bc903f 100644 --- a/src/ui_ng/src/app/project/member/member.component.css +++ b/src/ui_ng/src/app/project/member/member.component.css @@ -5,8 +5,4 @@ .option-right { padding-right: 16px; margin-top: 18px; -} - -.datagrid-foot { - margin-bottom: 0.5px; } \ No newline at end of file diff --git a/src/ui_ng/src/app/project/member/member.component.html b/src/ui_ng/src/app/project/member/member.component.html index 78ba04ea8..7f36d7639 100644 --- a/src/ui_ng/src/app/project/member/member.component.html +++ b/src/ui_ng/src/app/project/member/member.component.html @@ -19,9 +19,9 @@ {{'MEMBER.ROLE' | translate}} - - - + + + {{m.username}} diff --git a/src/ui_ng/src/app/project/member/member.component.ts b/src/ui_ng/src/app/project/member/member.component.ts index a69ac692c..494dfcb4d 100644 --- a/src/ui_ng/src/app/project/member/member.component.ts +++ b/src/ui_ng/src/app/project/member/member.component.ts @@ -111,8 +111,8 @@ export class MemberComponent implements OnInit, OnDestroy { ngOnInit() { //Get projectId from route params snapshot. this.projectId = +this.route.snapshot.parent.params['id']; - this.currentUser = this.session.getCurrentUser(); //Get current user from registered resolver. + this.currentUser = this.session.getCurrentUser(); let resolverData = this.route.snapshot.parent.data; if(resolverData) { this.hasProjectAdminRole = (resolverData['projectResolver']).has_project_admin_role; diff --git a/src/ui_ng/src/app/project/project-detail/project-detail.component.css b/src/ui_ng/src/app/project/project-detail/project-detail.component.css index 25f27c693..90f5add5f 100644 --- a/src/ui_ng/src/app/project/project-detail/project-detail.component.css +++ b/src/ui_ng/src/app/project/project-detail/project-detail.component.css @@ -7,6 +7,10 @@ background-color: #fafafa; } +.subnav .nav { + padding-left: 0; +} + .role-label { color: #CCCCCC; font-size: 14px; diff --git a/src/ui_ng/src/app/project/project.component.html b/src/ui_ng/src/app/project/project.component.html index e2b82e968..ddc4aed0c 100644 --- a/src/ui_ng/src/app/project/project.component.html +++ b/src/ui_ng/src/app/project/project.component.html @@ -13,7 +13,7 @@
- diff --git a/src/ui_ng/src/app/replication/replication-management/replication-management.component.css b/src/ui_ng/src/app/replication/replication-management/replication-management.component.css index 0286e4e83..fd8cfb74e 100644 --- a/src/ui_ng/src/app/replication/replication-management/replication-management.component.css +++ b/src/ui_ng/src/app/replication/replication-management/replication-management.component.css @@ -5,4 +5,8 @@ .sub-nav-bg-color { background-color: #fafafa; +} + +.subnav .nav { + padding-left: 0; } \ No newline at end of file diff --git a/src/ui_ng/src/app/replication/replication.component.html b/src/ui_ng/src/app/replication/replication.component.html index ac6a8e8f8..6bb7c5708 100644 --- a/src/ui_ng/src/app/replication/replication.component.html +++ b/src/ui_ng/src/app/replication/replication.component.html @@ -1,58 +1,50 @@
-
-
-
- - -
-
- - -
- {{r.description | translate}} -
- - - - - -
-
+
+
+
+ + +
+
+
+ +
+ + + + +
+
- +
-
-
{{'REPLICATION.REPLICATION_JOBS' | translate}}
-
- - - - - -
+
+
{{'REPLICATION.REPLICATION_JOBS' | translate}}
+
+ + + + +
-
- - -
- {{j.description | translate}} -
- -
- - -
+
+
+
+
+
+ + +
+
- +
\ No newline at end of file diff --git a/src/ui_ng/src/app/replication/replication.component.ts b/src/ui_ng/src/app/replication/replication.component.ts index 1392332e7..903408c59 100644 --- a/src/ui_ng/src/app/replication/replication.component.ts +++ b/src/ui_ng/src/app/replication/replication.component.ts @@ -20,6 +20,7 @@ import { MessageHandlerService } from '../shared/message-handler/message-handler import { ReplicationService } from './replication.service'; +import { SessionUser } from '../shared/session-user'; import { Policy } from './policy'; import { Job } from './job'; import { Target } from './target'; @@ -27,13 +28,13 @@ import { Target } from './target'; import { State } from 'clarity-angular'; const ruleStatus = [ - { 'key': '', 'description': 'REPLICATION.ALL_STATUS'}, + { 'key': 'all', 'description': 'REPLICATION.ALL_STATUS'}, { 'key': '1', 'description': 'REPLICATION.ENABLED'}, { 'key': '0', 'description': 'REPLICATION.DISABLED'} ]; const jobStatus = [ - { 'key': '', 'description': 'REPLICATION.ALL' }, + { 'key': 'all', 'description': 'REPLICATION.ALL' }, { 'key': 'pending', 'description': 'REPLICATION.PENDING' }, { 'key': 'running', 'description': 'REPLICATION.RUNNING' }, { 'key': 'error', 'description': 'REPLICATION.ERROR' }, @@ -62,7 +63,7 @@ class SearchOption { styleUrls: ['./replication.component.css'] }) export class ReplicationComponent implements OnInit { - + projectId: number; search: SearchOption; @@ -92,7 +93,7 @@ export class ReplicationComponent implements OnInit { constructor( private messageHandlerService: MessageHandlerService, private replicationService: ReplicationService, - private route: ActivatedRoute) { + private route: ActivatedRoute) { } ngOnInit(): void { @@ -171,9 +172,9 @@ export class ReplicationComponent implements OnInit { if(policy) { this.search.policyId = policy.id; this.search.repoName = ''; - this.search.status = '' + this.search.status = ''; this.currentJobSearchOption = 0; - this.currentJobStatus = { 'key': '', 'description': 'REPLICATION.ALL'}; + this.currentJobStatus = { 'key': 'all', 'description': 'REPLICATION.ALL' }; this.fetchPolicyJobs(); } } @@ -183,19 +184,28 @@ export class ReplicationComponent implements OnInit { this.retrievePolicies(); } - doFilterPolicyStatus(status: string) { - this.currentRuleStatus = this.ruleStatus.find(r=>r.key === status); - if(status.trim() === '') { - this.changedPolicies = this.policies; - } else { - this.changedPolicies = this.policies.filter(policy=>policy.enabled === +this.currentRuleStatus.key); + doFilterPolicyStatus($event: any) { + if ($event && $event.target && $event.target["value"]) { + let status = $event.target["value"]; + this.currentRuleStatus = this.ruleStatus.find(r=>r.key === status); + if(this.currentRuleStatus.key === 'all') { + this.changedPolicies = this.policies; + } else { + this.changedPolicies = this.policies.filter(policy=>policy.enabled === +this.currentRuleStatus.key); + } } } - doFilterJobStatus(status: string) { - this.currentJobStatus = this.jobStatus.find(r=>r.key === status); - this.search.status = status; - this.doSearchJobs(this.search.repoName); + doFilterJobStatus($event: any) { + if ($event && $event.target && $event.target["value"]) { + let status = $event.target["value"]; + this.currentJobStatus = this.jobStatus.find(r=>r.key === status); + if(this.currentJobStatus.key === 'all') { + status = ''; + } + this.search.status = status; + this.doSearchJobs(this.search.repoName); + } } doSearchJobs(repoName: string) { From adee392c3c00051d646d3f322c693bffa343dd8a Mon Sep 17 00:00:00 2001 From: kunw Date: Tue, 25 Apr 2017 20:34:28 +0800 Subject: [PATCH 2/5] Fix issues about confirm buttons and date validation. --- .../src/app/log/audit-log.component.html | 16 +++++- src/ui_ng/src/app/log/audit-log.component.ts | 28 ++++++++--- src/ui_ng/src/app/log/log.module.ts | 3 +- .../create-project.component.html | 2 +- .../list-project/list-project.component.html | 2 +- .../app/project/member/member.component.ts | 5 +- .../src/app/project/project.component.ts | 5 +- .../destination/destination.component.ts | 5 +- .../replication/replication.component.html | 16 +++++- .../app/replication/replication.component.ts | 31 ++++++++---- .../app/repository/repository.component.ts | 5 +- .../tag-repository.component.ts | 12 ++--- .../confirmation-dialog.component.html | 19 +++++-- .../confirmation-dialog.component.ts | 8 ++- .../confirmation-message.ts | 7 +-- .../app/shared/date-validator.directive.ts | 50 +++++++++++++++++++ .../list-policy/list-policy.component.ts | 5 +- .../list-project-ro.component.html | 2 +- src/ui_ng/src/app/shared/shared.const.ts | 3 ++ src/ui_ng/src/app/shared/shared.module.ts | 7 ++- src/ui_ng/src/app/user/user.component.ts | 5 +- src/ui_ng/src/i18n/lang/en-us-lang.json | 7 ++- src/ui_ng/src/i18n/lang/es-es-lang.json | 7 ++- src/ui_ng/src/i18n/lang/zh-cn-lang.json | 7 ++- 24 files changed, 195 insertions(+), 62 deletions(-) create mode 100644 src/ui_ng/src/app/shared/date-validator.directive.ts diff --git a/src/ui_ng/src/app/log/audit-log.component.html b/src/ui_ng/src/app/log/audit-log.component.html index d787c1cf5..69791755f 100644 --- a/src/ui_ng/src/app/log/audit-log.component.html +++ b/src/ui_ng/src/app/log/audit-log.component.html @@ -22,8 +22,20 @@
- - + + + +
diff --git a/src/ui_ng/src/app/log/audit-log.component.ts b/src/ui_ng/src/app/log/audit-log.component.ts index 7c4a24aff..aa5e84831 100644 --- a/src/ui_ng/src/app/log/audit-log.component.ts +++ b/src/ui_ng/src/app/log/audit-log.component.ts @@ -105,15 +105,29 @@ export class AuditLogComponent implements OnInit { this.retrieve(); } - doSearchByTimeRange(strDate: string, target: string): void { - let oneDayOffset = 3600 * 24; - switch(target) { - case 'begin': + convertDate(strDate: string): string { + if(/^(0[1-9]|[12][0-9]|3[01])[- /.](0[1-9]|1[012])[- /.](19|20)\d\d$/.test(strDate)) { + let parts = strDate.split(/[-\/]/); + strDate = parts[2] /*Year*/ + '-' +parts[1] /*Month*/ + '-' + parts[0] /*Date*/; + } + return strDate; + } + + doSearchByStartTime(valid: boolean, strDate: string): void { + this.queryParam.begin_timestamp = 0; + if(valid && strDate){ + strDate = this.convertDate(strDate); this.queryParam.begin_timestamp = new Date(strDate).getTime() / 1000; - break; - case 'end': + } + this.retrieve(); + } + + doSearchByEndTime(valid: boolean, strDate: string): void { + this.queryParam.end_timestamp = 0; + if(valid && strDate) { + strDate = this.convertDate(strDate); + let oneDayOffset = 3600 * 24; this.queryParam.end_timestamp = new Date(strDate).getTime() / 1000 + oneDayOffset; - break; } this.retrieve(); } diff --git a/src/ui_ng/src/app/log/log.module.ts b/src/ui_ng/src/app/log/log.module.ts index 533e20d7d..6200eb09f 100644 --- a/src/ui_ng/src/app/log/log.module.ts +++ b/src/ui_ng/src/app/log/log.module.ts @@ -21,7 +21,8 @@ import { RecentLogComponent } from './recent-log.component'; imports: [SharedModule], declarations: [ AuditLogComponent, - RecentLogComponent], + RecentLogComponent + ], providers: [AuditLogService], exports: [ AuditLogComponent, diff --git a/src/ui_ng/src/app/project/create-project/create-project.component.html b/src/ui_ng/src/app/project/create-project/create-project.component.html index 48117cbc4..2fa899a64 100644 --- a/src/ui_ng/src/app/project/create-project/create-project.component.html +++ b/src/ui_ng/src/app/project/create-project/create-project.component.html @@ -20,7 +20,7 @@
- +
diff --git a/src/ui_ng/src/app/project/list-project/list-project.component.html b/src/ui_ng/src/app/project/list-project/list-project.component.html index da18a7f7d..4529d2876 100644 --- a/src/ui_ng/src/app/project/list-project/list-project.component.html +++ b/src/ui_ng/src/app/project/list-project/list-project.component.html @@ -1,6 +1,6 @@ {{'PROJECT.NAME' | translate}} - {{'PROJECT.PUBLIC_OR_PRIVATE' | translate}} + {{'PROJECT.ACCESS_LEVEL' | translate}} {{'PROJECT.ROLE' | translate}} {{'PROJECT.REPO_COUNT'| translate}} {{'PROJECT.CREATION_TIME' | translate}} diff --git a/src/ui_ng/src/app/project/member/member.component.ts b/src/ui_ng/src/app/project/member/member.component.ts index 494dfcb4d..2521fe519 100644 --- a/src/ui_ng/src/app/project/member/member.component.ts +++ b/src/ui_ng/src/app/project/member/member.component.ts @@ -22,7 +22,7 @@ import { MemberService } from './member.service'; import { AddMemberComponent } from './add-member/add-member.component'; import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; -import { ConfirmationTargets, ConfirmationState } from '../../shared/shared.const'; +import { ConfirmationTargets, ConfirmationState, ConfirmationButtons } from '../../shared/shared.const'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; @@ -149,7 +149,8 @@ export class MemberComponent implements OnInit, OnDestroy { 'MEMBER.DELETION_SUMMARY', m.username, m.user_id, - ConfirmationTargets.PROJECT_MEMBER + ConfirmationTargets.PROJECT_MEMBER, + ConfirmationButtons.DELETE_CANCEL ); this.deletionDialogService.openComfirmDialog(deletionMessage); } diff --git a/src/ui_ng/src/app/project/project.component.ts b/src/ui_ng/src/app/project/project.component.ts index 4c8489f41..fcb4b668d 100644 --- a/src/ui_ng/src/app/project/project.component.ts +++ b/src/ui_ng/src/app/project/project.component.ts @@ -29,7 +29,7 @@ import { Response } from '@angular/http'; import { ConfirmationDialogService } from '../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../shared/confirmation-dialog/confirmation-message'; -import { ConfirmationTargets, ConfirmationState } from '../shared/shared.const'; +import { ConfirmationTargets, ConfirmationState, ConfirmationButtons } from '../shared/shared.const'; import { Subscription } from 'rxjs/Subscription'; @@ -178,7 +178,8 @@ export class ProjectComponent implements OnInit, OnDestroy { 'PROJECT.DELETION_SUMMARY', p.name, p.project_id, - ConfirmationTargets.PROJECT + ConfirmationTargets.PROJECT, + ConfirmationButtons.DELETE_CANCEL ); this.deletionDialogService.openComfirmDialog(deletionMessage); } diff --git a/src/ui_ng/src/app/replication/destination/destination.component.ts b/src/ui_ng/src/app/replication/destination/destination.component.ts index 384395041..37f049471 100644 --- a/src/ui_ng/src/app/replication/destination/destination.component.ts +++ b/src/ui_ng/src/app/replication/destination/destination.component.ts @@ -19,7 +19,7 @@ import { MessageHandlerService } from '../../shared/message-handler/message-hand import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; -import { ConfirmationTargets, ConfirmationState } from '../../shared/shared.const'; +import { ConfirmationTargets, ConfirmationState, ConfirmationButtons } from '../../shared/shared.const'; import { Subscription } from 'rxjs/Subscription'; @@ -149,7 +149,8 @@ export class DestinationComponent implements OnInit { 'REPLICATION.DELETION_SUMMARY_TARGET', target.name, target.id, - ConfirmationTargets.TARGET); + ConfirmationTargets.TARGET, + ConfirmationButtons.DELETE_CANCEL); this.deletionDialogService.openComfirmDialog(deletionMessage); } } diff --git a/src/ui_ng/src/app/replication/replication.component.html b/src/ui_ng/src/app/replication/replication.component.html index 6bb7c5708..d35493611 100644 --- a/src/ui_ng/src/app/replication/replication.component.html +++ b/src/ui_ng/src/app/replication/replication.component.html @@ -39,8 +39,20 @@
- - + + + +
diff --git a/src/ui_ng/src/app/replication/replication.component.ts b/src/ui_ng/src/app/replication/replication.component.ts index 903408c59..0c9e0ff80 100644 --- a/src/ui_ng/src/app/replication/replication.component.ts +++ b/src/ui_ng/src/app/replication/replication.component.ts @@ -232,20 +232,31 @@ export class ReplicationComponent implements OnInit { (option === 1) ? this.currentJobSearchOption = 0 : this.currentJobSearchOption = 1; } - doJobSearchByStartTime(strDate: string) { - if(!strDate || strDate.trim() === '') { - strDate = 0 + ''; - } - (strDate === '0') ? this.search.startTime = '' : this.search.startTime = (new Date(strDate).getTime() / 1000) + ''; + convertDate(strDate: string): string { + if(/^(0[1-9]|[12][0-9]|3[01])[- /.](0[1-9]|1[012])[- /.](19|20)\d\d$/.test(strDate)) { + let parts = strDate.split(/[-\/]/); + strDate = parts[2] /*Year*/ + '-' +parts[1] /*Month*/ + '-' + parts[0] /*Date*/; + } + return strDate; + } + + doJobSearchByStartTime(valid: boolean, strDate: string) { + this.search.startTime = ''; + if(valid && strDate) { + strDate = this.convertDate(strDate); + console.log(strDate); + this.search.startTime = (new Date(strDate).getTime() / 1000) + ''; + } this.fetchPolicyJobs(); } - doJobSearchByEndTime(strDate: string) { - if(!strDate || strDate.trim() === '') { - strDate = 0 + ''; + doJobSearchByEndTime(valid: boolean, strDate: string) { + this.search.endTime = ''; + if(valid && strDate) { + strDate = this.convertDate(strDate); + let oneDayOffset = 3600 * 24; + this.search.endTime = (new Date(strDate).getTime() / 1000 + oneDayOffset) + ''; } - let oneDayOffset = 3600 * 24; - (strDate === '0') ? this.search.endTime = '' : this.search.endTime = (new Date(strDate).getTime() / 1000 + oneDayOffset) + ''; this.fetchPolicyJobs(); } } \ No newline at end of file diff --git a/src/ui_ng/src/app/repository/repository.component.ts b/src/ui_ng/src/app/repository/repository.component.ts index a3f24565c..265cb2ae1 100644 --- a/src/ui_ng/src/app/repository/repository.component.ts +++ b/src/ui_ng/src/app/repository/repository.component.ts @@ -18,7 +18,7 @@ import { RepositoryService } from './repository.service'; import { Repository } from './repository'; import { MessageHandlerService } from '../shared/message-handler/message-handler.service'; -import { ConfirmationState, ConfirmationTargets } from '../shared/shared.const'; +import { ConfirmationState, ConfirmationTargets, ConfirmationButtons } from '../shared/shared.const'; import { ConfirmationDialogService } from '../shared/confirmation-dialog/confirmation-dialog.service'; @@ -115,7 +115,8 @@ export class RepositoryComponent implements OnInit { 'REPOSITORY.DELETION_SUMMARY_REPO', repoName, repoName, - ConfirmationTargets.REPOSITORY); + ConfirmationTargets.REPOSITORY, + ConfirmationButtons.DELETE_CANCEL); this.deletionDialogService.openComfirmDialog(message); } diff --git a/src/ui_ng/src/app/repository/tag-repository/tag-repository.component.ts b/src/ui_ng/src/app/repository/tag-repository/tag-repository.component.ts index 37f32ea5a..5c5db27df 100644 --- a/src/ui_ng/src/app/repository/tag-repository/tag-repository.component.ts +++ b/src/ui_ng/src/app/repository/tag-repository/tag-repository.component.ts @@ -16,7 +16,7 @@ import { ActivatedRoute } from '@angular/router'; import { RepositoryService } from '../repository.service'; import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; -import { ConfirmationTargets, ConfirmationState } from '../../shared/shared.const'; +import { ConfirmationTargets, ConfirmationState, ConfirmationButtons } from '../../shared/shared.const'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; @@ -155,25 +155,25 @@ export class TagRepositoryComponent implements OnInit, OnDestroy { deleteTag(tag: TagView) { if (tag) { - let titleKey: string, summaryKey: string, content: string, confirmOnly: boolean; + let titleKey: string, summaryKey: string, content: string, buttons: ConfirmationButtons; if (tag.signed) { titleKey = 'REPOSITORY.DELETION_TITLE_TAG_DENIED'; summaryKey = 'REPOSITORY.DELETION_SUMMARY_TAG_DENIED'; - confirmOnly = true; + buttons = ConfirmationButtons.CLOSE; content = 'notary -s https://' + this.registryUrl + ':4443 -d ~/.docker/trust remove -p ' + this.registryUrl + '/' + this.repoName + ' ' + tag.tag; } else { titleKey = 'REPOSITORY.DELETION_TITLE_TAG'; summaryKey = 'REPOSITORY.DELETION_SUMMARY_TAG'; + buttons = ConfirmationButtons.DELETE_CANCEL; content = tag.tag; - confirmOnly = false; } let message = new ConfirmationMessage( titleKey, summaryKey, content, tag, - ConfirmationTargets.TAG); - message.confirmOnly = confirmOnly; + ConfirmationTargets.TAG, + buttons); this.deletionDialogService.openComfirmDialog(message); } } 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 fe56db9b8..0154a11dd 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 @@ -6,8 +6,21 @@
{{dialogContent}}
-
- - +
+ + + + + + + + + + + + + + +
\ No newline at end of file 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 15bfd363a..519ba66e3 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 @@ -18,7 +18,7 @@ import { TranslateService } from '@ngx-translate/core'; import { ConfirmationDialogService } from './confirmation-dialog.service'; import { ConfirmationMessage } from './confirmation-message'; import { ConfirmationAcknowledgement } from './confirmation-state-message'; -import { ConfirmationState, ConfirmationTargets } from '../shared.const'; +import { ConfirmationState, ConfirmationTargets, ConfirmationButtons } from '../shared.const'; @Component({ selector: 'confiramtion-dialog', @@ -30,10 +30,9 @@ export class ConfirmationDialogComponent implements OnDestroy { opened: boolean = false; dialogTitle: string = ""; dialogContent: string = ""; - buttonKey: string = 'BUTTON.OK'; - confirmOnly: boolean = false; message: ConfirmationMessage; annouceSubscription: Subscription; + buttons: ConfirmationButtons; constructor( private confirmationService: ConfirmationDialogService, @@ -42,11 +41,10 @@ export class ConfirmationDialogComponent implements OnDestroy { this.dialogTitle = msg.title; this.dialogContent = msg.message; this.message = msg; - this.confirmOnly = this.message.confirmOnly; - this.buttonKey = this.confirmOnly ? 'BUTTON.CLOSE' : 'BUTTON.OK'; this.translate.get(this.dialogTitle).subscribe((res: string) => this.dialogTitle = res); this.translate.get(this.dialogContent, { 'param': msg.param }).subscribe((res: string) => this.dialogContent = res); //Open dialog + this.buttons = msg.buttons; this.open(); }); } diff --git a/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-message.ts b/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-message.ts index 15d1fcad8..9a9307c69 100644 --- a/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-message.ts +++ b/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-message.ts @@ -11,20 +11,21 @@ // 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 { ConfirmationTargets } from '../../shared/shared.const'; +import { ConfirmationTargets, ConfirmationButtons } from '../../shared/shared.const'; export class ConfirmationMessage { - public constructor(title: string, message: string, param: string, data: any, targetId: ConfirmationTargets) { + public constructor(title: string, message: string, param: string, data: any, targetId: ConfirmationTargets, buttons?: ConfirmationButtons) { this.title = title; this.message = message; this.data = data; this.targetId = targetId; this.param = param; + this.buttons = buttons ? buttons : ConfirmationButtons.CONFIRM_CANCEL; } title: string; message: string; data: any = {};//default is empty targetId: ConfirmationTargets = ConfirmationTargets.EMPTY; param: string; - confirmOnly: boolean; + buttons: ConfirmationButtons; } \ No newline at end of file diff --git a/src/ui_ng/src/app/shared/date-validator.directive.ts b/src/ui_ng/src/app/shared/date-validator.directive.ts new file mode 100644 index 000000000..7c689e4ef --- /dev/null +++ b/src/ui_ng/src/app/shared/date-validator.directive.ts @@ -0,0 +1,50 @@ +// 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 { Directive, OnChanges, Input, SimpleChanges } from '@angular/core'; +import { NG_VALIDATORS, Validator, Validators, ValidatorFn, AbstractControl } from '@angular/forms'; + +@Directive({ + selector: '[dateValidator]', + providers: [{provide: NG_VALIDATORS, useExisting: DateValidatorDirective, multi: true}] +}) +export class DateValidatorDirective implements Validator, OnChanges { + @Input() dateValidator: string; + private valFn = Validators.nullValidator; + + ngOnChanges(changes: SimpleChanges): void { + const change = changes['dateValidator']; + if (change) { + this.valFn = dateValidator(); + } else { + this.valFn = Validators.nullValidator; + } + } + validate(control: AbstractControl): {[key: string]: any} { + return this.valFn(control); + } +} + +export function dateValidator(): ValidatorFn { + return (control: AbstractControl): {[key: string]: any} => { + let controlValue = control.value; + let valid = true; + if(controlValue) { + const regYMD=/^(19|20)\d\d([- /.])(0[1-9]|1[012])\2(0[1-9]|[12][0-9]|3[01])$/g; + const regDMY=/^(0[1-9]|[12][0-9]|3[01])[- /.](0[1-9]|1[012])[- /.](19|20)\d\d$/g; + valid = (regYMD.test(controlValue) || regDMY.test(controlValue)); + } + return valid ? null : {'dateValidator': { value: controlValue }}; + }; +} + diff --git a/src/ui_ng/src/app/shared/list-policy/list-policy.component.ts b/src/ui_ng/src/app/shared/list-policy/list-policy.component.ts index 00d34a6fa..3015fa05e 100644 --- a/src/ui_ng/src/app/shared/list-policy/list-policy.component.ts +++ b/src/ui_ng/src/app/shared/list-policy/list-policy.component.ts @@ -19,7 +19,7 @@ import { Policy } from '../../replication/policy'; import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; -import { ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; +import { ConfirmationState, ConfirmationTargets, ConfirmationButtons } from '../../shared/shared.const'; import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; @@ -135,7 +135,8 @@ export class ListPolicyComponent implements OnDestroy { 'REPLICATION.DELETION_SUMMARY', policy.name, policy.id, - ConfirmationTargets.POLICY); + ConfirmationTargets.POLICY, + ConfirmationButtons.DELETE_CANCEL); this.deletionDialogService.openComfirmDialog(deletionMessage); } diff --git a/src/ui_ng/src/app/shared/list-project-ro/list-project-ro.component.html b/src/ui_ng/src/app/shared/list-project-ro/list-project-ro.component.html index 6ee5eb2b9..2752e67c7 100644 --- a/src/ui_ng/src/app/shared/list-project-ro/list-project-ro.component.html +++ b/src/ui_ng/src/app/shared/list-project-ro/list-project-ro.component.html @@ -1,6 +1,6 @@ {{'PROJECT.NAME' | translate}} - {{'PROJECT.PUBLIC_OR_PRIVATE' | translate}} + {{'PROJECT.ACCESS_LEVEL' | translate}} {{'PROJECT.REPO_COUNT'| translate}} {{'PROJECT.CREATION_TIME' | translate}} diff --git a/src/ui_ng/src/app/shared/shared.const.ts b/src/ui_ng/src/app/shared/shared.const.ts index 687512420..a69cd9c15 100644 --- a/src/ui_ng/src/app/shared/shared.const.ts +++ b/src/ui_ng/src/app/shared/shared.const.ts @@ -67,6 +67,9 @@ export const CookieKeyOfAdmiral = "admiral.endpoint.latest"; export const enum ConfirmationState { NA, CONFIRMED, CANCEL } +export const enum ConfirmationButtons { + CONFIRM_CANCEL, YES_NO, DELETE_CANCEL, CLOSE +} export const ProjectTypes = { 0: 'PROJECT.MY_PROJECTS', 1: 'PROJECT.PUBLIC_PROJECTS' }; export const RoleInfo = { 1: 'MEMBER.PROJECT_ADMIN', 2: 'MEMBER.DEVELOPER', 3: 'MEMBER.GUEST' }; diff --git a/src/ui_ng/src/app/shared/shared.module.ts b/src/ui_ng/src/app/shared/shared.module.ts index 021e9d6d6..848cdf974 100644 --- a/src/ui_ng/src/app/shared/shared.module.ts +++ b/src/ui_ng/src/app/shared/shared.module.ts @@ -54,6 +54,7 @@ import { MessageHandlerService } from './message-handler/message-handler.service import { EmailValidatorDirective } from './email.directive'; import { GaugeComponent } from './gauge/gauge.component'; import { StatisticHandler } from './statictics/statistic-handler.service'; +import { DateValidatorDirective } from '../shared/date-validator.directive'; @NgModule({ imports: [ @@ -78,7 +79,8 @@ import { StatisticHandler } from './statictics/statistic-handler.service'; ListProjectROComponent, ListRepositoryROComponent, EmailValidatorDirective, - GaugeComponent + GaugeComponent, + DateValidatorDirective ], exports: [ CoreModule, @@ -99,7 +101,8 @@ import { StatisticHandler } from './statictics/statistic-handler.service'; ListProjectROComponent, ListRepositoryROComponent, EmailValidatorDirective, - GaugeComponent + GaugeComponent, + DateValidatorDirective ], providers: [ SessionService, diff --git a/src/ui_ng/src/app/user/user.component.ts b/src/ui_ng/src/app/user/user.component.ts index af193750e..535ff3b85 100644 --- a/src/ui_ng/src/app/user/user.component.ts +++ b/src/ui_ng/src/app/user/user.component.ts @@ -21,7 +21,7 @@ import { NewUserModalComponent } from './new-user-modal.component'; import { TranslateService } from '@ngx-translate/core'; import { ConfirmationDialogService } from '../shared/confirmation-dialog/confirmation-dialog.service'; import { ConfirmationMessage } from '../shared/confirmation-dialog/confirmation-message'; -import { ConfirmationState, ConfirmationTargets } from '../shared/shared.const' +import { ConfirmationState, ConfirmationTargets, ConfirmationButtons } from '../shared/shared.const' import { MessageHandlerService } from '../shared/message-handler/message-handler.service'; import { SessionService } from '../shared/session.service'; @@ -188,7 +188,8 @@ export class UserComponent implements OnInit, OnDestroy { "USER.DELETION_SUMMARY", user.username, user, - ConfirmationTargets.USER + ConfirmationTargets.USER, + ConfirmationButtons.DELETE_CANCEL ); this.deletionDialogService.openComfirmDialog(msg); } 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 96cc9d25f..d258fa9cc 100644 --- a/src/ui_ng/src/i18n/lang/en-us-lang.json +++ b/src/ui_ng/src/i18n/lang/en-us-lang.json @@ -124,6 +124,7 @@ "NAME": "Project Name", "ROLE": "Role", "PUBLIC_OR_PRIVATE": "Public", + "ACCESS_LEVEL": "Access Level", "REPO_COUNT": "Repositories Count", "CREATION_TIME": "Creation Time", "PUBLIC": "Public", @@ -197,7 +198,8 @@ "ADVANCED": "Advanced", "SIMPLE": "Simple", "ITEMS": "item(s)", - "FILTER_PLACEHOLDER": "Filter Logs" + "FILTER_PLACEHOLDER": "Filter Logs", + "INVALID_DATE": "Invalid date." }, "REPLICATION": { "REPLICATION_RULE": "Replication Rule", @@ -265,7 +267,8 @@ "CANNOT_EDIT": "Replication rule cannot be changed while it is enabled.", "POLICY_ALREADY_EXISTS": "Replication rule already exists.", "FAILED_TO_DELETE_POLICY_ENABLED": "Cannot delete rule: rule has unfinished job(s) or rule is enabled.", - "FOUND_ERROR_IN_JOBS": "Found errors in the replication job(s), please check." + "FOUND_ERROR_IN_JOBS": "Found errors in the replication job(s), please check.", + "INVALID_DATE": "Invalid date." }, "DESTINATION": { "NEW_ENDPOINT": "New 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 8c4ff58eb..087df658b 100644 --- a/src/ui_ng/src/i18n/lang/es-es-lang.json +++ b/src/ui_ng/src/i18n/lang/es-es-lang.json @@ -124,6 +124,7 @@ "NAME": "Nombre del Proyecto", "ROLE": "Rol", "PUBLIC_OR_PRIVATE": "Público", + "ACCESS_LEVEL": "Nivel de acceso", "REPO_COUNT": "Contador de repositorios", "CREATION_TIME": "Fecha de creación", "PUBLIC": "Público", @@ -197,7 +198,8 @@ "ADVANCED": "Avanzado", "SIMPLE": "Simple", "ITEMS": "elemento(s)", - "FILTER_PLACEHOLDER": "Filtrar logs" + "FILTER_PLACEHOLDER": "Filtrar logs", + "INVALID_DATE": "Fecha invalida." }, "REPLICATION": { "REPLICATION_RULE": "Reglas de Replicación", @@ -265,7 +267,8 @@ "CANNOT_EDIT": "La regla de replicación no se puede cambiar mientras esté activa.", "POLICY_ALREADY_EXISTS": "La regla de replicación ya existe.", "FAILED_TO_DELETE_POLICY_ENABLED": "No se puede eliminar la regla: tiene trabajo(s) sin finalizar o está activa.", - "FOUND_ERROR_IN_JOBS": "Se han encontrado errores en el trabajo de replicación. Por favor, compruébelos." + "FOUND_ERROR_IN_JOBS": "Se han encontrado errores en el trabajo de replicación. Por favor, compruébelos.", + "INVALID_DATE": "Fecha invalida." }, "DESTINATION": { "NEW_ENDPOINT": "Nuevo 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 57aba1bcf..33e38fc63 100644 --- a/src/ui_ng/src/i18n/lang/zh-cn-lang.json +++ b/src/ui_ng/src/i18n/lang/zh-cn-lang.json @@ -124,6 +124,7 @@ "NAME": "项目名称", "ROLE": "角色", "PUBLIC_OR_PRIVATE": "公开", + "ACCESS_LEVEL": "访问级别", "REPO_COUNT": "镜像仓库数", "CREATION_TIME": "创建时间", "PUBLIC": "公开", @@ -197,7 +198,8 @@ "ADVANCED": "高级检索", "SIMPLE": "简单检索", "ITEMS": "条记录", - "FILTER_PLACEHOLDER": "过滤日志" + "FILTER_PLACEHOLDER": "过滤日志", + "INVALID_DATE": "无效日期。" }, "REPLICATION": { "REPLICATION_RULE": "复制规则", @@ -265,7 +267,8 @@ "CANNOT_EDIT": "当复制规则启用时无法修改。", "POLICY_ALREADY_EXISTS": "规则已存在。", "FAILED_TO_DELETE_POLICY_ENABLED": "删除复制规则失败： 仍有未完成的任务或规则未停用。", - "FOUND_ERROR_IN_JOBS": "复制任务中包含错误，请检查。" + "FOUND_ERROR_IN_JOBS": "复制任务中包含错误，请检查。", + "INVALID_DATE": "无效日期。" }, "DESTINATION": { "NEW_ENDPOINT": "新建目标", From 1d98212d60ad0a7a1b7f84a58798dc0279a30e5b Mon Sep 17 00:00:00 2001 From: kunw Date: Tue, 25 Apr 2017 21:28:31 +0800 Subject: [PATCH 3/5] Fix UI compile issues. --- src/ui_ng/src/app/log/audit-log.ts | 2 ++ .../app/replication/replication.component.html | 4 ++-- .../src/app/replication/replication.component.ts | 16 ++++++++-------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/ui_ng/src/app/log/audit-log.ts b/src/ui_ng/src/app/log/audit-log.ts index 2a5cbfb3e..d90da1ad7 100644 --- a/src/ui_ng/src/app/log/audit-log.ts +++ b/src/ui_ng/src/app/log/audit-log.ts @@ -42,4 +42,6 @@ export class AuditLog { keywords: string; page: number; page_size: number; + fromTime: string; + toTime: string; } \ No newline at end of file diff --git a/src/ui_ng/src/app/replication/replication.component.html b/src/ui_ng/src/app/replication/replication.component.html index d35493611..b4bd9ff10 100644 --- a/src/ui_ng/src/app/replication/replication.component.html +++ b/src/ui_ng/src/app/replication/replication.component.html @@ -41,14 +41,14 @@