From 4c098b0124d97c3574887bf28480ec79011b861d Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 12 Jan 2022 10:39:22 +0100 Subject: [PATCH 1/2] Withdrew space at the end of an locale definition. --- admin/src/locales/de.json | 2 +- admin/src/locales/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index 471f9626d..58f7b6714 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -2,7 +2,7 @@ "bookmark": "bookmark", "confirmed": "bestätigt", "creation_form": { - "creation_for": "Schöpfung für ", + "creation_for": "Schöpfung für", "enter_text": "Text eintragen", "form": "Schöpfungsformular", "min_characters": "Mindestens 10 Zeichen eingeben", diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index 6bbc6bd57..a02782267 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -2,7 +2,7 @@ "bookmark": "Remember", "confirmed": "confirmed", "creation_form": { - "creation_for": "Creation for ", + "creation_for": "Creation for", "enter_text": "Enter text", "form": "Creation form", "min_characters": "Enter at least 10 characters", From 06fdbf863ee59128f7642ceab4f669eb85402e58 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 12 Jan 2022 11:36:36 +0100 Subject: [PATCH 2/2] Fix removing from masscreationlist now gives right item to the left list. --- admin/src/pages/Creation.spec.js | 22 +++++++++++----------- admin/src/pages/Creation.vue | 8 ++++---- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/admin/src/pages/Creation.spec.js b/admin/src/pages/Creation.spec.js index cad0b9ba3..fc8cdbaf0 100644 --- a/admin/src/pages/Creation.spec.js +++ b/admin/src/pages/Creation.spec.js @@ -8,14 +8,14 @@ const apolloQueryMock = jest.fn().mockResolvedValue({ data: { searchUsers: [ { - id: 1, + userId: 1, firstName: 'Bibi', lastName: 'Bloxberg', email: 'bibi@bloxberg.de', creation: [200, 400, 600], }, { - id: 2, + userId: 2, firstName: 'Benjamin', lastName: 'Blümchen', email: 'benjamin@bluemchen.de', @@ -71,7 +71,7 @@ describe('Creation', () => { it('sets the data of itemsList', () => { expect(wrapper.vm.itemsList).toEqual([ { - id: 1, + userId: 1, firstName: 'Bibi', lastName: 'Bloxberg', email: 'bibi@bloxberg.de', @@ -79,7 +79,7 @@ describe('Creation', () => { showDetails: false, }, { - id: 2, + userId: 2, firstName: 'Benjamin', lastName: 'Blümchen', email: 'benjamin@bluemchen.de', @@ -100,7 +100,7 @@ describe('Creation', () => { wrapper.findComponent({ name: 'UserTable' }).vm.$emit( 'update-item', { - id: 2, + userId: 2, firstName: 'Benjamin', lastName: 'Blümchen', email: 'benjamin@bluemchen.de', @@ -114,7 +114,7 @@ describe('Creation', () => { it('removes the pushed item from itemsList', () => { expect(wrapper.vm.itemsList).toEqual([ { - id: 1, + userId: 1, firstName: 'Bibi', lastName: 'Bloxberg', email: 'bibi@bloxberg.de', @@ -127,7 +127,7 @@ describe('Creation', () => { it('adds the pushed item to itemsMassCreation', () => { expect(wrapper.vm.itemsMassCreation).toEqual([ { - id: 2, + userId: 2, firstName: 'Benjamin', lastName: 'Blümchen', email: 'benjamin@bluemchen.de', @@ -142,7 +142,7 @@ describe('Creation', () => { wrapper.findComponent({ name: 'UserTable' }).vm.$emit( 'update-item', { - id: 2, + userId: 2, firstName: 'Benjamin', lastName: 'Blümchen', email: 'benjamin@bluemchen.de', @@ -160,7 +160,7 @@ describe('Creation', () => { it('adds the item to itemsList', () => { expect(wrapper.vm.itemsList).toEqual([ { - id: 1, + userId: 1, firstName: 'Bibi', lastName: 'Bloxberg', email: 'bibi@bloxberg.de', @@ -168,7 +168,7 @@ describe('Creation', () => { showDetails: false, }, { - id: 2, + userId: 2, firstName: 'Benjamin', lastName: 'Blümchen', email: 'benjamin@bluemchen.de', @@ -206,7 +206,7 @@ describe('Creation', () => { await wrapper.findComponent({ name: 'UserTable' }).vm.$emit( 'update-item', { - id: 2, + userId: 2, firstName: 'Benjamin', lastName: 'Blümchen', email: 'benjamin@bluemchen.de', diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue index 4fabc064a..65e0b2f2f 100644 --- a/admin/src/pages/Creation.vue +++ b/admin/src/pages/Creation.vue @@ -133,16 +133,16 @@ export default { switch (event) { case 'push': - findArr = this.itemsList.find((arr) => arr.id === e.id) + findArr = this.itemsList.find((item) => e.userId === item.userId) index = this.itemsList.indexOf(findArr) this.itemsList.splice(index, 1) - this.itemsMassCreation.push(e) + this.itemsMassCreation.push(findArr) break case 'remove': - findArr = this.itemsMassCreation.find((arr) => arr.id === e.id) + findArr = this.itemsMassCreation.find((item) => e.userId === item.userId) index = this.itemsMassCreation.indexOf(findArr) this.itemsMassCreation.splice(index, 1) - this.itemsList.push(e) + this.itemsList.push(findArr) break default: throw new Error(event)