Merge pull request #1793 from OneCommunityGlobal/Jay_Modify_Badge_Amount

Anirudh SK (Old PR Conflicts fix) - Jay - PERMISSION: Modify Badge Amount Permission

Author: one-community

src/components/Badge/BadgeReport.jsx

@@ -42,6 +42,8 @@ function BadgeReport(props) {
   const canDeleteBadges = props.hasPermission('deleteBadges');
   const canUpdateBadges = props.hasPermission('updateBadges');
   const darkMode = props.darkMode;
+  const canAssignBadges = props.hasPermission('assignBadges');
+  const canModifyBadgeAmount = props.hasPermission('modifyBadgeAmount');
 
   async function imageToUri(url, callback) {
     const canvas = document.createElement('canvas');
@@ -452,7 +454,7 @@ function BadgeReport(props) {
                       </>
                     </td>
                     <td>
-                      {canUpdateBadges ? (
+                      {canUpdateBadges || canModifyBadgeAmount ? (
                         <Input
                           type="number"
                           value={Math.round(value.count)}
@@ -492,6 +494,7 @@ function BadgeReport(props) {
                           onChange={e => {
                             featuredChange(value, index, e);
                           }}
+                          disabled={canModifyBadgeAmount && !(canUpdateBadges || canAssignBadges)}
                         />
                       </FormGroup>
                     </td>

src/components/PermissionsManagement/PermissionsConst.jsx

@@ -274,6 +274,12 @@ export const permissionLabels = [
         description:
           'Gives the user permission to delete a badge on "Other Links" -> "Badge Management"',
       },
+      {
+        label: 'Modify Badge Amount',
+        key: 'modifyBadgeAmount',
+        description:
+          'Gives the user permission to increase or decrease the count of a badge on the Badge Reports Component',
+      },
       {
         label: 'Assign Badges',
         key: 'assignBadges',

src/components/UserProfile/Badges.jsx

@@ -45,6 +45,9 @@ export const Badges = (props) => {
 
   // Added restriction: Jae's badges only editable by Jae or Owner
   const isRecordBelongsToJaeAndUneditable = props.isRecordBelongsToJaeAndUneditable && props.role !== 'Owner';
+  // const canAssignBadges = props.hasPermission('assignBadges');
+  const canModifyBadgeAmount = props.hasPermission('modifyBadgeAmount');
+
   const toggle = () => setOpen(!isOpen);
 
   const toggleBadge = () => {setIsBadgeOpen(!isBadgeOpen)};
@@ -125,7 +128,7 @@ export const Badges = (props) => {
             </span>
 
             <div className='d-flex'>
-              {(props.canEdit || props.role == 'Owner' || props.role == 'Administrator') && (
+              {(props.canEdit || props.role == 'Owner' || props.role == 'Administrator' || canModifyBadgeAmount) && (
                 <>
                   <Button className="btn--dark-sea-green" onClick={toggle} style={darkMode ? boxStyleDark : boxStyle}>
                     Select Featured