Merge branch 'master' into 2220-feature-reconfigure-log4js

admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js

@@ -9,32 +9,27 @@ describe('ContributionMessagesListItem', () => {
   const mocks = {
     $t: jest.fn((t) => t),
     $d: jest.fn((d) => d),
-    $store: {
-      state: {
-        moderator: {
-          id: 107,
-        },
-      },
-    },
   }
 
+  describe('if message author has moderator role', () => {
     const propsData = {
       contributionId: 42,
       state: 'PENDING',
       message: {
         id: 111,
-      message: 'asd asda sda sda',
+        message: 'Lorem ipsum?',
         createdAt: '2022-08-29T12:23:27.000Z',
         updatedAt: null,
         type: 'DIALOG',
         userFirstName: 'Peter',
         userLastName: 'Lustig',
         userId: 107,
+        isModerator: true,
         __typename: 'ContributionMessage',
       },
     }
 
-  const Wrapper = () => {
+    const ModeratorItemWrapper = () => {
       return mount(ContributionMessagesListItem, {
         localVue,
         mocks,
@@ -43,16 +38,91 @@ describe('ContributionMessagesListItem', () => {
     }
 
     describe('mount', () => {
-    beforeEach(() => {
+      beforeAll(() => {
-      wrapper = Wrapper()
+        wrapper = ModeratorItemWrapper()
       })
 
-    it('has a DIV .contribution-messages-list-item', () => {
+      it('has a DIV .text-right.is-moderator', () => {
-      expect(wrapper.find('div.contribution-messages-list-item').exists()).toBe(true)
+        expect(wrapper.find('div.text-right.is-moderator').exists()).toBe(true)
       })
 
-    it('props.message.default', () => {
+      it('has the complete user name', () => {
-      expect(wrapper.vm.$options.props.message.default.call()).toEqual({})
+        expect(wrapper.find('div.text-right.is-moderator > span:nth-child(2)').text()).toBe(
+          'Peter Lustig',
+        )
+      })
+
+      it('has the message creation date', () => {
+        expect(wrapper.find('div.text-right.is-moderator > span:nth-child(3)').text()).toMatch(
+          'Mon Aug 29 2022 12:23:27 GMT+0000',
+        )
+      })
+
+      it('has the moderator label', () => {
+        expect(wrapper.find('div.text-right.is-moderator > small:nth-child(4)').text()).toBe(
+          'moderator',
+        )
+      })
+
+      it('has the message', () => {
+        expect(wrapper.find('div.text-right.is-moderator > div:nth-child(5)').text()).toBe(
+          'Lorem ipsum?',
+        )
+      })
+    })
+  })
+
+  describe('if message author does not have moderator role', () => {
+    const propsData = {
+      contributionId: 42,
+      state: 'PENDING',
+      message: {
+        id: 113,
+        message: 'Asda sdad ad asdasd, das Ass das Das. ',
+        createdAt: '2022-08-29T12:25:34.000Z',
+        updatedAt: null,
+        type: 'DIALOG',
+        userFirstName: 'Bibi',
+        userLastName: 'Bloxberg',
+        userId: 108,
+        __typename: 'ContributionMessage',
+      },
+    }
+
+    const ItemWrapper = () => {
+      return mount(ContributionMessagesListItem, {
+        localVue,
+        mocks,
+        propsData,
+      })
+    }
+
+    describe('mount', () => {
+      beforeAll(() => {
+        wrapper = ItemWrapper()
+      })
+
+      it('has a DIV .text-left.is-not-moderator', () => {
+        expect(wrapper.find('div.text-left.is-not-moderator').exists()).toBe(true)
+      })
+
+      it('has the complete user name', () => {
+        expect(wrapper.find('div.is-not-moderator.text-left > span:nth-child(2)').text()).toBe(
+          'Bibi Bloxberg',
+        )
+      })
+
+      it('has the message creation date', () => {
+        expect(wrapper.find('div.is-not-moderator.text-left > span:nth-child(3)').text()).toMatch(
+          'Mon Aug 29 2022 12:25:34 GMT+0000',
+        )
+      })
+
+      it('has the message', () => {
+        expect(wrapper.find('div.is-not-moderator.text-left > div:nth-child(4)').text()).toBe(
+          'Asda sdad ad asdasd, das Ass das Das.',
+        )
+      })
     })
   })
 })

admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue

@@ -1,27 +1,44 @@
 <template>
   <div class="contribution-messages-list-item">
-    <is-moderator v-if="message.isModerator" :message="message"></is-moderator>
+    <div v-if="message.isModerator" class="text-right is-moderator">
-    <is-not-moderator v-else :message="message"></is-not-moderator>
+      <b-avatar square :text="initialLetters" variant="warning"></b-avatar>
+      <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
+      <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
+      <small class="ml-4 text-success">{{ $t('moderator') }}</small>
+      <div class="mt-2">{{ message.message }}</div>
+    </div>
+    <div v-else class="text-left is-not-moderator">
+      <b-avatar :text="initialLetters" variant="info"></b-avatar>
+      <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
+      <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
+      <div class="mt-2">{{ message.message }}</div>
+    </div>
   </div>
 </template>
 <script>
-import IsModerator from '@/components/ContributionMessages/slots/IsModerator.vue'
-import IsNotModerator from '@/components/ContributionMessages/slots/IsNotModerator.vue'
-
 export default {
   name: 'ContributionMessagesListItem',
-  components: {
-    IsModerator,
-    IsNotModerator,
-  },
   props: {
     message: {
       type: Object,
       required: true,
-      default() {
-        return {}
-      },
     },
   },
 }
 </script>
+<style>
+.is-not-moderator {
+  clear: both;
+  width: 75%;
+  margin-top: 20px;
+  /* background-color: rgb(261, 204, 221); */
+}
+.is-moderator {
+  clear: both;
+  float: right;
+  width: 75%;
+  margin-top: 20px;
+  margin-bottom: 20px;
+  /* background-color: rgb(255, 255, 128); */
+}
+</style>

admin/src/components/ContributionMessages/slots/IsModerator.spec.js

@@ -1,49 +0,0 @@
-import { mount } from '@vue/test-utils'
-import IsModerator from './IsModerator.vue'
-
-const localVue = global.localVue
-
-describe('IsModerator', () => {
-  let wrapper
-
-  const mocks = {
-    $t: jest.fn((t) => t),
-    $d: jest.fn((d) => d),
-  }
-
-  const propsData = {
-    message: {
-      id: 111,
-      message: 'asd asda sda sda',
-      createdAt: '2022-08-29T12:23:27.000Z',
-      updatedAt: null,
-      type: 'DIALOG',
-      userFirstName: 'Peter',
-      userLastName: 'Lustig',
-      userId: 107,
-      __typename: 'ContributionMessage',
-    },
-  }
-
-  const Wrapper = () => {
-    return mount(IsModerator, {
-      localVue,
-      mocks,
-      propsData,
-    })
-  }
-
-  describe('mount', () => {
-    beforeEach(() => {
-      wrapper = Wrapper()
-    })
-
-    it('has a DIV .slot-is-moderator', () => {
-      expect(wrapper.find('div.slot-is-moderator').exists()).toBe(true)
-    })
-
-    it('props.message.default', () => {
-      expect(wrapper.vm.$options.props.message.default.call()).toEqual({})
-    })
-  })
-})

admin/src/components/ContributionMessages/slots/IsModerator.vue

@@ -1,37 +0,0 @@
-<template>
-  <div class="slot-is-moderator">
-    <div class="text-right">
-      <b-avatar square :text="initialLetters" variant="warning"></b-avatar>
-      <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
-      <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <small class="ml-4 text-success">{{ $t('moderator') }}</small>
-      <div class="mt-2">{{ message.message }}</div>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  props: {
-    message: {
-      type: Object,
-      default() {
-        return {}
-      },
-    },
-  },
-  computed: {
-    initialLetters() {
-      return `${this.message.userFirstName[0]} ${this.message.userLastName[0]}`
-    },
-  },
-}
-</script>
-<style>
-.slot-is-moderator {
-  clear: both;
-  float: right;
-  width: 75%;
-  margin-top: 20px;
-  margin-bottom: 20px;
-}
-</style>

admin/src/components/ContributionMessages/slots/IsNotModerator.spec.js

@@ -1,49 +0,0 @@
-import { mount } from '@vue/test-utils'
-import IsNotModerator from './IsNotModerator.vue'
-
-const localVue = global.localVue
-
-describe('IsNotModerator', () => {
-  let wrapper
-
-  const mocks = {
-    $t: jest.fn((t) => t),
-    $d: jest.fn((d) => d),
-  }
-
-  const propsData = {
-    message: {
-      id: 113,
-      message: 'asda sdad ad asdasd ',
-      createdAt: '2022-08-29T12:25:34.000Z',
-      updatedAt: null,
-      type: 'DIALOG',
-      userFirstName: 'Bibi',
-      userLastName: 'Bloxberg',
-      userId: 108,
-      __typename: 'ContributionMessage',
-    },
-  }
-
-  const Wrapper = () => {
-    return mount(IsNotModerator, {
-      localVue,
-      mocks,
-      propsData,
-    })
-  }
-
-  describe('mount', () => {
-    beforeEach(() => {
-      wrapper = Wrapper()
-    })
-
-    it('has a DIV .slot-is-not-moderator', () => {
-      expect(wrapper.find('div.slot-is-not-moderator').exists()).toBe(true)
-    })
-
-    it('props.message.default', () => {
-      expect(wrapper.vm.$options.props.message.default.call()).toEqual({})
-    })
-  })
-})

admin/src/components/ContributionMessages/slots/IsNotModerator.vue

@@ -1,34 +0,0 @@
-<template>
-  <div class="slot-is-not-moderator">
-    <div>
-      <b-avatar :text="initialLetters" variant="info"></b-avatar>
-      <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
-      <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <div class="mt-2">{{ message.message }}</div>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  props: {
-    message: {
-      type: Object,
-      default() {
-        return {}
-      },
-    },
-  },
-  computed: {
-    initialLetters() {
-      return `${this.message.userFirstName[0]} ${this.message.userLastName[0]}`
-    },
-  },
-}
-</script>
-<style>
-.slot-is-not-moderator {
-  clear: both;
-  width: 75%;
-  margin-top: 20px;
-}
-</style>

frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js

@@ -1,12 +1,11 @@
 import { mount } from '@vue/test-utils'
 import ContributionMessagesList from './ContributionMessagesList.vue'
+import ContributionMessagesListItem from './ContributionMessagesListItem.vue'
 
 const localVue = global.localVue
+let wrapper
 
-describe('ContributionMessagesList', () => {
+const mocks = {
-  let wrapper
-
-  const mocks = {
   $t: jest.fn((t) => t),
   $d: jest.fn((d) => d),
   $store: {
@@ -15,15 +14,16 @@ describe('ContributionMessagesList', () => {
       lastName: 'Lustig',
     },
   },
-  }
+}
 
+describe('ContributionMessagesList', () => {
   const propsData = {
     contributionId: 42,
-    state: 'PENDING0',
+    state: 'PENDING',
     messages: [
       {
         id: 111,
-        message: 'asd asda sda sda',
+        message: 'Lorem ipsum?',
         createdAt: '2022-08-29T12:23:27.000Z',
         updatedAt: null,
         type: 'DIALOG',
@@ -32,10 +32,21 @@ describe('ContributionMessagesList', () => {
         userId: 107,
         __typename: 'ContributionMessage',
       },
+      {
+        id: 113,
+        message: 'Asda sdad ad asdasd, das Ass das Das. ',
+        createdAt: '2022-08-29T12:25:34.000Z',
+        updatedAt: null,
+        type: 'DIALOG',
+        userFirstName: 'Bibi',
+        userLastName: 'Bloxberg',
+        userId: 108,
+        __typename: 'ContributionMessage',
+      },
     ],
   }
 
-  const Wrapper = () => {
+  const ListWrapper = () => {
     return mount(ContributionMessagesList, {
       localVue,
       mocks,
@@ -45,11 +56,123 @@ describe('ContributionMessagesList', () => {
 
   describe('mount', () => {
     beforeEach(() => {
-      wrapper = Wrapper()
+      wrapper = ListWrapper()
     })
 
-    it('has a DIV .contribution-messages-list-item', () => {
+    it('has two DIV .contribution-messages-list-item elements', () => {
-      expect(wrapper.find('div.contribution-messages-list-item').exists()).toBe(true)
+      expect(wrapper.findAll('div.contribution-messages-list-item').length).toBe(2)
+    })
+  })
+})
+
+describe('ContributionMessagesListItem', () => {
+  describe('if message author has moderator role', () => {
+    const propsData = {
+      message: {
+        id: 113,
+        message: 'Asda sdad ad asdasd, das Ass das Das. ',
+        createdAt: '2022-08-29T12:25:34.000Z',
+        updatedAt: null,
+        type: 'DIALOG',
+        userFirstName: 'Bibi',
+        userLastName: 'Bloxberg',
+        userId: 108,
+        __typename: 'ContributionMessage',
+      },
+    }
+
+    const ItemWrapper = () => {
+      return mount(ContributionMessagesListItem, {
+        localVue,
+        mocks,
+        propsData,
+      })
+    }
+
+    describe('mount', () => {
+      beforeAll(() => {
+        wrapper = ItemWrapper()
+      })
+
+      it('has a DIV .is-moderator.text-left', () => {
+        expect(wrapper.find('div.is-moderator.text-left').exists()).toBe(true)
+      })
+
+      it('has the complete user name', () => {
+        expect(wrapper.find('div.is-moderator.text-left > span:nth-child(2)').text()).toBe(
+          'Bibi Bloxberg',
+        )
+      })
+
+      it('has the message creation date', () => {
+        expect(wrapper.find('div.is-moderator.text-left > span:nth-child(3)').text()).toMatch(
+          'Mon Aug 29 2022 12:25:34 GMT+0000',
+        )
+      })
+
+      it('has the moderator label', () => {
+        expect(wrapper.find('div.is-moderator.text-left > small:nth-child(4)').text()).toBe(
+          'community.moderator',
+        )
+      })
+
+      it('has the message', () => {
+        expect(wrapper.find('div.is-moderator.text-left > div:nth-child(5)').text()).toBe(
+          'Asda sdad ad asdasd, das Ass das Das.',
+        )
+      })
+    })
+  })
+
+  describe('if message author does not have moderator role', () => {
+    const propsData = {
+      message: {
+        id: 111,
+        message: 'Lorem ipsum?',
+        createdAt: '2022-08-29T12:23:27.000Z',
+        updatedAt: null,
+        type: 'DIALOG',
+        userFirstName: 'Peter',
+        userLastName: 'Lustig',
+        userId: 107,
+        __typename: 'ContributionMessage',
+      },
+    }
+
+    const ModeratorItemWrapper = () => {
+      return mount(ContributionMessagesListItem, {
+        localVue,
+        mocks,
+        propsData,
+      })
+    }
+
+    describe('mount', () => {
+      beforeAll(() => {
+        wrapper = ModeratorItemWrapper()
+      })
+
+      it('has a DIV .is-not-moderator.text-right', () => {
+        expect(wrapper.find('div.is-not-moderator.text-right').exists()).toBe(true)
+      })
+
+      it('has the complete user name', () => {
+        expect(wrapper.find('div.is-not-moderator.text-right > span:nth-child(2)').text()).toBe(
+          'Peter Lustig',
+        )
+      })
+
+      it('has the message creation date', () => {
+        expect(wrapper.find('div.is-not-moderator.text-right > span:nth-child(3)').text()).toMatch(
+          'Mon Aug 29 2022 12:23:27 GMT+0000',
+        )
+      })
+
+      it('has the message', () => {
+        expect(wrapper.find('div.is-not-moderator.text-right > div:nth-child(4)').text()).toBe(
+          'Lorem ipsum?',
+        )
+      })
     })
   })
 })

frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue

@@ -1,26 +1,28 @@
 <template>
   <div class="contribution-messages-list-item">
-    <is-not-moderator v-if="isNotModerator" :message="message"></is-not-moderator>
+    <div v-if="isNotModerator" class="is-not-moderator text-right">
-    <is-moderator v-else :message="message"></is-moderator>
+      <b-avatar :text="initialLetters" variant="info"></b-avatar>
+      <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
+      <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
+      <div class="mt-2">{{ message.message }}</div>
+    </div>
+    <div v-else class="is-moderator text-left">
+      <b-avatar square :text="initialLetters" variant="warning"></b-avatar>
+      <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
+      <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
+      <small class="ml-4 text-success">{{ $t('community.moderator') }}</small>
+      <div class="mt-2">{{ message.message }}</div>
+    </div>
   </div>
 </template>
-<script>
-import IsModerator from '@/components/ContributionMessages/slots/IsModerator.vue'
-import IsNotModerator from '@/components/ContributionMessages/slots/IsNotModerator.vue'
 
+<script>
 export default {
   name: 'ContributionMessagesListItem',
-  components: {
-    IsModerator,
-    IsNotModerator,
-  },
   props: {
     message: {
       type: Object,
       required: true,
-      default() {
-        return {}
-      },
     },
   },
   data() {
@@ -36,3 +38,19 @@ export default {
   },
 }
 </script>
+<style>
+.is-not-moderator {
+  float: right;
+  /* background-color: rgb(261, 204, 221); */
+  width: 75%;
+  margin-top: 20px;
+  margin-bottom: 20px;
+  clear: both;
+}
+.is-moderator {
+  clear: both;
+  /* background-color: rgb(255, 255, 128); */
+  width: 75%;
+  margin-top: 20px;
+}
+</style>

frontend/src/components/ContributionMessages/slots/IsModerator.spec.js

@@ -1,49 +0,0 @@
-import { mount } from '@vue/test-utils'
-import IsModerator from './IsModerator.vue'
-
-const localVue = global.localVue
-
-describe('IsModerator', () => {
-  let wrapper
-
-  const mocks = {
-    $t: jest.fn((t) => t),
-    $d: jest.fn((d) => d),
-  }
-
-  const propsData = {
-    message: {
-      id: 111,
-      message: 'asd asda sda sda',
-      createdAt: '2022-08-29T12:23:27.000Z',
-      updatedAt: null,
-      type: 'DIALOG',
-      userFirstName: 'Peter',
-      userLastName: 'Lustig',
-      userId: 107,
-      __typename: 'ContributionMessage',
-    },
-  }
-
-  const Wrapper = () => {
-    return mount(IsModerator, {
-      localVue,
-      mocks,
-      propsData,
-    })
-  }
-
-  describe('mount', () => {
-    beforeEach(() => {
-      wrapper = Wrapper()
-    })
-
-    it('has a DIV .slot-is-moderator', () => {
-      expect(wrapper.find('div.slot-is-moderator').exists()).toBe(true)
-    })
-
-    it('props.message.default', () => {
-      expect(wrapper.vm.$options.props.message.default.call()).toEqual({})
-    })
-  })
-})

frontend/src/components/ContributionMessages/slots/IsModerator.vue

@@ -1,34 +0,0 @@
-<template>
-  <div class="slot-is-moderator">
-    <b-avatar square :text="initialLetters" variant="warning"></b-avatar>
-    <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
-    <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-    <small class="ml-4 text-success">{{ $t('community.moderator') }}</small>
-    <div class="mt-2">{{ message.message }}</div>
-  </div>
-</template>
-<script>
-export default {
-  props: {
-    message: {
-      type: Object,
-      default() {
-        return {}
-      },
-    },
-  },
-  computed: {
-    initialLetters() {
-      return `${this.message.userFirstName[0]} ${this.message.userLastName[0]}`
-    },
-  },
-}
-</script>
-<style>
-.slot-is-moderator {
-  clear: both;
-  /* background-color: rgb(255, 242, 227); */
-  width: 75%;
-  margin-top: 20px;
-}
-</style>

frontend/src/components/ContributionMessages/slots/IsNotModerator.spec.js

@@ -1,49 +0,0 @@
-import { mount } from '@vue/test-utils'
-import IsNotModerator from './IsNotModerator.vue'
-
-const localVue = global.localVue
-
-describe('IsNotModerator', () => {
-  let wrapper
-
-  const mocks = {
-    $t: jest.fn((t) => t),
-    $d: jest.fn((d) => d),
-  }
-
-  const propsData = {
-    message: {
-      id: 113,
-      message: 'asda sdad ad asdasd ',
-      createdAt: '2022-08-29T12:25:34.000Z',
-      updatedAt: null,
-      type: 'DIALOG',
-      userFirstName: 'Bibi',
-      userLastName: 'Bloxberg',
-      userId: 108,
-      __typename: 'ContributionMessage',
-    },
-  }
-
-  const Wrapper = () => {
-    return mount(IsNotModerator, {
-      localVue,
-      mocks,
-      propsData,
-    })
-  }
-
-  describe('mount', () => {
-    beforeEach(() => {
-      wrapper = Wrapper()
-    })
-
-    it('has a DIV .slot-is-not-moderator', () => {
-      expect(wrapper.find('div.slot-is-not-moderator').exists()).toBe(true)
-    })
-
-    it('props.message.default', () => {
-      expect(wrapper.vm.$options.props.message.default.call()).toEqual({})
-    })
-  })
-})

frontend/src/components/ContributionMessages/slots/IsNotModerator.vue

@@ -1,36 +0,0 @@
-<template>
-  <div class="slot-is-not-moderator">
-    <div class="text-right">
-      <b-avatar :text="initialLetters" variant="info"></b-avatar>
-      <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
-      <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <div class="mt-2">{{ message.message }}</div>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  props: {
-    message: {
-      type: Object,
-      default() {
-        return {}
-      },
-    },
-  },
-  computed: {
-    initialLetters() {
-      return `${this.message.userFirstName[0]} ${this.message.userLastName[0]}`
-    },
-  },
-}
-</script>
-<style>
-.slot-is-not-moderator {
-  float: right;
-  width: 75%;
-  margin-top: 20px;
-  margin-bottom: 20px;
-  clear: both;
-}
-</style>