From 30c443ad2f97468f803b19234f9c2f06d9c9c749 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Mon, 3 Nov 2025 13:42:51 +0100 Subject: [PATCH 1/4] optimize gitignore, add depends_on in docker-compose which mirror docker-compose.override, remove error line from github workflow --- .github/workflows/lint.yml | 1 - .gitignore | 3 +-- docker-compose.yml | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 1416b2e04..a68fa5906 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -25,7 +25,6 @@ jobs: run: | cd ./config-schema biome ci . - echo $? echo "success=$([ $? -eq 0 ] && echo true || echo false)" >> $GITHUB_OUTPUT - name: Lint - Shared id: shared diff --git a/.gitignore b/.gitignore index d82288fbd..b021db236 100644 --- a/.gitignore +++ b/.gitignore @@ -12,9 +12,8 @@ messages.pot nbproject .metadata /out/* -/.env +.env package-lock.json -/deployment/bare_metal/.env /deployment/bare_metal/nginx/sites-available/gradido.conf /deployment/bare_metal/nginx/sites-available/update-page.conf /deployment/bare_metal/nginx/update-page/updating.html diff --git a/docker-compose.yml b/docker-compose.yml index a14fcdf2e..72aa5102c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -279,6 +279,7 @@ services: depends_on: - backend - frontend + - admin ports: - 80:80 volumes: From ee09eb94a6612b9aeb9bd7cb7cfee23235bdbdf2 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Mon, 3 Nov 2025 14:01:21 +0100 Subject: [PATCH 2/4] reduce double entries in .gitignore files, trust mainly .gitignore in root folder --- .gitignore | 4 ++++ admin/.gitignore | 14 -------------- backend/.gitignore | 10 +--------- backend/src/seeds/factory/user.ts | 2 +- config-schema/.gitignore | 14 -------------- database/.gitignore | 27 --------------------------- dht-node/.gitignore | 8 -------- dlt-connector/.gitignore | 8 -------- e2e-tests/.gitignore | 1 - federation/.gitignore | 8 -------- frontend/.gitignore | 29 ----------------------------- 11 files changed, 6 insertions(+), 119 deletions(-) delete mode 100644 config-schema/.gitignore delete mode 100644 database/.gitignore delete mode 100644 dht-node/.gitignore delete mode 100644 dlt-connector/.gitignore delete mode 100644 federation/.gitignore diff --git a/.gitignore b/.gitignore index b021db236..856e4a490 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ vite.config.mjs.timestamp-* log4js-config*.json /node_modules/* node_modules +coverage build messages.pot nbproject @@ -22,3 +23,6 @@ package-lock.json # Apple macOS folder attribute file .DS_Store + +# emacs +*~ diff --git a/admin/.gitignore b/admin/.gitignore index 704a34221..8aab3b4f1 100644 --- a/admin/.gitignore +++ b/admin/.gitignore @@ -1,15 +1 @@ -node_modules/ -build/ -.cache/ -.yarn/install-state.gz - -/.env -/.env.bak - -# coverage folder -coverage/ - -# emacs -*~ - components.d.ts diff --git a/backend/.gitignore b/backend/.gitignore index 5435dd5ff..a3068018e 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -1,9 +1 @@ -/node_modules/ -/.env -/.env.bak -/build/ -/locales/ -package-json.lock -coverage -# emacs -*~ +locales diff --git a/backend/src/seeds/factory/user.ts b/backend/src/seeds/factory/user.ts index 3cae22f71..08bd70852 100644 --- a/backend/src/seeds/factory/user.ts +++ b/backend/src/seeds/factory/user.ts @@ -40,7 +40,7 @@ export const userFactory = async ( } // get last changes of user from database - dbUser = await User.findOneOrFail({ where: { id }, relations: ['userRoles'] }) + dbUser = await User.findOneOrFail({ where: { id }, relations: { userRoles: true, emailContact: true } }) if (user.createdAt || user.deletedAt || user.role) { if (user.createdAt) { diff --git a/config-schema/.gitignore b/config-schema/.gitignore deleted file mode 100644 index ce6695205..000000000 --- a/config-schema/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -node_modules/ -build/ -.cache/ -.yarn/install-state.gz - -/.env -/.env.bak - -# coverage folder -coverage/ - -# emacs -*~ - diff --git a/database/.gitignore b/database/.gitignore deleted file mode 100644 index 9e9e01ced..000000000 --- a/database/.gitignore +++ /dev/null @@ -1,27 +0,0 @@ -.DS_Store -node_modules/ -build/ -.cache/ -npm-debug.log* -yarn-debug.log* -yarn-error.log* -test/unit/coverage - -package-lock.json -/.env -/.env.bak -.env.development.local -.env.production.local - -# Editor directories and files -.idea -*.suo -*.ntvs* -*.njsproj -*.sln - -# coverage folder - -coverage/ - -*~ diff --git a/dht-node/.gitignore b/dht-node/.gitignore deleted file mode 100644 index 6eadcc884..000000000 --- a/dht-node/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/node_modules/ -/.env -/.env.bak -/build/ -package-json.lock -coverage -# emacs -*~ diff --git a/dlt-connector/.gitignore b/dlt-connector/.gitignore deleted file mode 100644 index 6eadcc884..000000000 --- a/dlt-connector/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/node_modules/ -/.env -/.env.bak -/build/ -package-json.lock -coverage -# emacs -*~ diff --git a/e2e-tests/.gitignore b/e2e-tests/.gitignore index 405b844c5..f1d8eebc2 100644 --- a/e2e-tests/.gitignore +++ b/e2e-tests/.gitignore @@ -1,4 +1,3 @@ -node_modules/ cypress/screenshots/ cypress/videos/ cypress/reports/ diff --git a/federation/.gitignore b/federation/.gitignore deleted file mode 100644 index 6eadcc884..000000000 --- a/federation/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/node_modules/ -/.env -/.env.bak -/build/ -package-json.lock -coverage -# emacs -*~ diff --git a/frontend/.gitignore b/frontend/.gitignore index b527252d0..8fd88a839 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -1,32 +1,3 @@ -.DS_Store -node_modules/ -build/ src/assets/css/gradido.css src/assets/css/gradido.css.map -.cache/ -.yarn/install-state.gz - -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -package-lock.json -/.env -/.env.bak -.env.development.local -.env.production.local - -# Editor directories and files -.idea -*.suo -*.ntvs* -*.njsproj -*.sln - -# coverage folder - -coverage/ - -*~ - components.d.ts From e3a7932660aa6ea1c5021036347f1bcfc71eff12 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Mon, 3 Nov 2025 14:07:19 +0100 Subject: [PATCH 3/4] remove lint line for outdated dlt-connector' --- .github/workflows/test_dlt_connector.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/test_dlt_connector.yml b/.github/workflows/test_dlt_connector.yml index 0c81188ba..1123b2696 100644 --- a/.github/workflows/test_dlt_connector.yml +++ b/.github/workflows/test_dlt_connector.yml @@ -40,18 +40,6 @@ jobs: name: docker-dlt-connector-test path: /tmp/dlt-connector.tar - lint: - name: Lint - DLT Connector - if: needs.files-changed.outputs.dlt_connector == 'true' - needs: files-changed - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v3 - - - name: Lint - run: cd dlt-connector && yarn && yarn run lint - unit_test: name: Unit Tests - DLT Connector if: needs.files-changed.outputs.dlt_connector == 'true' || needs.files-changed.outputs.docker-compose == 'true' From d5813b2f6644bd662e4d6e79b0531c13dbc7e2e6 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Fri, 14 Nov 2025 16:53:26 +0100 Subject: [PATCH 4/4] add missing 'use ' in clear db function --- database/migration/clear.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/database/migration/clear.ts b/database/migration/clear.ts index a78d35890..9c2f5b364 100644 --- a/database/migration/clear.ts +++ b/database/migration/clear.ts @@ -4,6 +4,8 @@ import { connectToDatabaseServer } from './prepare' import { MIGRATIONS_TABLE } from '../src/config/const' export async function truncateTables(connection: Connection) { + const databaseName = CONFIG.DB_DATABASE + await connection.query(`USE \`${databaseName}\``) const [tables] = await connection.query('SHOW TABLES') const tableNames = (tables as any[]).map((table) => Object.values(table)[0])