Cover instructor-resources-pane

Author: RoyEJohnson

src/app/pages/details/common/resource-box/resource-box-utils.tsx

@@ -18,8 +18,8 @@ function encodeLocation(search: string) {
 }
 
 export type ResourceData = {
-    linkExternal: string;
-    linkDocumentUrl: string;
+    linkExternal?: string;
+    linkDocumentUrl?: string;
     linkDocument?: {
         file: string;
     };
@@ -29,18 +29,18 @@ export type ResourceData = {
         heading: string;
         resourceCategory: string;
         resourceUnlocked: boolean;
-        creatorFestResource: boolean;
+        creatorFestResource?: boolean;
         description: string;
         comingSoonText?: string;
     };
     comingSoonText: string | null;
     videoReferenceNumber?: number | null;
     k12?: boolean;
     printLink: string | null;
-    resourceUnlocked: boolean;
+    resourceUnlocked?: boolean;
     lockedText?: string;
-    resourceHeading: string;
-    resourceDescription: string;
+    resourceHeading?: string;
+    resourceDescription?: string;
     featured?: boolean;
 };
 

src/app/pages/details/phone-view/instructor-resources-pane/instructor-resources-pane.tsx

@@ -10,6 +10,7 @@ import useUserContext, {type UserStatus} from '~/contexts/user';
 import useWindowContext, {WindowContextProvider} from '~/contexts/window';
 import type {ContextValues} from '../../context';
 import './instructor-resources-pane.scss';
+import {assertNotNull} from '~/helpers/data';
 
 export function InstructorResourcesPane({
     model,
@@ -62,7 +63,7 @@ export function InstructorResourcesPane({
                     models={featuredModels}
                 />
             )}
-            <a className="card filter-for-book" onClick={goToPartners}>
+            <a className="card filter-for-book" href="/partners" onClick={goToPartners}>
                 OpenStax Partners <FontAwesomeIcon icon={faSignOutAlt} />
             </a>
             <div
@@ -92,7 +93,7 @@ function StubUnlessDisplayed({
     const {innerWidth, scrollY} = useWindowContext();
 
     React.useEffect(
-        () => setY((y || ref.current?.getBoundingClientRect().y) ?? null),
+        () => setY(y || assertNotNull(ref.current).getBoundingClientRect().y),
         [innerWidth, scrollY, y]
     );
 
@@ -112,9 +113,6 @@ export default function LoadUserStatusThenInstructorPane({
 }) {
     const {userStatus} = useUserContext();
 
-    if (!userStatus) {
-        return null;
-    }
     return (
         <WindowContextProvider>
             <StubUnlessDisplayed model={model} userStatus={userStatus} />

test/src/pages/details/details.test.tsx

@@ -24,6 +24,7 @@ jest.mock('~/models/table-of-contents-html', () =>
     jest.fn().mockReturnValue(Promise.resolve({}))
 );
 
+jest.spyOn(window, 'scrollBy').mockImplementation(() => null);
 jest.spyOn(DH, 'setPageTitleAndDescriptionFromBookData').mockReturnValue();
 const spyIsPolish = jest.spyOn($, 'isPolish');
 const spyWindowContext = jest.spyOn(WC, 'default');
@@ -152,11 +153,46 @@ describe('Details page', () => {
         );
     });
     it('renders only phone-view at phone width', async () => {
+        jest.spyOn(RBU, 'useResources').mockReturnValue({
+            bookVideoFacultyResources: [],
+            bookFacultyResources: [
+                {
+                    featured: true,
+                    linkText: 'Link text',
+                    comingSoonText: '',
+                    printLink: 'print-link',
+                    videoReferenceNumber: 13
+                },
+                {
+                    featured: false,
+                    linkText: 'Link text2',
+                    comingSoonText: '',
+                    printLink: 'print-link2',
+                    videoReferenceNumber: null,
+                    resource: {
+                        id: 1,
+                        heading: 'resource-heading',
+                        resourceCategory: 'any',
+                        resourceUnlocked: true,
+                        description: 'resource-description'
+                    }
+                }
+            ]
+        });
         spyWindowContext.mockReturnValue({innerWidth: 480} as any); // eslint-disable-line
         render(<Component />);
         await finishedRendering();
         expect(lengthOfView('phone')).toBe(346);
         expect(lengthOfView('bigger')).toBeUndefined();
+
+        jest.spyOn(Element.prototype, 'getBoundingClientRect').mockReturnValue({
+            y: 100
+        } as any); // eslint-disable-line
+        await user.click(screen.getByRole('button', {name: 'Instructor resources updated'}));
+        console.warn = jest.fn();
+        await user.click(await screen.findByRole('link', {name: 'OpenStax Partners'}));
+        expect(console.warn).toHaveBeenCalled();
+        console.warn = saveWarn;
     });
     it('toggles authors at phone width', async () => {
         spyWindowContext.mockReturnValue({innerWidth: 480} as any); // eslint-disable-line