IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints

Browse Source
This commit is contained in:
Claus-Peter Hübner 2023-01-12 16:54:14 +01:00
commit 4c4979f8eb
48 changed files with 705 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test.yml vendored
View File

@ -527,7 +527,7 @@ jobs:
report_name: Coverage Backend
type: lcov
result_path: ./backend/coverage/lcov.info
min_coverage: 76
min_coverage: 78
token: ${{ github.token }}
##########################################################################

6
admin/yarn.lock
View File

@ -4141,9 +4141,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001271:
version "1.0.30001354"
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001354.tgz"
integrity sha512-mImKeCkyGDAHNywYFA4bqnLAzTUvVkqPvhY4DV47X+Gl2c5Z8c3KNETnXp14GQt11LvxE8AwjzGxJ+rsikiOzg==
version "1.0.30001442"
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz"
integrity sha512-239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow==
capture-exit@^2.0.0:
version "2.0.0"

12
backend/src/config/index.ts
View File

@ -10,7 +10,7 @@ Decimal.set({
})
const constants = {
DB_VERSION: '0058-add_communities_table',
DB_VERSION: '0059-add_hide_amount_to_users',
DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
LOG4JS_CONFIG: 'log4js-config.json',
// default log level on production should be info
@ -70,11 +70,13 @@ const email = {
EMAIL: process.env.EMAIL === 'true' || false,
EMAIL_TEST_MODUS: process.env.EMAIL_TEST_MODUS === 'true' || false,
EMAIL_TEST_RECEIVER: process.env.EMAIL_TEST_RECEIVER || 'stage1@gradido.net',
EMAIL_USERNAME: process.env.EMAIL_USERNAME || 'gradido_email',
EMAIL_USERNAME: process.env.EMAIL_USERNAME || '',
EMAIL_SENDER: process.env.EMAIL_SENDER || 'info@gradido.net',
EMAIL_PASSWORD: process.env.EMAIL_PASSWORD || 'xxx',
EMAIL_SMTP_URL: process.env.EMAIL_SMTP_URL || 'gmail.com',
EMAIL_SMTP_PORT: process.env.EMAIL_SMTP_PORT || '587',
EMAIL_PASSWORD: process.env.EMAIL_PASSWORD || '',
EMAIL_SMTP_URL: process.env.EMAIL_SMTP_URL || 'mailserver',
EMAIL_SMTP_PORT: process.env.EMAIL_SMTP_PORT || '1025',
// eslint-disable-next-line no-unneeded-ternary
EMAIL_TLS: process.env.EMAIL_TLS === 'false' ? false : true,
EMAIL_LINK_VERIFICATION:
process.env.EMAIL_LINK_VERIFICATION || 'http://localhost/checkEmail/{optin}{code}',
EMAIL_LINK_SETPASSWORD:

2
backend/src/emails/sendEmailTranslated.ts
View File

@ -41,7 +41,7 @@ export const sendEmailTranslated = async (params: {
host: CONFIG.EMAIL_SMTP_URL,
port: Number(CONFIG.EMAIL_SMTP_PORT),
secure: false, // true for 465, false for other ports
requireTLS: true,
requireTLS: CONFIG.EMAIL_TLS,
auth: {
user: CONFIG.EMAIL_USERNAME,
pass: CONFIG.EMAIL_PASSWORD,

6
backend/src/graphql/arg/UpdateUserInfosArgs.ts
View File

@ -19,4 +19,10 @@ export default class UpdateUserInfosArgs {
@Field({ nullable: true })
passwordNew?: string
@Field({ nullable: true })
hideAmountGDD?: boolean
@Field({ nullable: true })
hideAmountGDT?: boolean
}

8
backend/src/graphql/model/User.ts
View File

@ -27,6 +27,8 @@ export class User {
this.klickTipp = null
this.hasElopage = null
this.creation = creation
this.hideAmountGDD = user.hideAmountGDD
this.hideAmountGDT = user.hideAmountGDT
}
@Field(() => Number)
@ -72,6 +74,12 @@ export class User {
@Field(() => String)
language: string
@Field(() => Boolean)
hideAmountGDD: boolean
@Field(() => Boolean)
hideAmountGDT: boolean
// This is not the users publisherId, but the one of the users who recommend him
@Field(() => Number, { nullable: true })
publisherId: number | null

2
backend/src/graphql/resolver/BalanceResolver.ts
View File

@ -32,7 +32,7 @@ export class BalanceResolver {
const lastTransaction = context.lastTransaction
? context.lastTransaction
: await dbTransaction.findOne({ userId: user.id }, { order: { balanceDate: 'DESC' } })
: await dbTransaction.findOne({ userId: user.id }, { order: { id: 'DESC' } })
logger.debug(`lastTransaction=${lastTransaction}`)

47
backend/src/graphql/resolver/ContributionResolver.test.ts
View File

@ -1146,13 +1146,21 @@ describe('ContributionResolver', () => {
const now = new Date()
beforeAll(async () => {
creation = await creationFactory(testEnv, {
email: 'peter@lustig.de',
amount: 400,
memo: 'Herzlich Willkommen bei Gradido!',
creationDate: contributionDateFormatter(
new Date(now.getFullYear(), now.getMonth() - 1, 1),
),
await mutate({
mutation: adminCreateContribution,
variables: {
email: 'peter@lustig.de',
amount: 400,
memo: 'Herzlich Willkommen bei Gradido!',
creationDate: contributionDateFormatter(
new Date(now.getFullYear(), now.getMonth() - 1, 1),
),
},
})
creation = await Contribution.findOneOrFail({
where: {
memo: 'Herzlich Willkommen bei Gradido!',
},
})
})
@ -1879,6 +1887,10 @@ describe('ContributionResolver', () => {
new Date(now.getFullYear(), now.getMonth() - 2, 1),
),
})
await query({
query: login,
variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
})
})
it('returns true', async () => {
@ -1935,6 +1947,23 @@ describe('ContributionResolver', () => {
}),
)
})
describe('confirm same contribution again', () => {
it('throws an error', async () => {
await expect(
mutate({
mutation: confirmContribution,
variables: {
id: creation ? creation.id : -1,
},
}),
).resolves.toEqual(
expect.objectContaining({
errors: [new GraphQLError('Contribution already confirmd.')],
}),
)
})
})
})
describe('confirm two creations one after the other quickly', () => {
@ -1959,6 +1988,10 @@ describe('ContributionResolver', () => {
new Date(now.getFullYear(), now.getMonth() - 2, 1),
),
})
await query({
query: login,
variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
})
})
it('throws no error for the second confirmation', async () => {

188
backend/src/graphql/resolver/ContributionResolver.ts
View File

@ -553,108 +553,116 @@ export class ContributionResolver {
@Arg('id', () => Int) id: number,
@Ctx() context: Context,
): Promise<boolean> {
const clientTimezoneOffset = getClientTimezoneOffset(context)
const contribution = await DbContribution.findOne(id)
if (!contribution) {
logger.error(`Contribution not found for given id: ${id}`)
throw new Error('Contribution not found to given id.')
}
const moderatorUser = getUser(context)
if (moderatorUser.id === contribution.userId) {
logger.error('Moderator can not confirm own contribution')
throw new Error('Moderator can not confirm own contribution')
}
const user = await DbUser.findOneOrFail(
{ id: contribution.userId },
{ withDeleted: true, relations: ['emailContact'] },
)
if (user.deletedAt) {
logger.error('This user was deleted. Cannot confirm a contribution.')
throw new Error('This user was deleted. Cannot confirm a contribution.')
}
const creations = await getUserCreation(contribution.userId, clientTimezoneOffset, false)
validateContribution(
creations,
contribution.amount,
contribution.contributionDate,
clientTimezoneOffset,
)
// acquire lock
const releaseLock = await TRANSACTIONS_LOCK.acquire()
const receivedCallDate = new Date()
const queryRunner = getConnection().createQueryRunner()
await queryRunner.connect()
await queryRunner.startTransaction('REPEATABLE READ') // 'READ COMMITTED')
try {
const lastTransaction = await queryRunner.manager
.createQueryBuilder()
.select('transaction')
.from(DbTransaction, 'transaction')
.where('transaction.userId = :id', { id: contribution.userId })
.orderBy('transaction.id', 'DESC')
.getOne()
logger.info('lastTransaction ID', lastTransaction ? lastTransaction.id : 'undefined')
let newBalance = new Decimal(0)
let decay: Decay | null = null
if (lastTransaction) {
decay = calculateDecay(
lastTransaction.balance,
lastTransaction.balanceDate,
receivedCallDate,
)
newBalance = decay.balance
const clientTimezoneOffset = getClientTimezoneOffset(context)
const contribution = await DbContribution.findOne(id)
if (!contribution) {
logger.error(`Contribution not found for given id: ${id}`)
throw new Error('Contribution not found to given id.')
}
newBalance = newBalance.add(contribution.amount.toString())
if (contribution.confirmedAt) {
logger.error(`Contribution already confirmd: ${id}`)
throw new Error('Contribution already confirmd.')
}
const moderatorUser = getUser(context)
if (moderatorUser.id === contribution.userId) {
logger.error('Moderator can not confirm own contribution')
throw new Error('Moderator can not confirm own contribution')
}
const user = await DbUser.findOneOrFail(
{ id: contribution.userId },
{ withDeleted: true, relations: ['emailContact'] },
)
if (user.deletedAt) {
logger.error('This user was deleted. Cannot confirm a contribution.')
throw new Error('This user was deleted. Cannot confirm a contribution.')
}
const creations = await getUserCreation(contribution.userId, clientTimezoneOffset, false)
validateContribution(
creations,
contribution.amount,
contribution.contributionDate,
clientTimezoneOffset,
)
const transaction = new DbTransaction()
transaction.typeId = TransactionTypeId.CREATION
transaction.memo = contribution.memo
transaction.userId = contribution.userId
transaction.previous = lastTransaction ? lastTransaction.id : null
transaction.amount = contribution.amount
transaction.creationDate = contribution.contributionDate
transaction.balance = newBalance
transaction.balanceDate = receivedCallDate
transaction.decay = decay ? decay.decay : new Decimal(0)
transaction.decayStart = decay ? decay.start : null
await queryRunner.manager.insert(DbTransaction, transaction)
const receivedCallDate = new Date()
const queryRunner = getConnection().createQueryRunner()
await queryRunner.connect()
await queryRunner.startTransaction('REPEATABLE READ') // 'READ COMMITTED')
try {
const lastTransaction = await queryRunner.manager
.createQueryBuilder()
.select('transaction')
.from(DbTransaction, 'transaction')
.where('transaction.userId = :id', { id: contribution.userId })
.orderBy('transaction.id', 'DESC')
.getOne()
logger.info('lastTransaction ID', lastTransaction ? lastTransaction.id : 'undefined')
contribution.confirmedAt = receivedCallDate
contribution.confirmedBy = moderatorUser.id
contribution.transactionId = transaction.id
contribution.contributionStatus = ContributionStatus.CONFIRMED
await queryRunner.manager.update(DbContribution, { id: contribution.id }, contribution)
let newBalance = new Decimal(0)
let decay: Decay | null = null
if (lastTransaction) {
decay = calculateDecay(
lastTransaction.balance,
lastTransaction.balanceDate,
receivedCallDate,
)
newBalance = decay.balance
}
newBalance = newBalance.add(contribution.amount.toString())
await queryRunner.commitTransaction()
logger.info('creation commited successfuly.')
sendContributionConfirmedEmail({
firstName: user.firstName,
lastName: user.lastName,
email: user.emailContact.email,
language: user.language,
senderFirstName: moderatorUser.firstName,
senderLastName: moderatorUser.lastName,
contributionMemo: contribution.memo,
contributionAmount: contribution.amount,
})
} catch (e) {
await queryRunner.rollbackTransaction()
logger.error('Creation was not successful', e)
throw new Error('Creation was not successful.')
const transaction = new DbTransaction()
transaction.typeId = TransactionTypeId.CREATION
transaction.memo = contribution.memo
transaction.userId = contribution.userId
transaction.previous = lastTransaction ? lastTransaction.id : null
transaction.amount = contribution.amount
transaction.creationDate = contribution.contributionDate
transaction.balance = newBalance
transaction.balanceDate = receivedCallDate
transaction.decay = decay ? decay.decay : new Decimal(0)
transaction.decayStart = decay ? decay.start : null
await queryRunner.manager.insert(DbTransaction, transaction)
contribution.confirmedAt = receivedCallDate
contribution.confirmedBy = moderatorUser.id
contribution.transactionId = transaction.id
contribution.contributionStatus = ContributionStatus.CONFIRMED
await queryRunner.manager.update(DbContribution, { id: contribution.id }, contribution)
await queryRunner.commitTransaction()
logger.info('creation commited successfuly.')
sendContributionConfirmedEmail({
firstName: user.firstName,
lastName: user.lastName,
email: user.emailContact.email,
language: user.language,
senderFirstName: moderatorUser.firstName,
senderLastName: moderatorUser.lastName,
contributionMemo: contribution.memo,
contributionAmount: contribution.amount,
})
} catch (e) {
await queryRunner.rollbackTransaction()
logger.error('Creation was not successful', e)
throw new Error('Creation was not successful.')
} finally {
await queryRunner.release()
}
const event = new Event()
const eventContributionConfirm = new EventContributionConfirm()
eventContributionConfirm.userId = user.id
eventContributionConfirm.amount = contribution.amount
eventContributionConfirm.contributionId = contribution.id
await eventProtocol.writeEvent(event.setEventContributionConfirm(eventContributionConfirm))
} finally {
await queryRunner.release()
releaseLock()
}
const event = new Event()
const eventContributionConfirm = new EventContributionConfirm()
eventContributionConfirm.userId = user.id
eventContributionConfirm.amount = contribution.amount
eventContributionConfirm.contributionId = contribution.id
await eventProtocol.writeEvent(event.setEventContributionConfirm(eventContributionConfirm))
return true
}

2
backend/src/graphql/resolver/TransactionResolver.ts
View File

@ -211,7 +211,7 @@ export class TransactionResolver {
// find current balance
const lastTransaction = await dbTransaction.findOne(
{ userId: user.id },
{ order: { balanceDate: 'DESC' }, relations: ['contribution'] },
{ order: { id: 'DESC' }, relations: ['contribution'] },
)
logger.debug(`lastTransaction=${lastTransaction}`)

3
backend/src/graphql/resolver/UserResolver.test.ts
View File

@ -63,6 +63,7 @@ jest.mock('@/emails/sendEmailVariants', () => {
})
/*
jest.mock('@/apis/KlicktippController', () => {
return {
__esModule: true,
@ -132,6 +133,8 @@ describe('UserResolver', () => {
{
id: expect.any(Number),
gradidoID: expect.any(String),
hideAmountGDD: expect.any(Boolean),
hideAmountGDT: expect.any(Boolean),
alias: null,
emailContact: expect.any(UserContact), // 'peter@lustig.de',
emailId: expect.any(Number),

19
backend/src/graphql/resolver/UserResolver.ts
View File

@ -567,7 +567,15 @@ export class UserResolver {
@Mutation(() => Boolean)
async updateUserInfos(
@Args()
{ firstName, lastName, language, password, passwordNew }: UpdateUserInfosArgs,
{
firstName,
lastName,
language,
password,
passwordNew,
hideAmountGDD,
hideAmountGDT,
}: UpdateUserInfosArgs,
@Ctx() context: Context,
): Promise<boolean> {
logger.info(`updateUserInfos(${firstName}, ${lastName}, ${language}, ***, ***)...`)
@ -609,6 +617,15 @@ export class UserResolver {
userEntity.password = encryptPassword(userEntity, passwordNew)
}
// Save hideAmountGDD value
if (hideAmountGDD !== undefined) {
userEntity.hideAmountGDD = hideAmountGDD
}
// Save hideAmountGDT value
if (hideAmountGDT !== undefined) {
userEntity.hideAmountGDT = hideAmountGDT
}
const queryRunner = getConnection().createQueryRunner()
await queryRunner.connect()
await queryRunner.startTransaction('REPEATABLE READ')

49
backend/src/seeds/factory/creation.ts
View File

@ -1,8 +1,7 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
import { backendLogger as logger } from '@/server/logger'
import { login, adminCreateContribution, confirmContribution } from '@/seeds/graphql/mutations'
import { login, createContribution, confirmContribution } from '@/seeds/graphql/mutations'
import { CreationInterface } from '@/seeds/creation/CreationInterface'
import { ApolloServerTestClient } from 'apollo-server-testing'
import { Transaction } from '@entity/Transaction'
@ -19,43 +18,27 @@ export const creationFactory = async (
creation: CreationInterface,
): Promise<Contribution | void> => {
const { mutate } = client
logger.trace('creationFactory...')
await mutate({ mutation: login, variables: { email: 'peter@lustig.de', password: 'Aa12345_' } })
logger.trace('creationFactory... after login')
// TODO it would be nice to have this mutation return the id
await mutate({ mutation: adminCreateContribution, variables: { ...creation } })
logger.trace('creationFactory... after adminCreateContribution')
await mutate({ mutation: login, variables: { email: creation.email, password: 'Aa12345_' } })
const user = await findUserByEmail(creation.email) // userContact.user
const {
data: { createContribution: contribution },
} = await mutate({ mutation: createContribution, variables: { ...creation } })
const pendingCreation = await Contribution.findOneOrFail({
where: { userId: user.id, amount: creation.amount },
order: { createdAt: 'DESC' },
})
logger.trace(
'creationFactory... after Contribution.findOneOrFail pendingCreation=',
pendingCreation,
)
if (creation.confirmed) {
logger.trace('creationFactory... creation.confirmed=', creation.confirmed)
await mutate({ mutation: confirmContribution, variables: { id: pendingCreation.id } })
logger.trace('creationFactory... after confirmContribution')
const confirmedCreation = await Contribution.findOneOrFail({ id: pendingCreation.id })
logger.trace(
'creationFactory... after Contribution.findOneOrFail confirmedCreation=',
confirmedCreation,
)
const user = await findUserByEmail(creation.email) // userContact.user
await mutate({ mutation: login, variables: { email: 'peter@lustig.de', password: 'Aa12345_' } })
await mutate({ mutation: confirmContribution, variables: { id: contribution.id } })
const confirmedContribution = await Contribution.findOneOrFail({ id: contribution.id })
if (creation.moveCreationDate) {
logger.trace('creationFactory... creation.moveCreationDate=', creation.moveCreationDate)
const transaction = await Transaction.findOneOrFail({
where: { userId: user.id, creationDate: new Date(creation.creationDate) },
order: { balanceDate: 'DESC' },
})
logger.trace('creationFactory... after Transaction.findOneOrFail transaction=', transaction)
if (transaction.decay.equals(0) && transaction.creationDate) {
confirmedCreation.contributionDate = new Date(
confirmedContribution.contributionDate = new Date(
nMonthsBefore(transaction.creationDate, creation.moveCreationDate),
)
transaction.creationDate = new Date(
@ -64,17 +47,11 @@ export const creationFactory = async (
transaction.balanceDate = new Date(
nMonthsBefore(transaction.balanceDate, creation.moveCreationDate),
)
logger.trace('creationFactory... before transaction.save transaction=', transaction)
await transaction.save()
logger.trace(
'creationFactory... before confirmedCreation.save confirmedCreation=',
confirmedCreation,
)
await confirmedCreation.save()
await confirmedContribution.save()
}
}
} else {
logger.trace('creationFactory... pendingCreation=', pendingCreation)
return pendingCreation
return contribution
}
}

4
backend/src/seeds/graphql/mutations.ts
View File

@ -31,6 +31,8 @@ export const updateUserInfos = gql`
$password: String
$passwordNew: String
$locale: String
$hideAmountGDD: Boolean
$hideAmountGDT: Boolean
) {
updateUserInfos(
firstName: $firstName
@ -38,6 +40,8 @@ export const updateUserInfos = gql`
password: $password
passwordNew: $passwordNew
language: $locale
hideAmountGDD: $hideAmountGDD
hideAmountGDT: $hideAmountGDT
)
}
`

2
backend/src/util/communityUser.ts
View File

@ -18,6 +18,8 @@ const communityDbUser: dbUser = {
lastName: 'Akademie',
deletedAt: null,
password: BigInt(0),
hideAmountGDD: false,
hideAmountGDT: false,
// emailHash: Buffer.from(''),
createdAt: new Date(),
// emailChecked: false,

6
backend/yarn.lock
View File

@ -1913,9 +1913,9 @@ camelcase@^6.2.0:
integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
caniuse-lite@^1.0.30001264:
version "1.0.30001418"
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001418.tgz"
integrity sha512-oIs7+JL3K9JRQ3jPZjlH6qyYDp+nBTCais7hjh0s+fuBwufc7uZ7hPYMXrDOJhV360KGMTcczMRObk0/iMqZRg==
version "1.0.30001442"
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz"
integrity sha512-239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow==
chacha20-universal@^1.0.4:
version "1.0.4"

2
database/entity/0057-clear_old_password_junk/UserContact.ts
View File

@ -6,7 +6,7 @@ import {
DeleteDateColumn,
OneToOne,
} from 'typeorm'
import { User } from './User'
import { User } from '../User'
@Entity('user_contacts', { engine: 'InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci' })
export class UserContact extends BaseEntity {

118
database/entity/0059-add_hide_amount_to_users/User.ts Normal file
View File

@ -0,0 +1,118 @@
import {
BaseEntity,
Entity,
PrimaryGeneratedColumn,
Column,
DeleteDateColumn,
OneToMany,
JoinColumn,
OneToOne,
} from 'typeorm'
import { Contribution } from '../Contribution'
import { ContributionMessage } from '../ContributionMessage'
import { UserContact } from '../UserContact'
@Entity('users', { engine: 'InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci' })
export class User extends BaseEntity {
@PrimaryGeneratedColumn('increment', { unsigned: true })
id: number
@Column({
name: 'gradido_id',
length: 36,
nullable: false,
collation: 'utf8mb4_unicode_ci',
})
gradidoID: string
@Column({
name: 'alias',
length: 20,
nullable: true,
default: null,
collation: 'utf8mb4_unicode_ci',
})
alias: string
@OneToOne(() => UserContact, (emailContact: UserContact) => emailContact.user)
@JoinColumn({ name: 'email_id' })
emailContact: UserContact
@Column({ name: 'email_id', type: 'int', unsigned: true, nullable: true, default: null })
emailId: number | null
@Column({
name: 'first_name',
length: 255,
nullable: true,
default: null,
collation: 'utf8mb4_unicode_ci',
})
firstName: string
@Column({
name: 'last_name',
length: 255,
nullable: true,
default: null,
collation: 'utf8mb4_unicode_ci',
})
lastName: string
@Column({ name: 'created_at', default: () => 'CURRENT_TIMESTAMP', nullable: false })
createdAt: Date
@DeleteDateColumn({ name: 'deleted_at', nullable: true })
deletedAt: Date | null
@Column({ type: 'bigint', default: 0, unsigned: true })
password: BigInt
@Column({
name: 'password_encryption_type',
type: 'int',
unsigned: true,
nullable: false,
default: 0,
})
passwordEncryptionType: number
@Column({ length: 4, default: 'de', collation: 'utf8mb4_unicode_ci', nullable: false })
language: string
@Column({ type: 'bool', default: false })
hideAmountGDD: boolean
@Column({ type: 'bool', default: false })
hideAmountGDT: boolean
@Column({ name: 'is_admin', type: 'datetime', nullable: true, default: null })
isAdmin: Date | null
@Column({ name: 'referrer_id', type: 'int', unsigned: true, nullable: true, default: null })
referrerId?: number | null
@Column({
name: 'contribution_link_id',
type: 'int',
unsigned: true,
nullable: true,
default: null,
})
contributionLinkId?: number | null
@Column({ name: 'publisher_id', default: 0 })
publisherId: number
@OneToMany(() => Contribution, (contribution) => contribution.user)
@JoinColumn({ name: 'user_id' })
contributions?: Contribution[]
@OneToMany(() => ContributionMessage, (message) => message.user)
@JoinColumn({ name: 'user_id' })
messages?: ContributionMessage[]
@OneToMany(() => UserContact, (userContact: UserContact) => userContact.user)
@JoinColumn({ name: 'user_id' })
userContacts?: UserContact[]
}

2
database/entity/User.ts
View File

@ -1 +1 @@
export { User } from './0057-clear_old_password_junk/User'
export { User } from './0059-add_hide_amount_to_users/User'

12
database/migrations/0059-add_hide_amount_to_users.ts Normal file
View File

@ -0,0 +1,12 @@
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
/* eslint-disable @typescript-eslint/no-explicit-any */
export async function upgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
await queryFn('ALTER TABLE users ADD COLUMN hideAmountGDD bool DEFAULT false;')
await queryFn('ALTER TABLE users ADD COLUMN hideAmountGDT bool DEFAULT false;')
}
export async function downgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
await queryFn('ALTER TABLE users DROP COLUMN hideAmountGDD;')
await queryFn('ALTER TABLE users DROP COLUMN hideAmountGDT;')
}

11
docker-compose.override.yml
View File

@ -112,6 +112,17 @@ services:
volumes:
- /sessions
########################################################
# MAILSERVER TO FAKE SMTP ##############################
########################################################
mailserver:
image: maildev/maildev
ports:
- 1080:1080
- 1025:1025
networks:
- external-net
volumes:
frontend_node_modules:
admin_node_modules:

11
docker-compose.test.yml
View File

@ -81,6 +81,17 @@ services:
nginx:
image: gradido/nginx:test
########################################################
# MAILSERVER TO FAKE SMTP ##############################
########################################################
mailserver:
image: maildev/maildev
ports:
- 1080:1080
- 1025:1025
networks:
- external-net
networks:
external-net:
internal-net:

2
frontend/src/components/GddSend/TransactionConfirmationLink.vue
View File

@ -37,7 +37,7 @@
</b-row>
<b-row class="mt-5 p-5">
<b-col>
<b-button @click="$emit('on-reset')">{{ $t('back') }}</b-button>
<b-button @click="$emit('on-back')">{{ $t('back') }}</b-button>
</b-col>
<b-col class="text-right">
<b-button

2
frontend/src/components/GddSend/TransactionConfirmationSend.vue
View File

@ -41,7 +41,7 @@
</b-row>
<b-row class="mt-5 p-5">
<b-col>
<b-button @click="$emit('on-reset')">{{ $t('back') }}</b-button>
<b-button @click="$emit('on-back')">{{ $t('back') }}</b-button>
</b-col>
<b-col class="text-right">
<b-button

2
frontend/src/components/GddSend/TransactionForm.spec.js
View File

@ -322,7 +322,7 @@ Die ganze Welt bezwingen.“`)
[
{
email: 'someone@watches.tv',
amount: '87.23',
amount: 87.23,
memo: 'Long enough',
selected: 'send',
},

2
frontend/src/components/GddSend/TransactionForm.vue
View File

@ -144,7 +144,7 @@ export default {
this.$emit('set-transaction', {
selected: this.radioSelected,
email: this.form.email,
amount: this.form.amount,
amount: Number(this.form.amount.replace(',', '.')),
memo: this.form.memo,
})
},

2
frontend/src/components/GddSend/TransactionResultLink.vue
View File

@ -10,7 +10,7 @@
<div class="text-center">
<div><figure-qr-code :link="link" /></div>
<div>
<b-button variant="secondary" @click="$emit('on-reset')" class="mt-4" data-test="close-btn">
<b-button variant="secondary" @click="$emit('on-back')" class="mt-4" data-test="close-btn">
{{ $t('form.close') }}
</b-button>
</div>

2
frontend/src/components/GddSend/TransactionResultSendSuccess.vue
View File

@ -6,7 +6,7 @@
{{ $t('form.send_transaction_success') }}
</div>
<div class="text-center mt-5">
<b-button variant="primary" @click="$emit('on-reset')">{{ $t('form.close') }}</b-button>
<b-button variant="primary" @click="$emit('on-back')">{{ $t('form.close') }}</b-button>
</div>
</div>
</template>

10
frontend/src/components/Inputs/InputEmail.vue
View File

@ -40,11 +40,11 @@ export default {
}
},
},
name: { type: String, default: 'Email' },
label: { type: String, default: 'Email' },
placeholder: { type: String, default: 'Email' },
value: { required: true, type: String, default: '' },
disabled: { required: false, type: Boolean, default: false },
name: { type: String, required: true },
label: { type: String, required: true },
placeholder: { type: String, required: true },
value: { type: String, required: true },
disabled: { type: Boolean, required: false, default: false },
},
data() {
return {

12
frontend/src/components/Menu/Navbar.vue
View File

@ -12,14 +12,20 @@
<span class="navbar-toggler-icon"></span>
</b-button>
</b-navbar-brand>
<b-img class="sheet-img position-absolute zindex1" :src="sheet"></b-img>
<router-link to="/settings" class="d-block d-lg-none zindex1000">
<router-link to="/settings" class="d-block d-lg-none">
<div class="d-flex align-items-center">
<div class="mr-3">
<avatar :username="username.username" :color="'#fff'" :size="61"></avatar>
<avatar
:username="username.username"
:initials="username.initials"
:color="'#fff'"
:size="61"
></avatar>
</div>
</div>
</router-link>
<b-img class="sheet-img position-absolute zindex-1" :src="sheet"></b-img>
<b-collapse id="nav-collapse" is-nav class="ml-5">
<b-navbar-nav class="ml-auto" right>
<div class="mb-2">

97
frontend/src/components/Template/ContentHeader/GddAmount.spec.js
View File

@ -1,20 +1,31 @@
import { mount } from '@vue/test-utils'
import GddAmount from './GddAmount'
import { updateUserInfos } from '@/graphql/mutations'
import flushPromises from 'flush-promises'
import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
const localVue = global.localVue
const mockAPICall = jest.fn()
const storeCommitMock = jest.fn()
const state = {
language: 'en',
hideAmountGDD: false,
}
const mocks = {
$store: {
state,
commit: storeCommitMock,
},
$i18n: {
locale: 'en',
},
$t: jest.fn((t) => t),
$apollo: {
mutate: mockAPICall,
},
}
const propsData = {
@ -38,5 +49,89 @@ describe('GddAmount', () => {
it('renders the component gdd-amount', () => {
expect(wrapper.find('div.gdd-amount').exists()).toBe(true)
})
describe('API throws exception', () => {
beforeEach(async () => {
mockAPICall.mockRejectedValue({
message: 'Ouch',
})
jest.clearAllMocks()
await wrapper.find('div.border-left svg').trigger('click')
await flushPromises()
})
it('toasts an error message', () => {
expect(toastErrorSpy).toBeCalledWith('Ouch')
})
})
describe('API call successful', () => {
beforeEach(async () => {
mockAPICall.mockResolvedValue({
data: {
updateUserInfos: {
validValues: 1,
},
},
})
jest.clearAllMocks()
await wrapper.find('div.border-left svg').trigger('click')
await flushPromises()
})
it('calls the API', () => {
expect(mockAPICall).toBeCalledWith(
expect.objectContaining({
mutation: updateUserInfos,
variables: {
hideAmountGDD: true,
},
}),
)
})
it('commits hideAmountGDD to store', () => {
expect(storeCommitMock).toBeCalledWith('hideAmountGDD', true)
})
it('toasts a success message', () => {
expect(toastSuccessSpy).toBeCalledWith('settings.showAmountGDD')
})
})
})
describe('second call to API', () => {
beforeEach(async () => {
mockAPICall.mockResolvedValue({
data: {
updateUserInfos: {
validValues: 1,
},
},
})
jest.clearAllMocks()
wrapper.vm.$store.state.hideAmountGDD = true
await wrapper.find('div.border-left svg').trigger('click')
await flushPromises()
})
it('calls the API', () => {
expect(mockAPICall).toBeCalledWith(
expect.objectContaining({
mutation: updateUserInfos,
variables: {
hideAmountGDD: false,
},
}),
)
})
it('commits hideAmountGDD to store', () => {
expect(storeCommitMock).toBeCalledWith('hideAmountGDD', false)
})
it('toasts a success message', () => {
expect(toastSuccessSpy).toBeCalledWith('settings.hideAmountGDD')
})
})
})

26
frontend/src/components/Template/ContentHeader/GddAmount.vue
View File

@ -39,7 +39,7 @@
<b-icon
:icon="hideAmount ? 'eye-slash' : 'eye'"
class="mr-3 gradido-global-border-color-accent pointer hover-icon"
@click="$store.commit('hideAmountGDD', !hideAmount)"
@click="updateHideAmountGDD"
></b-icon>
</b-col>
</b-row>
@ -47,6 +47,8 @@
</div>
</template>
<script>
import { updateUserInfos } from '@/graphql/mutations'
export default {
name: 'GddAmount',
props: {
@ -60,5 +62,27 @@ export default {
return this.$store.state.hideAmountGDD
},
},
methods: {
async updateHideAmountGDD() {
this.$apollo
.mutate({
mutation: updateUserInfos,
variables: {
hideAmountGDD: !this.hideAmount,
},
})
.then(() => {
this.$store.commit('hideAmountGDD', !this.hideAmount)
if (!this.hideAmount) {
this.toastSuccess(this.$t('settings.showAmountGDD'))
} else {
this.toastSuccess(this.$t('settings.hideAmountGDD'))
}
})
.catch((error) => {
this.toastError(error.message)
})
},
},
}
</script>

97
frontend/src/components/Template/ContentHeader/GdtAmount.spec.js
View File

@ -1,19 +1,30 @@
import { mount } from '@vue/test-utils'
import GdtAmount from './GdtAmount'
import { updateUserInfos } from '@/graphql/mutations'
import flushPromises from 'flush-promises'
import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
const localVue = global.localVue
const mockAPICall = jest.fn()
const storeCommitMock = jest.fn()
const state = {
language: 'en',
hideAmountGDT: false,
}
const mocks = {
$store: {
state,
commit: storeCommitMock,
},
$i18n: {
locale: 'en',
},
$apollo: {
mutate: mockAPICall,
},
$t: jest.fn((t) => t),
$n: jest.fn((n) => n),
}
@ -39,5 +50,89 @@ describe('GdtAmount', () => {
it('renders the component gdt-amount', () => {
expect(wrapper.find('div.gdt-amount').exists()).toBe(true)
})
describe('API throws exception', () => {
beforeEach(async () => {
mockAPICall.mockRejectedValue({
message: 'Ouch',
})
jest.clearAllMocks()
await wrapper.find('div.border-left svg').trigger('click')
await flushPromises()
})
it('toasts an error message', () => {
expect(toastErrorSpy).toBeCalledWith('Ouch')
})
})
describe('API call successful', () => {
beforeEach(async () => {
mockAPICall.mockResolvedValue({
data: {
updateUserInfos: {
validValues: 1,
},
},
})
jest.clearAllMocks()
await wrapper.find('div.border-left svg').trigger('click')
await flushPromises()
})
it('calls the API', () => {
expect(mockAPICall).toBeCalledWith(
expect.objectContaining({
mutation: updateUserInfos,
variables: {
hideAmountGDT: true,
},
}),
)
})
it('commits hideAmountGDT to store', () => {
expect(storeCommitMock).toBeCalledWith('hideAmountGDT', true)
})
it('toasts a success message', () => {
expect(toastSuccessSpy).toBeCalledWith('settings.showAmountGDT')
})
})
})
describe('second call to API', () => {
beforeEach(async () => {
mockAPICall.mockResolvedValue({
data: {
updateUserInfos: {
validValues: 1,
},
},
})
jest.clearAllMocks()
wrapper.vm.$store.state.hideAmountGDT = true
await wrapper.find('div.border-left svg').trigger('click')
await flushPromises()
})
it('calls the API', () => {
expect(mockAPICall).toBeCalledWith(
expect.objectContaining({
mutation: updateUserInfos,
variables: {
hideAmountGDT: false,
},
}),
)
})
it('commits hideAmountGDT to store', () => {
expect(storeCommitMock).toBeCalledWith('hideAmountGDT', false)
})
it('toasts a success message', () => {
expect(toastSuccessSpy).toBeCalledWith('settings.hideAmountGDT')
})
})
})

26
frontend/src/components/Template/ContentHeader/GdtAmount.vue
View File

@ -34,7 +34,7 @@
<b-icon
:icon="hideAmount ? 'eye-slash' : 'eye'"
class="mr-3 gradido-global-border-color-accent pointer hover-icon"
@click="$store.commit('hideAmountGDT', !hideAmount)"
@click="updateHideAmountGDT"
></b-icon>
</b-col>
</b-row>
@ -42,6 +42,8 @@
</div>
</template>
<script>
import { updateUserInfos } from '@/graphql/mutations'
export default {
name: 'GdtAmount',
props: {
@ -54,5 +56,27 @@ export default {
return this.$store.state.hideAmountGDT
},
},
methods: {
async updateHideAmountGDT() {
this.$apollo
.mutate({
mutation: updateUserInfos,
variables: {
hideAmountGDT: !this.hideAmount,
},
})
.then(() => {
this.$store.commit('hideAmountGDT', !this.hideAmount)
if (!this.hideAmount) {
this.toastSuccess(this.$t('settings.showAmountGDT'))
} else {
this.toastSuccess(this.$t('settings.hideAmountGDT'))
}
})
.catch((error) => {
this.toastError(error.message)
})
},
},
}
</script>

1
frontend/src/components/Template/RightSide/LastTransactions.vue
View File

@ -24,6 +24,7 @@
:size="72"
:color="'#fff'"
:username="`${transaction.linkedUser.firstName} ${transaction.linkedUser.lastName}`"
:initials="`${transaction.linkedUser.firstName[0]} ${transaction.linkedUser.lastName[0]}`"
></avatar>
</div>
</b-col>

6
frontend/src/graphql/mutations.js
View File

@ -31,6 +31,8 @@ export const updateUserInfos = gql`
$password: String
$passwordNew: String
$locale: String
$hideAmountGDD: Boolean
$hideAmountGDT: Boolean
) {
updateUserInfos(
firstName: $firstName
@ -38,6 +40,8 @@ export const updateUserInfos = gql`
password: $password
passwordNew: $passwordNew
language: $locale
hideAmountGDD: $hideAmountGDD
hideAmountGDT: $hideAmountGDT
)
}
`
@ -151,6 +155,8 @@ export const login = gql`
publisherId
isAdmin
creation
hideAmountGDD
hideAmountGDT
}
}
`

2
frontend/src/graphql/queries.js
View File

@ -14,6 +14,8 @@ export const verifyLogin = gql`
publisherId
isAdmin
creation
hideAmountGDD
hideAmountGDT
}
}
`

6
frontend/src/locales/de.json
View File

@ -269,6 +269,8 @@
"warningText": "Bist du noch da?"
},
"settings": {
"hideAmountGDD": "Dein GDD Betrag ist versteckt.",
"hideAmountGDT": "Dein GDT Betrag ist versteckt.",
"language": {
"changeLanguage": "Sprache ändern",
"de": "Deutsch",
@ -301,7 +303,9 @@
"text": "Speichere nun dein neues Passwort, mit dem du dich zukünftig in deinem Gradido-Konto anmelden kannst."
},
"subtitle": "Wenn du dein Passwort vergessen hast, kannst du es hier zurücksetzen."
}
},
"showAmountGDD": "Dein GDD Betrag ist sichtbar.",
"showAmountGDT": "Dein GDT Betrag ist sichtbar."
},
"signin": "Anmelden",
"signup": "Registrieren",

6
frontend/src/locales/en.json
View File

@ -269,6 +269,8 @@
"warningText": "Are you still there?"
},
"settings": {
"hideAmountGDD": "Your GDD amount is hidden.",
"hideAmountGDT": "Your GDT amount is hidden.",
"language": {
"changeLanguage": "Change language",
"de": "Deutsch",
@ -301,7 +303,9 @@
"text": "Now save your new password, which you can use to log in to your Gradido account in the future."
},
"subtitle": "If you have forgotten your password, you can reset it here."
}
},
"showAmountGDD": "Your GDD amount is visible.",
"showAmountGDT": "Your GDT amount is visible."
},
"signin": "Sign in",
"signup": "Sign up",

4
frontend/src/pages/ForgotPassword.spec.js
View File

@ -58,11 +58,11 @@ describe('ForgotPassword', () => {
})
it('has the label "Email"', () => {
expect(form.find('label').text()).toEqual('Email')
expect(form.find('label').text()).toEqual('form.email')
})
it('has the placeholder "Email"', () => {
expect(form.find('input').attributes('placeholder')).toEqual('Email')
expect(form.find('input').attributes('placeholder')).toEqual('form.email')
})
it('has a submit button', () => {

7
frontend/src/pages/ForgotPassword.vue
View File

@ -6,7 +6,12 @@
<b-col>
<validation-observer ref="observer" v-slot="{ handleSubmit }">
<b-form role="form" @submit.prevent="handleSubmit(onSubmit)">
<input-email v-model="form.email"></input-email>
<input-email
v-model="form.email"
:name="$t('form.email')"
:label="$t('form.email')"
:placeholder="$t('form.email')"
></input-email>
<div class="text-center">
<b-button type="submit" variant="gradido">
{{ $t('settings.password.send_now') }}

17
frontend/src/pages/Login.spec.js
View File

@ -76,7 +76,7 @@ describe('Login', () => {
})
it('has an Email input field', () => {
expect(wrapper.find('input[placeholder="Email"]').exists()).toBe(true)
expect(wrapper.find('div[data-test="input-email"]').find('input').exists()).toBe(true)
})
it('has an Password input field', () => {
@ -110,7 +110,10 @@ describe('Login', () => {
describe('valid data', () => {
beforeEach(async () => {
jest.clearAllMocks()
await wrapper.find('input[placeholder="Email"]').setValue('user@example.org')
await wrapper
.find('div[data-test="input-email"]')
.find('input')
.setValue('user@example.org')
await wrapper.find('input[placeholder="form.password"]').setValue('1234')
await flushPromises()
apolloMutateMock.mockResolvedValue({
@ -159,7 +162,10 @@ describe('Login', () => {
code: 'some-code',
}
wrapper = Wrapper()
await wrapper.find('input[placeholder="Email"]').setValue('user@example.org')
await wrapper
.find('div[data-test="input-email"]')
.find('input')
.setValue('user@example.org')
await wrapper.find('input[placeholder="form.password"]').setValue('1234')
await flushPromises()
await wrapper.find('form').trigger('submit')
@ -180,7 +186,10 @@ describe('Login', () => {
})
wrapper = Wrapper()
jest.clearAllMocks()
await wrapper.find('input[placeholder="Email"]').setValue('user@example.org')
await wrapper
.find('div[data-test="input-email"]')
.find('input')
.setValue('user@example.org')
await wrapper.find('input[placeholder="form.password"]').setValue('1234')
await flushPromises()
await wrapper.find('form').trigger('submit')

9
frontend/src/pages/Login.vue
View File

@ -5,7 +5,14 @@
<validation-observer ref="observer" v-slot="{ handleSubmit }">
<b-form @submit.stop.prevent="handleSubmit(onSubmit)">
<b-row>
<b-col sm="12" md="12" lg="6"><input-email v-model="form.email"></input-email></b-col>
<b-col sm="12" md="12" lg="6">
<input-email
v-model="form.email"
:name="$t('form.email')"
:label="$t('form.email')"
:placeholder="$t('form.email')"
></input-email>
</b-col>
<b-col sm="12" md="12" lg="6">
<input-password
:label="$t('form.password')"

17
frontend/src/pages/Register.spec.js
View File

@ -65,7 +65,7 @@ describe('Register', () => {
})
it('has email input fields', () => {
expect(wrapper.find('#Email-input-field').exists()).toBe(true)
expect(wrapper.find('div[data-test="input-email"]').find('input').exists()).toBe(true)
})
it('has 1 checkbox input fields', () => {
@ -107,7 +107,10 @@ describe('Register', () => {
wrapper.find('#registerLastname').setValue('Mustermann')
})
it('has disabled submit button when missing input checked box', () => {
wrapper.find('#Email-input-field').setValue('max.mustermann@gradido.net')
wrapper
.find('div[data-test="input-email"]')
.find('input')
.setValue('max.mustermann@gradido.net')
expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe('disabled')
})
@ -121,7 +124,10 @@ describe('Register', () => {
beforeEach(() => {
wrapper.find('#registerFirstname').setValue('Max')
wrapper.find('#registerLastname').setValue('Mustermann')
wrapper.find('#Email-input-field').setValue('max.mustermann@gradido.net')
wrapper
.find('div[data-test="input-email"]')
.find('input')
.setValue('max.mustermann@gradido.net')
wrapper.find('#registerCheckbox').setChecked()
})
@ -211,7 +217,10 @@ describe('Register', () => {
wrapper = Wrapper()
wrapper.find('#registerFirstname').setValue('Max')
wrapper.find('#registerLastname').setValue('Mustermann')
wrapper.find('#Email-input-field').setValue('max.mustermann@gradido.net')
wrapper
.find('div[data-test="input-email"]')
.find('input')
.setValue('max.mustermann@gradido.net')
wrapper.find('#registerCheckbox').setChecked()
await wrapper.find('form').trigger('submit')
await flushPromises()

9
frontend/src/pages/Register.vue
View File

@ -59,7 +59,14 @@
</b-col>
</b-row>
<b-row>
<b-col><input-email v-model="form.email"></input-email></b-col>
<b-col>
<input-email
v-model="form.email"
:name="$t('form.email')"
:label="$t('form.email')"
:placeholder="$t('form.email')"
></input-email>
</b-col>
</b-row>
<div class="my-4">
<b-form-checkbox

13
frontend/src/pages/Send.vue
View File

@ -15,7 +15,7 @@
:amount="transactionData.amount"
:memo="transactionData.memo"
@send-transaction="sendTransaction"
@on-reset="onReset"
@on-back="onBack"
></transaction-confirmation-send>
</template>
<template #transactionConfirmationLink>
@ -26,17 +26,17 @@
:memo="transactionData.memo"
:loading="loading"
@send-transaction="sendTransaction"
@on-reset="onReset"
@on-back="onBack"
></transaction-confirmation-link>
</template>
<template #transactionResultSendSuccess>
<transaction-result-send-success @on-reset="onReset"></transaction-result-send-success>
<transaction-result-send-success @on-back="onBack"></transaction-result-send-success>
</template>
<template #transactionResultSendError>
<transaction-result-send-error
:error="error"
:errorResult="errorResult"
@on-reset="onReset"
@on-back="onBack"
></transaction-result-send-error>
</template>
<template #transactionResultLink>
@ -45,7 +45,7 @@
:amount="amount"
:memo="memo"
:validUntil="validUntil"
@on-reset="onReset"
@on-back="onBack"
></transaction-result-link>
</template>
</gdd-send>
@ -169,8 +169,9 @@ export default {
}
this.loading = false
},
onReset() {
onBack() {
this.currentTransactionStep = TRANSACTION_STEPS.transactionForm
this.$mount()
},
updateTransactions(pagination) {
this.$emit('update-transactions', pagination)

2
frontend/src/pages/Transactions.vue
View File

@ -85,7 +85,7 @@ export default {
}
},
watch: {
gdt() {
currentPage() {
if (this.gdt) {
this.updateGdt()
}

6
frontend/yarn.lock
View File

@ -4578,9 +4578,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001181, caniuse-lite@^1.0.30001280, caniuse-lite@^1.0.30001286:
version "1.0.30001439"
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001439.tgz"
integrity sha512-1MgUzEkoMO6gKfXflStpYgZDlFM7M/ck/bgfVCACO5vnAf0fXoNVHdWtqGU+MYca+4bL9Z5bpOVmR33cWW9G2A==
version "1.0.30001442"
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz"
integrity sha512-239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow==
capture-exit@^2.0.0:
version "2.0.0"