diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e2346a4a5..1b7ed87bc 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,7 +1,7 @@ name: gradido publish CI on: - push: + pull_request: branches: - master @@ -10,7 +10,7 @@ jobs: # JOB: DOCKER BUILD PRODUCTION FRONTEND ###################################### ############################################################################## build_production_frontend: - if: startsWith(github.event.head_commit.message, 'chore(release):') + if: startsWith(github.event.pull_request.title, 'chore(release):') name: Docker Build Production - Frontend runs-on: ubuntu-latest #needs: [nothing] diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cca591bc..1ef3c24bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,26 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [v2.7.4](https://github.com/gradido/gradido/compare/v2.7.3...v2.7.4) + +- feat(workflow): update .env.dist in deploy and make install script more idempotent [`#3593`](https://github.com/gradido/gradido/pull/3593) +- feat(admin): load moderator names for contribution list [`#3599`](https://github.com/gradido/gradido/pull/3599) +- fix(other): email mime types [`#3601`](https://github.com/gradido/gradido/pull/3601) +- fix(database): use connection pool for drizzle orm [`#3600`](https://github.com/gradido/gradido/pull/3600) +- feat(admin): make deleted contributions better recognisable with Deuteranopie [`#3597`](https://github.com/gradido/gradido/pull/3597) +- fix(workflow): rewrite sort.sh as sortLocales.ts [`#3598`](https://github.com/gradido/gradido/pull/3598) +- refactor(database): add drizzleOrm, use it in openaiThreads [`#3595`](https://github.com/gradido/gradido/pull/3595) +- fix(other): fix biome config [`#3592`](https://github.com/gradido/gradido/pull/3592) +- feat(other): reduce github worker count [`#3591`](https://github.com/gradido/gradido/pull/3591) +- fix(other): removed phantom line, aligned env and compose [`#3570`](https://github.com/gradido/gradido/pull/3570) +- feat(dlt): migrate database transaction to dlt transactions [`#3571`](https://github.com/gradido/gradido/pull/3571) +- feat(dlt): add inspector as submodule, update nginx config to serve inspector and gradido node [`#3566`](https://github.com/gradido/gradido/pull/3566) +- chore(release): v2.7.3 [`#3590`](https://github.com/gradido/gradido/pull/3590) + #### [v2.7.3](https://github.com/gradido/gradido/compare/v2.7.2...v2.7.3) +> 4 December 2025 + - feat(admin): show user registered at in admin [`#3589`](https://github.com/gradido/gradido/pull/3589) - feat(backend): 3573 feature introduce distributed semaphore base on redis [`#3580`](https://github.com/gradido/gradido/pull/3580) - fix(workflow): make deployment install script more robust [`#3588`](https://github.com/gradido/gradido/pull/3588) diff --git a/admin/.env.template b/admin/.env.template index 24725f279..4a65b5a35 100644 --- a/admin/.env.template +++ b/admin/.env.template @@ -1,5 +1,3 @@ -CONFIG_VERSION=$ADMIN_CONFIG_VERSION - COMMUNITY_HOST=$COMMUNITY_HOST URL_PROTOCOL=$URL_PROTOCOL WALLET_AUTH_PATH=$WALLET_AUTH_PATH diff --git a/admin/package.json b/admin/package.json index 062594ccc..61bbb21ac 100644 --- a/admin/package.json +++ b/admin/package.json @@ -3,7 +3,7 @@ "description": "Administration Interface for Gradido", "main": "index.js", "author": "Gradido Academy - https://www.gradido.net", - "version": "2.7.3", + "version": "2.7.4", "license": "Apache-2.0", "scripts": { "dev": "vite", @@ -18,8 +18,8 @@ "test:coverage": "cross-env TZ=UTC vitest run --coverage", "test:debug": "cross-env TZ=UTC node --inspect-brk ./node_modules/vitest/vitest.mjs", "test:watch": "cross-env TZ=UTC vitest", - "locales": "scripts/sort.sh", - "locales:fix": "scripts/sort.sh --fix", + "locales": "bun scripts/sortLocales.ts", + "locales:fix": "bun scripts/sortLocales.ts --fix", "clear": "rm -rf node_modules && rm -rf build && rm -rf .turbo" }, "dependencies": { diff --git a/admin/scripts/sortLocales.ts b/admin/scripts/sortLocales.ts new file mode 100644 index 000000000..9b0ee74a0 --- /dev/null +++ b/admin/scripts/sortLocales.ts @@ -0,0 +1,51 @@ +#!/usr/bin/env bun +import { readdir, readFile, writeFile } from 'fs/promises' +import { join } from 'path' + +const ROOT_DIR = join(import.meta.dir, '..') +const LOCALES_DIR = join(ROOT_DIR, 'src', 'locales') + +const FIX = process.argv.includes('--fix') + +function sortObject(value: any): any { + if (Array.isArray(value)) { + return value.map(sortObject) + } + + if (value && typeof value === 'object') { + return Object.keys(value) + .sort() + .reduce>((acc, key) => { + acc[key] = sortObject(value[key]) + return acc + }, {}) + } + + return value +} + +let exitCode = 0 + +const files = (await readdir(LOCALES_DIR)) + .filter(f => f.endsWith('.json')) + +for (const file of files) { + const path = join(LOCALES_DIR, file) + + const originalText = await readFile(path, 'utf8') + const originalJson = JSON.parse(originalText) + + const sortedJson = sortObject(originalJson) + const sortedText = JSON.stringify(sortedJson, null, 2) + '\n' + + if (originalText !== sortedText) { + if (FIX) { + await writeFile(path, sortedText) + } else { + console.error(`${file} is not sorted by keys`) + exitCode = 1 + } + } +} + +process.exit(exitCode) \ No newline at end of file diff --git a/admin/src/components/RowDetails.vue b/admin/src/components/RowDetails.vue index 9715ef158..97858c22b 100644 --- a/admin/src/components/RowDetails.vue +++ b/admin/src/components/RowDetails.vue @@ -6,7 +6,7 @@ :icon="type === 'PageCreationConfirm' ? 'x' : 'eye-slash-fill'" aria-label="Help" > - {{ $t('hide_details') }} {{ row.item.user.firstName }} {{ row.item.user.lastName }} + {{ $t('hide_details') }} diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue index d94f85bae..46a1651a1 100644 --- a/admin/src/components/Tables/OpenCreationsTable.vue +++ b/admin/src/components/Tables/OpenCreationsTable.vue @@ -14,7 +14,13 @@ - + +