Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-10-04 08:18:03 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3906 from ninjadq/sidenav_to_verticalnav

Browse Source 
Replace Navigation bar from Sidenav to Vertical Nav
This commit is contained in:
Qian Deng 2018-01-04 18:32:04 +08:00 committed by GitHub
commit f20103dc0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 86 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui_ng/package.json
View File

@ -31,7 +31,7 @@
"clarity-icons": "^0.10.17", "clarity-icons": "^0.10.17",
"clarity-ui": "^0.10.17", "clarity-ui": "^0.10.17",
"core-js": "^2.4.1", "core-js": "^2.4.1",
"harbor-ui": "0.6.6-dev.0", "harbor-ui": "0.6.6",
"intl": "^1.2.5", "intl": "^1.2.5",
"mutationobserver-shim": "^0.3.2", "mutationobserver-shim": "^0.3.2",
"ngx-cookie": "^1.0.0", "ngx-cookie": "^1.0.0",

56
src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.html
View File

@ -8,21 +8,47 @@
<search-result></search-result> <search-result></search-result>
<router-outlet></router-outlet> <router-outlet></router-outlet>
</div> </div>
<nav class="sidenav" style="padding: 12px 36px;" *ngIf="isUserExisting"> <clr-vertical-nav [clrVerticalNavCollapsible]="true" *ngIf="isUserExisting">
<section class="sidenav-content" style="padding-top: 20px;"> <a clrVerticalNavLink routerLinkActive="active" routerLink="/harbor/projects">
<a routerLink="/harbor/projects" routerLinkActive="active" class="nav-link nav-link-override">{{'SIDE_NAV.PROJECTS' | translate}}</a> <clr-icon shape="organization" clrVerticalNavIcon></clr-icon>
<a routerLink="/harbor/logs" routerLinkActive="active" class="nav-link nav-link-override" style="margin-top: 4px;">{{'SIDE_NAV.LOGS' | translate}}</a> {{'SIDE_NAV.PROJECTS' | translate}}
<section class="nav-group collapsible" *ngIf="isSystemAdmin" style="margin-top: 4px;"> </a>
<input id="tabsystem" type="checkbox"> <a clrVerticalNavLink routerLinkActive="active" routerLink="/harbor/logs">
<label for="tabsystem">{{'SIDE_NAV.SYSTEM_MGMT.NAME' | translate}}</label> <clr-icon shape="list" clrVerticalNavIcon></clr-icon>
<ul class="nav-list"> {{'SIDE_NAV.LOGS' | translate}}
<li><a class="nav-link nav-link-override" routerLink="/harbor/users" routerLinkActive="active">{{'SIDE_NAV.SYSTEM_MGMT.USER' | translate}}</a></li> </a>
<li><a class="nav-link nav-link-override" routerLink="/harbor/replications" routerLinkActive="active">{{'SIDE_NAV.SYSTEM_MGMT.REPLICATION' | translate}}</a></li> <clr-vertical-nav-group *ngIf="isSystemAdmin" routerLinkActive="active">
<li><a class="nav-link nav-link-override" routerLink="/harbor/configs" routerLinkActive="active">{{'SIDE_NAV.SYSTEM_MGMT.CONFIG' | translate}}</a></li> <clr-icon shape="administrator" clrVerticalNavIcon></clr-icon>
</ul> {{'SIDE_NAV.SYSTEM_MGMT.NAME' | translate}}
</section> <a routerLink="#" hidden aria-hidden="true"></a>
</section> <clr-vertical-nav-group-children *clrIfExpanded="true">
</nav> <a clrVerticalNavLink
routerLink="/harbor/users"
routerLinkActive="active">
<clr-icon shape="users" clrVerticalNavIcon></clr-icon>
{{'SIDE_NAV.SYSTEM_MGMT.USER' | translate}}
</a>
<a clrVerticalNavLink
routerLink="/harbor/registries"
routerLinkActive="active">
<clr-icon shape="block" clrVerticalNavIcon></clr-icon>
{{'SIDE_NAV.SYSTEM_MGMT.REGISTRY' | translate}}
</a>
<a clrVerticalNavLink
routerLink="/harbor/replications"
routerLinkActive="active">
<clr-icon shape="cloud-traffic" clrVerticalNavIcon></clr-icon>
{{'SIDE_NAV.SYSTEM_MGMT.REPLICATION' | translate}}
</a>
<a clrVerticalNavLink
routerLink="/harbor/configs"
routerLinkActive="active">
<clr-icon shape="cog" clrVerticalNavIcon></clr-icon>
{{'SIDE_NAV.SYSTEM_MGMT.CONFIG' | translate}}
</a>
</clr-vertical-nav-group-children>
</clr-vertical-nav-group>
</clr-vertical-nav>
</div> </div>
</clr-main-container> </clr-main-container>
<account-settings-modal></account-settings-modal> <account-settings-modal></account-settings-modal>

22
src/ui_ng/src/app/harbor-routing.module.ts
View File

@ -78,25 +78,15 @@ const harborRoutes: Routes = [
component: UserComponent, component: UserComponent,
canActivate: [SystemAdminGuard] canActivate: [SystemAdminGuard]
}, },
{
path: 'registries',
component: DestinationPageComponent,
canActivate: [SystemAdminGuard]
},
{ {
path: 'replications', path: 'replications',
component: ReplicationManagementComponent, component: TotalReplicationPageComponent,
canActivate: [SystemAdminGuard], canActivate: [SystemAdminGuard],
canActivateChild: [SystemAdminGuard],
children: [
{
path: 'rules',
component: TotalReplicationPageComponent
},
{
path: 'endpoints',
component: DestinationPageComponent
},
{
path: '**',
redirectTo: 'endpoints'
}
]
}, },
{ {
path: 'tags/:id/:repo', path: 'tags/:id/:repo',

3
src/ui_ng/src/app/replication/destination/destination-page.component.html
View File

@ -1,3 +1,4 @@
<div style="margin-top: 24px;"> <h2 class="custom-h2">{{'SIDE_NAV.SYSTEM_MGMT.REGISTRY' | translate}}</h2>
<div>
<hbr-endpoint></hbr-endpoint> <hbr-endpoint></hbr-endpoint>
</div> </div>

4
src/ui_ng/src/app/replication/replication-management/replication-management.component.ts
View File

@ -11,6 +11,10 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// This Module is used as Container For Endpoint and Replication Rules
// Will deprecated on Harbor 1.4.0
import { Component } from '@angular/core'; import { Component } from '@angular/core';
@Component({ @Component({

3
src/ui_ng/src/app/replication/total-replication/total-replication-page.component.html
View File

@ -1,3 +1,4 @@
<div style="margin-top: 24px;"> <h2 class="custom-h2">{{'SIDE_NAV.SYSTEM_MGMT.REPLICATION' | translate}}</h2>
<div>
<hbr-replication [withReplicationJob]='false' (redirect)="customRedirect($event)"></hbr-replication> <hbr-replication [withReplicationJob]='false' (redirect)="customRedirect($event)"></hbr-replication>
</div> </div>

3
src/ui_ng/src/i18n/lang/en-us-lang.json
View File

@ -100,7 +100,8 @@
"SYSTEM_MGMT": { "SYSTEM_MGMT": {
"NAME": "Administration", "NAME": "Administration",
"USER": "Users", "USER": "Users",
"REPLICATION": "Replication", "REGISTRY": "Registries",
"REPLICATION": "Replications",
"CONFIG": "Configuration" "CONFIG": "Configuration"
}, },
"LOGS": "Logs" "LOGS": "Logs"

3
src/ui_ng/src/i18n/lang/es-es-lang.json
View File

@ -96,7 +96,8 @@
"SYSTEM_MGMT": { "SYSTEM_MGMT": {
"NAME": "Administración", "NAME": "Administración",
"USER": "Usuarios", "USER": "Usuarios",
"REPLICATION": "Replicación", "REGISTRY": "Registries",
"REPLICATION": "Replicacións",
"CONFIG": "Configuración" "CONFIG": "Configuración"
}, },
"LOGS": "Logs" "LOGS": "Logs"

1
src/ui_ng/src/i18n/lang/zh-cn-lang.json
View File

@ -96,6 +96,7 @@
"SYSTEM_MGMT": { "SYSTEM_MGMT": {
"NAME": "系统管理", "NAME": "系统管理",
"USER": "用户管理", "USER": "用户管理",
"REGISTRY": "仓库管理",
"REPLICATION": "复制管理", "REPLICATION": "复制管理",
"CONFIG": "配置管理" "CONFIG": "配置管理"
}, },

4
tests/resources/Harbor-Pages/Administration-Users_Elements.robot
View File

@ -16,5 +16,5 @@
Documentation This resource provides any keywords related to the Harbor private registry appliance Documentation This resource provides any keywords related to the Harbor private registry appliance
*** Variables *** *** Variables ***
${administration_user_tag_xpath} /html/body/harbor-app/harbor-shell/clr-main-container/div/nav/section/section/ul/li[1]/a ${administration_user_tag_xpath} //clr-vertical-nav-group-children/a[contains(.,'Users')]
${administration_tag_xpath} /html/body/harbor-app/harbor-shell/clr-main-container/div/nav/section/section/label ${administration_tag_xpath} //clr-vertical-nav-group[contains(.,'Admin')]

30
tests/resources/Harbor-Pages/Configuration.robot
View File

@ -38,14 +38,14 @@ Init LDAP
Sleep 1 Sleep 1
Capture Page Screenshot Capture Page Screenshot
Disable Ldap Verify Cert Checkbox Disable Ldap Verify Cert Checkbox
Click Element xpath=/html/body/harbor-app/harbor-shell/clr-main-container/div/div/config/div/div/div/button[1] Click Element xpath=${config_save_button_xpath}
Sleep 2 Sleep 2
Click Element xpath=/html/body/harbor-app/harbor-shell/clr-main-container/div/div/config/div/div/div/button[3] Click Element xpath=/html/body/harbor-app/harbor-shell/clr-main-container/div/div/config/div/div/div/button[3]
Sleep 1 Sleep 1
Capture Page Screenshot Capture Page Screenshot
Switch To Configure Switch To Configure
Click Element xpath=/html/body/harbor-app/harbor-shell/clr-main-container/div/nav/section/section/ul/li[3]/a Click Element xpath=${configuration_xpath}
Sleep 2 Sleep 2
Test Ldap Connection Test Ldap Connection
@ -89,32 +89,32 @@ Ldap Verify Cert Checkbox Should Be Disabled
Set Pro Create Admin Only Set Pro Create Admin Only
#set limit to admin only #set limit to admin only
Sleep 2 Sleep 2
Click Element xpath=//clr-main-container//nav//ul/li[3] Click Element xpath=${configuration_xpath}
Sleep 1 Sleep 1
Click Element xpath=//select[@id="proCreation"] Click Element xpath=//select[@id="proCreation"]
Click Element xpath=//select[@id="proCreation"]//option[@value="adminonly"] Click Element xpath=//select[@id="proCreation"]//option[@value="adminonly"]
Sleep 1 Sleep 1
Click Element xpath=/html/body/harbor-app/harbor-shell/clr-main-container/div/div/config/div/div/div/button[1] Click Element xpath=${config_save_button_xpath}
Capture Page Screenshot AdminCreateOnly.png Capture Page Screenshot AdminCreateOnly.png
Set Pro Create Every One Set Pro Create Every One
#set limit to Every One #set limit to Every One
Click Element xpath=//clr-main-container//nav//ul/li[3] Click Element xpath=${configuration_xpath}
Sleep 1 Sleep 1
Click Element xpath=//select[@id="proCreation"] Click Element xpath=//select[@id="proCreation"]
Click Element xpath=//select[@id="proCreation"]//option[@value="everyone"] Click Element xpath=//select[@id="proCreation"]//option[@value="everyone"]
Sleep 1 Sleep 1
Click Element xpath=/html/body/harbor-app/harbor-shell/clr-main-container/div/div/config/div/div/div/button[1] Click Element xpath=${config_save_button_xpath}
Sleep 2 Sleep 2
Capture Page Screenshot EveryoneCreate.png Capture Page Screenshot EveryoneCreate.png
Disable Self Reg Disable Self Reg
Click Element xpath=//clr-main-container//nav//ul/li[3] Click Element xpath=${configuration_xpath}
Mouse Down xpath=${self_reg_xpath} Mouse Down xpath=${self_reg_xpath}
Mouse Up xpath=${self_reg_xpath} Mouse Up xpath=${self_reg_xpath}
Sleep 1 Sleep 1
Self Reg Should Be Disabled Self Reg Should Be Disabled
Click Element xpath=/html/body/harbor-app/harbor-shell/clr-main-container/div/div/config/div/div/div/button[1] Click Element xpath=${config_save_button_xpath}
Capture Page Screenshot DisableSelfReg.png Capture Page Screenshot DisableSelfReg.png
Sleep 1 Sleep 1
@ -123,7 +123,7 @@ Enable Self Reg
Mouse Up xpath=${self_reg_xpath} Mouse Up xpath=${self_reg_xpath}
Sleep 1 Sleep 1
Self Reg Should Be Enabled Self Reg Should Be Enabled
Click Element xpath=/html/body/harbor-app/harbor-shell/clr-main-container/div/div/config/div/div/div/button[1] Click Element xpath=${config_save_button_xpath}
Capture Page Screenshot EnableSelfReg.png Capture Page Screenshot EnableSelfReg.png
Sleep 1 Sleep 1
@ -142,13 +142,13 @@ Project Creation Should Not Display
## System settings ## System settings
Switch To System Settings Switch To System Settings
Sleep 1 Sleep 1
Click Element xpath=//clr-main-container//nav//ul/li[3] Click Element xpath=${configuration_xpath}
Click Element xpath=//*[@id="config-system"] Click Element xpath=//*[@id="config-system"]
Modify Token Expiration Modify Token Expiration
[Arguments] ${minutes} [Arguments] ${minutes}
Input Text xpath=//*[@id="tokenExpiration"] ${minutes} Input Text xpath=//*[@id="tokenExpiration"] ${minutes}
Click Button xpath=/html/body/harbor-app/harbor-shell/clr-main-container/div/div/config/div/div/div/button[1] Click Button xpath=${config_save_button_xpath}
Sleep 1 Sleep 1
Token Must Be Match Token Must Be Match
@ -159,7 +159,7 @@ Token Must Be Match
Check Verify Remote Cert Check Verify Remote Cert
Mouse Down xpath=//*[@id="clr-checkbox-verifyRemoteCert"] Mouse Down xpath=//*[@id="clr-checkbox-verifyRemoteCert"]
Mouse Up xpath=//*[@id="clr-checkbox-verifyRemoteCert"] Mouse Up xpath=//*[@id="clr-checkbox-verifyRemoteCert"]
Click Element xpath=/html/body/harbor-app/harbor-shell/clr-main-container/div/div/config/div/div/div/button[1] Click Element xpath=${config_save_button_xpath}
Capture Page Screenshot RemoteCert.png Capture Page Screenshot RemoteCert.png
Sleep 1 Sleep 1
@ -191,7 +191,7 @@ Config Email
Mouse Down xpath=//*[@id="clr-checkbox-emailInsecure"] Mouse Down xpath=//*[@id="clr-checkbox-emailInsecure"]
Mouse Up xpath=//*[@id="clr-checkbox-emailInsecure"] Mouse Up xpath=//*[@id="clr-checkbox-emailInsecure"]
Sleep 1 Sleep 1
Click Element xpath=/html/body/harbor-app/harbor-shell/clr-main-container/div/div/config/div/div/div/button[1] Click Element xpath=${config_save_button_xpath}
Sleep 6 Sleep 6
Verify Email Verify Email
@ -206,11 +206,11 @@ Set Scan All To None
click element //vulnerability-config//select click element //vulnerability-config//select
click element //vulnerability-config//select/option[@value='none'] click element //vulnerability-config//select/option[@value='none']
sleep 1 sleep 1
click element //config//div/button[contains(.,'SAVE')] click element ${config_save_button_xpath}
Set Scan All To Daily Set Scan All To Daily
click element //vulnerability-config//select click element //vulnerability-config//select
click element //vulnerability-config//select/option[@value='daily'] click element //vulnerability-config//select/option[@value='daily']
sleep 1 sleep 1
click element //config//div/button[contains(.,'SAVE')] click element ${config_save_button_xpath}
Click Scan Now Click Scan Now
click element //vulnerability-config//button[contains(.,'SCAN')] click element //vulnerability-config//button[contains(.,'SCAN')]

2
tests/resources/Harbor-Pages/Configuration_Elements.robot
View File

@ -19,3 +19,5 @@ Documentation This resource provides any keywords related to the Harbor private
${project_create_xpath} //clr-dg-action-bar//button[contains(.,'New')] ${project_create_xpath} //clr-dg-action-bar//button[contains(.,'New')]
${self_reg_xpath} //input[@id="clr-checkbox-selfReg"] ${self_reg_xpath} //input[@id="clr-checkbox-selfReg"]
${test_ldap_xpath} /html/body/harbor-app/harbor-shell/clr-main-container/div/div/config/div/div/div/button[3] ${test_ldap_xpath} /html/body/harbor-app/harbor-shell/clr-main-container/div/div/config/div/div/div/button[3]
${config_save_button_xpath} //config//div/button[contains(.,'SAVE')]
${configuration_xpath} //clr-vertical-nav-group-children/a[contains(.,'Configuration')]

2
tests/resources/Harbor-Pages/Project.robot
View File

@ -56,7 +56,7 @@ Switch To Log
Sleep 1 Sleep 1
Switch To Replication Switch To Replication
Click Element xpath=${replication_xpath} Click Element xpath=${project_replication_xpath}
Sleep 1 Sleep 1
Back To projects Back To projects

6
tests/resources/Harbor-Pages/Project_Elements.robot
View File

@ -20,6 +20,6 @@ ${create_project_button_css} .btn
${project_name_xpath} //*[@id="create_project_name"] ${project_name_xpath} //*[@id="create_project_name"]
${project_public_xpath} //input[@name='public']/..//label ${project_public_xpath} //input[@name='public']/..//label
${project_save_css} html body.no-scrolling harbor-app harbor-shell clr-main-container.main-container div.content-container div.content-area.content-area-override project div.row div.col-lg-12.col-md-12.col-sm-12.col-xs-12 div.row.flex-items-xs-between div.option-left create-project clr-modal div.modal div.modal-dialog div.modal-content div.modal-footer button.btn.btn-primary ${project_save_css} html body.no-scrolling harbor-app harbor-shell clr-main-container.main-container div.content-container div.content-area.content-area-override project div.row div.col-lg-12.col-md-12.col-sm-12.col-xs-12 div.row.flex-items-xs-between div.option-left create-project clr-modal div.modal div.modal-dialog div.modal-content div.modal-footer button.btn.btn-primary
${log_xpath} /html/body/harbor-app/harbor-shell/clr-main-container/div/nav/section/a[2] ${log_xpath} //clr-main-container/div/clr-vertical-nav/div/a[contains(.,'Logs')]
${projects_xpath} /html/body/harbor-app/harbor-shell/clr-main-container/div/nav/section/a[1] ${projects_xpath} //clr-main-container/div/clr-vertical-nav/div/a[contains(.,'Projects')]
${replication_xpath} /html/body/harbor-app/harbor-shell/clr-main-container/div/div/project-detail/nav/ul/li[4]/a ${project_replication_xpath} //project-detail//a[contains(.,'Replication')]

1
tests/resources/Harbor-Pages/Replication_Elements.robot
View File

@ -26,3 +26,4 @@ ${destination_url_xpath} //*[@id='destination_url']
${destination_username_xpath} //*[@id='destination_username'] ${destination_username_xpath} //*[@id='destination_username']
${destination_password_xpath} //*[@id='destination_password'] ${destination_password_xpath} //*[@id='destination_password']
${replicaton_save_xpath} //button[contains(.,'OK')] ${replicaton_save_xpath} //button[contains(.,'OK')]
${replication_xpath} //clr-vertical-nav-group-children/a[contains(.,'Replication')]

2
tests/resources/Harbor-Pages/UserProfile.robot
View File

@ -31,7 +31,7 @@ Change Password
Sleep 1 Sleep 1
Click Element xpath=//password-setting/clr-modal//button[2] Click Element xpath=//password-setting/clr-modal//button[2]
Sleep 2 Sleep 2
Click Element xpath=/html/body/harbor-app/harbor-shell/clr-main-container/div/nav/section/a[2] Click Element xpath=${log_xpath}
Sleep 1 Sleep 1
Update User Comment Update User Comment