Revert "fix: PR requests"

This reverts commit 7678313.

Author: jsnwesson

src/containers/Dashboard/__snapshots__/index.test.jsx.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Dashboard snapshots courses loaded, show select session modal snapshot 1`] = `
+exports[`Dashboard snapshots courses loaded, show select session modal, no available dashboards snapshot 1`] = `
 <div
   className="d-flex flex-column p-2 pt-0"
   id="dashboard-container"
@@ -11,7 +11,6 @@ exports[`Dashboard snapshots courses loaded, show select session modal snapshot
     test-page-title
   </h1>
   <Fragment>
-    <DashboardModalSlot />
     <SelectSessionModal />
   </Fragment>
   <div
@@ -44,7 +43,7 @@ exports[`Dashboard snapshots courses still loading snapshot 1`] = `
 </div>
 `;
 
-exports[`Dashboard snapshots there are no courses snapshot 1`] = `
+exports[`Dashboard snapshots there are no courses, there ARE available dashboards snapshot 1`] = `
 <div
   className="d-flex flex-column p-2 pt-0"
   id="dashboard-container"
@@ -55,7 +54,7 @@ exports[`Dashboard snapshots there are no courses snapshot 1`] = `
     test-page-title
   </h1>
   <Fragment>
-    <DashboardModalSlot />
+    <DashboardModal />
   </Fragment>
   <div
     data-testid="dashboard-content"

src/containers/Dashboard/index.test.jsx

@@ -4,6 +4,7 @@ import { reduxHooks } from 'hooks';
 
 import SelectSessionModal from 'containers/SelectSessionModal';
 import CoursesPanel from 'containers/CoursesPanel';
+import DashboardModalSlot from 'plugin-slots/DashboardModalSlot';
 
 import DashboardLayout from './DashboardLayout';
 import LoadingView from './LoadingView';
@@ -67,6 +68,7 @@ describe('Dashboard', () => {
     const testView = ({
       props,
       content: [contentName, contentEl],
+      showEnterpriseModal,
       showSelectSessionModal,
     }) => {
       beforeEach(() => { wrapper = createWrapper(props); });
@@ -75,6 +77,10 @@ describe('Dashboard', () => {
       it(`renders ${contentName}`, () => {
         testContent(contentEl);
       });
+      it(`${renderString(showEnterpriseModal)} dashboard modal`, () => {
+        expect(wrapper.instance.findByType(DashboardModalSlot).length)
+          .toEqual(showEnterpriseModal ? 1 : 0);
+      });
       it(`${renderString(showSelectSessionModal)} select session modal`, () => {
         expect(wrapper.instance.findByType(SelectSessionModal).length).toEqual(showSelectSessionModal ? 1 : 0);
       });
@@ -87,6 +93,7 @@ describe('Dashboard', () => {
           showSelectSessionModal: false,
         },
         content: ['LoadingView', <LoadingView />],
+        showEnterpriseModal: false,
         showSelectSessionModal: false,
       });
     });
@@ -101,6 +108,7 @@ describe('Dashboard', () => {
         content: ['LoadedView', (
           <DashboardLayout><CoursesPanel /></DashboardLayout>
         )],
+        showEnterpriseModal: false,
         showSelectSessionModal: true,
       });
     });
@@ -115,6 +123,7 @@ describe('Dashboard', () => {
         content: ['Dashboard layout with no courses sidebar and content', (
           <DashboardLayout><CoursesPanel /></DashboardLayout>
         )],
+        showEnterpriseModal: true,
         showSelectSessionModal: false,
       });
     });

src/data/redux/app/selectors/appSelectors.js

@@ -10,7 +10,10 @@ export const numCourses = createSelector(
   (courseData) => Object.keys(courseData).length,
 );
 export const hasCourses = createSelector([module.numCourses], (num) => num > 0);
-
+export const hasAvailableDashboards = createSelector(
+  [simpleSelectors.enterpriseDashboard],
+  (data) => data !== null && data.isLearnerPortalEnabled === true,
+);
 export const showSelectSessionModal = createSelector(
   [simpleSelectors.selectSessionModal],
   (data) => data.cardId != null,
@@ -19,5 +22,6 @@ export const showSelectSessionModal = createSelector(
 export default StrictDict({
   numCourses,
   hasCourses,
+  hasAvailableDashboards,
   showSelectSessionModal,
 });

src/data/redux/app/selectors/appSelectors.test.js

@@ -17,6 +17,15 @@ describe('basic app selectors', () => {
       expect(cb(0)).toEqual(false);
     });
   });
+  describe('hasAvailableDashboards', () => {
+    it('returns true iff the enterpriseDashboard field is populated and learner portal is enabled', () => {
+      const { preSelectors, cb } = appSelectors.hasAvailableDashboards;
+      expect(preSelectors).toEqual([simpleSelectors.enterpriseDashboard]);
+      expect(cb({ isLearnerPortalEnabled: true })).toEqual(true);
+      expect(cb({ isLearnerPortalEnabled: false })).toEqual(false);
+      expect(cb(null)).toEqual(false);
+    });
+  });
   describe('showSelectSessionModal', () => {
     it('returns true if the selectSessionModal cardId is not null', () => {
       const { preSelectors, cb } = appSelectors.showSelectSessionModal;

src/data/redux/app/selectors/simpleSelectors.test.js

@@ -36,6 +36,12 @@ describe('app simple selectors', () => {
       expect(preSelectors).toEqual([appSelector]);
       expect(cb(testState.app)).toEqual(testString);
     });
+    test('enterpriseDashboard returns empty object if data returns null', () => {
+      testState = { app: { enterpriseDashboard: null } };
+      const { preSelectors, cb } = simpleSelectors.enterpriseDashboard;
+      expect(preSelectors).toEqual([appSelector]);
+      expect(cb(testState.app)).toEqual({});
+    });
     describe('cardSimpleSelectors', () => {
       keys = keyStore(cardSimpleSelectors);
       test.each([

src/plugin-slots/DashboardModalSlot/README.md

@@ -1,16 +1,16 @@
-# Dashboard Modal Slot
+# Course Card Action Slot
 
 ### Slot ID: `dashboard_modal_slot`
 
 ## Description
 
-This slot is used for the modal on a dashboard.
+This slot is used for the modal on a dashboard that appears on initial load.
 The following `env.config.jsx` will render the modal.
 
 ## Example
 
-Learner dashboard will show modal
-![Screenshot of the dashboard modal](./images/dashboard_modal_slot.png)
+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';
@@ -27,7 +27,7 @@ const config = {
             type: DIRECT_PLUGIN,
             priority: 60,
             RenderWidget: 
-              <ModalDialog title="Modal that appears on learner dashboard" />,
+              <ModalDialog title="Modal that appears on initial render of learner dashboard" />,
           },
         },
       ],

src/plugin-slots/DashboardModalSlot/images/dashboard_modal_slot.png renamed to src/plugin-slots/DashboardModalSlot/images/widget_sidebar_slot.png

@@ -1,8 +1,8 @@
 import React from 'react';
 import { PluginSlot } from '@openedx/frontend-plugin-framework';
 
-const DashboardModalSlot = () => (
+const DashboardModal = () => (
   <PluginSlot id="dashboard_modal_slot" />
 );
 
-export default DashboardModalSlot;
+export default DashboardModal;