Revert "fix: PR requests"

This reverts commit 57d09af.

Author: jsnwesson

src/containers/Dashboard/index.jsx

@@ -15,6 +15,7 @@ export const Dashboard = () => {
   hooks.useInitializeDashboard();
   const { pageTitle } = hooks.useDashboardMessages();
   const hasCourses = reduxHooks.useHasCourses();
+  const hasAvailableDashboards = reduxHooks.useHasAvailableDashboards();
   const initIsPending = reduxHooks.useRequestIsPending(RequestKeys.initialize);
   const showSelectSessionModal = reduxHooks.useShowSelectSessionModal();
 
@@ -23,7 +24,7 @@ export const Dashboard = () => {
       <h1 className="sr-only">{pageTitle}</h1>
       {!initIsPending && (
         <>
-          <DashboardModalSlot />
+          {hasAvailableDashboards && <DashboardModalSlot />}
           {(hasCourses && showSelectSessionModal) && <SelectSessionModal />}
         </>
       )}

src/containers/Dashboard/index.test.jsx

@@ -14,6 +14,7 @@ import Dashboard from '.';
 jest.mock('hooks', () => ({
   reduxHooks: {
     useHasCourses: jest.fn(),
+    useHasAvailableDashboards: jest.fn(),
     useShowSelectSessionModal: jest.fn(),
     useRequestIsPending: jest.fn(),
   },
@@ -37,10 +38,12 @@ describe('Dashboard', () => {
   });
   const createWrapper = ({
     hasCourses,
+    hasAvailableDashboards,
     initIsPending,
     showSelectSessionModal,
   }) => {
     reduxHooks.useHasCourses.mockReturnValueOnce(hasCourses);
+    reduxHooks.useHasAvailableDashboards.mockReturnValueOnce(hasAvailableDashboards);
     reduxHooks.useRequestIsPending.mockReturnValueOnce(initIsPending);
     reduxHooks.useShowSelectSessionModal.mockReturnValueOnce(showSelectSessionModal);
     return shallow(<Dashboard />);
@@ -77,7 +80,7 @@ describe('Dashboard', () => {
       it(`renders ${contentName}`, () => {
         testContent(contentEl);
       });
-      it(`${renderString(showEnterpriseModal)} dashboard modal`, () => {
+      it(`${renderString(showEnterpriseModal)} dashbaord modal`, () => {
         expect(wrapper.instance.findByType(DashboardModalSlot).length)
           .toEqual(showEnterpriseModal ? 1 : 0);
       });
@@ -89,6 +92,7 @@ describe('Dashboard', () => {
       testView({
         props: {
           hasCourses: false,
+          hasAvailableDashboards: false,
           initIsPending: true,
           showSelectSessionModal: false,
         },
@@ -98,10 +102,11 @@ describe('Dashboard', () => {
       });
     });
 
-    describe('courses loaded, show select session modal', () => {
+    describe('courses loaded, show select session modal, no available dashboards', () => {
       testView({
         props: {
           hasCourses: true,
+          hasAvailableDashboards: false,
           initIsPending: false,
           showSelectSessionModal: true,
         },
@@ -113,10 +118,11 @@ describe('Dashboard', () => {
       });
     });
 
-    describe('there are no courses', () => {
+    describe('there are no courses, there ARE available dashboards', () => {
       testView({
         props: {
           hasCourses: false,
+          hasAvailableDashboards: true,
           initIsPending: false,
           showSelectSessionModal: false,
         },

src/data/redux/hooks/app.js

@@ -18,6 +18,7 @@ export const useSocialShareSettings = () => useSelector(selectors.socialShareSet
 
 /** global-level meta-selectors **/
 export const useHasCourses = () => useSelector(selectors.hasCourses);
+export const useHasAvailableDashboards = () => useSelector(selectors.hasAvailableDashboards);
 export const useCurrentCourseList = (opts) => useSelector(
   state => selectors.currentList(state, opts),
 );

src/plugin-slots/DashboardModalSlot/README.md

@@ -4,17 +4,12 @@
 
 ## Description
 
-This slot is used for the modal on a dashboard that appears on initial load.
+This slot is used for the modal on a dashboard that directs you to the enterprise dashboard if applicable. 
 The following `env.config.jsx` will render the modal.
 
-## Example
-
-Learner dashboard will show modal on initial load
-![Screenshot of the dashboard modal](./images/widget_sidebar_slot.png)
-
 ```js
 import { DIRECT_PLUGIN, PLUGIN_OPERATIONS } from '@openedx/frontend-plugin-framework';
-import { ModalDialog } from '@openedx/paragon';
+import { DashboardModal } from '@edx/frontend-plugin-learner-dashboard';
 
 const config = {
   pluginSlots: {
@@ -26,8 +21,10 @@ const config = {
             id: 'dashboard_modal',
             type: DIRECT_PLUGIN,
             priority: 60,
-            RenderWidget: 
-              <ModalDialog title="Modal that appears on initial render of learner dashboard" />,
+            RenderWidget: DashboardModal,
+            content: {
+              store,
+            },
           },
         },
       ],