From 67beabb36478122cb53e0565b59e4c288c8649de Mon Sep 17 00:00:00 2001
From: Mia ZHOU <meinaz@vmware.com>
Date: Tue, 31 Jul 2018 16:15:57 +0800
Subject: [PATCH] Add ldap admin DN

Problem description:
currently, harbor does not support config ldap admin DN

Enhancement:
Add ldap admin dn in configuration as a optional config.
---
 .../config/auth/config-auth.component.html    | 41 +++++++++++--------
 .../config/auth/config-auth.component.scss    |  4 ++
 src/ui_ng/src/i18n/lang/en-us-lang.json       |  2 +
 src/ui_ng/src/i18n/lang/es-es-lang.json       |  2 +
 src/ui_ng/src/i18n/lang/fr-fr-lang.json       |  2 +
 src/ui_ng/src/i18n/lang/zh-cn-lang.json       |  2 +
 src/ui_ng/src/styles.css                      |  1 +
 7 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/ui_ng/src/app/config/auth/config-auth.component.html b/src/ui_ng/src/app/config/auth/config-auth.component.html
index 47cd4ffe4..db2a2c727 100644
--- a/src/ui_ng/src/app/config/auth/config-auth.component.html
+++ b/src/ui_ng/src/app/config/auth/config-auth.component.html
@@ -137,12 +137,9 @@
             </clr-checkbox>
         </div>
         <div class="form-group">
-            <label for="ldapGroupBaseDN" class="required">{{'CONFIG.LDAP.LDAP_GROUP_BASE_DN' | translate}}</label>
-            <label for="ldapGroupBaseDN" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-lg tooltip-top-right">
-                <input name="ldapGroupBaseDN" type="text" #ldapGroupDNInput="ngModel" [(ngModel)]="currentConfig.ldap_group_base_dn.value"
-                    id="ldapGroupBaseDN" size="40" [disabled]="disabled(currentConfig.ldap_group_base_dn)">
-                <span class="tooltip-content"> {{'TOOLTIP.ITEM_REQUIRED' | translate}} </span>
-            </label>
+            <label for="ldapGroupBaseDN">{{'CONFIG.LDAP.LDAP_GROUP_BASE_DN' | translate}}</label>
+            <input name="ldapGroupBaseDN" class="padding-right-28" type="text" #ldapGroupDNInput="ngModel" [(ngModel)]="currentConfig.ldap_group_base_dn.value"
+                id="ldapGroupBaseDN" size="40" [disabled]="disabled(currentConfig.ldap_group_base_dn)">
             <clr-tooltip>
                 <clr-icon clrTooltipTrigger shape="info-circle" size="24"></clr-icon>
                 <clr-tooltip-content clrPosition="top-right" clrSize="lg" *clrIfOpen>
@@ -151,12 +148,9 @@
             </clr-tooltip>
         </div>
         <div class="form-group">
-            <label for="ldapGroupFilter" class="required">{{'CONFIG.LDAP.LDAP_GROUP_FILTER' | translate}}</label>
-            <label for="ldapGroupFilter" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-lg tooltip-top-right">
-                <input name="ldapGroupFilter" type="text" #ldapGroupFilterInput="ngModel" [(ngModel)]="currentConfig.ldap_group_search_filter.value"
-                    id="ldapGroupFilter" size="40" [disabled]="disabled(currentConfig.ldap_group_search_filter)">
-                <span class="tooltip-content"> {{'TOOLTIP.ITEM_REQUIRED' | translate}} </span>
-            </label>
+            <label for="ldapGroupFilter">{{'CONFIG.LDAP.LDAP_GROUP_FILTER' | translate}}</label>
+            <input name="ldapGroupFilter" type="text" class="padding-right-28" #ldapGroupFilterInput="ngModel" [(ngModel)]="currentConfig.ldap_group_search_filter.value"
+                id="ldapGroupFilter" size="40" [disabled]="disabled(currentConfig.ldap_group_search_filter)">
             <clr-tooltip>
                 <clr-icon clrTooltipTrigger shape="info-circle" size="24"></clr-icon>
                 <clr-tooltip-content clrPosition="top-right" clrSize="lg" *clrIfOpen>
@@ -165,12 +159,9 @@
             </clr-tooltip>
         </div>
         <div class="form-group">
-            <label for="ldapGroupGID" class="required">{{'CONFIG.LDAP.LDAP_GROUP_GID' | translate}}</label>
-            <label for="ldapGroupGID" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-lg tooltip-top-right">
-                <input name="ldapGroupGID" type="text" #ldapGroupDNInput="ngModel" [(ngModel)]="currentConfig.ldap_group_attribute_name.value"
-                    id="ldapGroupGID" size="40" [disabled]="disabled(currentConfig.ldap_group_attribute_name)">
-                <span class="tooltip-content"> {{'TOOLTIP.ITEM_REQUIRED' | translate}} </span>
-            </label>
+            <label for="ldapGroupGID">{{'CONFIG.LDAP.LDAP_GROUP_GID' | translate}}</label>
+            <input name="ldapGroupGID" class="padding-right-28" type="text" #ldapGroupDNInput="ngModel" [(ngModel)]="currentConfig.ldap_group_attribute_name.value"
+                id="ldapGroupGID" size="40" [disabled]="disabled(currentConfig.ldap_group_attribute_name)">
             <clr-tooltip>
                 <clr-icon clrTooltipTrigger shape="info-circle" size="24"></clr-icon>
                 <clr-tooltip-content clrPosition="top-right" clrSize="lg" *clrIfOpen>
@@ -178,6 +169,19 @@
                 </clr-tooltip-content>
             </clr-tooltip>
         </div>
+        <!-- This is for ldap group admin dn -->
+        <div class="form-group">
+            <label>{{'CONFIG.LDAP.LDAP_GROUP_ADMIN_DN' | translate}}</label>
+            <input name="ldapGroupAdminDN" class="padding-right-28" type="text" #ldapGroupFilterInput="ngModel" [(ngModel)]="currentConfig.ldap_group_admin_dn.value"
+                id="ldapGroupAdminDN" size="40" [disabled]="disabled(currentConfig.ldap_group_admin_dn)">
+            <clr-tooltip>
+                <clr-icon clrTooltipTrigger shape="info-circle" size="24"></clr-icon>
+                <clr-tooltip-content clrPosition="top-right" clrSize="lg" *clrIfOpen>
+                    <span>{{'CONFIG.LDAP.LDAP_GROUP_ADMIN_DN_INFO' | translate}}</span>
+                </clr-tooltip-content>
+            </clr-tooltip>
+        </div>
+        <!-- End of ldap group admin dn -->
         <div class="form-group">
             <label for="ldapGroupScope">{{'CONFIG.LDAP.GROUP_SCOPE' | translate}}</label>
             <div class="select">
@@ -194,6 +198,7 @@
                 </clr-tooltip-content>
             </clr-tooltip>
         </div>
+
     </section>
     <section class="form-block">
         <div class="form-group">
diff --git a/src/ui_ng/src/app/config/auth/config-auth.component.scss b/src/ui_ng/src/app/config/auth/config-auth.component.scss
index 9634e8199..fe2f29c51 100644
--- a/src/ui_ng/src/app/config/auth/config-auth.component.scss
+++ b/src/ui_ng/src/app/config/auth/config-auth.component.scss
@@ -1,3 +1,7 @@
 clr-tooltip {
     top: -1px;
+}
+
+.padding-right-28 {
+   padding-right:28px;
 }
\ No newline at end of file
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 91737b17f..2c1c86193 100644
--- a/src/ui_ng/src/i18n/lang/en-us-lang.json
+++ b/src/ui_ng/src/i18n/lang/en-us-lang.json
@@ -553,6 +553,8 @@
             "LDAP_GROUP_FILTER_INFO": "The filter of your LDAP group",
             "LDAP_GROUP_GID": "LDAP Group GID",
             "LDAP_GROUP_GID_INFO": "The Group gid of your LDAP group",
+            "LDAP_GROUP_ADMIN_DN": "LDAP Group Admin DN",
+            "LDAP_GROUP_ADMIN_DN_INFO": "The Admin DN of your LDAP group",
             "GROUP_SCOPE": "LDAP Group Scope",
             "GROUP_SCOPE_INFO": "The scope of your LDAP Group"
 
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 9872394d5..bcd7c02e6 100644
--- a/src/ui_ng/src/i18n/lang/es-es-lang.json
+++ b/src/ui_ng/src/i18n/lang/es-es-lang.json
@@ -553,6 +553,8 @@
             "LDAP_GROUP_FILTER_INFO": "The filter of your LDAP group",
             "LDAP_GROUP_GID": "LDAP Group GID",
             "LDAP_GROUP_GID_INFO": "The Group gid of your LDAP group",
+            "LDAP_GROUP_ADMIN_DN": "LDAP Group Admin DN",
+            "LDAP_GROUP_ADMIN_DN_INFO": "The Admin DN of your LDAP group",
             "GROUP_SCOPE": "LDAP Group Scope",
             "GROUP_SCOPE_INFO": "The scope of your LDAP Group"
         },
diff --git a/src/ui_ng/src/i18n/lang/fr-fr-lang.json b/src/ui_ng/src/i18n/lang/fr-fr-lang.json
index 1a8a309ed..c6a417f79 100644
--- a/src/ui_ng/src/i18n/lang/fr-fr-lang.json
+++ b/src/ui_ng/src/i18n/lang/fr-fr-lang.json
@@ -524,6 +524,8 @@
             "LDAP_GROUP_FILTER_INFO": "The filter of your LDAP group",
             "LDAP_GROUP_GID": "LDAP Group GID",
             "LDAP_GROUP_GID_INFO": "The Group gid of your LDAP group",
+            "LDAP_GROUP_ADMIN_DN": "LDAP Group Admin DN",
+            "LDAP_GROUP_ADMIN_DN_INFO": "The Admin DN of your LDAP group",
             "GROUP_SCOPE": "LDAP Group Scope",
             "GROUP_SCOPE_INFO": "The scope of your LDAP Group"
         },
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 15304f08a..dce247947 100644
--- a/src/ui_ng/src/i18n/lang/zh-cn-lang.json
+++ b/src/ui_ng/src/i18n/lang/zh-cn-lang.json
@@ -553,6 +553,8 @@
             "LDAP_GROUP_FILTER_INFO": "LDAP组的过滤器",
             "LDAP_GROUP_GID": "LDAP组GID",
             "LDAP_GROUP_GID_INFO": "LDAP组的GID",
+            "LDAP_GROUP_ADMIN_DN": "LDAP组管理员DN",
+            "LDAP_GROUP_ADMIN_DN_INFO": "LDAP组管理员DN",
             "GROUP_SCOPE": "LDAP组搜索范围",
             "GROUP_SCOPE_INFO": "搜索范围"
         },
diff --git a/src/ui_ng/src/styles.css b/src/ui_ng/src/styles.css
index 35ebf3b01..5878a035e 100644
--- a/src/ui_ng/src/styles.css
+++ b/src/ui_ng/src/styles.css
@@ -8,6 +8,7 @@ body {
     left: 0;
     right:0;
     bottom:0;
+    margin:auto;
     width: 108px !important;
     height: 108px !important;
 }