Merge branch 'master' into 1288-email-templates

2026-01-20 20:01:31 +00:00 · 2022-11-15 07:48:47 +01:00 · 2022-11-15 07:48:47 +01:00 · 3b0c937418
commit 3b0c937418
parent e9c4de5373 cfe9a03933
14 changed files with 89 additions and 32 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,8 +4,44 @@ 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.14.1](https://github.com/gradido/gradido/compare/1.14.0...1.14.1)
+
+- fix(frontend): load contributionMessages is fixed [`#2390`](https://github.com/gradido/gradido/pull/2390)
+
+#### [1.14.0](https://github.com/gradido/gradido/compare/1.13.3...1.14.0)
+
+> 14 November 2022
+
+- chore(release): version 1.14.0 [`#2389`](https://github.com/gradido/gradido/pull/2389)
+- fix(frontend): close all open collapse by change tabs in community [`#2388`](https://github.com/gradido/gradido/pull/2388)
+- fix(backend): corrected E-Mail texts [`#2386`](https://github.com/gradido/gradido/pull/2386)
+- fix(frontend): better history messages [`#2381`](https://github.com/gradido/gradido/pull/2381)
+- fix(frontend): mailto link [`#2383`](https://github.com/gradido/gradido/pull/2383)
+- fix(admin): fix text in admin area to uppercase [`#2365`](https://github.com/gradido/gradido/pull/2365)
+- feat(frontend): move the information about gradido being free to the auth layout [`#2349`](https://github.com/gradido/gradido/pull/2349)
+- fix(admin): load error fixed for contribution link [`#2364`](https://github.com/gradido/gradido/pull/2364)
+- fix(admin): edit contribution link does not take old values [`#2362`](https://github.com/gradido/gradido/pull/2362)
+- fix(other): corrected dockerfile descriptions [`#2346`](https://github.com/gradido/gradido/pull/2346)
+- feat(backend): 🍰 Send email for rejected contributions [`#2340`](https://github.com/gradido/gradido/pull/2340)
+- feat(admin): edit automatic contribution link [`#2309`](https://github.com/gradido/gradido/pull/2309)
+- refactor(backend): fix logger mocks [`#2308`](https://github.com/gradido/gradido/pull/2308)
+- fix(admin): update contribution list after admin updates contribution [`#2330`](https://github.com/gradido/gradido/pull/2330)
+- fix(frontend): inconsistent labeling on login register [`#2350`](https://github.com/gradido/gradido/pull/2350)
+- feat(backend): setup hyperswarm [`#1874`](https://github.com/gradido/gradido/pull/1874)
+- feat(other): lint pull request workflow [`#2338`](https://github.com/gradido/gradido/pull/2338)
+- Feature: 🍰 add updated at to contributions [`#2237`](https://github.com/gradido/gradido/pull/2237)
+- Refactor: GitHub test workflow - disable video recording and reduce wait time [`#2336`](https://github.com/gradido/gradido/pull/2336)
+- 2274 feature concept manuel user registration for admins [`#2289`](https://github.com/gradido/gradido/pull/2289)
+- 1574 concept to introduce gradidoID and change password encryption [`#2252`](https://github.com/gradido/gradido/pull/2252)
+- contributionlink stage-2 and stage-3 of capturing and activation [`#2241`](https://github.com/gradido/gradido/pull/2241)
+- Github workflow: update actions to the current API version using Node v 16 [`#2323`](https://github.com/gradido/gradido/pull/2323)
+- feature: Fullstack tests in GitHub workflow [`#2319`](https://github.com/gradido/gradido/pull/2319)
+
 #### [1.13.3](https://github.com/gradido/gradido/compare/1.13.2...1.13.3)

+> 1 November 2022
+
+- release: Version 1.13.3 [`#2322`](https://github.com/gradido/gradido/pull/2322)
 - 2294 contribution links on its own page [`#2312`](https://github.com/gradido/gradido/pull/2312)
 - fix: Change Orange Color [`#2302`](https://github.com/gradido/gradido/pull/2302)
 - fix: Release Statistic Query Runner [`#2320`](https://github.com/gradido/gradido/pull/2320)
--- 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.13.3",
+  "version": "1.14.1",
  "license": "Apache-2.0",
  "private": false,
  "scripts": {
--- a/backend/package.json
+++ b/backend/package.json
@ -1,6 +1,6 @@
 {
  "name": "gradido-backend",
-  "version": "1.13.3",
+  "version": "1.14.1",
  "description": "Gradido unified backend providing an API-Service for Gradido Transactions",
  "main": "src/index.ts",
  "repository": "https://github.com/gradido/gradido/backend",
--- a/database/package.json
+++ b/database/package.json
@ -1,6 +1,6 @@
 {
  "name": "gradido-database",
-  "version": "1.13.3",
+  "version": "1.14.1",
  "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.13.3",
+  "version": "1.14.1",
  "private": true,
  "scripts": {
    "start": "node run/server.js",
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
@ -67,9 +67,9 @@ describe('ContributionMessagesFormular', () => {
        await wrapper.find('form').trigger('submit')
      })

-      it('emitted "get-list-contribution-messages" with data', async () => {
+      it('emitted "get-list-contribution-messages" with false', async () => {
        expect(wrapper.emitted('get-list-contribution-messages')).toEqual(
-          expect.arrayContaining([expect.arrayContaining([42])]),
+          expect.arrayContaining([expect.arrayContaining([false])]),
        )
      })

--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@ -51,7 +51,7 @@ export default {
          },
        })
        .then((result) => {
-          this.$emit('get-list-contribution-messages', this.contributionId)
+          this.$emit('get-list-contribution-messages', false)
          this.$emit('update-state', this.contributionId)
          this.form.text = ''
          this.toastSuccess(this.$t('message.reply'))
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js
@ -40,16 +40,6 @@ describe('ContributionMessagesList', () => {
      expect(wrapper.findComponent({ name: 'ContributionMessagesFormular' }).exists()).toBe(true)
    })

-    describe('get List Contribution Messages', () => {
-      beforeEach(() => {
-        wrapper.vm.getListContributionMessages()
-      })
-
-      it('emits getListContributionMessages', async () => {
-        expect(wrapper.vm.$emit('get-list-contribution-messages')).toBeTruthy()
-      })
-    })
-
    describe('update State', () => {
      beforeEach(() => {
        wrapper.vm.updateState()
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@ -9,7 +9,7 @@
      <contribution-messages-formular
        v-if="['PENDING', 'IN_PROGRESS'].includes(state)"
        :contributionId="contributionId"
-        @get-list-contribution-messages="getListContributionMessages"
+        v-on="$listeners"
        @update-state="updateState"
      />
    </b-container>
@ -50,9 +50,6 @@ export default {
    },
  },
  methods: {
-    getListContributionMessages() {
-      this.$emit('get-list-contribution-messages', this.contributionId)
-    },
    updateState(id) {
      this.$emit('update-state', id)
    },
--- a/frontend/src/components/Contributions/ContributionList.vue
+++ b/frontend/src/components/Contributions/ContributionList.vue
@ -3,6 +3,7 @@
    <div class="list-group" v-for="item in items" :key="item.id">
      <contribution-list-item
        v-bind="item"
+        @closeAllOpenCollapse="$emit('closeAllOpenCollapse')"
        :contributionId="item.id"
        :allContribution="allContribution"
        @update-contribution-form="updateContributionForm"
--- a/frontend/src/components/Contributions/ContributionListItem.spec.js
+++ b/frontend/src/components/Contributions/ContributionListItem.spec.js
@ -9,6 +9,7 @@ describe('ContributionListItem', () => {
  const mocks = {
    $t: jest.fn((t) => t),
    $d: jest.fn((d) => d),
+    $apollo: { query: jest.fn().mockResolvedValue() },
  }

  const propsData = {
@ -132,6 +133,27 @@ describe('ContributionListItem', () => {
          expect(wrapper.emitted('delete-contribution')).toBeFalsy()
        })
      })
+
+      describe('updateState', () => {
+        beforeEach(async () => {
+          await wrapper.vm.updateState()
+        })
+
+        it('emit update-state', () => {
+          expect(wrapper.vm.$emit('update-state')).toBeTruthy()
+        })
+      })
+    })
+
+    describe('getListContributionMessages', () => {
+      beforeEach(() => {
+        wrapper
+          .findComponent({ name: 'ContributionMessagesList' })
+          .vm.$emit('get-list-contribution-messages')
+      })
+      it('emits closeAllOpenCollapse', () => {
+        expect(wrapper.emitted('closeAllOpenCollapse')).toBeTruthy()
+      })
    })
  })
 })
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@ -32,12 +32,13 @@
              v-if="!['CONFIRMED', 'DELETED'].includes(state) && !allContribution"
              class="pointer ml-5"
              @click="
-                $emit('update-contribution-form', {
-                  id: id,
-                  contributionDate: contributionDate,
-                  memo: memo,
-                  amount: amount,
-                })
+                $emit('closeAllOpenCollapse'),
+                  $emit('update-contribution-form', {
+                    id: id,
+                    contributionDate: contributionDate,
+                    memo: memo,
+                    amount: amount,
+                  })
              "
            >
              <b-icon icon="pencil" class="h2"></b-icon>
@ -178,8 +179,10 @@ export default {
        if (value) this.$emit('delete-contribution', item)
      })
    },
-    getListContributionMessages() {
-      // console.log('getListContributionMessages', this.contributionId)
+    getListContributionMessages(closeCollapse = true) {
+      if (closeCollapse) {
+        this.$emit('closeAllOpenCollapse')
+      }
      this.$apollo
        .query({
          query: listContributionMessages,
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@ -2,7 +2,7 @@
  <div class="community-page">
    <div>
      <b-tabs v-model="tabIndex" content-class="mt-3" align="center">
-        <b-tab :title="$t('community.submitContribution')">
+        <b-tab :title="$t('community.submitContribution')" @click="closeAllOpenCollapse">
          <contribution-form
            @set-contribution="setContribution"
            @update-contribution="updateContribution"
@ -39,6 +39,7 @@
            </b-alert>
          </div>
          <contribution-list
+            @closeAllOpenCollapse="closeAllOpenCollapse"
            :items="items"
            @update-list-contributions="updateListContributions"
            @update-contribution-form="updateContributionForm"
@ -49,7 +50,7 @@
            :pageSize="pageSize"
          />
        </b-tab>
-        <b-tab :title="$t('navigation.community')">
+        <b-tab :title="$t('navigation.community')" @click="closeAllOpenCollapse">
          <b-alert show dismissible fade variant="secondary" class="text-dark">
            <h4 class="alert-heading">{{ $t('navigation.community') }}</h4>
            <p>
@ -112,6 +113,13 @@ export default {
    }
  },
  methods: {
+    closeAllOpenCollapse() {
+      // console.log('Community closeAllOpenCollapse ')
+      // console.log('closeAllOpenCollapse', this.$el.querySelectorAll('.collapse.show'))
+      this.$el.querySelectorAll('.collapse.show').forEach((value) => {
+        this.$root.$emit('bv::toggle::collapse', value.id)
+      })
+    },
    setContribution(data) {
      this.$apollo
        .mutate({
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "gradido",
-  "version": "1.13.3",
+  "version": "1.14.1",
  "description": "Gradido",
  "main": "index.js",
  "repository": "git@github.com:gradido/gradido.git",