Skip to content

The Unified and Autonomous Development Platform

feat(overview): add link to published project site

Robin Shen622716ffad6a
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java
index 337367e9fa..fb348dc43b 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java
@@ -1325,7 +1325,8 @@ public class DefaultProjectService extends BaseEntityService<Project>
if (childFiles != null) {
int baseLen = getSiteDir(projectId).getAbsolutePath().length() + 1;
for (File child : childFiles) {
- if (!SiteSyncUtils.isVersionFile(child)) {
+ if (!SiteSyncUtils.isVersionFile(child)
+ && !child.getName().equals(".DS_Store")) {
String relativePath = child.getAbsolutePath().substring(baseLen);
if (child.isFile()) {
children.add(new FileInfo(relativePath, child.lastModified(),
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/website.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/website.svg
new file mode 100644
index 0000000000..f2e7ac5eb7
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/website.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="1785143202009" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7705" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M53.312 512a458.688 458.688 0 1 1 917.376 0A458.688 458.688 0 0 1 53.312 512z m339.52-376.32a394.048 394.048 0 0 0-138.88 77.632c25.6 22.08 53.952 40.96 84.48 55.936 6.784-25.408 14.528-49.152 23.168-70.848 9.216-22.912 19.584-44.16 31.232-62.72zM209.024 258.944A392.896 392.896 0 0 0 118.592 480h191.232c1.472-51.584 6.528-100.992 14.656-146.688a459.136 459.136 0 0 1-115.456-74.24z m422.144 629.376a394.176 394.176 0 0 0 138.88-77.696 395.328 395.328 0 0 0-84.48-55.936 610.752 610.752 0 0 1-23.168 70.848c-9.152 22.912-19.584 44.096-31.232 62.72z m183.808-123.456A392.832 392.832 0 0 0 905.408 544H714.24a1008.704 1008.704 0 0 1-14.72 146.624c42.24 19.008 81.152 44.16 115.456 74.304zM905.408 480a392.96 392.96 0 0 0-90.432-220.928 459.2 459.2 0 0 1-115.392 74.24c8.064 45.696 13.12 95.104 14.656 146.688h191.168zM769.92 213.312a394.112 394.112 0 0 0-138.88-77.696c11.712 18.688 22.144 39.872 31.296 62.784 8.704 21.76 16.448 45.44 23.104 70.848a395.328 395.328 0 0 0 84.48-55.936zM392.832 888.384a399.04 399.04 0 0 1-31.232-62.784 610.624 610.624 0 0 1-23.104-70.848 395.264 395.264 0 0 0-84.48 55.936 394.048 394.048 0 0 0 138.88 77.696z m-183.744-123.456a459.136 459.136 0 0 1 115.392-74.24A1008.448 1008.448 0 0 1 309.76 544H118.656a392.896 392.896 0 0 0 90.496 220.928zM512 117.312c-11.904 0-26.496 5.952-43.2 23.552-16.64 17.664-33.216 44.928-47.744 81.28-8.448 21.12-16 44.8-22.528 70.656A394.752 394.752 0 0 0 512 309.312c39.488 0 77.568-5.76 113.536-16.512a557.824 557.824 0 0 0-22.528-70.592c-14.592-36.416-31.104-63.68-47.808-81.344-16.64-17.6-31.232-23.552-43.2-23.552zM373.824 480h276.352a953.28 953.28 0 0 0-11.712-124.352A458.88 458.88 0 0 1 512 373.312a458.88 458.88 0 0 1-126.4-17.664A953.216 953.216 0 0 0 373.76 480z m11.776 188.352A458.944 458.944 0 0 1 512 650.688c43.84 0 86.272 6.144 126.464 17.664 6.272-38.656 10.368-80.448 11.712-124.352H373.824c1.344 43.904 5.44 85.76 11.776 124.352zM512 714.688c-39.424 0-77.568 5.76-113.472 16.512 6.464 25.792 14.08 49.472 22.528 70.592 14.528 36.416 31.04 63.68 47.744 81.344 16.64 17.6 31.296 23.552 43.2 23.552 11.968 0 26.56-5.952 43.2-23.552 16.704-17.664 33.28-44.928 47.808-81.28 8.448-21.184 16-44.8 22.464-70.656A394.752 394.752 0 0 0 512 714.688z" p-id="7706"></path></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/overview/ProjectOverviewPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/overview/ProjectOverviewPage.html
index a61033c746..85122a7949 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/overview/ProjectOverviewPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/overview/ProjectOverviewPage.html
@@ -6,7 +6,10 @@
<img wicket:id="avatar" class="mr-3 flex-shrink-0">
<div class="details flex-grow-1">
<div class="d-flex flex-wrap align-items-center row-gap-1">
- <span wicket:id="path" class="path mb-0 mr-2 h2 text-truncate"></span>
+ <div class="project-path d-flex align-items-center text-nowrap mr-2">
+ <span wicket:id="path" class="path mb-0 h2 text-truncate"></span>
+ <a wicket:id="site" class="ml-2 mt-1 flex-shrink-0" target="_blank" t:data-tippy-content="Published site"><wicket:svg href="website" class="icon icon-lg"/></a>
+ </div>
<wicket:enclosure child="forkInfo">
<span wicket:id="forkInfo" class="btn-group fork-info flex-shrink-0 ml-sm-auto">
<a wicket:id="forks" class="btn btn-sm btn-outline-secondary btn-hover-primary"><span wicket:id="label"></span></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/overview/ProjectOverviewPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/overview/ProjectOverviewPage.java
index 921f7d6fb7..f50f4d14a3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/overview/ProjectOverviewPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/overview/ProjectOverviewPage.java
@@ -24,6 +24,7 @@ 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.ExternalLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
@@ -41,6 +42,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.unbescape.html.HtmlEscape;
+import com.google.common.collect.Lists;
+
import io.onedev.commons.utils.PlanarRange;
import io.onedev.server.OneDev;
import io.onedev.server.cluster.ClusterService;
@@ -52,9 +55,9 @@ import io.onedev.server.model.Iteration;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.Workspace;
-import io.onedev.server.search.code.hit.QueryHit;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.replica.ProjectReplica;
+import io.onedev.server.search.code.hit.QueryHit;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.IssueQueryLexer;
import io.onedev.server.search.entity.issue.StateCriteria;
@@ -72,6 +75,7 @@ import io.onedev.server.util.ProjectIssueStateStat;
import io.onedev.server.util.ProjectPackTypeStat;
import io.onedev.server.util.ProjectPullRequestStatusStat;
import io.onedev.server.util.ProjectWorkspaceStatusStat;
+import io.onedev.server.util.artifact.DirectoryInfo;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.web.component.MultilineLabel;
import io.onedev.server.web.component.entity.labels.EntityLabelsPanel;
@@ -90,19 +94,19 @@ import io.onedev.server.web.component.project.stats.issue.IssueStatsPanel;
import io.onedev.server.web.component.project.stats.pack.PackStatsPanel;
import io.onedev.server.web.component.project.stats.pullrequest.PullRequestStatsPanel;
import io.onedev.server.web.component.project.stats.workspace.WorkspaceStatsPanel;
+import io.onedev.server.web.mapper.ProjectMapperUtils;
import io.onedev.server.web.page.project.ProjectListPage;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
import io.onedev.server.web.page.project.issues.iteration.IterationIssuesPage;
+import io.onedev.server.web.resource.SiteFileResourceReference;
import io.onedev.server.web.upload.FileUpload;
import io.onedev.server.web.util.paginghistory.PagingHistorySupport;
import io.onedev.server.web.util.paginghistory.ParamPagingHistorySupport;
import io.onedev.server.workspace.WorkspaceService;
import io.onedev.server.xodus.CommitInfoService;
-import com.google.common.collect.Lists;
-
public class ProjectOverviewPage extends ProjectPage {
private static final Logger logger = LoggerFactory.getLogger(ProjectOverviewPage.class);
@@ -525,6 +529,17 @@ public class ProjectOverviewPage extends ProjectPage {
container.add(new ProjectAvatar("avatar", getProject().getId()));
container.add(new Label("path", getProject().getPath()));
+ var siteRoot = getProjectService().getSiteArtifactInfo(getProject().getId(), "");
+ if (siteRoot instanceof DirectoryInfo directory
+ && directory.getChildren() != null
+ && !directory.getChildren().isEmpty()) {
+ var siteParams = new PageParameters();
+ siteParams.set(ProjectMapperUtils.PARAM_PROJECT, getProject().getPath());
+ container.add(new ExternalLink("site", urlFor(new SiteFileResourceReference(), siteParams).toString()));
+ } else {
+ container.add(new WebMarkupContainer("site").setVisible(false));
+ }
+
container.add(new EntityLabelsPanel<>("labels", projectModel));
container.add(new Label("id", "id: " + getProject().getId()));
container.add(new Label("key", " · key: " + getProject().getKey())
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/overview/project-overview.css b/server-core/src/main/java/io/onedev/server/web/page/project/overview/project-overview.css
index 2265f57b75..36b1d5226b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/overview/project-overview.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/overview/project-overview.css
@@ -6,12 +6,16 @@
.project-overview .summary .details {
min-width: 0;
}
+.project-overview .summary .project-path {
+ min-width: 0;
+ flex: 1 1 12rem;
+ max-width: 100%;
+}
.project-overview .summary .path {
font-weight: 600;
line-height: 1.3;
min-width: 0;
- flex: 1 1 12rem;
- max-width: 100%;
+ flex: 0 1 auto;
}
.project-overview .fork-info > .btn {
flex: 0 0 auto;
diff --git a/server-core/src/main/java/io/onedev/server/web/resource/ProjectSiteFileResource.java b/server-core/src/main/java/io/onedev/server/web/resource/ProjectSiteFileResource.java
index d1f01a0e83..735e95a1c9 100644
--- a/server-core/src/main/java/io/onedev/server/web/resource/ProjectSiteFileResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/resource/ProjectSiteFileResource.java
@@ -119,6 +119,7 @@ public class ProjectSiteFileResource extends AbstractResource {
}
ResourceResponse response = new ResourceResponse();
+ response.disableCaching();
response.setAcceptRange(ContentRangeType.BYTES);
response.setContentType(fileInfo.getMediaType());
response.setContentLength(fileInfo.getLength());
@@ -188,6 +189,7 @@ public class ProjectSiteFileResource extends AbstractResource {
private ResourceResponse newDirectoryResponse(String directoryPath, DirectoryInfo directoryInfo) {
ResourceResponse response = new ResourceResponse();
+ response.disableCaching();
response.setContentType(MediaType.TEXT_HTML + "; charset=" + StandardCharsets.UTF_8.name());
response.setWriteCallback(new WriteCallback() {
@@ -231,6 +233,7 @@ public class ProjectSiteFileResource extends AbstractResource {
private ResourceResponse newNotFoundResponse(String filePath) {
ResourceResponse response = new ResourceResponse();
+ response.disableCaching();
response.setStatusCode(HttpServletResponse.SC_NOT_FOUND).setContentType(MediaType.TEXT_PLAIN);
response.setWriteCallback(new WriteCallback() {
@Override