Compare commits

...

9 Commits

Author SHA1 Message Date
ec7aec310a fix: stage deploy archive in user home
All checks were successful
CI / test (pull_request) Successful in 9m22s
CI / deploy (pull_request) Has been skipped
2026-09-14 17:23:29 +03:00
0f91ed0d8f Merge pull request 'fix: repair admin directory filter layout' (#43) from fix/admin-directory-filters into main
Some checks failed
CI / test (push) Successful in 9m23s
CI / deploy (push) Failing after 14s
Reviewed-on: #43
2026-09-14 13:58:41 +00:00
1e9cc50a73 fix: keep filter select values readable
All checks were successful
CI / test (pull_request) Successful in 9m20s
CI / deploy (pull_request) Has been skipped
2026-09-14 15:28:02 +03:00
10d2cf0101 fix: repair admin directory filter layout
All checks were successful
CI / test (pull_request) Successful in 9m21s
CI / deploy (pull_request) Has been skipped
2026-09-14 15:24:41 +03:00
44949996bc Merge pull request 'fix: configure dismissal safeguards and remove obsolete endpoint references' (#42) from refactor/remove-mcp-mentions into main
Some checks failed
CI / test (push) Successful in 9m20s
CI / deploy (push) Failing after 42s
Reviewed-on: #42
2026-09-14 10:26:12 +00:00
baad49b976 docs: record dismissal config fix
All checks were successful
CI / test (pull_request) Successful in 9m19s
CI / deploy (pull_request) Has been skipped
2026-09-14 12:53:01 +03:00
ceca2017cb fix: wire dismissal safety settings
All checks were successful
CI / test (pull_request) Successful in 9m20s
CI / deploy (pull_request) Has been skipped
2026-09-14 12:48:47 +03:00
83e726efe5 docs: align service version in README
All checks were successful
CI / test (pull_request) Successful in 9m18s
CI / deploy (pull_request) Has been skipped
2026-09-14 12:41:04 +03:00
7d6d8759a5 refactor: remove obsolete endpoint references
All checks were successful
CI / test (pull_request) Successful in 9m23s
CI / deploy (pull_request) Has been skipped
2026-09-14 12:39:06 +03:00
11 changed files with 85 additions and 41 deletions

View File

@@ -10,6 +10,8 @@ CRAWL_LIMIT=
REQUEST_TIMEOUT=30
REQUEST_DELAY_SECONDS=1
PARSER_USE_PLAYWRIGHT=false
DISMISSAL_CONFIRMATION_RUNS=3
MAX_AUTO_DISMISSALS_PER_RUN=25
ADMIN_USERNAME=admin
ADMIN_PASSWORD=change-me

View File

@@ -55,7 +55,7 @@ jobs:
-o BatchMode=yes \
-o UserKnownHostsFile="$RUNNER_TEMP/known_hosts" \
"$RUNNER_TEMP/$RELEASE_NAME" \
"$PROD_USER@$PROD_HOST:/tmp/$RELEASE_NAME"
"$PROD_USER@$PROD_HOST:$RELEASE_NAME"
env:
PROD_HOST: ${{ secrets.PROD_HOST }}
PROD_USER: ${{ secrets.PROD_USER }}
@@ -70,17 +70,18 @@ jobs:
"PROD_PATH='$PROD_PATH' RELEASE_NAME='$RELEASE_NAME' bash -s" <<'REMOTE'
set -euo pipefail
cd "$PROD_PATH"
release="$HOME/$RELEASE_NAME"
mkdir -p "$HOME/backups/miem_workers"
backup="$HOME/backups/miem_workers/miem_workers-$(date +%Y%m%d-%H%M%S).sql"
docker compose exec -T postgres sh -c 'pg_dump -U "$POSTGRES_USER" "$POSTGRES_DB"' > "$backup"
docker run --rm \
-v "/tmp/$RELEASE_NAME:/src/release.tar:ro" \
-v "$release:/src/release.tar:ro" \
-v "$PROD_PATH":/dst \
alpine:3.20 sh -c 'tar -xf /src/release.tar -C /dst'
docker compose up -d --build
curl --fail --silent --show-error http://127.0.0.1:8000/api/health
docker compose ps
rm -f "/tmp/$RELEASE_NAME"
rm -f "$release"
REMOTE
env:
PROD_HOST: ${{ secrets.PROD_HOST }}

View File

@@ -1,5 +1,21 @@
# Changelog
## 0.8.6
- Исправлена загрузка release-архива production CD в домашний каталог deploy-пользователя.
## 0.8.5
- Исправлена адаптивная компоновка фильтров справочника и скрытие skip-link до клавиатурного фокуса.
## 0.8.4
- Подключены к конфигурации ограничения массового автоматического увольнения, используемые плановым обходом.
## 0.8.3
- Удалены устаревшие пояснение о недоступном endpoint и проверка его отсутствия.
## 0.8.2
- Добавлен production CD workflow с backup PostgreSQL и проверкой healthcheck после обновления.

View File

@@ -64,7 +64,7 @@ docker compose up -d --build --remove-orphans
- API и админка: `http://localhost:8000`
- PostgreSQL: `postgres:5432` внутри сети Compose; порт на хост не опубликован.
Compose запускает `api`, `worker` и `postgres`. API привязан к localhost; для внешнего доступа нужен настроенный reverse proxy. MCP удалён, endpoint `/mcp` отсутствует; REST API данных требует сессию администратора.
Compose запускает `api`, `worker` и `postgres`. API привязан к localhost; для внешнего доступа нужен настроенный reverse proxy. REST API данных требует сессию администратора.
Таблицы создаются приложением при старте. При обновлении существующей базы приложение также добавляет недостающие runtime-колонки, например `crawl_runs.skipped_count`. SQL-миграции для ручного применения лежат в `migrations/`.
@@ -135,4 +135,4 @@ node --check app/static/admin.js
Тесты с данными используют временную SQLite; отдельные API smoke-тесты запускают приложение с его текущей конфигурацией. Браузерная проверка: `pip install playwright`, `python -m playwright install chromium`, затем `python tests/browser_admin.py`. Она проверяет реальный рендеринг страниц, клавиатуру, диалог, фильтры и восстановление прогресса после ошибки. Скриншоты сохраняются во временную папку; путь выводится в конце.
Версия сервиса: `0.8.2`. Админка всегда показывает версии backend и frontend в footer.
Версия сервиса: `0.8.6`. Админка всегда показывает версии backend и frontend в footer.

View File

@@ -13,6 +13,8 @@ class Settings(BaseSettings):
request_timeout: int = 30
request_delay_seconds: float = 1.0
parser_use_playwright: bool = False
dismissal_confirmation_runs: int = Field(default=3, ge=1)
max_auto_dismissals_per_run: int = Field(default=25, ge=1)
admin_username: str = "admin"
admin_password: str = "admin"

View File

@@ -8,20 +8,19 @@
font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
}
.admin__skip-link {
position: absolute;
top: 8px;
left: 8px;
z-index: 100;
padding: 8px 12px;
color: #ffffff;
background: #0f766e;
transform: translateY(-150%);
}
.admin__skip-link:focus {
transform: translateY(0);
}
.admin__skip-link {
position: absolute;
top: 8px;
left: -999px;
z-index: 100;
padding: 8px 12px;
color: #ffffff;
background: #0f766e;
}
.admin__skip-link:focus-visible {
left: 8px;
}
.admin__header {
display: flex;
@@ -544,9 +543,9 @@
color: #6b7280;
}
.directory__filters {
display: grid;
grid-template-columns: repeat(4, minmax(0, 1fr));
.directory__filters {
display: grid;
grid-template-columns: minmax(0, 1.1fr) minmax(0, 2fr) minmax(0, 1.25fr) minmax(0, 2fr);
gap: 10px;
padding: 16px;
background: #ffffff;
@@ -554,8 +553,8 @@
border-radius: 8px;
}
.directory__filter-group {
display: grid;
.directory__filter-group {
display: grid;
grid-template-columns: 1fr;
align-content: start;
gap: 8px;
@@ -586,7 +585,9 @@
font-weight: 700;
}
.directory__input {
.directory__input {
box-sizing: border-box;
width: 100%;
font: inherit;
font-size: 16px;
font-weight: 400;
@@ -804,13 +805,13 @@
grid-template-columns: 1fr;
}
.directory__filter-group,
.directory__filter-group--search,
.directory__filter-actions {
grid-column: 1;
}
.directory__field {
.directory__filter-group,
.directory__filter-group--search,
.directory__filter-actions {
grid-column: 1;
}
.directory__field {
font-size: 13px;
}
}

View File

@@ -1,3 +1,3 @@
APP_VERSION = "0.8.2"
FRONTEND_VERSION = "0.8.2"
BACKEND_VERSION = "0.8.2"
APP_VERSION = "0.8.6"
FRONTEND_VERSION = "0.8.6"
BACKEND_VERSION = "0.8.6"

View File

@@ -1,6 +1,6 @@
[project]
name = "miem-workers"
version = "0.8.2"
version = "0.8.6"
description = "MIEM employees parser, admin API, and web admin"
requires-python = ">=3.11"
dependencies = [

View File

@@ -67,6 +67,23 @@ def main():
expect(page.get_by_role("status")).to_have_text("Показаны 2630 из 30")
assert page.locator("th:visible").count() == 5
assert page.locator(".directory__table-wrap").evaluate("e => e.scrollWidth <= e.clientWidth")
skip_link = page.get_by_role("link", name="Перейти к содержимому")
assert skip_link.evaluate("e => getComputedStyle(e).left === '-999px'")
page.keyboard.press("Tab")
expect(skip_link).to_be_focused()
assert skip_link.evaluate("e => getComputedStyle(e).left === '8px'")
page.keyboard.press("Tab")
assert skip_link.evaluate("e => getComputedStyle(e).left === '-999px'")
for width in (1440, 1024, 921, 920, 768, 621, 620, 390, 320):
page.set_viewport_size({"width": width, "height": 844})
assert page.locator(".directory__filters").evaluate("e => e.scrollWidth <= e.clientWidth")
assert page.locator(".directory__input").evaluate_all("""controls => controls.every(control => {
const field = control.closest('.directory__field').getBoundingClientRect();
const rect = control.getBoundingClientRect();
return rect.left >= field.left - 1 && rect.right <= field.right + 1;
})""")
page.set_viewport_size({"width": 1440, "height": 1000})
page.get_by_label("ФИО или ссылка").fill("Сотрудник 00")
page.get_by_role("button", name="Применить фильтры").click()
expect(page.get_by_role("status")).to_have_text("Показаны 11 из 1")

View File

@@ -18,11 +18,7 @@ def test_health_returns_versions():
response = TestClient(app).get("/api/health")
assert response.status_code == 200
assert response.json()["backend_version"] == "0.8.2"
def test_mcp_endpoint_is_removed():
assert TestClient(app).get("/mcp").status_code == 404
assert response.json()["backend_version"] == "0.8.6"
def test_api_employees_and_stats_require_admin_session():

View File

@@ -11,3 +11,12 @@ def test_numeric_crawl_limit_is_parsed():
settings = Settings(crawl_limit="25")
assert settings.crawl_limit == 25
def test_dismissal_safety_settings_have_conservative_defaults(monkeypatch):
monkeypatch.delenv("DISMISSAL_CONFIRMATION_RUNS", raising=False)
monkeypatch.delenv("MAX_AUTO_DISMISSALS_PER_RUN", raising=False)
settings = Settings(_env_file=None)
assert settings.dismissal_confirmation_runs == 3
assert settings.max_auto_dismissals_per_run == 25