From be6bf2ab226102782b6d04a95933b54c59c33c28 Mon Sep 17 00:00:00 2001 From: wemeya Date: Tue, 10 May 2016 15:10:19 +0800 Subject: [PATCH 01/29] add statistic api for projects and repos --- Deploy/config/registry/root.crt | 46 +++++++--- Deploy/config/ui/private_key.pem | 62 ++++++++++--- Deploy/harbor.cfg | 2 +- api/statistic.go | 146 +++++++++++++++++++++++++++++++ ui/router.go | 1 + 5 files changed, 230 insertions(+), 27 deletions(-) create mode 100644 api/statistic.go diff --git a/Deploy/config/registry/root.crt b/Deploy/config/registry/root.crt index 326d8080a..71ef6787f 100644 --- a/Deploy/config/registry/root.crt +++ b/Deploy/config/registry/root.crt @@ -1,15 +1,35 @@ -----BEGIN CERTIFICATE----- -MIICWDCCAcGgAwIBAgIJAN1nLuloDeHNMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV -BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX -aWRnaXRzIFB0eSBMdGQwHhcNMTYwMTI3MDQyMDM1WhcNNDMwNjE0MDQyMDM1WjBF -MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50 -ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB -gQClak/4HO7EeLU0w/BhtVENPLOqU0AP2QjVUdg1qhNiDWVrbWx9KYHqz5Kn0n2+ -fxdZo3o7ZY5/2+hhgkKh1z6Kge9XGgune6z4fx2J/X2Se8WsGeQUTiND8ngSnsCA -NtYFwW50SbUZPtyf5XjAfKRofZem51OxbxzN3217L/ubKwIDAQABo1AwTjAdBgNV -HQ4EFgQU5EG2VrB3I6G/TudUpz+kBgQXSvYwHwYDVR0jBBgwFoAU5EG2VrB3I6G/ -TudUpz+kBgQXSvYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQAx+2eo -oOm0YNy9KQ81+7GQkKVWoPQXjAGGgZuZj8WCFepYqUSJ4q5qbuVCY8WbGcHVk2Rx -Jg1XDCmMjBgYP6S0ikezBRqSmNA3G6oFiydTKBfPs6RNalsB0C78Xk5l5+PIyd2R -jFKOKoMpkjwfeJv2j64WNGoBgqj7XRBoJ11a4g== +MIIGBzCCA++gAwIBAgIJANjBN67MD5SgMA0GCSqGSIb3DQEBCwUAMIGZMQswCQYD +VQQGEwJDTjEOMAwGA1UECAwFU3RhdGUxCzAJBgNVBAcMAkNOMRUwEwYDVQQKDAxv +cmdhbml6YXRpb24xHDAaBgNVBAsME29yZ2FuaXphdGlvbmFsIHVuaXQxFDASBgNV +BAMMC2V4YW1wbGUuY29tMSIwIAYJKoZIhvcNAQkBFhNleGFtcGxlQGV4YW1wbGUu +Y29tMB4XDTE2MDUxMDA0MTMxM1oXDTI2MDUwODA0MTMxM1owgZkxCzAJBgNVBAYT +AkNOMQ4wDAYDVQQIDAVTdGF0ZTELMAkGA1UEBwwCQ04xFTATBgNVBAoMDG9yZ2Fu +aXphdGlvbjEcMBoGA1UECwwTb3JnYW5pemF0aW9uYWwgdW5pdDEUMBIGA1UEAwwL +ZXhhbXBsZS5jb20xIjAgBgkqhkiG9w0BCQEWE2V4YW1wbGVAZXhhbXBsZS5jb20w +ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDVSMUP/IR3iGdM4WrvuWno +Jy+mjOV/Qcte8gK92ClKd5zObAlo6/hn8ZMTeub76A9i39QN8GlQDFMtfv29EpLn +XXoVvLIwH4olycSdrye0ustOke/KT2RHAl3cVi5Zau0rfnb6h5kPQFFgjHsFdsLi +KIOBru976pJh3qxXq2xHIbmHvqLLEGuvt2WKXiRyz9ex6zbc/RTQhesJIA/N73Xo +9m5TfKOimuTedHYuGwS9XAHdr0W+EZl39keaPemrJz5QcebwwZPApuGwe0We8koL +0W1b2Z1a/gUdjcE++RVDOpHCupB/MltB+FSBJKd6LIbkjV1AC+T3NB3CzDPUP/Ep +bjk4wJqGOmMS+/mZbVu9lybrem7V0Wc03DEQyjZztpBcQ6MFbVw3pIbp3fAWhyDJ +N1y+i0O1Llcybpje5P3fQ0ioYc3hF61Wj3bAAx7ddPmrmtVGgisfvcTIRjNLGylM +qObhRjPPvky03x2jtwTnPX74gowuqq70sZHjfqpmXrjpJi9RMEJz30dxW6gy9Mn+ +MOTzwJ7iu3sm6XidaogMvMFrVlLfgIVLl+WfZJIv+i2by6TXfZ6/5OTvU4fzc1NZ +VeWBUSznmM/V72sWc/3AFgNibysv95OwDohqy91N9U73P6Q8H96hkDVHHhktHSL6 +s1OQau9XDgKS6xhZZsRxlwIDAQABo1AwTjAdBgNVHQ4EFgQUQl1pgU1b+rJMvLsQ +W1YednSAsDUwHwYDVR0jBBgwFoAUQl1pgU1b+rJMvLsQW1YednSAsDUwDAYDVR0T +BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAxCMLH/BhxzAGI2k8oBUXOaFXB+uo +2hrteE4glQw0nY959y7FEgKYBKKktWRqNBB/FlNSsrritfhWNK04tIHDQtUhP09m +2TD/0bxY++i+cyhqflHnyROkhAtcg1SBDhwkDMyEKnjzEe7t80Vq6d2sEBbq4PcA +Owl9Xj8elTt1g6aKP4Wt1V7ktZG+zAct+VPQtCnXCH2GAbkN8zqYKpCmzW0IBy0D +NFWKjsebXawOjUwMFu9MTDIwU3DvcCcrNj8k1palLPNNuyXqbsmencFjDRe2mZDU +lA2l4bpZ4G4HPSUJmhZHQ7eq9CYr5goS+kI36n5Uvg2TDDQQxXtfugRkI1qqxGlU +w+qc5BeQqkBior/dI/70+z0ith8/qZZ4U+y7eYY2lzIaNAOn2YLIdxkjF4YxIbSu +kV+Flxa4pFookeLvucZP1v3yW9VdHwClRGD4S4yiGC4j5uG8kcyRssH+iwdTm4Bl +0PSYiseeb0xlDaZMMq4K1IRvPLZ4PBKe+I6db8TIsTQjLIx8cUKaMdJlBUVLnmVG +uKKxdNz0OBUykEMAltHSagp/QqmVCED/q+Y1dsR2c2jy48dKl0mNRSTxMyaO1DTA +Fuzq0uQJetQdgwEdnoU0nabDk56vP686g4rJR8N6r822JxIfpE6ZLasgBX9P4jJS +rbSyDwCgpBd5p2g= -----END CERTIFICATE----- diff --git a/Deploy/config/ui/private_key.pem b/Deploy/config/ui/private_key.pem index 6c68cacb3..fb3d973fe 100644 --- a/Deploy/config/ui/private_key.pem +++ b/Deploy/config/ui/private_key.pem @@ -1,15 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/Deploy/harbor.cfg b/Deploy/harbor.cfg index bd949cea5..1a59f9578 100644 --- a/Deploy/harbor.cfg +++ b/Deploy/harbor.cfg @@ -2,7 +2,7 @@ #The IP address or hostname to access admin UI and registry service. #DO NOT use localhost or 127.0.0.1, because Harbor needs to be accessed by external clients. -hostname = reg.mydomain.com +hostname = localhost #The protocol for accessing the UI and token/notification service, by default it is http. #It can be set to https if ssl is enabled on nginx. diff --git a/api/statistic.go b/api/statistic.go new file mode 100644 index 000000000..5612fcd93 --- /dev/null +++ b/api/statistic.go @@ -0,0 +1,146 @@ +/* + Copyright (c) 2016 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. +*/ + +package api + +import ( + "net/http" + "os" + + "github.com/vmware/harbor/dao" + "github.com/vmware/harbor/models" + svc_utils "github.com/vmware/harbor/service/utils" + "github.com/vmware/harbor/utils/log" + "github.com/vmware/harbor/utils/registry" + "github.com/vmware/harbor/utils/registry/auth" +) + +type StatisticAPI struct { + BaseAPI + userID int + username string + registry *registry.Registry +} + +//Prepare validates the URL and the user +func (s *StatisticAPI) Prepare() { + userID, ok := s.GetSession("userId").(int) + if !ok { + s.userID = dao.NonExistUserID + } else { + s.userID = userID + log.Debug("userID is xxx", userID) + } + username, ok := s.GetSession("username").(string) + if !ok { + log.Warning("failed to get username from session") + s.username = "" + } else { + s.username = username + log.Debug("username is xxx", username) + } + + var client *http.Client + + //no session, initialize a standard auth handler + if s.userID == dao.NonExistUserID && len(s.username) == 0 { + username, password, _ := s.Ctx.Request.BasicAuth() + + credential := auth.NewBasicAuthCredential(username, password) + client = registry.NewClientStandardAuthHandlerEmbeded(credential) + log.Debug("initializing standard auth handler") + + } else { + // session works, initialize a username auth handler + username := s.username + if len(username) == 0 { + user, err := dao.GetUser(models.User{ + UserID: s.userID, + }) + if err != nil { + log.Errorf("error occurred whiling geting user for initializing a username auth handler: %v", err) + return + } + + username = user.Username + } + + client = registry.NewClientUsernameAuthHandlerEmbeded(username) + log.Debug("initializing username auth handler: %s", username) + } + + endpoint := os.Getenv("REGISTRY_URL") + r, err := registry.New(endpoint, client) + if err != nil { + log.Fatalf("error occurred while initializing auth handler for repository API: %v", err) + } + + s.registry = r +} + +// Get total projects and repos of the user +func (s *StatisticAPI) Get() { + queryProject := models.Project{UserID: s.userID} + projectList, err := dao.QueryProject(queryProject) + var projectArr [6]int + if err != nil { + log.Errorf("Error occured in QueryProject, error: %v", err) + s.CustomAbort(http.StatusInternalServerError, "Internal error.") + } + log.Debug("projectList xxx ", projectList) + isAdmin, _ := dao.IsAdminRole(s.userID) + for i := 0; i < len(projectList); i++ { + if isProjectAdmin(s.userID, projectList[i].ProjectID) { + projectArr[0] += 1 + projectArr[1] += s.GetRepos(projectList[i].ProjectID) + } + if projectList[i].Public == 1 { + projectArr[2] += 1 + projectArr[3] += s.GetRepos(projectList[i].ProjectID) + } + if isAdmin { + projectArr[5] += s.GetRepos(projectList[i].ProjectID) + } + } + if isAdmin { + projectArr[4] = len(projectList) + } + s.Data["json"] = projectArr + s.ServeJSON() +} + +func (s *StatisticAPI) GetRepos(projectID int64) int { + p, err := dao.GetProjectByID(projectID) + if err != nil { + log.Errorf("Error occurred in GetProjectById, error: %v", err) + s.CustomAbort(http.StatusInternalServerError, "Internal error.") + } + if p == nil { + log.Warningf("Project with Id: %d does not exist", projectID) + s.RenderError(http.StatusNotFound, "") + return 0 + } + if p.Public == 0 && !checkProjectPermission(s.userID, projectID) { + s.RenderError(http.StatusForbidden, "") + return 0 + } + + repoList, err := svc_utils.GetRepoFromCache() + if err != nil { + log.Errorf("Failed to get repo from cache, error: %v", err) + s.RenderError(http.StatusInternalServerError, "internal sever error") + } + return len(repoList) +} diff --git a/ui/router.go b/ui/router.go index 401745410..1218424c2 100644 --- a/ui/router.go +++ b/ui/router.go @@ -54,6 +54,7 @@ func initRouters() { beego.Router("/api/search", &api.SearchAPI{}) beego.Router("/api/projects/:pid/members/?:mid", &api.ProjectMemberAPI{}) beego.Router("/api/projects/?:id", &api.ProjectAPI{}) + beego.Router("/api/statistics", &api.StatisticAPI{}) beego.Router("/api/projects/:id/logs/filter", &api.ProjectAPI{}, "post:FilterAccessLog") beego.Router("/api/users", &api.UserAPI{}) beego.Router("/api/users/?:id", &api.UserAPI{}) From 7aa482a5c6e63645b903636ff67cca9b5811b9d5 Mon Sep 17 00:00:00 2001 From: wemeya Date: Tue, 10 May 2016 15:23:47 +0800 Subject: [PATCH 02/29] revoke unnecessary changes --- Deploy/config/registry/root.crt | 46 +++++++----------------- Deploy/config/ui/private_key.pem | 62 +++++++------------------------- Deploy/harbor.cfg | 2 +- 3 files changed, 27 insertions(+), 83 deletions(-) diff --git a/Deploy/config/registry/root.crt b/Deploy/config/registry/root.crt index 71ef6787f..326d8080a 100644 --- a/Deploy/config/registry/root.crt +++ b/Deploy/config/registry/root.crt @@ -1,35 +1,15 @@ -----BEGIN CERTIFICATE----- -MIIGBzCCA++gAwIBAgIJANjBN67MD5SgMA0GCSqGSIb3DQEBCwUAMIGZMQswCQYD -VQQGEwJDTjEOMAwGA1UECAwFU3RhdGUxCzAJBgNVBAcMAkNOMRUwEwYDVQQKDAxv -cmdhbml6YXRpb24xHDAaBgNVBAsME29yZ2FuaXphdGlvbmFsIHVuaXQxFDASBgNV -BAMMC2V4YW1wbGUuY29tMSIwIAYJKoZIhvcNAQkBFhNleGFtcGxlQGV4YW1wbGUu -Y29tMB4XDTE2MDUxMDA0MTMxM1oXDTI2MDUwODA0MTMxM1owgZkxCzAJBgNVBAYT -AkNOMQ4wDAYDVQQIDAVTdGF0ZTELMAkGA1UEBwwCQ04xFTATBgNVBAoMDG9yZ2Fu -aXphdGlvbjEcMBoGA1UECwwTb3JnYW5pemF0aW9uYWwgdW5pdDEUMBIGA1UEAwwL -ZXhhbXBsZS5jb20xIjAgBgkqhkiG9w0BCQEWE2V4YW1wbGVAZXhhbXBsZS5jb20w -ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDVSMUP/IR3iGdM4WrvuWno -Jy+mjOV/Qcte8gK92ClKd5zObAlo6/hn8ZMTeub76A9i39QN8GlQDFMtfv29EpLn -XXoVvLIwH4olycSdrye0ustOke/KT2RHAl3cVi5Zau0rfnb6h5kPQFFgjHsFdsLi -KIOBru976pJh3qxXq2xHIbmHvqLLEGuvt2WKXiRyz9ex6zbc/RTQhesJIA/N73Xo -9m5TfKOimuTedHYuGwS9XAHdr0W+EZl39keaPemrJz5QcebwwZPApuGwe0We8koL -0W1b2Z1a/gUdjcE++RVDOpHCupB/MltB+FSBJKd6LIbkjV1AC+T3NB3CzDPUP/Ep -bjk4wJqGOmMS+/mZbVu9lybrem7V0Wc03DEQyjZztpBcQ6MFbVw3pIbp3fAWhyDJ -N1y+i0O1Llcybpje5P3fQ0ioYc3hF61Wj3bAAx7ddPmrmtVGgisfvcTIRjNLGylM -qObhRjPPvky03x2jtwTnPX74gowuqq70sZHjfqpmXrjpJi9RMEJz30dxW6gy9Mn+ -MOTzwJ7iu3sm6XidaogMvMFrVlLfgIVLl+WfZJIv+i2by6TXfZ6/5OTvU4fzc1NZ -VeWBUSznmM/V72sWc/3AFgNibysv95OwDohqy91N9U73P6Q8H96hkDVHHhktHSL6 -s1OQau9XDgKS6xhZZsRxlwIDAQABo1AwTjAdBgNVHQ4EFgQUQl1pgU1b+rJMvLsQ -W1YednSAsDUwHwYDVR0jBBgwFoAUQl1pgU1b+rJMvLsQW1YednSAsDUwDAYDVR0T -BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAxCMLH/BhxzAGI2k8oBUXOaFXB+uo -2hrteE4glQw0nY959y7FEgKYBKKktWRqNBB/FlNSsrritfhWNK04tIHDQtUhP09m -2TD/0bxY++i+cyhqflHnyROkhAtcg1SBDhwkDMyEKnjzEe7t80Vq6d2sEBbq4PcA -Owl9Xj8elTt1g6aKP4Wt1V7ktZG+zAct+VPQtCnXCH2GAbkN8zqYKpCmzW0IBy0D -NFWKjsebXawOjUwMFu9MTDIwU3DvcCcrNj8k1palLPNNuyXqbsmencFjDRe2mZDU -lA2l4bpZ4G4HPSUJmhZHQ7eq9CYr5goS+kI36n5Uvg2TDDQQxXtfugRkI1qqxGlU -w+qc5BeQqkBior/dI/70+z0ith8/qZZ4U+y7eYY2lzIaNAOn2YLIdxkjF4YxIbSu -kV+Flxa4pFookeLvucZP1v3yW9VdHwClRGD4S4yiGC4j5uG8kcyRssH+iwdTm4Bl -0PSYiseeb0xlDaZMMq4K1IRvPLZ4PBKe+I6db8TIsTQjLIx8cUKaMdJlBUVLnmVG -uKKxdNz0OBUykEMAltHSagp/QqmVCED/q+Y1dsR2c2jy48dKl0mNRSTxMyaO1DTA -Fuzq0uQJetQdgwEdnoU0nabDk56vP686g4rJR8N6r822JxIfpE6ZLasgBX9P4jJS -rbSyDwCgpBd5p2g= +MIICWDCCAcGgAwIBAgIJAN1nLuloDeHNMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV +BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX +aWRnaXRzIFB0eSBMdGQwHhcNMTYwMTI3MDQyMDM1WhcNNDMwNjE0MDQyMDM1WjBF +MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50 +ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB +gQClak/4HO7EeLU0w/BhtVENPLOqU0AP2QjVUdg1qhNiDWVrbWx9KYHqz5Kn0n2+ +fxdZo3o7ZY5/2+hhgkKh1z6Kge9XGgune6z4fx2J/X2Se8WsGeQUTiND8ngSnsCA +NtYFwW50SbUZPtyf5XjAfKRofZem51OxbxzN3217L/ubKwIDAQABo1AwTjAdBgNV +HQ4EFgQU5EG2VrB3I6G/TudUpz+kBgQXSvYwHwYDVR0jBBgwFoAU5EG2VrB3I6G/ +TudUpz+kBgQXSvYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQAx+2eo +oOm0YNy9KQ81+7GQkKVWoPQXjAGGgZuZj8WCFepYqUSJ4q5qbuVCY8WbGcHVk2Rx +Jg1XDCmMjBgYP6S0ikezBRqSmNA3G6oFiydTKBfPs6RNalsB0C78Xk5l5+PIyd2R +jFKOKoMpkjwfeJv2j64WNGoBgqj7XRBoJ11a4g== -----END CERTIFICATE----- diff --git a/Deploy/config/ui/private_key.pem b/Deploy/config/ui/private_key.pem index fb3d973fe..6c68cacb3 100644 --- a/Deploy/config/ui/private_key.pem +++ b/Deploy/config/ui/private_key.pem @@ -1,51 +1,15 @@ -----BEGIN RSA PRIVATE KEY----- -MIIJKgIBAAKCAgEA1UjFD/yEd4hnTOFq77lp6Ccvpozlf0HLXvICvdgpSneczmwJ -aOv4Z/GTE3rm++gPYt/UDfBpUAxTLX79vRKS5116FbyyMB+KJcnEna8ntLrLTpHv -yk9kRwJd3FYuWWrtK352+oeZD0BRYIx7BXbC4iiDga7ve+qSYd6sV6tsRyG5h76i -yxBrr7dlil4kcs/Xses23P0U0IXrCSAPze916PZuU3yjoprk3nR2LhsEvVwB3a9F -vhGZd/ZHmj3pqyc+UHHm8MGTwKbhsHtFnvJKC9FtW9mdWv4FHY3BPvkVQzqRwrqQ -fzJbQfhUgSSneiyG5I1dQAvk9zQdwswz1D/xKW45OMCahjpjEvv5mW1bvZcm63pu -1dFnNNwxEMo2c7aQXEOjBW1cN6SG6d3wFocgyTdcvotDtS5XMm6Y3uT930NIqGHN -4RetVo92wAMe3XT5q5rVRoIrH73EyEYzSxspTKjm4UYzz75MtN8do7cE5z1++IKM -Lqqu9LGR436qZl646SYvUTBCc99HcVuoMvTJ/jDk88Ce4rt7Jul4nWqIDLzBa1ZS -34CFS5fln2SSL/otm8uk132ev+Tk71OH83NTWVXlgVEs55jP1e9rFnP9wBYDYm8r -L/eTsA6IasvdTfVO9z+kPB/eoZA1Rx4ZLR0i+rNTkGrvVw4CkusYWWbEcZcCAwEA -AQKCAgEAh6+k1pfCOj1H4owhuOKPMscDNIS8V+omlH+IKPiExEA2PMhUcDB2tsHj -3Ge63RVz/GYDBN8mUGuW2wHIMOnJFXHNgliqT50xCPtEn0BYFU0knBaRo3ZAiEBE -MDGPiQlSWvI4hQeQ4zf6zV5xwTcdoj099FmzN3UyrRq5L4j5+ILHAknQTTlkGMSm -z5E2xOffA+xs2cgT3tjjfsmr5EpsC8oCxBAuFftOkQssSAaeTE1lTn/78YBGzx+Z -y9GJf34W0Zy03AN6mPxR5jF2SDlBzCTu2pkl10Z1QKj3ALX7xepT4rtHw/PoRJ7U -O9hyx3HeWzZn1Z/7iRzZthys+GG5bIUhEwpjU1j2cbVVYIOkZhPilmhqREzGSJcQ -szs6TKjD7UL2W0+fhQ7uknheQ0mqBwDPrj9gN3gqK9UTHSZi2u1rA4AUXXCRu5v0 -wlU9gQ4fD0t9HO2J+QDSZ5Qz58zj+TE/Ohz8BFNyIGBQGIv4eJ8eRFydZDSRYif4 -VvPox7OxDBw4Ug8gwEOQhh2NQbl2ocFZcevYVajUDbWmoh2omoPdVI8L0Vm8aRxt -hFvHSDqfaEVId6LsH5mcng8lVeZsg4R+yx38+JUgafCSXS7+KHN2+XeiAkY+L8Ik -3reQ3iSaTvEb34E2/0IkRbtZyn5NkjDvYU5DWHeexxVjfBPPsukCggEBAPmpeJ1+ -PlzJN3HX1m/GuAcR7WXt1Itm5OnZlNF47jj3nQVo/2FxPxvivv6tqHOg8Jmo6nzj -S6EqyUbYB/VkbREpY8y+tEsgctakC9uOOIRBygK8olpaB1ncuoApXRWPsH73Ik5Q -s/W3Kf/8tQDNom64wTAKOBuIGLSq9A1pyFS97lsiEPMzilUoHywomIE76hcyTCVL -uXzZmPzRlOjvmW6Z9qHMSRtAI5NOuRIQ1vvXggnIuBB8hxmkQdESiu4cDQoJ61Tv -+PVA12R/G6kWmGaLvB8Vo0DYfWfFgExYDuYhE2ubsAEP2OTQmOQG+UPQKwPKv2/q -2xk2mp3tMbXbGbsCggEBANqy4h0djzr/6Iu0BsJJmreEElSHaS6zt9whkntUzWpj -A8LnmmXqJNT6PksuDAGyf3/TmmTZ6GXZJQXkDtUfiDZrq38JFkJRGJDUiB4cODzp -CuhZ66Dv+HmlaA9w4ZIqzHw2JwrC1Ys6s1N+SBSwCpI6LOpfbRHjxinrHG+HV3SW -MNlhUdoMzDM6isp0UOtF2dfRvY/gyspKM6XnZsrIBFBJI1JcgCvM0r0iDfYJiqSh -pKYPGstUqnYjEOUgv38kEUoq1Sf8Xxg2+BoNYJTQApuIsFxIG6RWuI8qzTHec6cV -QjMHP325itNLbuTRh5TGWMwuRDoEbKlSJtrUdbfHC9UCggEBAO1cdlQmBlxo4dHW -hwVWRPhTzwStjPnMJa8/MgHFm5eFsz/Fh6e452s3tKalrBXi2Vz9/5Ik926PIzW7 -hjWD+T3rv/qVBQy4GPaAmNVw7cKwWcMoXKLSHVMOTDI1IU6ygfb0NyWGDNJ8Be5e -8CeHWfsypFlsHdPvHK4IKmfmPpRyzv7N8JeIVOiJcLmnDvcvY2wSYdrDl+JfbthO -2ehsg89nidhiRM8nt6sBmWrXn81oIzXyIy1pd3ildf20R2oCOVNmAtuKG4Pw1dey -ETY9ST+VcpGLHN819GSInWX4ApJAuBoCtt8LlgZVXEbPaoVSkNLWHBPnkc7y3yVu -sWhYmqkCggEBAIi4qkk/cIqW779exZbywumVhIwZt3T936SbzGKT6nNnATP47Hpo -Paxz4TvIxrLM745vMCd6XyJE9TNQlsFAHDzBZQ5fFO5SmoP4ijwgsjvKCQqnJHqR -awpJkNuOW0awwPOqOxAsK6oGAZPh75gXUhSGkAvZqmsztXABTt6egtsdBd7wS2aA -96vTHm9g9jGPkpesxNBM3RpH9y/xkT6WerPidVWJBIvdWaXpw0acQnOXpkI2US7q -eEKwu2Ay7+TBHJn8WxPLX3vY6ZQH5uhBfk/TzUVzwuwjVvAR9wQFKNI8pQ0Xq+ai -dxqPHv2nzBYDRgInrnmCyJe2BxppFkrVAh0CggEAS4LpuAkzMrcn4bE4QNn1kKHP -HfYs462ueCI0M9rHI45S4st1MLOtAr+2IZWfd0PApcI4oEDGVO3XbOzMrxKxWS1m -kv62kTqcgQnXi3kZEGeduzjst2lrrKqYsuTMlgnkwPrvM+PHxmUkqsOoBOKbpGNf -06Kgy6h/5Ccu/nva3d5iL4AtfuWiMCY1w6WwPjIUp/oRvJXkN25X5DV+G34AIicy -GIoeb3PPbpsBgKQk0gMy/uTbE96+woSTGubL5ck1UxvbptAy0UTslZUPh2aZ7Rx/ -CllGWHa3eM8nS0/Q1FdgbzLOT9EiZrAlTziYV0SDBU9fkvh+7WWIkn61F19TjQ== +MIICXQIBAAKBgQClak/4HO7EeLU0w/BhtVENPLOqU0AP2QjVUdg1qhNiDWVrbWx9 +KYHqz5Kn0n2+fxdZo3o7ZY5/2+hhgkKh1z6Kge9XGgune6z4fx2J/X2Se8WsGeQU +TiND8ngSnsCANtYFwW50SbUZPtyf5XjAfKRofZem51OxbxzN3217L/ubKwIDAQAB +AoGBAITMMuNYJwAogCGaZHOs4yMjZoIJT9bpQMQxbsi2f9UqOA/ky0I4foqKloyQ +2k6DLbXTHqBsydgwLgGKWAAiE5xIR2bPMUNSLgjbA2eLly3aOR/0FJ5n09k2EmGg +Am7tLP+6yneXWKVi3HI3NzXriVjWK94WHGGC1b9F+n5CY/2RAkEA1d62OJUNve2k +IY6/b6T0BdssFo3VFcm22vnayEL/wcYrnRfF9Pb5wM4HUUqwVelKTouivXg60GNK +ZKYAx5CtHwJBAMYAEf5u0CQ/8URcwBuMkm0LzK4AM2x1nGs7gIxAEFhu1Z4xPjVe +MtIxuHhDhlLvD760uccmo5yE72QJ1ZrYBHUCQQCAxLZMPRpoB4QyHEOREe1G9V6H +OeBZXPk2wQcEWqqo3gt2a1DqHCXl+2aWgHTJVUxDHHngwFoRDCdHkFeZ0LcbAkAj +T8/luI2WaXD16DS6tQ9IM1qFjbOeHDuRRENgv+wqWVnvpIibq/kUU5m6mRBTqh78 +u+6F/fYf6/VluftGalAhAkAukdMtt+sksq2e7Qw2dRr5GXtXjt+Otjj0NaJENmWk +a7SgAs34EOWtbd0XGYpZFrg134MzQGbweFeEUTj++e8p -----END RSA PRIVATE KEY----- diff --git a/Deploy/harbor.cfg b/Deploy/harbor.cfg index 1a59f9578..bd949cea5 100644 --- a/Deploy/harbor.cfg +++ b/Deploy/harbor.cfg @@ -2,7 +2,7 @@ #The IP address or hostname to access admin UI and registry service. #DO NOT use localhost or 127.0.0.1, because Harbor needs to be accessed by external clients. -hostname = localhost +hostname = reg.mydomain.com #The protocol for accessing the UI and token/notification service, by default it is http. #It can be set to https if ssl is enabled on nginx. From 8502d3da1be4d365820c0e3b19691c6cbe16ee3d Mon Sep 17 00:00:00 2001 From: wemeya Date: Wed, 11 May 2016 15:54:26 +0800 Subject: [PATCH 03/29] change api for statistics --- api/project.go | 4 +- api/statistic.go | 115 +++++++++++++++------------------------------- dao/project.go | 2 +- models/project.go | 2 + 4 files changed, 44 insertions(+), 79 deletions(-) diff --git a/api/project.go b/api/project.go index 993cc9ad7..afe4783be 100644 --- a/api/project.go +++ b/api/project.go @@ -126,10 +126,12 @@ func (p *ProjectAPI) Get() { log.Errorf("Error occurred in QueryProject, error: %v", err) p.CustomAbort(http.StatusInternalServerError, "Internal error.") } + sa := &StatisticAPI{userID: p.userID, username: ""} for i := 0; i < len(projectList); i++ { - if isProjectAdmin(p.userID, projectList[i].ProjectID) { + if projectList[i].Role == 1 { projectList[i].Togglable = true } + projectList[i].Repos = sa.GetReposByProject(projectList[i].Name, false) } p.Data["json"] = projectList p.ServeJSON() diff --git a/api/statistic.go b/api/statistic.go index 5612fcd93..05b095679 100644 --- a/api/statistic.go +++ b/api/statistic.go @@ -17,21 +17,19 @@ package api import ( "net/http" - "os" + "strings" "github.com/vmware/harbor/dao" "github.com/vmware/harbor/models" svc_utils "github.com/vmware/harbor/service/utils" "github.com/vmware/harbor/utils/log" - "github.com/vmware/harbor/utils/registry" - "github.com/vmware/harbor/utils/registry/auth" ) +// StatisticAPI handles request to /api/statistics/ type StatisticAPI struct { BaseAPI userID int username string - registry *registry.Registry } //Prepare validates the URL and the user @@ -41,7 +39,6 @@ func (s *StatisticAPI) Prepare() { s.userID = dao.NonExistUserID } else { s.userID = userID - log.Debug("userID is xxx", userID) } username, ok := s.GetSession("username").(string) if !ok { @@ -49,98 +46,62 @@ func (s *StatisticAPI) Prepare() { s.username = "" } else { s.username = username - log.Debug("username is xxx", username) } - - var client *http.Client - - //no session, initialize a standard auth handler - if s.userID == dao.NonExistUserID && len(s.username) == 0 { - username, password, _ := s.Ctx.Request.BasicAuth() - - credential := auth.NewBasicAuthCredential(username, password) - client = registry.NewClientStandardAuthHandlerEmbeded(credential) - log.Debug("initializing standard auth handler") - - } else { - // session works, initialize a username auth handler - username := s.username - if len(username) == 0 { - user, err := dao.GetUser(models.User{ - UserID: s.userID, - }) - if err != nil { - log.Errorf("error occurred whiling geting user for initializing a username auth handler: %v", err) - return - } - - username = user.Username - } - - client = registry.NewClientUsernameAuthHandlerEmbeded(username) - log.Debug("initializing username auth handler: %s", username) - } - - endpoint := os.Getenv("REGISTRY_URL") - r, err := registry.New(endpoint, client) - if err != nil { - log.Fatalf("error occurred while initializing auth handler for repository API: %v", err) - } - - s.registry = r } // Get total projects and repos of the user func (s *StatisticAPI) Get() { queryProject := models.Project{UserID: s.userID} projectList, err := dao.QueryProject(queryProject) - var projectArr [6]int + proMap := map[string]int{} if err != nil { log.Errorf("Error occured in QueryProject, error: %v", err) s.CustomAbort(http.StatusInternalServerError, "Internal error.") } - log.Debug("projectList xxx ", projectList) - isAdmin, _ := dao.IsAdminRole(s.userID) - for i := 0; i < len(projectList); i++ { - if isProjectAdmin(s.userID, projectList[i].ProjectID) { - projectArr[0] += 1 - projectArr[1] += s.GetRepos(projectList[i].ProjectID) - } - if projectList[i].Public == 1 { - projectArr[2] += 1 - projectArr[3] += s.GetRepos(projectList[i].ProjectID) - } - if isAdmin { - projectArr[5] += s.GetRepos(projectList[i].ProjectID) - } + isAdmin, err0 := dao.IsAdminRole(s.userID) + if err0 != nil { + log.Errorf("Error occured in check admin, error: %v", err0) + s.CustomAbort(http.StatusInternalServerError, "Internal error.") } if isAdmin { - projectArr[4] = len(projectList) + proMap["total_project"] = len(projectList) } - s.Data["json"] = projectArr + for i := 0; i < len(projectList); i++ { + if projectList[i].Role == 1 || projectList[i].Role == 2 { + proMap["my_project"]++ + proMap["my_repos"] += s.GetReposByProject(projectList[i].Name, false) + } + if projectList[i].Public == 1 { + proMap["public_project"]++ + proMap["public_repos"] += s.GetReposByProject(projectList[i].Name, false) + } + if isAdmin { + proMap["total_repos"] = s.GetReposByProject(projectList[i].Name, true) + } + } + log.Debug(projectList) + s.Data["json"] = proMap s.ServeJSON() } -func (s *StatisticAPI) GetRepos(projectID int64) int { - p, err := dao.GetProjectByID(projectID) - if err != nil { - log.Errorf("Error occurred in GetProjectById, error: %v", err) - s.CustomAbort(http.StatusInternalServerError, "Internal error.") - } - if p == nil { - log.Warningf("Project with Id: %d does not exist", projectID) - s.RenderError(http.StatusNotFound, "") - return 0 - } - if p.Public == 0 && !checkProjectPermission(s.userID, projectID) { - s.RenderError(http.StatusForbidden, "") - return 0 - } - +//return repo numbers of specified project +func (s *StatisticAPI) GetReposByProject(projectName string, isAdmin bool) int { repoList, err := svc_utils.GetRepoFromCache() if err != nil { log.Errorf("Failed to get repo from cache, error: %v", err) s.RenderError(http.StatusInternalServerError, "internal sever error") } - return len(repoList) + if isAdmin { + return len(repoList) + } + var resp []string + if len(projectName) > 0 { + for _, r := range repoList { + if strings.Contains(r, "/") && r[0:strings.LastIndex(r, "/")] == projectName { + resp = append(resp, r) + } + } + return len(resp) + } + return 0 } diff --git a/dao/project.go b/dao/project.go index 9eba4f78e..cb41e303c 100644 --- a/dao/project.go +++ b/dao/project.go @@ -84,7 +84,7 @@ func QueryProject(query models.Project) ([]models.Project, error) { o := orm.NewOrm() sql := `select distinct - p.project_id, p.owner_id, p.name,p.creation_time, p.update_time, p.public + p.project_id, p.owner_id, p.name,p.creation_time, p.update_time, p.public, pm.role role from project p left join project_member pm on p.project_id = pm.project_id where p.deleted = 0 ` diff --git a/models/project.go b/models/project.go index e240c609f..6fa9257d7 100644 --- a/models/project.go +++ b/models/project.go @@ -34,4 +34,6 @@ type Project struct { Togglable bool UpdateTime time.Time `orm:"update_time" json:"update_time"` + Role int `json:"RoleId"` + Repos int } From acb2d0252b1eb9326995992973a87af3a56f555f Mon Sep 17 00:00:00 2001 From: wemeya Date: Wed, 11 May 2016 16:05:35 +0800 Subject: [PATCH 04/29] change the comment of the function --- api/statistic.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/statistic.go b/api/statistic.go index 05b095679..cc2bfb259 100644 --- a/api/statistic.go +++ b/api/statistic.go @@ -84,7 +84,7 @@ func (s *StatisticAPI) Get() { s.ServeJSON() } -//return repo numbers of specified project +//GetReposByProject returns repo numbers of specified project func (s *StatisticAPI) GetReposByProject(projectName string, isAdmin bool) int { repoList, err := svc_utils.GetRepoFromCache() if err != nil { From f43d6dab189da789fb7e97e8544fe31e4c4175a9 Mon Sep 17 00:00:00 2001 From: wemeya Date: Thu, 12 May 2016 14:56:43 +0800 Subject: [PATCH 05/29] change api for statistics and project repo, roleid --- api/statistic.go | 1 - dao/project.go | 23 ++++++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/api/statistic.go b/api/statistic.go index cc2bfb259..9aeab1bcd 100644 --- a/api/statistic.go +++ b/api/statistic.go @@ -79,7 +79,6 @@ func (s *StatisticAPI) Get() { proMap["total_repos"] = s.GetReposByProject(projectList[i].Name, true) } } - log.Debug(projectList) s.Data["json"] = proMap s.ServeJSON() } diff --git a/dao/project.go b/dao/project.go index 5c53a0f26..cc73ff841 100644 --- a/dao/project.go +++ b/dao/project.go @@ -84,19 +84,19 @@ func QueryProject(query models.Project) ([]models.Project, error) { o := orm.NewOrm() sql := `select distinct - p.project_id, p.owner_id, p.name,p.creation_time, p.update_time, p.public, pm.role role - from project p - left join project_member pm on p.project_id = pm.project_id - where p.deleted = 0 ` - + p.project_id, p.owner_id, p.name,p.creation_time, p.update_time, p.public` queryParam := make([]interface{}, 1) - + isAdmin, _ := IsAdminRole(query.UserID) if query.Public == 1 { - sql += ` and p.public = ?` + sql += ` from project p where p.deleted = 0 and p.public = ?` queryParam = append(queryParam, query.Public) - } else if isAdmin, _ := IsAdminRole(query.UserID); isAdmin == false { - sql += ` and (pm.user_id = ?) ` + } else if !isAdmin { + sql += `, pm.role role from project p + left join project_member pm on p.project_id = pm.project_id + where p.deleted = 0 and (pm.user_id = ?) ` queryParam = append(queryParam, query.UserID) + } else if isAdmin { + sql += ` from project p where p.deleted = 0 ` } if query.Name != "" { @@ -112,6 +112,11 @@ func QueryProject(query models.Project) ([]models.Project, error) { if err != nil { return nil, err } + if isAdmin { + for i := 0; i < len(r); i++ { + r[i].Role = 1 + } + } return r, nil } From 8c35e6ffa2d18991fca7b2f8e3595b29ec9a770c Mon Sep 17 00:00:00 2001 From: wemeya Date: Fri, 13 May 2016 22:45:30 +0800 Subject: [PATCH 06/29] change code for statistic and project repo_count, role_id api --- api/project.go | 5 ++--- api/statistic.go | 36 +++++++++++++++++++++--------------- dao/project.go | 16 +++++++++++----- models/project.go | 4 ++-- 4 files changed, 36 insertions(+), 25 deletions(-) diff --git a/api/project.go b/api/project.go index 35b089060..e14668e10 100644 --- a/api/project.go +++ b/api/project.go @@ -126,12 +126,11 @@ func (p *ProjectAPI) Get() { log.Errorf("Error occurred in QueryProject, error: %v", err) p.CustomAbort(http.StatusInternalServerError, "Internal error.") } - sa := &StatisticAPI{userID: p.userID, username: ""} for i := 0; i < len(projectList); i++ { - if projectList[i].Role == 1 { + if projectList[i].Role == models.PROJECTADMIN { projectList[i].Togglable = true } - projectList[i].Repos = sa.GetReposByProject(projectList[i].Name, false) + projectList[i].RepoCount = getRepoCountByProject(projectList[i].Name) } p.Data["json"] = projectList p.ServeJSON() diff --git a/api/statistic.go b/api/statistic.go index 9aeab1bcd..b16b5d875 100644 --- a/api/statistic.go +++ b/api/statistic.go @@ -64,34 +64,29 @@ func (s *StatisticAPI) Get() { s.CustomAbort(http.StatusInternalServerError, "Internal error.") } if isAdmin { - proMap["total_project"] = len(projectList) + proMap["total_project_count"] = len(projectList) + proMap["total_repo_count"] = getTotalRepoCount() } for i := 0; i < len(projectList); i++ { - if projectList[i].Role == 1 || projectList[i].Role == 2 { - proMap["my_project"]++ - proMap["my_repos"] += s.GetReposByProject(projectList[i].Name, false) + if projectList[i].Role == models.PROJECTADMIN || projectList[i].Role == models.DEVELOPER { + proMap["my_project_count"]++ + proMap["my_repo_count"] += getRepoCountByProject(projectList[i].Name) } if projectList[i].Public == 1 { - proMap["public_project"]++ - proMap["public_repos"] += s.GetReposByProject(projectList[i].Name, false) - } - if isAdmin { - proMap["total_repos"] = s.GetReposByProject(projectList[i].Name, true) + proMap["public_project_count"]++ + proMap["public_repo_count"] += getRepoCountByProject(projectList[i].Name) } } s.Data["json"] = proMap s.ServeJSON() } -//GetReposByProject returns repo numbers of specified project -func (s *StatisticAPI) GetReposByProject(projectName string, isAdmin bool) int { +//getReposByProject returns repo numbers of specified project +func getRepoCountByProject(projectName string) int { repoList, err := svc_utils.GetRepoFromCache() if err != nil { log.Errorf("Failed to get repo from cache, error: %v", err) - s.RenderError(http.StatusInternalServerError, "internal sever error") - } - if isAdmin { - return len(repoList) + return 0 } var resp []string if len(projectName) > 0 { @@ -104,3 +99,14 @@ func (s *StatisticAPI) GetReposByProject(projectName string, isAdmin bool) int { } return 0 } + +//getTotalRepoCount returns total repo count +func getTotalRepoCount() int { + repoList, err := svc_utils.GetRepoFromCache() + if err != nil { + log.Errorf("Failed to get repo from cache, error: %v", err) + return 0 + } + return len(repoList) + +} diff --git a/dao/project.go b/dao/project.go index cc73ff841..97ef37e14 100644 --- a/dao/project.go +++ b/dao/project.go @@ -86,19 +86,25 @@ func QueryProject(query models.Project) ([]models.Project, error) { sql := `select distinct p.project_id, p.owner_id, p.name,p.creation_time, p.update_time, p.public` queryParam := make([]interface{}, 1) - isAdmin, _ := IsAdminRole(query.UserID) + isAdmin, err := IsAdminRole(query.UserID) + if err != nil { + return nil, err + } + if query.Public == 1 { + //if the project is public sql += ` from project p where p.deleted = 0 and p.public = ?` queryParam = append(queryParam, query.Public) } else if !isAdmin { + //if the user is not admin, should join the project_member table to query his/her projects and role id sql += `, pm.role role from project p left join project_member pm on p.project_id = pm.project_id where p.deleted = 0 and (pm.user_id = ?) ` queryParam = append(queryParam, query.UserID) } else if isAdmin { + //if the user is admin, return all projects sql += ` from project p where p.deleted = 0 ` } - if query.Name != "" { sql += " and p.name like ? " queryParam = append(queryParam, query.Name) @@ -107,14 +113,14 @@ func QueryProject(query models.Project) ([]models.Project, error) { sql += " order by p.name " var r []models.Project - _, err := o.Raw(sql, queryParam).QueryRows(&r) + _, err0 := o.Raw(sql, queryParam).QueryRows(&r) - if err != nil { + if err0 != nil { return nil, err } if isAdmin { for i := 0; i < len(r); i++ { - r[i].Role = 1 + r[i].Role = models.PROJECTADMIN } } return r, nil diff --git a/models/project.go b/models/project.go index 6fa9257d7..2ebd5fc32 100644 --- a/models/project.go +++ b/models/project.go @@ -34,6 +34,6 @@ type Project struct { Togglable bool UpdateTime time.Time `orm:"update_time" json:"update_time"` - Role int `json:"RoleId"` - Repos int + Role int `json:"role_id"` + RepoCount int `json:"repo_count"` } From 85ce86df1abdc535c1171206e4be167ce7123f36 Mon Sep 17 00:00:00 2001 From: wemeya Date: Fri, 13 May 2016 15:28:26 +0800 Subject: [PATCH 07/29] change code of statistic api --- api/statistic.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/api/statistic.go b/api/statistic.go index b16b5d875..91f34c9c2 100644 --- a/api/statistic.go +++ b/api/statistic.go @@ -53,14 +53,14 @@ func (s *StatisticAPI) Prepare() { func (s *StatisticAPI) Get() { queryProject := models.Project{UserID: s.userID} projectList, err := dao.QueryProject(queryProject) - proMap := map[string]int{} if err != nil { log.Errorf("Error occured in QueryProject, error: %v", err) s.CustomAbort(http.StatusInternalServerError, "Internal error.") } - isAdmin, err0 := dao.IsAdminRole(s.userID) - if err0 != nil { - log.Errorf("Error occured in check admin, error: %v", err0) + proMap := map[string]int{} + isAdmin, err := dao.IsAdminRole(s.userID) + if err != nil { + log.Errorf("Error occured in check admin, error: %v", err) s.CustomAbort(http.StatusInternalServerError, "Internal error.") } if isAdmin { @@ -68,7 +68,8 @@ func (s *StatisticAPI) Get() { proMap["total_repo_count"] = getTotalRepoCount() } for i := 0; i < len(projectList); i++ { - if projectList[i].Role == models.PROJECTADMIN || projectList[i].Role == models.DEVELOPER { + if projectList[i].Role == models.PROJECTADMIN || projectList[i].Role == models.DEVELOPER || + projectList[i].Role == models.GUEST { proMap["my_project_count"]++ proMap["my_repo_count"] += getRepoCountByProject(projectList[i].Name) } @@ -88,14 +89,14 @@ func getRepoCountByProject(projectName string) int { log.Errorf("Failed to get repo from cache, error: %v", err) return 0 } - var resp []string + var resp int if len(projectName) > 0 { for _, r := range repoList { if strings.Contains(r, "/") && r[0:strings.LastIndex(r, "/")] == projectName { - resp = append(resp, r) + resp += 1 } } - return len(resp) + return resp } return 0 } From c5b1b86d891eba17e3ce02fb01cbb304e6767be1 Mon Sep 17 00:00:00 2001 From: wemeya Date: Fri, 13 May 2016 16:18:48 +0800 Subject: [PATCH 08/29] modify code where CI unpassed --- api/statistic.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/statistic.go b/api/statistic.go index 91f34c9c2..d594d2e2c 100644 --- a/api/statistic.go +++ b/api/statistic.go @@ -93,7 +93,7 @@ func getRepoCountByProject(projectName string) int { if len(projectName) > 0 { for _, r := range repoList { if strings.Contains(r, "/") && r[0:strings.LastIndex(r, "/")] == projectName { - resp += 1 + resp++ } } return resp From d30fc97b3f217b842a3d52f5b15c3f9c440329c8 Mon Sep 17 00:00:00 2001 From: wemeya Date: Fri, 13 May 2016 16:39:22 +0800 Subject: [PATCH 09/29] modify code when project list length is 0 --- api/statistic.go | 6 +++++- dao/project.go | 5 ++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/api/statistic.go b/api/statistic.go index d594d2e2c..ddcbcfd92 100644 --- a/api/statistic.go +++ b/api/statistic.go @@ -57,12 +57,16 @@ func (s *StatisticAPI) Get() { log.Errorf("Error occured in QueryProject, error: %v", err) s.CustomAbort(http.StatusInternalServerError, "Internal error.") } - proMap := map[string]int{} isAdmin, err := dao.IsAdminRole(s.userID) if err != nil { log.Errorf("Error occured in check admin, error: %v", err) s.CustomAbort(http.StatusInternalServerError, "Internal error.") } + proMap := map[string]int{} + proMap["my_project_count"] = 0 + proMap["my_repo_count"] = 0 + proMap["public_project_count"] = 0 + proMap["public_repo_count"] = 0 if isAdmin { proMap["total_project_count"] = len(projectList) proMap["total_repo_count"] = getTotalRepoCount() diff --git a/dao/project.go b/dao/project.go index 97ef37e14..6091ce65a 100644 --- a/dao/project.go +++ b/dao/project.go @@ -113,9 +113,8 @@ func QueryProject(query models.Project) ([]models.Project, error) { sql += " order by p.name " var r []models.Project - _, err0 := o.Raw(sql, queryParam).QueryRows(&r) - - if err0 != nil { + _, err := o.Raw(sql, queryParam).QueryRows(&r) + if err != nil { return nil, err } if isAdmin { From 2561371e377e28f5c9b8d71ab7d95d20d928bf78 Mon Sep 17 00:00:00 2001 From: wemeya Date: Fri, 13 May 2016 16:46:25 +0800 Subject: [PATCH 10/29] change CI error --- dao/project.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dao/project.go b/dao/project.go index 6091ce65a..476350fc7 100644 --- a/dao/project.go +++ b/dao/project.go @@ -113,7 +113,7 @@ func QueryProject(query models.Project) ([]models.Project, error) { sql += " order by p.name " var r []models.Project - _, err := o.Raw(sql, queryParam).QueryRows(&r) + _, err = o.Raw(sql, queryParam).QueryRows(&r) if err != nil { return nil, err } From 9017fe2b569566b78e25a7c4fd1c21167a321d46 Mon Sep 17 00:00:00 2001 From: wemeya Date: Mon, 16 May 2016 17:31:38 +0800 Subject: [PATCH 11/29] change code for statistics api and project detail api --- api/project.go | 29 ++++++++++++++--- api/search.go | 2 +- api/statistic.go | 35 +++++++++----------- dao/dao_test.go | 33 ------------------- dao/project.go | 84 ++++++++++++++++++++---------------------------- 5 files changed, 75 insertions(+), 108 deletions(-) diff --git a/api/project.go b/api/project.go index e14668e10..e933d5a3f 100644 --- a/api/project.go +++ b/api/project.go @@ -118,15 +118,34 @@ func (p *ProjectAPI) Get() { if len(projectName) > 0 { queryProject.Name = "%" + projectName + "%" } - public, _ := p.GetInt("is_public") - queryProject.Public = public - - projectList, err := dao.QueryProject(queryProject) + isPublic := p.GetString("is_public") + if len(isPublic) > 0 { + public, err := strconv.ParseInt(isPublic, 10, 64) + if err != nil { + log.Errorf("Error parsing public property: %d, error: %v", isPublic, err) + p.CustomAbort(http.StatusBadRequest, "invalid project Id") + } + queryProject.Public = int(public) + } + isAdmin, err := dao.IsAdminRole(p.userID) if err != nil { - log.Errorf("Error occurred in QueryProject, error: %v", err) + log.Errorf("Error occured in check admin, error: %v", err) + p.CustomAbort(http.StatusInternalServerError, "Internal error.") + } + var projectList []models.Project + if isAdmin { + projectList, err = dao.GetAllProjects() + } else { + projectList, err = dao.GetUserRelevantProjects(queryProject) + } + if err != nil { + log.Errorf("Error occured in QueryProject, error: %v", err) p.CustomAbort(http.StatusInternalServerError, "Internal error.") } for i := 0; i < len(projectList); i++ { + if isAdmin { + projectList[i].Role = models.PROJECTADMIN + } if projectList[i].Role == models.PROJECTADMIN { projectList[i].Togglable = true } diff --git a/api/search.go b/api/search.go index d47bb5890..f22b6b7f7 100644 --- a/api/search.go +++ b/api/search.go @@ -61,7 +61,7 @@ func (s *SearchAPI) Get() { s.CustomAbort(http.StatusInternalServerError, "internal error") } } else { - projects, err = dao.GetUserRelevantProjects(userID) + projects, err = dao.SearchProjects(userID) if err != nil { log.Errorf("failed to get user %d 's relevant projects: %v", userID, err) s.CustomAbort(http.StatusInternalServerError, "internal error") diff --git a/api/statistic.go b/api/statistic.go index ddcbcfd92..4d0561840 100644 --- a/api/statistic.go +++ b/api/statistic.go @@ -28,40 +28,32 @@ import ( // StatisticAPI handles request to /api/statistics/ type StatisticAPI struct { BaseAPI - userID int - username string + userID int } //Prepare validates the URL and the user func (s *StatisticAPI) Prepare() { - userID, ok := s.GetSession("userId").(int) - if !ok { - s.userID = dao.NonExistUserID - } else { - s.userID = userID - } - username, ok := s.GetSession("username").(string) - if !ok { - log.Warning("failed to get username from session") - s.username = "" - } else { - s.username = username - } + s.userID = s.ValidateUser() } // Get total projects and repos of the user func (s *StatisticAPI) Get() { queryProject := models.Project{UserID: s.userID} - projectList, err := dao.QueryProject(queryProject) - if err != nil { - log.Errorf("Error occured in QueryProject, error: %v", err) - s.CustomAbort(http.StatusInternalServerError, "Internal error.") - } isAdmin, err := dao.IsAdminRole(s.userID) if err != nil { log.Errorf("Error occured in check admin, error: %v", err) s.CustomAbort(http.StatusInternalServerError, "Internal error.") } + var projectList []models.Project + if isAdmin { + projectList, err = dao.GetAllProjects() + } else { + projectList, err = dao.GetUserRelevantProjects(queryProject) + } + if err != nil { + log.Errorf("Error occured in QueryProject, error: %v", err) + s.CustomAbort(http.StatusInternalServerError, "Internal error.") + } proMap := map[string]int{} proMap["my_project_count"] = 0 proMap["my_repo_count"] = 0 @@ -72,6 +64,9 @@ func (s *StatisticAPI) Get() { proMap["total_repo_count"] = getTotalRepoCount() } for i := 0; i < len(projectList); i++ { + if isAdmin { + projectList[i].Role = models.PROJECTADMIN + } if projectList[i].Role == models.PROJECTADMIN || projectList[i].Role == models.DEVELOPER || projectList[i].Role == models.GUEST { proMap["my_project_count"]++ diff --git a/dao/dao_test.go b/dao/dao_test.go index 0ef18faec..b4a48a066 100644 --- a/dao/dao_test.go +++ b/dao/dao_test.go @@ -572,39 +572,6 @@ func TestIsProjectPublic(t *testing.T) { } } -func TestQueryProject(t *testing.T) { - query1 := models.Project{ - UserID: 1, - } - projects, err := QueryProject(query1) - if err != nil { - t.Errorf("Error in Query Project: %v, query: %+v", err, query1) - } - if len(projects) != 2 { - t.Errorf("Expecting get 2 projects, but actual: %d, the list: %+v", len(projects), projects) - } - query2 := models.Project{ - Public: 1, - } - projects, err = QueryProject(query2) - if err != nil { - t.Errorf("Error in Query Project: %v, query: %+v", err, query2) - } - if len(projects) != 1 { - t.Errorf("Expecting get 1 project, but actual: %d, the list: %+v", len(projects), projects) - } - query3 := models.Project{ - UserID: 9, - } - projects, err = QueryProject(query3) - if err != nil { - t.Errorf("Error in Query Project: %v, query: %+v", err, query3) - } - if len(projects) != 0 { - t.Errorf("Expecting get 0 project, but actual: %d, the list: %+v", len(projects), projects) - } -} - func TestGetUserProjectRoles(t *testing.T) { r, err := GetUserProjectRoles(currentUser.UserID, currentProject.ProjectID) if err != nil { diff --git a/dao/project.go b/dao/project.go index 476350fc7..6efc86d43 100644 --- a/dao/project.go +++ b/dao/project.go @@ -79,52 +79,6 @@ func IsProjectPublic(projectName string) bool { return project.Public == 1 } -// QueryProject querys the projects based on publicity and user, disregarding the names etc. -func QueryProject(query models.Project) ([]models.Project, error) { - o := orm.NewOrm() - - sql := `select distinct - p.project_id, p.owner_id, p.name,p.creation_time, p.update_time, p.public` - queryParam := make([]interface{}, 1) - isAdmin, err := IsAdminRole(query.UserID) - if err != nil { - return nil, err - } - - if query.Public == 1 { - //if the project is public - sql += ` from project p where p.deleted = 0 and p.public = ?` - queryParam = append(queryParam, query.Public) - } else if !isAdmin { - //if the user is not admin, should join the project_member table to query his/her projects and role id - sql += `, pm.role role from project p - left join project_member pm on p.project_id = pm.project_id - where p.deleted = 0 and (pm.user_id = ?) ` - queryParam = append(queryParam, query.UserID) - } else if isAdmin { - //if the user is admin, return all projects - sql += ` from project p where p.deleted = 0 ` - } - if query.Name != "" { - sql += " and p.name like ? " - queryParam = append(queryParam, query.Name) - } - - sql += " order by p.name " - - var r []models.Project - _, err = o.Raw(sql, queryParam).QueryRows(&r) - if err != nil { - return nil, err - } - if isAdmin { - for i := 0; i < len(r); i++ { - r[i].Role = models.PROJECTADMIN - } - } - return r, nil -} - //ProjectExists returns whether the project exists according to its name of ID. func ProjectExists(nameOrID interface{}) (bool, error) { o := orm.NewOrm() @@ -218,16 +172,16 @@ func ToggleProjectPublicity(projectID int64, publicity int) error { return err } -// GetUserRelevantProjects returns a project list, +// SearchProjects returns a project list, // which satisfies the following conditions: // 1. the project is not deleted // 2. the prject is public or the user is a member of the project -func GetUserRelevantProjects(userID int) ([]models.Project, error) { +func SearchProjects(userID int) ([]models.Project, error) { o := orm.NewOrm() sql := `select distinct p.project_id, p.name, p.public from project p left join project_member pm on p.project_id = pm.project_id - where (pm.user_id = ? or p.public = 1) and p.deleted = 0` + where (pm.user_id = ? or p.pulic=1) and p.deleted = 0` var projects []models.Project @@ -238,6 +192,38 @@ func GetUserRelevantProjects(userID int) ([]models.Project, error) { return projects, nil } +// GetUserRelevantProjects returns the projects based on publicity and user, disregarding the names etc. +func GetUserRelevantProjects(query models.Project) ([]models.Project, error) { + o := orm.NewOrm() + + sql := `select distinct + p.project_id, p.owner_id, p.name,p.creation_time, p.update_time, p.public, pm.role role + from project p + left join project_member pm on p.project_id = pm.project_id + where p.deleted = 0 and pm.user_id= ?` + + queryParam := make([]interface{}, 1) + queryParam = append(queryParam, query.UserID) + if query.Public == 1 { + sql += ` and p.public = ?` + queryParam = append(queryParam, query.Public) + } + if query.Name != "" { + sql += " and p.name like ? " + queryParam = append(queryParam, query.Name) + } + + sql += " order by p.name " + + var r []models.Project + _, err := o.Raw(sql, queryParam).QueryRows(&r) + + if err != nil { + return nil, err + } + return r, nil +} + // GetAllProjects returns all projects which are not deleted func GetAllProjects() ([]models.Project, error) { o := orm.NewOrm() From ec59807963efaf8633eaa2ac2e270833d1302e71 Mon Sep 17 00:00:00 2001 From: wemeya Date: Mon, 16 May 2016 17:42:36 +0800 Subject: [PATCH 12/29] change dao_test file --- dao/dao_test.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dao/dao_test.go b/dao/dao_test.go index b4a48a066..65bf710a2 100644 --- a/dao/dao_test.go +++ b/dao/dao_test.go @@ -353,7 +353,8 @@ func TestChangeUserPasswordWithIncorrectOldPassword(t *testing.T) { } func TestQueryRelevantProjectsWhenNoProjectAdded(t *testing.T) { - projects, err := GetUserRelevantProjects(currentUser.UserID) + project := models.Project{UserID: currentUser.UserID} + projects, err := GetUserRelevantProjects(project) if err != nil { t.Errorf("Error occurred in QueryRelevantProjects: %v", err) } @@ -599,7 +600,8 @@ func TestProjectPermission(t *testing.T) { } func TestGetUserRelevantProjects(t *testing.T) { - projects, err := GetUserRelevantProjects(currentUser.UserID) + project := models.Project{UserID: currentUser.UserID} + projects, err := GetUserRelevantProjects(project) if err != nil { t.Errorf("Error occurred in GetUserRelevantProjects: %v", err) } From cf08ed8437c43781d719af9786c84e7cceaeec63 Mon Sep 17 00:00:00 2001 From: wemeya Date: Mon, 16 May 2016 17:50:27 +0800 Subject: [PATCH 13/29] change dao_test file --- dao/dao_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dao/dao_test.go b/dao/dao_test.go index 65bf710a2..dff8fa58c 100644 --- a/dao/dao_test.go +++ b/dao/dao_test.go @@ -353,8 +353,7 @@ func TestChangeUserPasswordWithIncorrectOldPassword(t *testing.T) { } func TestQueryRelevantProjectsWhenNoProjectAdded(t *testing.T) { - project := models.Project{UserID: currentUser.UserID} - projects, err := GetUserRelevantProjects(project) + projects, err := SearchProjects(currentUser.UserID) if err != nil { t.Errorf("Error occurred in QueryRelevantProjects: %v", err) } From 36e6f5f732b0b8856d44d35aa5261b47ce2c1b65 Mon Sep 17 00:00:00 2001 From: wemeya Date: Mon, 16 May 2016 17:57:54 +0800 Subject: [PATCH 14/29] change dao/porject.go file --- dao/project.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dao/project.go b/dao/project.go index 6efc86d43..67e2e1399 100644 --- a/dao/project.go +++ b/dao/project.go @@ -181,7 +181,7 @@ func SearchProjects(userID int) ([]models.Project, error) { sql := `select distinct p.project_id, p.name, p.public from project p left join project_member pm on p.project_id = pm.project_id - where (pm.user_id = ? or p.pulic=1) and p.deleted = 0` + where (pm.user_id = ? or p.pulic = 1) and p.deleted = 0` var projects []models.Project From 9d1a9c31c218c474cc12a79f47620647f2758550 Mon Sep 17 00:00:00 2001 From: wemeya Date: Mon, 16 May 2016 18:02:39 +0800 Subject: [PATCH 15/29] change dao/porject.go file --- dao/project.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dao/project.go b/dao/project.go index 67e2e1399..57df692c9 100644 --- a/dao/project.go +++ b/dao/project.go @@ -181,7 +181,7 @@ func SearchProjects(userID int) ([]models.Project, error) { sql := `select distinct p.project_id, p.name, p.public from project p left join project_member pm on p.project_id = pm.project_id - where (pm.user_id = ? or p.pulic = 1) and p.deleted = 0` + where (pm.user_id = ? or p.public = 1) and p.deleted = 0` var projects []models.Project From facfb03d155c968562ae6e17653efd408e6e5794 Mon Sep 17 00:00:00 2001 From: wemeya Date: Mon, 16 May 2016 18:08:50 +0800 Subject: [PATCH 16/29] change dao_test file --- dao/dao_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dao/dao_test.go b/dao/dao_test.go index dff8fa58c..3845524b9 100644 --- a/dao/dao_test.go +++ b/dao/dao_test.go @@ -604,10 +604,10 @@ func TestGetUserRelevantProjects(t *testing.T) { if err != nil { t.Errorf("Error occurred in GetUserRelevantProjects: %v", err) } - if len(projects) != 2 { - t.Errorf("Expected length of relevant projects is 2, but actual: %d, the projects: %+v", len(projects), projects) + if len(projects) != 1 { + t.Errorf("Expected length of relevant projects is 1, but actual: %d, the projects: %+v", len(projects), projects) } - if projects[1].Name != projectName { + if projects[0].Name != projectName { t.Errorf("Expected project name in the list: %s, actual: %s", projectName, projects[1].Name) } } From 313887967eeceacf1882c6ce4fef9b53b023ee9c Mon Sep 17 00:00:00 2001 From: wemeya Date: Tue, 17 May 2016 17:03:40 +0800 Subject: [PATCH 17/29] change api for statistics and project --- api/project.go | 51 +++++++++++++++++++++++++++--------------------- api/search.go | 2 +- api/statistic.go | 5 ++--- dao/dao_test.go | 5 ++--- dao/project.go | 37 +++++++++++++++++++++++++---------- 5 files changed, 61 insertions(+), 39 deletions(-) diff --git a/api/project.go b/api/project.go index e933d5a3f..989f5a5ab 100644 --- a/api/project.go +++ b/api/project.go @@ -113,34 +113,41 @@ func (p *ProjectAPI) Head() { // Get ... func (p *ProjectAPI) Get() { - queryProject := models.Project{UserID: p.userID} - projectName := p.GetString("project_name") - if len(projectName) > 0 { - queryProject.Name = "%" + projectName + "%" - } - isPublic := p.GetString("is_public") - if len(isPublic) > 0 { - public, err := strconv.ParseInt(isPublic, 10, 64) - if err != nil { - log.Errorf("Error parsing public property: %d, error: %v", isPublic, err) - p.CustomAbort(http.StatusBadRequest, "invalid project Id") - } - queryProject.Public = int(public) - } + var projectList []models.Project isAdmin, err := dao.IsAdminRole(p.userID) if err != nil { log.Errorf("Error occured in check admin, error: %v", err) p.CustomAbort(http.StatusInternalServerError, "Internal error.") } - var projectList []models.Project - if isAdmin { - projectList, err = dao.GetAllProjects() - } else { - projectList, err = dao.GetUserRelevantProjects(queryProject) + projectName := p.GetString("project_name") + if len(projectName) > 0 { + projectName = "%" + projectName + "%" } - if err != nil { - log.Errorf("Error occured in QueryProject, error: %v", err) - p.CustomAbort(http.StatusInternalServerError, "Internal error.") + var public int + isPublic := p.GetString("is_public") + if len(isPublic) > 0 { + public, err = strconv.Atoi(isPublic) + if err != nil { + log.Errorf("Error parsing public property: %d, error: %v", isPublic, err) + p.CustomAbort(http.StatusBadRequest, "invalid project Id") + } + } + if public == 1 { + projectList, err = dao.GetPublicProjects(projectName) + if err != nil { + log.Errorf("Error occured in GetPulicProjects, error: %v", err) + p.CustomAbort(http.StatusInternalServerError, "Internal error.") + } + } else { + if isAdmin { + projectList, err = dao.GetAllProjects(projectName) + } else { + projectList, err = dao.GetUserRelevantProjects(p.userID, projectName) + } + if err != nil { + log.Errorf("Error occured in GetUserRelevantProjects, error: %v", err) + p.CustomAbort(http.StatusInternalServerError, "Internal error.") + } } for i := 0; i < len(projectList); i++ { if isAdmin { diff --git a/api/search.go b/api/search.go index f22b6b7f7..3acdc7ca8 100644 --- a/api/search.go +++ b/api/search.go @@ -55,7 +55,7 @@ func (s *SearchAPI) Get() { var projects []models.Project if isSysAdmin { - projects, err = dao.GetAllProjects() + projects, err = dao.GetAllProjects("") if err != nil { log.Errorf("failed to get all projects: %v", err) s.CustomAbort(http.StatusInternalServerError, "internal error") diff --git a/api/statistic.go b/api/statistic.go index 4d0561840..e90140b17 100644 --- a/api/statistic.go +++ b/api/statistic.go @@ -38,7 +38,6 @@ func (s *StatisticAPI) Prepare() { // Get total projects and repos of the user func (s *StatisticAPI) Get() { - queryProject := models.Project{UserID: s.userID} isAdmin, err := dao.IsAdminRole(s.userID) if err != nil { log.Errorf("Error occured in check admin, error: %v", err) @@ -46,9 +45,9 @@ func (s *StatisticAPI) Get() { } var projectList []models.Project if isAdmin { - projectList, err = dao.GetAllProjects() + projectList, err = dao.GetAllProjects("") } else { - projectList, err = dao.GetUserRelevantProjects(queryProject) + projectList, err = dao.GetUserRelevantProjects(s.userID, "") } if err != nil { log.Errorf("Error occured in QueryProject, error: %v", err) diff --git a/dao/dao_test.go b/dao/dao_test.go index 3845524b9..7f9f07978 100644 --- a/dao/dao_test.go +++ b/dao/dao_test.go @@ -599,8 +599,7 @@ func TestProjectPermission(t *testing.T) { } func TestGetUserRelevantProjects(t *testing.T) { - project := models.Project{UserID: currentUser.UserID} - projects, err := GetUserRelevantProjects(project) + projects, err := GetUserRelevantProjects(currentUser.UserID, "") if err != nil { t.Errorf("Error occurred in GetUserRelevantProjects: %v", err) } @@ -613,7 +612,7 @@ func TestGetUserRelevantProjects(t *testing.T) { } func TestGetAllProjects(t *testing.T) { - projects, err := GetAllProjects() + projects, err := GetAllProjects("") if err != nil { t.Errorf("Error occurred in GetAllProjects: %v", err) } diff --git a/dao/project.go b/dao/project.go index 57df692c9..616a50716 100644 --- a/dao/project.go +++ b/dao/project.go @@ -193,7 +193,7 @@ func SearchProjects(userID int) ([]models.Project, error) { } // GetUserRelevantProjects returns the projects based on publicity and user, disregarding the names etc. -func GetUserRelevantProjects(query models.Project) ([]models.Project, error) { +func GetUserRelevantProjects(userId int, projectName string) ([]models.Project, error) { o := orm.NewOrm() sql := `select distinct @@ -203,33 +203,50 @@ func GetUserRelevantProjects(query models.Project) ([]models.Project, error) { where p.deleted = 0 and pm.user_id= ?` queryParam := make([]interface{}, 1) - queryParam = append(queryParam, query.UserID) - if query.Public == 1 { - sql += ` and p.public = ?` - queryParam = append(queryParam, query.Public) - } - if query.Name != "" { + queryParam = append(queryParam, userId) + if projectName != "" { sql += " and p.name like ? " - queryParam = append(queryParam, query.Name) + queryParam = append(queryParam, projectName) } sql += " order by p.name " var r []models.Project _, err := o.Raw(sql, queryParam).QueryRows(&r) - if err != nil { return nil, err } return r, nil } +//GetPublicProjects return all public projects whose name like projectName +func GetPublicProjects(projectName string) ([]models.Project, error) { + o := orm.NewOrm() + var publicProjects []models.Project + sql := `select project_id, name, public + from project + where deleted = 0 and public=1` + if len(projectName) > 0 { + sql += " and name like '" + projectName + "'" + } + sql += " order by name " + _, err := o.Raw(sql).QueryRows(&publicProjects) + if err != nil { + return nil, err + } + return publicProjects, nil +} + // GetAllProjects returns all projects which are not deleted -func GetAllProjects() ([]models.Project, error) { +func GetAllProjects(projectName string) ([]models.Project, error) { o := orm.NewOrm() sql := `select project_id, name, public from project where deleted = 0` + if len(projectName) > 0 { + sql += " and name like '" + projectName + "'" + } + sql += " order by name " var projects []models.Project if _, err := o.Raw(sql).QueryRows(&projects); err != nil { return nil, err From af200d6e4cc35f6dc128363042e2d5797e800332 Mon Sep 17 00:00:00 2001 From: wemeya Date: Tue, 17 May 2016 17:10:31 +0800 Subject: [PATCH 18/29] change func parameter according to travis CI --- dao/project.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dao/project.go b/dao/project.go index 616a50716..81de39701 100644 --- a/dao/project.go +++ b/dao/project.go @@ -193,7 +193,7 @@ func SearchProjects(userID int) ([]models.Project, error) { } // GetUserRelevantProjects returns the projects based on publicity and user, disregarding the names etc. -func GetUserRelevantProjects(userId int, projectName string) ([]models.Project, error) { +func GetUserRelevantProjects(userID int, projectName string) ([]models.Project, error) { o := orm.NewOrm() sql := `select distinct @@ -203,7 +203,7 @@ func GetUserRelevantProjects(userId int, projectName string) ([]models.Project, where p.deleted = 0 and pm.user_id= ?` queryParam := make([]interface{}, 1) - queryParam = append(queryParam, userId) + queryParam = append(queryParam, userID) if projectName != "" { sql += " and p.name like ? " queryParam = append(queryParam, projectName) From 89fce7ed222e34832004e26eff48589200ff885f Mon Sep 17 00:00:00 2001 From: wemeya Date: Wed, 18 May 2016 10:30:55 +0800 Subject: [PATCH 19/29] change comment and add sql fields --- dao/project.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dao/project.go b/dao/project.go index 81de39701..c7d487c7c 100644 --- a/dao/project.go +++ b/dao/project.go @@ -192,7 +192,7 @@ func SearchProjects(userID int) ([]models.Project, error) { return projects, nil } -// GetUserRelevantProjects returns the projects based on publicity and user, disregarding the names etc. +// GetUserRelevantProjects returns the projects of the user which are not deleted and name like projectName func GetUserRelevantProjects(userID int, projectName string) ([]models.Project, error) { o := orm.NewOrm() @@ -219,11 +219,11 @@ func GetUserRelevantProjects(userID int, projectName string) ([]models.Project, return r, nil } -//GetPublicProjects return all public projects whose name like projectName +//GetPublicProjects returns all public projects whose name like projectName func GetPublicProjects(projectName string) ([]models.Project, error) { o := orm.NewOrm() var publicProjects []models.Project - sql := `select project_id, name, public + sql := `select project_id, owner_id, creation_time, update_time, name, public from project where deleted = 0 and public=1` if len(projectName) > 0 { @@ -237,10 +237,10 @@ func GetPublicProjects(projectName string) ([]models.Project, error) { return publicProjects, nil } -// GetAllProjects returns all projects which are not deleted +// GetAllProjects returns all projects which are not deleted and name like projectName func GetAllProjects(projectName string) ([]models.Project, error) { o := orm.NewOrm() - sql := `select project_id, name, public + sql := `select project_id, owner_id, creation_time, update_time, name, public from project where deleted = 0` if len(projectName) > 0 { From 3e1bf8c862cb5ce0a157a58416f0b2dc48f4ce68 Mon Sep 17 00:00:00 2001 From: wemeya Date: Wed, 18 May 2016 14:36:20 +0800 Subject: [PATCH 20/29] change code for statistics and project api --- api/project.go | 32 ++++++++++++++++---------------- api/statistic.go | 14 ++++++++++---- dao/project.go | 15 ++++++++------- 3 files changed, 34 insertions(+), 27 deletions(-) diff --git a/api/project.go b/api/project.go index 989f5a5ab..2cd7772df 100644 --- a/api/project.go +++ b/api/project.go @@ -114,16 +114,12 @@ func (p *ProjectAPI) Head() { // Get ... func (p *ProjectAPI) Get() { var projectList []models.Project - isAdmin, err := dao.IsAdminRole(p.userID) - if err != nil { - log.Errorf("Error occured in check admin, error: %v", err) - p.CustomAbort(http.StatusInternalServerError, "Internal error.") - } projectName := p.GetString("project_name") if len(projectName) > 0 { projectName = "%" + projectName + "%" } var public int + var err error isPublic := p.GetString("is_public") if len(isPublic) > 0 { public, err = strconv.Atoi(isPublic) @@ -132,29 +128,33 @@ func (p *ProjectAPI) Get() { p.CustomAbort(http.StatusBadRequest, "invalid project Id") } } + isAdmin := false if public == 1 { projectList, err = dao.GetPublicProjects(projectName) + } else { + isAdmin, err = dao.IsAdminRole(p.userID) if err != nil { - log.Errorf("Error occured in GetPulicProjects, error: %v", err) + log.Errorf("Error occured in check admin, error: %v", err) p.CustomAbort(http.StatusInternalServerError, "Internal error.") } - } else { if isAdmin { projectList, err = dao.GetAllProjects(projectName) } else { projectList, err = dao.GetUserRelevantProjects(p.userID, projectName) } - if err != nil { - log.Errorf("Error occured in GetUserRelevantProjects, error: %v", err) - p.CustomAbort(http.StatusInternalServerError, "Internal error.") - } + } + if err != nil { + log.Errorf("Error occured in GetUserRelevantProjects, error: %v", err) + p.CustomAbort(http.StatusInternalServerError, "Internal error.") } for i := 0; i < len(projectList); i++ { - if isAdmin { - projectList[i].Role = models.PROJECTADMIN - } - if projectList[i].Role == models.PROJECTADMIN { - projectList[i].Togglable = true + if public != 1 { + if isAdmin { + projectList[i].Role = models.PROJECTADMIN + } + if projectList[i].Role == models.PROJECTADMIN { + projectList[i].Togglable = true + } } projectList[i].RepoCount = getRepoCountByProject(projectList[i].Name) } diff --git a/api/statistic.go b/api/statistic.go index e90140b17..67a7cc388 100644 --- a/api/statistic.go +++ b/api/statistic.go @@ -58,6 +58,16 @@ func (s *StatisticAPI) Get() { proMap["my_repo_count"] = 0 proMap["public_project_count"] = 0 proMap["public_repo_count"] = 0 + var publicProjects []models.Project + publicProjects, err = dao.GetPublicProjects("") + if err != nil { + log.Errorf("Error occured in QueryPublicProject, error: %v", err) + s.CustomAbort(http.StatusInternalServerError, "Internal error.") + } + proMap["public_project_count"] = len(publicProjects) + for i := 0; i < len(publicProjects); i++ { + proMap["public_repo_count"] += getRepoCountByProject(publicProjects[i].Name) + } if isAdmin { proMap["total_project_count"] = len(projectList) proMap["total_repo_count"] = getTotalRepoCount() @@ -71,10 +81,6 @@ func (s *StatisticAPI) Get() { proMap["my_project_count"]++ proMap["my_repo_count"] += getRepoCountByProject(projectList[i].Name) } - if projectList[i].Public == 1 { - proMap["public_project_count"]++ - proMap["public_repo_count"] += getRepoCountByProject(projectList[i].Name) - } } s.Data["json"] = proMap s.ServeJSON() diff --git a/dao/project.go b/dao/project.go index c7d487c7c..c4dde5cdb 100644 --- a/dao/project.go +++ b/dao/project.go @@ -195,7 +195,6 @@ func SearchProjects(userID int) ([]models.Project, error) { // GetUserRelevantProjects returns the projects of the user which are not deleted and name like projectName func GetUserRelevantProjects(userID int, projectName string) ([]models.Project, error) { o := orm.NewOrm() - sql := `select distinct p.project_id, p.owner_id, p.name,p.creation_time, p.update_time, p.public, pm.role role from project p @@ -208,9 +207,7 @@ func GetUserRelevantProjects(userID int, projectName string) ([]models.Project, sql += " and p.name like ? " queryParam = append(queryParam, projectName) } - sql += " order by p.name " - var r []models.Project _, err := o.Raw(sql, queryParam).QueryRows(&r) if err != nil { @@ -226,11 +223,13 @@ func GetPublicProjects(projectName string) ([]models.Project, error) { sql := `select project_id, owner_id, creation_time, update_time, name, public from project where deleted = 0 and public=1` + queryParam := make([]interface{}, 1) if len(projectName) > 0 { - sql += " and name like '" + projectName + "'" + sql += " and name like ? " + queryParam = append(queryParam, projectName) } sql += " order by name " - _, err := o.Raw(sql).QueryRows(&publicProjects) + _, err := o.Raw(sql, queryParam).QueryRows(&publicProjects) if err != nil { return nil, err } @@ -243,12 +242,14 @@ func GetAllProjects(projectName string) ([]models.Project, error) { sql := `select project_id, owner_id, creation_time, update_time, name, public from project where deleted = 0` + queryParam := make([]interface{}, 1) if len(projectName) > 0 { - sql += " and name like '" + projectName + "'" + sql += " and name like ? " + queryParam = append(queryParam, projectName) } sql += " order by name " var projects []models.Project - if _, err := o.Raw(sql).QueryRows(&projects); err != nil { + if _, err := o.Raw(sql, queryParam).QueryRows(&projects); err != nil { return nil, err } return projects, nil From 155f8dc1a87c4c86a2af694090203ebb44f61107 Mon Sep 17 00:00:00 2001 From: wemeya Date: Wed, 18 May 2016 15:07:54 +0800 Subject: [PATCH 21/29] modify error message --- api/project.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/project.go b/api/project.go index 2cd7772df..90ccbdb8c 100644 --- a/api/project.go +++ b/api/project.go @@ -144,7 +144,7 @@ func (p *ProjectAPI) Get() { } } if err != nil { - log.Errorf("Error occured in GetUserRelevantProjects, error: %v", err) + log.Errorf("Error occured in get projects info, error: %v", err) p.CustomAbort(http.StatusInternalServerError, "Internal error.") } for i := 0; i < len(projectList); i++ { From 1f44e2aa8be78904a9727db59ccb0c4fdc0e0187 Mon Sep 17 00:00:00 2001 From: wemeya Date: Wed, 18 May 2016 17:48:05 +0800 Subject: [PATCH 22/29] add a new func to reuse code --- dao/project.go | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dao/project.go b/dao/project.go index c4dde5cdb..8ff03fb28 100644 --- a/dao/project.go +++ b/dao/project.go @@ -218,31 +218,33 @@ func GetUserRelevantProjects(userID int, projectName string) ([]models.Project, //GetPublicProjects returns all public projects whose name like projectName func GetPublicProjects(projectName string) ([]models.Project, error) { - o := orm.NewOrm() - var publicProjects []models.Project - sql := `select project_id, owner_id, creation_time, update_time, name, public - from project - where deleted = 0 and public=1` - queryParam := make([]interface{}, 1) - if len(projectName) > 0 { - sql += " and name like ? " - queryParam = append(queryParam, projectName) - } - sql += " order by name " - _, err := o.Raw(sql, queryParam).QueryRows(&publicProjects) + publicProjects, err := getProjects(1, projectName) if err != nil { return nil, err + } return publicProjects, nil } // GetAllProjects returns all projects which are not deleted and name like projectName func GetAllProjects(projectName string) ([]models.Project, error) { + allProjects, err := getProjects(0, projectName) + if err != nil { + return nil, err + } + return allProjects, nil +} + +func getProjects(public int, projectName string) ([]models.Project, error) { o := orm.NewOrm() sql := `select project_id, owner_id, creation_time, update_time, name, public from project where deleted = 0` queryParam := make([]interface{}, 1) + if public == 1 { + sql += "and public = ?" + queryParam = append(queryParam, public) + } if len(projectName) > 0 { sql += " and name like ? " queryParam = append(queryParam, projectName) From 24c47914d7fff7628cabf7f676294f5dab7a9237 Mon Sep 17 00:00:00 2001 From: kunw Date: Thu, 19 May 2016 12:50:32 +0800 Subject: [PATCH 23/29] added search feature of UI and other updates for interactions. --- controllers/ng/search.go | 9 ++++ static/ng/resources/css/search.css | 9 ++++ .../repository/list-repository.directive.js | 17 ++++-- .../search/search-input.directive.html | 5 ++ .../search/search-input.directive.js | 54 +++++++++++++++++++ static/ng/resources/js/harbor.config.js | 15 +++++- static/ng/resources/js/harbor.module.js | 1 + .../js/layout/header/header.controller.js | 10 ++-- .../navigation-header.directive.html | 2 +- .../navigation/navigation-header.directive.js | 4 ++ .../reset-password.controller.js | 13 +---- .../js/layout/search/search.controller.js | 31 +++++++++++ .../js/layout/search/search.module.js | 9 ++++ .../js/services/search/services.search.js | 22 +++----- .../js/session/session.current-user.js | 2 +- ui/ngrouter.go | 2 +- views/ng/dashboard.htm | 2 +- views/ng/search.htm | 24 +++++++++ views/ng/sections/header-content.htm | 6 +-- views/ng/sections/header-include.htm | 5 ++ 20 files changed, 201 insertions(+), 41 deletions(-) create mode 100644 controllers/ng/search.go create mode 100644 static/ng/resources/css/search.css create mode 100644 static/ng/resources/js/components/search/search-input.directive.html create mode 100644 static/ng/resources/js/components/search/search-input.directive.js create mode 100644 static/ng/resources/js/layout/search/search.controller.js create mode 100644 static/ng/resources/js/layout/search/search.module.js create mode 100644 views/ng/search.htm diff --git a/controllers/ng/search.go b/controllers/ng/search.go new file mode 100644 index 000000000..341c864a0 --- /dev/null +++ b/controllers/ng/search.go @@ -0,0 +1,9 @@ +package ng + +type SearchController struct { + BaseController +} + +func (sc *SearchController) Get() { + sc.Forward("Search", "search.htm") +} diff --git a/static/ng/resources/css/search.css b/static/ng/resources/css/search.css new file mode 100644 index 000000000..d2b2b9f27 --- /dev/null +++ b/static/ng/resources/css/search.css @@ -0,0 +1,9 @@ +.search-result { + min-height: 200px; + max-height: 200px; + overflow-y: auto; +} + +.search-result li { + margin-bottom: 15px; +} \ No newline at end of file diff --git a/static/ng/resources/js/components/repository/list-repository.directive.js b/static/ng/resources/js/components/repository/list-repository.directive.js index a2d4eb3f6..cc010bf70 100644 --- a/static/ng/resources/js/components/repository/list-repository.directive.js +++ b/static/ng/resources/js/components/repository/list-repository.directive.js @@ -5,12 +5,23 @@ .module('harbor.repository') .directive('listRepository', listRepository); - ListRepositoryController.$inject = ['$scope', 'ListRepositoryService', 'DeleteRepositoryService', '$routeParams', '$filter', 'trFilter']; + ListRepositoryController.$inject = ['$scope', 'ListRepositoryService', 'DeleteRepositoryService', '$routeParams', '$filter', 'trFilter', '$location']; - function ListRepositoryController($scope, ListRepositoryService, DeleteRepositoryService, $routeParams, $filter, trFilter) { + function ListRepositoryController($scope, ListRepositoryService, DeleteRepositoryService, $routeParams, $filter, trFilter, $location) { var vm = this; + + vm.filterInput = ''; + + var hashValue = $location.hash(); + if(hashValue) { + var slashIndex = hashValue.indexOf('/'); + if(slashIndex >=0) { + vm.filterInput = hashValue.substring(slashIndex + 1); + }else{ + vm.filterInput = hashValue; + } + } - vm.filterInput = ""; vm.retrieve = retrieve; vm.projectId = $routeParams.project_id; vm.tagCount = {}; diff --git a/static/ng/resources/js/components/search/search-input.directive.html b/static/ng/resources/js/components/search/search-input.directive.html new file mode 100644 index 000000000..c60629955 --- /dev/null +++ b/static/ng/resources/js/components/search/search-input.directive.html @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/static/ng/resources/js/components/search/search-input.directive.js b/static/ng/resources/js/components/search/search-input.directive.js new file mode 100644 index 000000000..fe9eaaac2 --- /dev/null +++ b/static/ng/resources/js/components/search/search-input.directive.js @@ -0,0 +1,54 @@ +(function() { + + 'use strict'; + + angular + .module('harbor.search') + .directive('searchInput', searchInput); + + SearchInputController.$inject = ['$scope', '$location', '$window']; + + function SearchInputController($scope, $location, $window) { + var vm = this; + + vm.searchFor = searchFor; + + function searchFor(searchContent) { + $location + .path('/ng/search') + .search({'q': searchContent}); + $window.location.href = $location.url(); + } + + } + + function searchInput() { + + var directive = { + 'restrict': 'E', + 'templateUrl': '/static/ng/resources/js/components/search/search-input.directive.html', + 'scope': { + 'searchInput': '=', + }, + 'link': link, + 'controller': SearchInputController, + 'controllerAs': 'vm', + 'bindToController': true + }; + return directive; + + function link(scope, element, attrs, ctrl) { + element + .find('input[type="text"]') + .on('keydown', keydownHandler); + + function keydownHandler(e) { + if(e.keyCode === 13) { + ctrl.searchFor($(this).val()); + } + } + + } + } + +})(); \ No newline at end of file diff --git a/static/ng/resources/js/harbor.config.js b/static/ng/resources/js/harbor.config.js index b7f8990de..d256c5cf2 100644 --- a/static/ng/resources/js/harbor.config.js +++ b/static/ng/resources/js/harbor.config.js @@ -9,9 +9,22 @@ .config(function($httpProvider) { $httpProvider.defaults.headers.common = {'Accept': 'application/json, text/javascript, */*; q=0.01'}; }) + .factory('getParameterByName', getParameterByName) .filter('dateL', localizeDate) .filter('tr', tr); - + + function getParameterByName() { + return get; + function get(name, url) { + name = name.replace(/[\[\]]/g, "\\$&"); + var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"), + results = regex.exec(url); + if (!results) return null; + if (!results[2]) return ''; + return decodeURIComponent(results[2].replace(/\+/g, " ")); + } + } + function localizeDate() { return filter; diff --git a/static/ng/resources/js/harbor.module.js b/static/ng/resources/js/harbor.module.js index f0f190da6..0a18b1dd2 100644 --- a/static/ng/resources/js/harbor.module.js +++ b/static/ng/resources/js/harbor.module.js @@ -21,6 +21,7 @@ 'harbor.layout.system.management', 'harbor.layout.log', 'harbor.layout.admin.option', + 'harbor.layout.search', 'harbor.services.i18n', 'harbor.services.project', 'harbor.services.user', diff --git a/static/ng/resources/js/layout/header/header.controller.js b/static/ng/resources/js/layout/header/header.controller.js index fa28cddc6..754a9d3d0 100644 --- a/static/ng/resources/js/layout/header/header.controller.js +++ b/static/ng/resources/js/layout/header/header.controller.js @@ -6,10 +6,14 @@ .module('harbor.layout.header') .controller('HeaderController', HeaderController); - HeaderController.$inject = ['$scope', 'I18nService', '$cookies', '$window']; + HeaderController.$inject = ['$scope', '$window', 'getParameterByName']; - function HeaderController($scope, I18nService, $cookies, $window) { - + function HeaderController($scope, $window, getParameterByName) { + var vm = this; + if($window.location.search) { + vm.searchInput = getParameterByName('q', $window.location.search); + console.log('vm.searchInput at header:' + vm.searchInput); + } } })(); \ No newline at end of file diff --git a/static/ng/resources/js/layout/navigation/navigation-header.directive.html b/static/ng/resources/js/layout/navigation/navigation-header.directive.html index 936471a6c..2a28ef684 100644 --- a/static/ng/resources/js/layout/navigation/navigation-header.directive.html +++ b/static/ng/resources/js/layout/navigation/navigation-header.directive.html @@ -1,4 +1,4 @@ -
    +
    • // 'dashboard' | tr //
    • // 'projects' | tr //
    • // 'admin_options' | tr //
      • diff --git a/static/ng/resources/js/layout/navigation/navigation-header.directive.js b/static/ng/resources/js/layout/navigation/navigation-header.directive.js index ccdef15f5..ccf371a27 100644 --- a/static/ng/resources/js/layout/navigation/navigation-header.directive.js +++ b/static/ng/resources/js/layout/navigation/navigation-header.directive.js @@ -12,7 +12,11 @@ var vm = this; vm.url = $window.location.pathname; vm.isAdmin = false; + vm.isShow = false; $scope.$on('currentUser', function(e, val) { + if(val) { + vm.isShow = true; + } if(val.HasAdminRole === 1) { vm.isAdmin = true; } diff --git a/static/ng/resources/js/layout/reset-password/reset-password.controller.js b/static/ng/resources/js/layout/reset-password/reset-password.controller.js index 23ada471d..6b8c91e2b 100644 --- a/static/ng/resources/js/layout/reset-password/reset-password.controller.js +++ b/static/ng/resources/js/layout/reset-password/reset-password.controller.js @@ -6,18 +6,9 @@ .module('harbor.layout.reset.password') .controller('ResetPasswordController', ResetPasswordController); - ResetPasswordController.$inject = ['$location', 'ResetPasswordService', '$window']; + ResetPasswordController.$inject = ['$location', 'ResetPasswordService', '$window', 'getParameterByName']; - function getParameterByName(name, url) { - name = name.replace(/[\[\]]/g, "\\$&"); - var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"), - results = regex.exec(url); - if (!results) return null; - if (!results[2]) return ''; - return decodeURIComponent(results[2].replace(/\+/g, " ")); - } - - function ResetPasswordController($location, ResetPasswordService, $window) { + function ResetPasswordController($location, ResetPasswordService, $window, getParameterByName) { var vm = this; vm.resetUuid = getParameterByName('reset_uuid', $location.absUrl()); diff --git a/static/ng/resources/js/layout/search/search.controller.js b/static/ng/resources/js/layout/search/search.controller.js new file mode 100644 index 000000000..d0c5d4e41 --- /dev/null +++ b/static/ng/resources/js/layout/search/search.controller.js @@ -0,0 +1,31 @@ +(function() { + + 'use strict'; + + angular + .module('harbor.layout.search') + .controller('SearchController', SearchController); + + SearchController.$inject = ['$window', 'SearchService']; + + function SearchController($window, SearchService) { + var vm = this; + if($window.location.search) { + vm.q = $window.location.search.split('=')[1]; + console.log('vm.q:' + vm.q); + SearchService(vm.q) + .success(searchSuccess) + .error(searchFailed); + } + + function searchSuccess(data, status) { + vm.repository = data['repository']; + vm.project = data['project']; + } + + function searchFailed(data, status) { + console.log('Failed search:' + data); + } + } + +})(); \ No newline at end of file diff --git a/static/ng/resources/js/layout/search/search.module.js b/static/ng/resources/js/layout/search/search.module.js new file mode 100644 index 000000000..e40971e69 --- /dev/null +++ b/static/ng/resources/js/layout/search/search.module.js @@ -0,0 +1,9 @@ +(function() { + + 'use strict'; + + angular + .module('harbor.layout.search', []); + + +})(); \ No newline at end of file diff --git a/static/ng/resources/js/services/search/services.search.js b/static/ng/resources/js/services/search/services.search.js index 11c9d3ca6..26c12a9c0 100644 --- a/static/ng/resources/js/services/search/services.search.js +++ b/static/ng/resources/js/services/search/services.search.js @@ -10,21 +10,15 @@ function SearchService($http, $log) { - return Search; + return search; - function Search(keywords) { - return $http({ - method: 'GET', - url: '/api/search', - - transformRequest: function(obj) { - var str = []; - for(var p in obj) - str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p])); - return str.join("&"); - }, - data: {'q': keywords} - }); + function search(keywords) { + return $http + .get('/api/search',{ + params: { + 'q': keywords + } + }); } } diff --git a/static/ng/resources/js/session/session.current-user.js b/static/ng/resources/js/session/session.current-user.js index 90b109afc..6eca53aa0 100644 --- a/static/ng/resources/js/session/session.current-user.js +++ b/static/ng/resources/js/session/session.current-user.js @@ -26,7 +26,7 @@ function getCurrentUserFailed(e){ var url = location.pathname; - var exclusions = ['/ng', '/ng/forgot_password', '/ng/sign_up', '/ng/reset_password']; + var exclusions = ['/ng', '/ng/forgot_password', '/ng/sign_up', '/ng/reset_password', '/ng/search', '/ng/repository']; for(var i = 0; i < exclusions.length; i++) { if(exclusions[i]===url) { return; diff --git a/ui/ngrouter.go b/ui/ngrouter.go index d03c1a100..a460f2607 100644 --- a/ui/ngrouter.go +++ b/ui/ngrouter.go @@ -16,8 +16,8 @@ func initNgRouters() { beego.Router("/ng/admin_option", &ng.AdminOptionController{}) beego.Router("/ng/forgot_password", &ng.ForgotPasswordController{}) beego.Router("/ng/reset_password", &ng.ResetPasswordController{}) + beego.Router("/ng/search", &ng.SearchController{}) beego.Router("/ng/log_out", &ng.CommonController{}, "get:LogOut") beego.Router("/ng/reset", &ng.CommonController{}, "post:ResetPassword") beego.Router("/ng/sendEmail", &ng.CommonController{}, "get:SendEmail") - } diff --git a/views/ng/dashboard.htm b/views/ng/dashboard.htm index 53ab0d406..9dcdbcf8c 100644 --- a/views/ng/dashboard.htm +++ b/views/ng/dashboard.htm @@ -5,7 +5,7 @@

      // 'summary' | tr //

      -
      +
      // 'projects' | tr //:
      //vm.statProjects['projects']//
      // 'public_projects' | tr //:
      //vm.statProjects['public_projects']//
      // 'total_projects' | tr //:
      //vm.statProjects['total_projects']//
      diff --git a/views/ng/search.htm b/views/ng/search.htm new file mode 100644 index 000000000..cf2a4fae3 --- /dev/null +++ b/views/ng/search.htm @@ -0,0 +1,24 @@ +
      +
      +
      +
      +
      +
      +

      Projects  //vm.project.length//

      +
      + +
      +

      Repositories  //vm.repository.length//

      +
      + +
      +
      +
      +
      +
      +
      +
      \ No newline at end of file diff --git a/views/ng/sections/header-content.htm b/views/ng/sections/header-content.htm index bb2099642..d58076dec 100644 --- a/views/ng/sections/header-content.htm +++ b/views/ng/sections/header-content.htm @@ -16,11 +16,7 @@
    • - +
    diff --git a/views/ng/sections/header-include.htm b/views/ng/sections/header-include.htm index 22f06a38d..0d7cad5e0 100644 --- a/views/ng/sections/header-include.htm +++ b/views/ng/sections/header-include.htm @@ -31,6 +31,7 @@ + @@ -93,6 +94,9 @@ + + + @@ -156,6 +160,7 @@ + From 973ee40fdf92870d11bad42b7bbf46a6f66e9dc5 Mon Sep 17 00:00:00 2001 From: wemeya Date: Thu, 19 May 2016 14:40:09 +0800 Subject: [PATCH 24/29] fix a sql bug --- dao/dao_test.go | 13 +++++++++++++ dao/project.go | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dao/dao_test.go b/dao/dao_test.go index 7f9f07978..8e300740d 100644 --- a/dao/dao_test.go +++ b/dao/dao_test.go @@ -624,6 +624,19 @@ func TestGetAllProjects(t *testing.T) { } } +func TestGetPublicProjects(t *testing.T) { + projects, err := GetPublicProjects("") + if err != nil { + t.Errorf("Error occurred in getProjects: %v", err) + } + if len(projects) != 1 { + t.Errorf("Expected length of projects is 1, but actual: %d, the projects: %+v", len(projects), projects) + } + if projects[0].Name != "library" { + t.Errorf("Expected project name in the list: %s, actual: %s", "library", projects[0].Name) + } +} + func TestAddProjectMember(t *testing.T) { err := AddProjectMember(currentProject.ProjectID, 1, models.DEVELOPER) if err != nil { diff --git a/dao/project.go b/dao/project.go index 8ff03fb28..730b1f331 100644 --- a/dao/project.go +++ b/dao/project.go @@ -221,7 +221,6 @@ func GetPublicProjects(projectName string) ([]models.Project, error) { publicProjects, err := getProjects(1, projectName) if err != nil { return nil, err - } return publicProjects, nil } @@ -242,7 +241,7 @@ func getProjects(public int, projectName string) ([]models.Project, error) { where deleted = 0` queryParam := make([]interface{}, 1) if public == 1 { - sql += "and public = ?" + sql += " and public = ? " queryParam = append(queryParam, public) } if len(projectName) > 0 { @@ -251,6 +250,7 @@ func getProjects(public int, projectName string) ([]models.Project, error) { } sql += " order by name " var projects []models.Project + log.Debugf("sql xxx", sql) if _, err := o.Raw(sql, queryParam).QueryRows(&projects); err != nil { return nil, err } From 749412fb16a3172a3d98894a5e7c61d51c3d8330 Mon Sep 17 00:00:00 2001 From: kunw Date: Thu, 19 May 2016 18:54:30 +0800 Subject: [PATCH 25/29] refinement for retrieve-pane dismissing actions and Harbor logo of UI --- static/ng/resources/css/header.css | 22 +++++++----------- static/ng/resources/img/Harbor_Logo_rec.png | Bin 8556 -> 3680 bytes .../details/retrieve-projects.directive.html | 4 ++-- .../details/retrieve-projects.directive.js | 18 ++++++++++++++ .../switch-pane-projects.directive.html | 2 +- .../details/switch-pane-projects.directive.js | 17 ++++---------- .../navigation-details.directive.js | 10 -------- views/ng/repository.htm | 6 ++--- 8 files changed, 37 insertions(+), 42 deletions(-) mode change 100755 => 100644 static/ng/resources/img/Harbor_Logo_rec.png diff --git a/static/ng/resources/css/header.css b/static/ng/resources/css/header.css index c669545cf..4d8f86da1 100644 --- a/static/ng/resources/css/header.css +++ b/static/ng/resources/css/header.css @@ -21,11 +21,7 @@ nav .container-custom { } .navbar-brand > img { - height: 60px; - width: 100px; margin-top: -30px; - filter: brightness(0) invert(1); - -webkit-filter: brightness(0) invert(1); } .navbar-form { @@ -40,21 +36,21 @@ nav .container-custom { } .nav-custom li { - float: left; - padding: 10px 0 0 0; - margin-right: 12px; - list-style: none; - display: inline-block; + float: left; + padding: 10px 0 0 0; + margin-right: 12px; + list-style: none; + display: inline-block; } .nav-custom li a { - font-size: 14px; - color: #FFFFFF; - text-decoration: none; + font-size: 14px; + color: #FFFFFF; + text-decoration: none; } .nav-custom .active { - border-bottom: 3px solid #EFEFEF; + border-bottom: 3px solid #EFEFEF; } .dropdown { diff --git a/static/ng/resources/img/Harbor_Logo_rec.png b/static/ng/resources/img/Harbor_Logo_rec.png old mode 100755 new mode 100644 index cccdbedf164e407e3738ebf41c660da0a2ad0a1d..3a603109ea087fed1886abb1c67d9a6e1f84321a GIT binary patch delta 3356 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 G6!9-@f=*fh delta 8299 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 diff --git a/static/ng/resources/js/components/details/retrieve-projects.directive.html b/static/ng/resources/js/components/details/retrieve-projects.directive.html index 573d78b4e..8e1e90491 100644 --- a/static/ng/resources/js/components/details/retrieve-projects.directive.html +++ b/static/ng/resources/js/components/details/retrieve-projects.directive.html @@ -1,10 +1,10 @@ -
    +
    - +
    //vm.projectType | tr//: //vm.resultCount//
    diff --git a/static/ng/resources/js/components/details/retrieve-projects.directive.js b/static/ng/resources/js/components/details/retrieve-projects.directive.js index 3a0c6ba2a..5c9779a3d 100644 --- a/static/ng/resources/js/components/details/retrieve-projects.directive.js +++ b/static/ng/resources/js/components/details/retrieve-projects.directive.js @@ -12,6 +12,7 @@ var vm = this; vm.projectName = ''; + vm.isOpen = false; if($route.current.params.is_public) { vm.isPublic = $route.current.params.is_public === 'true' ? 1 : 0; @@ -114,6 +115,7 @@ 'publicity': '=', 'isProjectMember': '=' }, + link: link, replace: true, controller: RetrieveProjectsController, bindToController: true, @@ -122,6 +124,22 @@ return directive; + function link(scope, element, attrs, ctrl) { + $(document).on('click', clickHandler); + + function clickHandler(e) { + var targetId = $(e.target).attr('id'); + if(targetId === 'switchPane' || + targetId === 'retrievePane' || + targetId === 'retrieveFilter') { + return; + }else{ + ctrl.isOpen = false; + scope.$apply(); + } + } + } + } })(); \ No newline at end of file diff --git a/static/ng/resources/js/components/details/switch-pane-projects.directive.html b/static/ng/resources/js/components/details/switch-pane-projects.directive.html index 5158a1088..996b666de 100644 --- a/static/ng/resources/js/components/details/switch-pane-projects.directive.html +++ b/static/ng/resources/js/components/details/switch-pane-projects.directive.html @@ -1,5 +1,5 @@
    - //vm.projectName// + //vm.projectName//
    \ No newline at end of file diff --git a/static/ng/resources/js/components/details/switch-pane-projects.directive.js b/static/ng/resources/js/components/details/switch-pane-projects.directive.js index da6725a6f..1a10dd70e 100644 --- a/static/ng/resources/js/components/details/switch-pane-projects.directive.js +++ b/static/ng/resources/js/components/details/switch-pane-projects.directive.js @@ -10,11 +10,7 @@ function SwitchPaneProjectsController($scope) { var vm = this; - - $scope.$on('isOpen', function(e, val){ - vm.isOpen = val; - }); - + $scope.$watch('vm.selectedProject', function(current, origin) { if(current){ vm.projectName = current.Name; @@ -40,21 +36,16 @@ templateUrl: '/static/ng/resources/js/components/details/switch-pane-projects.directive.html', replace: true, scope: { - 'selectedProject': '=', - 'isOpen': '=' + 'isOpen': '=', + 'selectedProject': '=' }, - link: link, controller: SwitchPaneProjectsController, controllerAs: 'vm', bindToController: true } return directive; - - function link(scope, element, attrs, ctrl) { - - } - + } })(); \ No newline at end of file diff --git a/static/ng/resources/js/layout/navigation/navigation-details.directive.js b/static/ng/resources/js/layout/navigation/navigation-details.directive.js index 0372f516f..8c34b40a6 100644 --- a/static/ng/resources/js/layout/navigation/navigation-details.directive.js +++ b/static/ng/resources/js/layout/navigation/navigation-details.directive.js @@ -18,14 +18,6 @@ }); vm.url = $location.url(); - vm.clickTab = clickTab; - - function clickTab() { - console.log("triggered clickTab of Controller."); - vm.isOpen = false; - $scope.$apply(); - } - } function navigationDetails() { @@ -34,7 +26,6 @@ templateUrl: '/static/ng/resources/js/layout/navigation/navigation-details.directive.html', link: link, scope: { - 'isOpen': '=', 'selectedProject': '=' }, replace: true, @@ -66,7 +57,6 @@ function click(event) { element.find('a').removeClass('active'); $(event.target).addClass('active'); - ctrl.clickTab(); } } diff --git a/views/ng/repository.htm b/views/ng/repository.htm index 0531c4e42..2ed17f5f3 100644 --- a/views/ng/repository.htm +++ b/views/ng/repository.htm @@ -10,12 +10,12 @@ // 'public_projects' | tr // // 'public_projects' | tr //
    - + - +
    - +
    From 09db2d04d0bfd47da6eae8aab39649e63558bbe3 Mon Sep 17 00:00:00 2001 From: kunw Date: Fri, 20 May 2016 17:43:47 +0800 Subject: [PATCH 26/29] updates for cookies storage processing, and other refinements. --- .../details/retrieve-projects.directive.js | 7 +--- .../optional-menu.directive.html | 23 ++++++----- .../optional-menu/optional-menu.directive.js | 29 +++++++------- .../edit-project-member.directive.js | 5 --- .../list-project-member.directive.html | 2 +- .../list-project-member.directive.js | 21 +++------- .../repository/list-repository.directive.js | 7 +--- .../components/sign-in/sign-in.directive.html | 6 +-- static/ng/resources/js/harbor.data.js | 38 ++++++++++--------- .../js/layout/details/details.controller.js | 16 +++----- .../navigation/navigation-header.directive.js | 24 ++++++------ .../project-member.controller.js | 4 +- .../js/layout/project/project.controller.js | 8 ++-- .../js/session/session.current-user.js | 24 +++++++----- views/ng/project.htm | 2 +- views/ng/sections/header-content.htm | 2 +- views/ng/sections/header-include.htm | 12 +++--- 17 files changed, 103 insertions(+), 127 deletions(-) diff --git a/static/ng/resources/js/components/details/retrieve-projects.directive.js b/static/ng/resources/js/components/details/retrieve-projects.directive.js index 5c9779a3d..8d41385a6 100644 --- a/static/ng/resources/js/components/details/retrieve-projects.directive.js +++ b/static/ng/resources/js/components/details/retrieve-projects.directive.js @@ -20,8 +20,6 @@ } vm.retrieve = retrieve; - vm.retrieve(); - vm.checkProjectMember = checkProjectMember; $scope.$watch('vm.selectedProject', function(current, origin) { @@ -34,7 +32,7 @@ vm.selectItem = selectItem; $scope.$watch('vm.publicity', function(current, origin) { - vm.publicity = current ? 1 : 0; + vm.publicity = current ? true : false; vm.isPublic = vm.publicity ? 1 : 0; vm.projectType = (vm.isPublic === 1) ? 'public_projects' : 'my_projects'; vm.retrieve(); @@ -65,9 +63,8 @@ } }); } - - $location.search('project_id', vm.selectedProject.ProjectId); vm.checkProjectMember(vm.selectedProject.ProjectId); + $location.search('project_id', vm.selectedProject.ProjectId); vm.resultCount = vm.projects.length; $scope.$watch('vm.filterInput', function(current, origin) { diff --git a/static/ng/resources/js/components/optional-menu/optional-menu.directive.html b/static/ng/resources/js/components/optional-menu/optional-menu.directive.html index 287b607c2..4f88d21b5 100644 --- a/static/ng/resources/js/components/optional-menu/optional-menu.directive.html +++ b/static/ng/resources/js/components/optional-menu/optional-menu.directive.html @@ -1,16 +1,6 @@ -
    - - //vm.languageName// - - -
    -
    - - //vm.username// + + //vm.user.username// +
    +
    + + //vm.languageName// + +
    \ No newline at end of file diff --git a/static/ng/resources/js/components/optional-menu/optional-menu.directive.js b/static/ng/resources/js/components/optional-menu/optional-menu.directive.js index a490b5e8d..e3583afb8 100644 --- a/static/ng/resources/js/components/optional-menu/optional-menu.directive.js +++ b/static/ng/resources/js/components/optional-menu/optional-menu.directive.js @@ -6,15 +6,24 @@ .module('harbor.optional.menu') .directive('optionalMenu', optionalMenu); - OptionalMenuController.$inject = ['$scope', '$window', '$cookies', 'I18nService', 'LogOutService']; + OptionalMenuController.$inject = ['$window', 'I18nService', 'LogOutService', 'currentUser', '$timeout']; - function OptionalMenuController($scope, $window, $cookies, I18nService, LogOutService) { + function OptionalMenuController($window, I18nService, LogOutService, currentUser, $timeout) { var vm = this; + vm.currentLanguage = I18nService().getCurrentLanguage(); - vm.setLanguage = setLanguage; vm.languageName = I18nService().getLanguageName(vm.currentLanguage); console.log('current language:' + I18nService().getCurrentLanguage()); - + + vm.isLoggedIn = false; + $timeout(function() { + vm.user = currentUser.get(); + if(angular.isDefined(vm.user)) { + vm.isLoggedIn = true; + } + }); + + vm.setLanguage = setLanguage; vm.logOut = logOut; function setLanguage(name) { @@ -28,6 +37,7 @@ .error(logOutFailed); } function logOutSuccess(data, status) { + currentUser.unset(); $window.location.href= '/ng'; } function logOutFailed(data, status) { @@ -39,23 +49,12 @@ var directive = { 'restrict': 'E', 'templateUrl': '/static/ng/resources/js/components/optional-menu/optional-menu.directive.html', - 'link': link, 'scope': true, 'controller': OptionalMenuController, 'controllerAs': 'vm', 'bindToController': true }; return directive; - function link(scope, element, attrs, ctrl) { - ctrl.isLoggedIn = false; - scope.$on('currentUser', function(e, val) { - if(val != null) { - ctrl.isLoggedIn = true; - ctrl.username = val.username; - } - scope.$apply(); - }); - } } })(); \ No newline at end of file diff --git a/static/ng/resources/js/components/project-member/edit-project-member.directive.js b/static/ng/resources/js/components/project-member/edit-project-member.directive.js index 752a9db6e..fc1a1626d 100644 --- a/static/ng/resources/js/components/project-member/edit-project-member.directive.js +++ b/static/ng/resources/js/components/project-member/edit-project-member.directive.js @@ -74,16 +74,11 @@ 'projectId': '=', 'reload': '&' }, - 'link': link, 'controller': EditProjectMemberController, 'controllerAs': 'vm', 'bindToController': true }; return directive; - - function link(scope, element, attrs, ctrl) { - - } } })(); \ No newline at end of file diff --git a/static/ng/resources/js/components/project-member/list-project-member.directive.html b/static/ng/resources/js/components/project-member/list-project-member.directive.html index 857dbe71d..e126cdc90 100644 --- a/static/ng/resources/js/components/project-member/list-project-member.directive.html +++ b/static/ng/resources/js/components/project-member/list-project-member.directive.html @@ -18,7 +18,7 @@ // 'username' | tr //// 'role' | tr //// 'operation' | tr // - +
    diff --git a/static/ng/resources/js/components/project-member/list-project-member.directive.js b/static/ng/resources/js/components/project-member/list-project-member.directive.js index 42bb95485..c07c666c1 100644 --- a/static/ng/resources/js/components/project-member/list-project-member.directive.js +++ b/static/ng/resources/js/components/project-member/list-project-member.directive.js @@ -10,24 +10,19 @@ function ListProjectMemberController($scope, ListProjectMemberService, $routeParams, currentUser) { var vm = this; - - - vm.isOpen = false; - + + vm.isOpen = false; vm.search = search; vm.addProjectMember = addProjectMember; vm.retrieve = retrieve; - vm.projectId = $routeParams.project_id; vm.username = ""; - vm.currentUser = {}; - + vm.retrieve(); function search(e) { vm.projectId = e.projectId; vm.username = e.username; - console.log('project_id:' + e.projectId); retrieve(); } @@ -46,7 +41,7 @@ } function getProjectMemberComplete(response) { - vm.currentUser = currentUser.get(); + vm.user = currentUser.get(); vm.projectMembers = response.data; } @@ -62,17 +57,11 @@ templateUrl: '/static/ng/resources/js/components/project-member/list-project-member.directive.html', replace: true, scope: true, - link: link, controller: ListProjectMemberController, controllerAs: 'vm', bindToController: true - } - + } return directive; - - function link(scope, element, attrs, ctrl) { - - } } })(); \ No newline at end of file diff --git a/static/ng/resources/js/components/repository/list-repository.directive.js b/static/ng/resources/js/components/repository/list-repository.directive.js index cc010bf70..e3362117c 100644 --- a/static/ng/resources/js/components/repository/list-repository.directive.js +++ b/static/ng/resources/js/components/repository/list-repository.directive.js @@ -95,18 +95,13 @@ restrict: 'E', templateUrl: '/static/ng/resources/js/components/repository/list-repository.directive.html', replace: true, - link: 'link', controller: ListRepositoryController, controllerAs: 'vm', bindToController: true } return directive; - - function link(scope, element, attrs, ctrl) { - - } - + } })(); \ No newline at end of file diff --git a/static/ng/resources/js/components/sign-in/sign-in.directive.html b/static/ng/resources/js/components/sign-in/sign-in.directive.html index f7e49a24b..4b62997ab 100644 --- a/static/ng/resources/js/components/sign-in/sign-in.directive.html +++ b/static/ng/resources/js/components/sign-in/sign-in.directive.html @@ -1,7 +1,7 @@
    - +
    // 'username_is_required' | tr // @@ -11,7 +11,7 @@
    - +
    // 'password_is_required' | tr // @@ -23,7 +23,7 @@
    - +
    diff --git a/static/ng/resources/js/harbor.data.js b/static/ng/resources/js/harbor.data.js index e06481ea6..30f977df7 100644 --- a/static/ng/resources/js/harbor.data.js +++ b/static/ng/resources/js/harbor.data.js @@ -1,36 +1,40 @@ (function() { + 'use strict'; + angular - .module('harbor.app') + .module('harbor.app') .factory('currentUser', currentUser) - .factory('projectMember', projectMember); - - function currentUser() { - var currentUser; + .factory('currentProjectMember', currentProjectMember); + + currentUser.$inject = ['$cookies', '$timeout']; + + function currentUser($cookies, $timeout) { return { set: function(user) { - currentUser = user; - console.log('set currentUser:' + currentUser); + $cookies.putObject('user', user, {'path': '/'}); }, get: function() { - console.log('get currentUser:' + currentUser); - return currentUser; + return $cookies.getObject('user'); + }, + unset: function() { + $cookies.remove('user', {'path': '/'}); } } } - function projectMember() { - var projectMember; + currentProjectMember.$inject = ['$cookies']; + + function currentProjectMember($cookies) { return { set: function(member) { - projectMember = member; - console.log('set projectMember:'); - console.log(projectMember); + $cookies.putObject('member', member, {'path': '/'}); }, get: function() { - console.log('get projectMember:'); - console.log(projectMember); - return projectMember; + return $cookies.getObject('member'); + }, + unset: function() { + $cookies.remove('member', {'path': '/'}); } } } diff --git a/static/ng/resources/js/layout/details/details.controller.js b/static/ng/resources/js/layout/details/details.controller.js index c414a4ad0..096e009f0 100644 --- a/static/ng/resources/js/layout/details/details.controller.js +++ b/static/ng/resources/js/layout/details/details.controller.js @@ -5,23 +5,17 @@ angular .module('harbor.details') .controller('DetailsController', DetailsController); - - DetailsController.$inject = ['$scope', '$location', '$routeParams']; - - function DetailsController($scope, $location, $routeParams) { + + function DetailsController() { var vm = this; - vm.isOpen = false; + vm.publicity = false; - vm.isProjectMember = true; - vm.closeRetrievePane = closeRetrievePane; + vm.isProjectMember = false; + vm.togglePublicity = togglePublicity; - function closeRetrievePane() { - $scope.$broadcast('isOpen', false); - } function togglePublicity(e) { vm.publicity = e.publicity; - console.log('current project publicity:' + vm.publicity); } } diff --git a/static/ng/resources/js/layout/navigation/navigation-header.directive.js b/static/ng/resources/js/layout/navigation/navigation-header.directive.js index ccf371a27..34a1b7d0b 100644 --- a/static/ng/resources/js/layout/navigation/navigation-header.directive.js +++ b/static/ng/resources/js/layout/navigation/navigation-header.directive.js @@ -6,22 +6,24 @@ .module('harbor.layout.navigation') .directive('navigationHeader', navigationHeader); - NavigationHeaderController.$inject = ['$window', '$scope']; + NavigationHeaderController.$inject = ['$window', '$scope', 'currentUser', '$timeout']; - function NavigationHeaderController($window, $scope) { + function NavigationHeaderController($window, $scope, currentUser, $timeout) { var vm = this; - vm.url = $window.location.pathname; - vm.isAdmin = false; + vm.isShow = false; - $scope.$on('currentUser', function(e, val) { - if(val) { - vm.isShow = true; + vm.isAdmin = false; + + $timeout(function() { + vm.user = currentUser.get(); + if(angular.isDefined(vm.user)) { + vm.isShow = true; + if(vm.user.HasAdminRole === 1) { + vm.isAdmin = true; + } } - if(val.HasAdminRole === 1) { - vm.isAdmin = true; - } - $scope.$apply(); }); + vm.url = $window.location.pathname; } function navigationHeader() { diff --git a/static/ng/resources/js/layout/project-member/project-member.controller.js b/static/ng/resources/js/layout/project-member/project-member.controller.js index 9d55143ae..ec977697d 100644 --- a/static/ng/resources/js/layout/project-member/project-member.controller.js +++ b/static/ng/resources/js/layout/project-member/project-member.controller.js @@ -5,9 +5,7 @@ angular .module('harbor.layout.project.member') .controller('ProjectMemberController', ProjectMemberController); - - ProjectMemberController.$inject = ['$scope']; - + function ProjectMemberController($scope) { } diff --git a/static/ng/resources/js/layout/project/project.controller.js b/static/ng/resources/js/layout/project/project.controller.js index d6f8334ba..3ed2d3df4 100644 --- a/static/ng/resources/js/layout/project/project.controller.js +++ b/static/ng/resources/js/layout/project/project.controller.js @@ -6,9 +6,9 @@ .module('harbor.layout.project') .controller('ProjectController', ProjectController); - ProjectController.$inject = ['$scope', 'ListProjectService']; + ProjectController.$inject = ['$scope', 'ListProjectService', '$timeout', 'currentUser']; - function ProjectController($scope, ListProjectService) { + function ProjectController($scope, ListProjectService, $timeout, currentUser) { var vm = this; vm.isOpen = false; @@ -21,8 +21,8 @@ vm.showAddButton = showAddButton; vm.togglePublicity = togglePublicity; - $scope.$on('currentUser', function(e, val) { - vm.currentUser = val; + $timeout(function() { + vm.user = currentUser.get(); }); vm.retrieve(); diff --git a/static/ng/resources/js/session/session.current-user.js b/static/ng/resources/js/session/session.current-user.js index 6eca53aa0..9f92b6751 100644 --- a/static/ng/resources/js/session/session.current-user.js +++ b/static/ng/resources/js/session/session.current-user.js @@ -12,28 +12,32 @@ var vm = this; - CurrentUserService() - .then(getCurrentUserComplete) - .catch(getCurrentUserFailed); + if(!angular.isDefined(currentUser.get())) { + CurrentUserService() + .then(getCurrentUserComplete) + .catch(getCurrentUserFailed); + } function getCurrentUserComplete(response) { - console.log('Successful logged in.'); - $timeout(function(){ - $scope.$broadcast('currentUser', response.data); - currentUser.set(response.data); - }, 50); + currentUser.set(response.data); } function getCurrentUserFailed(e){ var url = location.pathname; - var exclusions = ['/ng', '/ng/forgot_password', '/ng/sign_up', '/ng/reset_password', '/ng/search', '/ng/repository']; + var exclusions = [ + '/ng', + '/ng/forgot_password', + '/ng/sign_up', + '/ng/reset_password', + '/ng/search' + ]; for(var i = 0; i < exclusions.length; i++) { if(exclusions[i]===url) { return; } } $window.location.href = '/ng'; - } + } } })(); \ No newline at end of file diff --git a/views/ng/project.htm b/views/ng/project.htm index 9612f9096..1b2639680 100644 --- a/views/ng/project.htm +++ b/views/ng/project.htm @@ -35,7 +35,7 @@ N/A N/A //p.CreationTime | dateL : 'YYYY-MM-DD HH:mm:ss'// - + diff --git a/views/ng/sections/header-content.htm b/views/ng/sections/header-content.htm index d58076dec..e0392623f 100644 --- a/views/ng/sections/header-content.htm +++ b/views/ng/sections/header-content.htm @@ -10,7 +10,7 @@
    \ No newline at end of file +
    +{{ end }} \ No newline at end of file diff --git a/views/ng/sections/header-include.htm b/views/ng/sections/header-include.htm index e0b021166..00673eb57 100644 --- a/views/ng/sections/header-include.htm +++ b/views/ng/sections/header-include.htm @@ -13,16 +13,16 @@ - - + + - - + + - - + + From 2bf1742ecbc0cdbe3af1ccaf0cd888fa931f8e51 Mon Sep 17 00:00:00 2001 From: kunw Date: Sat, 21 May 2016 17:20:39 +0800 Subject: [PATCH 29/29] refactor i18n processing and sign-in validation. --- Deploy/templates/ui/app.conf | 4 +- controllers/ng/base.go | 45 +- controllers/ng/password.go | 12 - static/ng/resources/css/dashboard.css | 4 - .../optional-menu/optional-menu.directive.js | 11 +- .../components/sign-in/sign-in.directive.html | 4 +- .../js/services/i18n/locale_messages.js | 468 ------------------ .../js/services/i18n/locale_messages_en-US.js | 121 +++++ .../js/services/i18n/locale_messages_zh-CN.js | 119 +++++ .../js/services/i18n/services.i18n.js | 39 +- .../js/session/session.current-user.js | 18 +- ui/ngrouter.go | 2 + views/ng/dashboard.htm | 2 +- views/ng/forgot-password.htm | 2 +- views/ng/optional-menu.htm | 10 +- views/ng/sections/header-include.htm | 8 +- views/ng/sign-up.htm | 2 +- 17 files changed, 328 insertions(+), 543 deletions(-) delete mode 100644 static/ng/resources/js/services/i18n/locale_messages.js create mode 100644 static/ng/resources/js/services/i18n/locale_messages_en-US.js create mode 100644 static/ng/resources/js/services/i18n/locale_messages_zh-CN.js diff --git a/Deploy/templates/ui/app.conf b/Deploy/templates/ui/app.conf index 090bcdc47..6d8f15728 100644 --- a/Deploy/templates/ui/app.conf +++ b/Deploy/templates/ui/app.conf @@ -2,8 +2,8 @@ appname = registry runmode = dev [lang] -types = en-US|zh-CN|de-DE|ru-RU -names = en-US|zh-CN|de-DE|ru-RU +types = en-US|zh-CN +names = English|中文 [dev] httpport = 80 diff --git a/controllers/ng/base.go b/controllers/ng/base.go index c0eb02c54..3b0b94fc6 100644 --- a/controllers/ng/base.go +++ b/controllers/ng/base.go @@ -8,7 +8,6 @@ import ( "github.com/astaxie/beego" "github.com/beego/i18n" - "github.com/vmware/harbor/dao" "github.com/vmware/harbor/utils/log" ) @@ -74,6 +73,7 @@ func (b *BaseController) Prepare() { b.Data["Lang"] = curLang.Lang b.Data["CurLang"] = curLang.Name b.Data["RestLangs"] = restLangs + b.Data["SupportLanguages"] = supportLanguages authMode := strings.ToLower(os.Getenv("AUTH_MODE")) if authMode == "" { @@ -82,28 +82,6 @@ func (b *BaseController) Prepare() { b.AuthMode = authMode b.Data["AuthMode"] = b.AuthMode - selfRegistration := strings.ToLower(os.Getenv("SELF_REGISTRATION")) - - if selfRegistration == "on" { - b.SelfRegistration = true - } - - sessionUserID := b.GetSession("userId") - if sessionUserID != nil { - b.Data["Username"] = b.GetSession("username") - b.Data["UserId"] = sessionUserID.(int) - - var err error - b.IsAdmin, err = dao.IsAdminRole(sessionUserID.(int)) - if err != nil { - log.Errorf("Error occurred in IsAdminRole:%v", err) - b.CustomAbort(http.StatusInternalServerError, "Internal error.") - } - } - - b.Data["IsAdmin"] = b.IsAdmin - b.Data["SelfRegistration"] = b.SelfRegistration - } func (bc *BaseController) Forward(title, templateName string) { @@ -120,6 +98,27 @@ func (bc *BaseController) Forward(title, templateName string) { var langTypes []*langType +type CommonController struct { + BaseController +} + +func (cc *CommonController) Render() error { + return nil +} + +func (cc *CommonController) LogOut() { + cc.DestroySession() +} + +func (cc *CommonController) SwitchLanguage() { + lang := cc.GetString("lang") + if _, exist := supportLanguages[lang]; exist { + cc.SetSession("lang", lang) + cc.Data["Lang"] = lang + } + cc.Redirect(cc.Ctx.Request.Header.Get("Referer"), http.StatusFound) +} + func init() { //conf/app.conf -> os.Getenv("config_path") diff --git a/controllers/ng/password.go b/controllers/ng/password.go index 9b16bba93..f6f169c4a 100644 --- a/controllers/ng/password.go +++ b/controllers/ng/password.go @@ -14,18 +14,6 @@ import ( "github.com/vmware/harbor/utils/log" ) -type CommonController struct { - BaseController -} - -func (cc *CommonController) Render() error { - return nil -} - -func (cc *CommonController) LogOut() { - cc.DestroySession() -} - type messageDetail struct { Hint string URL string diff --git a/static/ng/resources/css/dashboard.css b/static/ng/resources/css/dashboard.css index 215e5dc27..aac91bac8 100644 --- a/static/ng/resources/css/dashboard.css +++ b/static/ng/resources/css/dashboard.css @@ -12,7 +12,3 @@ text-align: left; } -.single { - margin-right: 0; -} - diff --git a/static/ng/resources/js/components/optional-menu/optional-menu.directive.js b/static/ng/resources/js/components/optional-menu/optional-menu.directive.js index 37f57650b..8d30ee06c 100644 --- a/static/ng/resources/js/components/optional-menu/optional-menu.directive.js +++ b/static/ng/resources/js/components/optional-menu/optional-menu.directive.js @@ -13,17 +13,17 @@ vm.currentLanguage = I18nService().getCurrentLanguage(); vm.languageName = I18nService().getLanguageName(vm.currentLanguage); + console.log('current language:' + I18nService().getCurrentLanguage()); + vm.user = currentUser.get(); - vm.setLanguage = setLanguage; vm.logOut = logOut; - function setLanguage(name) { - I18nService().setCurrentLanguage(name); - $window.location.reload(); + function setLanguage(language) { + I18nService().setCurrentLanguage(language); + $window.location.href = '/ng/language?lang=' + language; } - function logOut() { LogOutService() .success(logOutSuccess) @@ -31,6 +31,7 @@ } function logOutSuccess(data, status) { currentUser.unset(); + I18nService().unset(); $window.location.href= '/ng'; } function logOutFailed(data, status) { diff --git a/static/ng/resources/js/components/sign-in/sign-in.directive.html b/static/ng/resources/js/components/sign-in/sign-in.directive.html index 4b62997ab..a293a5f84 100644 --- a/static/ng/resources/js/components/sign-in/sign-in.directive.html +++ b/static/ng/resources/js/components/sign-in/sign-in.directive.html @@ -3,7 +3,7 @@
    -
    +
    // 'username_is_required' | tr //
    @@ -13,7 +13,7 @@
    -
    +
    // 'password_is_required' | tr //
    // vm.errorMessage | tr // diff --git a/static/ng/resources/js/services/i18n/locale_messages.js b/static/ng/resources/js/services/i18n/locale_messages.js deleted file mode 100644 index 1ddfc87b2..000000000 --- a/static/ng/resources/js/services/i18n/locale_messages.js +++ /dev/null @@ -1,468 +0,0 @@ -var global_messages = { - 'sign_in': { - 'en-US': 'Sign In', - 'zh-CN': '登录' - }, - 'sign_up': { - 'en-US': 'Sign Up', - 'zh-CN': '注册' - }, - 'forgot_password': { - 'en-US': 'Forgot Password', - 'zh-CN': '忘记密码' - }, - 'login_now': { - 'en-US': 'Login Now', - 'zh-CN': '立刻登录' - }, - 'its_easy_to_get_started': { - 'en-US': 'It\'s easy to get started ...', - 'zh-CN': '这很容易上手...' - }, - 'anybody_can_read_public_projects': { - 'en-US': 'Anybody can read public projects', - 'zh-CN': '任何人都可以访问公开的项目' - }, - 'create_projects_and_connect_repositories': { - 'en-US': 'Create projects and connect repositories', - 'zh-CN': '创建项目并关联镜像仓库' - }, - 'user_management_and_role_assignment': { - 'en-US': 'User management and role assignment', - 'zh-CN': '用户管理和角色分派' - }, - 'why_use_harbor': { - 'en-US': 'Why use Harbor?', - 'zh-CN': '为什么要使用Harbor？' - }, - 'index_desc': { - 'en-US': 'Project Harbor is to build an enterprise-class, reliable registry server. Enterprises can set up a private registry server in their own environment to improve productivity as well as security. Project Harbor can be used in both development and production environment.', - 'zh-CN': 'Harbor是可靠的企业级Registry服务器。企业用户可使用Harbor搭建私有容器Registry服务，提高生产效率和安全度，既可应用于生产环境，也可以在开发环境中使用。' - }, - 'index_desc_1': { - 'en-US': 'Security: Keep their intellectual properties within their organizations.', - 'zh-CN': '安全: 确保知识产权在自己组织内部的管控之下。' - }, - 'index_desc_2': { - 'en-US': 'Efficiency: A private registry server is set up within the organization\'s network and can reduce significantly the internet traffic to the public service. ', - 'zh-CN': '效率: 搭建组织内部的私有容器Registry服务，可显著降低访问公共Registry服务的网络需求。' - }, - 'index_desc_3': { - 'en-US': 'Access Control: RBAC (Role Based Access Control) is provided. User management can be integrated with existing enterprise identity services like AD/LDAP. ', - 'zh-CN': '访问控制: 提供基于角色的访问控制，可集成企业目前拥有的用户管理系统（如:AD/LDAP）。 ' - }, - 'index_desc_4': { - 'en-US': 'Audit: All access to the registry are logged and can be used for audit purpose.', - 'zh-CN': '审计: 所有访问Registry服务的操作均被记录，便于日后审计。' - }, - 'index_desc_5': { - 'en-US': 'GUI: User friendly single-pane-of-glass management console.', - 'zh-CN': '管理界面: 具有友好易用图形管理界面。' - }, - 'learn_more': { - 'en-US': 'Learn more...', - 'zh-CN': '更多...' - }, - 'repositories': { - 'en-US': 'Repositories', - 'zh-CN': '镜像仓库' - }, - 'project_repo_name': { - 'en-US': 'Project/Repository Name', - 'zh-CN': '项目/镜像仓库名称' - }, - 'creation_time': { - 'en-US': 'Creation Time', - 'zh-CN': '创建时间' - }, - 'author': { - 'en-US': 'Author', - 'zh-CN': '作者' - }, - 'username': { - 'en-US': 'Username', - 'zh-CN': '用户名' - }, - 'username_is_required' : { - 'en-US': 'Username is required.', - 'zh-CN': '用户名为必填项。' - }, - 'username_has_been_taken' : { - 'en-US': 'Username has been taken.', - 'zh-CN': '用户名已被占用。' - }, - 'username_is_too_long' : { - 'en-US': 'Username is too long. (maximum 20 characters)', - 'zh-CN': '用户名长度超出限制。（最长为20个字符）' - }, - 'username_contains_illegal_chars': { - 'en-US': 'Username contains illegal character(s).', - 'zh-CN': '用户名包含不合法的字符。' - }, - 'email': { - 'en-US': 'Email', - 'zh-CN': '邮箱' - }, - 'email_desc': { - 'en-US': 'The Email address will be used for resetting password.', - 'zh-CN': '此邮箱将用于重置密码。' - }, - 'email_is_required' : { - 'en-US': 'Email is required.', - 'zh-CN': '邮箱为必填项。' - }, - 'email_has_been_taken' : { - 'en-US': 'Email has been taken.', - 'zh-CN': '邮箱已被占用。' - }, - 'email_content_illegal' : { - 'en-US': 'Email format is illegal.', - 'zh-CN': '邮箱格式不合法。' - }, - 'email_does_not_exist' : { - 'en-US': 'Email does not exist.', - 'zh-CN': '邮箱不存在。' - }, - 'email_is_too_long': { - 'en-US': 'Email is to long. (maximum 50 characters)', - 'zh-CN': '邮箱名称长度超出限制。（最长为50个字符）' - }, - 'full_name': { - 'en-US': 'Full Name', - 'zh-CN': '全名' - }, - 'full_name_desc': { - 'en-US': 'First name & Last name', - 'zh-CN': '请输入全名。' - }, - 'full_name_is_required' : { - 'en-US': 'Full name is required.', - 'zh-CN': '全名为必填项。' - }, - 'full_name_is_too_long' : { - 'en-US': 'Full name is too long. (maximum 20 characters)', - 'zh-CN': '全名长度超出限制。（最长为20个字符）' - }, - 'full_name_contains_illegal_chars' : { - 'en-US': 'Full name contains illegal character(s).', - 'zh-CN': '全名包含不合法的字符。' - }, - 'password': { - 'en-US': 'Password', - 'zh-CN': '密码' - }, - 'password_desc': { - 'en-US': 'At least 7 characters with 1 lowercase letter, 1 capital letter and 1 numeric character.', - 'zh-CN': '至少输入 7个字符且包含 1个小写字母， 1个大写字母和 1个数字。' - }, - 'password_is_required' : { - 'en-US': 'Password is required.', - 'zh-CN': '密码为必填项。' - }, - 'password_is_invalid' : { - 'en-US': 'Password is invalid. At least 7 characters with 1 lowercase letter, 1 capital letter and 1 numeric character.', - 'zh-CN': '密码无效。至少输入 7个字符且包含 1个小写字母，1个大写字母和 1个数字。' - }, - 'confirm_password': { - 'en-US': 'Confirm Password', - 'zh-CN': '确认密码' - }, - 'password_does_not_match' : { - 'en-US': 'Passwords do not match.', - 'zh-CN': '两次密码输入不一致。' - }, - 'comments': { - 'en-US': 'Comments', - 'zh-CN': '备注' - }, - 'comment_is_too_long' : { - 'en-US': 'Comment is too long. (maximum 20 characters)', - 'zh-CN': '备注长度超出限制。（最长为20个字符）' - }, - 'forgot_password_description': { - 'en-US': 'Please input the Email used when you signed up, a reset password Email will be sent to you.', - 'zh-CN': '重置邮件将发送到此邮箱。' - }, - 'email_does_not_exist': { - 'en-US': 'Email does not exist', - 'zh-CN': '邮箱不存在。' - }, - 'reset_password': { - 'en-US': 'Reset Password', - 'zh-CN': '重置密码' - }, - 'summary': { - 'en-US': 'Summary', - 'zh-CN': '摘要' - }, - 'projects': { - 'en-US': 'Projects', - 'zh-CN': '项目' - }, - 'public_projects': { - 'en-US': 'Public Projects', - 'zh-CN': '公开项目' - }, - 'public': { - 'en-US': 'Public', - 'zh-CN': '公开' - }, - 'total_projects': { - 'en-US': 'Total Projects', - 'zh-CN': '全部项目' - }, - 'public_repositories': { - 'en-US': 'Public Repositories', - 'zh-CN': '公开镜像仓库' - }, - 'total_repositories': { - 'en-US': 'Total Repositories', - 'zh-CN': '全部镜像仓库' - }, - 'top_10_repositories': { - 'en-US': 'Top 10 Repositories', - 'zh-CN': 'Top 10 镜像仓库' - }, - 'repository_name': { - 'en-US': 'Repository Name', - 'zh-CN': '镜像仓库名' - }, - 'size': { - 'en-US': 'Size', - 'zh-CN': '规格' - }, - 'creator': { - 'en-US': 'Creator', - 'zh-CN': '创建者' - }, - 'logs': { - 'en-US': 'Logs', - 'zh-CN': '日志' - }, - 'task_name': { - 'en-US': 'Task Name', - 'zh-CN': '任务名称' - }, - 'details': { - 'en-US': 'Details', - 'zh-CN': '详细信息' - }, - 'user': { - 'en-US': 'User', - 'zh-CN': '用户' - }, - 'users': { - 'en-US': 'Users', - 'zh-CN': '用户' - }, - 'my_projects': { - 'en-US': 'My Projects', - 'zh-CN': '我的项目' - }, - 'project_name': { - 'en-US': 'Project Name', - 'zh-CN': '项目名称' - }, - 'role': { - 'en-US': 'Role', - 'zh-CN': '角色' - }, - 'publicity': { - 'en-US': 'Publicity', - 'zh-CN': '公开' - }, - 'button_on': { - 'en-US': 'On', - 'zh-CN': '打开' - }, - 'button_off': { - 'en-US': 'Off', - 'zh-CN': '关闭' - }, - 'new_project': { - 'en-US': 'New Project', - 'zh-CN': '新增项目' - }, - 'save': { - 'en-US': 'Save', - 'zh-CN': '保存' - }, - 'cancel': { - 'en-US': 'Cancel', - 'zh-CN': '取消' - }, - 'items': { - 'en-US': 'items', - 'zh-CN': '条记录' - }, - 'add_member': { - 'en-US': 'Add Member', - 'zh-CN': '新增成员' - }, - 'operation': { - 'en-US': 'Operation', - 'zh-CN': '操作' - }, - 'advanced_search': { - 'en-US': 'Advanced Search', - 'zh-CN': '高级搜索' - }, - 'all': { - 'en-US': 'All', - 'zh-CN': '全部' - }, - 'others': { - 'en-US': 'Others', - 'zh-CN': '其他' - }, - 'search': { - 'en-US': 'Search', - 'zh-CN': '搜索' - }, - 'duration': { - 'en-US': 'Duration', - 'zh-CN': '持续时间' - }, - 'from': { - 'en-US': 'From', - 'zh-CN': '起始' - }, - 'to': { - 'en-US': 'To', - 'zh-CN': '结束' - }, - 'timestamp': { - 'en-US': 'Timestamp', - 'zh-CN': '时间戳' - }, - 'dashboard': { - 'en-US': 'Dashboard', - 'zh-CN': '消息中心' - }, - 'admin_options': { - 'en-US': 'Admin Options', - 'zh-CN': '管理员选项' - }, - 'account_setting': { - 'en-US': 'Account Setting', - 'zh-CN': '个人设置' - }, - 'log_out': { - 'en-US': 'Log Out', - 'zh-CN': '注销' - }, - 'registration_time': { - 'en-US': 'Registration Time', - 'zh-CN': '注册时间' - }, - 'system_management': { - 'en-US': 'System Management', - 'zh-CN': '系统管理' - }, - 'change_password': { - 'en-US': 'Change Password', - 'zh-CN': '修改密码' - }, - 'old_password': { - 'en-US': 'Old Password', - 'zh-CN': '原密码' - }, - 'old_password_is_required': { - 'en-US': 'Old password is required.', - 'zh-CN': '原密码为必填项。' - }, - 'old_password_is_incorrect': { - 'en-US': 'Old password is incorrect.', - 'zh-CN': '原密码不正确。' - }, - 'new_password_is_required': { - 'en-US': 'New password is required.', - 'zh-CN': '新密码为必填项。' - }, - 'new_password_is_invalid': { - 'en-US': 'New password is invalid. At least 7 characters with 1 lowercase letter, 1 capital letter and 1 numeric character.', - 'zh-CN': '新密码无效。至少输入 7个字符且包含 1个小写字母，1个大写字母和 1个数字。' - }, - 'new_password': { - 'en-US': 'New Password', - 'zh-CN': '新密码' - }, - 'username_already_exist': { - 'en-US': 'Username already exist.', - 'zh-CN': '用户名已存在。' - }, - 'username_does_not_exist': { - 'en-US': 'Username does not exist.', - 'zh-CN': '用户名不存在。' - }, - 'username_or_password_is_incorrect': { - 'en-US': 'Username or password is incorrect', - 'zh-CN': '用户名或密码不正确。' - }, - 'username_email': { - 'en-US': 'Username/Email', - 'zh-CN': '用户名/邮箱' - }, - 'project_name_is_required': { - 'en-US': 'Project name is required', - 'zh-CN': '项目名称为必填项。' - }, - 'project_already_exist': { - 'en-US': 'Project already exist', - 'zh-CN': '项目已存在。' - }, - 'project_name_is_invalid': { - 'en-US': 'Project name is invalid', - 'zh-CN': '项目名称无效。' - }, - 'projects_or_repositories': { - 'en-US': 'Projects or repositories', - 'zh-CN': '项目和镜像资源' - }, - 'tag': { - 'en-US': 'Tag', - 'zh-CN': '标签' - }, - 'image_details': { - 'en-US': 'Image Details', - 'zh-CN': '镜像明细' - }, - 'pull_command': { - 'en-US': 'Pull Command', - 'zh-CN': 'Pull 命令' - }, - 'alert_delete_repo_title': { - 'en-US': 'Delete repository - $0', - 'zh-CN': '删除镜像仓库 - $0' - }, - 'alert_delete_repo': { - 'en-US': 'After deleting the associated tags with the repository will be deleted together.
    ' + - 'And the corresponding image will be removed from the system.
    ' + - '
    Delete this "$0" repository now?', - 'zh-CN': '删除镜像仓库也会删除其所有相关联的镜像标签，
    并且其对应镜像资源文件也会被从系统删除。
    ' + - '
    是否删除镜像仓库 "$0" ?' - }, - 'alert_delete_last_tag': { - 'en-US': 'After deleting the associated repository with the tag will be deleted together,
    ' + - 'because a repository contains at least one tag. And the corresponding image will be removed from the system.
    ' + - '
    Delete this "$0" tag now?', - 'zh-CN': '当删除只包含一个镜像标签的镜像仓库时，其对应的镜像仓库也会被从系统中删除。
    ' + - '
    删除镜像标签 "$0" ?' - }, - 'alert_delete_tag_title': { - 'en-US': 'Delete tag - $0', - 'zh-CN': '删除镜像标签 - $0' - }, - 'alert_delete_tag': { - 'en-US': 'Delete this "$0" tag now?', - 'zh-CN': '删除镜像标签 "$0" ?' - }, - 'close': { - 'en-US': 'Close', - 'zh-CN': '关闭' - }, - 'ok': { - 'en-US': 'OK', - 'zh-CN': '确认' - } -}; \ No newline at end of file diff --git a/static/ng/resources/js/services/i18n/locale_messages_en-US.js b/static/ng/resources/js/services/i18n/locale_messages_en-US.js new file mode 100644 index 000000000..1b95db666 --- /dev/null +++ b/static/ng/resources/js/services/i18n/locale_messages_en-US.js @@ -0,0 +1,121 @@ +var locale_messages = { + 'sign_in': 'Sign In', + 'sign_up': 'Sign Up', + 'forgot_password': 'Forgot Password', + 'login_now': 'Login Now', + 'its_easy_to_get_started': 'It\'s easy to get started ...', + 'anybody_can_read_public_projects': 'Anybody can read public projects', + 'create_projects_and_connect_repositories': 'Create projects and connect repositories', + 'user_management_and_role_assignment': 'User management and role assignment', + 'why_use_harbor': 'Why use Harbor?', + 'index_desc': 'Project Harbor is to build an enterprise-class, reliable registry server. Enterprises can set up a private registry server in their own environment to improve productivity as well as security. Project Harbor can be used in both development and production environment.', + 'index_desc_1': 'Security: Keep their intellectual properties within their organizations.', + 'index_desc_2': 'Efficiency: A private registry server is set up within the organization\'s network and can reduce significantly the internet traffic to the public service. ', + 'index_desc_3': 'Access Control: RBAC (Role Based Access Control) is provided. User management can be integrated with existing enterprise identity services like AD/LDAP. ', + 'index_desc_4': 'Audit: All access to the registry are logged and can be used for audit purpose.', + 'index_desc_5': 'GUI: User friendly single-pane-of-glass management console.', + 'learn_more': 'Learn more...', + 'repositories': 'Repositories', + 'project_repo_name': 'Project/Repository Name', + 'creation_time': 'Creation Time', + 'author': 'Author', + 'username': 'Username', + 'username_is_required': 'Username is required.', + 'username_has_been_taken': 'Username has been taken.', + 'username_is_too_long': 'Username is too long. (maximum 20 characters)', + 'username_contains_illegal_chars': 'Username contains illegal character(s).', + 'email': 'Email', + 'email_desc': 'The Email address will be used for resetting password.', + 'email_is_required': 'Email is required.', + 'email_has_been_taken': 'Email has been taken.', + 'email_content_illegal': 'Email format is illegal.', + 'email_does_not_exist': 'Email does not exist.', + 'email_is_too_long': 'Email is to long. (maximum 50 characters)', + 'full_name': 'Full Name', + 'full_name_desc': 'First name & Last name', + 'full_name_is_required': 'Full name is required.', + 'full_name_is_too_long': 'Full name is too long. (maximum 20 characters)', + 'full_name_contains_illegal_chars': 'Full name contains illegal character(s).', + 'password': 'Password', + 'password_desc': 'At least 7 characters with 1 lowercase letter, 1 capital letter and 1 numeric character.', + 'password_is_required': 'Password is required.', + 'password_is_invalid': 'Password is invalid. At least 7 characters with 1 lowercase letter, 1 capital letter and 1 numeric character.', + 'confirm_password': 'Confirm Password', + 'password_does_not_match': 'Passwords do not match.', + 'comments': 'Comments', + 'comment_is_too_long': 'Comment is too long. (maximum 20 characters)', + 'forgot_password_description': 'Please input the Email used when you signed up, a reset password Email will be sent to you.', + 'email_does_not_exist': 'Email does not exist', + 'reset_password': 'Reset Password', + 'summary': 'Summary', + 'projects': 'Projects', + 'public_projects': 'Public Projects', + 'public': 'Public', + 'total_projects': 'Total Projects', + 'public_repositories': 'Public Repositories', + 'total_repositories': 'Total Repositories', + 'top_10_repositories': 'Top 10 Repositories', + 'repository_name': 'Repository Name', + 'size': 'Size', + 'creator': 'Creator', + 'logs': 'Logs', + 'task_name': 'Task Name', + 'details': 'Details', + 'user': 'User', + 'users': 'Users', + 'my_projects': 'My Projects', + 'project_name': 'Project Name', + 'role': 'Role', + 'publicity': 'Publicity', + 'button_on': 'On', + 'button_off': 'Off', + 'new_project': 'New Project', + 'save': 'Save', + 'cancel': 'Cancel', + 'items': 'items', + 'add_member': 'Add Member', + 'operation': 'Operation', + 'advanced_search': 'Advanced Search', + 'all': 'All', + 'others': 'Others', + 'search': 'Search', + 'duration': 'Duration', + 'from': 'From', + 'to': 'To', + 'timestamp': 'Timestamp', + 'dashboard': 'Dashboard', + 'admin_options': 'Admin Options', + 'account_setting': 'Account Setting', + 'log_out': 'Log Out', + 'registration_time': 'Registration Time', + 'system_management': 'System Management', + 'change_password': 'Change Password', + 'old_password': 'Old Password', + 'old_password_is_required': 'Old password is required.', + 'old_password_is_incorrect': 'Old password is incorrect.', + 'new_password_is_required': 'New password is required.', + 'new_password_is_invalid': 'New password is invalid. At least 7 characters with 1 lowercase letter, 1 capital letter and 1 numeric character.', + 'new_password': 'New Password', + 'username_already_exist': 'Username already exist.', + 'username_does_not_exist': 'Username does not exist.', + 'username_or_password_is_incorrect': 'Username or password is incorrect', + 'username_email': 'Username/Email', + 'project_name_is_required': 'Project name is required', + 'project_already_exist': 'Project already exist', + 'project_name_is_invalid': 'Project name is invalid', + 'projects_or_repositories': 'Projects or repositories', + 'tag': 'Tag', + 'image_details': 'Image Details', + 'pull_command': 'Pull Command', + 'alert_delete_repo_title': 'Delete repository - $0', + 'alert_delete_repo': 'After deleting the associated tags with the repository will be deleted together.
    ' + + 'And the corresponding image will be removed from the system.
    ' + + '
    Delete this "$0" repository now?', + 'alert_delete_last_tag': 'After deleting the associated repository with the tag will be deleted together,
    ' + + 'because a repository contains at least one tag. And the corresponding image will be removed from the system.
    ' + + '
    Delete this "$0" tag now?', + 'alert_delete_tag_title': 'Delete tag - $0', + 'alert_delete_tag': 'Delete this "$0" tag now?', + 'close': 'Close', + 'ok': 'OK' +}; \ No newline at end of file diff --git a/static/ng/resources/js/services/i18n/locale_messages_zh-CN.js b/static/ng/resources/js/services/i18n/locale_messages_zh-CN.js new file mode 100644 index 000000000..f854d5fd4 --- /dev/null +++ b/static/ng/resources/js/services/i18n/locale_messages_zh-CN.js @@ -0,0 +1,119 @@ +var locale_messages = { + 'sign_in': '登录', + 'sign_up': '注册', + 'forgot_password': '忘记密码', + 'login_now': '立刻登录', + 'its_easy_to_get_started': '这很容易上手...', + 'anybody_can_read_public_projects': '任何人都可以访问公开的项目', + 'create_projects_and_connect_repositories': '创建项目并关联镜像仓库', + 'user_management_and_role_assignment': '用户管理和角色分派', + 'why_use_harbor': '为什么要使用Harbor？', + 'index_desc': 'Harbor是可靠的企业级Registry服务器。企业用户可使用Harbor搭建私有容器Registry服务，提高生产效率和安全度，既可应用于生产环境，也可以在开发环境中使用。', + 'index_desc_1': '安全: 确保知识产权在自己组织内部的管控之下。', + 'index_desc_2': '效率: 搭建组织内部的私有容器Registry服务，可显著降低访问公共Registry服务的网络需求。', + 'index_desc_3': '访问控制: 提供基于角色的访问控制，可集成企业目前拥有的用户管理系统（如:AD/LDAP）。', + 'index_desc_4': '审计: 所有访问Registry服务的操作均被记录，便于日后审计。', + 'index_desc_5': '管理界面: 具有友好易用图形管理界面。', + 'learn_more': '更多...', + 'repositories': '镜像仓库', + 'project_repo_name': '项目/镜像仓库名称', + 'creation_time': '创建时间', + 'author': '作者', + 'username': '用户名', + 'username_is_required' : '用户名为必填项。', + 'username_has_been_taken' : '用户名已被占用。', + 'username_is_too_long' : '用户名长度超出限制。（最长为20个字符）', + 'username_contains_illegal_chars': '用户名包含不合法的字符。', + 'email': '邮箱', + 'email_desc': '此邮箱将用于重置密码。', + 'email_is_required' : '邮箱为必填项。', + 'email_has_been_taken' : '邮箱已被占用。', + 'email_content_illegal' : '邮箱格式不合法。', + 'email_does_not_exist' : '邮箱不存在。', + 'email_is_too_long': '邮箱名称长度超出限制。（最长为50个字符）', + 'full_name': '全名', + 'full_name_desc': '请输入全名。', + 'full_name_is_required' : '全名为必填项。', + 'full_name_is_too_long' : '全名长度超出限制。（最长为20个字符）', + 'full_name_contains_illegal_chars' : '全名包含不合法的字符。', + 'password': '密码', + 'password_desc': '至少输入 7个字符且包含 1个小写字母， 1个大写字母和 1个数字。', + 'password_is_required' : '密码为必填项。', + 'password_is_invalid' : '密码无效。至少输入 7个字符且包含 1个小写字母，1个大写字母和 1个数字。', + 'confirm_password': '确认密码', + 'password_does_not_match' : '两次密码输入不一致。', + 'comments': '备注', + 'comment_is_too_long' : '备注长度超出限制。（最长为20个字符）', + 'forgot_password_description': '重置邮件将发送到此邮箱。', + 'email_does_not_exist': '邮箱不存在。', + 'reset_password': '重置密码', + 'summary': '摘要', + 'projects': '项目', + 'public_projects': '公开项目', + 'public': '公开', + 'total_projects': '全部项目', + 'public_repositories': '公开镜像仓库', + 'total_repositories': '全部镜像仓库', + 'top_10_repositories': 'Top 10 镜像仓库', + 'repository_name': '镜像仓库名', + 'size': '规格', + 'creator': '创建者', + 'logs': '日志', + 'task_name': '任务名称', + 'details': '详细信息', + 'user': '用户', + 'users': '用户', + 'my_projects': '我的项目', + 'project_name': '项目名称', + 'role': '角色', + 'publicity': '公开', + 'button_on': '打开', + 'button_off': '关闭', + 'new_project': '新增项目', + 'save': '保存', + 'cancel': '取消', + 'items': '条记录', + 'add_member': '新增成员', + 'operation': '操作', + 'advanced_search': '高级搜索', + 'all': '全部', + 'others': '其他', + 'search':'搜索', + 'duration': '持续时间', + 'from': '起始', + 'to': '结束', + 'timestamp': '时间戳', + 'dashboard': '消息中心', + 'admin_options': '管理员选项', + 'account_setting': '个人设置', + 'log_out': '注销', + 'registration_time': '注册时间', + 'system_management': '系统管理', + 'change_password': '修改密码', + 'old_password': '原密码', + 'old_password_is_required': '原密码为必填项。', + 'old_password_is_incorrect': '原密码不正确。', + 'new_password_is_required': '新密码为必填项。', + 'new_password_is_invalid': '新密码无效。至少输入 7个字符且包含 1个小写字母，1个大写字母和 1个数字。', + 'new_password': '新密码', + 'username_already_exist': '用户名已存在。', + 'username_does_not_exist': '用户名不存在。', + 'username_or_password_is_incorrect': '用户名或密码不正确。', + 'username_email': '用户名/邮箱', + 'project_name_is_required': '项目名称为必填项。', + 'project_already_exist': '项目已存在。', + 'project_name_is_invalid': '项目名称无效。', + 'projects_or_repositories': '项目和镜像资源', + 'tag': '标签', + 'image_details': '镜像明细', + 'pull_command': 'Pull 命令', + 'alert_delete_repo_title': '删除镜像仓库 - $0', + 'alert_delete_repo': '删除镜像仓库也会删除其所有相关联的镜像标签，
    并且其对应镜像资源文件也会被从系统删除。
    ' + + '
    是否删除镜像仓库 "$0" ?', + 'alert_delete_last_tag': '当删除只包含一个镜像标签的镜像仓库时，其对应的镜像仓库也会被从系统中删除。
    ' + + '
    删除镜像标签 "$0" ?', + 'alert_delete_tag_title': '删除镜像标签 - $0', + 'alert_delete_tag': '删除镜像标签 "$0" ?', + 'close': '关闭', + 'ok': '确认' +}; \ No newline at end of file diff --git a/static/ng/resources/js/services/i18n/services.i18n.js b/static/ng/resources/js/services/i18n/services.i18n.js index d34a5c672..00b5ced18 100644 --- a/static/ng/resources/js/services/i18n/services.i18n.js +++ b/static/ng/resources/js/services/i18n/services.i18n.js @@ -9,29 +9,48 @@ I18nService.$inject = ['$cookies', '$window']; function I18nService($cookies, $window) { - var languages = $.extend(true, {}, global_messages); + var cookieOptions = {'path': '/'}; + var messages = $.extend(true, {}, eval('locale_messages')); var defaultLanguage = navigator.language || 'en-US'; - var languageNames = { + var supportLanguages = { 'en-US': 'English', 'zh-CN': '中文' - }; + }; + var isSupportLanguage = function(language) { + for (var i in supportLanguages) { + if(language == i) { + return true; + } + } + return false; + } + return tr; function tr() { return { - 'setCurrentLanguage': function(language) { - if(!language){ + 'setCurrentLanguage': function(language) { + if(!angular.isDefined(language) || !isSupportLanguage(language)) { language = defaultLanguage; } - $cookies.put('language', language, {'path': '/'}); + $cookies.put('language', language, cookieOptions); + }, + 'setDefaultLanguage': function() { + $cookies.put('language', defaultLanguage, cookieOptions); }, 'getCurrentLanguage': function() { return $cookies.get('language') || defaultLanguage; }, - 'getLanguageName': function(crrentLanguage) { - return languageNames[crrentLanguage]; + 'getLanguageName': function(language) { + if(!angular.isDefined(language) || !isSupportLanguage(language)) { + language = defaultLanguage; + } + return supportLanguages[language]; }, - 'getValue': function(key, currentLanguage) { - return languages[key][currentLanguage]; + 'unset': function(){ + $cookies.put('language', defaultLanguage, cookieOptions); + }, + 'getValue': function(key) { + return messages[key]; } } } diff --git a/static/ng/resources/js/session/session.current-user.js b/static/ng/resources/js/session/session.current-user.js index 9f92b6751..e50406cb9 100644 --- a/static/ng/resources/js/session/session.current-user.js +++ b/static/ng/resources/js/session/session.current-user.js @@ -6,20 +6,20 @@ .module('harbor.session') .controller('CurrentUserController', CurrentUserController); - CurrentUserController.$inject = ['CurrentUserService', 'currentUser', '$scope', '$timeout', '$window']; + CurrentUserController.$inject = ['CurrentUserService', 'currentUser', '$window']; - function CurrentUserController(CurrentUserService, currentUser, $scope, $timeout, $window) { + function CurrentUserController(CurrentUserService, currentUser, $window) { var vm = this; - if(!angular.isDefined(currentUser.get())) { - CurrentUserService() - .then(getCurrentUserComplete) - .catch(getCurrentUserFailed); - } - + CurrentUserService() + .then(getCurrentUserComplete) + .catch(getCurrentUserFailed); + function getCurrentUserComplete(response) { - currentUser.set(response.data); + if(angular.isDefined(response)) { + currentUser.set(response.data); + } } function getCurrentUserFailed(e){ diff --git a/ui/ngrouter.go b/ui/ngrouter.go index f28ff4d45..3e6a0730e 100644 --- a/ui/ngrouter.go +++ b/ui/ngrouter.go @@ -17,9 +17,11 @@ func initNgRouters() { beego.Router("/ng/forgot_password", &ng.ForgotPasswordController{}) beego.Router("/ng/reset_password", &ng.ResetPasswordController{}) beego.Router("/ng/search", &ng.SearchController{}) + beego.Router("/ng/log_out", &ng.CommonController{}, "get:LogOut") beego.Router("/ng/reset", &ng.CommonController{}, "post:ResetPassword") beego.Router("/ng/sendEmail", &ng.CommonController{}, "get:SendEmail") + beego.Router("/ng/language", &ng.CommonController{}, "get:SwitchLanguage") beego.Router("/ng/optional_menu", &ng.OptionalMenuController{}) beego.Router("/ng/navigation_header", &ng.NavigationHeaderController{}) diff --git a/views/ng/dashboard.htm b/views/ng/dashboard.htm index 9dcdbcf8c..9b1a8727e 100644 --- a/views/ng/dashboard.htm +++ b/views/ng/dashboard.htm @@ -38,7 +38,7 @@
    -
    +

    // 'logs' | tr //

    diff --git a/views/ng/forgot-password.htm b/views/ng/forgot-password.htm index c1bafd819..e8d02cc7e 100644 --- a/views/ng/forgot-password.htm +++ b/views/ng/forgot-password.htm @@ -5,7 +5,7 @@

    // 'forgot_password' | tr //

    - +
    diff --git a/views/ng/optional-menu.htm b/views/ng/optional-menu.htm index 9aabee197..f7512665e 100644 --- a/views/ng/optional-menu.htm +++ b/views/ng/optional-menu.htm @@ -8,8 +8,9 @@
  • //vm.languageName//
  • @@ -22,8 +23,9 @@ //vm.languageName//
    {{ end }} \ No newline at end of file diff --git a/views/ng/sections/header-include.htm b/views/ng/sections/header-include.htm index 00673eb57..0d3d5b738 100644 --- a/views/ng/sections/header-include.htm +++ b/views/ng/sections/header-include.htm @@ -98,7 +98,13 @@ - + +{{ if eq .Lang "zh-CN" }} + +{{ else if eq .Lang "en-US"}} + +{{ end }} + diff --git a/views/ng/sign-up.htm b/views/ng/sign-up.htm index d2955baf5..312629dea 100644 --- a/views/ng/sign-up.htm +++ b/views/ng/sign-up.htm @@ -5,7 +5,7 @@

    // 'sign_up' | tr //

    - +