Collaborators.vue: make invitation as guest possible

Issue: #1415
ecamp · May 14, 2021 · d1cae1b · d1cae1b
1 parent dd4e54b
commit d1cae1b
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 3 deletions.
diff --git a/backend/module/eCampApi/config/Rest/campCollaboration.config.php b/backend/module/eCampApi/config/Rest/campCollaboration.config.php
@@ -21,6 +21,7 @@
             ->addValidatorInArray([
                 CampCollaboration::ROLE_MEMBER,
                 CampCollaboration::ROLE_MANAGER,
+                CampCollaboration::ROLE_GUEST,
             ])
     )
     ->buildConfig()

diff --git a/backend/module/eCampApi/test/Rest/CampCollaborationTest.php b/backend/module/eCampApi/test/Rest/CampCollaborationTest.php
@@ -226,10 +226,13 @@ public function testCreateSuccess(): void {
         $this->assertEquals(CampCollaboration::STATUS_INVITED, $this->getResponseContent()->status);
     }
 
-    public function testCreateOnlyWithEmail(): void {
+    /**
+     * @dataProvider getRoles
+     */
+    public function testCreateOnlyWithEmail(string $role): void {
         $inviteEmail = 'my.mail@fantasy.com';
         $this->setRequestContent([
-            'role' => CampCollaboration::ROLE_MEMBER,
+            'role' => $role,
             'campId' => $this->campCollaboration1->getCamp()->getId(),
             'inviteEmail' => $inviteEmail,
             'userId' => null,
@@ -244,6 +247,10 @@ public function testCreateOnlyWithEmail(): void {
         $this->assertThat($this->getResponseContent()->_embedded, self::logicalNot(self::classHasAttribute('user')));
     }
 
+    public static function getRoles(): array {
+        return [[CampCollaboration::ROLE_GUEST], [CampCollaboration::ROLE_MANAGER], [CampCollaboration::ROLE_MEMBER]];
+    }
+
     public function testCreateWithEmailOfExistingUser() {
         $inviteEmail = 'my.mail@fantasy.com';
         $user2 = new User();

diff --git a/common/locales/en.json b/common/locales/en.json
@@ -40,7 +40,8 @@
       "collaborators": {
         "invite": "Invite",
         "manager": "Manager",
-        "member": "Member"
+        "member": "Member",
+        "guest": "Guest"
       },
       "fields": {
         "addressCity": "City",

diff --git a/frontend/src/components/camp/CollaboratorListItem.vue b/frontend/src/components/camp/CollaboratorListItem.vue
@@ -30,6 +30,7 @@
         :items="[
           { key: 'member', translation: $tc('entity.camp.collaborators.member') },
           { key: 'manager', translation: $tc('entity.camp.collaborators.manager') },
+          { key: 'guest', translation: $tc('entity.camp.collaborators.guest') },
         ]"
         item-value="key"
         item-text="translation"

diff --git a/frontend/src/views/camp/Collaborators.vue b/frontend/src/views/camp/Collaborators.vue
@@ -50,6 +50,7 @@ Displays collaborators of a single camp.
                   :items="[
                     { key: 'member', translation: $tc('entity.camp.collaborators.member') },
                     { key: 'manager', translation: $tc('entity.camp.collaborators.manager') },
+                    { key: 'guest', translation: $tc('entity.camp.collaborators.guest') },
                   ]"
                   item-value="key"
                   item-text="translation"

diff --git a/frontend/src/views/camp/__tests__/Admin.spec.js b/frontend/src/views/camp/__tests__/Admin.spec.js
@@ -62,4 +62,25 @@ describe('Admin view', () => {
     expect(queryByText('components.camp.campDangerzone.title')).not.toBeInTheDocument()
     expect(queryByText('components.camp.campDangerzone.deleteCamp.title')).not.toBeInTheDocument()
   })
+
+  it('doesn\'t show the danger zone when the user has the guest role', async () => {
+    const { queryByText } = renderWithVuetify(Admin, {
+      props: {
+        camp: () => ({
+          role: 'guest',
+          materialLists: () => {},
+          _meta: { loading: false }
+        })
+      },
+      routes: [],
+      mocks: {
+        api: { reload: () => Promise.resolve() },
+        $tc: key => key
+      },
+      stubs: ['camp-settings', 'camp-address', 'camp-periods', 'camp-categories', 'camp-material-lists']
+    })
+
+    expect(queryByText('components.camp.campDangerzone.title')).not.toBeInTheDocument()
+    expect(queryByText('components.camp.campDangerzone.deleteCamp.title')).not.toBeInTheDocument()
+  })
 })