Merge pull request #3997 from Tahi-project/bugs/APERTA-12445-fix-participant-perms

APERTA-12445 first card

Author: benjaminkreen

app/controllers/card_permissions_controller.rb

@@ -3,7 +3,7 @@ class CardPermissionsController < ApplicationController
   before_action :authenticate_user!
   respond_to :json
 
-  CARD_ACTIONS = ['view', 'edit', 'view_discussion_footer', 'edit_discussion_footer', 'be_assigned', 'assign_others'].freeze
+  CARD_ACTIONS = %w[view edit view_discussion_footer edit_discussion_footer be_assigned assign_others view_participants manage_participant].freeze
 
   def create
     card = Card.find(safe_params[:filter_by_card_id])

client/app/pods/admin-card-permission/service.js

@@ -15,13 +15,14 @@ export default Ember.Service.extend({
    * @return {Ember.Array.<CardPermission>} All permissions that were modified
    */
 
-  editPermissions: ['edit', 'edit_discussion_footer', 'assign_others', 'be_assigned'],
+  editPermissions: ['edit', 'edit_discussion_footer', 'assign_others', 'be_assigned', 'manage_participant'],
 
   correspondingActions: {
     'edit': ['view'],
     'be_assigned': ['view', 'edit'],
     'assign_others': ['view', 'edit'],
-    'edit_discussion_footer': ['view_discussion_footer']
+    'edit_discussion_footer': ['view_discussion_footer'],
+    'manage_participant': ['view_participants']
   },
 
   addRoleToPermissionSensible(role, filterByCardId, permissionAction) {

client/app/pods/components/card-editor/permissions/role/component.js

@@ -18,21 +18,15 @@ export default Ember.Component.extend({
   edit_discussion_footerAllowed: permissionExists('card', 'role', 'edit_discussion_footer'),
   be_assignedAllowed: permissionExists('card', 'role', 'be_assigned'),
   assign_othersAllowed: permissionExists('card', 'role', 'assign_others'),
-
-  togglePermission(permissionAction) {
-    if (this.get(`${permissionAction}Allowed`)) {
-      this.get('turnOffPermission')(this.get('role'), this.get('card'), permissionAction);
-    } else {
-      this.get('turnOnPermission')(this.get('role'), this.get('card'), permissionAction);
-    }
-  },
-
+  view_participantsAllowed: permissionExists('card', 'role', 'view_participants'),
+  manage_participantAllowed: permissionExists('card', 'role', 'manage_participant'),
   actions: {
-    toggleViewPermission() { this.togglePermission('view'); },
-    toggleEditPermission() { this.togglePermission('edit'); },
-    toggleViewDiscussionFooterPermission() { this.togglePermission('view_discussion_footer'); },
-    toggleEditDiscussionFooterPermission() { this.togglePermission('edit_discussion_footer'); },
-    toggleBeAssignedPermission() { this.togglePermission('be_assigned'); },
-    toggleAssignOthersAllowed() { this.togglePermission('assign_others'); }
+    togglePermission(permissionAction) {
+      if (this.get(`${permissionAction}Allowed`)) {
+        this.get('turnOffPermission')(this.get('role'), this.get('card'), permissionAction);
+      } else {
+        this.get('turnOnPermission')(this.get('role'), this.get('card'), permissionAction);
+      }
+    }
   }
 });

client/app/pods/components/card-editor/permissions/role/template.hbs

@@ -6,36 +6,49 @@
       name=(concat role.name "-view")
       checked=(readonly viewAllowed)
       disabled=(readonly editAllowed)
-      action=(action "toggleViewPermission")}}
+      action=(action "togglePermission" "view")}}
 </td>
 <td class="centered">
   {{check-box
       name=(concat role.name "-edit")
       checked=(readonly editAllowed)
-      action=(action "toggleEditPermission")}}
+      action=(action "togglePermission" "edit")}}
 </td>
 <td class="centered">
   {{check-box
       name=(concat role.name "-discussion-view")
       checked=(readonly view_discussion_footerAllowed)
       disabled=(readonly edit_discussion_footerAllowed)
-      action=(action "toggleViewDiscussionFooterPermission")}}
+      action=(action "togglePermission" "view_discussion_footer")}}
 </td>
 <td class="centered">
   {{check-box
       name=(concat role.name "-discussion-edit")
       checked=(readonly edit_discussion_footerAllowed)
-      action=(action "toggleEditDiscussionFooterPermission")}}
+      action=(action "togglePermission" "edit_discussion_footer")}}
 </td>
 <td class="centered">
   {{check-box
       name=(concat role.name "-be_assigned")
       checked=(readonly be_assignedAllowed)
-      action=(action "toggleBeAssignedPermission")}}
+      action=(action "togglePermission" "be_assigned")}}
 </td>
 <td class="centered">
   {{check-box
       name=(concat role.name "-assign_others")
       checked=(readonly assign_othersAllowed)
-      action=(action "toggleAssignOthersAllowed")}}
-</td>
+      action=(action "togglePermission" "assign_others")}}
+</td>
+<td class="centered">
+  {{check-box
+      name=(concat role.name "-view_participants")
+      checked=(readonly view_participantsAllowed)
+      disabled=(readonly manage_participantAllowed)
+      action=(action "togglePermission" "view_participants")}}
+</td>
+<td class="centered">
+  {{check-box
+      name=(concat role.name "-manage_participant")
+      checked=(readonly manage_participantAllowed)
+      action=(action "togglePermission" "manage_participant")}}
+</td>

client/app/pods/components/card-editor/permissions/template.hbs

@@ -8,6 +8,8 @@
       <th class="permission centered">WRITE<br>Can comment in discussions</th>
       <th class="permission centered">WRITE<br>Can be assigned </th>
       <th class="permission centered">WRITE<br>Can assign others</th>
+      <th class="permission centered">READ<br>Can view card discussion participants</th>
+      <th class="permission centered">WRITE<br>Can manage card discussion participants </th>
     </tr>
   </thead>
   <tbody>

client/tests/integration/pods/components/card-editor/permissions/role/component-test.js

@@ -0,0 +1,25 @@
+import { moduleForComponent, test } from 'ember-qunit';
+import sinon from 'sinon';
+import * as AdminCardPermission from 'tahi/lib/admin-card-permission';
+import hbs from 'htmlbars-inline-precompile';
+import Ember from 'ember';
+
+moduleForComponent('card-editor/permissions/role', 'Integration | Component | card editor | permissions | role', {
+  integration: true
+});
+
+test('it renders participant checkboxes', function(assert) {
+  sinon.stub(AdminCardPermission, 'permissionExists');
+  const card = Ember.Object.create({ id: 1 });
+  const role = Ember.Object.create({name: 'Foo'});
+  this.setProperties({card: card, role: role, noop: sinon.stub()});
+
+  this.render(hbs `{{card-editor/permissions/role
+                    role=role
+                    card=card
+                    turnOnPermission=noop
+                    turnOffPermission=noop}}`);
+
+  assert.elementFound('input[name=Foo-manage_participant]');
+  assert.elementFound('input[name=Foo-view_participants]');
+});