fix: improve code for get gitlab repo info

ineo6 · Nov 5, 2020 · 5ff49f5 · 5ff49f5
1 parent 6122a7e
commit 5ff49f5
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/common/adapters/gitlab.js b/src/common/adapters/gitlab.js
@@ -113,24 +113,25 @@ class Gitlab extends PjaxAdapter {
 
     let pathname = window.location.pathname;
     // get project name first
-    const projectName = $('body').data('project');
+    const { group, project } = $('body').data();
 
     const replacePath = pathname.replace(/\/-\/([^/]+)?/, '/$1');
 
     // dynamic regex
-    let match = replacePath.match(new RegExp(`((?:[^/]+\\/)+)${projectName}(?:\\/([^/]+))`));
+    let match = replacePath.match(new RegExp(`((?:[^/]+\\/)+)${group}/${project}(\\/([^/]+))?`));
 
     if (!match) {
       return cb();
     }
 
-    let reponame = projectName;
+    let reponame = project;
 
     const usernameArr = match[1].split('/').filter(Boolean);
-    let type = match[2] || '';
-
+    usernameArr.push(group);
     const username = usernameArr.join('/');
 
+    let type = match[2] || '';
+
     // Not a repository, skip
     if (~GL_RESERVED_USER_NAMES.indexOf(username) || ~GL_RESERVED_REPO_NAMES.indexOf(reponame) || ~GL_RESERVED_TYPES.indexOf(type)) {
       return cb();