Merge branch 'master' of github.com:gradido/gradido into 1948-delete-settings-animationcoin-in-database

2025-12-13 07:45:54 +00:00 · 2022-06-07 10:22:11 +02:00 · 2022-06-07 10:22:11 +02:00 · 7166f83d84
commit 7166f83d84
parent 71595428b3 06319f2c66
28 changed files with 495 additions and 145 deletions
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -528,7 +528,7 @@ jobs:
          report_name: Coverage Backend
          type: lcov
          result_path: ./backend/coverage/lcov.info
-          min_coverage: 66
+          min_coverage: 68
          token: ${{ github.token }}

  ##########################################################################
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,8 +4,48 @@ 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.9.0](https://github.com/gradido/gradido/compare/1.8.3...1.9.0)
+
+- refactor: 🍰 Refactor To `filters` Object And Rename Filters Properties [`#1914`](https://github.com/gradido/gradido/pull/1914)
+- refactor register button position [`#1964`](https://github.com/gradido/gradido/pull/1964)
+- fixed redeem link is mobile start false [`#1958`](https://github.com/gradido/gradido/pull/1958)
+- 1951 remove back link and remove gray box [`#1959`](https://github.com/gradido/gradido/pull/1959)
+- 1952 change footer icons color an remove save login [`#1955`](https://github.com/gradido/gradido/pull/1955)
+- fix: License should be a valid SPDX license expression [`#1954`](https://github.com/gradido/gradido/pull/1954)
+- refactor: 🍰 Refactor THX Page – 2. Step [`#1858`](https://github.com/gradido/gradido/pull/1858)
+- fix: Add Timezone to Decay Start Block [`#1931`](https://github.com/gradido/gradido/pull/1931)
+- devops: Update License in all package.json [`#1925`](https://github.com/gradido/gradido/pull/1925)
+- docu: Creation Flowchart [`#1918`](https://github.com/gradido/gradido/pull/1918)
+- refactor: Use Logger Categories [`#1912`](https://github.com/gradido/gradido/pull/1912)
+- 1883 remove the animated coins in the profile settings [`#1946`](https://github.com/gradido/gradido/pull/1946)
+- 1942 replace pictures for carousel [`#1943`](https://github.com/gradido/gradido/pull/1943)
+- 1933 auth footer is not on one level [`#1941`](https://github.com/gradido/gradido/pull/1941)
+- 1929 styling new template for password component [`#1935`](https://github.com/gradido/gradido/pull/1935)
+- 1926 button concept for gradido template [`#1927`](https://github.com/gradido/gradido/pull/1927)
+- 1916 remove select language from register form [`#1930`](https://github.com/gradido/gradido/pull/1930)
+- rename files from auth folder, rule vue name = name files [`#1937`](https://github.com/gradido/gradido/pull/1937)
+- Add files Bild_1_2400.jpg [`#1945`](https://github.com/gradido/gradido/pull/1945)
+- Bilder für Slider [`#1940`](https://github.com/gradido/gradido/pull/1940)
+- contribution analysis of elopage and concept proposal [`#1917`](https://github.com/gradido/gradido/pull/1917)
+- 1676 feature federation technical concept [`#1711`](https://github.com/gradido/gradido/pull/1711)
+- more details about Windows installation [`#1842`](https://github.com/gradido/gradido/pull/1842)
+- Concept to Introduce Gradido ID [`#1797`](https://github.com/gradido/gradido/pull/1797)
+- first draft of concept event protocol [`#1796`](https://github.com/gradido/gradido/pull/1796)
+- 1682 new design for the login and registration area [`#1693`](https://github.com/gradido/gradido/pull/1693)
+- fix: Database Connection Charset to utf8mb4_unicode_ci [`#1915`](https://github.com/gradido/gradido/pull/1915)
+- refactor: 🍰 Create Filter Object in GQL And Rename Args [`#1860`](https://github.com/gradido/gradido/pull/1860)
+- feat: 🍰 Improve Apollo Logging [`#1859`](https://github.com/gradido/gradido/pull/1859)
+- Add files via upload [`#1903`](https://github.com/gradido/gradido/pull/1903)
+- 🍰 Hide Pagenation On Short Transactionlist [`#1875`](https://github.com/gradido/gradido/pull/1875)
+- 🍰 Ignore macOS .DS_Store Files [`#1902`](https://github.com/gradido/gradido/pull/1902)
+- pre I from #1682,  add images, svg for new styling [`#1900`](https://github.com/gradido/gradido/pull/1900)
+- add browserstack logo image [`#1888`](https://github.com/gradido/gradido/pull/1888)
+
 #### [1.8.3](https://github.com/gradido/gradido/compare/1.8.2...1.8.3)

+> 13 May 2022
+
+- Release 1.8.3 [`#1899`](https://github.com/gradido/gradido/pull/1899)
 - Checkbox [`#1894`](https://github.com/gradido/gradido/pull/1894)
 - fix: Count Deprecated Links as Well [`#1892`](https://github.com/gradido/gradido/pull/1892)

--- 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.8.3",
+  "version": "1.9.0",
  "license": "Apache-2.0",
  "private": false,
  "scripts": {
--- a/admin/src/graphql/listTransactionLinksAdmin.js
+++ b/admin/src/graphql/listTransactionLinksAdmin.js
@ -2,7 +2,12 @@ import gql from 'graphql-tag'

 export const listTransactionLinksAdmin = gql`
  query ($currentPage: Int = 1, $pageSize: Int = 5, $userId: Int!) {
-    listTransactionLinksAdmin(currentPage: $currentPage, pageSize: $pageSize, userId: $userId) {
+    listTransactionLinksAdmin(
+      currentPage: $currentPage
+      pageSize: $pageSize
+      userId: $userId
+      filters: { withRedeemed: true, withExpired: true, withDeleted: true }
+    ) {
      linkCount
      linkList {
        id
--- a/admin/src/graphql/searchUsers.js
+++ b/admin/src/graphql/searchUsers.js
@ -1,12 +1,7 @@
 import gql from 'graphql-tag'

 export const searchUsers = gql`
-  query (
-    $searchText: String!
-    $currentPage: Int
-    $pageSize: Int
-    $filters: SearchUsersFiltersInput
-  ) {
+  query ($searchText: String!, $currentPage: Int, $pageSize: Int, $filters: SearchUsersFilters) {
    searchUsers(
      searchText: $searchText
      currentPage: $currentPage
--- a/admin/src/pages/Creation.spec.js
+++ b/admin/src/pages/Creation.spec.js
@ -72,8 +72,8 @@ describe('Creation', () => {
              currentPage: 1,
              pageSize: 25,
              filters: {
-                filterByActivated: true,
-                filterByDeleted: false,
+                byActivated: true,
+                byDeleted: false,
              },
            },
          }),
@ -274,8 +274,8 @@ describe('Creation', () => {
                currentPage: 1,
                pageSize: 25,
                filters: {
-                  filterByActivated: true,
-                  filterByDeleted: false,
+                  byActivated: true,
+                  byDeleted: false,
                },
              },
            }),
@ -293,8 +293,8 @@ describe('Creation', () => {
                  currentPage: 1,
                  pageSize: 25,
                  filters: {
-                    filterByActivated: true,
-                    filterByDeleted: false,
+                    byActivated: true,
+                    byDeleted: false,
                  },
                },
              }),
@ -312,8 +312,8 @@ describe('Creation', () => {
              currentPage: 2,
              pageSize: 25,
              filters: {
-                filterByActivated: true,
-                filterByDeleted: false,
+                byActivated: true,
+                byDeleted: false,
              },
            },
          }),
--- a/admin/src/pages/Creation.vue
+++ b/admin/src/pages/Creation.vue
@ -103,8 +103,8 @@ export default {
            currentPage: this.currentPage,
            pageSize: this.perPage,
            filters: {
-              filterByActivated: true,
-              filterByDeleted: false,
+              byActivated: true,
+              byDeleted: false,
            },
          },
          fetchPolicy: 'network-only',
--- a/admin/src/pages/UserSearch.spec.js
+++ b/admin/src/pages/UserSearch.spec.js
@ -83,8 +83,8 @@ describe('UserSearch', () => {
            currentPage: 1,
            pageSize: 25,
            filters: {
-              filterByActivated: null,
-              filterByDeleted: null,
+              byActivated: null,
+              byDeleted: null,
            },
          },
        }),
@ -104,8 +104,8 @@ describe('UserSearch', () => {
              currentPage: 1,
              pageSize: 25,
              filters: {
-                filterByActivated: false,
-                filterByDeleted: null,
+                byActivated: false,
+                byDeleted: null,
              },
            },
          }),
@ -126,8 +126,8 @@ describe('UserSearch', () => {
              currentPage: 1,
              pageSize: 25,
              filters: {
-                filterByActivated: null,
-                filterByDeleted: true,
+                byActivated: null,
+                byDeleted: true,
              },
            },
          }),
@ -148,8 +148,8 @@ describe('UserSearch', () => {
              currentPage: 2,
              pageSize: 25,
              filters: {
-                filterByActivated: null,
-                filterByDeleted: null,
+                byActivated: null,
+                byDeleted: null,
              },
            },
          }),
@ -170,8 +170,8 @@ describe('UserSearch', () => {
              currentPage: 1,
              pageSize: 25,
              filters: {
-                filterByActivated: null,
-                filterByDeleted: null,
+                byActivated: null,
+                byDeleted: null,
              },
            },
          }),
@ -189,8 +189,8 @@ describe('UserSearch', () => {
                currentPage: 1,
                pageSize: 25,
                filters: {
-                  filterByActivated: null,
-                  filterByDeleted: null,
+                  byActivated: null,
+                  byDeleted: null,
                },
              },
            }),
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@ -4,9 +4,9 @@
      <b-button class="unconfirmedRegisterMails" variant="light" @click="unconfirmedRegisterMails">
        <b-icon icon="envelope" variant="danger"></b-icon>
        {{
-          filterByActivated === null
+          filters.byActivated === null
            ? $t('all_emails')
-            : filterByActivated === false
+            : filters.byActivated === false
            ? $t('unregistered_emails')
            : ''
        }}
@ -14,9 +14,9 @@
      <b-button class="deletedUserSearch" variant="light" @click="deletedUserSearch">
        <b-icon icon="x-circle" variant="danger"></b-icon>
        {{
-          filterByDeleted === null
+          filters.byDeleted === null
            ? $t('all_emails')
-            : filterByDeleted === true
+            : filters.byDeleted === true
            ? $t('deleted_user')
            : ''
        }}
@ -72,8 +72,10 @@ export default {
      searchResult: [],
      massCreation: [],
      criteria: '',
-      filterByActivated: null,
-      filterByDeleted: null,
+      filters: {
+        byActivated: null,
+        byDeleted: null,
+      },
      rows: 0,
      currentPage: 1,
      perPage: 25,
@ -82,11 +84,11 @@ export default {
  },
  methods: {
    unconfirmedRegisterMails() {
-      this.filterByActivated = this.filterByActivated === null ? false : null
+      this.filters.byActivated = this.filters.byActivated === null ? false : null
      this.getUsers()
    },
    deletedUserSearch() {
-      this.filterByDeleted = this.filterByDeleted === null ? true : null
+      this.filters.byDeleted = this.filters.byDeleted === null ? true : null
      this.getUsers()
    },
    getUsers() {
@ -97,10 +99,7 @@ export default {
            searchText: this.criteria,
            currentPage: this.currentPage,
            pageSize: this.perPage,
-            filters: {
-              filterByActivated: this.filterByActivated,
-              filterByDeleted: this.filterByDeleted,
-            },
+            filters: this.filters,
          },
          fetchPolicy: 'no-cache',
        })
--- a/backend/package.json
+++ b/backend/package.json
@ -1,6 +1,6 @@
 {
  "name": "gradido-backend",
-  "version": "1.8.3",
+  "version": "1.9.0",
  "description": "Gradido unified backend providing an API-Service for Gradido Transactions",
  "main": "src/index.ts",
  "repository": "https://github.com/gradido/gradido/backend",
--- a/backend/src/graphql/arg/SearchUsersArgs.ts
+++ b/backend/src/graphql/arg/SearchUsersArgs.ts
@ -12,6 +12,6 @@ export default class SearchUsersArgs {
  @Field(() => Int, { nullable: true })
  pageSize?: number

-  @Field(() => SearchUsersFilters, { nullable: true })
+  @Field(() => SearchUsersFilters, { nullable: true, defaultValue: null })
  filters: SearchUsersFilters
 }
--- a/backend/src/graphql/arg/SearchUsersFilters.ts
+++ b/backend/src/graphql/arg/SearchUsersFilters.ts
@ -1,11 +1,10 @@
-import { Field, InputType, ObjectType } from 'type-graphql'
+import { Field, InputType } from 'type-graphql'

-@ObjectType()
-@InputType('SearchUsersFiltersInput')
+@InputType()
 export default class SearchUsersFilters {
  @Field(() => Boolean, { nullable: true, defaultValue: null })
-  filterByActivated?: boolean | null
+  byActivated: boolean

  @Field(() => Boolean, { nullable: true, defaultValue: null })
-  filterByDeleted?: boolean | null
+  byDeleted: boolean
 }
--- a/backend/src/graphql/arg/TransactionLinkFilters.ts
+++ b/backend/src/graphql/arg/TransactionLinkFilters.ts
@ -1,13 +1,13 @@
-import { ArgsType, Field } from 'type-graphql'
+import { Field, InputType } from 'type-graphql'

-@ArgsType()
+@InputType()
 export default class TransactionLinkFilters {
-  @Field(() => Boolean, { nullable: true, defaultValue: true })
-  filterByDeleted?: boolean
+  @Field(() => Boolean, { nullable: true })
+  withDeleted: boolean

-  @Field(() => Boolean, { nullable: true, defaultValue: true })
-  filterByExpired?: boolean
+  @Field(() => Boolean, { nullable: true })
+  withExpired: boolean

-  @Field(() => Boolean, { nullable: true, defaultValue: true })
-  filterByRedeemed?: boolean
+  @Field(() => Boolean, { nullable: true })
+  withRedeemed: boolean
 }
--- a/backend/src/graphql/resolver/AdminResolver.test.ts
+++ b/backend/src/graphql/resolver/AdminResolver.test.ts
@ -1,10 +1,13 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */

-import { convertObjValuesToArray } from '@/util/utilities'
+import { objectValuesToArray } from '@/util/utilities'
 import { testEnvironment, resetToken, cleanDB } from '@test/helpers'
 import { userFactory } from '@/seeds/factory/user'
 import { creationFactory } from '@/seeds/factory/creation'
+import { creations } from '@/seeds/creation/index'
+import { transactionLinkFactory } from '@/seeds/factory/transactionLink'
+import { transactionLinks } from '@/seeds/transactionLink/index'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { stephenHawking } from '@/seeds/users/stephen-hawking'
@ -12,14 +15,18 @@ import { garrickOllivander } from '@/seeds/users/garrick-ollivander'
 import {
  deleteUser,
  unDeleteUser,
-  searchUsers,
  createPendingCreation,
  createPendingCreations,
  updatePendingCreation,
  deletePendingCreation,
  confirmPendingCreation,
 } from '@/seeds/graphql/mutations'
-import { getPendingCreations, login } from '@/seeds/graphql/queries'
+import {
+  getPendingCreations,
+  login,
+  searchUsers,
+  listTransactionLinksAdmin,
+} from '@/seeds/graphql/queries'
 import { GraphQLError } from 'graphql'
 import { User } from '@entity/User'
 /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
@ -366,7 +373,7 @@ describe('AdminResolver', () => {
                data: {
                  searchUsers: {
                    userCount: 4,
-                    userList: expect.arrayContaining(convertObjValuesToArray(allUsers)),
+                    userList: expect.arrayContaining(objectValuesToArray(allUsers)),
                  },
                },
              }),
@ -382,8 +389,8 @@ describe('AdminResolver', () => {
                variables: {
                  ...variablesWithoutTextAndFilters,
                  filters: {
-                    filterByActivated: null,
-                    filterByDeleted: null,
+                    byActivated: null,
+                    byDeleted: null,
                  },
                },
              }),
@ -392,7 +399,7 @@ describe('AdminResolver', () => {
                data: {
                  searchUsers: {
                    userCount: 4,
-                    userList: expect.arrayContaining(convertObjValuesToArray(allUsers)),
+                    userList: expect.arrayContaining(objectValuesToArray(allUsers)),
                  },
                },
              }),
@ -408,8 +415,8 @@ describe('AdminResolver', () => {
                variables: {
                  ...variablesWithoutTextAndFilters,
                  filters: {
-                    filterByActivated: false,
-                    filterByDeleted: null,
+                    byActivated: false,
+                    byDeleted: null,
                  },
                },
              }),
@ -434,8 +441,8 @@ describe('AdminResolver', () => {
                variables: {
                  ...variablesWithoutTextAndFilters,
                  filters: {
-                    filterByActivated: null,
-                    filterByDeleted: true,
+                    byActivated: null,
+                    byDeleted: true,
                  },
                },
              }),
@ -460,8 +467,8 @@ describe('AdminResolver', () => {
                variables: {
                  ...variablesWithoutTextAndFilters,
                  filters: {
-                    filterByActivated: false,
-                    filterByDeleted: true,
+                    byActivated: false,
+                    byDeleted: true,
                  },
                },
              }),
@ -1324,4 +1331,266 @@ describe('AdminResolver', () => {
      })
    })
  })
+
+  describe('transaction links list', () => {
+    const variables = {
+      userId: 1, // dummy, may be replaced
+      filters: null,
+      currentPage: 1,
+      pageSize: 5,
+    }
+
+    describe('unauthenticated', () => {
+      it('returns an error', async () => {
+        await expect(
+          query({
+            query: listTransactionLinksAdmin,
+            variables,
+          }),
+        ).resolves.toEqual(
+          expect.objectContaining({
+            errors: [new GraphQLError('401 Unauthorized')],
+          }),
+        )
+      })
+    })
+
+    describe('authenticated', () => {
+      describe('without admin rights', () => {
+        beforeAll(async () => {
+          user = await userFactory(testEnv, bibiBloxberg)
+          await query({
+            query: login,
+            variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
+          })
+        })
+
+        afterAll(async () => {
+          await cleanDB()
+          resetToken()
+        })
+
+        it('returns an error', async () => {
+          await expect(
+            query({
+              query: listTransactionLinksAdmin,
+              variables,
+            }),
+          ).resolves.toEqual(
+            expect.objectContaining({
+              errors: [new GraphQLError('401 Unauthorized')],
+            }),
+          )
+        })
+      })
+
+      describe('with admin rights', () => {
+        beforeAll(async () => {
+          // admin 'peter@lustig.de' has to exists for 'creationFactory'
+          admin = await userFactory(testEnv, peterLustig)
+
+          user = await userFactory(testEnv, bibiBloxberg)
+          variables.userId = user.id
+          variables.pageSize = 25
+          // bibi needs GDDs
+          const bibisCreation = creations.find((creation) => creation.email === 'bibi@bloxberg.de')
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          await creationFactory(testEnv, bibisCreation!)
+          // bibis transaktion links
+          const bibisTransaktionLinks = transactionLinks.filter(
+            (transactionLink) => transactionLink.email === 'bibi@bloxberg.de',
+          )
+          for (let i = 0; i < bibisTransaktionLinks.length; i++) {
+            await transactionLinkFactory(testEnv, bibisTransaktionLinks[i])
+          }
+
+          // admin: only now log in
+          await query({
+            query: login,
+            variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
+          })
+        })
+
+        afterAll(async () => {
+          await cleanDB()
+          resetToken()
+        })
+
+        describe('without any filters', () => {
+          it('finds 6 open transaction links and no deleted or redeemed', async () => {
+            await expect(
+              query({
+                query: listTransactionLinksAdmin,
+                variables,
+              }),
+            ).resolves.toEqual(
+              expect.objectContaining({
+                data: {
+                  listTransactionLinksAdmin: {
+                    linkCount: 6,
+                    linkList: expect.not.arrayContaining([
+                      expect.objectContaining({
+                        memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
+                        createdAt: expect.any(String),
+                      }),
+                      expect.objectContaining({
+                        memo: 'Da habe ich mich wohl etwas übernommen.',
+                        deletedAt: expect.any(String),
+                      }),
+                    ]),
+                  },
+                },
+              }),
+            )
+          })
+        })
+
+        describe('all filters are null', () => {
+          it('finds 6 open transaction links and no deleted or redeemed', async () => {
+            await expect(
+              query({
+                query: listTransactionLinksAdmin,
+                variables: {
+                  ...variables,
+                  filters: {
+                    withDeleted: null,
+                    withExpired: null,
+                    withRedeemed: null,
+                  },
+                },
+              }),
+            ).resolves.toEqual(
+              expect.objectContaining({
+                data: {
+                  listTransactionLinksAdmin: {
+                    linkCount: 6,
+                    linkList: expect.not.arrayContaining([
+                      expect.objectContaining({
+                        memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
+                        createdAt: expect.any(String),
+                      }),
+                      expect.objectContaining({
+                        memo: 'Da habe ich mich wohl etwas übernommen.',
+                        deletedAt: expect.any(String),
+                      }),
+                    ]),
+                  },
+                },
+              }),
+            )
+          })
+        })
+
+        describe('filter with deleted', () => {
+          it('finds 6 open transaction links, 1 deleted, and no redeemed', async () => {
+            await expect(
+              query({
+                query: listTransactionLinksAdmin,
+                variables: {
+                  ...variables,
+                  filters: {
+                    withDeleted: true,
+                  },
+                },
+              }),
+            ).resolves.toEqual(
+              expect.objectContaining({
+                data: {
+                  listTransactionLinksAdmin: {
+                    linkCount: 7,
+                    linkList: expect.arrayContaining([
+                      expect.not.objectContaining({
+                        memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
+                        createdAt: expect.any(String),
+                      }),
+                      expect.objectContaining({
+                        memo: 'Da habe ich mich wohl etwas übernommen.',
+                        deletedAt: expect.any(String),
+                      }),
+                    ]),
+                  },
+                },
+              }),
+            )
+          })
+        })
+
+        describe('filter by expired', () => {
+          it('finds 5 open transaction links, 1 expired, and no redeemed', async () => {
+            await expect(
+              query({
+                query: listTransactionLinksAdmin,
+                variables: {
+                  ...variables,
+                  filters: {
+                    withExpired: true,
+                  },
+                },
+              }),
+            ).resolves.toEqual(
+              expect.objectContaining({
+                data: {
+                  listTransactionLinksAdmin: {
+                    linkCount: 7,
+                    linkList: expect.arrayContaining([
+                      expect.objectContaining({
+                        memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
+                        createdAt: expect.any(String),
+                      }),
+                      expect.not.objectContaining({
+                        memo: 'Da habe ich mich wohl etwas übernommen.',
+                        deletedAt: expect.any(String),
+                      }),
+                    ]),
+                  },
+                },
+              }),
+            )
+          })
+        })
+
+        // TODO: works not as expected, because 'redeemedAt' and 'redeemedBy' have to be added to the transaktion link factory
+        describe.skip('filter by redeemed', () => {
+          it('finds 6 open transaction links, 1 deleted, and no redeemed', async () => {
+            await expect(
+              query({
+                query: listTransactionLinksAdmin,
+                variables: {
+                  ...variables,
+                  filters: {
+                    withDeleted: null,
+                    withExpired: null,
+                    withRedeemed: true,
+                  },
+                },
+              }),
+            ).resolves.toEqual(
+              expect.objectContaining({
+                data: {
+                  listTransactionLinksAdmin: {
+                    linkCount: 6,
+                    linkList: expect.arrayContaining([
+                      expect.not.objectContaining({
+                        memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
+                        createdAt: expect.any(String),
+                      }),
+                      expect.objectContaining({
+                        memo: 'Yeah, eingelöst!',
+                        redeemedAt: expect.any(String),
+                        redeemedBy: expect.any(Number),
+                      }),
+                      expect.not.objectContaining({
+                        memo: 'Da habe ich mich wohl etwas übernommen.',
+                        deletedAt: expect.any(String),
+                      }),
+                    ]),
+                  },
+                },
+              }),
+            )
+          })
+        })
+      })
+    })
+  })
 })
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@ -58,12 +58,12 @@ export class AdminResolver {

    const filterCriteria: ObjectLiteral[] = []
    if (filters) {
-      if (filters.filterByActivated !== null) {
-        filterCriteria.push({ emailChecked: filters.filterByActivated })
+      if (filters.byActivated !== null) {
+        filterCriteria.push({ emailChecked: filters.byActivated })
      }

-      if (filters.filterByDeleted !== null) {
-        filterCriteria.push({ deletedAt: filters.filterByDeleted ? Not(IsNull()) : IsNull() })
+      if (filters.byDeleted !== null) {
+        filterCriteria.push({ deletedAt: filters.byDeleted ? Not(IsNull()) : IsNull() })
      }
    }

@ -426,9 +426,10 @@ export class AdminResolver {
  async listTransactionLinksAdmin(
    @Args()
    { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated,
-    @Args()
+    @Arg('filters', () => TransactionLinkFilters, { nullable: true })
    filters: TransactionLinkFilters,
-    @Arg('userId', () => Int) userId: number,
+    @Arg('userId', () => Int)
+    userId: number,
  ): Promise<TransactionLinkResult> {
    const user = await dbUser.findOneOrFail({ id: userId })
    const where: {
@ -437,12 +438,16 @@ export class AdminResolver {
      validUntil?: FindOperator<Date> | null
    } = {
      userId,
+      redeemedBy: null,
+      validUntil: MoreThan(new Date()),
+    }
+    if (filters) {
+      if (filters.withRedeemed) delete where.redeemedBy
+      if (filters.withExpired) delete where.validUntil
    }
-    if (!filters.filterByRedeemed) where.redeemedBy = null
-    if (!filters.filterByExpired) where.validUntil = MoreThan(new Date())
    const [transactionLinks, count] = await dbTransactionLink.findAndCount({
      where,
-      withDeleted: filters.filterByDeleted,
+      withDeleted: filters ? filters.withDeleted : false,
      order: {
        createdAt: order,
      },
--- a/backend/src/seeds/graphql/mutations.ts
+++ b/backend/src/seeds/graphql/mutations.ts
@ -105,35 +105,6 @@ export const unDeleteUser = gql`
  }
 `

-export const searchUsers = gql`
-  query (
-    $searchText: String!
-    $currentPage: Int
-    $pageSize: Int
-    $filters: SearchUsersFiltersInput
-  ) {
-    searchUsers(
-      searchText: $searchText
-      currentPage: $currentPage
-      pageSize: $pageSize
-      filters: $filters
-    ) {
-      userCount
-      userList {
-        userId
-        firstName
-        lastName
-        email
-        creation
-        emailChecked
-        hasElopage
-        emailConfirmationSend
-        deletedAt
-      }
-    }
-  }
-`
-
 export const createPendingCreations = gql`
  mutation ($pendingCreations: [CreatePendingCreationArgs!]!) {
    createPendingCreations(pendingCreations: $pendingCreations) {
--- a/backend/src/seeds/graphql/queries.ts
+++ b/backend/src/seeds/graphql/queries.ts
@ -91,6 +91,30 @@ export const sendResetPasswordEmail = gql`
  }
 `

+export const searchUsers = gql`
+  query ($searchText: String!, $currentPage: Int, $pageSize: Int, $filters: SearchUsersFilters) {
+    searchUsers(
+      searchText: $searchText
+      currentPage: $currentPage
+      pageSize: $pageSize
+      filters: $filters
+    ) {
+      userCount
+      userList {
+        userId
+        firstName
+        lastName
+        email
+        creation
+        emailChecked
+        hasElopage
+        emailConfirmationSend
+        deletedAt
+      }
+    }
+  }
+`
+
 export const listGDTEntriesQuery = gql`
  query ($currentPage: Int!, $pageSize: Int!) {
    listGDTEntries(currentPage: $currentPage, pageSize: $pageSize) {
@ -164,3 +188,32 @@ export const getPendingCreations = gql`
    }
  }
 `
+
+export const listTransactionLinksAdmin = gql`
+  query (
+    $userId: Int!
+    $filters: TransactionLinkFilters
+    $currentPage: Int = 1
+    $pageSize: Int = 5
+  ) {
+    listTransactionLinksAdmin(
+      userId: $userId
+      filters: $filters
+      currentPage: $currentPage
+      pageSize: $pageSize
+    ) {
+      linkCount
+      linkList {
+        id
+        amount
+        holdAvailableAmount
+        memo
+        code
+        createdAt
+        validUntil
+        redeemedAt
+        deletedAt
+      }
+    }
+  }
+`
--- a/backend/src/seeds/transactionLink/TransactionLinkInterface.ts
+++ b/backend/src/seeds/transactionLink/TransactionLinkInterface.ts
@ -3,5 +3,8 @@ export interface TransactionLinkInterface {
  amount: number
  memo: string
  createdAt?: Date
+  // TODO: for testing
+  // redeemedAt?: Date
+  // redeemedBy?: number
  deletedAt?: boolean
 }
--- a/backend/src/seeds/transactionLink/index.ts
+++ b/backend/src/seeds/transactionLink/index.ts
@ -30,6 +30,10 @@ bei Gradidio sei dabei!`,
    amount: 19.99,
    memo: `Kein Trick, keine Zauberrei,
 bei Gradidio sei dabei!`,
+    // TODO: for testing
+    // memo: `Yeah, eingelöst!`,
+    // redeemedAt: new Date(2022, 2, 2),
+    // redeemedBy: not null,
  },
  {
    email: 'bibi@bloxberg.de',
--- a/backend/src/util/utilities.ts
+++ b/backend/src/util/utilities.ts
@ -1,4 +1,4 @@
-export const convertObjValuesToArray = (obj: { [x: string]: string }): Array<string> => {
+export const objectValuesToArray = (obj: { [x: string]: string }): Array<string> => {
  return Object.keys(obj).map(function (key) {
    return obj[key]
  })
--- a/database/package.json
+++ b/database/package.json
@ -1,6 +1,6 @@
 {
  "name": "gradido-database",
-  "version": "1.8.3",
+  "version": "1.9.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.8.3",
+  "version": "1.9.0",
  "private": true,
  "scripts": {
    "start": "node run/server.js",
--- a/frontend/src/assets/scss/gradido-template.scss
+++ b/frontend/src/assets/scss/gradido-template.scss
@ -15,6 +15,14 @@ body {
  color: #0e79bc !important;
 }

+.text-gradido {
+  color: rgb(249 205 105 / 100%);
+}
+
+.gradient-gradido {
+  background-image: linear-gradient(146deg, rgb(220 167 44) 50%, rgb(197 141 56 / 100%) 100%);
+}
+
 /* Navbar  */
 a,
 .navbar-light,
@ -32,14 +40,6 @@ a:hover,
  color: rgb(35 121 188 / 90%);
 }

-.text-gradido {
-  color: rgb(249 205 105 / 100%);
-}
-
-.gradient-gradido {
-  background-image: linear-gradient(146deg, rgb(220 167 44) 50%, rgb(197 141 56 / 100%) 100%);
-}
-
 /* Button */
 .btn {
  border-radius: 25px;
--- a/frontend/src/components/Auth/AuthMobileStart.vue
+++ b/frontend/src/components/Auth/AuthMobileStart.vue
@ -124,4 +124,10 @@ export default {
    min-width: 360px;
  }
 }
+
+@media screen and (max-height: 700px) {
+  .mobil-start-box #img3 {
+    top: -104px;
+  }
+}
 </style>
--- a/frontend/src/layouts/AuthLayout.vue
+++ b/frontend/src/layouts/AuthLayout.vue
@ -16,7 +16,11 @@
          <div class="h0 text-white">{{ $t('auth.left.gratitude') }}</div>
          <div class="h1 text-white">{{ $t('auth.left.newCurrency') }}</div>
          <div class="h2 text-white">{{ $t('auth.left.oneAnotherNature') }}</div>
-          <b-button variant="gradido">{{ $t('auth.left.learnMore') }}</b-button>
+          <b-link :href="`https://gradido.net/${$i18n.locale}`" target="_blank">
+            <b-button variant="gradido">
+              {{ $t('auth.left.learnMore') }}
+            </b-button>
+          </b-link>
        </div>
      </div>
      <b-row class="justify-content-md-center">
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@ -63,29 +63,25 @@
          <b-row>
            <b-col><input-email v-model="form.email"></input-email></b-col>
          </b-row>
-
-          <b-row class="mt-4 mb-4">
-            <b-col class="mb-4 mb-md-0">
-              <b-form-checkbox
-                id="registerCheckbox"
-                v-model="form.agree"
-                :name="$t('site.signup.agree')"
-              >
-                <!-- eslint-disable-next-line @intlify/vue-i18n/no-v-html -->
-                <span class="text-muted" v-html="$t('site.signup.agree')"></span>
-              </b-form-checkbox>
-            </b-col>
-
-            <b-col class="d-flex justify-content-end">
-              <b-button
-                type="submit"
-                :disabled="disabled"
-                :variant="disabled ? 'gradido-disable' : 'gradido'"
-              >
-                {{ $t('signup') }}
-              </b-button>
-            </b-col>
-          </b-row>
+          <div class="my-4">
+            <b-form-checkbox
+              id="registerCheckbox"
+              v-model="form.agree"
+              :name="$t('site.signup.agree')"
+            >
+              <!-- eslint-disable-next-line @intlify/vue-i18n/no-v-html -->
+              <span class="text-muted" v-html="$t('site.signup.agree')"></span>
+            </b-form-checkbox>
+          </div>
+          <div>
+            <b-button
+              type="submit"
+              :disabled="disabled"
+              :variant="disabled ? 'gradido-disable' : 'gradido'"
+            >
+              {{ $t('signup') }}
+            </b-button>
+          </div>
        </b-form>
      </validation-observer>
    </b-container>
--- a/frontend/src/pages/TransactionLink.vue
+++ b/frontend/src/pages/TransactionLink.vue
@ -143,6 +143,7 @@ export default {
  },
  created() {
    this.setTransactionLinkInformation()
+    this.$emit('set-mobile-start', false)
  },
 }
 </script>
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "gradido",
-  "version": "1.8.3",
+  "version": "1.9.0",
  "description": "Gradido",
  "main": "index.js",
  "repository": "git@github.com:gradido/gradido.git",