Merge branch 'master' into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey

CHANGELOG.md

@@ -4,8 +4,60 @@ 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.17.0](https://github.com/gradido/gradido/compare/1.16.0...1.17.0)
+
+- fix(frontend): submit contribution text [`#2573`](https://github.com/gradido/gradido/pull/2573)
+- fix(backend): admin cannot delete confirmed contribution [`#2571`](https://github.com/gradido/gradido/pull/2571)
+- fix(frontend): english locales - horas -> hours [`#2572`](https://github.com/gradido/gradido/pull/2572)
+- fix(frontend): mobil divices datepicker add props dropleft  [`#2570`](https://github.com/gradido/gradido/pull/2570)
+- fix(frontend): pagination [`#2569`](https://github.com/gradido/gradido/pull/2569)
+- fix(frontend): add a watch on gdt prop to assure propper loading when mounted [`#2568`](https://github.com/gradido/gradido/pull/2568)
+- refactor(frontend): creation step in quarter hour set [`#2566`](https://github.com/gradido/gradido/pull/2566)
+- fix(frontend): tunneled email on right side last transactions [`#2561`](https://github.com/gradido/gradido/pull/2561)
+- feat(frontend): test transaction page [`#2555`](https://github.com/gradido/gradido/pull/2555)
+- refactor(backend): statistics with field resolvers [`#2553`](https://github.com/gradido/gradido/pull/2553)
+- fix(frontend): normalized amount transaction if processed again [`#2550`](https://github.com/gradido/gradido/pull/2550)
+- fix(backend): semaphore deadlock [`#2551`](https://github.com/gradido/gradido/pull/2551)
+- fix(frontend): mobile design [`#2552`](https://github.com/gradido/gradido/pull/2552)
+- refactor(frontend): slots for right sidebar and header [`#2548`](https://github.com/gradido/gradido/pull/2548)
+- fix(frontend): creation menu highlighted on all submenus [`#2527`](https://github.com/gradido/gradido/pull/2527)
+- refactor(frontend): computed hours for open creations [`#2545`](https://github.com/gradido/gradido/pull/2545)
+- feat(other): add description for daily backup cronjob [`#2532`](https://github.com/gradido/gradido/pull/2532)
+- fix(frontend): editing transaction does not work [`#2543`](https://github.com/gradido/gradido/pull/2543)
+- refactor(frontend): remove open creations from store [`#2541`](https://github.com/gradido/gradido/pull/2541)
+- feat(other): vscode extensions [`#2524`](https://github.com/gradido/gradido/pull/2524)
+- fix(backend): remove jest from dependecies [`#2533`](https://github.com/gradido/gradido/pull/2533)
+- fix(frontend): initials without space [`#2546`](https://github.com/gradido/gradido/pull/2546)
+- fix(backend): fix backend not confirmable [`#2539`](https://github.com/gradido/gradido/pull/2539)
+- fix(frontend):  send gdd and send link gdd is running [`#2534`](https://github.com/gradido/gradido/pull/2534)
+- fix(other): update browser list [`#2540`](https://github.com/gradido/gradido/pull/2540)
+- test(backend): increase backend coverage to 78% [`#2542`](https://github.com/gradido/gradido/pull/2542)
+- fix(frontend): pagination gdt  [`#2525`](https://github.com/gradido/gradido/pull/2525)
+- fix(frontend): leaves are over the user symbol [`#2526`](https://github.com/gradido/gradido/pull/2526)
+- fix(frontend): input-email label and placeholder are displayed correctly per language [`#2528`](https://github.com/gradido/gradido/pull/2528)
+- feat(backend): add hideAmountGDD & hideAmountGDT to users table. [`#2506`](https://github.com/gradido/gradido/pull/2506)
+- fix(frontend): avatar initials always has 2 letters [`#2530`](https://github.com/gradido/gradido/pull/2530)
+- refactor(backend): seed contributions as user [`#2460`](https://github.com/gradido/gradido/pull/2460)
+- fix(backend): fix logger middleware [`#2503`](https://github.com/gradido/gradido/pull/2503)
+- fix(backend): fix email text [`#2523`](https://github.com/gradido/gradido/pull/2523)
+- feat(other): new scopes for lint pr [`#2489`](https://github.com/gradido/gradido/pull/2489)
+- fix(backend): fix config - some typos [`#2477`](https://github.com/gradido/gradido/pull/2477)
+- style(frontend): new Design [`#2297`](https://github.com/gradido/gradido/pull/2297)
+- refactor(other): adjust some texts and translations [`#2504`](https://github.com/gradido/gradido/pull/2504)
+- test(other): fix tests breaking with the new year [`#2505`](https://github.com/gradido/gradido/pull/2505)
+- feat(backend): federation implement exchange of api versions persist in table [`#2427`](https://github.com/gradido/gradido/pull/2427)
+- feat(backend): semaphore to lock transaction table [`#2458`](https://github.com/gradido/gradido/pull/2458)
+- feat(backend): design html emails and adjust texts [`#2472`](https://github.com/gradido/gradido/pull/2472)
+- feat(backend): test semaphore [`#2468`](https://github.com/gradido/gradido/pull/2468)
+- fix(admin): reduce triggers of success toast on deleted user form to exactly one [`#2471`](https://github.com/gradido/gradido/pull/2471)
+- refactor(other):  build nginx docker image in workflow independent of other builds [`#2470`](https://github.com/gradido/gradido/pull/2470)
+- feat(backend): setup unit tests for federation [`#2465`](https://github.com/gradido/gradido/pull/2465)
+
 #### [1.16.0](https://github.com/gradido/gradido/compare/1.15.0...1.16.0)
 
+> 15 December 2022
+
+- feat(release): version 1.16.0 [`#2467`](https://github.com/gradido/gradido/pull/2467)
 - refactor(backend): cleaning user related old password junk [`#2426`](https://github.com/gradido/gradido/pull/2426)
 - fix(database): consistent transaction table [`#2453`](https://github.com/gradido/gradido/pull/2453)
 - refactor(backend): dissolve admin resolver [`#2416`](https://github.com/gradido/gradido/pull/2416)

admin/package.json

@@ -3,7 +3,7 @@
   "description": "Administraion Interface for Gradido",
   "main": "index.js",
   "author": "Moriz Wahl",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "license": "Apache-2.0",
   "private": false,
   "scripts": {

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido-backend",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "Gradido unified backend providing an API-Service for Gradido Transactions",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/backend",

backend/src/graphql/resolver/ContributionResolver.test.ts

@@ -3,6 +3,7 @@
 
 import Decimal from 'decimal.js-light'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
+import { bobBaumeister } from '@/seeds/users/bob-baumeister'
 import { stephenHawking } from '@/seeds/users/stephen-hawking'
 import { garrickOllivander } from '@/seeds/users/garrick-ollivander'
 import {
@@ -26,7 +27,13 @@ import {
   sendContributionConfirmedEmail,
   // sendContributionRejectedEmail,
 } from '@/emails/sendEmailVariants'
-import { cleanDB, resetToken, testEnvironment, contributionDateFormatter } from '@test/helpers'
+import {
+  cleanDB,
+  resetToken,
+  testEnvironment,
+  contributionDateFormatter,
+  resetEntity,
+} from '@test/helpers'
 import { GraphQLError } from 'graphql'
 import { userFactory } from '@/seeds/factory/user'
 import { creationFactory } from '@/seeds/factory/creation'
@@ -1818,6 +1825,49 @@ describe('ContributionResolver', () => {
               )
             })
           })
+
+          describe('creation already confirmed', () => {
+            it('throws an error', async () => {
+              await userFactory(testEnv, bobBaumeister)
+              await query({
+                query: login,
+                variables: { email: 'bob@baumeister.de', password: 'Aa12345_' },
+              })
+              const {
+                data: { createContribution: confirmedContribution },
+              } = await mutate({
+                mutation: createContribution,
+                variables: {
+                  amount: 100.0,
+                  memo: 'Confirmed Contribution',
+                  creationDate: contributionDateFormatter(new Date()),
+                },
+              })
+              await query({
+                query: login,
+                variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
+              })
+              await mutate({
+                mutation: confirmContribution,
+                variables: {
+                  id: confirmedContribution.id ? confirmedContribution.id : -1,
+                },
+              })
+              await expect(
+                mutate({
+                  mutation: adminDeleteContribution,
+                  variables: {
+                    id: confirmedContribution.id ? confirmedContribution.id : -1,
+                  },
+                }),
+              ).resolves.toEqual(
+                expect.objectContaining({
+                  errors: [new GraphQLError('A confirmed contribution can not be deleted')],
+                }),
+              )
+              await resetEntity(DbTransaction)
+            })
+          })
         })
 
         describe('confirmContribution', () => {

backend/src/graphql/resolver/ContributionResolver.ts

@@ -512,6 +512,10 @@ export class ContributionResolver {
       logger.error(`Contribution not found for given id: ${id}`)
       throw new Error('Contribution not found for given id.')
     }
+    if (contribution.confirmedAt) {
+      logger.error('A confirmed contribution can not be deleted')
+      throw new Error('A confirmed contribution can not be deleted')
+    }
     const moderator = getUser(context)
     if (
       contribution.contributionType === ContributionType.USER &&

database/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido-database",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "Gradido Database Tool to execute database migrations",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/database",

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-vue-gradido-wallet",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "private": true,
   "scripts": {
     "start": "node run/server.js",

frontend/src/locales/de.json

@@ -30,7 +30,7 @@
     "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.",
-    "submitContribution": "schreiben"
+    "submitContribution": "Schreiben"
   },
   "communityInfo": "Gemeinschaft Information",
   "contact": "Kontakt",

frontend/src/locales/en.json

@@ -30,7 +30,7 @@
     "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.",
-    "submitContribution": "writing"
+    "submitContribution": "Contribute"
   },
   "communityInfo": "Community Information",
   "contact": "Contact",
@@ -126,7 +126,7 @@
     "firstname": "Firstname",
     "from": "from",
     "generate_now": "Generate now",
-    "hours": "Horas",
+    "hours": "Hours",
     "lastname": "Lastname",
     "memo": "Message",
     "message": "Message",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "Gradido",
   "main": "index.js",
   "repository": "git@github.com:gradido/gradido.git",