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
1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ task format
task typecheck

pnpm run lint
pnpm run typecheck
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
"**/node_modules/**",
"**/dist/**",
"*.config.ts"
],
],
}
2 changes: 1 addition & 1 deletion nginx/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG NGINX_VERSION=1.29.6
ARG NGINX_VERSION=1.29.7
ARG NODE_VERSION=24
ARG SHIB_MOD_VERSION=2.0.2
ARG HEADERS_MORE_VERSION=0.37
Expand Down
2 changes: 1 addition & 1 deletion nginx/conf.d/app.dev.inc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Proxy requests to the application dev server

location ~ "_nuxt" {
location ~ ^/(_nuxt|_fonts)/ {
proxy_pass http://app_server;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
Expand Down
6 changes: 4 additions & 2 deletions nginx/conf.d/app.inc
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ root /usr/share/nginx/html;

index index.html;

location /_nuxt/ {
location ~ ^/(_nuxt|_fonts)/ {
access_log off;
log_not_found off;

try_files $uri $uri/ /index.html;
add_header Cache-Control "public, immutable";

try_files $uri =404;
}

location / {
Expand Down
2 changes: 1 addition & 1 deletion nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default defineNuxtConfig({

srcDir: 'src/app/',

compatibilityDate: '2026-03-04',
compatibilityDate: '2026-03-23',

vite: {
vue: {
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "jairocloud-groups-manager",
"private": true,
"type": "module",
"version": "1.0.0-alpha.1",
"version": "1.0.0-alpha.2",
"description": "A web client for JAIRO Cloud repository administrators to manage groups in the GakuNin Cloud Gateway.",
"license": "MIT",
"author": {
Expand All @@ -24,8 +24,8 @@
"dependencies": {
"@iconify-json/lucide": "^1.2.98",
"@nuxt/content": "^3.12.0",
"@nuxt/ui": "^4.5.1",
"@nuxtjs/i18n": "^10.2.3",
"@nuxt/ui": "^4.6.0",
"@nuxtjs/i18n": "^10.2.4",
"@pinia/nuxt": "^0.11.3",
"@vueuse/nuxt": "^14.2.1",
"nuxt": "^4.4.2",
Expand All @@ -42,13 +42,13 @@
"eslint": "^10.1.0",
"eslint-plugin-unicorn": "^63.0.0",
"husky": "^9.1.7",
"typescript": "^5.9.3",
"typescript": "^6.0.2",
"vue-tsc": "^3.2.6"
},
"engines": {
"node": "^24.14.0",
"pnpm": "^10.32.0",
"pnpm": "^10.33.0",
"npm": "please_use_pnpm_instead"
},
"packageManager": "pnpm@10.32.1"
"packageManager": "pnpm@10.33.0"
}
1,779 changes: 1,225 additions & 554 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

48 changes: 29 additions & 19 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "jairocloud-groups-manager"
version = "1.0.0a1"
version = "1.0.0a2"
authors = [
{name = "National Institute of Informatics"}
]
Expand All @@ -9,28 +9,28 @@ readme = "README.md"
license = {file = "LICENSE"}
requires-python = ">=3.14"
dependencies = [
"celery[redis]>=5.6.2",
"flask>=3.1.3",
"flask-login>=0.6.3",
"flask-pydantic>=0.14.0",
"flask-sqlalchemy>=3.1.1",
"openpyxl>=3.1.5",
"psycopg[binary]>=3.3.3",
"pydantic-settings>=2.13.1",
"pydantic[email]>=2.12.5",
"requests>=2.32.5",
"sqlalchemy-utils>=0.42.1",
"weko-group-cache-db",
"celery[redis]>=5.6.2",
"flask>=3.1.3",
"flask-login>=0.6.3",
"flask-pydantic>=0.14.0",
"flask-sqlalchemy>=3.1.1",
"openpyxl>=3.1.5",
"psycopg[binary]>=3.3.3",
"pydantic-settings>=2.13.1",
"pydantic[email]>=2.12.5",
"requests>=2.32.5",
"sqlalchemy-utils>=0.42.1",
"weko-group-cache-db",
]

[dependency-groups]
dev = [
"celery-types>=0.24.0",
"pyright>=1.1.408",
"pytest>=9.0.2",
"pytest-cov>=7.0.0",
"pytest-mock>=3.15.1",
"taskipy>=1.14.1",
"celery-types>=0.24.0",
"pyright>=1.1.408",
"pytest>=9.0.2",
"pytest-cov>=7.0.0",
"pytest-mock>=3.15.1",
"taskipy>=1.14.1",
]

[project.scripts]
Expand Down Expand Up @@ -89,6 +89,16 @@ select = ["ALL"]
combine-as-imports = true
lines-after-imports = 2
lines-between-types = 1
known-first-party = ["server"]
sections = { "testing-helpers" = ["tests"] }
section-order = [
"future",
"standard-library",
"third-party",
"first-party",
"testing-helpers",
"local-folder",
]

[tool.ruff.lint.pylint]
max-args = 6
Expand Down
2 changes: 1 addition & 1 deletion src/app/composables/repositories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const useRepositoriesTable = () => {
header: () => sortColumns
? sortableHeader('id')
: h('span', { class: 'text-xs text-default font-medium' }, columnNames.value.id),
cell: ({ row }) => row.original.spConnectorId,
cell: ({ row }) => row.original.id,
enableGlobalFilter: false,
},
{
Expand Down
9 changes: 7 additions & 2 deletions src/contrib/messages.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@

from datetime import UTC, datetime

from src.server import messages
from src.server.messages.base import LogMessage

try:
from src.server import messages
from src.server.messages.base import LogMessage
except ImportError:
from server import messages
from server.messages.base import LogMessage


def generate_type_stub() -> None:
Expand Down
2 changes: 1 addition & 1 deletion src/server/api/group_caches.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
@bp.before_request
def init_settings() -> None:
"""Initialize settings for the request."""
setup_weko_group_cache_db_config(config.CACHE_DB)
setup_weko_group_cache_db_config(config.for_group_caches)


@bp.get("/", strict_slashes=False)
Expand Down
2 changes: 1 addition & 1 deletion src/server/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class RuntimeConfig(BaseSettings):

@computed_field
@property
def CACHE_DB(self) -> CacheDbSettings:
def for_group_caches(self) -> CacheDbSettings:
"""Cache database configuration values."""
endpoint = (
self.MAP_CORE.base_url.rstrip("/")
Expand Down
2 changes: 1 addition & 1 deletion src/server/ext.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def init_config(self, app: Flask) -> None:
app.config.from_mapping(self.config.for_flask)
app.config.from_prefixed_env()

setup_weko_group_cache_db_config(self.config.CACHE_DB)
setup_weko_group_cache_db_config(self.config.for_group_caches)

def init_db_app(self, app: Flask) -> None: # noqa: PLR6301
"""Initialize the database for the this extension.
Expand Down
6 changes: 6 additions & 0 deletions tests/helpers.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import inspect
import json
import typing as t

from pathlib import Path
from typing import Any
Expand All @@ -9,5 +11,9 @@ def load_json_data(file_path: str) -> dict[str, Any]:
return json.load(file)


def unwrap[T: t.Callable](f: T) -> T:
return inspect.unwrap(f)


class UnexpectedError(Exception):
"""Custom exception for unexpected errors in tests."""
Loading
Loading