Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ object GithubModel:
for
endCursor <- cursor.downField("pageInfo").downField("endCursor").as[Option[String]]
hasNextPage <- cursor.downField("pageInfo").downField("hasNextPage").as[Boolean]
nodes <- cursor.downField("nodes").as[Seq[T]]
nodes <- cursor.downField("nodes").as[Seq[Option[T]]].map(_.flatten)
yield GraphQLPage(endCursor, hasNextPage, nodes)

case class UserInfo(login: String, name: Option[String], avatarUrl: String):
Expand Down
6 changes: 2 additions & 4 deletions modules/server/src/main/resources/reference.conf
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ scaladex {
}
}

akka {
loggers = [akka.event.slf4j.Slf4jLogger]
pekko {
loggers = [org.apache.pekko.event.slf4j.Slf4jLogger]
loglevel = INFO
http.server {
idle-timeout = 30s
}
http.parsing.illegal-header-warnings = off
# The following is available in 10.1.x only
# http.parsing.ignore-illegal-header-for = ["user-agent", "accept-language"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class ProjectPages(
artifactsParams { params =>
getProjectOrRedirect(ref, user) { project =>
val artifactsF = database.getProjectArtifacts(ref, artifactName, params.stableOnly)
val headerF = projectService.getHeader(project).map(_.get)
val headerF = projectService.getHeader(project)
for artifacts <- artifactsF; header <- headerF yield
val binaryVersions = artifacts
.map(_.binaryVersion)
Expand Down Expand Up @@ -314,10 +314,12 @@ class ProjectPages(

private def getBadges(ref: Project.Reference, user: Option[UserState]): Route =
getProjectOrRedirect(ref, user) { project =>
for header <- projectService.getHeader(project).map(_.get) yield
val artifact = header.getDefaultArtifact(None, None)
val page = html.badges(env, user, project, header, artifact)
complete(StatusCodes.OK, page)
for header <- projectService.getHeader(project) yield header.map(_.getDefaultArtifact(None, None)) match
case Some(artifact) =>
val page = html.badges(env, user, project, header, artifact)
complete(StatusCodes.OK, page)
case None =>
complete(StatusCodes.NotFound)
}

private val editForm: Directive1[Project.Settings] =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
env: Env,
user: Option[UserState],
project: Project,
header: ProjectHeader,
header: Option[ProjectHeader],
artifact: Artifact
)
@main(env, title = project.repository.value, user, extraMeta = project.twitterCard.toHeadMeta, extraMetaProperty = project.ogp.toHeadMetaProperty) {
<main id="container-project">
@headproject(env, user, project, Some(header), ProjectTab.Badges)
@headproject(env, user, project, header, ProjectTab.Badges)
<div class="container">
<div class="content-project box project-badges">
<section class="badge-section" id="latest">
Expand All @@ -27,7 +27,7 @@ <h2>Latest version</h2>
<pre aria-label="Badge markdown" id="badge-markdown">[![@artifact.name Scala version support](@artifact.latestBadgeUrl(env))](@artifact.fullHttpUrl(env))</pre>
<button class="btn btn-primary btn-copy pull-right" data-clipboard-target="badge-markdown">Copy Markdown</button>
</section>
@header.platforms(artifact.name).map { platform =>
@header.toSeq.flatMap(_.platforms(artifact.name)).map { platform =>
<section class="badge-section" id="@platform">
<h2>@platform badge</h2>
<img src="@artifact.badgeUrl(env, Some(platform))" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
env: Env,
user: Option[UserState],
project: Project,
header: ProjectHeader,
header: Option[ProjectHeader],
artifactName: Artifact.Name,
allBinaryVersions: Seq[BinaryVersion],
artifactByVersions: SortedMap[(Instant, Version), Seq[Artifact]],
Expand All @@ -24,7 +24,7 @@

@main(env, title = project.repository.toString, user) {
<main id="container-project">
@headproject(env, user, project, Some(header), ProjectTab.Versions)
@headproject(env, user, project, header, ProjectTab.Versions)
<div class="container">
<div class="content-project versions box" data-organization="@project.reference.organization"
data-repository="@project.reference.repository">
Expand All @@ -34,7 +34,7 @@ <h2>
<select class="selectpicker" title="Other Artifacts"
data-style="btn-default" data-selected-text-format="static"
onchange="window.location=this.value">
@for(name <- header.allArtifactNames) {
@for(name <- header.map(_.allArtifactNames).getOrElse(Seq.empty)) {
<option value="@versionsUri(project.reference, name, params)" @if(name == artifactName) {selected}>
@name
</option>
Expand Down