Skip to content

Commit f4a04df

Browse files
Merge pull request #3402 from OneCommunityGlobal/Vamsi_Krishna_Impl_a_permission_to_view_task_extension_count
Vamsi krishna impl a permission to view task extension count
2 parents f8a97db + 86ef7ff commit f4a04df

3 files changed

Lines changed: 27 additions & 10 deletions

File tree

src/__tests__/mockStates.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -593,8 +593,8 @@ export const userProfileMock = {
593593
},
594594
mediaUrl: 'http://dropbox.com',
595595
weeklySummariesCount: 0,
596-
savedTangibleHrs:[
597-
0,0,0,0,0,0,0,0
596+
savedTangibleHrs: [
597+
0, 0, 0, 0, 0, 0, 0, 0
598598
],
599599
};
600600

@@ -1095,6 +1095,7 @@ export const rolesMock = {
10951095
'swapTask',
10961096
'deleteTask',
10971097
'updateNum',
1098+
'viewTaskExtensionCount',
10981099
// Teams
10991100
'postTeam',
11001101
'deleteTeam',
@@ -1254,6 +1255,7 @@ export const rolesMock = {
12541255
'updateTask',
12551256
'swapTask',
12561257
'deleteTask',
1258+
'viewTaskExtensionCount',
12571259
'postTeam',
12581260
'deleteTeam',
12591261
'putTeam',
@@ -1327,9 +1329,9 @@ export const createAuthMocks = (permissions) => {
13271329
frontPermissions: []
13281330
},
13291331
firstName: 'Dev',
1330-
profilePic:''
1332+
profilePic: ''
13311333
};
1332-
const onlyPermissions = {...authTemplate, permissions: {frontPermissions: permissions}};
1333-
const allOtherPermissions = {...authTemplate, permissions: {frontPermissions: allPermissionsExcept(permissions)}};
1334+
const onlyPermissions = { ...authTemplate, permissions: { frontPermissions: permissions } };
1335+
const allOtherPermissions = { ...authTemplate, permissions: { frontPermissions: allPermissionsExcept(permissions) } };
13341336
return [onlyPermissions, allOtherPermissions];
13351337
};

src/components/PermissionsManagement/PermissionsConst.jsx

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,10 +343,24 @@ export const permissionLabels = [
343343
'Gives the user permission to add a task on any WBS. "Other Links" -> "Projects" -> "WBS Button" -> "Choose any WBS" -> "Add task button"',
344344
},
345345
{
346-
label: 'Edit Task',
347-
key: 'updateTask',
346+
label: 'Edit Task/Task Extension',
348347
description:
349-
'Gives the user permission to edit a task on any WBS. "Other Links" -> "Projects" -> "WBS Button" -> "Choose any WBS" -> "Edit" -> "Edit" ',
348+
'Category for all permissions related to editing tasks and task extensions',
349+
subperms: [
350+
{
351+
label: 'Edit Task',
352+
key: 'updateTask',
353+
description:
354+
'Gives the user permission to edit a task on any WBS. "Other Links" -> "Projects" -> "WBS Button" -> "Choose any WBS" -> "Edit" -> "Edit" ',
355+
},
356+
{
357+
// task extension count viewing permission
358+
label: 'See # of Times Time Added to Task',
359+
key: 'viewTaskDeadlineCount',
360+
description:
361+
'Gives the user permission to view the task extension count. "Other Links" -> "Permissions Management" -> "Manage User Permissions" -> "Choose any user" -> "Add button to view task deadline count" ',
362+
},
363+
],
350364
},
351365
{
352366
label: 'Delete Task',

src/components/TeamMemberTasks/TeamMemberTask.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,11 @@ const TeamMemberTask = React.memo(
8181
const thisWeekHours = user.totaltangibletime_hrs;
8282

8383
const rolesAllowedToResolveTasks = ['Administrator', 'Owner'];
84-
const rolesAllowedToSeeDeadlineCount = ['Manager', 'Mentor', 'Administrator', 'Owner'];
8584
const isAllowedToResolveTasks =
8685
rolesAllowedToResolveTasks.includes(userRole) || dispatch(hasPermission('resolveTask'));
87-
const isAllowedToSeeDeadlineCount = rolesAllowedToSeeDeadlineCount.includes(userRole);
86+
87+
// this variable is used to check the permission to view task extension count for a user
88+
const isAllowedToSeeDeadlineCount = dispatch(hasPermission('viewTaskDeadlineCount'));
8889

8990
const canGetWeeklySummaries = dispatch(hasPermission('getWeeklySummaries'));
9091
const canSeeReports =

0 commit comments

Comments
 (0)