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
2 changes: 1 addition & 1 deletion app/airflow/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "carrot-airflow"
version = "4.2.3"
version = "4.2.4"
description = "Add your description here"
readme = "README.md"
requires-python = ">=3.11"
Expand Down
4 changes: 3 additions & 1 deletion app/api/api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -1589,4 +1589,6 @@ class HealthCheckView(APIView):
permission_classes = [AllowAny]

def get(self, request):
return Response({"status": "healthy"}, status=status.HTTP_200_OK)
return Response(
{"status": "healthy", "version": version("api")}, status=status.HTTP_200_OK
)
2 changes: 2 additions & 0 deletions app/api/config/urls.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
from api.views import HealthCheckView
from django.contrib import admin
from django.http import HttpResponse
from django.urls import include, path

urlpatterns = [
path("", lambda r: HttpResponse(status=200), name="root"),
path("api/", include("api.urls")),
path("api/auth/", include("authn.urls")),
path("admin/", admin.site.urls),
Expand Down
2 changes: 1 addition & 1 deletion app/api/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "api"
version = "4.2.3"
version = "4.2.4"
description = "Web app for Carrot-Mapper"

authors = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,9 @@ export const columns: ColumnDef<FileDownload>[] = [
}
};
return (
<Button variant={"outline"} onClick={handleDownload}>
Download{" "}
<Button variant={"outline"} asChild>
<a href={`/api/download/${scan_report}/${id}`} target="_blank">
<Download />
Download <Download />
</a>
</Button>
);
Expand Down
9 changes: 9 additions & 0 deletions app/next-client-app/app/api/health/route.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { NextResponse } from "next/server";
import packageJson from "../../../package.json";

export async function GET() {
return NextResponse.json({
status: "healthy",
version: packageJson.version,
});
}
2 changes: 1 addition & 1 deletion app/next-client-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "next-client-app",
"version": "4.2.3",
"version": "4.2.4",
"private": true,
"scripts": {
"dev": "next dev --turbo",
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "carrot-mapper"
version = "4.2.3"
version = "4.2.4"
description = ""
authors = [
{ name = "Sam Cox", email = "sam.cox@nottingham.ac.uk" },
Expand Down