The Unified and Autonomous Development Platform
feat: Issue/Build/Pull request statistics and reports (OD-1983)
Robin Shen433faf778fc1
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex e5e4a57f00..2399c63fdd 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -269,6 +269,7 @@ public class CoreModule extends AbstractPluginModule {bind(IssueScheduleManager.class).to(DefaultIssueScheduleManager.class);bind(LinkSpecManager.class).to(DefaultLinkSpecManager.class);bind(IssueLinkManager.class).to(DefaultIssueLinkManager.class);+ bind(IssueStateHistoryManager.class).to(DefaultIssueStateHistoryManager.class);bind(LinkAuthorizationManager.class).to(DefaultLinkAuthorizationManager.class);bind(EmailAddressManager.class).to(DefaultEmailAddressManager.class);bind(GpgKeyManager.class).to(DefaultGpgKeyManager.class);diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.javaindex 962dcf6603..802d834832 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.java@@ -1,22 +1,21 @@package io.onedev.server.buildspec.step;-import java.util.List;--import javax.validation.constraints.NotNull;-import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.k8shelper.CheckoutFacade;import io.onedev.k8shelper.StepFacade;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.Interpolative;+import io.onedev.server.annotation.SubPath;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.gitcredential.DefaultCredential;import io.onedev.server.buildspec.job.gitcredential.GitCredential;import io.onedev.server.buildspec.param.ParamCombination;import io.onedev.server.model.Build;-import io.onedev.server.annotation.SubPath;-import io.onedev.server.annotation.Editable;-import io.onedev.server.annotation.Interpolative;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;+import javax.validation.constraints.NotNull;+import java.util.List;+@Editable(order=50, name="Checkout Code")public class CheckoutStep extends Step {@@ -32,9 +31,9 @@ public class CheckoutStep extends Step {private String checkoutPath;- @Editable(order=100, description="By default code is cloned via an auto-generated credential, "- + "which only has read permission over current project. In case the job needs to <a href='https://docs.onedev.io/tutorials/cicd/commit-and-push' target='_blank'>push code to server</a>, or want "- + "to <a href='https://docs.onedev.io/tutorials/cicd/clone-submodules-ssh/' target='_blank'>clone private submodules</a>, you should supply custom credential with appropriate permissions here")+ @Editable(order=100, description="By default code is cloned via an auto-generated credential, " ++ "which only has read permission over current project. In case the job needs to <a href='https://docs.onedev.io/tutorials/cicd/commit-and-push' target='_blank'>push code to server</a>, " ++ "you should supply custom credential with appropriate permissions here")@NotNullpublic GitCredential getCloneCredential() {return cloneCredential;@@ -53,7 +52,9 @@ public class CheckoutStep extends Step {this.withLfs = withLfs;}- @Editable(order=180, name="Retrieve Submodules", description="Check this to retrieve submodules")+ @Editable(order=180, name="Retrieve Submodules", description="Whether or not to retrieve submodules. Refer to " ++ "<a href='https://docs.onedev.io/tutorials/cicd/clone-submodules' target='_blank'>this tutorial</a> on " ++ "how to set up clone credential above to retrieve submodules")public boolean isWithSubmodules() {return withSubmodules;}diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex d9f3c318d7..c372fe3f5d 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -10,9 +10,13 @@ import io.onedev.server.OneDev;import io.onedev.server.markdown.MarkdownManager;import io.onedev.server.markdown.MentionParser;import io.onedev.server.model.*;+import io.onedev.server.model.support.TimeGroups;import io.onedev.server.ssh.SshKeyUtils;import io.onedev.server.util.CryptoUtils;import io.onedev.server.util.Pair;+import io.onedev.server.util.date.Day;+import io.onedev.server.util.date.Month;+import io.onedev.server.util.date.Week;import io.onedev.server.util.patternset.PatternSet;import org.apache.commons.io.IOUtils;import org.apache.commons.lang3.tuple.Triple;@@ -37,11 +41,17 @@ import java.nio.file.Path;import java.security.GeneralSecurityException;import java.security.PublicKey;import java.text.MessageFormat;+import java.time.Instant;+import java.time.OffsetDateTime;+import java.time.ZoneId;+import java.time.ZonedDateTime;+import java.time.format.DateTimeFormatter;import java.util.*;import java.util.regex.Matcher;import java.util.regex.Pattern;import static java.nio.charset.StandardCharsets.UTF_8;+import static java.util.Comparator.comparing;import static java.util.Comparator.naturalOrder;@@ -51,6 +61,8 @@ public class DataMigrator {private static final Logger logger = LoggerFactory.getLogger(DataMigrator.class);+ private static final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSS'Z'");+private void migrate5(File dataDir, Stack<Integer> versions) {for (File file : dataDir.listFiles()) {if (file.getName().startsWith("Configs.xml")) {@@ -6064,7 +6076,7 @@ public class DataMigrator {if (file.getName().startsWith("Packs.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);for (Element element : dom.getRootElement().elements()) {- var prerelease = element.elementTextTrim("type").equals("NuGet")+ var prerelease = element.elementTextTrim("type").equals("NuGet")&& element.elementText("version").contains("-");element.addElement("prerelease").setText(String.valueOf(prerelease));}@@ -6085,9 +6097,9 @@ public class DataMigrator {} catch (IOException e) {throw new RuntimeException(e);}- }+ }}-+for (File file : dataDir.listFiles()) {if (file.getName().startsWith("Packs.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);@@ -6102,7 +6114,7 @@ public class DataMigrator {groupIdElement.detach();artifactIdElement.detach();} else {- element.addElement("name").setText(groupId + ":<$NONE$>");+ element.addElement("name").setText(groupId + ":<$NONE$>");element.addElement("version").setText("<$NONE$>");groupIdElement.detach();}@@ -6130,9 +6142,9 @@ public class DataMigrator {widgetElement.detach();if (widgetElement.getName().contains("CompositeWidget"))continue;-+var newWidgetElement = widgetsElement.addElement("io.onedev.server.model.support.widget.Widget");-+var leftElement = widgetElement.element("left");leftElement.detach();newWidgetElement.add(leftElement);@@ -6152,7 +6164,7 @@ public class DataMigrator {var autoHeightElement = widgetElement.element("autoHeight");autoHeightElement.detach();newWidgetElement.add(autoHeightElement);-+var tabsElement = newWidgetElement.addElement("tabs");widgetElement.addAttribute("class", widgetElement.getName());widgetElement.setName("tab");@@ -6168,7 +6180,7 @@ public class DataMigrator {for (File file : dataDir.listFiles()) {if (file.getName().startsWith("Roles.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);- for (Element element : dom.getRootElement().elements())+ for (Element element : dom.getRootElement().elements())element.addElement("uploadCache").setText("false");dom.writeToFile(file, false);}@@ -6187,13 +6199,13 @@ public class DataMigrator {if (valueElement != null) {for (Element executorElement : valueElement.elements()) {executorElement.element("cacheTTL").detach();- if (executorElement.getName().contains("KubernetesExecutor"))+ if (executorElement.getName().contains("KubernetesExecutor"))executorElement.addElement("buildWithPV").setText("false");}}} else if (key.equals("BRANDING")) {Element valueElement = element.element("value");- if (valueElement != null)+ if (valueElement != null)valueElement.addElement("url").setText("https://onedev.io");} else if (key.equals("SECURITY")) {Element valueElement = element.element("value");@@ -6225,10 +6237,10 @@ public class DataMigrator {} else if (key.equals("SSO_CONNECTORS")) {Element valueElement = element.element("value");if (valueElement != null) {- for (var connectorElement: valueElement.elements()) {+ for (var connectorElement : valueElement.elements()) {if (connectorElement.getName().contains("OpenIdConnector")) {var requestScopes = "openid email profile";- var groupsClaim = connectorElement.elementText("groupsClaim");+ var groupsClaim = connectorElement.elementText("groupsClaim");if (groupsClaim != null)requestScopes += " " + groupsClaim;connectorElement.addElement("requestScopes").setText(requestScopes);@@ -6251,7 +6263,7 @@ public class DataMigrator {if (key.equals("SSO_CONNECTORS")) {Element valueElement = element.element("value");if (valueElement != null) {- for (var connectorElement: valueElement.elements()) {+ for (var connectorElement : valueElement.elements()) {if (connectorElement.getName().contains("EntraIdConnector"))connectorElement.addElement("retrieveGroups").setText("false");}@@ -6268,7 +6280,7 @@ public class DataMigrator {if (file.getName().startsWith("Roles.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);for (Element element : dom.getRootElement().elements()) {- for (var jobPrivilegeElement: element.element("jobPrivileges").elements()) {+ for (var jobPrivilegeElement : element.element("jobPrivileges").elements()) {if (jobPrivilegeElement.elementTextTrim("accessLog").equals("true")) {jobPrivilegeElement.addElement("accessPipeline").setText("true");var accessibleReportsElement = jobPrivilegeElement.element("accessibleReports");@@ -6289,7 +6301,7 @@ public class DataMigrator {for (File file : dataDir.listFiles()) {if (file.getName().startsWith("ProblemMetrics.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);- for (Element element : dom.getRootElement().elements())+ for (Element element : dom.getRootElement().elements())element.addElement("criticalSeverities").setText("0");dom.writeToFile(file, false);}@@ -6306,7 +6318,7 @@ public class DataMigrator {Element valueElement = element.element("value");if (valueElement != null) {for (Element executorElement : valueElement.elements()) {- if (executorElement.getName().contains("ServerDockerExecutor")+ if (executorElement.getName().contains("ServerDockerExecutor")|| executorElement.getName().contains("RemoteDockerExecutor")) {executorElement.addElement("dockerBuilder").setText("onedev");}@@ -6346,7 +6358,7 @@ public class DataMigrator {for (File file : dataDir.listFiles()) {if (file.getName().contains(".xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);- for (var whitespaceOptionNode: dom.selectNodes(".//whitespaceOption")) {+ for (var whitespaceOptionNode : dom.selectNodes(".//whitespaceOption")) {Element whitespaceOptionElement = (Element) whitespaceOptionNode;if (whitespaceOptionElement.getText().equals("DEFAULT"))whitespaceOptionElement.setText("IGNORE_TRAILING");@@ -6371,7 +6383,7 @@ public class DataMigrator {dom.writeToFile(file, false);} else if (file.getName().startsWith("Dashboards.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);- for (var showJobNode: dom.selectNodes(".//showJob"))+ for (var showJobNode : dom.selectNodes(".//showJob"))showJobNode.detach();dom.writeToFile(file, false);}@@ -6391,7 +6403,7 @@ public class DataMigrator {var ownerId = element.elementTextTrim("id");var nameIndex = 1;var accessTokensElement = element.element("accessTokens");- for (var accessTokenElement: accessTokensElement.elements()) {+ for (var accessTokenElement : accessTokensElement.elements()) {var newAccessTokenElement = listElement.addElement("io.onedev.server.model.AccessToken");newAccessTokenElement.addAttribute("revision", "0.0");newAccessTokenElement.addElement("id").setText(String.valueOf(accessTokenId++));@@ -6417,8 +6429,8 @@ public class DataMigrator {if (file.getName().startsWith("Agents.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);for (Element element : dom.getRootElement().elements()) {- var cpusElement = element.element("cpus");- if (cpusElement != null)+ var cpusElement = element.element("cpus");+ if (cpusElement != null)cpusElement.setName("cpuCount");}dom.writeToFile(file, false);@@ -6432,12 +6444,12 @@ public class DataMigrator {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);for (Element element : dom.getRootElement().elements()) {var number = Long.parseLong(element.elementText("number"));- element.addElement("boardPosition").setText(String.valueOf(number*-1));+ element.addElement("boardPosition").setText(String.valueOf(number * -1));}dom.writeToFile(file, false);} else if (file.getName().startsWith("LinkSpecs.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);- for (Element element : dom.getRootElement().elements())+ for (Element element : dom.getRootElement().elements())element.addElement("showAlways").setText("false");dom.writeToFile(file, false);}@@ -6476,7 +6488,7 @@ public class DataMigrator {for (Element element : dom.getRootElement().elements()) {String key = element.elementTextTrim("key");if (key.equals("ISSUE")) {- for (var fieldSpecElement: element.element("value").element("fieldSpecs").elements()) {+ for (var fieldSpecElement : element.element("value").element("fieldSpecs").elements()) {if (fieldSpecElement.getName().contains("MilestoneChoiceField"))fieldSpecElement.setName("io.onedev.server.model.support.issue.field.spec.IterationChoiceField");}@@ -6485,7 +6497,7 @@ public class DataMigrator {dom.writeToFile(file, false);} else if (file.getName().startsWith("IssueSchedules.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);- for (Element element : dom.getRootElement().elements())+ for (Element element : dom.getRootElement().elements())element.element("milestone").setName("iteration");dom.writeToFile(file, false);} else if (file.getName().startsWith("Dashboards.xml")) {@@ -6505,7 +6517,7 @@ public class DataMigrator {}}for (Node node : dom.selectNodes("//io.onedev.server.ee.dashboard.widgets.BuildListWidget")) {- if (node instanceof Element)+ if (node instanceof Element)((Element) node).addElement("showDuration").setText("false");}dom.writeToFile(file, false);@@ -6544,7 +6556,7 @@ public class DataMigrator {for (File file : dataDir.listFiles()) {try {String content = FileUtils.readFileToString(file, UTF_8);- content = StringUtils.replace(content,+ content = StringUtils.replace(content,"\"Milestone\" is", "\"Iteration\" is");content = StringUtils.replace(content,"\"Milestone\" is", "\"Iteration\" is");@@ -6565,8 +6577,8 @@ public class DataMigrator {for (File file : dataDir.listFiles()) {try {var content = StringUtils.replace(- FileUtils.readFileToString(file, UTF_8),- "on branch(\"**\")",+ FileUtils.readFileToString(file, UTF_8),+ "on branch(\"**\")","on branch \"**\"");FileUtils.writeStringToFile(file, content, UTF_8);} catch (IOException e) {@@ -6616,7 +6628,7 @@ public class DataMigrator {}var listFieldsElement = issueSettingElement.element("listFields");if (listFieldsElement != null) {- for (var listFieldElement : listFieldsElement.elements()){+ for (var listFieldElement : listFieldsElement.elements()) {if (listFieldElement.getTextTrim().equals("Milestone"))listFieldElement.setText("Iteration");}@@ -6628,13 +6640,13 @@ public class DataMigrator {for (Element element : dom.getRootElement().elements()) {String key = element.elementTextTrim("key");if (key.equals("ISSUE")) {- for (var boardSpecElement: element.element("value").element("boardSpecs").elements()) {- for (var displayFieldElement: boardSpecElement.element("displayFields").elements()) {+ for (var boardSpecElement : element.element("value").element("boardSpecs").elements()) {+ for (var displayFieldElement : boardSpecElement.element("displayFields").elements()) {if (displayFieldElement.getTextTrim().equals("Milestone"))displayFieldElement.setText("Iteration");}}- for (var listFieldElement: element.element("value").element("listFields").elements()) {+ for (var listFieldElement : element.element("value").element("listFields").elements()) {if (listFieldElement.getTextTrim().equals("Milestone"))listFieldElement.setText("Iteration");}@@ -6644,6 +6656,166 @@ public class DataMigrator {}}}++ private void migrate171(File dataDir, Stack<Integer> versions) {+ for (File file : dataDir.listFiles()) {+ try {+ var content = StringUtils.replace(+ FileUtils.readFileToString(file, UTF_8),+ "io.onedev.server.ee.dashboard.widgets.BuildListWidget",+ "io.onedev.server.ee.dashboard.widgets.build.BuildListWidget");+ content = StringUtils.replace(+ content,+ "io.onedev.server.ee.dashboard.widgets.BurnDownChartWidget",+ "io.onedev.server.ee.dashboard.widgets.iteration.BurnDownChartWidget");+ content = StringUtils.replace(+ content,+ "io.onedev.server.ee.dashboard.widgets.IssueListWidget",+ "io.onedev.server.ee.dashboard.widgets.issue.IssueListWidget");+ content = StringUtils.replace(+ content,+ "io.onedev.server.ee.dashboard.widgets.IterationListWidget",+ "io.onedev.server.ee.dashboard.widgets.iteration.IterationListWidget");+ content = StringUtils.replace(+ content,+ "io.onedev.server.ee.dashboard.widgets.MarkdownBlobWidget",+ "io.onedev.server.ee.dashboard.widgets.markdown.MarkdownBlobWidget");+ content = StringUtils.replace(+ content,+ "io.onedev.server.ee.dashboard.widgets.MarkdownWidget",+ "io.onedev.server.ee.dashboard.widgets.markdown.MarkdownWidget");+ content = StringUtils.replace(+ content,+ "io.onedev.server.ee.dashboard.widgets.ProjectListWidget",+ "io.onedev.server.ee.dashboard.widgets.project.ProjectListWidget");+ content = StringUtils.replace(+ content,+ "io.onedev.server.ee.dashboard.widgets.PullRequestListWidget",+ "io.onedev.server.ee.dashboard.widgets.pullrequest.PullRequestListWidget");+ content = StringUtils.replace(+ content,+ "io.onedev.server.ee.dashboard.widgets.projectoverview.ProjectOverviewWidget",+ "io.onedev.server.ee.dashboard.widgets.project.ProjectOverviewWidget");+ FileUtils.writeStringToFile(file, content, UTF_8);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ Map<Long, List<IssueStateHistory>> histories = new HashMap<>();+ var id = 1L;+ for (File file : dataDir.listFiles()) {+ if (file.getName().startsWith("IssueChanges.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements()) {+ Element dataElement = element.element("data");+ var className = dataElement.attributeValue("class");+ if (className.contains("IssueStateChangeData")+ || className.contains("IssueBatchUpdateData")) {+ var oldState = dataElement.elementText("oldState").trim();+ var newState = dataElement.elementText("newState").trim();+ if (!oldState.equals(newState)) {+ var history = new IssueStateHistory();+ history.setId(Long.parseLong(element.elementText("id")));+ history.setState(newState);+ history.setDate(parseDate(element.elementText("date")));+ history.setTimeGroups(TimeGroups.of(history.getDate()));+ history.setIssue(new Issue());+ history.getIssue().setId(Long.parseLong(element.elementText("issue").trim()));+ histories.computeIfAbsent(history.getIssue().getId(), it->new ArrayList<>()).add(history);+ }+ }+ }+ } else if (file.getName().startsWith("Builds.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements()) {+ var pendingDateElement = element.element("pendingDate");+ var runningDateElement = element.element("runningDate");+ var finishDateElement = element.element("finishDate");+ if (finishDateElement != null) {+ var finishDate = parseDate(finishDateElement.getText().trim());+ var finishTimeGroupsElement = element.addElement("finishTimeGroups");+ finishTimeGroupsElement.addElement("day").setText(String.valueOf(new Day(finishDate).getValue()));+ finishTimeGroupsElement.addElement("week").setText(String.valueOf(new Week(finishDate).getValue()));+ finishTimeGroupsElement.addElement("month").setText(String.valueOf(new Month(finishDate).getValue()));+ if (runningDateElement != null)+ element.addElement("runningDuration").setText(String.valueOf(finishDate.getTime() - parseDate(runningDateElement.getText().trim()).getTime()));+ }+ if (pendingDateElement != null && runningDateElement != null)+ element.addElement("pendingDuration").setText(String.valueOf(parseDate(runningDateElement.getText().trim()).getTime() - parseDate(pendingDateElement.getText().trim()).getTime()));+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("PullRequests.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements()) {+ var submitDate = parseDate(element.elementText("submitDate").trim());+ var submitTimeGroupsElement = element.addElement("submitTimeGroups");+ submitTimeGroupsElement.addElement("day").setText(String.valueOf(new Day(submitDate).getValue()));+ submitTimeGroupsElement.addElement("week").setText(String.valueOf(new Week(submitDate).getValue()));+ submitTimeGroupsElement.addElement("month").setText(String.valueOf(new Month(submitDate).getValue()));++ if (!element.element("status").equals("OPEN")) {+ var closeDate = parseDate(element.element("lastActivity").elementText("date").trim());+ element.addElement("closeDate").addAttribute("class", "sql-timestamp").setText(formatDate(closeDate));+ element.addElement("duration").setText(String.valueOf(closeDate.getTime() - submitDate.getTime()));+ var closeTimeGroupsElement = element.addElement("closeTimeGroups");+ closeTimeGroupsElement.addElement("day").setText(String.valueOf(new Day(closeDate).getValue()));+ closeTimeGroupsElement.addElement("week").setText(String.valueOf(new Week(closeDate).getValue()));+ closeTimeGroupsElement.addElement("month").setText(String.valueOf(new Month(closeDate).getValue()));+ }+ }+ dom.writeToFile(file, false);+ }+ }++ VersionedXmlDoc historiesDom;+ File historiesDomFile = new File(dataDir, "IssueStateHistorys.xml");+ historiesDom = new VersionedXmlDoc();+ Element listElement = historiesDom.addElement("list");++ for (var value: histories.values()) {+ value.sort(comparing(IssueStateHistory::getDate));+ for(int i=0; i<value.size()-1; i++) {+ var history = value.get(i);+ var nextHistory = value.get(i+1);+ history.setDuration(nextHistory.getDate().getTime() - history.getDate().getTime());+ migrate171_createHistoryElement(listElement, history);+ }+ if (!value.isEmpty())+ migrate171_createHistoryElement(listElement, value.get(value.size()-1));+ }+ historiesDom.writeToFile(historiesDomFile, true);+ }++ private static Date parseDate(String dateString) {+ if (dateString.endsWith("Z")) {+ Instant instant = Instant.parse(dateString);+ return Date.from(instant);+ } else {+ OffsetDateTime offsetDateTime = OffsetDateTime.parse(dateString);+ return Date.from(offsetDateTime.toInstant());+ }+ }++ private static String formatDate(Date date) {+ ZonedDateTime zdt = ZonedDateTime.ofInstant(date.toInstant(), ZoneId.of("UTC"));+ return zdt.format(dateTimeFormatter);+ }++ private Element migrate171_createHistoryElement(Element parentElement, IssueStateHistory history) {+ var historyElement = parentElement.addElement("io.onedev.server.model.IssueStateHistory");+ historyElement.addAttribute("revision", "0.0");+ historyElement.addElement("id").setText(history.getId().toString());+ historyElement.addElement("issue").setText(history.getIssue().getId().toString());+ historyElement.addElement("state").setText(history.getState());+ historyElement.addElement("date").addAttribute("class", "sql-timestamp").setText(formatDate(history.getDate()));+ var timeGroupsElement = historyElement.addElement("timeGroups");+ timeGroupsElement.addElement("day").setText(String.valueOf(new Day(history.getDate()).getValue()));+ timeGroupsElement.addElement("week").setText(String.valueOf(new Week(history.getDate()).getValue()));+ timeGroupsElement.addElement("month").setText(String.valueOf(new Month(history.getDate()).getValue()));+ if (history.getDuration() != null)+ historyElement.addElement("duration").setText(history.getDuration().toString());+ return historyElement;+ }-}-\ No newline at end of file+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.javaindex c71de09a7a..8edb8695f0 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java@@ -3,10 +3,12 @@ package io.onedev.server.entitymanager;import io.onedev.server.model.*;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.ProjectBuildStats;+import io.onedev.server.util.ProjectBuildStatusStat;import io.onedev.server.util.StatusInfo;import io.onedev.server.util.artifact.ArtifactInfo;import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.web.util.StatsGroup;+import org.apache.commons.lang3.tuple.Pair;import org.eclipse.jgit.lib.ObjectId;import javax.annotation.Nullable;@@ -69,6 +71,16 @@ public interface BuildManager extends EntityManager<Build> {List<String> queryVersions(Project project, String matchWith, int count);+ Map<Integer, Pair<Integer, Integer>> queryDurationStats(Project project,+ @Nullable+ Criteria<Build> criteria,+ StatsGroup group);++ Map<Integer, Integer> queryFrequencyStats(Project project,+ @Nullable+ Criteria<Build> criteria,+ StatsGroup group);+Collection<String> getAccessibleJobNames(Project project);Map<Project, Collection<String>> getAccessibleJobNames();@@ -79,7 +91,7 @@ public interface BuildManager extends EntityManager<Build> {Collection<Build> query(Agent agent, @Nullable Build.Status status);- List<ProjectBuildStats> queryStats(Collection<Project> projects);+ List<ProjectBuildStatusStat> queryStatusStats(Collection<Project> projects);@NullableArtifactInfo getArtifactInfo(Build build, @Nullable String artifactPath);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.javaindex 011eeeb049..cab58ebe86 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java@@ -8,7 +8,7 @@ import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.util.IssueTimes;import io.onedev.server.util.IterationAndIssueState;-import io.onedev.server.util.ProjectIssueStats;+import io.onedev.server.util.ProjectIssueStateStat;import io.onedev.server.util.ProjectScope;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;@@ -83,7 +83,7 @@ public interface IssueManager extends EntityManager<Issue> {Collection<IterationAndIssueState> queryIterationAndIssueStates(Project project, Collection<Iteration> iterations);- List<ProjectIssueStats> queryStats(Collection<Project> projects);+ List<ProjectIssueStateStat> queryStateStats(Collection<Project> projects);Collection<Iteration> queryUsedIterations(Project project);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueStateHistoryManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueStateHistoryManager.javanew file mode 100644index 0000000000..943eef7013--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueStateHistoryManager.java@@ -0,0 +1,21 @@+package io.onedev.server.entitymanager;++import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueStateHistory;+import io.onedev.server.persistence.dao.EntityManager;+import io.onedev.server.util.ProjectScope;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.web.util.StatsGroup;+import org.jetbrains.annotations.Nullable;++import java.util.Map;++public interface IssueStateHistoryManager extends EntityManager<IssueStateHistory> {++ Map<Integer, Map<String, Integer>> queryDurationStats(+ ProjectScope projectScope, @Nullable Criteria<Issue> criteria, StatsGroup group);++ Map<Integer, Map<String, Integer>> queryFrequencyStats(+ ProjectScope projectScope, @Nullable Criteria<Issue> criteria, StatsGroup group);++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PackManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PackManager.javaindex 8abc44a48e..e966b81ca5 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/PackManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PackManager.java@@ -5,7 +5,7 @@ import io.onedev.server.model.PackBlob;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.ProjectPackStats;+import io.onedev.server.util.ProjectPackTypeStat;import io.onedev.server.util.criteria.Criteria;import javax.annotation.Nullable;@@ -28,7 +28,7 @@ public interface PackManager extends EntityManager<Pack> {List<String> queryProps(Project project, String propName, String matchWith, int count);- List<ProjectPackStats> queryStats(Collection<Project> projects);+ List<ProjectPackTypeStat> queryTypeStats(Collection<Project> projects);@NullablePack findByNameAndVersion(Project project, String type, String name, String version);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.javaindex 35281701d5..09a65b9486 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java@@ -5,8 +5,10 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.ProjectAndBranch;-import io.onedev.server.util.ProjectPullRequestStats;+import io.onedev.server.util.ProjectPullRequestStatusStat;import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.web.util.StatsGroup;+import org.apache.commons.lang3.tuple.Pair;import org.eclipse.jgit.lib.ObjectId;import javax.annotation.Nullable;@@ -62,7 +64,16 @@ public interface PullRequestManager extends EntityManager<PullRequest> {void delete(Collection<PullRequest> requests, Project project);- List<ProjectPullRequestStats> queryStats(Collection<Project> projects);+ List<ProjectPullRequestStatusStat> queryStatusStats(Collection<Project> projects);++ Map<Integer, Integer> queryDurationStats(Project project,+ @Nullable+ Criteria<PullRequest> criteria,+ StatsGroup group);+ Map<Integer, Pair<Integer, Integer>> queryOpenAndMergeFrequencyStats(Project project,+ @Nullable+ Criteria<PullRequest> criteria,+ StatsGroup group);ObjectId getComparisonBase(PullRequest request, ObjectId oldCommitId, ObjectId newCommitId);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex 694dded651..27ae82549e 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -34,13 +34,16 @@ import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.taskschedule.SchedulableTask;import io.onedev.server.taskschedule.TaskScheduler;-import io.onedev.server.util.ProjectBuildStats;+import io.onedev.server.util.ProjectBuildStatusStat;import io.onedev.server.util.StatusInfo;import io.onedev.server.util.artifact.ArtifactInfo;import io.onedev.server.util.artifact.DirectoryInfo;import io.onedev.server.util.artifact.FileInfo;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.facade.BuildFacade;+import io.onedev.server.web.util.StatsGroup;+import org.apache.commons.lang3.tuple.ImmutablePair;+import org.apache.commons.lang3.tuple.Pair;import org.eclipse.jgit.lib.ObjectId;import org.hibernate.Session;import org.hibernate.criterion.Criterion;@@ -66,9 +69,11 @@ import java.util.*;import java.util.concurrent.atomic.AtomicInteger;import java.util.stream.Collectors;+import static com.google.common.collect.Lists.newArrayList;import static edu.emory.mathcs.backport.java.util.Collections.sort;import static io.onedev.commons.utils.LockUtils.write;import static io.onedev.server.model.Build.*;+import static io.onedev.server.model.Build.Status.SUCCESSFUL;import static io.onedev.server.model.Project.BUILDS_DIR;import static io.onedev.server.model.Project.SHARE_TEST_DIR;import static io.onedev.server.util.DirectoryVersionUtils.isVersionFile;@@ -417,6 +422,59 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Buireturn query.getResultList();}++ @Sessional+ @Override+ public Map<Integer, Pair<Integer, Integer>> queryDurationStats(Project project,+ Criteria<Build> criteria,+ StatsGroup group) {+ CriteriaBuilder builder = dao.getSession().getCriteriaBuilder();+ CriteriaQuery<Object[]> criteriaQuery = builder.createQuery(Object[].class);+ Root<Build> root = criteriaQuery.from(Build.class);++ var predicates = new ArrayList<Predicate>();+ predicates.addAll(Arrays.asList(getPredicates(project, criteria, criteriaQuery, root, builder)));+ predicates.add(builder.equal(root.get(PROP_STATUS), SUCCESSFUL));+ predicates.add(builder.isNotNull(root.get(PROP_PENDING_DURATION)));+ predicates.add(builder.isNotNull(root.get(PROP_RUNNING_DURATION)));+ criteriaQuery.where(predicates.toArray(new Predicate[0]));+ var groupPath = group.getPath(root.get(PROP_FINISH_TIME_GROUPS));+ criteriaQuery.groupBy(groupPath);++ criteriaQuery.multiselect(newArrayList(+ groupPath,+ builder.avg(root.get(PROP_PENDING_DURATION)),+ builder.avg(root.get(PROP_RUNNING_DURATION))));++ Map<Integer, Pair<Integer, Integer>> stats = new HashMap<>();+ for (var result: getSession().createQuery(criteriaQuery).getResultList()) {+ var pendingDuration = ((Double)result[1])/60000;+ var runningDuration = ((Double)result[2])/60000;+ stats.put((int)result[0], new ImmutablePair<>((int)pendingDuration, (int)runningDuration));+ }+ return stats;+ }++ @Sessional+ @Override+ public Map<Integer, Integer> queryFrequencyStats(Project project,+ Criteria<Build> criteria,+ StatsGroup group) {+ CriteriaBuilder builder = dao.getSession().getCriteriaBuilder();+ CriteriaQuery<Object[]> criteriaQuery = builder.createQuery(Object[].class);+ Root<Build> root = criteriaQuery.from(Build.class);++ criteriaQuery.where(getPredicates(project, criteria, criteriaQuery, root, builder));+ var groupPath = group.getPath(root.get(PROP_FINISH_TIME_GROUPS));+ criteriaQuery.groupBy(groupPath);++ criteriaQuery.multiselect(newArrayList(groupPath, builder.count(root)));++ Map<Integer, Integer> stats = new HashMap<>();+ for (var result: getSession().createQuery(criteriaQuery).getResultList())+ stats.put((int)result[0], ((Long)result[1]).intValue());+ return stats;+ }@Transactional@Override@@ -883,12 +941,12 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui@Sessional@Override- public List<ProjectBuildStats> queryStats(Collection<Project> projects) {+ public List<ProjectBuildStatusStat> queryStatusStats(Collection<Project> projects) {if (projects.isEmpty()) {return new ArrayList<>();} else {CriteriaBuilder builder = getSession().getCriteriaBuilder();- CriteriaQuery<ProjectBuildStats> criteriaQuery = builder.createQuery(ProjectBuildStats.class);+ CriteriaQuery<ProjectBuildStatusStat> criteriaQuery = builder.createQuery(ProjectBuildStatusStat.class);Root<Build> root = criteriaQuery.from(Build.class);criteriaQuery.multiselect(root.get(Build.PROP_PROJECT).get(Project.PROP_ID),diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildMetricManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildMetricManager.javaindex bbfc3571f8..15d7d84c30 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildMetricManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildMetricManager.java@@ -39,10 +39,10 @@ import java.util.*;import java.util.stream.Collectors;import static io.onedev.commons.utils.ExceptionUtils.unchecked;-import static io.onedev.server.model.Build.PROP_JOB_NAME;-import static io.onedev.server.model.Build.PROP_PROJECT;+import static io.onedev.server.model.Build.*;import static io.onedev.server.model.support.BuildMetric.PROP_BUILD;import static io.onedev.server.model.support.BuildMetric.PROP_REPORT;+import static io.onedev.server.model.support.TimeGroups.PROP_DAY;@Singletonpublic class DefaultBuildMetricManager implements BuildMetricManager {@@ -120,7 +120,7 @@ public class DefaultBuildMetricManager implements BuildMetricManager {predicates.add(query.getCriteria().getPredicate(metricRoot, buildJoin, builder));criteriaQuery.where(predicates.toArray(new Predicate[0]));- criteriaQuery.groupBy(buildJoin.get(Build.PROP_FINISH_DAY));+ criteriaQuery.groupBy(buildJoin.get(PROP_FINISH_TIME_GROUPS).get(PROP_DAY));List<Method> setters = new ArrayList<>();List<Selection<?>> selections = new ArrayList<>();@@ -131,7 +131,7 @@ public class DefaultBuildMetricManager implements BuildMetricManager {}}- selections.add(buildJoin.get(Build.PROP_FINISH_DAY));+ selections.add(buildJoin.get(PROP_FINISH_TIME_GROUPS).get(PROP_DAY));criteriaQuery.multiselect(selections);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex 76a47ea85a..07aa05d8a9 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -40,7 +40,7 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessProject;import io.onedev.server.util.IssueTimes;import io.onedev.server.util.IterationAndIssueState;-import io.onedev.server.util.ProjectIssueStats;+import io.onedev.server.util.ProjectIssueStateStat;import io.onedev.server.util.ProjectScope;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;@@ -186,7 +186,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Ississue.setLastActivity(lastActivity);dao.persist(issue);-+fieldManager.saveFields(issue);for (IssueSchedule schedule: issue.getSchedules())dao.persist(schedule);@@ -424,12 +424,17 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements IssCollection<String> undefinedStates = getIssueSetting().getUndefinedStates();Query<String> query = getSession().createQuery("select distinct state from Issue");-for (String state: query.getResultList()) {if (getIssueSetting().getStateSpec(state) == null)undefinedStates.add(state);}+ query = getSession().createQuery("select distinct state from IssueStateHistory");+ for (String state: query.getResultList()) {+ if (getIssueSetting().getStateSpec(state) == null)+ undefinedStates.add(state);+ }+for (Project project: projectManager.query()) {undefinedStates.addAll(project.getIssueSetting().getUndefinedStates());undefinedStates.addAll(project.getBuildSetting().getUndefinedStates());@@ -565,6 +570,11 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Issquery.setParameter("newState", entry.getValue().getNewState());query.setParameter("newStateOrdinal", getIssueSetting().getStateOrdinal(entry.getValue().getNewState()));query.executeUpdate();++ query = getSession().createQuery("update IssueStateHistory set state=:newState where state=:oldState");+ query.setParameter("oldState", entry.getKey());+ query.setParameter("newState", entry.getValue().getNewState());+ query.executeUpdate();} else {Query<?> query = getSession().createQuery("delete from IssueField where issue in (select issue from Issue issue where issue.state=:state)");query.setParameter("state", entry.getKey());@@ -589,10 +599,18 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Issquery = getSession().createQuery("delete from IssueAuthorization where issue in (select issue from Issue issue where issue.state=:state)");query.setParameter("state", entry.getKey());query.executeUpdate();++ query = getSession().createQuery("delete from IssueStateHistory where issue in (select issue from Issue issue where issue.state=:state)");+ query.setParameter("state", entry.getKey());+ query.executeUpdate();query = getSession().createQuery("delete from Issue where state=:state");query.setParameter("state", entry.getKey());query.executeUpdate();++ query = getSession().createQuery("delete from IssueStateHistory where state=:state");+ query.setParameter("state", entry.getKey());+ query.executeUpdate();}}@@ -1118,12 +1136,12 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss@Sessional@Override- public List<ProjectIssueStats> queryStats(Collection<Project> projects) {+ public List<ProjectIssueStateStat> queryStateStats(Collection<Project> projects) {if (projects.isEmpty()) {return new ArrayList<>();} else {CriteriaBuilder builder = getSession().getCriteriaBuilder();- CriteriaQuery<ProjectIssueStats> criteriaQuery = builder.createQuery(ProjectIssueStats.class);+ CriteriaQuery<ProjectIssueStateStat> criteriaQuery = builder.createQuery(ProjectIssueStateStat.class);Root<Issue> root = criteriaQuery.from(Issue.class);criteriaQuery.multiselect(diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueStateHistoryManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueStateHistoryManager.javanew file mode 100644index 0000000000..cc4c06cbdd--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueStateHistoryManager.java@@ -0,0 +1,150 @@+package io.onedev.server.entitymanager.impl;++import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.IssueStateHistoryManager;+import io.onedev.server.event.Listen;+import io.onedev.server.event.entity.EntityPersisted;+import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueChange;+import io.onedev.server.model.IssueStateHistory;+import io.onedev.server.model.support.TimeGroups;+import io.onedev.server.model.support.issue.changedata.IssueBatchUpdateData;+import io.onedev.server.model.support.issue.changedata.IssueStateChangeData;+import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.persistence.dao.BaseEntityManager;+import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.util.ProjectScope;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.web.util.StatsGroup;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Restrictions;+import org.jetbrains.annotations.Nullable;++import javax.inject.Inject;+import javax.inject.Singleton;+import javax.persistence.criteria.*;+import java.util.ArrayList;+import java.util.Date;+import java.util.HashMap;+import java.util.Map;++import static com.google.common.collect.Lists.newArrayList;+import static io.onedev.server.model.AbstractEntity.PROP_ID;+import static io.onedev.server.model.IssueStateHistory.*;+import static java.util.Arrays.asList;++@Singleton+public class DefaultIssueStateHistoryManager extends BaseEntityManager<IssueStateHistory> implements IssueStateHistoryManager {++ private final IssueManager issueManager;++ @Inject+ public DefaultIssueStateHistoryManager(Dao dao, IssueManager issueManager) {+ super(dao);+ this.issueManager = issueManager;+ }++ @Transactional+ @Listen+ public void on(EntityPersisted event) {+ if (event.getEntity() instanceof Issue && event.isNewEntity()) {+ var issue = (Issue) event.getEntity();+ dao.persist(create(issue, issue.getState()));+ } else if (event.getEntity() instanceof IssueChange) {+ var change = (IssueChange) event.getEntity();+ if (change.getData() instanceof IssueStateChangeData) {+ var changeData = (IssueStateChangeData) change.getData();+ if (!changeData.getOldState().equals(changeData.getNewState())) {+ var history = create(change.getIssue(), changeData.getNewState());+ updateLast(change.getIssue(), history.getDate());+ dao.persist(history);+ }+ } else if (change.getData() instanceof IssueBatchUpdateData) {+ var changeData = (IssueBatchUpdateData) change.getData();+ if (!changeData.getOldState().equals(changeData.getNewState())) {+ var history = create(change.getIssue(), changeData.getNewState());+ updateLast(change.getIssue(), history.getDate());+ dao.persist(history);+ }+ }+ }+ }++ private IssueStateHistory create(Issue issue, String state) {+ var history = new IssueStateHistory();+ history.setIssue(issue);+ history.setDate(new Date());+ history.setTimeGroups(TimeGroups.of(history.getDate()));+ history.setState(state);+ return history;+ }++ private void updateLast(Issue issue, Date date) {+ var criteria = newCriteria();+ criteria.add(Restrictions.eq(PROP_ISSUE, issue));+ criteria.addOrder(Order.desc(PROP_ID));+ var lastHistory = find(criteria);+ if (lastHistory != null)+ lastHistory.setDuration(date.getTime() - lastHistory.getDate().getTime());+ }++ @Sessional+ @Override+ public Map<Integer, Map<String, Integer>> queryDurationStats(ProjectScope projectScope,+ @Nullable Criteria<Issue> criteria, StatsGroup group) {+ CriteriaBuilder builder = dao.getSession().getCriteriaBuilder();+ CriteriaQuery<Object[]> criteriaQuery = builder.createQuery(Object[].class);+ Root<IssueStateHistory> root = criteriaQuery.from(IssueStateHistory.class);+ Join<Issue, Issue> issue = root.join(PROP_ISSUE, JoinType.INNER);++ var predicates = new ArrayList<Predicate>();+ predicates.addAll(asList(issueManager.buildPredicates(projectScope, criteria, criteriaQuery, builder, issue)));+ predicates.add(builder.isNotNull(root.get(PROP_DURATION)));+ criteriaQuery.where(predicates.toArray(new Predicate[0]));++ var timePath = group.getPath(root.get(PROP_TIME_GROUPS));+ var statePath = root.get(PROP_STATE);+ criteriaQuery.groupBy(timePath, statePath);++ criteriaQuery.multiselect(newArrayList(+ timePath, statePath, builder.avg(root.get(PROP_DURATION))));++ Map<Integer, Map<String, Integer>> stats = new HashMap<>();+ for (var result: getSession().createQuery(criteriaQuery).getResultList()) {+ int time = (int)result[0];+ String state = (String)result[1];+ var duration = ((Double)result[2])/60000;+ stats.computeIfAbsent(time, it -> new HashMap<>()).put(state, (int)duration);+ }+ return stats;+ }++ @Sessional+ @Override+ public Map<Integer, Map<String, Integer>> queryFrequencyStats(ProjectScope projectScope,+ @Nullable Criteria<Issue> criteria, StatsGroup group) {+ CriteriaBuilder builder = dao.getSession().getCriteriaBuilder();+ CriteriaQuery<Object[]> criteriaQuery = builder.createQuery(Object[].class);+ Root<IssueStateHistory> root = criteriaQuery.from(IssueStateHistory.class);+ Join<Issue, Issue> issue = root.join(PROP_ISSUE, JoinType.INNER);++ criteriaQuery.where(issueManager.buildPredicates(projectScope, criteria, criteriaQuery, builder, issue));++ var timePath = group.getPath(root.get(PROP_TIME_GROUPS));+ var statePath = root.get(PROP_STATE);+ criteriaQuery.groupBy(timePath, statePath);++ criteriaQuery.multiselect(newArrayList(timePath, statePath, builder.count(root)));++ Map<Integer, Map<String, Integer>> stats = new HashMap<>();+ for (var result: getSession().createQuery(criteriaQuery).getResultList()) {+ int time = (int)result[0];+ String state = (String)result[1];+ var duration = ((Long)result[2]).intValue();+ stats.computeIfAbsent(time, it -> new HashMap<>()).put(state, duration);+ }+ return stats;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackManager.javaindex 1d47679bb7..897ce8f736 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackManager.java@@ -16,7 +16,7 @@ import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.pack.PackQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.ReadPack;-import io.onedev.server.util.ProjectPackStats;+import io.onedev.server.util.ProjectPackTypeStat;import io.onedev.server.util.criteria.Criteria;import org.hibernate.Session;import org.hibernate.criterion.Restrictions;@@ -185,12 +185,12 @@ public class DefaultPackManager extends BaseEntityManager<Pack>@Sessional@Override- public List<ProjectPackStats> queryStats(Collection<Project> projects) {+ public List<ProjectPackTypeStat> queryTypeStats(Collection<Project> projects) {if (projects.isEmpty()) {return new ArrayList<>();} else {CriteriaBuilder builder = getSession().getCriteriaBuilder();- CriteriaQuery<ProjectPackStats> criteriaQuery = builder.createQuery(ProjectPackStats.class);+ CriteriaQuery<ProjectPackTypeStat> criteriaQuery = builder.createQuery(ProjectPackTypeStat.class);Root<Pack> root = criteriaQuery.from(Pack.class);criteriaQuery.multiselect(root.get(Pack.PROP_PROJECT).get(Project.PROP_ID),diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 86d41234ff..8c02ca070a 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -20,7 +20,6 @@ import io.onedev.server.event.project.pullrequest.*;import io.onedev.server.git.GitUtils;import io.onedev.server.git.service.GitService;import io.onedev.server.model.*;-import io.onedev.server.model.PullRequest.Status;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.LastActivity;import io.onedev.server.model.support.code.BranchProtection;@@ -42,12 +41,15 @@ import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.ReadCode;import io.onedev.server.util.ProjectAndBranch;-import io.onedev.server.util.ProjectPullRequestStats;+import io.onedev.server.util.ProjectPullRequestStatusStat;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.facade.EmailAddressFacade;import io.onedev.server.util.reviewrequirement.ReviewRequirement;+import io.onedev.server.web.util.StatsGroup;import io.onedev.server.xodus.CommitInfoManager;import io.onedev.server.xodus.PullRequestInfoManager;+import org.apache.commons.lang3.tuple.ImmutablePair;+import org.apache.commons.lang3.tuple.Pair;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.PersonIdent;import org.hibernate.Session;@@ -70,8 +72,11 @@ import java.util.*;import java.util.stream.Collectors;import static com.google.common.base.Preconditions.checkNotNull;-import static io.onedev.server.model.PullRequest.getSerialLockName;+import static com.google.common.collect.Lists.newArrayList;+import static io.onedev.server.model.PullRequest.*;+import static io.onedev.server.model.PullRequest.Status.MERGED;import static io.onedev.server.model.support.pullrequest.MergeStrategy.*;+import static java.util.Arrays.asList;@Singletonpublic class DefaultPullRequestManager extends BaseEntityManager<PullRequest>@@ -238,6 +243,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>@Overridepublic void discard(PullRequest request, String note) {request.setStatus(Status.DISCARDED);+ request.setCloseDate(new Date());User user = SecurityUtils.getUser();@@ -341,7 +347,8 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>}private void closeAsMerged(PullRequest request, boolean dueToMerged) {- request.setStatus(Status.MERGED);+ request.setStatus(MERGED);+ request.setCloseDate(new Date());Date date = new DateTime().plusMillis(1).toDate();@@ -536,7 +543,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>public PullRequest findEffective(ProjectAndBranch target, ProjectAndBranch source) {EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);Criterion merged = Restrictions.and(- Restrictions.eq(PullRequest.PROP_STATUS, Status.MERGED),+ Restrictions.eq(PROP_STATUS, MERGED),Restrictions.eq(PullRequest.PROP_MERGE_PREVIEW + "." + MergePreview.PROP_HEAD_COMMIT_HASH, source.getObjectName()));criteria.add(ofTarget(target)).add(ofSource(source)).add(Restrictions.or(ofOpen(), merged));@@ -551,7 +558,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>Collection<Criterion> criterions = new ArrayList<>();for (ProjectAndBranch source: sources) {Criterion merged = Restrictions.and(- Restrictions.eq(PullRequest.PROP_STATUS, Status.MERGED),+ Restrictions.eq(PROP_STATUS, MERGED),Restrictions.eq(PullRequest.PROP_MERGE_PREVIEW + "." + MergePreview.PROP_HEAD_COMMIT_HASH, source.getObjectName()));criterions.add(Restrictions.and(ofTarget(target), ofSource(source), Restrictions.or(ofOpen(), merged)));}@@ -950,26 +957,99 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>@Sessional@Override- public List<ProjectPullRequestStats> queryStats(Collection<Project> projects) {+ public List<ProjectPullRequestStatusStat> queryStatusStats(Collection<Project> projects) {if (projects.isEmpty()) {return new ArrayList<>();} else {CriteriaBuilder builder = getSession().getCriteriaBuilder();- CriteriaQuery<ProjectPullRequestStats> criteriaQuery = builder.createQuery(ProjectPullRequestStats.class);+ CriteriaQuery<ProjectPullRequestStatusStat> criteriaQuery = builder.createQuery(ProjectPullRequestStatusStat.class);Root<PullRequest> root = criteriaQuery.from(PullRequest.class);criteriaQuery.multiselect(root.get(PullRequest.PROP_TARGET_PROJECT).get(Project.PROP_ID),- root.get(PullRequest.PROP_STATUS), builder.count(root));- criteriaQuery.groupBy(root.get(PullRequest.PROP_TARGET_PROJECT), root.get(PullRequest.PROP_STATUS));+ root.get(PROP_STATUS), builder.count(root));+ criteriaQuery.groupBy(root.get(PullRequest.PROP_TARGET_PROJECT), root.get(PROP_STATUS));criteriaQuery.where(root.get(PullRequest.PROP_TARGET_PROJECT).in(projects));- criteriaQuery.orderBy(builder.asc(root.get(PullRequest.PROP_STATUS)));+ criteriaQuery.orderBy(builder.asc(root.get(PROP_STATUS)));return getSession().createQuery(criteriaQuery).getResultList();}}+ @Sessional+ @Override+ public Map<Integer, Integer> queryDurationStats(Project project,+ Criteria<PullRequest> criteria,+ StatsGroup group) {+ CriteriaBuilder builder = dao.getSession().getCriteriaBuilder();+ CriteriaQuery<Object[]> criteriaQuery = builder.createQuery(Object[].class);+ Root<PullRequest> root = criteriaQuery.from(PullRequest.class);++ var predicates = new ArrayList<Predicate>();+ predicates.addAll(asList(getPredicates(project, criteria, criteriaQuery, root, builder)));+ predicates.add(builder.equal(root.get(PROP_STATUS), MERGED));+ predicates.add(builder.isNotNull(root.get(PROP_DURATION)));+ criteriaQuery.where(predicates.toArray(new Predicate[0]));+ var groupPath = group.getPath(root.get(PROP_CLOSE_TIME_GROUPS));+ criteriaQuery.groupBy(groupPath);++ criteriaQuery.multiselect(newArrayList(+ groupPath,+ builder.avg(root.get(PROP_DURATION))));++ Map<Integer, Integer> stats = new HashMap<>();+ for (var result: getSession().createQuery(criteriaQuery).getResultList()) {+ var duration = ((Double)result[1])/60000;+ stats.put((int)result[0], (int)duration);+ }+ return stats;+ }++ @Sessional+ @Override+ public Map<Integer, Pair<Integer, Integer>> queryOpenAndMergeFrequencyStats(Project project,+ Criteria<PullRequest> criteria,+ StatsGroup group) {+ CriteriaBuilder builder = dao.getSession().getCriteriaBuilder();+ CriteriaQuery<Object[]> criteriaQuery = builder.createQuery(Object[].class);+ Root<PullRequest> root = criteriaQuery.from(PullRequest.class);++ criteriaQuery.where(getPredicates(project, criteria, criteriaQuery, root, builder));+ var groupPath = group.getPath(root.get(PROP_SUBMIT_TIME_GROUPS));+ criteriaQuery.groupBy(groupPath);++ criteriaQuery.multiselect(newArrayList(groupPath, builder.count(root)));++ Map<Integer, Integer> openStats = new HashMap<>();+ for (var result: getSession().createQuery(criteriaQuery).getResultList())+ openStats.put((int)result[0], ((Long)result[1]).intValue());++ var predicates = new ArrayList<>(asList(getPredicates(project, criteria, criteriaQuery, root, builder)));+ predicates.add(builder.equal(root.get(PROP_STATUS), MERGED));+ criteriaQuery.where(predicates.toArray(new Predicate[0]));+ groupPath = group.getPath(root.get(PROP_CLOSE_TIME_GROUPS));+ criteriaQuery.groupBy(groupPath);++ criteriaQuery.multiselect(newArrayList(groupPath, builder.count(root)));++ Map<Integer, Integer> mergeStats = new HashMap<>();+ for (var result: getSession().createQuery(criteriaQuery).getResultList())+ mergeStats.put((int)result[0], ((Long)result[1]).intValue());++ Map<Integer, Pair<Integer, Integer>> stats = new HashMap<>();+ for (var entry: openStats.entrySet())+ stats.put(entry.getKey(), new ImmutablePair<>(entry.getValue(), 0));+ for (var entry: mergeStats.entrySet()) {+ var value = stats.get(entry.getKey());+ if (value != null)+ stats.put(entry.getKey(), new ImmutablePair<>(value.getLeft(), entry.getValue()));+ else+ stats.put(entry.getKey(), new ImmutablePair<>(0, entry.getValue()));+ }+ return stats;+ }+private Criterion ofOpen() {- return Restrictions.eq(PullRequest.PROP_STATUS, Status.OPEN);+ return Restrictions.eq(PROP_STATUS, Status.OPEN);}private Criterion ofTarget(ProjectAndBranch target) {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultStopwatchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultStopwatchManager.javaindex e925aa1231..8e0042d787 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultStopwatchManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultStopwatchManager.java@@ -20,7 +20,7 @@ import io.onedev.server.persistence.dao.BaseEntityManager;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.taskschedule.SchedulableTask;import io.onedev.server.taskschedule.TaskScheduler;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import org.hibernate.criterion.Restrictions;import org.quartz.CronScheduleBuilder;import org.quartz.ScheduleBuilder;diff --git a/server-core/src/main/java/io/onedev/server/git/GitContributor.java b/server-core/src/main/java/io/onedev/server/git/GitContributor.javaindex f25d67a9cb..4037327643 100644--- a/server-core/src/main/java/io/onedev/server/git/GitContributor.java+++ b/server-core/src/main/java/io/onedev/server/git/GitContributor.java@@ -5,7 +5,7 @@ import java.util.Map;import org.eclipse.jgit.lib.PersonIdent;-import io.onedev.server.util.Day;+import io.onedev.server.util.date.Day;public class GitContributor implements Serializable {diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 6cd6ef5b3c..01771e9638 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -26,9 +26,13 @@ import io.onedev.server.job.JobAuthorizationContext;import io.onedev.server.model.support.BuildMetric;import io.onedev.server.model.support.LabelSupport;import io.onedev.server.model.support.ProjectBelonging;+import io.onedev.server.model.support.TimeGroups;import io.onedev.server.model.support.build.JobSecret;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.*;+import io.onedev.server.util.CollectionUtils;+import io.onedev.server.util.ComponentContext;+import io.onedev.server.util.FilenameUtils;+import io.onedev.server.util.Input;import io.onedev.server.util.artifact.ArtifactInfo;import io.onedev.server.util.artifact.DirectoryInfo;import io.onedev.server.util.criteria.Criteria;@@ -55,16 +59,18 @@ import java.util.*;import static io.onedev.server.model.AbstractEntity.PROP_NUMBER;import static io.onedev.server.model.Build.*;import static io.onedev.server.model.Project.BUILDS_DIR;+import static io.onedev.server.model.support.TimeGroups.*;@Entity@Table(- indexes={@Index(columnList="o_project_id"), @Index(columnList="o_submitter_id"), @Index(columnList="o_canceller_id"),- @Index(columnList="o_request_id"),+ indexes={@Index(columnList="o_project_id"), @Index(columnList="o_submitter_id"),+ @Index(columnList="o_canceller_id"), @Index(columnList="o_request_id"),@Index(columnList= PROP_COMMIT_HASH),@Index(columnList=PROP_NUMBER), @Index(columnList= PROP_JOB_NAME),@Index(columnList=PROP_STATUS), @Index(columnList=PROP_REF_NAME),@Index(columnList=PROP_SUBMIT_DATE), @Index(columnList=PROP_PENDING_DATE),@Index(columnList=PROP_RUNNING_DATE), @Index(columnList=PROP_FINISH_DATE),+ @Index(columnList=PROP_FINISH_MONTH), @Index(columnList=PROP_FINISH_WEEK),@Index(columnList=PROP_FINISH_DAY), @Index(columnList=PROP_VERSION),@Index(columnList="o_numberScope_id"), @Index(columnList="o_project_id, " + PROP_COMMIT_HASH)},uniqueConstraints={@UniqueConstraint(columnNames={"o_numberScope_id", PROP_NUMBER})}@@ -125,8 +131,18 @@ public class Build extends ProjectBelongingpublic static final String PROP_FINISH_DATE = "finishDate";+ public static final String PROP_FINISH_TIME_GROUPS = "finishTimeGroups";++ public static final String PROP_FINISH_MONTH = "finishMonth";++ public static final String PROP_FINISH_WEEK = "finishWeek";+public static final String PROP_FINISH_DAY = "finishDay";+ public static final String PROP_PENDING_DURATION = "pendingDuration";++ public static final String PROP_RUNNING_DURATION = "runningDuration";+public static final String NAME_COMMIT = "Commit";public static final String NAME_BRANCH = "Branch";@@ -350,10 +366,18 @@ public class Build extends ProjectBelongingprivate Date finishDate;- private Date retryDate;+ private Long pendingDuration;- @JsonIgnore- private Integer finishDay;+ private Long runningDuration;++ private Date retryDate;++ @Embedded+ @AttributeOverrides({+ @AttributeOverride(name= PROP_MONTH, column=@Column(name=PROP_FINISH_MONTH)),+ @AttributeOverride(name= PROP_WEEK, column=@Column(name=PROP_FINISH_WEEK)),+ @AttributeOverride(name= PROP_DAY, column=@Column(name=PROP_FINISH_DAY))})+ private TimeGroups finishTimeGroups;@Column(nullable=false, length=1000)private String submitReason;@@ -592,46 +616,81 @@ public class Build extends ProjectBelongingthis.submitReason = submitReason;}+ @Nullablepublic Date getPendingDate() {return pendingDate;}- public void setPendingDate(Date pendingDate) {+ public void setPendingDate(@Nullable Date pendingDate) {this.pendingDate = pendingDate;}+ @Nullablepublic Date getRunningDate() {return runningDate;}- public void setRunningDate(Date runningDate) {+ public void setRunningDate(@Nullable Date runningDate) {this.runningDate = runningDate;+ if (runningDate != null && pendingDate != null)+ pendingDuration = runningDate.getTime() - pendingDate.getTime();+ else+ pendingDuration = null;}+ @Nullablepublic Date getFinishDate() {return finishDate;}- public void setFinishDate(Date finishDate) {+ public void setFinishDate(@Nullable Date finishDate) {this.finishDate = finishDate;if (finishDate != null) {- finishDay = new Day(finishDate).getValue();+ if (runningDate != null)+ runningDuration = finishDate.getTime() - runningDate.getTime();+ else+ runningDuration = null;+ finishTimeGroups = TimeGroups.of(finishDate);} else {- finishDay = null;+ runningDuration = null;+ finishTimeGroups = null;}}+ @Nullable+ public Long getPendingDuration() {+ return pendingDuration;+ }++ public void setPendingDuration(@Nullable Long pendingDuration) {+ this.pendingDuration = pendingDuration;+ }++ @Nullable+ public Long getRunningDuration() {+ return runningDuration;+ }++ public void setRunningDuration(@Nullable Long runningDuration) {+ this.runningDuration = runningDuration;+ }++ @Nullablepublic Date getRetryDate() {return retryDate;}- public void setRetryDate(Date retryDate) {+ public void setRetryDate(@Nullable Date retryDate) {this.retryDate = retryDate;}@Nullable- public Integer getFinishDay() {- return finishDay;+ public TimeGroups getFinishTimeGroups() {+ return finishTimeGroups;+ }++ public void setFinishTimeGroups(@Nullable TimeGroups finishTimeGroups) {+ this.finishTimeGroups = finishTimeGroups;}public Collection<BuildParam> getParams() {diff --git a/server-core/src/main/java/io/onedev/server/model/CodeComment.java b/server-core/src/main/java/io/onedev/server/model/CodeComment.javaindex 7340e0905e..86285f5792 100644--- a/server-core/src/main/java/io/onedev/server/model/CodeComment.java+++ b/server-core/src/main/java/io/onedev/server/model/CodeComment.java@@ -65,10 +65,6 @@ public class CodeComment extends ProjectBelonging implements AttachmentStorageSupublic static final String PROP_USER = "user";- public static final String PROP_REPLIES = "replies";-- public static final String PROP_CHANGES = "changes";-public static final String PROP_UUID = "uuid";public static final List<String> QUERY_FIELDS = Lists.newArrayList(diff --git a/server-core/src/main/java/io/onedev/server/model/CoverageMetric.java b/server-core/src/main/java/io/onedev/server/model/CoverageMetric.javaindex d07a7bf9c6..c70532cd31 100644--- a/server-core/src/main/java/io/onedev/server/model/CoverageMetric.java+++ b/server-core/src/main/java/io/onedev/server/model/CoverageMetric.java@@ -2,6 +2,7 @@ package io.onedev.server.model;import io.onedev.server.model.support.BuildMetric;import io.onedev.server.util.MetricIndicator;+import io.onedev.server.web.component.chart.line.LineSeries;import javax.persistence.*;@@ -45,7 +46,7 @@ public class CoverageMetric extends AbstractEntity implements BuildMetric {this.reportName = reportName;}- @MetricIndicator(group="Code Coverage", order=200, valueFormatter=BuildMetric.FORMAT_PERCENTAGE,+ @MetricIndicator(group="Code Coverage", order=200, valueFormatter= LineSeries.PERCENTAGE_FORMATTER,maxValue=100, minValue=0, name="Branch", color="#1BC5BD")public int getBranchCoverage() {return branchCoverage;@@ -55,7 +56,7 @@ public class CoverageMetric extends AbstractEntity implements BuildMetric {this.branchCoverage = branchCoverage;}- @MetricIndicator(group="Code Coverage", order=400, valueFormatter=BuildMetric.FORMAT_PERCENTAGE,+ @MetricIndicator(group="Code Coverage", order=400, valueFormatter=LineSeries.PERCENTAGE_FORMATTER,maxValue=100, minValue=0, name="Line", color="#FFA800")public int getLineCoverage() {return lineCoverage;diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.javaindex 15a0398142..d30ab81157 100644--- a/server-core/src/main/java/io/onedev/server/model/Issue.java+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java@@ -266,6 +266,9 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)private Collection<IssueField> fields = new ArrayList<>();++ @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)+ private Collection<IssueStateHistory> stateHistories = new ArrayList<>();@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)private Collection<IssueComment> comments = new ArrayList<>();@@ -616,7 +619,15 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupportpublic void setFields(Collection<IssueField> fields) {this.fields = fields;}-++ public Collection<IssueStateHistory> getStateHistories() {+ return stateHistories;+ }++ public void setStateHistories(Collection<IssueStateHistory> stateHistories) {+ this.stateHistories = stateHistories;+ }+public Collection<IssueLink> getSourceLinks() {return sourceLinks;}diff --git a/server-core/src/main/java/io/onedev/server/model/IssueStateHistory.java b/server-core/src/main/java/io/onedev/server/model/IssueStateHistory.javanew file mode 100644index 0000000000..b72216e23b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/IssueStateHistory.java@@ -0,0 +1,88 @@+package io.onedev.server.model;++import io.onedev.server.model.support.TimeGroups;++import javax.annotation.Nullable;+import javax.persistence.*;+import java.util.Date;++import static io.onedev.server.model.IssueStateHistory.PROP_DATE;+import static io.onedev.server.model.IssueStateHistory.PROP_STATE;+import static io.onedev.server.model.support.TimeGroups.*;++@Entity+@Table(indexes={+ @Index(columnList="o_issue_id"), @Index(columnList=PROP_STATE),+ @Index(columnList=PROP_DATE), @Index(columnList=PROP_MONTH),+ @Index(columnList=PROP_WEEK), @Index(columnList=PROP_DAY),+})+public class IssueStateHistory extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ public static final String PROP_ISSUE = "issue";++ public static final String PROP_STATE = "state";++ public static final String PROP_DATE = "date";++ public static final String PROP_DURATION = "duration";++ public static final String PROP_TIME_GROUPS = "timeGroups";++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Issue issue;++ @Column(nullable=false)+ private String state;++ @Column(nullable=false)+ private Date date;++ private Long duration;++ @Embedded+ private TimeGroups timeGroups;++ public Issue getIssue() {+ return issue;+ }++ public void setIssue(Issue issue) {+ this.issue = issue;+ }++ public String getState() {+ return state;+ }++ public void setState(String state) {+ this.state = state;+ }++ public Date getDate() {+ return date;+ }++ public void setDate(Date date) {+ this.date = date;+ }++ @Nullable+ public Long getDuration() {+ return duration;+ }++ public void setDuration(@Nullable Long duration) {+ this.duration = duration;+ }++ public TimeGroups getTimeGroups() {+ return timeGroups;+ }++ public void setTimeGroups(TimeGroups timeGroups) {+ this.timeGroups = timeGroups;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.javaindex e125189ce0..a2c39a1dbe 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java@@ -13,10 +13,7 @@ import io.onedev.server.entityreference.PullRequestReference;import io.onedev.server.git.GitUtils;import io.onedev.server.git.service.CommitMessageError;import io.onedev.server.git.service.GitService;-import io.onedev.server.model.support.EntityWatch;-import io.onedev.server.model.support.LabelSupport;-import io.onedev.server.model.support.LastActivity;-import io.onedev.server.model.support.ProjectBelonging;+import io.onedev.server.model.support.*;import io.onedev.server.model.support.code.BranchProtection;import io.onedev.server.model.support.code.BuildRequirement;import io.onedev.server.model.support.pullrequest.MergePreview;@@ -41,7 +38,11 @@ import java.util.*;import java.util.stream.Collectors;import static io.onedev.server.model.AbstractEntity.PROP_NUMBER;+import static io.onedev.server.model.Build.*;import static io.onedev.server.model.PullRequest.*;+import static io.onedev.server.model.PullRequest.PROP_STATUS;+import static io.onedev.server.model.PullRequest.PROP_SUBMIT_DATE;+import static io.onedev.server.model.support.TimeGroups.*;import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS;import static java.lang.ThreadLocal.withInitial;@@ -52,7 +53,10 @@ import static java.lang.ThreadLocal.withInitial;@Index(columnList=PROP_NO_SPACE_TITLE), @Index(columnList=PROP_NUMBER),@Index(columnList="o_targetProject_id"), @Index(columnList=PROP_SUBMIT_DATE),@Index(columnList= LastActivity.COLUMN_DATE), @Index(columnList="o_sourceProject_id"),- @Index(columnList="o_submitter_id"), @Index(columnList=MergePreview.COLUMN_HEAD_COMMIT_HASH),+ @Index(columnList="o_submitter_id"), @Index(columnList=MergePreview.COLUMN_HEAD_COMMIT_HASH),+ @Index(columnList=PROP_SUBMIT_MONTH), @Index(columnList=PROP_SUBMIT_WEEK),+ @Index(columnList=PROP_SUBMIT_DAY), @Index(columnList=PROP_CLOSE_MONTH),+ @Index(columnList=PROP_CLOSE_WEEK), @Index(columnList=PROP_CLOSE_DAY),@Index(columnList=PROP_STATUS), @Index(columnList="o_numberScope_id")},uniqueConstraints={@UniqueConstraint(columnNames={"o_numberScope_id", PROP_NUMBER})})//use dynamic update in order not to overwrite other edits while background threads change update date@@ -116,6 +120,8 @@ public class PullRequest extends ProjectBelongingpublic static final String NAME_CLOSE_DATE = "Close Date";+ public static final String PROP_CLOSE_DATE = "closeDate";+public static final String NAME_MERGE_STRATEGY = "Merge Strategy";public static final String PROP_MERGE_STRATEGY = "mergeStrategy";@@ -133,7 +139,25 @@ public class PullRequest extends ProjectBelongingpublic static final String PROP_UUID = "uuid";public static final String PROP_NO_SPACE_TITLE = "noSpaceTitle";++ public static final String PROP_DURATION = "duration";++ public static final String PROP_SUBMIT_TIME_GROUPS = "submitTimeGroups";++ public static final String PROP_CLOSE_TIME_GROUPS = "closeTimeGroups";++ public static final String PROP_SUBMIT_MONTH = "submitMonth";++ public static final String PROP_SUBMIT_WEEK = "submitWeek";+ public static final String PROP_SUBMIT_DAY = "submitDay";++ public static final String PROP_CLOSE_MONTH = "closeMonth";++ public static final String PROP_CLOSE_WEEK = "closeWeek";++ public static final String PROP_CLOSE_DAY = "closeDay";+public static final String REFS_PREFIX = "refs/pulls/";private static final int MAX_CHECK_ERROR_LEN = 1024;@@ -146,6 +170,7 @@ public class PullRequest extends ProjectBelongingpublic static final Map<String, String> ORDER_FIELDS = CollectionUtils.newLinkedHashMap(NAME_SUBMIT_DATE, PROP_SUBMIT_DATE,+ NAME_CLOSE_DATE, PROP_CLOSE_DATE,NAME_LAST_ACTIVITY_DATE, PROP_LAST_ACTIVITY + "." + LastActivity.PROP_DATE,NAME_NUMBER, PROP_NUMBER,NAME_STATUS, PROP_STATUS,@@ -218,6 +243,24 @@ public class PullRequest extends ProjectBelonging@Column(nullable=false)private Date submitDate = new Date();+ private Date closeDate;++ private Long duration;++ @Embedded+ @AttributeOverrides({+ @AttributeOverride(name= PROP_MONTH, column=@Column(name= PROP_SUBMIT_MONTH)),+ @AttributeOverride(name= PROP_WEEK, column=@Column(name= PROP_SUBMIT_WEEK)),+ @AttributeOverride(name= PROP_DAY, column=@Column(name= PROP_SUBMIT_DAY))})+ private TimeGroups submitTimeGroups;++ @Embedded+ @AttributeOverrides({+ @AttributeOverride(name= PROP_MONTH, column=@Column(name= PROP_CLOSE_MONTH)),+ @AttributeOverride(name= PROP_WEEK, column=@Column(name= PROP_CLOSE_WEEK)),+ @AttributeOverride(name= PROP_DAY, column=@Column(name= PROP_CLOSE_DAY))})+ private TimeGroups closeTimeGroups;+@Column(nullable=false)private MergeStrategy mergeStrategy;@@ -618,6 +661,25 @@ public class PullRequest extends ProjectBelongingpublic void setSubmitDate(Date submitDate) {this.submitDate = submitDate;+ submitTimeGroups = TimeGroups.of(submitDate);+ }++ public Date getCloseDate() {+ return closeDate;+ }++ public void setCloseDate(Date closeDate) {+ this.closeDate = closeDate;+ closeTimeGroups = TimeGroups.of(closeDate);+ duration = closeDate.getTime() - submitDate.getTime();+ }++ public Long getDuration() {+ return duration;+ }++ public void setDuration(Long duration) {+ this.duration = duration;}public Collection<PullRequestReview> getReviews() {diff --git a/server-core/src/main/java/io/onedev/server/model/UnitTestMetric.java b/server-core/src/main/java/io/onedev/server/model/UnitTestMetric.javaindex 4771897207..127aa2bf70 100644--- a/server-core/src/main/java/io/onedev/server/model/UnitTestMetric.java+++ b/server-core/src/main/java/io/onedev/server/model/UnitTestMetric.java@@ -1,9 +1,10 @@package io.onedev.server.model;-import javax.persistence.*;-import io.onedev.server.model.support.BuildMetric;import io.onedev.server.util.MetricIndicator;+import io.onedev.server.web.component.chart.line.LineSeries;++import javax.persistence.*;import static io.onedev.server.model.support.BuildMetric.PROP_REPORT;@@ -52,7 +53,7 @@ public class UnitTestMetric extends AbstractEntity implements BuildMetric {}@MetricIndicator(order=100, group="Success Rate", name="Test Suite", color="#1BC5BD",- valueFormatter=BuildMetric.FORMAT_PERCENTAGE, maxValue=100, minValue=0)+ valueFormatter=LineSeries.PERCENTAGE_FORMATTER, maxValue=100, minValue=0)public int getTestSuiteSuccessRate() {return testSuiteSuccessRate;}@@ -62,7 +63,7 @@ public class UnitTestMetric extends AbstractEntity implements BuildMetric {}@MetricIndicator(order=200, group="Success Rate", name="Test Case", color="#F64E60",- valueFormatter=BuildMetric.FORMAT_PERCENTAGE, maxValue=100, minValue=0)+ valueFormatter=LineSeries.PERCENTAGE_FORMATTER, maxValue=100, minValue=0)public int getTestCaseSuccessRate() {return testCaseSuccessRate;}@@ -89,7 +90,7 @@ public class UnitTestMetric extends AbstractEntity implements BuildMetric {this.numOfTestCases = numOfTestCases;}- @MetricIndicator(order=600, valueFormatter=BuildMetric.FORMAT_DURATION)+ @MetricIndicator(order=600, group = "Total Test Duration", valueFormatter= LineSeries.SECONDS_FORMATTER)public int getTotalTestDuration() {return totalTestDuration;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/BuildMetric.java b/server-core/src/main/java/io/onedev/server/model/support/BuildMetric.javaindex b3dce1069a..1194ec03ad 100644--- a/server-core/src/main/java/io/onedev/server/model/support/BuildMetric.java+++ b/server-core/src/main/java/io/onedev/server/model/support/BuildMetric.java@@ -10,10 +10,6 @@ public interface BuildMetric {static final String PROP_REPORT = "reportName";- static final String FORMAT_PERCENTAGE = "function(value) {return value+'%';}";-- static final String FORMAT_DURATION = "function(seconds) {return onedev.server.formatBriefDuration(seconds);}";-Build getBuild();String getReportName();diff --git a/server-core/src/main/java/io/onedev/server/model/support/TimeGroups.java b/server-core/src/main/java/io/onedev/server/model/support/TimeGroups.javanew file mode 100644index 0000000000..0bcbe69fa5--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/TimeGroups.java@@ -0,0 +1,60 @@+package io.onedev.server.model.support;++import io.onedev.server.util.date.Day;+import io.onedev.server.util.date.Hour;+import io.onedev.server.util.date.Month;+import io.onedev.server.util.date.Week;++import javax.persistence.Embeddable;+import java.io.Serializable;+import java.util.Date;++@Embeddable+public class TimeGroups implements Serializable {++ private static final long serialVersionUID = 1L;++ public static final String PROP_DAY = "day";++ public static final String PROP_WEEK = "week";++ public static final String PROP_MONTH = "month";++ private Integer day;++ private Integer week;++ private Integer month;++ public Integer getDay() {+ return day;+ }++ public void setDay(Integer day) {+ this.day = day;+ }++ public Integer getWeek() {+ return week;+ }++ public void setWeek(Integer week) {+ this.week = week;+ }++ public Integer getMonth() {+ return month;+ }++ public void setMonth(Integer month) {+ this.month = month;+ }++ public static TimeGroups of(Date date) {+ var timeGroups = new TimeGroups();+ timeGroups.setMonth(new Month(date).getValue());+ timeGroups.setWeek(new Week(date).getValue());+ timeGroups.setDay(new Day(date).getValue());+ return timeGroups;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueOwnSpentTimeChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueOwnSpentTimeChangeData.javaindex 547db0cf5f..f44d82356a 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueOwnSpentTimeChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueOwnSpentTimeChangeData.java@@ -5,7 +5,6 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Group;import io.onedev.server.model.User;import io.onedev.server.notification.ActivityDetail;-import io.onedev.server.util.DateUtils;import java.util.Collection;import java.util.HashMap;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTotalEstimatedTimeChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTotalEstimatedTimeChangeData.javaindex d2870ca9ff..51d76c9ced 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTotalEstimatedTimeChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTotalEstimatedTimeChangeData.java@@ -5,7 +5,6 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Group;import io.onedev.server.model.User;import io.onedev.server.notification.ActivityDetail;-import io.onedev.server.util.DateUtils;import java.util.Collection;import java.util.HashMap;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/WorkingPeriodField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/WorkingPeriodField.javaindex 68a11f3221..4f3be48eb4 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/WorkingPeriodField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/WorkingPeriodField.java@@ -9,7 +9,6 @@ import io.onedev.server.OneDev;import io.onedev.server.buildspecmodel.inputspec.workingperiodinput.WorkingPeriodInput;import io.onedev.server.buildspecmodel.inputspec.workingperiodinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.util.DateUtils;import io.onedev.server.annotation.Editable;@Editable(order=700, name=FieldSpec.WORKING_PERIOD)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueWorkResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueWorkResource.javaindex 7bc726a184..1f22a5cca2 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueWorkResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueWorkResource.java@@ -5,7 +5,7 @@ import io.onedev.server.entitymanager.IssueWorkManager;import io.onedev.server.model.IssueWork;import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import org.apache.shiro.authz.UnauthorizedException;import javax.inject.Inject;diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.javaindex 5eff924c5c..a249981968 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java@@ -24,8 +24,8 @@ import io.onedev.server.rest.InvalidParamException;import io.onedev.server.rest.resource.support.RestConstants;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;-import io.onedev.server.util.Day;+import io.onedev.server.util.date.DateUtils;+import io.onedev.server.util.date.Day;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.web.page.project.setting.ContributedProjectSetting;import org.apache.shiro.authz.UnauthorizedException;diff --git a/server-core/src/main/java/io/onedev/server/search/commit/AfterCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/AfterCriteria.javaindex d458cc1ff2..1efe86c9b1 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/AfterCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/AfterCriteria.java@@ -11,7 +11,7 @@ import com.google.common.base.Preconditions;import io.onedev.server.event.project.RefUpdated;import io.onedev.server.git.command.RevListOptions;import io.onedev.server.model.Project;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;public class AfterCriteria extends CommitCriteria {diff --git a/server-core/src/main/java/io/onedev/server/search/commit/BeforeCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/BeforeCriteria.javaindex bcdfda1292..2a166e7fa2 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/BeforeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/BeforeCriteria.java@@ -11,7 +11,7 @@ import com.google.common.base.Preconditions;import io.onedev.server.event.project.RefUpdated;import io.onedev.server.git.command.RevListOptions;import io.onedev.server.model.Project;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;public class BeforeCriteria extends CommitCriteria {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.javaindex 0864d8a193..911cb1b933 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java@@ -10,7 +10,7 @@ import io.onedev.server.entityreference.BuildReference;import io.onedev.server.entityreference.IssueReference;import io.onedev.server.entityreference.PullRequestReference;import io.onedev.server.model.*;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.util.ProjectScopedCommit;import io.onedev.server.util.ProjectScopedRevision;import io.onedev.server.util.criteria.Criteria;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/LastActivityDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/LastActivityDateCriteria.javaindex 6c6f222587..56b1161c61 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/LastActivityDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/LastActivityDateCriteria.java@@ -11,7 +11,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.support.LastActivity;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.util.criteria.Criteria;public class LastActivityDateCriteria extends Criteria<Issue> {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.javaindex 920002d8f4..3b20d87512 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.java@@ -3,7 +3,6 @@ package io.onedev.server.search.entity.issue;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;-import io.onedev.server.util.DateUtils;import io.onedev.server.util.criteria.Criteria;import javax.persistence.criteria.*;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.javanew file mode 100644index 0000000000..3ee7b207c4--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java@@ -0,0 +1,50 @@+package io.onedev.server.search.entity.pullrequest;++import io.onedev.server.model.PullRequest;+import io.onedev.server.search.entity.EntityQuery;+import io.onedev.server.util.criteria.Criteria;++import javax.persistence.criteria.*;+import java.util.Date;++public class CloseDateCriteria extends Criteria<PullRequest> {++ private static final long serialVersionUID = 1L;++ private final int operator;++ private final Date date;++ private final String value;++ public CloseDateCriteria(String value, int operator) {+ this.operator = operator;+ this.value = value;+ date = EntityQuery.getDateValue(value);+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {+ Path<Date> attribute = from.get(PullRequest.PROP_CLOSE_DATE);+ if (operator == PullRequestQueryLexer.IsUntil)+ return builder.lessThan(attribute, date);+ else+ return builder.greaterThan(attribute, date);+ }++ @Override+ public boolean matches(PullRequest request) {+ if (operator == PullRequestQueryLexer.IsUntil)+ return request.getCloseDate().before(date);+ else+ return request.getCloseDate().after(date);+ }++ @Override+ public String toStringWithoutParens() {+ return quote(PullRequest.NAME_CLOSE_DATE) + " "+ + PullRequestQuery.getRuleName(operator) + " "+ + quote(value);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.javaindex e634689efd..1a15e56902 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java@@ -216,6 +216,8 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {switch (fieldName) {case PullRequest.NAME_SUBMIT_DATE:return new SubmitDateCriteria(value, operator);+ case PullRequest.NAME_CLOSE_DATE:+ return new CloseDateCriteria(value, operator);case PullRequest.NAME_LAST_ACTIVITY_DATE:return new LastActivityDateCriteria(value, operator);default:diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectBuildStats.java b/server-core/src/main/java/io/onedev/server/util/ProjectBuildStatusStat.javasimilarity index 77%rename from server-core/src/main/java/io/onedev/server/util/ProjectBuildStats.javarename to server-core/src/main/java/io/onedev/server/util/ProjectBuildStatusStat.javaindex 546967726d..0673351331 100644--- a/server-core/src/main/java/io/onedev/server/util/ProjectBuildStats.java+++ b/server-core/src/main/java/io/onedev/server/util/ProjectBuildStatusStat.java@@ -4,7 +4,7 @@ import java.io.Serializable;import io.onedev.server.model.Build;-public class ProjectBuildStats implements Serializable {+public class ProjectBuildStatusStat implements Serializable {private static final long serialVersionUID = 1L;@@ -14,7 +14,7 @@ public class ProjectBuildStats implements Serializable {private final long statusCount;- public ProjectBuildStats(Long projectId, Build.Status buildStatus, long statusCount) {+ public ProjectBuildStatusStat(Long projectId, Build.Status buildStatus, long statusCount) {this.projectId = projectId;this.buildStatus = buildStatus;this.statusCount = statusCount;diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectIssueStats.java b/server-core/src/main/java/io/onedev/server/util/ProjectIssueStateStat.javasimilarity index 77%rename from server-core/src/main/java/io/onedev/server/util/ProjectIssueStats.javarename to server-core/src/main/java/io/onedev/server/util/ProjectIssueStateStat.javaindex 5590f270c0..1be2be258c 100644--- a/server-core/src/main/java/io/onedev/server/util/ProjectIssueStats.java+++ b/server-core/src/main/java/io/onedev/server/util/ProjectIssueStateStat.java@@ -2,7 +2,7 @@ package io.onedev.server.util;import java.io.Serializable;-public class ProjectIssueStats implements Serializable {+public class ProjectIssueStateStat implements Serializable {private static final long serialVersionUID = 1L;@@ -12,7 +12,7 @@ public class ProjectIssueStats implements Serializable {private final long stateCount;- public ProjectIssueStats(Long projectId, int stateOrdinal, long stateCount) {+ public ProjectIssueStateStat(Long projectId, int stateOrdinal, long stateCount) {this.projectId = projectId;this.stateOrdinal = stateOrdinal;this.stateCount = stateCount;diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectPackStats.java b/server-core/src/main/java/io/onedev/server/util/ProjectPackTypeStat.javasimilarity index 77%rename from server-core/src/main/java/io/onedev/server/util/ProjectPackStats.javarename to server-core/src/main/java/io/onedev/server/util/ProjectPackTypeStat.javaindex 92931896c9..e0743dbb5e 100644--- a/server-core/src/main/java/io/onedev/server/util/ProjectPackStats.java+++ b/server-core/src/main/java/io/onedev/server/util/ProjectPackTypeStat.java@@ -2,7 +2,7 @@ package io.onedev.server.util;import java.io.Serializable;-public class ProjectPackStats implements Serializable {+public class ProjectPackTypeStat implements Serializable {private static final long serialVersionUID = 1L;@@ -12,7 +12,7 @@ public class ProjectPackStats implements Serializable {private final long typeCount;- public ProjectPackStats(Long projectId, String type, long typeCount) {+ public ProjectPackTypeStat(Long projectId, String type, long typeCount) {this.projectId = projectId;this.type = type;this.typeCount = typeCount;diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectPullRequestStats.java b/server-core/src/main/java/io/onedev/server/util/ProjectPullRequestStatusStat.javasimilarity index 77%rename from server-core/src/main/java/io/onedev/server/util/ProjectPullRequestStats.javarename to server-core/src/main/java/io/onedev/server/util/ProjectPullRequestStatusStat.javaindex 91416e406b..fb07aa0b6d 100644--- a/server-core/src/main/java/io/onedev/server/util/ProjectPullRequestStats.java+++ b/server-core/src/main/java/io/onedev/server/util/ProjectPullRequestStatusStat.java@@ -4,7 +4,7 @@ import java.io.Serializable;import io.onedev.server.model.PullRequest.Status;-public class ProjectPullRequestStats implements Serializable {+public class ProjectPullRequestStatusStat implements Serializable {private static final long serialVersionUID = 1L;@@ -14,7 +14,7 @@ public class ProjectPullRequestStats implements Serializable {private final long statusCount;- public ProjectPullRequestStats(Long projectId, Status pullRequestStatus, long statusCount) {+ public ProjectPullRequestStatusStat(Long projectId, Status pullRequestStatus, long statusCount) {this.projectId = projectId;this.pullRequestStatus = pullRequestStatus;this.statusCount = statusCount;diff --git a/server-core/src/main/java/io/onedev/server/util/DateUtils.java b/server-core/src/main/java/io/onedev/server/util/date/DateUtils.javasimilarity index 96%rename from server-core/src/main/java/io/onedev/server/util/DateUtils.javarename to server-core/src/main/java/io/onedev/server/util/date/DateUtils.javaindex d5c4e22eaa..43582e2f7a 100644--- a/server-core/src/main/java/io/onedev/server/util/DateUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/date/DateUtils.java@@ -1,9 +1,10 @@-package io.onedev.server.util;+package io.onedev.server.util.date;import com.google.common.collect.Lists;import com.joestelmach.natty.DateGroup;import com.joestelmach.natty.Parser;import io.onedev.k8shelper.KubernetesHelper;+import io.onedev.server.util.Constants;import org.joda.time.DateTime;import org.joda.time.format.ISODateTimeFormat;import org.ocpsoft.prettytime.PrettyTime;diff --git a/server-core/src/main/java/io/onedev/server/util/Day.java b/server-core/src/main/java/io/onedev/server/util/date/Day.javasimilarity index 86%rename from server-core/src/main/java/io/onedev/server/util/Day.javarename to server-core/src/main/java/io/onedev/server/util/date/Day.javaindex cc770d14f7..0dd99fe09e 100644--- a/server-core/src/main/java/io/onedev/server/util/Day.java+++ b/server-core/src/main/java/io/onedev/server/util/date/Day.java@@ -1,4 +1,4 @@-package io.onedev.server.util;+package io.onedev.server.util.date;import java.io.Serializable;import java.time.LocalDate;@@ -26,7 +26,7 @@ public class Day implements Serializable, Comparable<Day> {}public Day(DateTime dateTime) {- this(dateTime.getYear(), dateTime.getMonthOfYear()-1, dateTime.getDayOfMonth());+ this(dateTime.getYear(), dateTime.getMonthOfYear(), dateTime.getDayOfMonth());}public Day(int year, int monthOfYear, int dayOfMonth) {@@ -36,7 +36,7 @@ public class Day implements Serializable, Comparable<Day> {}public Day(LocalDate date) {- this(date.getYear(), date.getMonthValue()-1, date.getDayOfMonth());+ this(date.getYear(), date.getMonthValue(), date.getDayOfMonth());}public Day(int value) {@@ -48,7 +48,7 @@ public class Day implements Serializable, Comparable<Day> {}public DateTime getDate() {- return new DateTime(year, monthOfYear+1, dayOfMonth, 0, 0);+ return new DateTime(year, monthOfYear, dayOfMonth, 0, 0);}@Override@@ -104,7 +104,7 @@ public class Day implements Serializable, Comparable<Day> {@Overridepublic String toString() {- return String.format("%04d-%02d-%02d", year, monthOfYear+1, dayOfMonth);+ return String.format("%02d-%02d", monthOfYear, dayOfMonth);}}diff --git a/server-core/src/main/java/io/onedev/server/util/date/Hour.java b/server-core/src/main/java/io/onedev/server/util/date/Hour.javanew file mode 100644index 0000000000..1509eaed95--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/date/Hour.java@@ -0,0 +1,117 @@+package io.onedev.server.util.date;++import io.onedev.server.rest.annotation.Api;+import org.apache.commons.lang3.builder.EqualsBuilder;+import org.apache.commons.lang3.builder.HashCodeBuilder;+import org.joda.time.DateTime;++import java.io.Serializable;+import java.time.LocalDate;+import java.util.Date;++public class Hour implements Serializable, Comparable<Hour> {++ private static final long serialVersionUID = 1L;++ private final int year;++ private final int monthOfYear;++ private final int dayOfMonth;++ private final int hourOfDay;++ public Hour(Date date) {+ this(new DateTime(date));+ }++ public Hour(DateTime dateTime) {+ this(dateTime.getYear(), dateTime.getMonthOfYear(), dateTime.getDayOfMonth(), dateTime.getHourOfDay());+ }++ public Hour(int year, int monthOfYear, int dayOfMonth, int hourOfDay) {+ this.year = year;+ this.monthOfYear = monthOfYear;+ this.dayOfMonth = dayOfMonth;+ this.hourOfDay = hourOfDay;+ }++ public Hour(int value) {+ this(value>>>16, (value&0x0000ffff)>>>12, (value&0x00000fff)>>>6, value&0x0000003f);+ }++ public int getValue() {+ return (year<<16) | (monthOfYear<<12) | (dayOfMonth<<6) | hourOfDay;+ }++ public DateTime getDate() {+ return new DateTime(year, monthOfYear, dayOfMonth, hourOfDay, 0);+ }++ @Override+ public int compareTo(Hour hour) {+ if (year < hour.year)+ return -1;+ else if (year > hour.year)+ return 1;+ else if (monthOfYear < hour.monthOfYear)+ return -1;+ else if (monthOfYear > hour.monthOfYear)+ return 1;+ else if (dayOfMonth < hour.dayOfMonth)+ return -1;+ else if (dayOfMonth > hour.dayOfMonth)+ return 1;+ else+ return hourOfDay - hour.hourOfDay;+ }++ public int getYear() {+ return year;+ }++ public int getMonthOfYear() {+ return monthOfYear;+ }++ public int getDayOfMonth() {+ return dayOfMonth;+ }++ public int getHourOfDay() {+ return hourOfDay;+ }++ @Override+ public boolean equals(Object other) {+ if (this == other) {+ return true;+ } else if (other instanceof Hour) {+ Hour otherHour = (Hour) other;+ return new EqualsBuilder()+ .append(year, otherHour.year)+ .append(monthOfYear, otherHour.monthOfYear)+ .append(dayOfMonth, otherHour.dayOfMonth)+ .append(hourOfDay, otherHour.hourOfDay)+ .isEquals();+ } else {+ return false;+ }+ }++ @Override+ public int hashCode() {+ return new HashCodeBuilder(17, 37)+ .append(year)+ .append(monthOfYear)+ .append(dayOfMonth)+ .append(hourOfDay)+ .toHashCode();+ }++ @Override+ public String toString() {+ return String.format("%02d", hourOfDay);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/date/Month.java b/server-core/src/main/java/io/onedev/server/util/date/Month.javanew file mode 100644index 0000000000..7c81060499--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/date/Month.java@@ -0,0 +1,89 @@+package io.onedev.server.util.date;++import org.apache.commons.lang3.builder.EqualsBuilder;+import org.apache.commons.lang3.builder.HashCodeBuilder;+import org.joda.time.DateTime;++import java.io.Serializable;+import java.util.Date;++public class Month implements Serializable, Comparable<Month> {++ private static final long serialVersionUID = 1L;++ private final int year;++ private final int monthOfYear;++ public Month(Date date) {+ this(new DateTime(date));+ }++ public Month(DateTime dateTime) {+ this(dateTime.getYear(), dateTime.getMonthOfYear());+ }++ public Month(int year, int monthOfYear) {+ this.year = year;+ this.monthOfYear = monthOfYear;+ }++ public Month(int value) {+ this(value>>>16, value&0x0000ffff);+ }++ public int getValue() {+ return (year<<16) | monthOfYear;+ }++ public DateTime getDate() {+ return new DateTime(year, monthOfYear, 1, 0, 0);+ }++ @Override+ public int compareTo(Month month) {+ if (year < month.year)+ return -1;+ else if (year > month.year)+ return 1;+ else+ return monthOfYear - month.monthOfYear;+ }++ public int getYear() {+ return year;+ }++ public int getMonthOfYear() {+ return monthOfYear;+ }++ @Override+ public boolean equals(Object other) {+ if (this == other) {+ return true;+ } else if (other instanceof Month) {+ Month otherDay = (Month) other;+ return new EqualsBuilder()+ .append(year, otherDay.year)+ .append(monthOfYear, otherDay.monthOfYear)+ .isEquals();+ } else {+ return false;+ }+ }++ @Override+ public int hashCode() {+ return new HashCodeBuilder(17, 37)+ .append(year)+ .append(monthOfYear)+ .toHashCode();+ }++ @Override+ public String toString() {+ return String.format("%04d-%02d", year, monthOfYear);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/date/Week.java b/server-core/src/main/java/io/onedev/server/util/date/Week.javanew file mode 100644index 0000000000..28798dbcc9--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/date/Week.java@@ -0,0 +1,89 @@+package io.onedev.server.util.date;++import org.apache.commons.lang3.builder.EqualsBuilder;+import org.apache.commons.lang3.builder.HashCodeBuilder;+import org.joda.time.DateTime;++import java.io.Serializable;+import java.util.Date;++public class Week implements Serializable, Comparable<Week> {++ private static final long serialVersionUID = 1L;++ private final int weekyear;++ private final int weekOfWeekyear;++ public Week(Date date) {+ this(new DateTime(date));+ }++ public Week(DateTime dateTime) {+ this(dateTime.getWeekyear(), dateTime.getWeekOfWeekyear());+ }++ public Week(int weekyear, int weekOfWeekyear) {+ this.weekyear = weekyear;+ this.weekOfWeekyear = weekOfWeekyear;+ }++ public Week(int value) {+ this(value>>>16, value&0x0000ffff);+ }++ public int getValue() {+ return (weekyear<<16) | weekOfWeekyear;+ }++ public DateTime getDate() {+ return new DateTime().withWeekyear(weekyear).withWeekOfWeekyear(weekOfWeekyear).withDayOfWeek(1).withHourOfDay(0).withMinuteOfHour(0);+ }++ @Override+ public int compareTo(Week week) {+ if (weekyear < week.weekyear)+ return -1;+ else if (weekyear > week.weekyear)+ return 1;+ else+ return weekOfWeekyear - week.weekOfWeekyear;+ }++ public int getWeekyear() {+ return weekyear;+ }++ public int getWeekOfWeekyear() {+ return weekOfWeekyear;+ }++ @Override+ public boolean equals(Object other) {+ if (this == other) {+ return true;+ } else if (other instanceof Week) {+ Week otherWeek = (Week) other;+ return new EqualsBuilder()+ .append(weekyear, otherWeek.weekyear)+ .append(weekOfWeekyear, otherWeek.weekOfWeekyear)+ .isEquals();+ } else {+ return false;+ }+ }++ @Override+ public int hashCode() {+ return new HashCodeBuilder(17, 37)+ .append(weekyear)+ .append(weekOfWeekyear)+ .toHashCode();+ }++ @Override+ public String toString() {+ return String.format("w%02d", weekOfWeekyear);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/PrioritizedComponentRenderer.java b/server-core/src/main/java/io/onedev/server/web/PrioritizedComponentRenderer.javadeleted file mode 100644index 9c60344805..0000000000--- a/server-core/src/main/java/io/onedev/server/web/PrioritizedComponentRenderer.java+++ /dev/null@@ -1,12 +0,0 @@-package io.onedev.server.web;--import org.apache.wicket.Component;--public interface PrioritizedComponentRenderer extends ComponentRenderer {-- @Override- Component render(String componentId);-- int getPriority();--}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/group2.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/group2.svgnew file mode 100644index 0000000000..3c820a2e7d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/group2.svg@@ -0,0 +1 @@+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1720753036132" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="18350" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M390.4 448H147.2c-32 0-51.2-25.6-51.2-57.6V147.2c0-32 25.6-51.2 51.2-51.2h249.6c25.6 0 51.2 19.2 51.2 51.2v249.6c0 25.6-25.6 51.2-57.6 51.2zM876.8 448H633.6c-32 0-57.6-25.6-57.6-57.6V147.2c0-32 25.6-51.2 51.2-51.2h249.6c32 0 51.2 25.6 51.2 51.2v249.6c0 25.6-19.2 51.2-51.2 51.2zM390.4 928H147.2c-32 0-51.2-25.6-51.2-51.2V633.6c0-32 19.2-57.6 51.2-57.6h249.6c25.6 0 51.2 25.6 51.2 57.6v249.6c0 25.6-25.6 44.8-57.6 44.8zM876.8 928H633.6c-32 0-51.2-25.6-51.2-51.2V633.6c-6.4-32 19.2-57.6 51.2-57.6h249.6c32 0 51.2 25.6 51.2 51.2v249.6c-6.4 32-25.6 51.2-57.6 51.2z" fill="" p-id="18351"></path></svg>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/statistics.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/statistics.svgdeleted file mode 100644index 69644f55e8..0000000000--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/statistics.svg+++ /dev/null@@ -1,4 +0,0 @@-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg">- <path stroke='currentColor' stroke-width="5" d='M1008 1024H16a16 16 0 0 1-16-16v-32a16 16 0 0 1 16-16h992a16 16 0 0 1 16 16v32a16 16 0 0 1-16 16zM928 832h-128a64 64 0 0 1-64-64V64a64 64 0 0 1 64-64h128a64 64 0 0 1 64 64v704a64 64 0 0 1-64 64z m0-768h-128v704h128V64zM576 832h-128a64 64 0 0 1-64-64V320a64 64 0 0 1 64-64h128a64 64 0 0 1 64 64v448a64 64 0 0 1-64 64z m0-512h-128v448h128V320zM224 832H96a64 64 0 0 1-64-64v-192a64 64 0 0 1 64-64h128a64 64 0 0 1 64 64v192a64 64 0 0 1-64 64z m0-256H96v192h128v-192z' />-</svg>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/stats.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/stats.svgindex 5069964b49..ca5f26fae0 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/stats.svg+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/stats.svg@@ -1 +1,39 @@-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M929.28 896 65.28 896 65.28 623.68l184.448-184.448C261.76 444.736 275.072 448 289.28 448s27.456-3.264 39.552-8.768l129.216 129.216C452.48 580.48 449.28 593.856 449.28 608c0 52.992 43.008 96 96 96s96-43.008 96-96c0-14.144-3.264-27.52-8.768-39.552l317.44-317.44c13.824-13.76 13.824-36.096 0-49.92-13.76-13.76-36.096-13.76-49.92 0L581.76 519.296C570.496 514.624 558.208 512 545.28 512S520 514.624 508.736 519.296L377.984 388.48C382.656 377.28 385.28 364.928 385.28 352c0-52.992-43.008-96-96-96s-96 43.008-96 96c0 12.928 2.624 25.28 7.296 36.48L65.28 523.84 65.28 160c0-17.664-14.336-32-32-32s-32 14.336-32 32l0 437.312c-0.832 4.288-0.832 8.576 0 12.864L1.28 928c0 17.664 14.336 32 32 32l896 0c17.664 0 32-14.336 32-32S946.944 896 929.28 896zM545.28 576c17.664 0 32 14.336 32 32S562.944 640 545.28 640s-32-14.336-32-32S527.552 576 545.28 576zM289.28 320c17.664 0 32 14.336 32 32S306.944 384 289.28 384s-32-14.336-32-32S271.552 320 289.28 320z" /></svg>\ No newline at end of file+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<svg+ class="icon"+ width="200px"+ height="200.00px"+ viewBox="0 0 1024 1024"+ version="1.1"+ id="svg1"+ sodipodi:docname="stats.svg"+ inkscape:version="1.3.2 (091e20e, 2023-11-25)"+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"+ xmlns="http://www.w3.org/2000/svg"+ xmlns:svg="http://www.w3.org/2000/svg">+ <defs+ id="defs1" />+ <sodipodi:namedview+ id="namedview1"+ pagecolor="#ffffff"+ bordercolor="#666666"+ borderopacity="1.0"+ inkscape:showpageshadow="2"+ inkscape:pageopacity="0.0"+ inkscape:pagecheckerboard="0"+ inkscape:deskcolor="#d1d1d1"+ inkscape:zoom="3.075"+ inkscape:cx="100"+ inkscape:cy="99.837398"+ inkscape:window-width="1864"+ inkscape:window-height="1027"+ inkscape:window-x="58"+ inkscape:window-y="25"+ inkscape:window-maximized="1"+ inkscape:current-layer="svg1" />+ <path+ d="M 931.22129,897.9212 H 119.636 V 633.77591 l 173.25843,-178.9111 c 11.30207,5.33878 23.8065,8.5048 37.15257,8.5048 13.34607,0 25.79037,-3.16602 37.15257,-8.5048 l 121.37709,125.3371 c -5.23022,11.67081 -8.23609,24.64528 -8.23609,38.36469 0,51.40125 40.39891,93.1182 90.17614,93.1182 49.77723,0 90.17615,-41.71695 90.17615,-93.1182 0,-13.71941 -3.06599,-26.69388 -8.23609,-38.36469 L 950.63922,272.29106 c 12.98536,-13.34694 12.98536,-35.01244 0,-48.42146 -12.92525,-13.34694 -33.90623,-13.34694 -46.8916,0 L 604.78365,532.52539 c -10.58067,-4.53175 -22.12322,-7.07698 -34.26694,-7.07698 -12.14372,0 -23.74638,2.54523 -34.32705,7.07698 L 413.36975,405.63632 c 4.38858,-10.86379 6.85339,-22.845 6.85339,-35.38491 0,-51.40125 -40.39891,-93.1182 -90.17614,-93.1182 -49.77723,0 -90.17615,41.71695 -90.17615,93.1182 0,12.53991 2.46482,24.52112 6.85339,35.38491 L 119.636,536.93298 V 184.01501 c 0,-17.13375 -13.46631,-31.0394 -30.058718,-31.0394 -16.59241,0 -30.058714,13.90565 -30.058714,31.0394 v 424.18443 c -0.781527,4.15928 -0.781527,8.31856 0,12.47784 V 928.9606 c 0,17.13375 13.466304,31.0394 30.058714,31.0394 H 931.22129 c 16.59241,0 30.05871,-13.90565 30.05871,-31.0394 0,-17.13375 -13.4663,-31.0394 -30.05871,-31.0394 z M 570.51671,587.5272 c 16.59241,0 30.05872,13.90566 30.05872,31.0394 0,17.13375 -13.46631,31.0394 -30.05872,31.0394 -16.59241,0 -30.05871,-13.90565 -30.05871,-31.0394 0,-17.13374 13.40618,-31.0394 30.05871,-31.0394 z M 330.047,339.21201 c 16.59241,0 30.05871,13.90565 30.05871,31.0394 0,17.13375 -13.4663,31.0394 -30.05871,31.0394 -16.59241,0 -30.05872,-13.90565 -30.05872,-31.0394 0,-17.13375 13.40619,-31.0394 30.05872,-31.0394 z"+ id="path1"+ style="stroke-width:0.954535" />+</svg>diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.javaindex 53b2c2775d..05da9a9655 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java@@ -17,7 +17,7 @@ import io.onedev.server.model.Agent;import io.onedev.server.search.entity.agent.AgentQuery;import io.onedev.server.search.entity.agent.AgentQueryLexer;import io.onedev.server.search.entity.agent.AgentQueryParser;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.javaindex 63ccc95f24..1cffc0b88c 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java@@ -27,7 +27,7 @@ import io.onedev.server.model.support.BuildMetric;import io.onedev.server.search.buildmetric.BuildMetricQuery;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.buildmetric.BuildMetricQueryParser;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.javaindex 0da9145d23..2d7e4f5bb6 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java@@ -18,7 +18,7 @@ import io.onedev.server.model.Project;import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.search.entity.build.BuildQueryLexer;import io.onedev.server.search.entity.build.BuildQueryParser;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.javaindex bb8c773f9f..79f5658f14 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java@@ -15,7 +15,7 @@ import io.onedev.server.model.Project;import io.onedev.server.search.entity.codecomment.CodeCommentQuery;import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser;import io.onedev.server.search.entity.project.ProjectQuery;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;import org.apache.commons.lang3.StringUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex 4eb454f522..417251ded5 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -26,10 +26,9 @@ import io.onedev.server.search.entity.issue.IssueQueryParseOption;import io.onedev.server.search.entity.issue.IssueQueryParser;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.util.ComponentContext;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;-import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;import io.onedev.server.web.util.SuggestionUtils;import io.onedev.server.web.util.WicketUtils;import org.apache.commons.lang3.StringUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.javaindex 6ea3ec6c66..7074699f26 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.java@@ -16,7 +16,7 @@ import io.onedev.server.model.Project;import io.onedev.server.search.entity.pack.PackQuery;import io.onedev.server.search.entity.pack.PackQueryLexer;import io.onedev.server.search.entity.pack.PackQueryParser;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.javaindex e2bc6d608b..631755fe28 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java@@ -20,7 +20,7 @@ import io.onedev.server.search.entity.project.ProjectQueryLexer;import io.onedev.server.search.entity.project.ProjectQueryParser;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessProject;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.util.facade.ProjectCache;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.javaindex 7719110ef1..18f05f81eb 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java@@ -15,7 +15,7 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/blamemessage/BlameMessageBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/blamemessage/BlameMessageBehavior.javaindex feb634e57b..460fb2c07f 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/blamemessage/BlameMessageBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/blamemessage/BlameMessageBehavior.java@@ -11,7 +11,7 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.unbescape.javascript.JavaScriptEscape;import io.onedev.server.model.Project;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;public abstract class BlameMessageBehavior extends AbstractPostAjaxBehavior {diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListActionRenderer.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListActionRenderer.javanew file mode 100644index 0000000000..eaa4f81ccf--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListActionRenderer.java@@ -0,0 +1,8 @@+package io.onedev.server.web.component.build.list;++import io.onedev.commons.loader.ExtensionPoint;+import io.onedev.server.web.ComponentRenderer;++@ExtensionPoint+public interface BuildListActionRenderer extends ComponentRenderer {+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.htmlindex 7528668eed..43a8ba099b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html@@ -28,6 +28,7 @@<a wicket:id="orderBy" class="order-by text-gray mr-4 mb-2 d-inline-block text-nowrap"><wicket:svg href="sort" class="icon"></wicket:svg> Order By</a>+ <span wicket:id="extraActions"></span><span wicket:id="count" class="float-right text-gray"></span></div><div wicket:id="body">diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex 8547116090..1df0baa905 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -19,8 +19,8 @@ import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.JobPermission;import io.onedev.server.security.permission.RunJob;-import io.onedev.server.util.DateUtils;import io.onedev.server.util.Input;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;import io.onedev.server.web.behavior.BuildQueryBehavior;@@ -84,6 +84,7 @@ import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.Item;import org.apache.wicket.markup.repeater.OddEvenItem;+import org.apache.wicket.markup.repeater.RepeatingView;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;@@ -836,6 +837,11 @@ public abstract class BuildListPanel extends Panel {});+ var extraActionsView = new RepeatingView("extraActions");+ add(extraActionsView);+ for (var renderer: OneDev.getExtensions(BuildListActionRenderer.class))+ extraActionsView.add(renderer.render(extraActionsView.newChildId()));+queryInput = new TextField<String>("input", queryStringModel);queryInput.add(new BuildQueryBehavior(new AbstractReadOnlyModel<Project>() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.javaindex 2e9a02ab8c..f2172b71c8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java@@ -13,7 +13,7 @@ import io.onedev.server.model.BuildLabel;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.util.Input;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.asset.emoji.Emojis;diff --git a/server-core/src/main/java/io/onedev/server/web/component/chart/line/Line.java b/server-core/src/main/java/io/onedev/server/web/component/chart/line/Line.javaindex 2753c2829c..ac368311e8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/chart/line/Line.java+++ b/server-core/src/main/java/io/onedev/server/web/component/chart/line/Line.java@@ -1,9 +1,8 @@package io.onedev.server.web.component.chart.line;-import java.io.Serializable;-import java.util.Map;-import javax.annotation.Nullable;+import java.io.Serializable;+import java.util.List;public class Line implements Serializable {@@ -11,7 +10,7 @@ public class Line implements Serializable {private final String name;- private final Map<String, Integer> yAxisValues;+ private final List<Integer> yAxisValues;private final String color;@@ -19,7 +18,7 @@ public class Line implements Serializable {private final String style;- public Line(String name, Map<String, Integer> yAxisValues, String color, @Nullable String stack, @Nullable String style) {+ public Line(String name, List<Integer> yAxisValues, String color, @Nullable String stack, @Nullable String style) {this.name = name;this.yAxisValues = yAxisValues;this.color = color;@@ -31,7 +30,7 @@ public class Line implements Serializable {return name;}- public Map<String, Integer> getYAxisValues() {+ public List<Integer> getYAxisValues() {return yAxisValues;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineSeries.java b/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineSeries.javaindex 729e1703ee..289478db7a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineSeries.java+++ b/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineSeries.java@@ -1,14 +1,19 @@package io.onedev.server.web.component.chart.line;+import javax.annotation.Nullable;import java.io.Serializable;import java.util.List;-import javax.annotation.Nullable;-public class LineSeries implements Serializable {private static final long serialVersionUID = 1L;+ public static final String PERCENTAGE_FORMATTER = "function(value) {return value+'%';}";++ public static final String SECONDS_FORMATTER = "function(seconds) {return onedev.server.formatBriefDuration(seconds);}";++ public static final String MINUTES_FORMATTER = "function(minutes) {return onedev.server.formatBriefDuration(minutes*60);}";+private final String seriesName;private final List<String> xAxisValues;@@ -59,5 +64,5 @@ public class LineSeries implements Serializable {public Integer getMaxYAxisValue() {return maxYAxisValue;}-+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/chart/line/line-chart.js b/server-core/src/main/java/io/onedev/server/web/component/chart/line/line-chart.jsindex 9267d586ec..bab3d67bcb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/chart/line/line-chart.js+++ b/server-core/src/main/java/io/onedev/server/web/component/chart/line/line-chart.js@@ -61,10 +61,8 @@ onedev.server.lineChart = {}option.legend.top = 30;}- } else {- let title = lineSeries.lines[0].name;- if (lineSeries.seriesName)- title = lineSeries.seriesName + " / " + title;+ } else if (lineSeries.seriesName) {+ let title = lineSeries.seriesName;option.title = {text: title,left: 'center',@@ -103,7 +101,7 @@ onedev.server.lineChart = {let xAxisValue = lineSeries.xAxisValues[i];option.xAxis.data.push(xAxisValue);for (const j in lineSeries.lines) {- option.series[j].data.push(lineSeries.lines[j].yAxisValues[xAxisValue]);+ option.series[j].data.push(lineSeries.lines[j].yAxisValues[i]);}};if (yAxisValueFormatter) {@@ -127,7 +125,9 @@ onedev.server.lineChart = {chart.setOption(option);$chart.on("resized", function() {- chart.resize();+ setTimeout(function(){+ chart.resize();+ });});} else {$chart.append("No Data").addClass("d-flex align-items-center h1 text-muted justify-content-center");diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.javaindex 9ddbc765c2..9afcdc48ef 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java@@ -11,7 +11,7 @@ import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.codecomment.CodeCommentQuery;import io.onedev.server.search.entity.codecomment.UnresolvedCriteria;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.util.Provider;import io.onedev.server.util.UrlUtils;import io.onedev.server.web.UrlManager;diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.javaindex f1ab0358c2..91fd3d04ef 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java@@ -59,7 +59,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.CompareContext;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.util.UrlUtils;import io.onedev.server.util.facade.UserCache;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.javaindex a33245ff09..b95a65507b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java@@ -64,7 +64,8 @@ public abstract class CommandPalettePanel extends Panel {private static final PatternSet eeUrlPatterns = PatternSet.parse("" +"~dashboards/** ~code-search/** ~administration/settings/storage-setting " +- "~administration/cluster ~administration/settings/time-tracking ${project}/~timesheets");+ "~administration/cluster ~administration/settings/time-tracking ${project}/~timesheets " ++ "${project}/~stats/pull-request-duration ${project}/~stats/build-duration ${project}/~stats/build-frequency");static {for (IRequestMapper mapper: OneDev.getInstance(WebApplication.class).getRequestMappers())diff --git a/server-core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.java b/server-core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.javaindex 94dd942313..2c40589ad8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;import org.eclipse.jgit.lib.PersonIdent;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.PersonIdentPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.javaindex 9fe3ad8e99..34686e9af4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java@@ -56,7 +56,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.util.Pair;import io.onedev.server.util.diff.DiffBlock;import io.onedev.server.util.diff.DiffMatchPatch.Operation;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.javaindex c4d9ac92a0..a7fdc13290 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java@@ -9,7 +9,7 @@ import org.apache.wicket.model.IModel;import io.onedev.server.model.IssueChange;import io.onedev.server.notification.ActivityDetail;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;@SuppressWarnings("serial")class IssueChangePanel extends GenericPanel<IssueChange> {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.javaindex 7d2ea564d6..7442b9a1ce 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java@@ -10,7 +10,7 @@ import io.onedev.server.model.IssueComment;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.util.facade.UserCache;import io.onedev.server.web.component.comment.CommentPanel;import io.onedev.server.web.component.markdown.ContentVersionSupport;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.javaindex 7ff61b0d7d..b70e43e8f1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java@@ -19,7 +19,7 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.util.facade.UserCache;import io.onedev.server.web.component.markdown.ContentVersionSupport;import io.onedev.server.web.component.comment.CommentPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.javaindex 10bda55b8a..a94d7ff4d0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java@@ -5,7 +5,7 @@ import io.onedev.server.entitymanager.IssueWorkManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.IssueWork;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;import io.onedev.server.web.component.markdown.MarkdownViewer;import io.onedev.server.web.editable.BeanContext;@@ -26,7 +26,7 @@ import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;-import static io.onedev.server.util.DateUtils.formatDateTime;+import static io.onedev.server.util.date.DateUtils.formatDateTime;@SuppressWarnings("serial")class IssueWorkPanel extends GenericPanel<IssueWork> {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListActionRenderer.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListActionRenderer.javanew file mode 100644index 0000000000..1964e56f92--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListActionRenderer.java@@ -0,0 +1,8 @@+package io.onedev.server.web.component.issue.list;++import io.onedev.commons.loader.ExtensionPoint;+import io.onedev.server.web.ComponentRenderer;++@ExtensionPoint+public interface IssueListActionRenderer extends ComponentRenderer {+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.htmlindex 4edfea1092..746f32f66d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html@@ -34,6 +34,7 @@<a wicket:id="showProgress" class="text-gray mr-4 mb-2 d-inline-block text-nowrap"><wicket:svg href="clock" class="icon"></wicket:svg> Timing</a>+ <span wicket:id="extraActions"></span><span wicket:id="count" class="float-right text-gray"></span></div><div wicket:id="body" class="body">diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex 4243a57d93..e4b0cdb57c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -22,10 +22,10 @@ import io.onedev.server.search.entity.issue.IssueQueryParseOption;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessProject;import io.onedev.server.timetracking.TimeTrackingManager;-import io.onedev.server.util.DateUtils;import io.onedev.server.util.Input;import io.onedev.server.util.LinkSide;import io.onedev.server.util.ProjectScope;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.util.facade.ProjectCache;import io.onedev.server.util.watch.WatchStatus;import io.onedev.server.web.WebConstants;@@ -38,8 +38,8 @@ import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.issue.IssueStateBadge;import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;-import io.onedev.server.web.component.issue.link.IssueLinksPanel;import io.onedev.server.web.component.issue.iteration.IterationCrumbPanel;+import io.onedev.server.web.component.issue.link.IssueLinksPanel;import io.onedev.server.web.component.issue.operation.TransitionMenuLink;import io.onedev.server.web.component.issue.progress.IssueProgressPanel;import io.onedev.server.web.component.issue.progress.QueriedIssuesProgressPanel;@@ -358,6 +358,11 @@ public abstract class IssueListPanel extends Panel {}});++ var extraActionsView = new RepeatingView("extraActions");+ add(extraActionsView);+ for (var renderer: OneDev.getExtensions(IssueListActionRenderer.class))+ extraActionsView.add(renderer.render(extraActionsView.newChildId()));queryInput = new TextField<String>("input", queryStringModel);diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.javaindex f06d06c1e8..f46cea0241 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java@@ -11,7 +11,7 @@ import io.onedev.server.model.IssueWork;import io.onedev.server.model.Stopwatch;import io.onedev.server.security.SecurityUtils;import io.onedev.server.timetracking.TimeTrackingManager;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.util.editbean.IssueWorkBean;diff --git a/server-core/src/main/java/io/onedev/server/web/component/iteration/IterationDateLabel.java b/server-core/src/main/java/io/onedev/server/web/component/iteration/IterationDateLabel.javaindex ba827543c4..6b90980196 100644--- a/server-core/src/main/java/io/onedev/server/web/component/iteration/IterationDateLabel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/iteration/IterationDateLabel.java@@ -8,7 +8,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.model.Iteration;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.component.svg.SpriteImage;@SuppressWarnings("serial")diff --git a/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.java b/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.javaindex c5f0a999da..d7889918e7 100644--- a/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.java@@ -1,7 +1,6 @@package io.onedev.server.web.component.iteration.burndown;import io.onedev.server.OneDev;-import io.onedev.server.xodus.IssueInfoManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueSchedule;@@ -12,6 +11,7 @@ import io.onedev.server.model.support.issue.field.spec.WorkingPeriodField;import io.onedev.server.web.component.chart.line.Line;import io.onedev.server.web.component.chart.line.LineChartPanel;import io.onedev.server.web.component.chart.line.LineSeries;+import io.onedev.server.xodus.IssueInfoManager;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.GenericPanel;@@ -23,7 +23,7 @@ import javax.annotation.Nullable;import java.time.LocalDate;import java.util.*;-import static io.onedev.server.util.DateUtils.toLocalDate;+import static io.onedev.server.util.date.DateUtils.toLocalDate;import static io.onedev.server.web.component.iteration.burndown.BurndownIndicators.*;public class IterationBurndownPanel extends GenericPanel<Iteration> {@@ -66,10 +66,6 @@ public class IterationBurndownPanel extends GenericPanel<Iteration> {var fragment = new Fragment("content", "chartFrag", this);fragment.add(new LineChartPanel("chart", new LoadableDetachableModel<>() {- private String getXAxisValue(LocalDate date) {- return String.format("%02d-%02d", date.getMonthValue(), date.getDayOfMonth());- }-@Overrideprotected LineSeries load() {long startDay = toLocalDate(getIteration().getStartDate()).toEpochDay();@@ -106,33 +102,40 @@ public class IterationBurndownPanel extends GenericPanel<Iteration> {}List<String> xAxisValues = new ArrayList<>();- for (Long day : dailyStateMetrics.keySet())- xAxisValues.add(getXAxisValue(LocalDate.ofEpochDay(day)));+ for (Long day : dailyStateMetrics.keySet()) {+ var date = LocalDate.ofEpochDay(day);+ xAxisValues.add(String.format("%02d-%02d", date.getMonthValue(), date.getDayOfMonth()));+ }List<Line> lines = new ArrayList<>();int initialIssueMetric = 0;long today = LocalDate.now().toEpochDay();for (StateSpec spec : OneDev.getInstance(SettingManager.class).getIssueSetting().getStateSpecs()) {- Map<String, Integer> yAxisValues = new HashMap<>();+ List<Integer> yAxisValues = new ArrayList<>();for (Map.Entry<Long, Map<String, Integer>> entry : dailyStateMetrics.entrySet()) {if (entry.getKey() <= today) {- var date = LocalDate.ofEpochDay(entry.getKey());int metric = entry.getValue().getOrDefault(spec.getName(), 0);- yAxisValues.put(getXAxisValue(date), metric);+ yAxisValues.add(metric);+ } else {+ yAxisValues.add(null);}}- Integer stateMetric = yAxisValues.get(getXAxisValue(LocalDate.ofEpochDay(startDay)));+ Integer stateMetric = yAxisValues.get(0);if (stateMetric == null)stateMetric = 0;initialIssueMetric += stateMetric;lines.add(new Line(spec.getName(), yAxisValues, spec.getColor(), "States", null));}- Map<String, Integer> guidelineYAxisValues = new HashMap<>();- if (!xAxisValues.isEmpty()) {- guidelineYAxisValues.put(xAxisValues.get(0), initialIssueMetric);- guidelineYAxisValues.put(xAxisValues.get(xAxisValues.size() - 1), 0);+ List<Integer> guidelineYAxisValues = new ArrayList<>();+ if (xAxisValues.size() > 1) {+ guidelineYAxisValues.add(initialIssueMetric);+ for (var i=2; i<xAxisValues.size(); i++)+ guidelineYAxisValues.add(null);+ guidelineYAxisValues.add(0);+ } else if (xAxisValues.size() == 1) {+ guidelineYAxisValues.add(initialIssueMetric);}lines.add(new Line("Guide Line", guidelineYAxisValues, "#7E8299", null, "dashed"));diff --git a/server-core/src/main/java/io/onedev/server/web/component/link/StatsGroupMenuLink.java b/server-core/src/main/java/io/onedev/server/web/component/link/StatsGroupMenuLink.javanew file mode 100644index 0000000000..6dbe967132--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/link/StatsGroupMenuLink.java@@ -0,0 +1,56 @@+package io.onedev.server.web.component.link;++import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.menu.MenuItem;+import io.onedev.server.web.component.menu.MenuLink;+import io.onedev.server.web.util.StatsGroup;+import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.markup.html.WebMarkupContainer;++import java.util.ArrayList;+import java.util.List;++public abstract class StatsGroupMenuLink extends MenuLink {++ public StatsGroupMenuLink(String id) {+ super(id);+ }++ @Override+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {+ var menuItems = new ArrayList<MenuItem>();+ for (var group: StatsGroup.values()) {+ menuItems.add(new MenuItem() {+ @Override+ public String getLabel() {+ return StringUtils.capitalize(group.name().replace("_", " ").toLowerCase());+ }++ @Override+ public boolean isSelected() {+ return group == getSelectedGroup();+ }++ @Override+ public WebMarkupContainer newLink(String id) {+ return new AjaxLink<Void>(id) {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onSelect(target, group);+ dropdown.close();+ }+ };+ }+ });+ }+ return menuItems;+ }++ protected abstract StatsGroup getSelectedGroup();++ protected abstract void onSelect(AjaxRequestTarget target, StatsGroup group);++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.javaindex ef6a24d42e..b0170cf685 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java@@ -13,7 +13,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ColorUtils;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.asset.emoji.Emojis;import io.onedev.server.web.asset.lozad.LozadResourceReference;import io.onedev.server.web.avatar.AvatarManager;diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.javaindex 8366a305b2..fb91286f2f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java@@ -11,7 +11,7 @@ import io.onedev.server.search.entity.pack.PackQuery;import io.onedev.server.search.entity.pack.PackQueryLexer;import io.onedev.server.search.entity.pack.TypeCriteria;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;import io.onedev.server.web.behavior.PackQueryBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.javaindex 3e88116c4f..63498e66af 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java@@ -15,7 +15,7 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryLexer;import io.onedev.server.search.entity.issue.IssueQueryParseOption;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.component.entity.labels.EntityLabelsPanel;import io.onedev.server.web.component.pack.choice.PackChoiceProvider;diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.javaindex 06889cb856..be1baaa7ba 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java@@ -14,10 +14,10 @@ import io.onedev.server.search.entity.project.ChildrenOfCriteria;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.CreateChildren;-import io.onedev.server.util.ProjectBuildStats;-import io.onedev.server.util.ProjectIssueStats;-import io.onedev.server.util.ProjectPackStats;-import io.onedev.server.util.ProjectPullRequestStats;+import io.onedev.server.util.ProjectBuildStatusStat;+import io.onedev.server.util.ProjectIssueStateStat;+import io.onedev.server.util.ProjectPackTypeStat;+import io.onedev.server.util.ProjectPullRequestStatusStat;import io.onedev.server.util.facade.ProjectCache;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.web.WebConstants;@@ -108,54 +108,54 @@ public class ProjectListPanel extends Panel {};- private final IModel<List<ProjectIssueStats>> issueStatsModel =+ private final IModel<List<ProjectIssueStateStat>> issueStatsModel =new LoadableDetachableModel<>() {@Override- protected List<ProjectIssueStats> load() {+ protected List<ProjectIssueStateStat> load() {List<Project> projects = new ArrayList<>();for (Component row : (WebMarkupContainer) projectsTable.get("body").get("rows"))projects.add((Project) row.getDefaultModelObject());- return OneDev.getInstance(IssueManager.class).queryStats(projects);+ return OneDev.getInstance(IssueManager.class).queryStateStats(projects);}};- private final IModel<List<ProjectBuildStats>> buildStatsModel =+ private final IModel<List<ProjectBuildStatusStat>> buildStatsModel =new LoadableDetachableModel<>() {@Override- protected List<ProjectBuildStats> load() {+ protected List<ProjectBuildStatusStat> load() {List<Project> projects = new ArrayList<>();for (Component row : (WebMarkupContainer) projectsTable.get("body").get("rows"))projects.add((Project) row.getDefaultModelObject());- return OneDev.getInstance(BuildManager.class).queryStats(projects);+ return OneDev.getInstance(BuildManager.class).queryStatusStats(projects);}};- private final IModel<List<ProjectPackStats>> packStatsModel =+ private final IModel<List<ProjectPackTypeStat>> packStatsModel =new LoadableDetachableModel<>() {@Override- protected List<ProjectPackStats> load() {+ protected List<ProjectPackTypeStat> load() {List<Project> projects = new ArrayList<>();for (Component row : (WebMarkupContainer) projectsTable.get("body").get("rows"))projects.add((Project) row.getDefaultModelObject());- return OneDev.getInstance(PackManager.class).queryStats(projects);+ return OneDev.getInstance(PackManager.class).queryTypeStats(projects);}};- private final IModel<List<ProjectPullRequestStats>> pullRequestStatsModel =+ private final IModel<List<ProjectPullRequestStatusStat>> pullRequestStatsModel =new LoadableDetachableModel<>() {@Override- protected List<ProjectPullRequestStats> load() {+ protected List<ProjectPullRequestStatusStat> load() {List<Project> projects = new ArrayList<>();for (Component row : (WebMarkupContainer) projectsTable.get("body").get("rows"))projects.add((Project) row.getDefaultModelObject());- return OneDev.getInstance(PullRequestManager.class).queryStats(projects);+ return OneDev.getInstance(PullRequestManager.class).queryStatusStats(projects);}};@@ -1096,7 +1096,7 @@ public class ProjectListPanel extends Panel {@Overrideprotected Map<PullRequest.Status, Long> load() {Map<PullRequest.Status, Long> statusCounts = new LinkedHashMap<>();- for (ProjectPullRequestStats stats: pullRequestStatsModel.getObject()) {+ for (ProjectPullRequestStatusStat stats: pullRequestStatsModel.getObject()) {if (stats.getProjectId().equals(projectId))statusCounts.put(stats.getPullRequestStatus(), stats.getStatusCount());}@@ -1116,7 +1116,7 @@ public class ProjectListPanel extends Panel {protected Map<Integer, Long> load() {Map<Integer, Long> stateCounts = new LinkedHashMap<>();GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();- for (ProjectIssueStats stats : issueStatsModel.getObject()) {+ for (ProjectIssueStateStat stats : issueStatsModel.getObject()) {if (stats.getProjectId().equals(projectId)&& stats.getStateOrdinal() >= 0&& stats.getStateOrdinal() < issueSetting.getStateSpecs().size()) {@@ -1137,7 +1137,7 @@ public class ProjectListPanel extends Panel {@Overrideprotected Map<Build.Status, Long> load() {Map<Build.Status, Long> statusCounts = new LinkedHashMap<>();- for (ProjectBuildStats stats : buildStatsModel.getObject()) {+ for (ProjectBuildStatusStat stats : buildStatsModel.getObject()) {if (stats.getProjectId().equals(projectId))statusCounts.put(stats.getBuildStatus(), stats.getStatusCount());}@@ -1154,7 +1154,7 @@ public class ProjectListPanel extends Panel {@Overrideprotected Map<String, Long> load() {Map<String, Long> statusCounts = new LinkedHashMap<>();- for (ProjectPackStats stats : packStatsModel.getObject()) {+ for (ProjectPackTypeStat stats : packStatsModel.getObject()) {if (stats.getProjectId().equals(projectId))statusCounts.put(stats.getType(), stats.getTypeCount());}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListActionRenderer.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListActionRenderer.javanew file mode 100644index 0000000000..605e753800--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListActionRenderer.java@@ -0,0 +1,8 @@+package io.onedev.server.web.component.pullrequest.list;++import io.onedev.commons.loader.ExtensionPoint;+import io.onedev.server.web.ComponentRenderer;++@ExtensionPoint+public interface PullRequestListActionRenderer extends ComponentRenderer {+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.htmlindex accb9c05a2..a11f9f359f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html@@ -25,6 +25,7 @@<a wicket:id="orderBy" class="order-by text-gray mr-4 mb-2 text-nowrap d-inline-block"><wicket:svg href="sort" class="icon"></wicket:svg> Order By</a>+ <span wicket:id="extraActions"></span><span wicket:id="count" class="float-right text-gray"></span></div><div wicket:id="body" class="body">diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.javaindex 7b8fa72b49..15193931af 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java@@ -18,7 +18,7 @@ import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.ReadCode;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.util.watch.WatchStatus;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;@@ -731,7 +731,12 @@ public abstract class PullRequestListPanel extends Panel {});}- });+ });++ var extraActionsView = new RepeatingView("extraActions");+ add(extraActionsView);+ for (var renderer: OneDev.getExtensions(PullRequestListActionRenderer.class))+ extraActionsView.add(renderer.render(extraActionsView.newChildId()));queryInput = new TextField<String>("input", queryStringModel);queryInput.add(new PullRequestQueryBehavior(new AbstractReadOnlyModel<Project>() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/tabbable/PageTab.java b/server-core/src/main/java/io/onedev/server/web/component/tabbable/PageTab.javaindex eacc159bc1..daa6d7d7aa 100644--- a/server-core/src/main/java/io/onedev/server/web/component/tabbable/PageTab.java+++ b/server-core/src/main/java/io/onedev/server/web/component/tabbable/PageTab.java@@ -4,6 +4,7 @@ import io.onedev.server.web.util.WicketUtils;import org.apache.wicket.Component;import org.apache.wicket.Page;import org.apache.wicket.model.IModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;import javax.annotation.Nullable;import java.util.ArrayList;@@ -19,74 +20,77 @@ public class PageTab extends Tab {private final Class<? extends Page> mainPageClass;+ private final PageParameters mainPageParams;+private final List<Class<? extends Page>> additionalPageClasses;- public PageTab(IModel<String> titleModel, IModel<String> iconModel, Class<? extends Page> mainPageClass,- List<Class<? extends Page>> additionalPageClasses) {+ public PageTab(IModel<String> titleModel, IModel<String> iconModel, Class<? extends Page> mainPageClass,+ PageParameters mainPageParams, List<Class<? extends Page>> additionalPageClasses) {this.titleModel = titleModel;this.iconModel = iconModel;this.mainPageClass = mainPageClass;+ this.mainPageParams = mainPageParams;this.additionalPageClasses = additionalPageClasses;}- public PageTab(IModel<String> titleModel, IModel<String> iconModel, Class<? extends Page> mainPageClass) {- this(titleModel, iconModel, mainPageClass, new ArrayList<>());+ public PageTab(IModel<String> titleModel, IModel<String> iconModel, Class<? extends Page> mainPageClass,+ PageParameters mainPageParams) {+ this(titleModel, iconModel, mainPageClass, mainPageParams, new ArrayList<>());}public PageTab(IModel<String> titleModel, IModel<String> iconModel, Class<? extends Page> mainPageClass,- Class<? extends Page> additionalPageClass) {- this(titleModel, iconModel, mainPageClass, asList(additionalPageClass));+ PageParameters mainPageParams, Class<? extends Page> additionalPageClass) {+ this(titleModel, iconModel, mainPageClass, mainPageParams, asList(additionalPageClass));}- public PageTab(IModel<String> titleModel, IModel<String> iconModel, Class<? extends Page> mainPageClass,- Class<? extends Page> additionalPageClass1, Class<? extends Page> additionalPageClass2) {- this(titleModel, iconModel, mainPageClass, asList(additionalPageClass1, additionalPageClass2));+ public PageTab(IModel<String> titleModel, IModel<String> iconModel, Class<? extends Page> mainPageClass,+ PageParameters mainPageParams, Class<? extends Page> additionalPageClass1,+ Class<? extends Page> additionalPageClass2) {+ this(titleModel, iconModel, mainPageClass, mainPageParams, asList(additionalPageClass1, additionalPageClass2));}- public PageTab(IModel<String> titleModel, IModel<String> iconModel, Class<? extends Page> mainPageClass,- Class<? extends Page> additionalPageClass1,- Class<? extends Page> additionalPageClass2,- Class<? extends Page> additionalPageClass3) {- this(titleModel, iconModel, mainPageClass, asList(additionalPageClass1,+ public PageTab(IModel<String> titleModel, IModel<String> iconModel, Class<? extends Page> mainPageClass,+ PageParameters mainPageParams, Class<? extends Page> additionalPageClass1,+ Class<? extends Page> additionalPageClass2, Class<? extends Page> additionalPageClass3) {+ this(titleModel, iconModel, mainPageClass, mainPageParams, asList(additionalPageClass1,additionalPageClass2, additionalPageClass3));}- public PageTab(IModel<String> titleModel, Class<? extends Page> mainPageClass,+ public PageTab(IModel<String> titleModel, Class<? extends Page> mainPageClass, PageParameters mainPageParams,List<Class<? extends Page>> additionalPageClasses) {- this(titleModel, null, mainPageClass, additionalPageClasses);+ this(titleModel, null, mainPageClass, mainPageParams, additionalPageClasses);}- public PageTab(IModel<String> titleModel, Class<? extends Page> mainPageClass) {- this(titleModel, null, mainPageClass, new ArrayList<Class<? extends Page>>());+ public PageTab(IModel<String> titleModel, Class<? extends Page> mainPageClass, PageParameters mainPageParams) {+ this(titleModel, null, mainPageClass, mainPageParams, new ArrayList<>());}public PageTab(IModel<String> titleModel, Class<? extends Page> mainPageClass,- Class<? extends Page> additionalPageClass) {- this(titleModel, null, mainPageClass, asList(additionalPageClass));+ PageParameters mainPageParams, Class<? extends Page> additionalPageClass) {+ this(titleModel, null, mainPageClass, mainPageParams, asList(additionalPageClass));}- public PageTab(IModel<String> titleModel, Class<? extends Page> mainPageClass,+ public PageTab(IModel<String> titleModel, Class<? extends Page> mainPageClass, PageParameters mainPageParams,Class<? extends Page> additionalPageClass1, Class<? extends Page> additionalPageClass2) {- this(titleModel, null, mainPageClass, asList(additionalPageClass1, additionalPageClass2));+ this(titleModel, null, mainPageClass, mainPageParams, asList(additionalPageClass1, additionalPageClass2));}- public PageTab(IModel<String> titleModel, Class<? extends Page> mainPageClass,- Class<? extends Page> additionalPageClass1,- Class<? extends Page> additionalPageClass2,+ public PageTab(IModel<String> titleModel, Class<? extends Page> mainPageClass, PageParameters mainPageParams,+ Class<? extends Page> additionalPageClass1, Class<? extends Page> additionalPageClass2,Class<? extends Page> additionalPageClass3) {- this(titleModel, null, mainPageClass, asList(additionalPageClass1,+ this(titleModel, null, mainPageClass, mainPageParams, asList(additionalPageClass1,additionalPageClass2, additionalPageClass3));}private static List<Class<? extends Page>> asList(Class<? extends Page> pageClass) {- List<Class<? extends Page>> pageClasses = new ArrayList<Class<? extends Page>>();+ List<Class<? extends Page>> pageClasses = new ArrayList<>();pageClasses.add(pageClass);return pageClasses;}private static List<Class<? extends Page>> asList(Class<? extends Page> pageClass1,Class<? extends Page> pageClass2) {- List<Class<? extends Page>> pageClasses = new ArrayList<Class<? extends Page>>();+ List<Class<? extends Page>> pageClasses = new ArrayList<>();pageClasses.add(pageClass1);pageClasses.add(pageClass2);return pageClasses;@@ -94,7 +98,7 @@ public class PageTab extends Tab {private static List<Class<? extends Page>> asList(Class<? extends Page> pageClass1,Class<? extends Page> pageClass2, Class<? extends Page> pageClass3) {- List<Class<? extends Page>> pageClasses = new ArrayList<Class<? extends Page>>();+ List<Class<? extends Page>> pageClasses = new ArrayList<>();pageClasses.add(pageClass1);pageClasses.add(pageClass2);pageClasses.add(pageClass3);@@ -104,7 +108,7 @@ public class PageTab extends Tab {private static List<Class<? extends Page>> asList(Class<? extends Page> pageClass1, Class<? extends Page> pageClass2,Class<? extends Page> pageClass3, Class<? extends Page> pageClass4) {- List<Class<? extends Page>> pageClasses = new ArrayList<Class<? extends Page>>();+ List<Class<? extends Page>> pageClasses = new ArrayList<>();pageClasses.add(pageClass1);pageClasses.add(pageClass2);pageClasses.add(pageClass3);@@ -116,7 +120,7 @@ public class PageTab extends Tab {Class<? extends Page> pageClass1, Class<? extends Page> pageClass2,Class<? extends Page> pageClass3, Class<? extends Page> pageClass4,Class<? extends Page> pageClass5) {- List<Class<? extends Page>> pageClasses = new ArrayList<Class<? extends Page>>();+ List<Class<? extends Page>> pageClasses = new ArrayList<>();pageClasses.add(pageClass1);pageClasses.add(pageClass2);pageClasses.add(pageClass3);@@ -141,7 +145,11 @@ public class PageTab extends Tab {public final Class<? extends Page> getMainPageClass() {return mainPageClass;}-++ public PageParameters getMainPageParams() {+ return mainPageParams;+ }+/*** Override this to provide your own logic of populating tab item (the <li> element).*diff --git a/server-core/src/main/java/io/onedev/server/web/component/tabbable/PageTabHead.java b/server-core/src/main/java/io/onedev/server/web/component/tabbable/PageTabHead.javaindex 110dd346b3..1634905be9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/tabbable/PageTabHead.java+++ b/server-core/src/main/java/io/onedev/server/web/component/tabbable/PageTabHead.java@@ -7,6 +7,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.request.mapper.parameter.PageParameters;public class PageTabHead extends Panel {@@ -23,7 +24,7 @@ public class PageTabHead extends Panel {protected void onInitialize() {super.onInitialize();- Link<?> link = newLink("link", tab.getMainPageClass());+ Link<?> link = newLink("link", tab.getMainPageClass(), tab.getMainPageParams());add(link);if (tab.getIconModel() != null)link.add(new SpriteImage("icon", tab.getIconModel()));@@ -32,8 +33,8 @@ public class PageTabHead extends Panel {link.add(new Label("label", tab.getTitleModel()));}- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new ViewStateAwarePageLink<Void>(linkId, pageClass);+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass, PageParameters pageParams) {+ return new ViewStateAwarePageLink<Void>(linkId, pageClass, pageParams);}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/SshKeyListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/SshKeyListPanel.javaindex fee679a15e..732c36c80b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/SshKeyListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/SshKeyListPanel.java@@ -3,7 +3,7 @@ package io.onedev.server.web.component.user.sshkey;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SshKeyManager;import io.onedev.server.model.SshKey;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;import io.onedev.server.web.component.datatable.DefaultDataTable;import io.onedev.server.web.util.LoadableDetachableDataProvider;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/date/DateEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/date/DateEditSupport.javaindex 764f1498c6..71e5e9131f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/date/DateEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/date/DateEditSupport.java@@ -7,7 +7,7 @@ import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.javaindex 9d8b75a11c..e5829b4c8c 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java@@ -59,7 +59,7 @@ public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {Map<String, String> choices = new LinkedHashMap<>();for (Iterator<?> it = EnumSet.allOf(enumClass).iterator(); it.hasNext(); ) {Enum<?> value = (Enum<?>) it.next();- choices.put(value.name(), TextUtils.getDisplayValue(value));+ choices.put(value.name(), TextUtils.getDisplayValue(value));}return choices;}diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.javaindex 708790a9eb..4b1c064aa2 100644--- a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java@@ -117,8 +117,8 @@ import io.onedev.server.web.page.project.setting.general.GeneralProjectSettingPaimport io.onedev.server.web.page.project.setting.pluginsettings.ContributedProjectSettingPage;import io.onedev.server.web.page.project.setting.servicedesk.ServiceDeskSettingPage;import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;-import io.onedev.server.web.page.project.stats.ProjectContribsPage;-import io.onedev.server.web.page.project.stats.SourceLinesPage;+import io.onedev.server.web.page.project.stats.code.CodeContribsPage;+import io.onedev.server.web.page.project.stats.code.SourceLinesPage;import io.onedev.server.web.page.project.tags.ProjectTagsPage;import io.onedev.server.web.page.pullrequests.PullRequestListPage;import io.onedev.server.web.page.simple.error.PageNotFoundErrorPage;@@ -319,8 +319,8 @@ public class BaseUrlMapper extends CompoundRequestMapper {add(new ProjectPageMapper("${project}/~commits", ProjectCommitsPage.class));add(new ProjectPageMapper("${project}/~commits/${commit}", CommitDetailPage.class));add(new ProjectPageMapper("${project}/~compare", RevisionComparePage.class));- add(new ProjectPageMapper("${project}/~stats/contribs", ProjectContribsPage.class));- add(new ProjectPageMapper("${project}/~stats/lines", SourceLinesPage.class));+ add(new ProjectPageMapper("${project}/~stats/code/contribs", CodeContribsPage.class));+ add(new ProjectPageMapper("${project}/~stats/code/lines", SourceLinesPage.class));add(new ProjectPageMapper("${project}/~branches", ProjectBranchesPage.class));add(new ProjectPageMapper("${project}/~tags", ProjectTagsPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDetailPage.javaindex 576e6f2cd0..6b250daeda 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDetailPage.java@@ -1,29 +1,24 @@package io.onedev.server.web.page.admin.buildsetting.agent;-import java.util.ArrayList;-import java.util.List;-+import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.AgentManager;+import io.onedev.server.model.Agent;+import io.onedev.server.web.component.tabbable.PageTab;+import io.onedev.server.web.component.tabbable.Tab;+import io.onedev.server.web.component.tabbable.Tabbable;+import io.onedev.server.web.page.admin.AdministrationPage;import org.apache.wicket.Component;-import org.apache.wicket.Page;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.commons.utils.ExplicitException;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.AgentManager;-import io.onedev.server.model.Agent;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.tabbable.PageTab;-import io.onedev.server.web.component.tabbable.PageTabHead;-import io.onedev.server.web.component.tabbable.Tab;-import io.onedev.server.web.component.tabbable.Tabbable;-import io.onedev.server.web.page.admin.AdministrationPage;+import java.util.ArrayList;+import java.util.List;@SuppressWarnings("serial")public abstract class AgentDetailPage extends AdministrationPage {@@ -63,9 +58,9 @@ public abstract class AgentDetailPage extends AdministrationPage {List<Tab> tabs = new ArrayList<>();- tabs.add(new AgentTab("Overview", AgentOverviewPage.class));- tabs.add(new AgentTab("Builds", AgentBuildsPage.class));- tabs.add(new AgentTab("Log", AgentLogPage.class));+ tabs.add(new PageTab(Model.of("Overview"), AgentOverviewPage.class, AgentOverviewPage.paramsOf(getAgent())));+ tabs.add(new PageTab(Model.of("Builds"), AgentBuildsPage.class, AgentBuildsPage.paramsOf(getAgent())));+ tabs.add(new PageTab(Model.of("Log"), AgentLogPage.class, AgentLogPage.paramsOf(getAgent())));add(new Tabbable("agentTabs", tabs).setOutputMarkupId(true));}@@ -97,24 +92,4 @@ public abstract class AgentDetailPage extends AdministrationPage {return params;}- private class AgentTab extends PageTab {-- public AgentTab(String title, Class<? extends Page> pageClass) {- super(Model.of(title), pageClass);- }-- @Override- public Component render(String componentId) {- return new PageTabHead(componentId, this) {-- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new ViewStateAwarePageLink<Void>(linkId, pageClass, paramsOf(getAgent()));- }-- };- }-- }-}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/GroupPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/GroupPage.javaindex 1b87f2982a..746445df62 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/GroupPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/GroupPage.java@@ -1,8 +1,15 @@package io.onedev.server.web.page.admin.groupmanagement;-import java.util.ArrayList;-import java.util.List;-+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.model.Group;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.component.tabbable.PageTab;+import io.onedev.server.web.component.tabbable.Tabbable;+import io.onedev.server.web.page.admin.AdministrationPage;+import io.onedev.server.web.page.admin.groupmanagement.authorization.GroupAuthorizationsPage;+import io.onedev.server.web.page.admin.groupmanagement.membership.GroupMembershipsPage;+import io.onedev.server.web.page.admin.groupmanagement.profile.GroupProfilePage;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.RestartResponseException;@@ -13,18 +20,11 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.GroupManager;-import io.onedev.server.model.Group;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.component.tabbable.PageTab;-import io.onedev.server.web.component.tabbable.Tabbable;-import io.onedev.server.web.page.admin.AdministrationPage;-import io.onedev.server.web.page.admin.groupmanagement.authorization.GroupAuthorizationsPage;-import io.onedev.server.web.page.admin.groupmanagement.membership.GroupMembershipsPage;-import io.onedev.server.web.page.admin.groupmanagement.profile.GroupProfilePage;+import java.util.ArrayList;+import java.util.List;@SuppressWarnings("serial")public abstract class GroupPage extends AdministrationPage {@@ -58,9 +58,10 @@ public abstract class GroupPage extends AdministrationPage {List<PageTab> tabs = new ArrayList<>();- tabs.add(new GroupTab("Profile", "profile", GroupProfilePage.class));- tabs.add(new GroupTab("Members", "members", GroupMembershipsPage.class));- tabs.add(new GroupTab("Authorized Projects", "project", GroupAuthorizationsPage.class));+ var params = paramsOf(getGroup());+ tabs.add(new PageTab(Model.of("Profile"), Model.of("profile"), GroupProfilePage.class, params));+ tabs.add(new PageTab(Model.of("Members"), Model.of("members"), GroupMembershipsPage.class, params));+ tabs.add(new PageTab(Model.of("Authorized Projects"), Model.of("project"), GroupAuthorizationsPage.class, params));add(new Tabbable("groupTabs", tabs));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/GroupTab.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/GroupTab.javadeleted file mode 100644index 55e66f4fe2..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/GroupTab.java+++ /dev/null@@ -1,52 +0,0 @@-package io.onedev.server.web.page.admin.groupmanagement;--import org.apache.wicket.Component;-import org.apache.wicket.model.Model;--import io.onedev.server.web.component.tabbable.PageTab;--@SuppressWarnings("serial")-public class GroupTab extends PageTab {-- private final String iconHref;-- public GroupTab(String title, String iconHref, Class<? extends GroupPage> mainPageClass) {- super(Model.of(title), mainPageClass);-- this.iconHref = iconHref;- }-- public GroupTab(String title, String iconHref, Class<? extends GroupPage> mainPageClass,- Class<? extends GroupPage> additionalPageClass1) {- super(Model.of(title), mainPageClass, additionalPageClass1);-- this.iconHref = iconHref;- }-- public GroupTab(String title, String iconHref, Class<? extends GroupPage> mainPageClass,- Class<? extends GroupPage> additionalPageClass1,- Class<? extends GroupPage> additionalPageClass2) {- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2);-- this.iconHref = iconHref;- }-- public GroupTab(String title, String iconHref, Class<? extends GroupPage> mainPageClass,- Class<? extends GroupPage> additionalPageClass1,- Class<? extends GroupPage> additionalPageClass2,- Class<? extends GroupPage> additionalPageClass3) {- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2, additionalPageClass3);-- this.iconHref = iconHref;- }-- public String getIconHref() {- return iconHref;- }-- @Override- public Component render(String componentId) {- return new GroupTabHead(componentId, this);- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/GroupTabHead.html b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/GroupTabHead.htmldeleted file mode 100644index 9aca73e53d..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/GroupTabHead.html+++ /dev/null@@ -1,6 +0,0 @@-<wicket:panel>- <a wicket:id="link" class="nav-link">- <svg wicket:id="icon" class="icon"></svg>- <span wicket:id="label" class="text"></span>- </a>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/GroupTabHead.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/GroupTabHead.javadeleted file mode 100644index 943efc3968..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/GroupTabHead.java+++ /dev/null@@ -1,33 +0,0 @@-package io.onedev.server.web.page.admin.groupmanagement;--import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.Panel;--import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.svg.SpriteImage;--@SuppressWarnings("serial")-public class GroupTabHead extends Panel {-- private final GroupTab tab;-- public GroupTabHead(String id, GroupTab tab) {- super(id);-- this.tab = tab;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- GroupPage page = (GroupPage) getPage();- Link<Void> link = new ViewStateAwarePageLink<Void>("link",- tab.getMainPageClass(), GroupPage.paramsOf(page.getGroup()));- link.add(new SpriteImage("icon", tab.getIconHref()));- link.add(new Label("label", tab.getTitleModel()));- add(link);- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.javaindex e1336fac28..4d5cbf5c77 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java@@ -2,7 +2,7 @@ package io.onedev.server.web.page.admin.serverinformation;import io.onedev.server.OneDev;import io.onedev.server.cluster.ClusterManager;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.page.admin.ServerDetailPage;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.html.basic.Label;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.javaindex b3384c0896..cf1f3c6656 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.java@@ -28,6 +28,7 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import java.util.ArrayList;@@ -66,16 +67,17 @@ public abstract class UserPage extends AdministrationPage implements UserAware {List<PageTab> tabs = new ArrayList<>();- tabs.add(new UserTab("Profile", "profile", UserProfilePage.class));- tabs.add(new UserTab("Email Addresses", "mail", UserEmailAddressesPage.class));- tabs.add(new UserTab("Edit Avatar", "avatar", UserAvatarPage.class));+ var params = paramsOf(getUser());+ tabs.add(new PageTab(Model.of("Profile"), Model.of("profile"), UserProfilePage.class, params));+ tabs.add(new PageTab(Model.of("Email Addresses"), Model.of("mail"), UserEmailAddressesPage.class, params));+ tabs.add(new PageTab(Model.of("Edit Avatar"), Model.of("avatar"), UserAvatarPage.class, params));- tabs.add(new UserTab("Change Password", "password", UserPasswordPage.class));- tabs.add(new UserTab("Belonging Groups", "group", UserMembershipsPage.class));- tabs.add(new UserTab("Authorized Projects", "project", UserAuthorizationsPage.class));- tabs.add(new UserTab("SSH Keys", "key", UserSshKeysPage.class));- tabs.add(new UserTab("GPG Keys", "key", UserGpgKeysPage.class));- tabs.add(new UserTab("Access Tokens", "token", UserAccessTokensPage.class));+ tabs.add(new PageTab(Model.of("Change Password"), Model.of("password"), UserPasswordPage.class, params));+ tabs.add(new PageTab(Model.of("Belonging Groups"), Model.of("group"), UserMembershipsPage.class, params));+ tabs.add(new PageTab(Model.of("Authorized Projects"), Model.of("project"), UserAuthorizationsPage.class, params));+ tabs.add(new PageTab(Model.of("SSH Keys"), Model.of("key"), UserSshKeysPage.class, params));+ tabs.add(new PageTab(Model.of("GPG Keys"), Model.of("key"), UserGpgKeysPage.class, params));+ tabs.add(new PageTab(Model.of("Access Tokens"), Model.of("token"), UserAccessTokensPage.class, params));add(new Tabbable("userTabs", tabs));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserTab.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserTab.javadeleted file mode 100644index 12d8858642..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserTab.java+++ /dev/null@@ -1,54 +0,0 @@-package io.onedev.server.web.page.admin.usermanagement;--import javax.annotation.Nullable;--import org.apache.wicket.Component;-import org.apache.wicket.model.Model;--import io.onedev.server.web.component.tabbable.PageTab;--@SuppressWarnings("serial")-public class UserTab extends PageTab {-- private final String iconHref;-- public UserTab(String title, @Nullable String iconHref, Class<? extends UserPage> mainPageClass) {- super(Model.of(title), mainPageClass);-- this.iconHref = iconHref;- }-- public UserTab(String title, @Nullable String iconHref, Class<? extends UserPage> mainPageClass,- Class<? extends UserPage> additionalPageClass1) {- super(Model.of(title), mainPageClass, additionalPageClass1);-- this.iconHref = iconHref;- }-- public UserTab(String title, @Nullable String iconHref, Class<? extends UserPage> mainPageClass,- Class<? extends UserPage> additionalPageClass1,- Class<? extends UserPage> additionalPageClass2) {- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2);-- this.iconHref = iconHref;- }-- public UserTab(String title, @Nullable String iconHref, Class<? extends UserPage> mainPageClass,- Class<? extends UserPage> additionalPageClass1,- Class<? extends UserPage> additionalPageClass2,- Class<? extends UserPage> additionalPageClass3) {- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2, additionalPageClass3);-- this.iconHref = iconHref;- }-- public String getIconHref() {- return iconHref;- }-- @Override- public Component render(String componentId) {- return new UserTabHead(componentId, this);- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserTabHead.html b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserTabHead.htmldeleted file mode 100644index eee6128169..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserTabHead.html+++ /dev/null@@ -1,6 +0,0 @@-<wicket:panel>- <a wicket:id="link" class="nav-link">- <svg wicket:id="icon" class="icon mr-1"></svg>- <span wicket:id="label" class="text"></span>- </a>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserTabHead.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserTabHead.javadeleted file mode 100644index e95e1a08e6..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserTabHead.java+++ /dev/null@@ -1,33 +0,0 @@-package io.onedev.server.web.page.admin.usermanagement;--import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.Panel;--import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.svg.SpriteImage;--@SuppressWarnings("serial")-public class UserTabHead extends Panel {-- private final UserTab tab;-- public UserTabHead(String id, UserTab tab) {- super(id);-- this.tab = tab;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- UserPage page = (UserPage) getPage();- Link<Void> link = new ViewStateAwarePageLink<Void>("link",- tab.getMainPageClass(), UserPage.paramsOf(page.getUser()));- link.add(new SpriteImage("icon", tab.getIconHref()));- link.add(new Label("label", tab.getTitleModel()));- add(link);- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.javaindex e9edcd1c5c..0fac2ee9ec 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java@@ -379,7 +379,12 @@ public abstract class BasePage extends WebPage {}protected Collection<String> getCssClasses() {- return Sets.newHashSet();+ var cssClasses = new HashSet<String>();+ if (WicketUtils.isSubscriptionActive())+ cssClasses.add("enterprise-edition");+ else+ cssClasses.add("community-edition");+ return cssClasses;}public void resizeWindow(IPartialPageRequestHandler handler) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.cssindex 5065ff58eb..3e50e91652 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css@@ -830,3 +830,22 @@ span.keycap {.d-first-child-none:first-child {display: none !important;}++.ee-feature {+ position: relative;+}+.community-edition .ee-feature {+ margin-right: 24px !important;+}+.community-edition .ee-feature::after {+ content: "ee";+ position: absolute;+ top: -3px;+ right: -18px;+ font-size: 8px;+ padding: 0 3px 1px 3px;+ line-height: 10px;+ border-radius: 2px;+ background: #C9F7F5;+ color: #1BC5BD;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.jsindex e2316a141f..2c10c0d700 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js@@ -857,9 +857,11 @@ onedev.server = {seconds = seconds%60;if (seconds != 0)intervals.push(seconds + "s");- return intervals.join(" ");+ if (intervals.length != 0)+ return intervals.join(" ");+ else+ return "0s";},-onDomReady: function(bootTimestamp, icons, popStateCallback) {onedev.server.bootTimestamp = bootTimestamp;onedev.server.icons = icons;diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex e847ab1584..6c538d6218 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -15,7 +15,7 @@ import io.onedev.server.model.support.administration.BrandingSetting;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.updatecheck.UpdateCheckManager;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.ChangeObserver;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 6d4eb3b627..27dbff0421 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -40,11 +40,11 @@ import io.onedev.server.web.page.project.compare.RevisionComparePage;import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;import io.onedev.server.web.page.project.issues.create.NewIssuePage;import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;-import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;import io.onedev.server.web.page.project.issues.iteration.IterationDetailPage;import io.onedev.server.web.page.project.issues.iteration.IterationEditPage;import io.onedev.server.web.page.project.issues.iteration.IterationListPage;import io.onedev.server.web.page.project.issues.iteration.NewIterationPage;+import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;import io.onedev.server.web.page.project.packs.ProjectPacksPage;import io.onedev.server.web.page.project.packs.detail.PackDetailPage;import io.onedev.server.web.page.project.pullrequests.InvalidPullRequestPage;@@ -67,8 +67,8 @@ import io.onedev.server.web.page.project.setting.general.GeneralProjectSettingPaimport io.onedev.server.web.page.project.setting.pluginsettings.ContributedProjectSettingPage;import io.onedev.server.web.page.project.setting.servicedesk.ServiceDeskSettingPage;import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;-import io.onedev.server.web.page.project.stats.ProjectContribsPage;-import io.onedev.server.web.page.project.stats.SourceLinesPage;+import io.onedev.server.web.page.project.stats.code.CodeContribsPage;+import io.onedev.server.web.page.project.stats.code.SourceLinesPage;import io.onedev.server.web.page.project.tags.ProjectTagsPage;import io.onedev.server.web.util.ProjectAware;import org.apache.commons.lang3.StringUtils;@@ -241,10 +241,9 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {List<SidebarMenuItem> statsMenuItems = new ArrayList<>();if (getProject().isCodeManagement() && SecurityUtils.canReadCode(getProject())) {- statsMenuItems.add(new SidebarMenuItem.Page(null, "Contributions",- ProjectContribsPage.class, ProjectContribsPage.paramsOf(getProject())));- statsMenuItems.add(new SidebarMenuItem.Page(null, "Source Lines",- SourceLinesPage.class, SourceLinesPage.paramsOf(getProject())));+ statsMenuItems.add(new SidebarMenuItem.Page(null, "Code",+ CodeContribsPage.class, CodeContribsPage.paramsOf(getProject()),+ Lists.newArrayList(SourceLinesPage.class)));}List<StatisticsMenuContribution> contributions = new ArrayList<>(OneDev.getExtensions(StatisticsMenuContribution.class));@@ -254,7 +253,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {statsMenuItems.addAll(contribution.getMenuItems(getProject()));if (!statsMenuItems.isEmpty())- menuItems.add(new SidebarMenuItem.SubMenu("statistics", "Statistics", statsMenuItems));+ menuItems.add(new SidebarMenuItem.SubMenu("stats", "Statistics", statsMenuItems));menuItems.add(new SidebarMenuItem.Page("tree", "Child Projects",ProjectChildrenPage.class, ProjectChildrenPage.paramsOf(getProject(), null, 0)));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.javaindex ee6d9a803f..59f2b5cac0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.java@@ -10,7 +10,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.asset.emoji.Emojis;import io.onedev.server.web.avatar.AvatarManager;import io.onedev.server.web.page.project.commits.CommitDetailPage;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.javaindex 4f1889f14a..11d7e59f77 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java@@ -27,7 +27,7 @@ import io.onedev.server.model.support.Mark;import io.onedev.server.search.code.CodeSearchManager;import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.util.Similarities;import io.onedev.server.util.diff.DiffUtils;import io.onedev.server.util.patternset.PatternSet;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.htmlindex bc20cedabe..cefe469b57 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html@@ -11,7 +11,7 @@<a wicket:id="rebuild" class="btn btn-icon btn-light btn-hover-primary btn-xs mr-2" title="Re-run this build"><wicket:svg href="re-run" class="icon"/></a><a wicket:id="cancel" class="btn btn-icon btn-light btn-hover-danger btn-xs mr-2" title="Cancel this build"><wicket:svg href="cancel" class="icon"/></a><a wicket:id="edit" title="Edit build description" class="btn btn-icon btn-light btn-hover-primary btn-xs mr-2"><wicket:svg href="edit" class="icon"/></a>- <a wicket:id="terminal" title="Open terminal of current running step" class="btn btn-icon btn-light btn-hover-primary btn-xs mr-2"><wicket:svg href="terminal" class="icon"/></a>+ <a wicket:id="terminal" title="Open terminal of current running step" class="ee-feature btn btn-icon btn-light btn-hover-primary btn-xs mr-2"><wicket:svg href="terminal" class="icon"/></a><a wicket:id="promotions" class="btn btn-icon btn-light btn-hover-primary btn-xs mr-2" title="Promotions"><wicket:svg href="next" class="icon"/></a></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex 11b2335cb0..580dd55d86 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -39,7 +39,6 @@ import io.onedev.server.web.component.markdown.MarkdownViewer;import io.onedev.server.web.component.modal.message.MessageModal;import io.onedev.server.web.component.sideinfo.SideInfoLink;import io.onedev.server.web.component.sideinfo.SideInfoPanel;-import io.onedev.server.web.component.tabbable.PageTabHead;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.page.base.BasePage;@@ -76,6 +75,7 @@ import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;import org.apache.wicket.request.flow.RedirectToUrlException;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -445,7 +445,7 @@ public abstract class BuildDetailPage extends ProjectPageList<Tab> tabs = new ArrayList<>();if (SecurityUtils.canAccessLog(getBuild())) {- tabs.add(new BuildTab("Log", BuildLogPage.class) {+ tabs.add(new BuildTab(Model.of("Log"), BuildLogPage.class, BuildLogPage.paramsOf(getBuild())) {@Overrideprotected Component renderOptions(String componentId) {@@ -457,10 +457,10 @@ public abstract class BuildDetailPage extends ProjectPage}if (SecurityUtils.canAccessPipeline(getBuild()))- tabs.add(new BuildTab("Pipeline", BuildPipelinePage.class));+ tabs.add(new BuildTab(Model.of("Pipeline"), BuildPipelinePage.class, BuildPipelinePage.paramsOf(getBuild())));if (SecurityUtils.canManageBuild(getBuild()) || getBuild().getRootArtifacts().size() != 0) {- tabs.add(new BuildTab("Artifacts", BuildArtifactsPage.class));+ tabs.add(new BuildTab(Model.of("Artifacts"), BuildArtifactsPage.class, BuildArtifactsPage.paramsOf(getBuild())));}var packSupports = new ArrayList<>(OneDev.getExtensions(PackSupport.class));@@ -468,7 +468,7 @@ public abstract class BuildDetailPage extends ProjectPagefor (var packSupport: packSupports) {var packType = packSupport.getPackType();if (getBuild().getPacks().stream().anyMatch(it -> it.getType().equals(packType) && SecurityUtils.canReadPack(it.getProject()))) {- tabs.add(new BuildTab(packSupport.getPackType(), packSupport.getPackIcon(), BuildPacksPage.class) {+ tabs.add(new BuildTab(Model.of(packSupport.getPackType()), Model.of(packSupport.getPackIcon()), BuildPacksPage.class, BuildPacksPage.paramsOf(getBuild(), packType)) {@Overridepublic boolean isActive(Page currentPage) {if (super.isActive(currentPage)) {@@ -482,43 +482,15 @@ public abstract class BuildDetailPage extends ProjectPagereturn false;}}-- @Override- public Component render(String componentId) {- return new PageTabHead(componentId, this) {-- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new ViewStateAwarePageLink<Void>(linkId, pageClass,- BuildPacksPage.paramsOf(getBuild(), packType));- }-- };- }});}}- tabs.add(new BuildTab("Fixed Issues", FixedIssuesPage.class) {-- @Override- public Component render(String componentId) {- return new PageTabHead(componentId, this) {-- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new ViewStateAwarePageLink<Void>(- linkId, pageClass, FixedIssuesPage.paramsOf(getBuild(),- getProject().getHierarchyDefaultFixedIssueQuery(getBuild().getJobName())));- }-- };- }-- });+ var params = FixedIssuesPage.paramsOf(getBuild(), getProject().getHierarchyDefaultFixedIssueQuery(getBuild().getJobName()));+ tabs.add(new BuildTab(Model.of("Fixed Issues"), FixedIssuesPage.class, params));if (SecurityUtils.canReadCode(getProject()))- tabs.add(new BuildTab("Changes", BuildChangesPage.class));+ tabs.add(new BuildTab(Model.of("Changes"), BuildChangesPage.class, BuildChangesPage.paramsOf(getBuild())));List<BuildTabContribution> contributions = new ArrayList<>(OneDev.getExtensions(BuildTabContribution.class));contributions.sort(Comparator.comparing(BuildTabContribution::getOrder));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.javaindex 11cb8b1761..9d2cda2daf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.java@@ -1,70 +1,56 @@package io.onedev.server.web.page.project.builds.detail;import io.onedev.commons.loader.ExtensionPoint;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.tabbable.PageTab;-import io.onedev.server.web.component.tabbable.PageTabHead;-import org.apache.wicket.Component;import org.apache.wicket.Page;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.model.Model;+import org.apache.wicket.model.IModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import java.util.List;@ExtensionPoint@SuppressWarnings("serial")public class BuildTab extends PageTab {- public BuildTab(String title, Class<? extends BuildDetailPage> mainPageClass) {- super(Model.of(title), mainPageClass);++ public BuildTab(IModel<String> titleModel, IModel<String> iconModel, Class<? extends Page> mainPageClass, PageParameters mainPageParams, List<Class<? extends Page>> additionalPageClasses) {+ super(titleModel, iconModel, mainPageClass, mainPageParams, additionalPageClasses);}- public BuildTab(String title, String icon, Class<? extends BuildDetailPage> mainPageClass) {- super(Model.of(title), Model.of(icon), mainPageClass);+ public BuildTab(IModel<String> titleModel, IModel<String> iconModel, Class<? extends Page> mainPageClass, PageParameters mainPageParams) {+ super(titleModel, iconModel, mainPageClass, mainPageParams);}-- public BuildTab(String title, Class<? extends BuildDetailPage> mainPageClass,- Class<? extends BuildDetailPage> additionalPageClass1) {- super(Model.of(title), mainPageClass, additionalPageClass1);++ public BuildTab(IModel<String> titleModel, IModel<String> iconModel, Class<? extends Page> mainPageClass, PageParameters mainPageParams, Class<? extends Page> additionalPageClass) {+ super(titleModel, iconModel, mainPageClass, mainPageParams, additionalPageClass);}- public BuildTab(String title, String icon, Class<? extends BuildDetailPage> mainPageClass,- Class<? extends BuildDetailPage> additionalPageClass1) {- super(Model.of(title), Model.of(icon), mainPageClass, additionalPageClass1);+ public BuildTab(IModel<String> titleModel, IModel<String> iconModel, Class<? extends Page> mainPageClass, PageParameters mainPageParams, Class<? extends Page> additionalPageClass1, Class<? extends Page> additionalPageClass2) {+ super(titleModel, iconModel, mainPageClass, mainPageParams, additionalPageClass1, additionalPageClass2);}-- public BuildTab(String title, Class<? extends BuildDetailPage> mainPageClass,- Class<? extends BuildDetailPage> additionalPageClass1, Class<? extends BuildDetailPage> additionalPageClass2) {- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2);++ public BuildTab(IModel<String> titleModel, IModel<String> iconModel, Class<? extends Page> mainPageClass, PageParameters mainPageParams, Class<? extends Page> additionalPageClass1, Class<? extends Page> additionalPageClass2, Class<? extends Page> additionalPageClass3) {+ super(titleModel, iconModel, mainPageClass, mainPageParams, additionalPageClass1, additionalPageClass2, additionalPageClass3);}- public BuildTab(String title, String icon, Class<? extends BuildDetailPage> mainPageClass,- Class<? extends BuildDetailPage> additionalPageClass1, Class<? extends BuildDetailPage> additionalPageClass2) {- super(Model.of(title), Model.of(icon), mainPageClass, additionalPageClass1, additionalPageClass2);+ public BuildTab(IModel<String> titleModel, Class<? extends Page> mainPageClass, PageParameters mainPageParams, List<Class<? extends Page>> additionalPageClasses) {+ super(titleModel, mainPageClass, mainPageParams, additionalPageClasses);}-- public BuildTab(String title, Class<? extends BuildDetailPage> mainPageClass,- Class<? extends BuildDetailPage> additionalPageClass1, Class<? extends BuildDetailPage> additionalPageClass2,- Class<? extends BuildDetailPage> additionalPageClass3) {- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2, additionalPageClass3);++ public BuildTab(IModel<String> titleModel, Class<? extends Page> mainPageClass, PageParameters mainPageParams) {+ super(titleModel, mainPageClass, mainPageParams);}- public BuildTab(String title, String icon, Class<? extends BuildDetailPage> mainPageClass,- Class<? extends BuildDetailPage> additionalPageClass1, Class<? extends BuildDetailPage> additionalPageClass2,- Class<? extends BuildDetailPage> additionalPageClass3) {- super(Model.of(title), Model.of(icon), mainPageClass, additionalPageClass1, additionalPageClass2, additionalPageClass3);+ public BuildTab(IModel<String> titleModel, Class<? extends Page> mainPageClass, PageParameters mainPageParams, Class<? extends Page> additionalPageClass) {+ super(titleModel, mainPageClass, mainPageParams, additionalPageClass);+ }++ public BuildTab(IModel<String> titleModel, Class<? extends Page> mainPageClass, PageParameters mainPageParams, Class<? extends Page> additionalPageClass1, Class<? extends Page> additionalPageClass2) {+ super(titleModel, mainPageClass, mainPageParams, additionalPageClass1, additionalPageClass2);}-- @Override- public Component render(String componentId) {- return new PageTabHead(componentId, this) {- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- BuildDetailPage page = (BuildDetailPage) getPage();- return new ViewStateAwarePageLink<Void>(linkId, pageClass,- BuildDetailPage.paramsOf(page.getBuild()));- }-- };+ public BuildTab(IModel<String> titleModel, Class<? extends Page> mainPageClass, PageParameters mainPageParams, Class<? extends Page> additionalPageClass1, Class<? extends Page> additionalPageClass2, Class<? extends Page> additionalPageClass3) {+ super(titleModel, mainPageClass, mainPageParams, additionalPageClass1, additionalPageClass2, additionalPageClass3);}}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.javaindex 0366cf9ec1..baad88cdab 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java@@ -5,7 +5,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.util.artifact.ArtifactInfo;import io.onedev.server.util.artifact.DirectoryInfo;import io.onedev.server.util.artifact.FileInfo;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportTab.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportTab.javaindex 051d71b9df..d28152d3f8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportTab.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportTab.java@@ -1,16 +1,17 @@package io.onedev.server.web.page.project.builds.detail.report;-import javax.annotation.Nullable;--import org.apache.wicket.Component;-import org.apache.wicket.Page;-import org.apache.wicket.markup.html.link.Link;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.tabbable.PageTabHead;import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;import io.onedev.server.web.page.project.builds.detail.BuildTab;import io.onedev.server.web.page.project.stats.buildmetric.BuildMetricStatsPage;+import org.apache.wicket.Component;+import org.apache.wicket.Page;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import javax.annotation.Nullable;public class BuildReportTab extends BuildTab {@@ -20,14 +21,14 @@ public class BuildReportTab extends BuildTab {public BuildReportTab(String title, Class<? extends BuildReportPage> mainPageClass,@Nullable Class<? extends BuildMetricStatsPage<?>> statsPageClass) {- super(title, mainPageClass);+ super(Model.of(title), mainPageClass, new PageParameters());this.statsPageClass = statsPageClass;}public BuildReportTab(String title, Class<? extends BuildReportPage> mainPageClass,Class<? extends BuildReportPage> additionalPageClass1,@Nullable Class<? extends BuildMetricStatsPage<?>> statsPageClass) {- super(title, mainPageClass, additionalPageClass1);+ super(Model.of(title), mainPageClass, new PageParameters(), additionalPageClass1);this.statsPageClass = statsPageClass;}@@ -35,7 +36,7 @@ public class BuildReportTab extends BuildTab {Class<? extends BuildReportPage> additionalPageClass1,Class<? extends BuildReportPage> additionalPageClass2,@Nullable Class<? extends BuildMetricStatsPage<?>> statsPageClass) {- super(title, mainPageClass, additionalPageClass1, additionalPageClass2);+ super(Model.of(title), mainPageClass, new PageParameters(), additionalPageClass1, additionalPageClass2);this.statsPageClass = statsPageClass;}@@ -44,7 +45,7 @@ public class BuildReportTab extends BuildTab {Class<? extends BuildReportPage> additionalPageClass2,Class<? extends BuildReportPage> additionalPageClass3,@Nullable Class<? extends BuildMetricStatsPage<?>> statsPageClass) {- super(title, mainPageClass, additionalPageClass1, additionalPageClass2, additionalPageClass3);+ super(Model.of(title), mainPageClass, new PageParameters(), additionalPageClass1, additionalPageClass2, additionalPageClass3);this.statsPageClass = statsPageClass;}@@ -55,7 +56,7 @@ public class BuildReportTab extends BuildTab {private static final long serialVersionUID = 1L;@Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass, PageParameters pageParams) {BuildDetailPage page = (BuildDetailPage) getPage();return new ViewStateAwarePageLink<Void>(linkId, pageClass,BuildReportPage.paramsOf(page.getBuild(), getTitle()));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex 8a352c8045..34ca6b47c9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -24,7 +24,6 @@ import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.sideinfo.SideInfoLink;import io.onedev.server.web.component.sideinfo.SideInfoPanel;import io.onedev.server.web.component.tabbable.PageTab;-import io.onedev.server.web.component.tabbable.PageTabHead;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.page.project.ProjectPage;@@ -37,7 +36,6 @@ import io.onedev.server.web.util.CursorSupport;import io.onedev.server.xodus.VisitInfoManager;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;-import org.apache.wicket.Page;import org.apache.wicket.RestartResponseException;import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -147,7 +145,7 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input@Overrideprotected List<? extends Tab> load() {List<Tab> tabs = new ArrayList<>();- tabs.add(new IssueTab("Activities", IssueActivitiesPage.class) {+ tabs.add(new PageTab(Model.of("Activities"), IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(getIssue())) {@Overrideprotected Component renderOptions(String componentId) {@@ -159,16 +157,16 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Inputif (!getIssue().getCommits().isEmpty()) {if (SecurityUtils.canReadCode(getProject())) {- tabs.add(new IssueTab("Fixing Commits", IssueCommitsPage.class));+ tabs.add(new PageTab(Model.of("Fixing Commits"), IssueCommitsPage.class, IssueCommitsPage.paramsOf(getIssue())));if (!getIssue().getPullRequests().isEmpty())- tabs.add(new IssueTab("Pull Requests", IssuePullRequestsPage.class));+ tabs.add(new PageTab(Model.of("Pull Requests"), IssuePullRequestsPage.class, IssuePullRequestsPage.paramsOf(getIssue())));}// Do not calculate fix builds now as it might be slow- tabs.add(new IssueTab("Fixing Builds", IssueBuildsPage.class));+ tabs.add(new PageTab(Model.of("Fixing Builds"), IssueBuildsPage.class, IssueBuildsPage.paramsOf(getIssue())));}if (getIssue().isConfidential() && SecurityUtils.canModifyIssue(getIssue()))- tabs.add(new IssueTab("Authorizations", IssueAuthorizationsPage.class));+ tabs.add(new PageTab(Model.of("Authorizations"), IssueAuthorizationsPage.class, IssueAuthorizationsPage.paramsOf(getIssue())));return tabs;}@@ -339,26 +337,6 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Inputpublic FieldSpec getInputSpec(String inputName) {return OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpec(inputName);}-- private class IssueTab extends PageTab {-- public IssueTab(String title, Class<? extends Page> pageClass) {- super(Model.of(title), pageClass);- }-- @Override- public Component render(String componentId) {- return new PageTabHead(componentId, this) {-- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new ViewStateAwarePageLink<Void>(linkId, pageClass, paramsOf(getIssue()));- }-- };- }-- }private IssueManager getIssueManager() {return OneDev.getInstance(IssueManager.class);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationDetailPage.javaindex 8a58db40d4..534f1000af 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationDetailPage.java@@ -7,19 +7,17 @@ import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebSession;import io.onedev.server.web.component.MultilineLabel;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.iteration.IterationDateLabel;import io.onedev.server.web.component.iteration.IterationStatusLabel;import io.onedev.server.web.component.iteration.actions.IterationActionsPanel;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.tabbable.PageTab;-import io.onedev.server.web.component.tabbable.PageTabHead;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;-import org.apache.wicket.Page;import org.apache.wicket.RestartResponseException;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.head.CssHeaderItem;@@ -27,7 +25,6 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;@@ -120,8 +117,9 @@ public abstract class IterationDetailPage extends ProjectPage {});List<Tab> tabs = new ArrayList<>();- tabs.add(new IterationTab("Issues", IterationIssuesPage.class));- tabs.add(new IterationTab("Burndown", IterationBurndownPage.class));+ var params = paramsOf(getProject(), getIteration());+ tabs.add(new PageTab(Model.of("Issues"), IterationIssuesPage.class, params));+ tabs.add(new PageTab(Model.of("Burndown"), IterationBurndownPage.class, params));add(new Tabbable("iterationTabs", tabs).setOutputMarkupId(true));}@@ -158,26 +156,6 @@ public abstract class IterationDetailPage extends ProjectPage {return "Iteration " + getIteration().getName() + " - " + getProject().getPath();}- private class IterationTab extends PageTab {-- public IterationTab(String title, Class<? extends Page> pageClass) {- super(Model.of(title), pageClass);- }-- @Override- public Component render(String componentId) {- return new PageTabHead(componentId, this) {-- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new ViewStateAwarePageLink<Void>(linkId, pageClass, paramsOf(getProject(), getIteration()));- }-- };- }-- }-@Overrideprotected BookmarkablePageLink<Void> navToProject(String componentId, Project project) {if (project.isIssueManagement())diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 5c60ea113b..283be5070b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -44,7 +44,6 @@ import io.onedev.server.web.component.pullrequest.review.ReviewListPanel;import io.onedev.server.web.component.sideinfo.SideInfoLink;import io.onedev.server.web.component.sideinfo.SideInfoPanel;import io.onedev.server.web.component.tabbable.PageTab;-import io.onedev.server.web.component.tabbable.PageTabHead;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.component.user.ident.Mode;@@ -70,7 +69,6 @@ import io.onedev.server.web.util.editbean.LabelsBean;import io.onedev.server.xodus.VisitInfoManager;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;-import org.apache.wicket.Page;import org.apache.wicket.RestartResponseException;import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -707,7 +705,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRList<Tab> tabs = new ArrayList<>();- tabs.add(new PullRequestTab("Activities", PullRequestActivitiesPage.class) {+ tabs.add(new PageTab(Model.of("Activities"), PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(getPullRequest())) {@Overrideprotected Component renderOptions(String componentId) {@@ -716,8 +714,42 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR}});- tabs.add(new PullRequestTab("File Changes", PullRequestChangesPage.class));- tabs.add(new PullRequestTab("Code Comments", PullRequestCodeCommentsPage.class));+ tabs.add(new PageTab(Model.of("File Changes"), PullRequestChangesPage.class, PullRequestChangesPage.paramsOf(getPullRequest())));+ tabs.add(new PageTab(Model.of("Code Comments"), PullRequestCodeCommentsPage.class, PullRequestCodeCommentsPage.paramsOf(getPullRequest())) {+ @Override+ public Component render(String componentId) {+ Fragment fragment = new Fragment(componentId, "codeCommentsTabLinkFrag", PullRequestDetailPage.this);++ // Do not show unresolved only by default as new indicator for+ // code comments tab may also be caused by new activities in+ // resolved issues+ Link<Void> link = new ViewStateAwarePageLink<Void>("link",+ PullRequestCodeCommentsPage.class,+ PullRequestCodeCommentsPage.paramsOf(getPullRequest()));+ link.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {+ @Override+ protected String load() {+ Date updateDate = getPullRequest().getCodeCommentsUpdateDate();+ if (updateDate != null && !getPullRequest().isCodeCommentsVisitedAfter(updateDate))+ return "new";+ else+ return "";+ }++ }));+ link.add(new ChangeObserver() {++ @Override+ public Collection<String> findObservables() {+ return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));+ }++ });+ link.setOutputMarkupId(true);+ fragment.add(link);+ return fragment;+ }+ });add(new Tabbable("requestTabs", tabs).setOutputMarkupId(true));@@ -1634,59 +1666,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRreturn SecurityUtils.canReadCode(getProject());}- private class PullRequestTab extends PageTab {-- public PullRequestTab(String title, Class<? extends Page> pageClass) {- super(Model.of(title), pageClass);- }-- @Override- public Component render(String componentId) {- if (getMainPageClass() == PullRequestCodeCommentsPage.class) {- Fragment fragment = new Fragment(componentId, "codeCommentsTabLinkFrag", PullRequestDetailPage.this);-- // Do not show unresolved only by default as new indicator for- // code comments tab may also be caused by new activities in- // resolved issues- Link<Void> link = new ViewStateAwarePageLink<Void>("link",- PullRequestCodeCommentsPage.class,- PullRequestCodeCommentsPage.paramsOf(getPullRequest()));- link.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {- @Override- protected String load() {- Date updateDate = getPullRequest().getCodeCommentsUpdateDate();- if (updateDate != null && !getPullRequest().isCodeCommentsVisitedAfter(updateDate))- return "new";- else- return "";- }-- }));- link.add(new ChangeObserver() {-- @Override- public Collection<String> findObservables() {- return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));- }-- });- link.setOutputMarkupId(true);- fragment.add(link);- return fragment;- } else {- return new PageTabHead(componentId, this) {-- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new ViewStateAwarePageLink<Void>(linkId, pageClass, paramsOf(getPullRequest()));- }-- };- }- }-- }-@Overrideprotected Component newProjectTitle(String componentId) {Fragment fragment = new Fragment(componentId, "projectTitleFrag", this);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.javaindex 1cd3d5b3df..4d9553c68d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java@@ -11,7 +11,7 @@ import org.apache.wicket.model.IModel;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.notification.ActivityDetail;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.page.project.pullrequests.detail.activities.SinceChangesLink;@SuppressWarnings("serial")diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.javaindex cd26f6b3cd..4e6d170fb3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java@@ -11,7 +11,7 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestComment;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.util.facade.UserCache;import io.onedev.server.web.component.comment.CommentPanel;import io.onedev.server.web.component.markdown.ContentVersionSupport;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.javaindex 3b47526d4c..43dafe5124 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java@@ -9,7 +9,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.util.facade.UserCache;import io.onedev.server.web.component.comment.CommentPanel;import io.onedev.server.web.component.markdown.ContentVersionSupport;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.javaindex 25be1b393f..afe0f9b5d5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java@@ -6,7 +6,7 @@ import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestUpdate;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.ChangeObserver;import io.onedev.server.web.component.commit.message.CommitMessagePanel;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.javaindex bcf6a22447..54ae56d117 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java@@ -762,7 +762,9 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev@Overrideprotected Collection<String> getCssClasses() {- return Sets.newHashSet("hide-side-info");+ var cssClasses = super.getCssClasses();+ cssClasses.add("hide-side-info");+ return cssClasses;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/CacheManagementPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/CacheManagementPage.javaindex 503c61345e..bca6656156 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/CacheManagementPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/CacheManagementPage.java@@ -5,7 +5,7 @@ import io.onedev.server.entitymanager.JobCacheManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.JobCache;import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.component.datatable.DefaultDataTable;import io.onedev.server.web.editable.BeanContext;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.htmldeleted file mode 100644index 465219bef4..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html+++ /dev/null@@ -1,24 +0,0 @@-<wicket:extend>- <div class="project-contribs p-2 p-sm-5">- <wicket:enclosure child="note">- <div class="alert alert-notice bg-white shadow mb-5 text-gray">- <wicket:svg href="bulb" class="icon mr-2"/><span wicket:id="note"></span>- </div>- </wicket:enclosure>- <div class="card mb-5">- <div class="card-body">- <div class="d-flex align-items-center">- <span class="date-range mr-3 font-size-h5"></span>- <select class="contrib-type custom-select form-control ml-auto">- <option>Commits</option>- <option>Additions</option>- <option>Deletions</option>- </select>- </div>- <div class="overall chart"></div>- </div>- </div>- <div class="top-contributors"></div>- </div>- <div wicket:id="userCard" class="user-card-content"></div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.htmldeleted file mode 100644index 1b617882a4..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.html+++ /dev/null@@ -1,5 +0,0 @@-<wicket:extend>- <div class="project-stats d-flex flex-column flex-grow-1">- <wicket:child></wicket:child>- </div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.javadeleted file mode 100644index 5bfb5d71da..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java+++ /dev/null@@ -1,50 +0,0 @@-package io.onedev.server.web.page.project.stats;--import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.model.Project;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;--@SuppressWarnings("serial")-public abstract class ProjectStatsPage extends ProjectPage {-- public ProjectStatsPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.canReadCode(getProject());- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(JavaScriptHeaderItem.forReference(new ProjectStatsResourceReference()));- }-- @Override- protected String getPageTitle() {- return "Statistics - " + getProject().getPath();- }-- @Override- protected BookmarkablePageLink<Void> navToProject(String componentId, Project project) {- if (project.isCodeManagement() && SecurityUtils.canReadCode(project))- return new ViewStateAwarePageLink<Void>(componentId, getPageClass(), ProjectStatsPage.paramsOf(project.getId()));- else- return new ViewStateAwarePageLink<Void>(componentId, ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.htmldeleted file mode 100644index 9dc574a250..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.html+++ /dev/null@@ -1,7 +0,0 @@-<wicket:extend>- <div class="source-lines card m-2 m-sm-5 d-flex flex-column flex-grow-1">- <div class="card-body d-flex flex-column flex-grow-1 overflow-auto">- <div class="chart resize-aware flex-grow-1"></div>- </div>- </div>-</wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.javaindex fd6f31f683..6f890843d8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java@@ -8,7 +8,10 @@ import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Project;import io.onedev.server.search.buildmetric.BuildMetricQuery;import io.onedev.server.search.buildmetric.BuildMetricQueryParser;-import io.onedev.server.util.*;+import io.onedev.server.util.BeanUtils;+import io.onedev.server.util.MetricIndicator;+import io.onedev.server.util.Pair;+import io.onedev.server.util.ReflectionUtils;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.behavior.BuildMetricQueryBehavior;import io.onedev.server.web.component.chart.line.Line;@@ -37,8 +40,13 @@ import javax.annotation.Nullable;import java.io.Serializable;import java.lang.reflect.InvocationTargetException;import java.lang.reflect.Method;-import java.util.*;+import java.util.ArrayList;+import java.util.HashMap;+import java.util.List;+import java.util.Map;+import java.util.stream.Collectors;+import static io.onedev.server.web.util.StatsGroup.BY_DAY;import static java.util.Comparator.comparingInt;@SuppressWarnings("serial")@@ -197,7 +205,7 @@ public abstract class BuildMetricStatsPage<T extends AbstractEntity> extends Proif (valueFormatter.length() == 0)valueFormatter = null;- Map<Integer, List<Integer>> discreteValues = new HashMap<>();+ Map<Integer, List<Integer>> data = new HashMap<>();for (Map.Entry<Integer, T> entry : stats.entrySet()) {List<Integer> lineValues = new ArrayList<>();for (Method getter : group) {@@ -208,30 +216,13 @@ public abstract class BuildMetricStatsPage<T extends AbstractEntity> extends Prothrow new RuntimeException(e);}}- discreteValues.put(entry.getKey(), lineValues);+ data.put(entry.getKey(), lineValues);}- Map<String, List<Integer>> completeValues = new LinkedHashMap<>();- if (!discreteValues.isEmpty()) {- int minDayValue = Collections.min(discreteValues.keySet());- int maxDayValue = Collections.max(discreteValues.keySet());- List<Integer> lastValues = null;- int currentDayValue = minDayValue;- while (currentDayValue <= maxDayValue) {- List<Integer> currentValues = discreteValues.get(currentDayValue);- if (currentValues == null)- currentValues = lastValues;- else- lastValues = currentValues;- Day currentDay = new Day(currentDayValue);- String currentDayLabel = String.format("%02d-%02d-%02d",- currentDay.getYear() % 100, currentDay.getMonthOfYear() + 1, currentDay.getDayOfMonth());- completeValues.put(currentDayLabel, currentValues);- currentDayValue = new Day(currentDay.getDate().plusDays(1)).getValue();- }- }-- List<String> xAxisValues = new ArrayList<>(completeValues.keySet());+ var normalizedData = BY_DAY.normalizeData(data, null);+ List<String> xAxisValues = normalizedData.stream()+ .map(org.apache.commons.lang3.tuple.Pair::getLeft)+ .collect(Collectors.toList());List<Line> lines = new ArrayList<>();int lineIndex = 0;@@ -240,9 +231,10 @@ public abstract class BuildMetricStatsPage<T extends AbstractEntity> extends ProString name = indicator.name();if (name.length() == 0)name = BeanUtils.getDisplayName(getter);- Map<String, Integer> yAxisValues = new HashMap<>();- for (String xAxisValue : xAxisValues)- yAxisValues.put(xAxisValue, completeValues.get(xAxisValue).get(lineIndex));+ var finalLineIndex = lineIndex;+ var yAxisValues = normalizedData.stream()+ .map(it->it.getRight().get(finalLineIndex))+ .collect(Collectors.toList());lines.add(new Line(name, yAxisValues, indicator.color(), null, null));lineIndex++;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeContribsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeContribsPage.htmlnew file mode 100644index 0000000000..87aa85568c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeContribsPage.html@@ -0,0 +1,20 @@+<wicket:extend>+ <div class="code-contribs">+ <wicket:enclosure child="note">+ <div class="alert alert-light alert-notice mb-5">+ <wicket:svg href="bulb" class="icon mr-2"/><span wicket:id="note"></span>+ </div>+ </wicket:enclosure>+ <div class="d-flex align-items-center mb-4">+ <span class="date-range mr-3 font-size-h5"></span>+ <select class="contrib-type custom-select form-control ml-auto">+ <option>Commits</option>+ <option>Additions</option>+ <option>Deletions</option>+ </select>+ </div>+ <div class="overall chart border p-4 rounded mb-4"></div>+ <div class="top-contributors"></div>+ </div>+ <div wicket:id="userCard" class="user-card-content"></div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeContribsPage.javasimilarity index 89%rename from server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.javarename to server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeContribsPage.javaindex 4dfe32e6b6..206e0b7e90 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeContribsPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.stats;+package io.onedev.server.web.page.project.stats.code;import java.util.HashMap;import java.util.Map;@@ -22,18 +22,18 @@ import io.onedev.server.OneDev;import io.onedev.server.git.GitContribution;import io.onedev.server.xodus.CommitInfoManager;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.Day;+import io.onedev.server.util.date.Day;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.user.card.PersonCardPanel;@SuppressWarnings("serial")-public class ProjectContribsPage extends ProjectStatsPage {+public class CodeContribsPage extends CodeStatsPage {private static final String USER_CARD_ID = "userCard";private AbstractDefaultAjaxBehavior userCardBehavior;- public ProjectContribsPage(PageParameters params) {+ public CodeContribsPage(PageParameters params) {super(params);}@@ -63,7 +63,7 @@ public class ProjectContribsPage extends ProjectStatsPage {userCard.setOutputMarkupId(true);replace(userCard);target.add(userCard);- target.appendJavaScript("onedev.server.stats.contribs.onUserCardAvailable();");+ target.appendJavaScript("onedev.server.codeStats.contribs.onUserCardAvailable();");}});@@ -94,14 +94,14 @@ public class ProjectContribsPage extends ProjectStatsPage {CharSequence callback = userCardBehavior.getCallbackFunction(CallbackParameter.explicit("name"), CallbackParameter.explicit("emailAddress"));- String script = String.format("onedev.server.stats.contribs.onDomReady(%s, '%s', %s, %b);",+ String script = String.format("onedev.server.codeStats.contribs.onDomReady(%s, '%s', %s, %b);",jsonOfData, topContributorsUrl, callback, isDarkMode());response.render(OnDomReadyHeaderItem.forScript(script));}@Overrideprotected Component newProjectTitle(String componentId) {- return new Label(componentId, "Contribution Statistics");+ return new Label(componentId, "Code Contribution Statistics");}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeStatsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeStatsPage.htmlnew file mode 100644index 0000000000..ef9d74d9ea--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeStatsPage.html@@ -0,0 +1,11 @@+<wicket:extend>+ <div class="code-stats p-2 p-sm-5 d-flex flex-column flex-grow-1">+ <div class="card d-flex flex-column flex-grow-1">+ <div class="card-body d-flex flex-column flex-grow-1">+ <ul wicket:id="tabs" class="tabs nav nav-tabs nav-tabs-line mb-5"></ul>+ <wicket:child></wicket:child>+ </div>+ </div>+ </div>+</wicket:extend>+diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeStatsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeStatsPage.javanew file mode 100644index 0000000000..a258238b19--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeStatsPage.java@@ -0,0 +1,60 @@+package io.onedev.server.web.page.project.stats.code;++import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.tabbable.PageTab;+import io.onedev.server.web.component.tabbable.Tabbable;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import java.util.ArrayList;++public abstract class CodeStatsPage<T extends AbstractEntity> extends ProjectPage {++ public CodeStatsPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ var tabs = new ArrayList<PageTab>();+ var params = paramsOf(getProject());+ tabs.add(new PageTab(Model.of("Contributions"), CodeContribsPage.class, params));+ tabs.add(new PageTab(Model.of("Source Lines"), SourceLinesPage.class, params));+ add(new Tabbable("tabs", tabs));+ }++ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canReadCode(getProject());+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(JavaScriptHeaderItem.forReference(new CodeStatsResourceReference()));+ }++ @Override+ protected String getPageTitle() {+ return "Code Statistics - " + getProject().getPath();+ }++ @Override+ protected BookmarkablePageLink<Void> navToProject(String componentId, Project project) {+ if (project.isCodeManagement() && SecurityUtils.canReadCode(project))+ return new ViewStateAwarePageLink<>(componentId, getPageClass(), paramsOf(project.getId()));+ else+ return new ViewStateAwarePageLink<>(componentId, ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeStatsResourceReference.javasimilarity index 78%rename from server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsResourceReference.javarename to server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeStatsResourceReference.javaindex 3806d5e8a8..bfb8d7c5ce 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeStatsResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.stats;+package io.onedev.server.web.page.project.stats.code;import java.util.List;@@ -13,12 +13,12 @@ import io.onedev.server.web.asset.echarts.EChartsResourceReference;import io.onedev.server.web.asset.hover.HoverResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;-public class ProjectStatsResourceReference extends BaseDependentResourceReference {+public class CodeStatsResourceReference extends BaseDependentResourceReference {private static final long serialVersionUID = 1L;- public ProjectStatsResourceReference() {- super(ProjectStatsResourceReference.class, "project-stats.js");+ public CodeStatsResourceReference() {+ super(CodeStatsResourceReference.class, "code-stats.js");}@Override@@ -29,7 +29,7 @@ public class ProjectStatsResourceReference extends BaseDependentResourceReferencdependencies.add(JavaScriptHeaderItem.forReference(new HoverResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new DayResourceReference()));dependencies.add(CssHeaderItem.forReference(- new CssResourceReference(ProjectStatsResourceReference.class, "project-stats.css")));+ new CssResourceReference(CodeStatsResourceReference.class, "code-stats.css")));return dependencies;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/SourceLinesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/SourceLinesPage.htmlnew file mode 100644index 0000000000..46a45039cc--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/SourceLinesPage.html@@ -0,0 +1,5 @@+<wicket:extend>+ <div class="source-lines d-flex flex-column flex-grow-1 overflow-auto">+ <div class="chart resize-aware flex-grow-1"></div>+ </div>+</wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/SourceLinesPage.javasimilarity index 83%rename from server-core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.javarename to server-core/src/main/java/io/onedev/server/web/page/project/stats/code/SourceLinesPage.javaindex f62f173276..e9c535ffb4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/SourceLinesPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.stats;+package io.onedev.server.web.page.project.stats.code;import java.util.HashMap;import java.util.Map;@@ -14,10 +14,10 @@ import com.fasterxml.jackson.databind.ObjectMapper;import io.onedev.server.OneDev;import io.onedev.server.xodus.CommitInfoManager;-import io.onedev.server.util.Day;+import io.onedev.server.util.date.Day;@SuppressWarnings("serial")-public class SourceLinesPage extends ProjectStatsPage {+public class SourceLinesPage extends CodeStatsPage {public SourceLinesPage(PageParameters params) {super(params);@@ -36,7 +36,7 @@ public class SourceLinesPage extends ProjectStatsPage {ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);String jsonOfData = mapper.writeValueAsString(data);String jsonOfDefaultBranch = mapper.writeValueAsString(getProject().getDefaultBranch());- String script = String.format("onedev.server.stats.sourceLines.onDomReady(%s, %s, %b);",+ String script = String.format("onedev.server.codeStats.sourceLines.onDomReady(%s, %s, %b);",jsonOfData, jsonOfDefaultBranch, isDarkMode());response.render(OnDomReadyHeaderItem.forScript(script));} catch (JsonProcessingException e) {@@ -46,7 +46,7 @@ public class SourceLinesPage extends ProjectStatsPage {@Overrideprotected Component newProjectTitle(String componentId) {- return new Label(componentId, "Line Statistics");+ return new Label(componentId, "Code Line Statistics");}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/TopContributorsResource.javasimilarity index 98%rename from server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.javarename to server-core/src/main/java/io/onedev/server/web/page/project/stats/code/TopContributorsResource.javaindex 771b16349f..01d0301677 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/TopContributorsResource.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.stats;+package io.onedev.server.web.page.project.stats.code;import java.io.IOException;import java.util.ArrayList;@@ -28,7 +28,7 @@ import io.onedev.server.xodus.CommitInfoManager;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.Day;+import io.onedev.server.util.date.Day;import io.onedev.server.web.avatar.AvatarManager;import org.eclipse.jgit.lib.PersonIdent;import org.joda.time.format.DateTimeFormat;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/TopContributorsResourceReference.javasimilarity index 89%rename from server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResourceReference.javarename to server-core/src/main/java/io/onedev/server/web/page/project/stats/code/TopContributorsResourceReference.javaindex bd11adbe9a..e96d5df3e8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/TopContributorsResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.stats;+package io.onedev.server.web.page.project.stats.code;import org.apache.wicket.request.resource.IResource;import org.apache.wicket.request.resource.ResourceReference;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/code-stats.csssimilarity index 51%rename from server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.cssrename to server-core/src/main/java/io/onedev/server/web/page/project/stats/code/code-stats.cssindex fc11468659..3e687b9acd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/code-stats.css@@ -1,43 +1,43 @@-.project-contribs select {+.code-contribs select {width: 120px;}-.project-contribs .overall {+.code-contribs .overall {height: 360px;}-.project-contribs .overall .no-data {+.code-contribs .overall .no-data {text-align: center;font-size: 2rem;margin-top: 2rem;font-weight: bold;}-.project-contribs .top-contributors .loading {+.code-contribs .top-contributors .loading {background: url(/~img/ajax-indicator-big.png) no-repeat scroll center center;background-size: 64px 64px;height: 64px;}-.dark-mode .project-contribs .top-contributors .loading {+.dark-mode .code-contribs .top-contributors .loading {background: url(/~img/dark-ajax-indicator-big.png) no-repeat scroll center center;}-.project-contribs .top-contributors .head .total-contribution span.additions {+.code-contribs .top-contributors .head .total-contribution span.additions {color: green;}-.project-contribs .top-contributors .head .total-contribution span.deletions {+.code-contribs .top-contributors .head .total-contribution span.deletions {color: red;}-.project-contribs .top-contributors .avatar {+.code-contribs .top-contributors .avatar {width: 36px;height: 36px;}-.project-contribs .top-contributors .body {+.code-contribs .top-contributors .body {height: 300px;}-.project-contribs .top-contributors .col-xl-6.left {+.code-contribs .top-contributors .col-xl-6.left {padding-right: 1rem;}-.project-contribs .top-contributors .col-xl-6.right {+.code-contribs .top-contributors .col-xl-6.right {padding-left: 1rem;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/code-stats.jssimilarity index 96%rename from server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.jsrename to server-core/src/main/java/io/onedev/server/web/page/project/stats/code/code-stats.jsindex c35f83f235..3d7034595b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/code-stats.js@@ -1,4 +1,4 @@-onedev.server.stats = {+onedev.server.codeStats = {formatYAxisLabel: function(value, index, useKilo) {if (index == 0)useKilo = false;@@ -12,7 +12,7 @@ onedev.server.stats = {contribs: {onDomReady : function(overallContributions, topContributorsDataUrl, userCardCallback, darkMode) {- var $contribs = $(".project-contribs");+ var $contribs = $(".code-contribs");var $overall = $contribs.find(".overall");if (Object.keys(overallContributions).length === 0) {$overall.html("<div class='no-data'>No data</div>");@@ -102,7 +102,7 @@ onedev.server.stats = {},axisLabel: {formatter: function(value, index) {- var result = onedev.server.stats.formatYAxisLabel(value, index, useKiloForOverallChart);+ var result = onedev.server.codeStats.formatYAxisLabel(value, index, useKiloForOverallChart);useKiloForOverallChart = result.useKilo;return result.value;},@@ -192,10 +192,10 @@ onedev.server.stats = {}function renderContributor($container, contributor, index) {- var $contrib = $("<div class='card contrib mb-5'><div class='card-body'></div></div>");+ var $contrib = $("<div class='contrib border rounded p-3 mb-5'></div>");$container.append($contrib);var $head = $("<div class='head d-flex align-items-center'></div>");- $contrib.children().append($head);+ $contrib.append($head);var $left = $("<div class='mr-3 d-flex align-items-center'></div>");$head.append($left);$left.append("<a class='user mr-3'><img class='avatar' src='" + contributor.authorAvatarUrl + "'></img></a>");@@ -223,7 +223,7 @@ onedev.server.stats = {$head.append("<div class='ml-auto font-size-h6 font-weight-bold'>#" + (index + 1) + "</div>");var $body = $("<div class='body chart'></div>");- $contrib.children().append($body);+ $contrib.append($body);var chart = echarts.init($body[0]);$body.data("chart", chart);@@ -267,7 +267,7 @@ onedev.server.stats = {boundaryGap: [0, (maxValue-maxValueOfContributor)/maxValueOfContributor],axisLabel: {formatter: function(value, index) {- var result = onedev.server.stats.formatYAxisLabel(value, index, useKilo);+ var result = onedev.server.codeStats.formatYAxisLabel(value, index, useKilo);useKilo = result.useKilo;return result.value;},@@ -338,7 +338,7 @@ onedev.server.stats = {onDomReady: function(lineIncrements, defaultBranch, darkMode) {var numOfTopLanguages = 10;- var $chart = $(".source-lines>div>.chart");+ var $chart = $(".source-lines>.chart");if (lineIncrements.length == 0) {$chart.append("<div class='no-data'>No data</div>");return;@@ -442,7 +442,7 @@ onedev.server.stats = {boundaryGap: [0, 0],axisLabel: {formatter: function(value, index) {- var result = onedev.server.stats.formatYAxisLabel(value, index, useKilo);+ var result = onedev.server.codeStats.formatYAxisLabel(value, index, useKilo);useKilo = result.useKilo;return result.value;},diff --git a/server-core/src/main/java/io/onedev/server/web/util/StatsGroup.java b/server-core/src/main/java/io/onedev/server/web/util/StatsGroup.javanew file mode 100644index 0000000000..ce98a10425--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/util/StatsGroup.java@@ -0,0 +1,98 @@+package io.onedev.server.web.util;++import io.onedev.server.model.support.TimeGroups;+import io.onedev.server.util.date.Day;+import io.onedev.server.util.date.Month;+import io.onedev.server.util.date.Week;+import org.apache.commons.lang3.tuple.ImmutablePair;+import org.apache.commons.lang3.tuple.Pair;++import javax.annotation.Nullable;+import javax.persistence.criteria.Path;+import java.util.ArrayList;+import java.util.Collections;+import java.util.List;+import java.util.Map;++public enum StatsGroup {++ BY_DAY {+ @Override+ public Path<?> getPath(Path<?> embeddedPath) {+ return embeddedPath.get(TimeGroups.PROP_DAY);+ }++ @Override+ public String toString(int groupValue) {+ return new Day(groupValue).toString();+ }++ @Override+ public int getNext(int groupValue) {+ return new Day(new Day(groupValue).getDate().plusDays(1)).getValue();+ }+ },+ BY_WEEK {++ @Override+ public Path<?> getPath(Path<?> embeddedPath) {+ return embeddedPath.get(TimeGroups.PROP_WEEK);+ }++ @Override+ public String toString(int groupValue) {+ return new Week(groupValue).toString();+ }++ @Override+ public int getNext(int groupValue) {+ return new Week(new Week(groupValue).getDate().plusWeeks(1)).getValue();+ }++ },+ BY_MONTH {++ @Override+ public Path<?> getPath(Path<?> embeddedPath) {+ return embeddedPath.get(TimeGroups.PROP_MONTH);+ }++ @Override+ public String toString(int groupValue) {+ return new Month(groupValue).toString();+ }++ @Override+ public int getNext(int groupValue) {+ return new Month(new Month(groupValue).getDate().plusMonths(1)).getValue();+ }++ };++ public abstract Path<?> getPath(Path<?> embeddedPath);++ public abstract String toString(int groupValue);++ public abstract int getNext(int groupValue);++ public <T> List<Pair<String, T>> normalizeData(Map<Integer, T> data, @Nullable T emptyValue) {+ List<Pair<String, T>> normalizedData = new ArrayList<>();+ if (!data.isEmpty()) {+ int minKey = Collections.min(data.keySet());+ int maxKey = Collections.max(data.keySet());+ T lastValue = data.get(minKey);+ int currentKey = minKey;+ while (currentKey <= maxKey) {+ var currentValue = data.get(currentKey);+ if (currentValue == null)+ currentValue = emptyValue != null? emptyValue: lastValue;+ else+ lastValue = currentValue;+ normalizedData.add(new ImmutablePair<>(toString(currentKey), currentValue));+ currentKey = getNext(currentKey);+ }+ }+ return normalizedData;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/xodus/CommitInfoManager.java b/server-core/src/main/java/io/onedev/server/xodus/CommitInfoManager.javaindex db7954d4c9..c828442fb2 100644--- a/server-core/src/main/java/io/onedev/server/xodus/CommitInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/xodus/CommitInfoManager.java@@ -9,7 +9,7 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.git.GitContribution;import io.onedev.server.git.GitContributor;-import io.onedev.server.util.Day;+import io.onedev.server.util.date.Day;import io.onedev.server.util.NameAndEmail;import io.onedev.server.util.facade.EmailAddressFacade;diff --git a/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.javaindex 57359e3b5d..5805e6733c 100644--- a/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java@@ -36,6 +36,7 @@ import io.onedev.server.util.*;import io.onedev.server.util.concurrent.BatchWorkManager;import io.onedev.server.util.concurrent.BatchWorker;import io.onedev.server.util.concurrent.Prioritized;+import io.onedev.server.util.date.Day;import io.onedev.server.util.facade.EmailAddressFacade;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.patternset.PatternSet;@@ -81,7 +82,7 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManagerprivate static final Logger logger = LoggerFactory.getLogger(DefaultCommitInfoManager.class);- private static final int INFO_VERSION = 15;+ private static final int INFO_VERSION = 16;private static final long LOG_FILE_SIZE = 256 * 1024;diff --git a/server-core/src/main/java/io/onedev/server/xodus/DefaultIssueInfoManager.java b/server-core/src/main/java/io/onedev/server/xodus/DefaultIssueInfoManager.javaindex 727992a9d9..d82a4db740 100644--- a/server-core/src/main/java/io/onedev/server/xodus/DefaultIssueInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/xodus/DefaultIssueInfoManager.java@@ -39,14 +39,14 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import static io.onedev.server.util.DateUtils.toLocalDate;+import static io.onedev.server.util.date.DateUtils.toLocalDate;import static java.lang.Long.valueOf;@Singletonpublic class DefaultIssueInfoManager extends AbstractMultiEnvironmentManagerimplements IssueInfoManager, Serializable {- private static final int INFO_VERSION = 2;+ private static final int INFO_VERSION = 3;private static final int BATCH_SIZE = 5000;diff --git a/server-core/src/main/java/io/onedev/server/xodus/IssueInfoManager.java b/server-core/src/main/java/io/onedev/server/xodus/IssueInfoManager.javaindex 656ccbd7a6..217bbc668b 100644--- a/server-core/src/main/java/io/onedev/server/xodus/IssueInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/xodus/IssueInfoManager.java@@ -1,13 +1,13 @@package io.onedev.server.xodus;-import java.util.Map;-import io.onedev.server.model.Issue;+import java.util.Map;+public interface IssueInfoManager {Map<Long, String> getDailyStates(Issue issue, Long fromDay, Long toDay);Map<Long, Integer> getDailySpentTimes(Issue issue, Long fromDay, Long toDay);-+}diff --git a/server-core/src/test/java/io/onedev/server/model/support/issue/TimeTrackingSettingTest.java b/server-core/src/test/java/io/onedev/server/model/support/issue/TimeTrackingSettingTest.javaindex f20c2cfc8e..d0d960cd04 100644--- a/server-core/src/test/java/io/onedev/server/model/support/issue/TimeTrackingSettingTest.java+++ b/server-core/src/test/java/io/onedev/server/model/support/issue/TimeTrackingSettingTest.java@@ -1,6 +1,5 @@package io.onedev.server.model.support.issue;-import io.onedev.server.util.DateUtils;import org.junit.Test;import static org.junit.Assert.*;diff --git a/server-ee b/server-eeindex 1a8a39e97d..2f1389ffcc 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 1a8a39e97dab7ab6548a2ef9d30f370de2984fc5+Subproject commit 2f1389ffcc30d9ab69325950103bf49bca071cf1diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.javaindex 64aa24df24..1c7c98c621 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java@@ -23,7 +23,7 @@ import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.util.JerseyUtils;import io.onedev.server.util.JerseyUtils.PageDataConsumer;import io.onedev.server.util.Pair;diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.javaindex 417041d3b0..9a9381c901 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java@@ -26,7 +26,7 @@ import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.util.JerseyUtils;import io.onedev.server.util.JerseyUtils.PageDataConsumer;import io.onedev.server.util.Pair;diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.javaindex da4385a19b..6090f95f04 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java@@ -24,7 +24,7 @@ import io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoicimport io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.date.DateUtils;import io.onedev.server.util.JerseyUtils;import io.onedev.server.util.JerseyUtils.PageDataConsumer;import io.onedev.server.util.Pair;diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportTab.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportTab.javaindex 2432f6b31c..35c7c37edd 100644--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportTab.java+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportTab.java@@ -14,6 +14,7 @@ import io.onedev.server.web.page.project.builds.detail.BuildTab;import org.apache.wicket.Component;import org.apache.wicket.Page;import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import java.io.File;@@ -24,15 +25,15 @@ import java.util.concurrent.Callable;public class MarkdownReportTab extends BuildTab {public MarkdownReportTab(String reportName) {- super(reportName, MarkdownReportPage.class);+ super(Model.of(reportName), MarkdownReportPage.class, new PageParameters());}-+@Overridepublic Component render(String componentId) {return new PageTabHead(componentId, this) {@Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass, PageParameters pageParams) {BuildDetailPage page = (BuildDetailPage) getPage();Build build = page.getBuild();Long projectId = build.getProject().getId();diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReportPage.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReportPage.javaindex be48607a79..ec7e9d00de 100644--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReportPage.java+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReportPage.java@@ -21,6 +21,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import javax.annotation.Nullable;@@ -84,7 +85,7 @@ public abstract class UnitTestReportPage extends BuildReportPage {private class UnitReportTab extends BuildTab {public UnitReportTab(String title, Class<? extends UnitTestReportPage> pageClass) {- super(title, pageClass);+ super(Model.of(title), pageClass, new PageParameters());}@Override@@ -92,10 +93,9 @@ public abstract class UnitTestReportPage extends BuildReportPage {return new PageTabHead(componentId, this) {@Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass, PageParameters pageParams) {BuildDetailPage page = (BuildDetailPage) getPage();- PageParameters params = UnitTestReportPage.paramsOf(- page.getBuild(), getReportName());+ PageParameters params = UnitTestReportPage.paramsOf(page.getBuild(), getReportName());return new ViewStateAwarePageLink<Void>(linkId, pageClass, params);}