Merge branch 'master' into 2562-style-and-design-changes-to-a-contribution

2025-12-13 07:45:54 +00:00 · 2023-02-10 08:25:56 +01:00 · 2023-02-10 08:25:56 +01:00 · d7f03778e9
commit d7f03778e9
parent a2922bf5a2 0fa61c67eb
12 changed files with 81 additions and 9 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,8 +4,42 @@ 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.18.0](https://github.com/gradido/gradido/compare/1.17.1...1.18.0)
+
+- refactor(frontend):  toast by automatically logged out [`#2681`](https://github.com/gradido/gradido/pull/2681)
+- refactor(frontend): change text for gdd_per_link.choose-amount [`#2638`](https://github.com/gradido/gradido/pull/2638)
+- fix(backend): emails for deny and delete contribution [`#2688`](https://github.com/gradido/gradido/pull/2688)
+- refactor(other): remove config version from `.env.dist` [`#2686`](https://github.com/gradido/gradido/pull/2686)
+- refactor(backend): use LogError on contributionMessageResolver [`#2663`](https://github.com/gradido/gradido/pull/2663)
+- refactor(backend): get last transaction by only one function [`#2668`](https://github.com/gradido/gradido/pull/2668)
+- refactor(other): don't rebuild modul if unit test file has been changed [`#2667`](https://github.com/gradido/gradido/pull/2667)
+- refactor(backend): use LogError on contributionLinkResolver [`#2662`](https://github.com/gradido/gradido/pull/2662)
+- refactor(backend): remove event protocol config switch [`#2670`](https://github.com/gradido/gradido/pull/2670)
+- refactor(backend): event protocol [`#2652`](https://github.com/gradido/gradido/pull/2652)
+- refactor(frontend): sidebar becomes smaller when critical phase [`#2649`](https://github.com/gradido/gradido/pull/2649)
+- refactor(backend): use LogError on sendEMailTranslated [`#2656`](https://github.com/gradido/gradido/pull/2656)
+- refactor(backend): log error class [`#2640`](https://github.com/gradido/gradido/pull/2640)
+- feat(backend): add filterState parameter to listAllContributions query [`#2619`](https://github.com/gradido/gradido/pull/2619)
+- refactor(frontend): there is no message when a month is fully created [`#2626`](https://github.com/gradido/gradido/pull/2626)
+- refactor(frontend): better text alignment on send via link [`#2637`](https://github.com/gradido/gradido/pull/2637)
+- refactor(frontend): text changed as indicated in the issues [`#2642`](https://github.com/gradido/gradido/pull/2642)
+- refactor(frontend): when you click on create, you will be directed to the form [`#2645`](https://github.com/gradido/gradido/pull/2645)
+- feat(backend): federation: separated dht-hub features in new dht-node modul [`#2510`](https://github.com/gradido/gradido/pull/2510)
+- refactor(backend): refine assembly of error message in user resolver [`#2636`](https://github.com/gradido/gradido/pull/2636)
+- fix(backend): unit tests creations for 31st day [`#2641`](https://github.com/gradido/gradido/pull/2641)
+- fix(workflow): properly lint pr - prevent requirement to restart linting [`#2635`](https://github.com/gradido/gradido/pull/2635)
+- feat(frontend): 'yes'-button shows which dialog is currently open with a different color  [`#2629`](https://github.com/gradido/gradido/pull/2629)
+- feat(backend): federation implement multiple apollo graphql endpoints [`#2459`](https://github.com/gradido/gradido/pull/2459)
+- refactor(frontend): add legend to all contribution tab, and add tests. [`#2625`](https://github.com/gradido/gradido/pull/2625)
+- feat(frontend): unit tests community page [`#2587`](https://github.com/gradido/gradido/pull/2587)
+- feat(backend): deny contributions [`#2461`](https://github.com/gradido/gradido/pull/2461)
+- refactor(admin): update yarn.lock file of admin. [`#2579`](https://github.com/gradido/gradido/pull/2579)
+
 #### [1.17.1](https://github.com/gradido/gradido/compare/1.17.0...1.17.1)

+> 20 January 2023
+
+- chore(release): v1.17.1 [`#2588`](https://github.com/gradido/gradido/pull/2588)
 - refactor(frontend): change contribution memo add word-break [`#2583`](https://github.com/gradido/gradido/pull/2583)
 - refactor(admin): add text-break on all table memo fields [`#2584`](https://github.com/gradido/gradido/pull/2584)
 - fix(frontend): throw proper frontend warning errors [`#2586`](https://github.com/gradido/gradido/pull/2586)
--- 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.17.1",
+  "version": "1.18.0",
  "license": "Apache-2.0",
  "private": false,
  "scripts": {
--- a/backend/package.json
+++ b/backend/package.json
@ -1,6 +1,6 @@
 {
  "name": "gradido-backend",
-  "version": "1.17.1",
+  "version": "1.18.0",
  "description": "Gradido unified backend providing an API-Service for Gradido Transactions",
  "main": "src/index.ts",
  "repository": "https://github.com/gradido/gradido/backend",
@ -74,6 +74,8 @@
    "typescript": "^4.3.4"
  },
  "nodemonConfig": {
-    "ignore": ["**/*.test.ts"]
+    "ignore": [
+      "**/*.test.ts"
+    ]
  }
 }
--- a/database/package.json
+++ b/database/package.json
@ -1,6 +1,6 @@
 {
  "name": "gradido-database",
-  "version": "1.17.1",
+  "version": "1.18.0",
  "description": "Gradido Database Tool to execute database migrations",
  "main": "src/index.ts",
  "repository": "https://github.com/gradido/gradido/database",
--- a/frontend/package.json
+++ b/frontend/package.json
@ -1,6 +1,6 @@
 {
  "name": "bootstrap-vue-gradido-wallet",
-  "version": "1.17.1",
+  "version": "1.18.0",
  "private": true,
  "scripts": {
    "start": "node run/server.js",
--- a/frontend/src/components/Contributions/ContributionList.spec.js
+++ b/frontend/src/components/Contributions/ContributionList.spec.js
@ -116,5 +116,15 @@ describe('ContributionList', () => {
        expect(wrapper.emitted('delete-contribution')).toEqual([[{ id: 2 }]])
      })
    })
+
+    describe('update status', () => {
+      beforeEach(() => {
+        wrapper.findComponent({ name: 'ContributionListItem' }).vm.$emit('update-state', { id: 2 })
+      })
+
+      it('emits update status', () => {
+        expect(wrapper.emitted('update-state')).toEqual([[{ id: 2 }]])
+      })
+    })
  })
 })
--- a/frontend/src/components/SessionLogoutTimeout.vue
+++ b/frontend/src/components/SessionLogoutTimeout.vue
@ -67,6 +67,7 @@ export default {
      }
      if (this.tokenExpiresInSeconds === 0) {
        this.$timer.stop('tokenExpires')
+        this.toastInfoNoHide(this.$t('session.automaticallyLoggedOut'))
        this.$emit('logout')
      }
    },
@ -84,6 +85,7 @@ export default {
        })
        .catch(() => {
          this.$timer.stop('tokenExpires')
+          this.toastInfoNoHide(this.$t('session.automaticallyLoggedOut'))
          this.$emit('logout')
        })
    },
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@ -175,7 +175,7 @@
  "GDD": "GDD",
  "gddKonto": "GDD Konto",
  "gdd_per_link": {
-    "choose-amount": "Wähle einen Betrag aus, welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „Jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
+    "choose-amount": "Wähle einen Betrag aus, welchen du per Link versenden möchtest, und trage eine Nachricht ein. Die Nachricht ist ein Pflichtfeld.",
    "copy-link": "Link kopieren",
    "copy-link-with-text": "Link und Text kopieren",
    "created": "Der Link wurde erstellt!",
@ -274,6 +274,7 @@
  "send_gdd": "GDD versenden",
  "send_per_link": "GDD versenden per Link",
  "session": {
+    "automaticallyLoggedOut": "Du wurdest automatisch abgemeldet",
    "extend": "Angemeldet bleiben",
    "lightText": "Wenn du länger als 10 Minuten keine Aktion getätigt hast, wirst du aus Sicherheitsgründen abgemeldet.",
    "logoutIn": "Abmelden in ",
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@ -175,7 +175,7 @@
  "GDD": "GDD",
  "gddKonto": "GDD Konto",
  "gdd_per_link": {
-    "choose-amount": "Select an amount that you would like to send via link. You can also enter a message. Click 'Generate now' to create a link that you can share.",
+    "choose-amount": "Select an amount you want to send via link and enter a message. The message is mandatory.",
    "copy-link": "Copy link",
    "copy-link-with-text": "Copy link and text",
    "created": "Link was created!",
@ -274,6 +274,7 @@
  "send_gdd": "Send GDD",
  "send_per_link": "Send GDD via Link",
  "session": {
+    "automaticallyLoggedOut": "You have been automatically logged out.",
    "extend": "Stay logged in",
    "lightText": "If you have not performed any action for more than 10 minutes, you will be logged out for security reasons.",
    "logoutIn": "Log out in ",
--- a/frontend/src/mixins/toaster.js
+++ b/frontend/src/mixins/toaster.js
@ -18,11 +18,18 @@ export const toasters = {
        variant: 'warning',
      })
    },
+    toastInfoNoHide(message) {
+      this.toast(message, {
+        title: this.$t('navigation.info'),
+        variant: 'warning',
+        noAutoHide: true,
+      })
+    },
    toast(message, options) {
      if (message.replace) message = message.replace(/^GraphQL error: /, '')
      this.$root.$bvToast.toast(message, {
-        autoHideDelay: 5000,
        appendToast: true,
+        autoHideDelay: 5000,
        solid: true,
        toaster: 'b-toaster-top-right',
        headerClass: 'gdd-toaster-title',
--- a/frontend/src/pages/Community.spec.js
+++ b/frontend/src/pages/Community.spec.js
@ -70,6 +70,8 @@ describe('Community', () => {
                lastName: 'Bloxberg',
                state: 'IN_PROGRESS',
                messagesCount: 0,
+                deniedAt: null,
+                deniedBy: null,
              },
              {
                id: 1550,
@ -84,6 +86,8 @@ describe('Community', () => {
                lastName: 'Bloxberg',
                state: 'CONFIRMED',
                messagesCount: 0,
+                deniedAt: null,
+                deniedBy: null,
              },
            ],
            contributionCount: 1,
@ -112,6 +116,10 @@ describe('Community', () => {
                confirmedAt: null,
                firstName: 'Bibi',
                lastName: 'Bloxberg',
+                deniedAt: null,
+                deniedBy: null,
+                messagesCount: 0,
+                state: 'IN_PROGRESS',
              },
              {
                id: 1550,
@ -124,7 +132,10 @@ describe('Community', () => {
                firstName: 'Bibi',
                contributionDate: '2022-06-15T08:47:06.000Z',
                lastName: 'Bloxberg',
+                deniedAt: null,
+                deniedBy: null,
                messagesCount: 0,
+                state: 'IN_PROGRESS',
              },
              {
                id: 1556,
@ -137,6 +148,10 @@ describe('Community', () => {
                confirmedAt: null,
                firstName: 'Bob',
                lastName: 'der Baumeister',
+                deniedAt: null,
+                deniedBy: null,
+                messagesCount: 0,
+                state: 'IN_PROGRESS',
              },
            ],
            contributionCount: 3,
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "gradido",
-  "version": "1.17.1",
+  "version": "1.18.0",
  "description": "Gradido",
  "main": "index.js",
  "repository": "git@github.com:gradido/gradido.git",