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
10 changes: 8 additions & 2 deletions src/features/projects/data/useProjectSelection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ import NProgress from "nprogress"
import { useRouter, usePathname } from "next/navigation"
import { useContext } from "react"
import { ProjectsContext } from "@/common"
import { Project, ProjectNavigator, getProjectSelectionFromPath } from "../domain"
import {
Project,
ProjectNavigator,
getProjectSelectionFromPath,
getDefaultSpecification

} from "../domain"

export default function useProjectSelection() {
const router = useRouter()
Expand All @@ -29,7 +35,7 @@ export default function useProjectSelection() {
},
selectProject: (project: Project) => {
const version = project.versions[0]
const specification = version.specifications.find(spec => spec.isDefault) || version.specifications[0]
const specification = getDefaultSpecification(version)
NProgress.start()
projectNavigator.navigate(
project.owner,
Expand Down
3 changes: 2 additions & 1 deletion src/features/projects/domain/ProjectNavigator.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Project from "./Project"
import { getDefaultSpecification } from "./Version"

interface IPathnameReader {
readonly pathname: string
Expand Down Expand Up @@ -36,7 +37,7 @@ export default class ProjectNavigator {
if (candidateSpecification) {
this.router.push(`/${project.owner}/${project.name}/${newVersion.id}/${candidateSpecification.id}`)
} else {
const defaultOrFirstSpecification = newVersion.specifications.find(spec => spec.isDefault) || newVersion.specifications[0]
const defaultOrFirstSpecification = getDefaultSpecification(newVersion)
this.router.push(`/${project.owner}/${project.name}/${newVersion.id}/${defaultOrFirstSpecification.id}`)
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/features/projects/domain/Version.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@ export const VersionSchema = z.object({
type Version = z.infer<typeof VersionSchema>

export default Version

export function getDefaultSpecification(version: Version) {
return version.specifications.find((spec) => spec.isDefault) || version.specifications[0]
}
4 changes: 2 additions & 2 deletions src/features/projects/domain/getProjectSelectionFromPath.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Project from "./Project"
import Version from "./Version"
import Version, { getDefaultSpecification } from "./Version"
import OpenApiSpecification from "./OpenApiSpecification"

export default function getProjectSelectionFromPath({
Expand Down Expand Up @@ -61,7 +61,7 @@ export default function getProjectSelectionFromPath({
if (specificationId && !didMoveSpecificationIdToVersionId) {
specification = version.specifications.find(e => e.id == specificationId)
} else if (version.specifications.length > 0) {
specification = version.specifications.find(spec => spec.isDefault) || version.specifications[0]
specification = getDefaultSpecification(version)
}
return { project, version, specification }
}
Expand Down
1 change: 1 addition & 0 deletions src/features/projects/domain/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ export { default as ProjectNavigator } from "./ProjectNavigator"
export { default as ProjectRepository } from "./ProjectRepository"
export { default as updateWindowTitle } from "./updateWindowTitle"
export type { default as Version } from "./Version"
export { getDefaultSpecification } from "./Version"