IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-02-06 09:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor state to status for contribution in frontend.

Browse Source
This commit is contained in:
elweyn 2023-06-27 10:04:40 +02:00
parent 48498ee729
commit af60cc2638
12 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
View File

@ -73,8 +73,8 @@ describe('ContributionMessagesFormular', () => {
)
})
it('emitted "update-state" with data', async () => {
expect(wrapper.emitted('update-state')).toEqual(
it('emitted "update-status" with data', async () => {
expect(wrapper.emitted('update-status')).toEqual(
expect.arrayContaining([expect.arrayContaining([42])]),
)
})

2
frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
View File

@ -55,7 +55,7 @@ export default {
})
.then((result) => {
this.$emit('get-list-contribution-messages', false)
this.$emit('update-state', this.contributionId)
this.$emit('update-status', this.contributionId)
this.form.text = ''
this.toastSuccess(this.$t('message.reply'))
this.isSubmitting = false

8
frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js
View File

@ -8,7 +8,7 @@ describe('ContributionMessagesList', () => {
const propsData = {
contributionId: 42,
state: 'IN_PROGRESS',
status: 'IN_PROGRESS',
messages: [],
}
@ -40,13 +40,13 @@ describe('ContributionMessagesList', () => {
expect(wrapper.findComponent({ name: 'ContributionMessagesFormular' }).exists()).toBe(true)
})
describe('update State', () => {
describe('update Status', () => {
beforeEach(() => {
wrapper.vm.updateState()
wrapper.vm.updateStatus()
})
it('emits getListContributionMessages', async () => {
expect(wrapper.vm.$emit('update-state')).toBeTruthy()
expect(wrapper.vm.$emit('update-status')).toBeTruthy()
})
})
})

10
frontend/src/components/ContributionMessages/ContributionMessagesList.vue
View File

@ -7,10 +7,10 @@
</div>
<div>
<contribution-messages-formular
v-if="['PENDING', 'IN_PROGRESS'].includes(state)"
v-if="['PENDING', 'IN_PROGRESS'].includes(status)"
:contributionId="contributionId"
v-on="$listeners"
@update-state="updateState"
@update-status="updateStatus"
/>
</div>
@ -37,7 +37,7 @@ export default {
type: Number,
required: true,
},
state: {
status: {
type: String,
required: true,
},
@ -47,8 +47,8 @@ export default {
},
},
methods: {
updateState(id) {
this.$emit('update-state', id)
updateStatus(id) {
this.$emit('update-status', id)
},
},
}

2
frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
View File

@ -21,7 +21,7 @@ const mocks = {
describe('ContributionMessagesList', () => {
const propsData = {
contributionId: 42,
state: 'PENDING',
status: 'PENDING',
messages: [
{
id: 111,

4
frontend/src/components/Contributions/ContributionList.spec.js
View File

@ -119,11 +119,11 @@ describe('ContributionList', () => {
describe('update status', () => {
beforeEach(() => {
wrapper.findComponent({ name: 'ContributionListItem' }).vm.$emit('update-state', { id: 2 })
wrapper.findComponent({ name: 'ContributionListItem' }).vm.$emit('update-status', { id: 2 })
})
it('emits update status', () => {
expect(wrapper.emitted('update-state')).toEqual([[{ id: 2 }]])
expect(wrapper.emitted('update-status')).toEqual([[{ id: 2 }]])
})
})
})

12
frontend/src/components/Contributions/ContributionList.vue
View File

@ -2,26 +2,26 @@
<div class="contribution-list">
<div class="mb-3" v-for="item in items" :key="item.id + 'a'">
<contribution-list-item
v-if="item.state === 'IN_PROGRESS'"
v-if="item.status === 'IN_PROGRESS'"
v-bind="item"
@closeAllOpenCollapse="$emit('closeAllOpenCollapse')"
:contributionId="item.id"
:allContribution="allContribution"
@update-contribution-form="updateContributionForm"
@delete-contribution="deleteContribution"
@update-state="updateState"
@update-status="updateStatus"
/>
</div>
<div class="mb-3" v-for="item2 in items" :key="item2.id">
<contribution-list-item
v-if="item2.state !== 'IN_PROGRESS'"
v-if="item2.status !== 'IN_PROGRESS'"
v-bind="item2"
@closeAllOpenCollapse="$emit('closeAllOpenCollapse')"
:contributionId="item2.id"
:allContribution="allContribution"
@update-contribution-form="updateContributionForm"
@delete-contribution="deleteContribution"
@update-state="updateState"
@update-status="updateStatus"
/>
</div>
<b-pagination
@ -85,8 +85,8 @@ export default {
deleteContribution(item) {
this.$emit('delete-contribution', item)
},
updateState(id) {
this.$emit('update-state', id)
updateStatus(id) {
this.$emit('update-status', id)
},
},
computed: {

14
frontend/src/components/Contributions/ContributionListItem.spec.js
View File

@ -14,7 +14,7 @@ describe('ContributionListItem', () => {
const propsData = {
contributionId: 42,
state: 'PENDING',
status: 'PENDING',
messagesCount: 2,
id: 1,
createdAt: '26/07/2022',
@ -72,8 +72,8 @@ describe('ContributionListItem', () => {
expect(wrapper.vm.variant).toBe('success')
})
it('is warning at when state is IN_PROGRESS', async () => {
await wrapper.setProps({ state: 'IN_PROGRESS' })
it('is warning at when status is IN_PROGRESS', async () => {
await wrapper.setProps({ status: 'IN_PROGRESS' })
expect(wrapper.vm.variant).toBe('205')
})
})
@ -134,13 +134,13 @@ describe('ContributionListItem', () => {
})
})
describe('updateState', () => {
describe('updateStatus', () => {
beforeEach(async () => {
await wrapper.vm.updateState()
await wrapper.vm.updateStatus()
})
it('emit update-state', () => {
expect(wrapper.vm.$emit('update-state')).toBeTruthy()
it('emit update-status', () => {
expect(wrapper.vm.$emit('update-status')).toBeTruthy()
})
})
})

28
frontend/src/components/Contributions/ContributionListItem.vue
View File

@ -2,7 +2,7 @@
<div>
<div
class="contribution-list-item bg-white appBoxShadow gradido-border-radius pt-3 px-3"
:class="state === 'IN_PROGRESS' && !allContribution ? 'pulse border border-205' : ''"
:class="status === 'IN_PROGRESS' && !allContribution ? 'pulse border border-205' : ''"
>
<b-row>
<b-col cols="3" lg="2" md="2">
@ -26,7 +26,7 @@
<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'"
v-if="status === 'IN_PROGRESS'"
class="text-205 pointer hover-font-bold"
@click="visible = !visible"
>
@ -37,11 +37,11 @@
<div class="small">
{{ $t('creation') }} {{ $t('(') }}{{ amount / 20 }} {{ $t('h') }}{{ $t(')') }}
</div>
<div v-if="state === 'DENIED' && allContribution" class="font-weight-bold">
<div v-if="status === 'DENIED' && allContribution" class="font-weight-bold">
<b-icon icon="x-circle" variant="danger"></b-icon>
{{ $t('contribution.alert.denied') }}
</div>
<div v-if="state === 'DELETED'" class="small">
<div v-if="status === 'DELETED'" class="small">
{{ $t('contribution.deleted') }}
</div>
<div v-else class="font-weight-bold">{{ amount | GDD }}</div>
@ -53,12 +53,12 @@
</b-col>
</b-row>
<b-row
v-if="(!['CONFIRMED', 'DELETED'].includes(state) && !allContribution) || messagesCount > 0"
v-if="(!['CONFIRMED', 'DELETED'].includes(status) && !allContribution) || messagesCount > 0"
class="p-2"
>
<b-col cols="3" class="mr-auto text-center">
<div
v-if="!['CONFIRMED', 'DELETED'].includes(state) && !allContribution && !moderatorId"
v-if="!['CONFIRMED', 'DELETED'].includes(status) && !allContribution && !moderatorId"
class="test-delete-contribution pointer mr-3"
@click="deleteContribution({ id })"
>
@ -69,7 +69,7 @@
</b-col>
<b-col cols="3" class="text-center">
<div
v-if="!['CONFIRMED', 'DELETED'].includes(state) && !allContribution && !moderatorId"
v-if="!['CONFIRMED', 'DELETED'].includes(status) && !allContribution && !moderatorId"
class="test-edit-contribution pointer mr-3"
@click="
$emit('update-contribution-form', {
@ -95,10 +95,10 @@
<b-collapse :id="collapsId" class="mt-2" v-model="visible">
<contribution-messages-list
:messages="messages_get"
:state="state"
:status="status"
:contributionId="contributionId"
@get-list-contribution-messages="getListContributionMessages"
@update-state="updateState"
@update-status="updateStatus"
/>
</b-collapse>
</div>
@ -161,7 +161,7 @@ export default {
type: String,
required: false,
},
state: {
status: {
type: String,
required: false,
default: '',
@ -197,14 +197,14 @@ export default {
if (this.deletedAt) return 'trash'
if (this.deniedAt) return 'x-circle'
if (this.confirmedAt) return 'check'
if (this.state === 'IN_PROGRESS') return 'question'
if (this.status === 'IN_PROGRESS') return 'question'
return 'bell-fill'
},
variant() {
if (this.deletedAt) return 'danger'
if (this.deniedAt) return 'warning'
if (this.confirmedAt) return 'success'
if (this.state === 'IN_PROGRESS') return '205'
if (this.status === 'IN_PROGRESS') return '205'
return 'primary'
},
date() {
@ -245,8 +245,8 @@ export default {
this.toastError(error.message)
})
},
updateState(id) {
this.$emit('update-state', id)
updateStatus(id) {
this.$emit('update-status', id)
},
},
watch: {

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

@ -190,7 +190,7 @@ export const listContributions = gql`
confirmedAt
confirmedBy
deletedAt
state
status
messagesCount
deniedAt
deniedBy
@ -214,7 +214,7 @@ export const listAllContributions = gql`
contributionDate
confirmedAt
confirmedBy
state
status
messagesCount
deniedAt
deniedBy

12
frontend/src/pages/Community.spec.js
View File

@ -68,7 +68,7 @@ describe('Community', () => {
firstName: 'Bibi',
contributionDate: '2022-07-15T08:47:06.000Z',
lastName: 'Bloxberg',
state: 'IN_PROGRESS',
status: 'IN_PROGRESS',
messagesCount: 0,
deniedAt: null,
deniedBy: null,
@ -85,7 +85,7 @@ describe('Community', () => {
firstName: 'Bibi',
contributionDate: '2022-06-15T08:47:06.000Z',
lastName: 'Bloxberg',
state: 'CONFIRMED',
status: 'CONFIRMED',
messagesCount: 0,
deniedAt: null,
deniedBy: null,
@ -121,7 +121,7 @@ describe('Community', () => {
deniedAt: null,
deniedBy: null,
messagesCount: 0,
state: 'IN_PROGRESS',
status: 'IN_PROGRESS',
},
{
id: 1550,
@ -137,7 +137,7 @@ describe('Community', () => {
deniedAt: null,
deniedBy: null,
messagesCount: 0,
state: 'IN_PROGRESS',
status: 'IN_PROGRESS',
},
{
id: 1556,
@ -153,7 +153,7 @@ describe('Community', () => {
deniedAt: null,
deniedBy: null,
messagesCount: 0,
state: 'IN_PROGRESS',
status: 'IN_PROGRESS',
},
],
contributionCount: 3,
@ -263,7 +263,7 @@ describe('Community', () => {
expect(wrapper.findAll('div[role="tabpanel"]')).toHaveLength(3)
})
it('check for correct tabIndex if state is "IN_PROGRESS" or not', () => {
it('check for correct tabIndex if status is "IN_PROGRESS" or not', () => {
expect(routerPushMock).toBeCalledWith({ params: { tab: 'contributions' } })
})

8
frontend/src/pages/Community.vue
View File

@ -30,7 +30,7 @@
@update-list-contributions="updateListContributions"
@update-contribution-form="updateContributionForm"
@delete-contribution="deleteContribution"
@update-state="updateState"
@update-status="updateStatus"
:contributionCount="contributionCount"
:showPagination="true"
:pageSize="pageSize"
@ -148,7 +148,7 @@ export default {
update({ listContributions }) {
this.contributionCount = listContributions.contributionCount
this.items = listContributions.contributionList
if (this.items.find((item) => item.state === 'IN_PROGRESS')) {
if (this.items.find((item) => item.status === 'IN_PROGRESS')) {
this.tabIndex = 1
if (this.$route.params.tab !== 'contributions')
this.$router.push({ params: { tab: 'contributions' } })
@ -290,8 +290,8 @@ export default {
updateTransactions(pagination) {
this.$emit('update-transactions', pagination)
},
updateState(id) {
this.items.find((item) => item.id === id).state = 'PENDING'
updateStatus(id) {
this.items.find((item) => item.id === id).status = 'PENDING'
},
},
}