ecamp · carlobeltrame · Jul 14, 2021 · May 14, 2021 · May 14, 2021 · May 14, 2021
diff --git a/backend/content-type/eCampMultiSelect/src/Module.php b/backend/content-type/eCampMultiSelect/src/Module.php
@@ -34,12 +34,19 @@ public function onBootstrap(MvcEvent $e): void {
             Option::class,
             [Acl::REST_PRIVILEGE_FETCH_ALL]
         );
+
+        $acl->allow(
+            User::ROLE_USER,
+            Option::class,
+            [Acl::REST_PRIVILEGE_FETCH],
+            new UserIsCollaborator([CampCollaboration::ROLE_MEMBER, CampCollaboration::ROLE_MANAGER, CampCollaboration::ROLE_GUEST])
+        );
+
         $acl->allow(
             User::ROLE_USER,
             Option::class,
             [
                 Acl::REST_PRIVILEGE_CREATE,
-                Acl::REST_PRIVILEGE_FETCH,
                 Acl::REST_PRIVILEGE_PATCH,
                 Acl::REST_PRIVILEGE_UPDATE,
                 Acl::REST_PRIVILEGE_DELETE,

diff --git a/backend/content-type/eCampSingleText/src/Module.php b/backend/content-type/eCampSingleText/src/Module.php
@@ -48,12 +48,19 @@ public function onBootstrap(MvcEvent $e): void {
             SingleText::class,
             [Acl::REST_PRIVILEGE_FETCH_ALL]
         );
+
+        $acl->allow(
+            User::ROLE_USER,
+            SingleText::class,
+            [Acl::REST_PRIVILEGE_FETCH],
+            new UserIsCollaborator([CampCollaboration::ROLE_MEMBER, CampCollaboration::ROLE_MANAGER, CampCollaboration::ROLE_GUEST])
+        );
+
         $acl->allow(
             User::ROLE_USER,
             SingleText::class,
             [
                 Acl::REST_PRIVILEGE_CREATE,
-                Acl::REST_PRIVILEGE_FETCH,
                 Acl::REST_PRIVILEGE_PATCH,
                 Acl::REST_PRIVILEGE_UPDATE,
                 Acl::REST_PRIVILEGE_DELETE,

diff --git a/backend/content-type/eCampStoryboard/src/Module.php b/backend/content-type/eCampStoryboard/src/Module.php
@@ -34,12 +34,19 @@ public function onBootstrap(MvcEvent $e): void {
             Section::class,
             [Acl::REST_PRIVILEGE_FETCH_ALL]
         );
+
+        $acl->allow(
+            User::ROLE_USER,
+            Section::class,
+            [Acl::REST_PRIVILEGE_FETCH],
+            new UserIsCollaborator([CampCollaboration::ROLE_MEMBER, CampCollaboration::ROLE_MANAGER, CampCollaboration::ROLE_GUEST])
+        );
+
         $acl->allow(
             User::ROLE_USER,
             Section::class,
             [
                 Acl::REST_PRIVILEGE_CREATE,
-                Acl::REST_PRIVILEGE_FETCH,
                 Acl::REST_PRIVILEGE_PATCH,
                 Acl::REST_PRIVILEGE_UPDATE,
                 Acl::REST_PRIVILEGE_DELETE,

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/backend/module/eCampCore/src/Acl/AclFactory.php b/backend/module/eCampCore/src/Acl/AclFactory.php
@@ -134,7 +134,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
             Acl::REST_PRIVILEGE_FETCH,
             AclAssertion::or(
                 new CampIsPrototype(),
-                new UserIsCollaborator([CampCollaboration::ROLE_MEMBER, CampCollaboration::ROLE_MANAGER])
+                new UserIsCollaborator([CampCollaboration::ROLE_MEMBER, CampCollaboration::ROLE_MANAGER, CampCollaboration::ROLE_GUEST])
             )
         );
         $acl->allow(

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/activity/CardContentNode.vue b/frontend/src/components/activity/CardContentNode.vue
@@ -2,7 +2,8 @@
   <v-card :elevation="draggable ? 4 : 0" :class="{ 'mx-2 my-2': draggable }">
     <v-card-title hide-actions class="pa-0 pr-sm-2">
       <v-toolbar dense flat>
-        <v-menu bottom
+        <v-menu v-if="!disabled"
+                bottom
                 right
                 offset-y>
           <template #activator="{ on, attrs }">
@@ -26,6 +27,9 @@
             </v-row>
           </v-container>
         </v-menu>
+        <v-icon v-else>
+          {{ currentIcon }}
+        </v-icon>
 
         <div
           v-if="editInstanceName"
@@ -46,7 +50,7 @@
           </v-toolbar-title>
         </div>
 
-        <v-menu v-if="!layoutMode"
+        <v-menu v-if="!layoutMode && !disabled"
                 bottom
                 left
                 offset-y>
@@ -67,7 +71,7 @@
           </v-list>
         </v-menu>
         <dialog-entity-delete
-          v-else
+          v-else-if="!disabled"
           :entity="contentNode">
           <template #activator="{ on }">
             <v-btn icon
@@ -101,7 +105,8 @@ export default {
   props: {
     contentNode: { type: Object, required: true },
     layoutMode: { type: Boolean, required: true },
-    draggable: { type: Boolean, default: false }
+    draggable: { type: Boolean, default: false },
+    disabled: { type: Boolean, default: false }
   },
   data () {
     return {
@@ -139,6 +144,9 @@ export default {
   },
   methods: {
     toggleEditInstanceName (e) {
+      if (this.disabled) {
+        return
+      }
       this.editInstanceName = !this.editInstanceName
     }
   }

diff --git a/frontend/src/components/activity/ContentNode.vue b/frontend/src/components/activity/ContentNode.vue
@@ -6,6 +6,7 @@
              :content-node="contentNode"
              :layout-mode="layoutMode"
              :draggable="draggable"
+             :disabled="disabled"
              v-bind="$attrs" />
 </template>
 
@@ -35,7 +36,8 @@ export default {
   props: {
     contentNode: { type: Object, required: true },
     layoutMode: { type: Boolean, required: true },
-    draggable: { type: Boolean, default: false }
+    draggable: { type: Boolean, default: false },
+    disabled: { type: Boolean, default: false }
   }
 }
 </script>

diff --git a/frontend/src/components/activity/DraggableContentNodes.vue b/frontend/src/components/activity/DraggableContentNodes.vue
@@ -15,7 +15,8 @@
                     class="content-node"
                     :content-node="allContentNodesById[id]"
                     :layout-mode="layoutMode"
-                    :draggable="draggingEnabled" />
+                    :draggable="draggingEnabled"
+                    :disabled="disabled" />
     </draggable>
 
     <button-nested-content-node-add v-if="layoutMode"
@@ -40,7 +41,8 @@ export default {
   props: {
     layoutMode: { type: Boolean, default: false },
     slotName: { type: String, required: true },
-    parentContentNode: { type: Object, required: true }
+    parentContentNode: { type: Object, required: true },
+    disabled: { type: Boolean, default: false }
   },
   data () {
     return {
@@ -52,7 +54,7 @@ export default {
       return keyBy(this.parentContentNode.owner().contentNodes().items, 'id')
     },
     draggingEnabled () {
-      return this.layoutMode && this.$vuetify.breakpoint.mdAndUp
+      return this.layoutMode && this.$vuetify.breakpoint.mdAndUp && !this.disabled
     },
     contentNodeIds () {
       return sortBy(

diff --git a/frontend/src/components/activity/content/ColumnLayout.vue b/frontend/src/components/activity/content/ColumnLayout.vue
@@ -17,7 +17,8 @@
                       @resize-stop="saveColumnWidths">
       <draggable-content-nodes :slot-name="slot"
                                :layout-mode="layoutMode"
-                               :parent-content-node="contentNode" />
+                               :parent-content-node="contentNode"
+                               :disabled="disabled" />
 
       <template #menu>
         <column-operations :content-node="contentNode" :min-column-width="minWidth(slot)" :total-width="12" />

diff --git a/frontend/src/components/activity/content/LAThematicArea.vue b/frontend/src/components/activity/content/LAThematicArea.vue
@@ -5,7 +5,7 @@
         <v-list-item v-for="option in contentNode.options().items"
                      :key="option.id"
                      tag="label"
-                     :disabled="layoutMode">
+                     :disabled="layoutMode || disabled">
           <v-list-item-action>
             <api-checkbox fieldname="checked" :uri="option._meta.self" />
           </v-list-item-action>

diff --git a/frontend/src/components/activity/content/Material.vue b/frontend/src/components/activity/content/Material.vue
@@ -5,7 +5,8 @@
                       :content-node="contentNode"
                       :layout-mode="layoutMode"
                       :material-item-collection="contentNode.materialItems()"
-                      :group-by-list="$vuetify.breakpoint.xs" />
+                      :group-by-list="$vuetify.breakpoint.xs"
+                      :disabled="disabled" />
     </div>
   </card-content-node>
 </template>

diff --git a/frontend/src/components/activity/content/Notes.vue b/frontend/src/components/activity/content/Notes.vue
@@ -7,7 +7,7 @@
           :label="$tc('contentNode.notes.name')"
           rows="4"
           auto-grow
-          :disabled="layoutMode"
+          :disabled="layoutMode || disabled"
           :filled="layoutMode" />
       </api-form>
     </div>

diff --git a/frontend/src/components/activity/content/SafetyConcept.vue b/frontend/src/components/activity/content/SafetyConcept.vue
@@ -6,7 +6,7 @@
           fieldname="text"
           :placeholder="$tc('contentNode.safetyConcept.name')"
           rows="2"
-          :disabled="layoutMode"
+          :disabled="layoutMode || disabled"
           :filled="layoutMode" />
       </api-form>
     </div>

diff --git a/frontend/src/components/activity/content/Storyboard.vue b/frontend/src/components/activity/content/Storyboard.vue
@@ -14,35 +14,35 @@
         <v-col cols="1" />
       </v-row>
 
-      <api-sortable v-slot="sortable" :collection="sections">
+      <api-sortable v-slot="sortable" :disabled="layoutMode || disabled" :collection="sections">
         <api-form :entity="sortable.entity">
           <v-row dense>
             <v-col cols="2">
               <api-textarea
                 fieldname="column1"
                 auto-grow
                 rows="2"
-                :disabled="layoutMode"
+                :disabled="layoutMode || disabled"
                 :filled="layoutMode" />
             </v-col>
             <v-col cols="7">
               <api-textarea
                 fieldname="column2"
                 auto-grow
                 rows="4"
-                :disabled="layoutMode"
+                :disabled="layoutMode || disabled"
                 :filled="layoutMode" />
             </v-col>
             <v-col cols="2">
               <api-textarea
                 fieldname="column3"
                 auto-grow
                 rows="2"
-                :disabled="layoutMode"
+                :disabled="layoutMode || disabled"
                 :filled="layoutMode" />
             </v-col>
             <v-col cols="1">
-              <v-container v-if="!layoutMode" class="ma-0 pa-0">
+              <v-container v-if="!layoutMode && !disabled" class="ma-0 pa-0">
                 <v-row no-gutters>
                   <v-col cols="6">
                     <div class="section-buttons">
@@ -85,7 +85,7 @@
       <!-- add at end position -->
       <v-row no-gutters justify="center">
         <v-col cols="1">
-          <v-btn v-if="!layoutMode"
+          <v-btn v-if="!layoutMode && !disabled"
                  icon
                  small
                  class="button-add"

diff --git a/frontend/src/components/activity/content/Storycontext.vue b/frontend/src/components/activity/content/Storycontext.vue
@@ -7,7 +7,7 @@
           :placeholder="$tc('contentNode.storycontext.name')"
           rows="2"
           auto-grow
-          :disabled="layoutMode"
+          :disabled="layoutMode || disabled"
           :filled="layoutMode" />
       </api-form>
     </div>

diff --git a/frontend/src/components/camp/CampAddress.vue b/frontend/src/components/camp/CampAddress.vue
@@ -9,16 +9,20 @@ Displays address and allows to edit
       <api-form :entity="camp()">
         <api-text-field
           fieldname="addressName"
-          :name="$tc('entity.camp.fields.addressName')" />
+          :name="$tc('entity.camp.fields.addressName')"
+          :disabled="disabled" />
         <api-text-field
           fieldname="addressStreet"
-          :name="$tc('entity.camp.fields.addressStreet')" />
+          :name="$tc('entity.camp.fields.addressStreet')"
+          :disabled="disabled" />
         <api-text-field
           fieldname="addressZipcode"
-          :name="$tc('entity.camp.fields.addressZipcode')" />
+          :name="$tc('entity.camp.fields.addressZipcode')"
+          :disabled="disabled" />
         <api-text-field
           fieldname="addressCity"
-          :name="$tc('entity.camp.fields.addressCity')" />
+          :name="$tc('entity.camp.fields.addressCity')"
+          :disabled="disabled" />
       </api-form>
     </div>
   </content-group>
@@ -36,6 +40,10 @@ export default {
     camp: {
       type: Function,
       required: true
+    },
+    disabled: {
+      type: Boolean,
+      default: false
     }
   }
 }