Merge branch 'develop' into feature/sort-specifications-alphabetically

Author: ulrikandersen

package-lock.json

@@ -27,7 +27,7 @@
     "@mui/material": "^7.0.1",
     "@octokit/auth-app": "^7.2.1",
     "@octokit/core": "^6.1.5",
-    "@octokit/webhooks": "~13.8.0",
+    "@octokit/webhooks": "~13.8.2",
     "core-js": "^3.39.0",
     "encoding": "^0.1.13",
     "figma-squircle": "^1.1.0",
@@ -36,7 +36,7 @@
     "mobx": "^6.13.5",
     "next": "^15.3.0",
     "next-auth": "^5.0.0-beta.25",
-    "npm": "^11.2.0",
+    "npm": "^11.3.0",
     "nprogress": "^0.2.0",
     "octokit": "^4.1.1",
     "react": "^18.3.1",
@@ -45,7 +45,7 @@
     "redoc": "^2.4.0",
     "sharp": "^0.34.1",
     "styled-components": "^6.1.17",
-    "swagger-ui-react": "^5.20.1",
+    "swagger-ui-react": "^5.21.0",
     "swr": "^2.3.3",
     "usehooks-ts": "^3.1.1",
     "yaml": "^2.7.0",
@@ -60,9 +60,9 @@
     "@types/pg": "^8.11.10",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.0",
-    "@types/swagger-ui-react": "^4.18.3",
-    "@typescript-eslint/eslint-plugin": "^8.30.1",
-    "@typescript-eslint/parser": "^8.30.1",
+    "@types/swagger-ui-react": "^5.18.0",
+    "@typescript-eslint/eslint-plugin": "^8.31.0",
+    "@typescript-eslint/parser": "^8.31.0",
     "eslint": "^9.21.0",
     "eslint-config-next": "^15.2.2",
     "pg": "^8.13.1",

package.json

@@ -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()
@@ -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,

src/features/projects/data/useProjectSelection.ts

@@ -1,4 +1,5 @@
 import Project from "./Project"
+import { getDefaultSpecification } from "./Version"
 
 interface IPathnameReader {
   readonly pathname: string
@@ -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}`)
     }
   }

src/features/projects/domain/ProjectNavigator.ts

@@ -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]
+}

src/features/projects/domain/Version.ts

@@ -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({
@@ -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 }
 }

src/features/projects/domain/getProjectSelectionFromPath.ts

@@ -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"