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

package/components/Accordion/index.jsx

@@ -38,7 +38,9 @@ const Accordion = (props) => {
   return (
     <div className="accordion-section" data-testid="accordion">
       <button
-        className={`accordion ${setActive}`}
+        className={`accordion ${setActive} ${
+          setActive && props.isSticky ? 'sticky' : ''
+        }`}
         aria-label={props.title}
         aria-pressed={ariaPressed}
         aria-expanded={ariaPressed}
@@ -83,11 +85,13 @@ Accordion.propTypes = {
   centerItem: PropTypes.string,
   rightItem: PropTypes.string,
   isOpen: PropTypes.bool,
+  isSticky: PropTypes.bool,
 };
 
 Accordion.defaultProps = {
   title: '',
   isOpen: false,
+  isSticky: false,
 };
 
 export default Accordion;

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

@@ -54,26 +54,18 @@ const SelectRole = ({ selectedRole, setSelectedRole }) => {
     }
   }, []);
 
-  const singleRoleUser = ROLE_OPTIONS.length === 1;
-
-  const MultiRoleDropdown = () => (
-    <Dropdown
-      value={selectedRole}
-      name="user-role-selection"
-      ariaLabel="Select User Role"
-      className="qpp-u-width--100 SelectRole__Dropdown"
-      options={ROLE_OPTIONS}
-      onChange={handleSelection}
-      disabled={isHelpdeskRoleAndImpersonating}
-    />
-  );
-
   return (
     <div className="SelectRole__Container">
-      <p className="SelectRole__Text">
-        You are viewing as a{singleRoleUser ? ` ${selectedRole}` : ''}
-      </p>
-      {!singleRoleUser && <MultiRoleDropdown />}
+      <p className="SelectRole__Text">You are viewing as a</p>
+      <Dropdown
+        value={selectedRole}
+        name="user-role-selection"
+        ariaLabel="Select User Role"
+        className="qpp-u-width--100 SelectRole__Dropdown"
+        options={ROLE_OPTIONS}
+        onChange={handleSelection}
+        disabled={isHelpdeskRoleAndImpersonating}
+      />
     </div>
   );
 };

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

@@ -11,19 +11,27 @@ 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);
 };
 
@@ -49,15 +57,35 @@ 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

@@ -28,6 +28,9 @@ const NavLinkDrawer = ({
 }) => {
   const [isOpen, setIsOpen] = useState(openByDefault);
   const MANAGE_ACCESS = '/user/manage-access';
+  const ELIGIBILITY_REPORTING = '/user/dashboard';
+  const REGISTRATION = '/user/registration';
+  const SUBMISSION_FEEDBACK = '/user/submissions/feedback';
 
   const toggleDrawer = () => {
     if (!isExpanded && typeof sidebarExpand === 'function') {
@@ -44,11 +47,25 @@ const NavLinkDrawer = ({
   };
 
   const reRouteHandler = () => {
-    if (url === MANAGE_ACCESS) {
-      return (window.location.href = MANAGE_ACCESS);
+    if (url) {
+      window.location.href = url;
     }
   };
 
+  const parentRerouteUrls = [
+    MANAGE_ACCESS,
+    ELIGIBILITY_REPORTING,
+    REGISTRATION,
+    SUBMISSION_FEEDBACK,
+  ];
+
+  const parentReroute = (url) => {
+    if (parentRerouteUrls.includes(url)) {
+      return false;
+    }
+    return true;
+  };
+
   const isLinkActive = (link, func) => {
     if (typeof func === 'function') {
       return func(link);
@@ -201,7 +218,7 @@ const NavLinkDrawer = ({
         {...(!isAlwaysOpen ? { 'aria-pressed': isOpen } : {})}
         tabIndex="0"
         aria-label={label}
-        {...((url !== MANAGE_ACCESS && isAlwaysOpen) || disabled
+        {...((parentReroute(url) && isAlwaysOpen) || disabled
           ? { disabled: isAlwaysOpen || disabled }
           : {})}
         className={`${className} ${expandedClass} ${highlightTitle(

package/components/SideNav/helpers.js

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