From 8ef4f4dcd50580a1fe4b3bca3b776374c1e285d5 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 12 Nov 2024 14:13:08 +0100 Subject: [PATCH 01/10] try and catch by syncUser with humhub or gms --- backend/src/graphql/resolver/UserResolver.ts | 26 +++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index e31dc4867..2ff0775d0 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -686,17 +686,25 @@ export class UserResolver { await EVENT_USER_INFO_UPDATE(user) // validate if user settings are changed with relevance to update gms-user - if (CONFIG.GMS_ACTIVE && updateUserInGMS) { - logger.debug(`changed user-settings relevant for gms-user update...`) - const homeCom = await getHomeCommunity() - if (homeCom.gmsApiKey !== null) { - logger.debug(`gms-user update...`, user) - await updateGmsUser(homeCom.gmsApiKey, new GmsUser(user)) - logger.debug(`gms-user update successfully.`) + try { + if (CONFIG.GMS_ACTIVE && updateUserInGMS) { + logger.debug(`changed user-settings relevant for gms-user update...`) + const homeCom = await getHomeCommunity() + if (homeCom.gmsApiKey !== null) { + logger.debug(`gms-user update...`, user) + await updateGmsUser(homeCom.gmsApiKey, new GmsUser(user)) + logger.debug(`gms-user update successfully.`) + } } + } catch (e) { + logger.error('error sync user with gms', e) } - if (CONFIG.HUMHUB_ACTIVE) { - await syncHumhub(updateUserInfosArgs, user) + try { + if (CONFIG.HUMHUB_ACTIVE) { + await syncHumhub(updateUserInfosArgs, user) + } + } catch (e) { + logger.error('error sync user with humhub', e) } return true From 3ce1f58a8924dc59a7070dae2d19656d46f323d4 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 12 Nov 2024 16:43:25 +0100 Subject: [PATCH 02/10] fix, small refactor --- backend/src/apis/humhub/model/Account.ts | 3 +-- backend/src/data/PublishName.logic.ts | 3 ++- backend/src/graphql/resolver/UserResolver.ts | 11 ++++++++--- backend/src/graphql/resolver/util/syncHumhub.ts | 3 ++- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/backend/src/apis/humhub/model/Account.ts b/backend/src/apis/humhub/model/Account.ts index 1eb3e37be..ac80a195b 100644 --- a/backend/src/apis/humhub/model/Account.ts +++ b/backend/src/apis/humhub/model/Account.ts @@ -3,12 +3,11 @@ import { User } from '@entity/User' import { convertGradidoLanguageToHumhub } from '@/apis/humhub/convertLanguage' import { PublishNameLogic } from '@/data/PublishName.logic' -import { PublishNameType } from '@/graphql/enum/PublishNameType' export class Account { public constructor(user: User) { const publishNameLogic = new PublishNameLogic(user) - this.username = publishNameLogic.getUsername(user.humhubPublishName as PublishNameType) + this.username = publishNameLogic.getUsername() this.email = user.emailContact.email this.language = convertGradidoLanguageToHumhub(user.language) this.status = 1 diff --git a/backend/src/data/PublishName.logic.ts b/backend/src/data/PublishName.logic.ts index d3643d633..3c89fc057 100644 --- a/backend/src/data/PublishName.logic.ts +++ b/backend/src/data/PublishName.logic.ts @@ -66,7 +66,8 @@ export class PublishNameLogic { * @returns user.alias for publishNameType = PUBLISH_NAME_ALIAS_OR_INITALS and user has alias * else return user.firstName[0,2] + user.lastName[0,2] for publishNameType = [PUBLISH_NAME_ALIAS_OR_INITALS, PUBLISH_NAME_INITIALS] */ - public getUsername(publishNameType: PublishNameType): string { + public getUsername(): string { + const publishNameType = this.user.humhubPublishName as PublishNameType if ( [ PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS, diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index e31dc4867..e74ae8f45 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -60,7 +60,6 @@ import { EVENT_ADMIN_USER_DELETE, EVENT_ADMIN_USER_UNDELETE, } from '@/event/Events' -import { PublishNameType } from '@/graphql/enum/PublishNameType' import { isValidPassword } from '@/password/EncryptorUtils' import { encryptPassword, verifyPassword } from '@/password/PasswordEncryptor' import { Context, getUser, getClientTimezoneOffset } from '@/server/context' @@ -172,7 +171,7 @@ export class UserResolver { if (CONFIG.HUMHUB_ACTIVE && dbUser.humhubAllowed) { const publishNameLogic = new PublishNameLogic(dbUser) humhubUserPromise = HumHubClient.getInstance()?.userByUsernameAsync( - publishNameLogic.getUsername(dbUser.humhubPublishName as PublishNameType), + publishNameLogic.getUsername(), ) } @@ -316,6 +315,8 @@ export class UserResolver { dbUser.firstName = firstName dbUser.lastName = lastName dbUser.language = language + // enable humhub from now on for new user + dbUser.humhubAllowed = true if (alias && (await validateAlias(alias))) { dbUser.alias = alias } @@ -386,6 +387,9 @@ export class UserResolver { await queryRunner.release() } logger.info('createUser() successful...') + if (CONFIG.HUMHUB_ACTIVE) { + void syncHumhub(null, dbUser) + } if (redeemCode) { eventRegisterRedeem.affectedUser = dbUser @@ -736,7 +740,8 @@ export class UserResolver { if (!humhubClient) { throw new LogError('cannot create humhub client') } - const username = dbUser.alias ?? dbUser.gradidoID + const userNameLogic = new PublishNameLogic(dbUser) + const username = userNameLogic.getUsername() let humhubUser = await humhubClient.userByUsername(username) if (!humhubUser) { humhubUser = await humhubClient.userByEmail(dbUser.emailContact.email) diff --git a/backend/src/graphql/resolver/util/syncHumhub.ts b/backend/src/graphql/resolver/util/syncHumhub.ts index 426f89c92..c229df655 100644 --- a/backend/src/graphql/resolver/util/syncHumhub.ts +++ b/backend/src/graphql/resolver/util/syncHumhub.ts @@ -7,11 +7,12 @@ import { UpdateUserInfosArgs } from '@/graphql/arg/UpdateUserInfosArgs' import { backendLogger as logger } from '@/server/logger' export async function syncHumhub( - updateUserInfosArg: UpdateUserInfosArgs, + updateUserInfosArg: UpdateUserInfosArgs | null, user: User, ): Promise { // check for humhub relevant changes if ( + updateUserInfosArg && updateUserInfosArg.alias === undefined && updateUserInfosArg.firstName === undefined && updateUserInfosArg.lastName === undefined && From da6bdfaa61e8af6115f7992a43f2ef1d73b3e57f Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 12 Nov 2024 16:48:04 +0100 Subject: [PATCH 03/10] fix test --- backend/src/data/PublishName.logic.test.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/src/data/PublishName.logic.test.ts b/backend/src/data/PublishName.logic.test.ts index 280836c5e..9249670de 100644 --- a/backend/src/data/PublishName.logic.test.ts +++ b/backend/src/data/PublishName.logic.test.ts @@ -9,15 +9,17 @@ describe('test publish name logic', () => { it('alias or initials with alias set', () => { const user = new User() user.alias = 'alias' + user.humhubPublishName = PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS const logic = new PublishNameLogic(user) - expect(logic.getUsername(PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS)).toBe(user.alias) + expect(logic.getUsername()).toBe(user.alias) }) it('alias or initials with empty alias', () => { const user = new User() user.firstName = 'John' user.lastName = 'Smith' + user.humhubPublishName = PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS const logic = new PublishNameLogic(user) - expect(logic.getUsername(PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS)).toBe('JoSm') + expect(logic.getUsername()).toBe('JoSm') }) }) }) From 0ad93ebbf4175427b99887a73cd4129cfd8ff095 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 12 Nov 2024 16:54:09 +0100 Subject: [PATCH 04/10] remove change, parameter is neccessary for using is also for gms --- backend/src/apis/humhub/model/Account.ts | 3 ++- backend/src/data/PublishName.logic.test.ts | 6 ++---- backend/src/data/PublishName.logic.ts | 3 +-- backend/src/graphql/resolver/UserResolver.ts | 5 +++-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/backend/src/apis/humhub/model/Account.ts b/backend/src/apis/humhub/model/Account.ts index ac80a195b..1eb3e37be 100644 --- a/backend/src/apis/humhub/model/Account.ts +++ b/backend/src/apis/humhub/model/Account.ts @@ -3,11 +3,12 @@ import { User } from '@entity/User' import { convertGradidoLanguageToHumhub } from '@/apis/humhub/convertLanguage' import { PublishNameLogic } from '@/data/PublishName.logic' +import { PublishNameType } from '@/graphql/enum/PublishNameType' export class Account { public constructor(user: User) { const publishNameLogic = new PublishNameLogic(user) - this.username = publishNameLogic.getUsername() + this.username = publishNameLogic.getUsername(user.humhubPublishName as PublishNameType) this.email = user.emailContact.email this.language = convertGradidoLanguageToHumhub(user.language) this.status = 1 diff --git a/backend/src/data/PublishName.logic.test.ts b/backend/src/data/PublishName.logic.test.ts index 9249670de..280836c5e 100644 --- a/backend/src/data/PublishName.logic.test.ts +++ b/backend/src/data/PublishName.logic.test.ts @@ -9,17 +9,15 @@ describe('test publish name logic', () => { it('alias or initials with alias set', () => { const user = new User() user.alias = 'alias' - user.humhubPublishName = PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS const logic = new PublishNameLogic(user) - expect(logic.getUsername()).toBe(user.alias) + expect(logic.getUsername(PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS)).toBe(user.alias) }) it('alias or initials with empty alias', () => { const user = new User() user.firstName = 'John' user.lastName = 'Smith' - user.humhubPublishName = PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS const logic = new PublishNameLogic(user) - expect(logic.getUsername()).toBe('JoSm') + expect(logic.getUsername(PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS)).toBe('JoSm') }) }) }) diff --git a/backend/src/data/PublishName.logic.ts b/backend/src/data/PublishName.logic.ts index 3c89fc057..d3643d633 100644 --- a/backend/src/data/PublishName.logic.ts +++ b/backend/src/data/PublishName.logic.ts @@ -66,8 +66,7 @@ export class PublishNameLogic { * @returns user.alias for publishNameType = PUBLISH_NAME_ALIAS_OR_INITALS and user has alias * else return user.firstName[0,2] + user.lastName[0,2] for publishNameType = [PUBLISH_NAME_ALIAS_OR_INITALS, PUBLISH_NAME_INITIALS] */ - public getUsername(): string { - const publishNameType = this.user.humhubPublishName as PublishNameType + public getUsername(publishNameType: PublishNameType): string { if ( [ PublishNameType.PUBLISH_NAME_ALIAS_OR_INITALS, diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index e74ae8f45..40a1fcbc2 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -60,6 +60,7 @@ import { EVENT_ADMIN_USER_DELETE, EVENT_ADMIN_USER_UNDELETE, } from '@/event/Events' +import { PublishNameType } from '@/graphql/enum/PublishNameType' import { isValidPassword } from '@/password/EncryptorUtils' import { encryptPassword, verifyPassword } from '@/password/PasswordEncryptor' import { Context, getUser, getClientTimezoneOffset } from '@/server/context' @@ -171,7 +172,7 @@ export class UserResolver { if (CONFIG.HUMHUB_ACTIVE && dbUser.humhubAllowed) { const publishNameLogic = new PublishNameLogic(dbUser) humhubUserPromise = HumHubClient.getInstance()?.userByUsernameAsync( - publishNameLogic.getUsername(), + publishNameLogic.getUsername(dbUser.humhubPublishName as PublishNameType), ) } @@ -741,7 +742,7 @@ export class UserResolver { throw new LogError('cannot create humhub client') } const userNameLogic = new PublishNameLogic(dbUser) - const username = userNameLogic.getUsername() + const username = userNameLogic.getUsername(dbUser.humhubPublishName as PublishNameType) let humhubUser = await humhubClient.userByUsername(username) if (!humhubUser) { humhubUser = await humhubClient.userByEmail(dbUser.emailContact.email) From f7cd831fee31827a80e97760a0870bd6de08ab75 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 12 Nov 2024 17:00:45 +0100 Subject: [PATCH 05/10] fix backend test error --- backend/src/graphql/resolver/UserResolver.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts index 83ee8f64e..c0a707577 100644 --- a/backend/src/graphql/resolver/UserResolver.test.ts +++ b/backend/src/graphql/resolver/UserResolver.test.ts @@ -185,7 +185,7 @@ describe('UserResolver', () => { communityUuid: homeCom.communityUuid, foreign: false, gmsAllowed: true, - humhubAllowed: false, + humhubAllowed: true, gmsPublishName: 0, humhubPublishName: 0, gmsPublishLocation: 2, From fb0f901472d515b067190a239b9513940dea4357 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 12 Nov 2024 19:55:14 +0100 Subject: [PATCH 06/10] call frontend docker before waiting 10 seconds, use build instead of dev to prevent timeout --- .github/workflows/test_e2e.yml | 6 +++--- frontend/Dockerfile | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_e2e.yml b/.github/workflows/test_e2e.yml index 590758248..bdf979bf9 100644 --- a/.github/workflows/test_e2e.yml +++ b/.github/workflows/test_e2e.yml @@ -23,6 +23,9 @@ jobs: cd .. docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps backend + - name: Boot up test system | docker-compose frontends + run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps frontend admin nginx + - name: Sleep for 10 seconds run: sleep 10s @@ -34,9 +37,6 @@ jobs: cd ../backend yarn && yarn seed - - name: Boot up test system | docker-compose frontends - run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps frontend admin nginx - - name: Boot up test system | docker-compose mailserver run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mailserver diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 6f6cc0e9e..6acd4f268 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -75,8 +75,10 @@ FROM build as test # Install Additional Software RUN apk add --no-cache bash jq +RUN yarn run build + # Run command -CMD /bin/sh -c "yarn run dev" +CMD /bin/sh -c "yarn run start" ################################################################################## # PRODUCTION (Does contain only "binary"- and static-files to reduce image size) # From c5fcf61154ecf902d82fc120f211f3336ab8be4b Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 12 Nov 2024 20:45:00 +0100 Subject: [PATCH 07/10] increase cypress timeout --- e2e-tests/cypress.config.ts | 2 +- frontend/Dockerfile | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/e2e-tests/cypress.config.ts b/e2e-tests/cypress.config.ts index fd6caa069..3251f379c 100644 --- a/e2e-tests/cypress.config.ts +++ b/e2e-tests/cypress.config.ts @@ -35,7 +35,7 @@ export default defineConfig({ excludeSpecPattern: '*.js', baseUrl: 'http://localhost:3000', chromeWebSecurity: false, - defaultCommandTimeout: 10000, + defaultCommandTimeout: 100000, supportFile: 'cypress/support/index.ts', viewportHeight: 720, viewportWidth: 1280, diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 6acd4f268..6f6cc0e9e 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -75,10 +75,8 @@ FROM build as test # Install Additional Software RUN apk add --no-cache bash jq -RUN yarn run build - # Run command -CMD /bin/sh -c "yarn run start" +CMD /bin/sh -c "yarn run dev" ################################################################################## # PRODUCTION (Does contain only "binary"- and static-files to reduce image size) # From 0b6b5c486943c83c8784e6456978974355a865a6 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 13 Nov 2024 11:38:26 +0100 Subject: [PATCH 08/10] version --- CHANGELOG.md | 56 ++++++++++++++++++++++++++++++++++++++ admin/package.json | 2 +- backend/package.json | 2 +- database/package.json | 2 +- dht-node/package.json | 2 +- dlt-connector/package.json | 2 +- federation/package.json | 2 +- frontend/package.json | 2 +- package.json | 2 +- 9 files changed, 64 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a84f8909c..46c8086e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,64 @@ 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). +#### [2.4.0](https://github.com/gradido/gradido/compare/2.3.1...2.4.0) + +- feat(backend): auto register new user in humhub [`#3386`](https://github.com/gradido/gradido/pull/3386) +- feat(backend): try and catch user sync [`#3385`](https://github.com/gradido/gradido/pull/3385) +- feat(backend): increase initialien count [`#3369`](https://github.com/gradido/gradido/pull/3369) +- feat(frontend): monterail vue3 migration [`#3383`](https://github.com/gradido/gradido/pull/3383) +- fix(frontend): fix postmigration fix [`#3382`](https://github.com/gradido/gradido/pull/3382) +- feat(frontend): update text [`#3373`](https://github.com/gradido/gradido/pull/3373) +- feat(frontend): fix postmigration fix [`#3378`](https://github.com/gradido/gradido/pull/3378) +- feat(frontend): map feature in vue 3 [`#3376`](https://github.com/gradido/gradido/pull/3376) +- feat(frontend): links and emails in messages [`#3377`](https://github.com/gradido/gradido/pull/3377) +- feat(frontend): add transaction link in latest transactions [`#3375`](https://github.com/gradido/gradido/pull/3375) +- fix(frontend): fix logout issue [`#3374`](https://github.com/gradido/gradido/pull/3374) +- fix(frontend): post migration fixes [`#3372`](https://github.com/gradido/gradido/pull/3372) +- feat(frontend): vue3 migration [`#3365`](https://github.com/gradido/gradido/pull/3365) +- fix(frontend): fix index.html [`#3368`](https://github.com/gradido/gradido/pull/3368) +- build(frontend): merged code from master [`#3367`](https://github.com/gradido/gradido/pull/3367) +- fix(frontend): vue3 migration pre deploy setup [`#3366`](https://github.com/gradido/gradido/pull/3366) +- fix(workflow): fix broken tests [`#3363`](https://github.com/gradido/gradido/pull/3363) +- fix(frontend): style fixes, admin fix [`#3364`](https://github.com/gradido/gradido/pull/3364) +- fix(frontend): gdt test [`#3361`](https://github.com/gradido/gradido/pull/3361) +- fix(frontend): style fixes [`#3360`](https://github.com/gradido/gradido/pull/3360) +- fix(frontend): migration feedback fixes [`#3359`](https://github.com/gradido/gradido/pull/3359) +- fix(frontend): scss changes and fixes [`#3358`](https://github.com/gradido/gradido/pull/3358) +- fix(frontend): migration remaining fixes [`#3356`](https://github.com/gradido/gradido/pull/3356) +- fix(admin): fix message update [`#3354`](https://github.com/gradido/gradido/pull/3354) +- fix(admin): fix refetch data in edit creation form [`#3353`](https://github.com/gradido/gradido/pull/3353) +- fix(frontend): fix dropdown in transaction send and link [`#3352`](https://github.com/gradido/gradido/pull/3352) +- fix(frontend): fix newsletter state reactivity [`#3351`](https://github.com/gradido/gradido/pull/3351) +- fix(frontend): fix how community switch is handled [`#3350`](https://github.com/gradido/gradido/pull/3350) +- fix(frontend): fixed after merge [`#3349`](https://github.com/gradido/gradido/pull/3349) +- fix(frontend): fixed logout handler [`#3347`](https://github.com/gradido/gradido/pull/3347) +- chore(frontend): main js cleanup [`#3346`](https://github.com/gradido/gradido/pull/3346) +- feature(frontend): change env config reading [`#3345`](https://github.com/gradido/gradido/pull/3345) +- feature(frontend): bump node in FE .nvmrc [`#3344`](https://github.com/gradido/gradido/pull/3344) +- feat(frontend): migration setup [`#3342`](https://github.com/gradido/gradido/pull/3342) +- fix(admin): Remove "maxAmountPerMonth" from `createContributionLink` gql. [`#3343`](https://github.com/gradido/gradido/pull/3343) +- fix(admin): style fixes [`#3339`](https://github.com/gradido/gradido/pull/3339) +- fix(admin): creation tab disappearing after creating creation [`#3338`](https://github.com/gradido/gradido/pull/3338) +- fix(frontend): show updated gdd amount [`#3337`](https://github.com/gradido/gradido/pull/3337) +- feat(admin): Add remaining fixes [`#3336`](https://github.com/gradido/gradido/pull/3336) +- feat(admin): fix edit creation form [`#3334`](https://github.com/gradido/gradido/pull/3334) +- feat(admin): migration of admin creation components [`#3333`](https://github.com/gradido/gradido/pull/3333) +- feat(admin): automatic contributions updates [`#3332`](https://github.com/gradido/gradido/pull/3332) +- feat(admin): vite config changes [`#3331`](https://github.com/gradido/gradido/pull/3331) +- feat(admin) - fix import in node server [`#3330`](https://github.com/gradido/gradido/pull/3330) +- fix(admin): stylelint fix [`#3329`](https://github.com/gradido/gradido/pull/3329) +- feat(admin): setup migration environment [`#3328`](https://github.com/gradido/gradido/pull/3328) +- fix(admin): fix contribution link [`#3326`](https://github.com/gradido/gradido/pull/3326) +- feat(admin): geo-coordinates for community [`#3323`](https://github.com/gradido/gradido/pull/3323) +- feat(backend): speedup listTransactions [`#3324`](https://github.com/gradido/gradido/pull/3324) +- fix(frontend): link forwarding after using send with url parameters [`#3322`](https://github.com/gradido/gradido/pull/3322) + #### [2.3.1](https://github.com/gradido/gradido/compare/2.3.0...2.3.1) +> 11 June 2024 + +- chore(release): v2.3.1 beta [`#3321`](https://github.com/gradido/gradido/pull/3321) - feat(frontend): more compatible humhub auto-login link [`#3319`](https://github.com/gradido/gradido/pull/3319) - fix(backend): fix test which will only fail at 31. of month, or 30.05 [`#3320`](https://github.com/gradido/gradido/pull/3320) - feat(frontend): remove automatically logged out message [`#3318`](https://github.com/gradido/gradido/pull/3318) diff --git a/admin/package.json b/admin/package.json index 3a5d9363b..ffc9be130 100644 --- a/admin/package.json +++ b/admin/package.json @@ -3,7 +3,7 @@ "description": "Administration Interface for Gradido", "main": "index.js", "author": "Moriz Wahl", - "version": "2.3.1", + "version": "2.4.0", "license": "Apache-2.0", "private": false, "scripts": { diff --git a/backend/package.json b/backend/package.json index cd01d69d4..fbeac345a 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "gradido-backend", - "version": "2.3.1", + "version": "2.4.0", "description": "Gradido unified backend providing an API-Service for Gradido Transactions", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/backend", diff --git a/database/package.json b/database/package.json index 50a489934..33ef99354 100644 --- a/database/package.json +++ b/database/package.json @@ -1,6 +1,6 @@ { "name": "gradido-database", - "version": "2.3.1", + "version": "2.4.0", "description": "Gradido Database Tool to execute database migrations", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/database", diff --git a/dht-node/package.json b/dht-node/package.json index 67c24dd9e..dc9230619 100644 --- a/dht-node/package.json +++ b/dht-node/package.json @@ -1,6 +1,6 @@ { "name": "gradido-dht-node", - "version": "2.3.1", + "version": "2.4.0", "description": "Gradido dht-node module", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/", diff --git a/dlt-connector/package.json b/dlt-connector/package.json index 3e576b48d..fb6d24c8c 100644 --- a/dlt-connector/package.json +++ b/dlt-connector/package.json @@ -1,6 +1,6 @@ { "name": "gradido-dlt-connector", - "version": "2.3.1", + "version": "2.4.0", "description": "Gradido DLT-Connector", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/", diff --git a/federation/package.json b/federation/package.json index 151777054..488dcceba 100644 --- a/federation/package.json +++ b/federation/package.json @@ -1,6 +1,6 @@ { "name": "gradido-federation", - "version": "2.3.1", + "version": "2.4.0", "description": "Gradido federation module providing Gradido-Hub-Federation and versioned API for inter community communication", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/federation", diff --git a/frontend/package.json b/frontend/package.json index 5bc403506..2a91e0ed5 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-vue-gradido-wallet", - "version": "2.3.1", + "version": "2.4.0", "private": true, "scripts": { "start": "node run/server.js", diff --git a/package.json b/package.json index 28f981637..c593ec335 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gradido", - "version": "2.3.1", + "version": "2.4.0", "description": "Gradido", "main": "index.js", "repository": "git@github.com:gradido/gradido.git", From c1368e6dc794d1cd87f37ef48765ff87b5bb46b6 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Sun, 17 Nov 2024 10:10:52 +0100 Subject: [PATCH 09/10] bugfix --- frontend/src/components/Contributions/ContributionForm.vue | 7 ++++++- frontend/src/pages/Community.vue | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue index 4a44e03b7..5612ae14b 100644 --- a/frontend/src/components/Contributions/ContributionForm.vue +++ b/frontend/src/components/Contributions/ContributionForm.vue @@ -19,7 +19,7 @@ required :no-flip="true" type="date" - @update:model-value="date = $event" + @update:model-value="handleDateChange" > @@ -128,6 +128,11 @@ const [date, dateProps] = defineField('date') const { meta: dataFieldMeta } = useField('date', 'required') +const handleDateChange = (newDate) => { + date.value = newDate + emit('update:model-value', { ...props.modelValue, date: newDate }) +} + const showMessage = computed(() => { if (props.maxGddThisMonth <= 0 && props.maxGddLastMonth <= 0) return true if (props.modelValue.date) diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue index 064aee33c..f850ccb4e 100644 --- a/frontend/src/pages/Community.vue +++ b/frontend/src/pages/Community.vue @@ -11,7 +11,7 @@
Date: Sun, 17 Nov 2024 10:11:31 +0100 Subject: [PATCH 10/10] release --- CHANGELOG.md | 2 +- admin/package.json | 2 +- backend/package.json | 2 +- database/package.json | 2 +- dht-node/package.json | 2 +- dlt-connector/package.json | 2 +- federation/package.json | 2 +- frontend/package.json | 2 +- package.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46c8086e9..5dfc8a529 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ 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). -#### [2.4.0](https://github.com/gradido/gradido/compare/2.3.1...2.4.0) +#### [2.4.1](https://github.com/gradido/gradido/compare/2.3.1...2.4.1) - feat(backend): auto register new user in humhub [`#3386`](https://github.com/gradido/gradido/pull/3386) - feat(backend): try and catch user sync [`#3385`](https://github.com/gradido/gradido/pull/3385) diff --git a/admin/package.json b/admin/package.json index ffc9be130..5d3cdb8fb 100644 --- a/admin/package.json +++ b/admin/package.json @@ -3,7 +3,7 @@ "description": "Administration Interface for Gradido", "main": "index.js", "author": "Moriz Wahl", - "version": "2.4.0", + "version": "2.4.1", "license": "Apache-2.0", "private": false, "scripts": { diff --git a/backend/package.json b/backend/package.json index fbeac345a..db89dfbe7 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "gradido-backend", - "version": "2.4.0", + "version": "2.4.1", "description": "Gradido unified backend providing an API-Service for Gradido Transactions", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/backend", diff --git a/database/package.json b/database/package.json index 33ef99354..dc9bd39c4 100644 --- a/database/package.json +++ b/database/package.json @@ -1,6 +1,6 @@ { "name": "gradido-database", - "version": "2.4.0", + "version": "2.4.1", "description": "Gradido Database Tool to execute database migrations", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/database", diff --git a/dht-node/package.json b/dht-node/package.json index dc9230619..4c6868784 100644 --- a/dht-node/package.json +++ b/dht-node/package.json @@ -1,6 +1,6 @@ { "name": "gradido-dht-node", - "version": "2.4.0", + "version": "2.4.1", "description": "Gradido dht-node module", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/", diff --git a/dlt-connector/package.json b/dlt-connector/package.json index fb6d24c8c..0ed9aa89e 100644 --- a/dlt-connector/package.json +++ b/dlt-connector/package.json @@ -1,6 +1,6 @@ { "name": "gradido-dlt-connector", - "version": "2.4.0", + "version": "2.4.1", "description": "Gradido DLT-Connector", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/", diff --git a/federation/package.json b/federation/package.json index 488dcceba..ecf2d2d50 100644 --- a/federation/package.json +++ b/federation/package.json @@ -1,6 +1,6 @@ { "name": "gradido-federation", - "version": "2.4.0", + "version": "2.4.1", "description": "Gradido federation module providing Gradido-Hub-Federation and versioned API for inter community communication", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/federation", diff --git a/frontend/package.json b/frontend/package.json index 2a91e0ed5..4dc914b03 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-vue-gradido-wallet", - "version": "2.4.0", + "version": "2.4.1", "private": true, "scripts": { "start": "node run/server.js", diff --git a/package.json b/package.json index c593ec335..19eb4d847 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gradido", - "version": "2.4.0", + "version": "2.4.1", "description": "Gradido", "main": "index.js", "repository": "git@github.com:gradido/gradido.git",