Merge branch 'master' into eslint-plugin-type-graphql-fixes

2025-12-13 07:45:54 +00:00 · 2023-03-10 12:12:59 +01:00 · 2023-03-10 12:12:59 +01:00 · b4e324ce0a
commit b4e324ce0a
parent becabb861c eb266ec93c
14 changed files with 127 additions and 77 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,8 +4,28 @@ 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.1](https://github.com/gradido/gradido/compare/1.19.0...1.19.1)
+
+- fix(frontend): admin question clickable [`#2810`](https://github.com/gradido/gradido/pull/2810)
+- refactor(frontend): change b-img to b-icon send [`#2809`](https://github.com/gradido/gradido/pull/2809)
+- fix(admin): update openCreation in case of tab open. [`#2806`](https://github.com/gradido/gradido/pull/2806)
+- fix(admin): english language for contributions in admin [`#2804`](https://github.com/gradido/gradido/pull/2804)
+- refactor(admin): event buttons for myself turned off in open contributions [`#2760`](https://github.com/gradido/gradido/pull/2760)
+- fix(admin): contribution page [`#2794`](https://github.com/gradido/gradido/pull/2794)
+- fix(frontend): info.svg [`#2798`](https://github.com/gradido/gradido/pull/2798)
+- fix(backend): add relation messages to database query [`#2795`](https://github.com/gradido/gradido/pull/2795)
+- fix(admin): header and menu [`#2793`](https://github.com/gradido/gradido/pull/2793)
+- fix(frontend): send gdd - change first submit button text to 'Check Now' [`#2774`](https://github.com/gradido/gradido/pull/2774)
+- refactor(frontend): creations generated by link NL [`#2771`](https://github.com/gradido/gradido/pull/2771)
+- refactor(frontend): creations generated by link (FR) + (NL) [`#2770`](https://github.com/gradido/gradido/pull/2770)
+- refactor(frontend): update German locales [`#2765`](https://github.com/gradido/gradido/pull/2765)
+- refactor(backend): use find contributions helper for list contributions [`#2762`](https://github.com/gradido/gradido/pull/2762)
+
 #### [1.19.0](https://github.com/gradido/gradido/compare/1.18.2...1.19.0)

+> 7 March 2023
+
+- chore(release): version 1.19.0 [`#2786`](https://github.com/gradido/gradido/pull/2786)
 - 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)
--- 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.19.0",
+  "version": "1.19.1",
  "license": "Apache-2.0",
  "private": false,
  "scripts": {
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
@ -10,6 +10,7 @@ describe('ContributionMessagesList', () => {

  const propsData = {
    contributionId: 42,
+    contributionState: 'PENDING',
  }

  const mocks = {
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@ -1,18 +1,19 @@
 <template>
  <div class="contribution-messages-list">
    <b-container>
-      {{ messages.lenght }}
      <div v-for="message in messages" v-bind:key="message.id">
        <contribution-messages-list-item :message="message" />
      </div>
    </b-container>

+    <div v-if="contributionState === 'PENDING' || contributionState === 'IN_PROGRESS'">
      <contribution-messages-formular
        :contributionId="contributionId"
        @get-list-contribution-messages="getListContributionMessages"
        @update-state="updateState"
      />
    </div>
+  </div>
 </template>
 <script>
 import ContributionMessagesListItem from './slots/ContributionMessagesListItem'
@ -30,6 +31,10 @@ export default {
      type: Number,
      required: true,
    },
+    contributionState: {
+      type: String,
+      required: true,
+    },
  },
  data() {
    return {
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@ -13,6 +13,7 @@
        <b-icon :icon="getStatusIcon(row.item.state)"></b-icon>
      </template>
      <template #cell(bookmark)="row">
+        <div v-if="!myself(row.item)">
          <b-button
            variant="danger"
            size="md"
@ -21,9 +22,10 @@
          >
            <b-icon icon="trash" variant="light"></b-icon>
          </b-button>
+        </div>
      </template>
      <template #cell(editCreation)="row">
-        <div v-if="$store.state.moderator.id !== row.item.userId">
+        <div v-if="!myself(row.item)">
          <b-button
            v-if="row.item.moderator"
            variant="info"
@ -36,30 +38,26 @@
          <b-button v-else @click="rowToggleDetails(row, 0)">
            <b-icon icon="chat-dots"></b-icon>
            <b-icon
-              v-if="row.item.state === 'PENDING' && row.item.messageCount > 0"
+              v-if="row.item.state === 'PENDING' && row.item.messagesCount > 0"
              icon="exclamation-circle-fill"
              variant="warning"
            ></b-icon>
            <b-icon
-              v-if="row.item.state === 'IN_PROGRESS' && row.item.messageCount > 0"
+              v-if="row.item.state === 'IN_PROGRESS' && row.item.messagesCount > 0"
              icon="question-diamond"
-              variant="light"
+              variant="warning"
+              class="pl-1"
            ></b-icon>
          </b-button>
        </div>
      </template>
-      <template #cell(reActive)>
-        <b-button variant="warning" size="md" class="mr-2">
-          <b-icon icon="arrow-up" variant="light"></b-icon>
-        </b-button>
-      </template>
      <template #cell(chatCreation)="row">
        <b-button v-if="row.item.messagesCount > 0" @click="rowToggleDetails(row, 0)">
          <b-icon icon="chat-dots"></b-icon>
        </b-button>
      </template>
      <template #cell(deny)="row">
-        <div v-if="$store.state.moderator.id !== row.item.userId">
+        <div v-if="!myself(row.item)">
          <b-button
            variant="warning"
            size="md"
@ -71,7 +69,7 @@
        </div>
      </template>
      <template #cell(confirm)="row">
-        <div v-if="$store.state.moderator.id !== row.item.userId">
+        <div v-if="!myself(row.item)">
          <b-button
            variant="success"
            size="md"
@ -104,6 +102,7 @@
            <div v-else>
              <contribution-messages-list
                :contributionId="row.item.id"
+                :contributionState="row.item.state"
                @update-state="updateState"
                @update-user-data="updateUserData"
              />
@ -158,13 +157,22 @@ export default {
    }
  },
  methods: {
+    myself(item) {
+      return (
+        `${item.firstName} ${item.lastName}` ===
+        `${this.$store.state.moderator.firstName} ${this.$store.state.moderator.lastName}`
+      )
+    },
    getStatusIcon(status) {
      return iconMap[status] ? iconMap[status] : 'default-icon'
    },
    rowClass(item, type) {
      if (!item || type !== 'row') return
      if (item.state === 'CONFIRMED') return 'table-success'
-      if (item.state === 'DENIED') return 'table-info'
+      if (item.state === 'DENIED') return 'table-warning'
+      if (item.state === 'DELETED') return 'table-danger'
+      if (item.state === 'IN_PROGRESS') return 'table-primary'
+      if (item.state === 'PENDING') return 'table-primary'
    },
    updateCreationData(data) {
      const row = data.row
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@ -63,7 +63,6 @@
  "deleted_user": "Alle gelöschten Nutzer",
  "delete_user": "Nutzer löschen",
  "deny": "Ablehnen",
-  "edit": "Bearbeiten",
  "enabled": "aktiviert",
  "error": "Fehler",
  "expired": "abgelaufen",
@ -101,7 +100,6 @@
  "message": {
    "request": "Die Anfrage wurde gesendet."
  },
-  "mod": "Mod",
  "moderator": "Moderator",
  "name": "Name",
  "navbar": {
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@ -34,12 +34,12 @@
    "all": "All",
    "confirms": "Confirmed",
    "deleted": "Deleted",
-    "denied": "Denied",
+    "denied": "Rejected",
    "open": "Open"
  },
-  "created": "Confirmed",
-  "createdAt": "Created",
-  "creation": "Creation",
+  "created": "Created for",
+  "createdAt": "Created at",
+  "creation": "Amount",
  "creationList": "Creation list",
  "creation_form": {
    "creation_for": "Active Basic Income for",
@ -53,7 +53,7 @@
    "toasted": "Open creation ({value} GDD) for {email} has been saved and is ready for confirmation.",
    "toasted_created": "Creation has been successfully saved",
    "toasted_delete": "Open creation has been deleted",
-    "toasted_denied": "Open creation has been denied",
+    "toasted_denied": "Open creation has been rejected",
    "toasted_update": "Open creation {value} GDD) for {email} has been changed and is ready for confirmation.",
    "update_creation": "Creation update"
  },
@ -63,7 +63,6 @@
  "deleted_user": "All deleted user",
  "delete_user": "Delete user",
  "deny": "Reject",
-  "edit": "Edit",
  "enabled": "enabled",
  "error": "Error",
  "expired": "expired",
@ -87,7 +86,7 @@
    "transactionlist": {
      "confirmed": "When was it confirmed by a moderator / admin.",
      "periods": "For what period was it submitted by the member.",
-      "state": "[PENDING = submitted, DELETED = deleted, IN_PROGRESS = in dialogue with moderator, DENIED = denied, CONFIRMED = confirmed]",
+      "state": "[PENDING = submitted, DELETED = deleted, IN_PROGRESS = in dialogue with moderator, DENIED = rejected, CONFIRMED = confirmed]",
      "submitted": "When was it submitted by the member"
    }
  },
@ -101,7 +100,6 @@
  "message": {
    "request": "Request has been sent."
  },
-  "mod": "Mod",
  "moderator": "Moderator",
  "name": "Name",
  "navbar": {
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@ -5,25 +5,37 @@
      <b-tabs v-model="tabIndex" content-class="mt-3" fill>
        <b-tab active :title-link-attributes="{ 'data-test': 'open' }">
          <template #title>
+            <b-icon icon="bell-fill" variant="primary"></b-icon>
            {{ $t('contributions.open') }}
            <b-badge v-if="$store.state.openCreations > 0" variant="danger">
              {{ $store.state.openCreations }}
            </b-badge>
          </template>
        </b-tab>
-        <b-tab
-          :title="$t('contributions.confirms')"
-          :title-link-attributes="{ 'data-test': 'confirmed' }"
-        />
-        <b-tab
-          :title="$t('contributions.denied')"
-          :title-link-attributes="{ 'data-test': 'denied' }"
-        />
-        <b-tab
-          :title="$t('contributions.deleted')"
-          :title-link-attributes="{ 'data-test': 'deleted' }"
-        />
-        <b-tab :title="$t('contributions.all')" :title-link-attributes="{ 'data-test': 'all' }" />
+        <b-tab :title-link-attributes="{ 'data-test': 'confirmed' }">
+          <template #title>
+            <b-icon icon="check" variant="success"></b-icon>
+            {{ $t('contributions.confirms') }}
+          </template>
+        </b-tab>
+        <b-tab :title-link-attributes="{ 'data-test': 'denied' }">
+          <template #title>
+            <b-icon icon="x-circle" variant="warning"></b-icon>
+            {{ $t('contributions.denied') }}
+          </template>
+        </b-tab>
+        <b-tab :title-link-attributes="{ 'data-test': 'deleted' }">
+          <template #title>
+            <b-icon icon="trash" variant="danger"></b-icon>
+            {{ $t('contributions.deleted') }}
+          </template>
+        </b-tab>
+        <b-tab :title-link-attributes="{ 'data-test': 'all' }">
+          <template #title>
+            <b-icon icon="list"></b-icon>
+            {{ $t('contributions.all') }}
+          </template>
+        </b-tab>
      </b-tabs>
    </div>
    <open-creations-table
@ -172,6 +184,9 @@ export default {
      this.items.find((obj) => obj.id === id).messagesCount++
      this.items.find((obj) => obj.id === id).state = 'IN_PROGRESS'
    },
+    formatDateOrDash(value) {
+      return value ? this.$d(new Date(value), 'short') : '—'
+    },
  },
  computed: {
    fields() {
@ -180,7 +195,6 @@ export default {
          // open contributions
          { key: 'bookmark', label: this.$t('delete') },
          { key: 'deny', label: this.$t('deny') },
-          { key: 'email', label: this.$t('e_mail') },
          { key: 'firstName', label: this.$t('firstname') },
          { key: 'lastName', label: this.$t('lastname') },
          {
@ -195,11 +209,11 @@ export default {
            key: 'contributionDate',
            label: this.$t('created'),
            formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
            },
          },
          { key: 'moderator', label: this.$t('moderator') },
-          { key: 'editCreation', label: this.$t('edit') },
+          { key: 'editCreation', label: this.$t('chat') },
          { key: 'confirm', label: this.$t('save') },
        ],
        [
@ -218,28 +232,28 @@ export default {
            key: 'contributionDate',
            label: this.$t('created'),
            formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
            },
          },
          {
            key: 'createdAt',
            label: this.$t('createdAt'),
            formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
            },
          },
          {
            key: 'confirmedAt',
            label: this.$t('contributions.confirms'),
            formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
            },
          },
+          { key: 'confirmedBy', label: this.$t('moderator') },
          { key: 'chatCreation', label: this.$t('chat') },
        ],
        [
          // denied contributions
-          { key: 'reActive', label: 'reActive' },
          { key: 'firstName', label: this.$t('firstname') },
          { key: 'lastName', label: this.$t('lastname') },
          {
@ -254,29 +268,28 @@ export default {
            key: 'contributionDate',
            label: this.$t('created'),
            formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
            },
          },
          {
            key: 'createdAt',
            label: this.$t('createdAt'),
            formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
            },
          },
          {
            key: 'deniedAt',
            label: this.$t('contributions.denied'),
            formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
            },
          },
-          { key: 'deniedBy', label: this.$t('mod') },
+          { key: 'deniedBy', label: this.$t('moderator') },
          { key: 'chatCreation', label: this.$t('chat') },
        ],
        [
          // deleted contributions
-          { key: 'reActive', label: 'reActive' },
          { key: 'firstName', label: this.$t('firstname') },
          { key: 'lastName', label: this.$t('lastname') },
          {
@ -291,29 +304,29 @@ export default {
            key: 'contributionDate',
            label: this.$t('created'),
            formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
            },
          },
          {
            key: 'createdAt',
            label: this.$t('createdAt'),
            formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
            },
          },
          {
            key: 'deletedAt',
            label: this.$t('contributions.deleted'),
            formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
            },
          },
-          { key: 'deletedBy', label: this.$t('mod') },
+          { key: 'deletedBy', label: this.$t('moderator') },
          { key: 'chatCreation', label: this.$t('chat') },
        ],
        [
          // all contributions
-          { key: 'state', label: 'state' },
+          { key: 'state', label: this.$t('status') },
          { key: 'firstName', label: this.$t('firstname') },
          { key: 'lastName', label: this.$t('lastname') },
          {
@ -328,24 +341,24 @@ export default {
            key: 'contributionDate',
            label: this.$t('created'),
            formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
            },
          },
          {
            key: 'createdAt',
            label: this.$t('createdAt'),
            formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
            },
          },
          {
            key: 'confirmedAt',
            label: this.$t('contributions.confirms'),
            formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
            },
          },
-          { key: 'confirmedBy', label: this.$t('mod') },
+          { key: 'confirmedBy', label: this.$t('moderator') },
          { key: 'chatCreation', label: this.$t('chat') },
        ],
      ][this.tabIndex]
@ -397,6 +410,9 @@ export default {
      update({ adminListAllContributions }) {
        this.rows = adminListAllContributions.contributionCount
        this.items = adminListAllContributions.contributionList
+        if (this.statusFilter === FILTER_TAB_MAP[0]) {
+          this.$store.commit('setOpenCreations', adminListAllContributions.contributionCount)
+        }
      },
      error({ message }) {
        this.toastError(message)
--- a/backend/package.json
+++ b/backend/package.json
@ -1,6 +1,6 @@
 {
  "name": "gradido-backend",
-  "version": "1.19.0",
+  "version": "1.19.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.19.0",
+  "version": "1.19.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.19.0",
+  "version": "1.19.1",
  "private": true,
  "scripts": {
    "start": "node run/server.js",
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@ -25,7 +25,11 @@
          </div>
          <div class="mt-3 font-weight-bold">{{ $t('contributionText') }}</div>
          <div class="mb-3 text-break word-break">{{ memo }}</div>
-          <div v-if="state === 'IN_PROGRESS' && !allContribution" class="text-205">
+          <div
+            v-if="state === 'IN_PROGRESS'"
+            class="text-205 pointer hover-font-bold"
+            @click="visible = !visible"
+          >
            {{ $t('contribution.alert.answerQuestion') }}
          </div>
        </b-col>
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@ -13,7 +13,7 @@
            <span class="ml-2">{{ $t('navigation.overview') }}</span>
          </b-nav-item>
          <b-nav-item to="/send" class="mb-3" active-class="activeRoute">
-            <b-img src="/img/svg/send.svg" height="20" class="svg-icon" />
+            <b-icon icon="cash" aria-hidden="true"></b-icon>
            <span class="ml-2">{{ $t('navigation.send') }}</span>
          </b-nav-item>
          <b-nav-item to="/transactions" class="mb-3" active-class="activeRoute">
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "gradido",
-  "version": "1.19.0",
+  "version": "1.19.1",
  "description": "Gradido",
  "main": "index.js",
  "repository": "git@github.com:gradido/gradido.git",