qpp-style 9.28.4-mo-beta.0 → 9.28.4

package/components/SideNav/Content/SelectRole/utils.js

@@ -11,27 +11,19 @@ const extractCookieValues = (cookies) => {
   return [hasAuthorizations, cmsInternalRoles];
 };
 
-const reviewerRoles = [
-  'QPP Self-Nomination',
-  'QPP Targeted Review & Exceptions',
-  'QPP Case Management - PIMMS Reviewer',
-  'QPP Case Management - ACO PAC Reviewer',
-  'QPP Case Management - CMS Reviewer',
-];
-
-const cmsRoles = [
-  'QPP Content Management - Author',
-  'QPP Content Management - Approver',
-  'QPP Content Management - Admin',
-  'QPP Front-end - Author',
-];
-
 /**
  * Check if internal cms role is a Reviewer role
  * @param {string} cmsInternalRole
  * @returns {boolean}
  */
 export const isReviewerRole = (cmsInternalRole) => {
+  const reviewerRoles = [
+    'QPP Self-Nomination',
+    'QPP Targeted Review & Exceptions',
+    'QPP Case Management - PIMMS Reviewer',
+    'QPP Case Management - ACO PAC Reviewer',
+    'QPP Case Management - CMS Reviewer',
+  ];
   return reviewerRoles.includes(cmsInternalRole);
 };
 
@@ -57,35 +49,15 @@ const hasHelpdeskRole = (cmsInternalRoles) => {
 
 const hasContentMgmtRole = (cmsInternalRoles) => {
   if (!cmsInternalRoles) return false;
+  const cmsRoles = [
+    'QPP Content Management - Author',
+    'QPP Content Management - Approver',
+    'QPP Content Management - Admin',
+    'QPP Front-end - Author',
+  ];
   return cmsInternalRoles.some((role) => cmsRoles.includes(role));
 };
 
-const includesRole = (arr, roles) => roles.some((role) => arr.includes(role));
-
-/**
- * Check if internal cms roles includes only Content Manager roles
- * @param {array} internalAuthz array of values
- * @returns {boolean}
- */
-export const isOnlyContentManager = (internalAuthz) => {
-  return (
-    includesRole(internalAuthz, cmsRoles) &&
-    !includesRole(internalAuthz, reviewerRoles)
-  );
-};
-
-/**
- * Check if internal cms roles includes only Internal Reviewers roles
- * @param {array} internalAuthz array of values
- * @returns {boolean}
- */
-export const isOnlyInternalReviewer = (internalAuthz) => {
-  return (
-    includesRole(internalAuthz, reviewerRoles) &&
-    !includesRole(internalAuthz, cmsRoles)
-  );
-};
-
 /**
  * Transforms cookie values into optios format for use in role seelction dropdown
  * @param {array} values extracted & parsed vookie values

package/components/SideNav/Links/NavLinkDrawer.jsx

@@ -217,7 +217,7 @@ const NavLinkDrawer = ({
         onClick={toggleDrawer}
         {...(!isAlwaysOpen ? { 'aria-pressed': isOpen } : {})}
         tabIndex="0"
-        aria-label={label}
+        aria-label={hideLabelSection ? 'hidden button' : label}
         {...((parentReroute(url) && isAlwaysOpen) || disabled
           ? { disabled: isAlwaysOpen || disabled }
           : {})}

package/components/SideNav/helpers.js

@@ -17,11 +17,7 @@ import {
   AuthorContentIcon,
   RegistrationIcon,
 } from '../../lib/SvgComponents';
-import {
-  isReviewerRole,
-  isOnlyInternalReviewer,
-  isOnlyContentManager,
-} from './Content/SelectRole/utils';
+import { isReviewerRole } from './Content/SelectRole/utils';
 
 const submissionsUrl = '/user/submissions';
 const dashboardUrl = '/user/dashboard';
@@ -197,11 +193,7 @@ const isMultiRoleUser = (docCookie) => {
     return activeRoles.add(element);
   });
 
-  return (
-    !isOnlyContentManager(internalAuthz) &&
-    !isOnlyInternalReviewer(internalAuthz) &&
-    activeRoles.size > 1
-  );
+  return activeRoles.size > 1;
 };
 
 /**