From fe8214df89a5a1a6f60af17d103fa4606f4a6115 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 22 Feb 2023 09:46:34 +0100 Subject: [PATCH 01/24] change contribution design an all and my contribution icons --- .../src/components/Contributions/ContributionListItem.vue | 8 ++++---- frontend/src/layouts/templates/CommunityTemplate.vue | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue index d830f1bcd..5b9bfb82f 100644 --- a/frontend/src/components/Contributions/ContributionListItem.vue +++ b/frontend/src/components/Contributions/ContributionListItem.vue @@ -2,7 +2,7 @@
@@ -25,7 +25,7 @@
{{ $t('contributionText') }}
{{ memo }}
-
+
{{ $t('contribution.alert.answerQuestion') }}
@@ -189,14 +189,14 @@ export default { if (this.deletedAt) return 'trash' if (this.deniedAt) return 'x-circle' if (this.confirmedAt) return 'check' - if (this.state === 'IN_PROGRESS') return 'question-circle' + if (this.state === 'IN_PROGRESS') return 'question' return 'bell-fill' }, variant() { if (this.deletedAt) return 'danger' if (this.deniedAt) return 'warning' if (this.confirmedAt) return 'success' - if (this.state === 'IN_PROGRESS') return 'f5' + if (this.state === 'IN_PROGRESS') return '205' return 'primary' }, date() { diff --git a/frontend/src/layouts/templates/CommunityTemplate.vue b/frontend/src/layouts/templates/CommunityTemplate.vue index 448c06bd2..f014af2c0 100644 --- a/frontend/src/layouts/templates/CommunityTemplate.vue +++ b/frontend/src/layouts/templates/CommunityTemplate.vue @@ -24,7 +24,7 @@ {{ $t('contribution.alert.pending') }}
  • - + {{ $t('contribution.alert.in_progress') }}
  • @@ -54,7 +54,7 @@ {{ $t('contribution.alert.pending') }}
  • - + {{ $t('contribution.alert.in_progress') }}
  • From 35d81f889cab5548d0bf39e0ff901fe932af352f Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 22 Feb 2023 13:53:51 +0100 Subject: [PATCH 02/24] fix tests --- .../src/components/Contributions/ContributionListItem.spec.js | 2 +- frontend/src/layouts/templates/CommunityTemplate.spec.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/Contributions/ContributionListItem.spec.js b/frontend/src/components/Contributions/ContributionListItem.spec.js index 3415ee5d3..cf2c062ed 100644 --- a/frontend/src/components/Contributions/ContributionListItem.spec.js +++ b/frontend/src/components/Contributions/ContributionListItem.spec.js @@ -74,7 +74,7 @@ describe('ContributionListItem', () => { it('is warning at when state is IN_PROGRESS', async () => { await wrapper.setProps({ state: 'IN_PROGRESS' }) - expect(wrapper.vm.variant).toBe('f5') + expect(wrapper.vm.variant).toBe('205') }) }) diff --git a/frontend/src/layouts/templates/CommunityTemplate.spec.js b/frontend/src/layouts/templates/CommunityTemplate.spec.js index cd4b598ef..534e45125 100644 --- a/frontend/src/layouts/templates/CommunityTemplate.spec.js +++ b/frontend/src/layouts/templates/CommunityTemplate.spec.js @@ -50,7 +50,7 @@ describe('CommunityTemplate', () => { expect(listItems.at(0).find('svg').attributes('aria-label')).toEqual('bell fill') expect(listItems.at(0).text()).toBe('contribution.alert.pending') - expect(listItems.at(1).find('svg').attributes('aria-label')).toEqual('question square') + expect(listItems.at(1).find('svg').attributes('aria-label')).toEqual('question') expect(listItems.at(1).text()).toBe('contribution.alert.in_progress') expect(listItems.at(2).find('svg').attributes('aria-label')).toEqual('check') @@ -80,7 +80,7 @@ describe('CommunityTemplate', () => { expect(listItems.at(0).find('svg').attributes('aria-label')).toEqual('bell fill') expect(listItems.at(0).text()).toBe('contribution.alert.pending') - expect(listItems.at(1).find('svg').attributes('aria-label')).toEqual('question square') + expect(listItems.at(1).find('svg').attributes('aria-label')).toEqual('question') expect(listItems.at(1).text()).toBe('contribution.alert.in_progress') expect(listItems.at(2).find('svg').attributes('aria-label')).toEqual('check') From e4a9533802a281dc3cfc266568b2d89afacb978f Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 28 Feb 2023 20:36:23 +0100 Subject: [PATCH 03/24] refactor(backend): use find contributions helper in list contributions --- .../resolver/ContributionResolver.test.ts | 7 ++-- .../graphql/resolver/ContributionResolver.ts | 41 ++++++++----------- .../resolver/util/findContributions.ts | 5 ++- backend/src/seeds/graphql/queries.ts | 4 +- 4 files changed, 27 insertions(+), 30 deletions(-) diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts index a8e36258c..71f3dd26c 100644 --- a/backend/src/graphql/resolver/ContributionResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionResolver.test.ts @@ -993,7 +993,6 @@ describe('ContributionResolver', () => { currentPage: 1, pageSize: 25, order: 'DESC', - filterConfirmed: false, }, }) expect(errorObjects).toEqual([new GraphQLError('401 Unauthorized')]) @@ -1012,7 +1011,7 @@ describe('ContributionResolver', () => { resetToken() }) - describe('filter confirmed is false', () => { + describe('no status filter', () => { it('returns creations', async () => { const { data: { listContributions: contributionListResult }, @@ -1064,7 +1063,7 @@ describe('ContributionResolver', () => { }) }) - describe('filter confirmed is true', () => { + describe('with status filter [PENDING, IN_PROGRESS, DENIED, DELETED]', () => { it('returns only unconfirmed creations', async () => { const { data: { listContributions: contributionListResult }, @@ -1074,7 +1073,7 @@ describe('ContributionResolver', () => { currentPage: 1, pageSize: 25, order: 'DESC', - filterConfirmed: true, + statusFilter: ['PENDING', 'IN_PROGRESS', 'DENIED', 'DELETED'], }, }) expect(contributionListResult).toMatchObject({ diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts index 9cb81ce4c..ab177d759 100644 --- a/backend/src/graphql/resolver/ContributionResolver.ts +++ b/backend/src/graphql/resolver/ContributionResolver.ts @@ -1,6 +1,6 @@ import Decimal from 'decimal.js-light' import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql' -import { FindOperator, IsNull, getConnection } from '@dbTools/typeorm' +import { IsNull, getConnection } from '@dbTools/typeorm' import { Contribution as DbContribution } from '@entity/Contribution' import { ContributionMessage } from '@entity/ContributionMessage' @@ -127,35 +127,26 @@ export class ContributionResolver { @Authorized([RIGHTS.LIST_CONTRIBUTIONS]) @Query(() => ContributionListResult) async listContributions( + @Ctx() context: Context, @Args() { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated, - @Arg('filterConfirmed', () => Boolean) - filterConfirmed: boolean | null, - @Ctx() context: Context, + @Arg('statusFilter', () => [ContributionStatus], { nullable: true }) + statusFilter?: ContributionStatus[], ): Promise { const user = getUser(context) - const where: { - userId: number - confirmedBy?: FindOperator | null - } = { userId: user.id } - - if (filterConfirmed) where.confirmedBy = IsNull() - - const [contributions, count] = await getConnection() - .createQueryBuilder() - .select('c') - .from(DbContribution, 'c') - .leftJoinAndSelect('c.messages', 'm') - .where(where) - .withDeleted() - .orderBy('c.createdAt', order) - .limit(pageSize) - .offset((currentPage - 1) * pageSize) - .getManyAndCount() + const [dbContributions, count] = await findContributions( + order, + currentPage, + pageSize, + true, + ['messages'], + user.id, + statusFilter, + ) return new ContributionListResult( count, - contributions.map((contribution) => new Contribution(contribution, user)), + dbContributions.map((contribution) => new Contribution(contribution, user)), ) } @@ -172,6 +163,8 @@ export class ContributionResolver { currentPage, pageSize, false, + ['user'], + undefined, statusFilter, ) @@ -398,6 +391,8 @@ export class ContributionResolver { currentPage, pageSize, true, + ['user'], + undefined, statusFilter, ) diff --git a/backend/src/graphql/resolver/util/findContributions.ts b/backend/src/graphql/resolver/util/findContributions.ts index 0dc70cf30..9409a0553 100644 --- a/backend/src/graphql/resolver/util/findContributions.ts +++ b/backend/src/graphql/resolver/util/findContributions.ts @@ -8,17 +8,20 @@ export const findContributions = async ( currentPage: number, pageSize: number, withDeleted: boolean, + relations: string[], + userId?: number, statusFilter?: ContributionStatus[], ): Promise<[DbContribution[], number]> => DbContribution.findAndCount({ where: { ...(statusFilter && statusFilter.length && { contributionStatus: In(statusFilter) }), + ...(userId && { userId }), }, withDeleted: withDeleted, order: { createdAt: order, }, - relations: ['user'], + relations, skip: (currentPage - 1) * pageSize, take: pageSize, }) diff --git a/backend/src/seeds/graphql/queries.ts b/backend/src/seeds/graphql/queries.ts index c17665e4d..6e2e58c67 100644 --- a/backend/src/seeds/graphql/queries.ts +++ b/backend/src/seeds/graphql/queries.ts @@ -153,13 +153,13 @@ export const listContributions = gql` $currentPage: Int = 1 $pageSize: Int = 5 $order: Order - $filterConfirmed: Boolean = false + $statusFilter: [ContributionStatus!] ) { listContributions( currentPage: $currentPage pageSize: $pageSize order: $order - filterConfirmed: $filterConfirmed + statusFilter: $statusFilter ) { contributionCount contributionList { From 92e072652fcbda3d920b0e1c6a54096c9d84b925 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 28 Feb 2023 20:37:32 +0100 Subject: [PATCH 04/24] change list contribution query to status filter --- frontend/src/graphql/queries.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js index 6e8d420b8..7193eded0 100644 --- a/frontend/src/graphql/queries.js +++ b/frontend/src/graphql/queries.js @@ -165,13 +165,13 @@ export const listContributions = gql` $currentPage: Int = 1 $pageSize: Int = 25 $order: Order = DESC - $filterConfirmed: Boolean = false + $statusFilter: [ContributionStatus!] ) { listContributions( currentPage: $currentPage pageSize: $pageSize order: $order - filterConfirmed: $filterConfirmed + statusFilter: $statusFilter ) { contributionCount contributionList { From 7c39cc1e70b4f655541bc0282645db6f11b96b1b Mon Sep 17 00:00:00 2001 From: Bernd Hueckstaedt Date: Thu, 2 Mar 2023 11:09:06 +0100 Subject: [PATCH 05/24] Update de.json --- frontend/src/locales/de.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index d966e2867..c5cb0c12a 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -27,9 +27,9 @@ "moderator": "Moderator", "moderators": "Moderatoren", "myContributions": "Meine Beiträge", - "noOpenContributionLinkText": "Zur Zeit gibt es keine automatischen Schöpfungen.", - "openContributionLinks": "Öffentliche Beitrags-Linkliste", - "openContributionLinkText": "Folgende {count} automatische Schöpfungen werden zur Zeit durch die Gemeinschaft „{name}“ bereitgestellt.", + "noOpenContributionLinkText": "Zur Zeit gibt es keine projektbezogenen Guthaben-Links.", + "openContributionLinks": "Projektbezogene Guthaben-Links und QR-Codes", + "openContributionLinkText": "Die Gemeinschaft kann Links und QR-Codes für die automatische Schöpfung von Startguthaben oder wiederkehrenden Gemeinwohl-Beiträgen erstellen.

    Folgende {count} Guthaben-Links werden zur Zeit durch die Gemeinschaft „{name}“ bereitgestellt.", "submitContribution": "Schreiben" }, "communityInfo": "Gemeinschaft Information", From 664c59abb29dd16911c8ac11df91a9efa0e1d7a6 Mon Sep 17 00:00:00 2001 From: Bernd Hueckstaedt Date: Fri, 3 Mar 2023 11:17:02 +0100 Subject: [PATCH 06/24] Update de.json --- frontend/src/locales/de.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index c5cb0c12a..bf5205bf6 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -27,9 +27,9 @@ "moderator": "Moderator", "moderators": "Moderatoren", "myContributions": "Meine Beiträge", - "noOpenContributionLinkText": "Zur Zeit gibt es keine projektbezogenen Guthaben-Links.", - "openContributionLinks": "Projektbezogene Guthaben-Links und QR-Codes", - "openContributionLinkText": "Die Gemeinschaft kann Links und QR-Codes für die automatische Schöpfung von Startguthaben oder wiederkehrenden Gemeinwohl-Beiträgen erstellen.

    Folgende {count} Guthaben-Links werden zur Zeit durch die Gemeinschaft „{name}“ bereitgestellt.", + "noOpenContributionLinkText": "Zur Zeit gibt es keine per Link erzeugte Schöpfungen.", + "openContributionLinks": "Per Link erzeugte Schöpfungen", + "openContributionLinkText": "Die Gemeinschaft „{name}“ unterstützt aktuell {count} per Link erzeugte Schöpfungen:", "submitContribution": "Schreiben" }, "communityInfo": "Gemeinschaft Information", From 091b856a201eaf17d4ebaeec2172ae9784951d20 Mon Sep 17 00:00:00 2001 From: Bernd Hueckstaedt Date: Fri, 3 Mar 2023 11:32:13 +0100 Subject: [PATCH 07/24] Update en.json --- frontend/src/locales/en.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index a5be6e05b..78898266f 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -27,9 +27,9 @@ "moderator": "Moderator", "moderators": "Moderators", "myContributions": "My contributions", - "noOpenContributionLinkText": "Currently there are no automatic creations.", - "openContributionLinks": "Open contribution-link list", - "openContributionLinkText": "The following {count} automatic creations are currently provided by the \"{name}\" community.", + "noOpenContributionLinkText": "Currently there are no link-generated creations.", + "openContributionLinks": "Creations generated by link", + "openContributionLinkText": "The \"{name}\" community currently supports {count} link-generated creations:", "submitContribution": "Contribute" }, "communityInfo": "Community Information", From 83cf137122e186f0a68d0a58b7c7d9eaca534b8e Mon Sep 17 00:00:00 2001 From: Bernd Hueckstaedt Date: Fri, 3 Mar 2023 11:36:52 +0100 Subject: [PATCH 08/24] (refactor): creations generated by link --- frontend/src/locales/es.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json index 9441a10a2..fbcb5867e 100644 --- a/frontend/src/locales/es.json +++ b/frontend/src/locales/es.json @@ -26,8 +26,8 @@ "moderator": "Moderador", "moderators": "Moderadores", "myContributions": "Mis contribuciones al bien común", - "openContributionLinks": "lista de enlaces de contribuciones públicas", - "openContributionLinkText": "La comunidad \"{name}\" proporciona actualmente las siguientes {count} creaciones automáticas.", + "openContributionLinks": "Creaciones generadas por enlace", + "openContributionLinkText": "La comunidad \"{name}\" admite actualmente {count} creaciones generadas por enlaces:", "other-communities": "Otras comunidades", "statistic": "Estadísticas", "submitContribution": "escribir", From a22cf6bfe3f7f2ee4f59863dc66e82af151c377e Mon Sep 17 00:00:00 2001 From: Bernd Hueckstaedt Date: Fri, 3 Mar 2023 11:39:33 +0100 Subject: [PATCH 09/24] (refactor): creations generated by link --- frontend/src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 78898266f..f551fea3f 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -131,7 +131,7 @@ "close": "Close", "current_balance": "Current Balance", "date": "Date", - "description": "Description", + "description": "Description", "email": "Email", "firstname": "Firstname", "from": "from", From 3436f4abcaa8ac54e2f17539253603d16f208d75 Mon Sep 17 00:00:00 2001 From: Bernd Hueckstaedt Date: Fri, 3 Mar 2023 19:07:43 +0100 Subject: [PATCH 10/24] Update frontend/src/locales/de.json Co-authored-by: Hannes Heine --- frontend/src/locales/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index bf5205bf6..ef2abe366 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -29,7 +29,7 @@ "myContributions": "Meine Beiträge", "noOpenContributionLinkText": "Zur Zeit gibt es keine per Link erzeugte Schöpfungen.", "openContributionLinks": "Per Link erzeugte Schöpfungen", - "openContributionLinkText": "Die Gemeinschaft „{name}“ unterstützt aktuell {count} per Link erzeugte Schöpfungen:", + "openContributionLinkText": "Die Gemeinschaft „{name}“ unterstützt aktuell {count} per Link erzeugte Schöpfungen:", "submitContribution": "Schreiben" }, "communityInfo": "Gemeinschaft Information", From 68be6053510493072749267e6d3b1ac6ec2024fe Mon Sep 17 00:00:00 2001 From: Bernd Hueckstaedt Date: Fri, 3 Mar 2023 19:07:55 +0100 Subject: [PATCH 11/24] Update frontend/src/locales/es.json Co-authored-by: Hannes Heine --- frontend/src/locales/es.json | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json index fbcb5867e..93891d2da 100644 --- a/frontend/src/locales/es.json +++ b/frontend/src/locales/es.json @@ -26,6 +26,7 @@ "moderator": "Moderador", "moderators": "Moderadores", "myContributions": "Mis contribuciones al bien común", + "noOpenContributionLinkText": "Actualmente no hay creaciones automáticas.", "openContributionLinks": "Creaciones generadas por enlace", "openContributionLinkText": "La comunidad \"{name}\" admite actualmente {count} creaciones generadas por enlaces:", "other-communities": "Otras comunidades", From ae05185544c325851ddd48b1624f82391d414b45 Mon Sep 17 00:00:00 2001 From: Bernd Hueckstaedt Date: Fri, 3 Mar 2023 19:08:22 +0100 Subject: [PATCH 12/24] Update frontend/src/locales/en.json Co-authored-by: Hannes Heine --- frontend/src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index f551fea3f..78898266f 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -131,7 +131,7 @@ "close": "Close", "current_balance": "Current Balance", "date": "Date", - "description": "Description", + "description": "Description", "email": "Email", "firstname": "Firstname", "from": "from", From b66b40ba43a24f0504320d93dac97b4dda1d58d4 Mon Sep 17 00:00:00 2001 From: Bernd Hueckstaedt Date: Sat, 4 Mar 2023 07:36:33 +0100 Subject: [PATCH 13/24] (refactor): Creations generated by link (Fr) --- frontend/src/locales/fr.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json index 9e2c11fc5..102825acc 100644 --- a/frontend/src/locales/fr.json +++ b/frontend/src/locales/fr.json @@ -27,9 +27,9 @@ "moderator": "Modérateur", "moderators": "Modérateurs", "myContributions": "Mes contributions", - "noOpenContributionLinkText": "Currently there are no automatic creations.", - "openContributionLinks": "liste de liens de contribution publique", - "openContributionLinkText": "Les {count} créations automatiques suivantes sont actuellement fournies par la communauté \"{name}\".", + "noOpenContributionLinkText": "Actuellement, il n'y a pas de créations générées par lien.", + "openContributionLinks": "Créations générées par lien", + "openContributionLinkText": "La communauté \"{name}\" soutient actuellement {count} créations générées par lien:", "submitContribution": "Contribuer" }, "communityInfo": "Information communauté^^", From 001ed6946f6a850ca9c4fdaa91320389065e2f6c Mon Sep 17 00:00:00 2001 From: Bernd Hueckstaedt Date: Sat, 4 Mar 2023 07:48:24 +0100 Subject: [PATCH 14/24] (refactor): creations generated by link NL --- frontend/src/locales/nl.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json index 0ac052c47..f1306eda8 100644 --- a/frontend/src/locales/nl.json +++ b/frontend/src/locales/nl.json @@ -26,8 +26,9 @@ "moderator": "Moderator", "moderators": "Moderators", "myContributions": "Mijn bijdragen voor het algemeen belang", - "openContributionLinks": "openbare lijst van bijdragen", - "openContributionLinkText": "De volgende {count} automatische creaties worden momenteel aangeboden door de gemeenschap \"{name}\".", + "noOpenContributionLinkText": "Er zijn momenteel geen link-gegenereerde creaties.", + "openContributionLinks": "Creaties gegenereerd door link", + "openContributionLinkText": "De community \"{name}\" ondersteunt momenteel {count} link-gegenereerde creaties:", "other-communities": "Verdere gemeenschappen", "statistic": "Statistieken", "submitContribution": "schrijf", From 70817a9c2db6ed690084e432e13723c9ac9f999b Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 6 Mar 2023 12:20:31 +0100 Subject: [PATCH 15/24] change text to 'Check Now' --- frontend/src/components/GddSend/TransactionForm.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue index 10884d5f1..b560e0767 100644 --- a/frontend/src/components/GddSend/TransactionForm.vue +++ b/frontend/src/components/GddSend/TransactionForm.vue @@ -105,10 +105,7 @@ - {{ $t('form.check_now') }} - - {{ $t('form.generate_now') }} - + {{ $t('form.check_now') }} From d00bfec5a6d522bcf6afed415431d198083408aa Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 7 Mar 2023 14:15:17 +0100 Subject: [PATCH 16/24] Set new release version. --- CHANGELOG.md | 48 +++++++++++++++++++++++++++++++++++++++++++ admin/package.json | 2 +- backend/package.json | 2 +- database/package.json | 2 +- frontend/package.json | 2 +- package.json | 2 +- 6 files changed, 53 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4bfc66e39..ce3bd4a10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,56 @@ 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). +#### [1.19.0](https://github.com/gradido/gradido/compare/1.18.2...1.19.0) + +- fix(frontend): change contribution design [`#2731`](https://github.com/gradido/gradido/pull/2731) +- refactor(frontend): commnity navbar- & unauthenticated b-gradido styles [`#2732`](https://github.com/gradido/gradido/pull/2732) +- fix(database): change downwards migration to delete entries with last_announced_at IS NULL [`#2767`](https://github.com/gradido/gradido/pull/2767) +- feat(admin): deleted contributions visible [`#2759`](https://github.com/gradido/gradido/pull/2759) +- feat(other): e2e test user story user registration [`#2753`](https://github.com/gradido/gradido/pull/2753) +- refactor(frontend): style and design changes to a contribution [`#2648`](https://github.com/gradido/gradido/pull/2648) +- test(backend): add tests that ``sendContributionDeleted`` and ``sendContributionDenied`` are called [`#2740`](https://github.com/gradido/gradido/pull/2740) +- fix(backend): set email tls true in test [`#2763`](https://github.com/gradido/gradido/pull/2763) +- refactor(frontend): add visible event an answer question [`#2750`](https://github.com/gradido/gradido/pull/2750) +- refactor(frontend): style sidebar, add icons [`#2737`](https://github.com/gradido/gradido/pull/2737) +- fix(backend): possible flaky test [`#2761`](https://github.com/gradido/gradido/pull/2761) +- fix(backend): emails – adjust namings of menus to new design [`#2756`](https://github.com/gradido/gradido/pull/2756) +- ci(other): rename dht node and federation workflow jobs for better branch protection maintenance [`#2743`](https://github.com/gradido/gradido/pull/2743) +- refactor(backend): combine logic for `listTransactionLinks` & `listTransactionLinksAdmin` [`#2706`](https://github.com/gradido/gradido/pull/2706) +- refactor(backend): remove admin create contributions [`#2724`](https://github.com/gradido/gradido/pull/2724) +- refactor(frontend): remove .vue as imports [`#2725`](https://github.com/gradido/gradido/pull/2725) +- feat(federation): add dht-node to deployment scripts [`#2729`](https://github.com/gradido/gradido/pull/2729) +- fix(frontend): change fetchPolicy, add scripts.update [`#2718`](https://github.com/gradido/gradido/pull/2718) +- refactor(backend): list unconfirmed contribution to admin list all contribution [`#2666`](https://github.com/gradido/gradido/pull/2666) +- refactor(frontend): community routes [`#2721`](https://github.com/gradido/gradido/pull/2721) +- test(backend): authentication tests for TransactionLinkResolver [`#2705`](https://github.com/gradido/gradido/pull/2705) +- refactor(backend): use LogError on errors [`#2679`](https://github.com/gradido/gradido/pull/2679) +- refactor(backend): use LogError on encryptorUtils [`#2678`](https://github.com/gradido/gradido/pull/2678) +- refactor(backend): use LogError on creations [`#2677`](https://github.com/gradido/gradido/pull/2677) +- refactor(other): decrease docker build dependencies in test workflow [`#2719`](https://github.com/gradido/gradido/pull/2719) +- refactor(backend): unit test for the method denyContribution [`#2639`](https://github.com/gradido/gradido/pull/2639) +- refactor(frontend): logo inserted with better quality. [`#2646`](https://github.com/gradido/gradido/pull/2646) +- feat(federation): harmonize and sync modules and data of federation [`#2665`](https://github.com/gradido/gradido/pull/2665) +- feat(federation): add docker and github-workflow files [`#2680`](https://github.com/gradido/gradido/pull/2680) +- feat(other): e2e test user authentication reset password [`#2644`](https://github.com/gradido/gradido/pull/2644) +- refactor(admin): add tabs for all statusus on contributions [`#2623`](https://github.com/gradido/gradido/pull/2623) +- feat(federation): implement a graphql client to request getpublickey [`#2511`](https://github.com/gradido/gradido/pull/2511) +- refactor(frontend): style refactor mobil auth area [`#2643`](https://github.com/gradido/gradido/pull/2643) +- refactor(backend): use LogError on TransactionResolver [`#2676`](https://github.com/gradido/gradido/pull/2676) +- refactor(backend): event protocol rework [`#2691`](https://github.com/gradido/gradido/pull/2691) +- refactor(backend): use LogError on TransactionLinkResolver [`#2673`](https://github.com/gradido/gradido/pull/2673) +- fix(frontend): simple disabled function on submit send [`#2647`](https://github.com/gradido/gradido/pull/2647) +- refactor(frontend): missing message on old transactions [`#2660`](https://github.com/gradido/gradido/pull/2660) +- refactor(admin): remove overview and multi creation menu entry [`#2661`](https://github.com/gradido/gradido/pull/2661) +- feat(other): add locales check to backend and integrate it to test workflow [`#2693`](https://github.com/gradido/gradido/pull/2693) +- refactor(other): add linting rules like in backend modul [`#2695`](https://github.com/gradido/gradido/pull/2695) +- refactor(backend): use LogError on contributionResolver [`#2669`](https://github.com/gradido/gradido/pull/2669) + #### [1.18.2](https://github.com/gradido/gradido/compare/1.18.1...1.18.2) +> 10 February 2023 + +- chore(release): version 1.18.2 [`#2700`](https://github.com/gradido/gradido/pull/2700) - fix(admin): deny contribution button to left [`#2699`](https://github.com/gradido/gradido/pull/2699) #### [1.18.1](https://github.com/gradido/gradido/compare/1.18.0...1.18.1) diff --git a/admin/package.json b/admin/package.json index 941a9bf69..2b9f3032f 100644 --- a/admin/package.json +++ b/admin/package.json @@ -3,7 +3,7 @@ "description": "Administraion Interface for Gradido", "main": "index.js", "author": "Moriz Wahl", - "version": "1.18.2", + "version": "1.19.0", "license": "Apache-2.0", "private": false, "scripts": { diff --git a/backend/package.json b/backend/package.json index ec9e63a7a..08a9bf54d 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "gradido-backend", - "version": "1.18.2", + "version": "1.19.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 5be01a5d5..95fd9a791 100644 --- a/database/package.json +++ b/database/package.json @@ -1,6 +1,6 @@ { "name": "gradido-database", - "version": "1.18.2", + "version": "1.19.0", "description": "Gradido Database Tool to execute database migrations", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/database", diff --git a/frontend/package.json b/frontend/package.json index 9aa457c19..180959bc5 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-vue-gradido-wallet", - "version": "1.18.2", + "version": "1.19.0", "private": true, "scripts": { "start": "node run/server.js", diff --git a/package.json b/package.json index 2220c1a85..c28757c68 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gradido", - "version": "1.18.2", + "version": "1.19.0", "description": "Gradido", "main": "index.js", "repository": "git@github.com:gradido/gradido.git", From 992eb6e89bcaeb7be5d98f396450dee3ba6babd7 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 8 Mar 2023 07:44:43 +0100 Subject: [PATCH 17/24] Add margin-top -7px to navbar brand. --- admin/src/components/NavBar.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue index 7e2b7d76f..9b2c7a077 100644 --- a/admin/src/components/NavBar.vue +++ b/admin/src/components/NavBar.vue @@ -50,6 +50,10 @@ export default { } From 747c146bbf24d44497baaa293d143fb61c91898b Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 8 Mar 2023 12:33:15 +0100 Subject: [PATCH 22/24] Add to database query relation messages --- backend/src/graphql/resolver/ContributionResolver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts index ab177d759..2469f60ba 100644 --- a/backend/src/graphql/resolver/ContributionResolver.ts +++ b/backend/src/graphql/resolver/ContributionResolver.ts @@ -391,7 +391,7 @@ export class ContributionResolver { currentPage, pageSize, true, - ['user'], + ['user', 'messages'], undefined, statusFilter, ) From 775d29fb68700e7acc972e58a8103b4844f82e2a Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 8 Mar 2023 14:29:25 +0100 Subject: [PATCH 23/24] Add messageCount value to the contributions that got messages, order the objects in the same order as they are found. --- .../resolver/ContributionResolver.test.ts | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts index ed4cdffa0..27f6d1c2a 100644 --- a/backend/src/graphql/resolver/ContributionResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionResolver.test.ts @@ -2745,15 +2745,6 @@ describe('ContributionResolver', () => { messagesCount: 0, state: 'CONFIRMED', }), - expect.objectContaining({ - amount: expect.decimalEqual(100), - firstName: 'Bob', - id: expect.any(Number), - lastName: 'der Baumeister', - memo: 'Confirmed Contribution', - messagesCount: 0, - state: 'CONFIRMED', - }), expect.objectContaining({ amount: expect.decimalEqual(400), firstName: 'Peter', @@ -2763,6 +2754,15 @@ describe('ContributionResolver', () => { messagesCount: 0, state: 'PENDING', }), + expect.objectContaining({ + amount: expect.decimalEqual(100), + firstName: 'Bob', + id: expect.any(Number), + lastName: 'der Baumeister', + memo: 'Confirmed Contribution', + messagesCount: 0, + state: 'CONFIRMED', + }), expect.objectContaining({ amount: expect.decimalEqual(100), firstName: 'Peter', @@ -2781,15 +2781,6 @@ describe('ContributionResolver', () => { messagesCount: 0, state: 'PENDING', }), - expect.objectContaining({ - amount: expect.decimalEqual(10), - firstName: 'Bibi', - id: expect.any(Number), - lastName: 'Bloxberg', - memo: 'Test PENDING contribution update', - messagesCount: 0, - state: 'PENDING', - }), expect.objectContaining({ amount: expect.decimalEqual(200), firstName: 'Peter', @@ -2799,15 +2790,6 @@ describe('ContributionResolver', () => { messagesCount: 0, state: 'DELETED', }), - expect.objectContaining({ - amount: expect.decimalEqual(166), - firstName: 'Räuber', - id: expect.any(Number), - lastName: 'Hotzenplotz', - memo: 'Whatever contribution', - messagesCount: 0, - state: 'DELETED', - }), expect.objectContaining({ amount: expect.decimalEqual(166), firstName: 'Räuber', @@ -2817,6 +2799,15 @@ describe('ContributionResolver', () => { messagesCount: 0, state: 'DENIED', }), + expect.objectContaining({ + amount: expect.decimalEqual(166), + firstName: 'Räuber', + id: expect.any(Number), + lastName: 'Hotzenplotz', + memo: 'Whatever contribution', + messagesCount: 0, + state: 'DELETED', + }), expect.objectContaining({ amount: expect.decimalEqual(166), firstName: 'Räuber', @@ -2831,18 +2822,9 @@ describe('ContributionResolver', () => { firstName: 'Bibi', id: expect.any(Number), lastName: 'Bloxberg', - memo: 'Test IN_PROGRESS contribution', + memo: 'Test contribution to delete', messagesCount: 0, - state: 'IN_PROGRESS', - }), - expect.objectContaining({ - amount: expect.decimalEqual(100), - firstName: 'Bibi', - id: expect.any(Number), - lastName: 'Bloxberg', - memo: 'Test contribution to confirm', - messagesCount: 0, - state: 'CONFIRMED', + state: 'DELETED', }), expect.objectContaining({ amount: expect.decimalEqual(100), @@ -2858,9 +2840,27 @@ describe('ContributionResolver', () => { firstName: 'Bibi', id: expect.any(Number), lastName: 'Bloxberg', - memo: 'Test contribution to delete', + memo: 'Test contribution to confirm', messagesCount: 0, - state: 'DELETED', + state: 'CONFIRMED', + }), + expect.objectContaining({ + amount: expect.decimalEqual(100), + firstName: 'Bibi', + id: expect.any(Number), + lastName: 'Bloxberg', + memo: 'Test IN_PROGRESS contribution', + messagesCount: 1, + state: 'IN_PROGRESS', + }), + expect.objectContaining({ + amount: expect.decimalEqual(10), + firstName: 'Bibi', + id: expect.any(Number), + lastName: 'Bloxberg', + memo: 'Test PENDING contribution update', + messagesCount: 1, + state: 'PENDING', }), expect.objectContaining({ amount: expect.decimalEqual(1000), From 34def5fdbf533e93ca2d48495132849cb338649e Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 9 Mar 2023 12:49:12 +0100 Subject: [PATCH 24/24] Change info.svg to path --- frontend/public/img/svg/info.svg | 186 +++---------------------------- 1 file changed, 13 insertions(+), 173 deletions(-) diff --git a/frontend/public/img/svg/info.svg b/frontend/public/img/svg/info.svg index 1d1b88c65..0510a5b60 100644 --- a/frontend/public/img/svg/info.svg +++ b/frontend/public/img/svg/info.svg @@ -3,180 +3,20 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -