Skip to content

The Unified and Autonomous Development Platform

refactor: Clean up unused imports and remove unnecessary blob identification logic in commit panels

Robin Shen0bd52f72e8da
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/info/CommitInfoPanel.html b/server-core/src/main/java/io/onedev/server/web/component/commit/info/CommitInfoPanel.html
index f2a8449502..740a584ec1 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/info/CommitInfoPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/info/CommitInfoPanel.html
@@ -16,7 +16,7 @@
<a wicket:id="buildStatus" class="build-status btn btn-outline-secondary"></a>
</span>
<span class="btn-group hash mr-2">
- <a wicket:id="hashLink" class="btn btn-outline-secondary hash" t:data-tippy-content="Commit detail"><span wicket:id="hash"></span></a>
+ <a wicket:id="hashLink" class="btn btn-outline-secondary hash"><span wicket:id="hash"></span></a>
<a wicket:id="copyHash" class="btn btn-icon btn-outline-secondary"><wicket:svg href="copy" class="icon"></wicket:svg></a>
</span>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/info/CommitInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/info/CommitInfoPanel.java
index 72202c554b..747fba769f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/info/CommitInfoPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/info/CommitInfoPanel.java
@@ -1,6 +1,5 @@
package io.onedev.server.web.component.commit.info;
-import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
@@ -12,7 +11,6 @@ import io.onedev.server.web.component.gitsignature.SignatureStatusPanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;
-import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.page.project.overview.ProjectOverviewPage;
@@ -25,9 +23,7 @@ import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevObject;
@@ -47,10 +43,6 @@ public abstract class CommitInfoPanel extends GenericPanel<ProjectScopedCommit>
add(new ContributorAvatars("avatar", revCommit.getAuthorIdent(), revCommit.getCommitterIdent()));
- BlobIdent blobIdent = new BlobIdent(commitHash, null, FileMode.TYPE_TREE);
- ProjectBlobPage.State browseState = new ProjectBlobPage.State(blobIdent);
- PageParameters browseParams = ProjectBlobPage.paramsOf(project, browseState);
-
add(new CommitMessagePanel("message", new LoadableDetachableModel<RevCommit>() {
@Override
@@ -65,11 +57,6 @@ public abstract class CommitInfoPanel extends GenericPanel<ProjectScopedCommit>
return getCommit().getProject();
}
- @Override
- protected String getCommitUrl() {
- return RequestCycle.get().urlFor(ProjectBlobPage.class, browseParams).toString();
- }
-
});
add(new ContributorPanel("contribution", revCommit.getAuthorIdent(),
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
index 1514f3eee5..9e2a0e4453 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
@@ -57,7 +57,7 @@
<div wicket:id="contribution"></div>
</div>
<div class="btn-group hash d-none d-xl-flex ml-auto actions">
- <a wicket:id="hashLink" class="btn btn-outline-secondary hash" t:data-tippy-content="Commit detail"><span wicket:id="hash"></span></a>
+ <a wicket:id="hashLink" class="btn btn-outline-secondary hash"><span wicket:id="hash"></span></a>
<a wicket:id="copyHash" class="btn btn-outline-secondary btn-icon"><wicket:svg href="copy" class="icon"></wicket:svg></a>
</div>
</wicket:fragment>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
index 48b38bf2e9..d848fa2014 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
@@ -41,7 +41,6 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -55,7 +54,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.command.RevListOptions;
import io.onedev.server.git.service.GitService;
@@ -87,7 +85,6 @@ import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;
import io.onedev.server.web.component.workspace.speclist.WorkspaceSpecListPanel;
-import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.compare.RevisionComparePage;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.util.QuerySaveSupport;
@@ -590,7 +587,7 @@ public abstract class CommitListPanel extends Panel {
/*
* If we query a single definitive path, let's record it to be used for
- * diff comparison and code browsing
+ * diff comparison
*/
String path = null;
@@ -607,15 +604,6 @@ public abstract class CommitListPanel extends Panel {
}
}
- BlobIdent blobIdent;
- if (path != null) {
- blobIdent = new BlobIdent(commit.name(), path, null);
- } else {
- blobIdent = new BlobIdent(commit.name(), null, FileMode.TREE.getBits());
- }
- ProjectBlobPage.State browseState = new ProjectBlobPage.State(blobIdent);
- PageParameters browseParams = ProjectBlobPage.paramsOf(getProject(), browseState);
-
item.add(new CommitMessagePanel("message", new LoadableDetachableModel<RevCommit>() {
@Override
@@ -649,11 +637,6 @@ public abstract class CommitListPanel extends Panel {
protected Project getProject() {
return CommitListPanel.this.getProject();
}
-
- @Override
- protected String getCommitUrl() {
- return RequestCycle.get().urlFor(ProjectBlobPage.class, browseParams).toString();
- }
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatePanel.java
index ec8cf90b43..99bb77dfd3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatePanel.java
@@ -13,15 +13,12 @@ import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevObject;
import com.google.common.collect.Sets;
-import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
@@ -35,7 +32,6 @@ import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.PersonIdentPanel;
-import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
class PullRequestUpdatePanel extends Panel {
@@ -82,9 +78,6 @@ class PullRequestUpdatePanel extends Panel {
item.add(new PersonIdentPanel("author", commit.getAuthorIdent(), "Author", Mode.AVATAR));
Project project = getUpdate().getRequest().getTarget().getProject();
- BlobIdent blobIdent = new BlobIdent(commit.name(), null, FileMode.TREE.getBits());
- ProjectBlobPage.State browseState = new ProjectBlobPage.State(blobIdent);
- PageParameters browseParams = ProjectBlobPage.paramsOf(project, browseState);
item.add(new CommitMessagePanel("message", item.getModel()) {
@@ -92,11 +85,6 @@ class PullRequestUpdatePanel extends Panel {
protected Project getProject() {
return getUpdate().getRequest().getTarget().getProject();
}
-
- @Override
- protected String getCommitUrl() {
- return RequestCycle.get().urlFor(ProjectBlobPage.class, browseParams).toString();
- }
});