feat: improve search modal results [FC-0040]

src/course-outline/CourseOutline.scss

@@ -11,3 +11,21 @@
 @import "./drag-helper/SortableItem";
 @import "./xblock-status/XBlockStatus";
 @import "./paste-button/PasteButton";
+
+div.row:has(> div > div.highlight) {
+  animation: 5s glow;
+}
+
+@keyframes glow {
+  0% {
+    box-shadow: 0 0 5px 5px $primary-500;
+  }
+
+  90% {
+    box-shadow: 0 0 5px 5px $primary-500;
+  }
+
+  100% {
+    box-shadow: unset;
+  }
+}

src/course-outline/section-card/SectionCard.jsx

@@ -7,6 +7,7 @@ import { useDispatch } from 'react-redux';
 import { useIntl } from '@edx/frontend-platform/i18n';
 import { Bubble, Button, useToggle } from '@openedx/paragon';
 import { Add as IconAdd } from '@openedx/paragon/icons';
+import { useSearchParams } from 'react-router-dom';
 import classNames from 'classnames';
 
 import { setCurrentItem, setCurrentSection } from '../data/slice';
@@ -42,6 +43,9 @@ const SectionCard = ({
   const dispatch = useDispatch();
   const { activeId, overId } = useContext(DragContext);
   const [isExpanded, setIsExpanded] = useState(isSectionsExpanded);
+  const [searchParams] = useSearchParams();
+  const locatorId = searchParams.get('show');
+  const isScrolledToElement = locatorId === section.id;
   const [isFormOpen, openForm, closeForm] = useToggle(false);
   const namePrefix = 'section';
 
@@ -70,11 +74,10 @@ const SectionCard = ({
   }, [activeId, overId]);
 
   useEffect(() => {
-    // if this items has been newly added, scroll to it.
-    if (currentRef.current && section.shouldScroll) {
+    if (currentRef.current && (section.shouldScroll || isScrolledToElement)) {
       scrollToElement(currentRef.current);
     }
-  }, []);
+  }, [isScrolledToElement]);
 
   // re-create actions object for customizations
   const actions = { ...sectionActions };
@@ -155,7 +158,7 @@ const SectionCard = ({
       }}
     >
       <div
-        className="section-card"
+        className={`section-card ${isScrolledToElement ? 'highlight' : ''}`}
         data-testid="section-card"
         ref={currentRef}
       >

src/course-outline/subsection-card/SubsectionCard.jsx

@@ -134,7 +134,7 @@ const SubsectionCard = ({
     if (currentRef.current && (section.shouldScroll || subsection.shouldScroll || isScrolledToElement)) {
       scrollToElement(currentRef.current);
     }
-  }, []);
+  }, [isScrolledToElement]);
 
   useEffect(() => {
     if (savingStatus === RequestStatus.SUCCESSFUL) {
@@ -160,7 +160,11 @@ const SubsectionCard = ({
         ...borderStyle,
       }}
     >
-      <div className="subsection-card" data-testid="subsection-card" ref={currentRef}>
+      <div
+        className={`subsection-card ${isScrolledToElement ? 'highlight' : ''}`}
+        data-testid="subsection-card"
+        ref={currentRef}
+      >
         {isHeaderVisible && (
           <>
             <CardHeader

src/course-outline/unit-card/UnitCard.jsx

@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import { useDispatch } from 'react-redux';
 import { useToggle } from '@openedx/paragon';
 import { isEmpty } from 'lodash';
+import { useSearchParams } from 'react-router-dom';
 
 import { setCurrentItem, setCurrentSection, setCurrentSubsection } from '../data/slice';
 import { RequestStatus } from '../../data/constants';
@@ -34,6 +35,9 @@ const UnitCard = ({
 }) => {
   const currentRef = useRef(null);
   const dispatch = useDispatch();
+  const [searchParams] = useSearchParams();
+  const locatorId = searchParams.get('show');
+  const isScrolledToElement = locatorId === unit.id;
   const [isFormOpen, openForm, closeForm] = useToggle(false);
   const namePrefix = 'unit';
 
@@ -109,10 +113,10 @@ const UnitCard = ({
     // if this items has been newly added, scroll to it.
     // we need to check section.shouldScroll as whole section is fetched when a
     // unit is duplicated under it.
-    if (currentRef.current && (section.shouldScroll || unit.shouldScroll)) {
+    if (currentRef.current && (section.shouldScroll || unit.shouldScroll || isScrolledToElement)) {
       scrollToElement(currentRef.current);
     }
-  }, []);
+  }, [isScrolledToElement]);
 
   useEffect(() => {
     if (savingStatus === RequestStatus.SUCCESSFUL) {
@@ -139,7 +143,7 @@ const UnitCard = ({
       }}
     >
       <div
-        className="unit-card"
+        className={`unit-card ${isScrolledToElement ? 'highlight' : ''}`}
         data-testid="unit-card"
         ref={currentRef}
       >

src/custom.d.ts

@@ -0,0 +1,4 @@
+declare module '*.svg' {
+  const content: string;
+  export default content;
+}

src/search-modal/EmptyStates.jsx

@@ -1,8 +1,30 @@
 /* eslint-disable react/prop-types */
 // @ts-check
 import React from 'react';
+import { FormattedMessage } from '@edx/frontend-platform/i18n';
+import { Stack } from '@openedx/paragon';
 import { useStats, useClearRefinements } from 'react-instantsearch';
 
+import EmptySearchImage from './images/empty-search.svg';
+import NoResultImage from './images/no-results.svg';
+import messages from './messages';
+
+const EmptySearch = () => (
+  <Stack className="d-flex mt-6 align-items-center">
+    <p className="fs-large"> <FormattedMessage {...messages.emptySearchTitle} /> </p>
+    <p className="small text-muted"> <FormattedMessage {...messages.emptySearchSubtitle} /> </p>
+    <img src={EmptySearchImage} alt="" />
+  </Stack>
+);
+
+const NoResults = () => (
+  <Stack className="d-flex mt-6 align-items-center">
+    <p className="fs-large"> <FormattedMessage {...messages.noResultsTitle} /> </p>
+    <p className="small text-muted"> <FormattedMessage {...messages.noResultsSubtitle} /> </p>
+    <img src={NoResultImage} alt="" />
+  </Stack>
+);
+
 /**
  * If the user hasn't put any keywords/filters yet, display an "empty state".
  * Likewise, if the results are empty (0 results), display a special message.
@@ -16,12 +38,10 @@ const EmptyStates = ({ children }) => {
 
   if (!hasQuery && !hasFiltersApplied) {
     // We haven't started the search yet. Display the "start your search" empty state
-    // Note this isn't localized because it's going to be replaced in a fast-follow PR.
-    return <p className="text-muted text-center mt-6">Enter a keyword or select a filter to begin searching.</p>;
+    return <EmptySearch />;
   }
   if (nbHits === 0) {
-    // Note this isn't localized because it's going to be replaced in a fast-follow PR.
-    return <p className="text-muted text-center mt-6">No results found. Change your search and try again.</p>;
+    return <NoResults />;
   }
 
   return children;

src/search-modal/SearchEndpointLoader.jsx

@@ -10,8 +10,8 @@ import { useContentSearch } from './data/apiHooks';
 import SearchUI from './SearchUI';
 import messages from './messages';
 
-/** @type {React.FC<{courseId: string}>} */
-const SearchEndpointLoader = ({ courseId }) => {
+/** @type {React.FC<{courseId: string, closeSearch?: () => void}>} */
+const SearchEndpointLoader = ({ courseId, closeSearch }) => {
   const intl = useIntl();
 
   // Load the Meilisearch connection details from the LMS: the URL to use, the index name, and an API key specific
@@ -25,7 +25,7 @@ const SearchEndpointLoader = ({ courseId }) => {
   const title = intl.formatMessage(messages.title);
 
   if (searchEndpointData) {
-    return <SearchUI {...searchEndpointData} courseId={courseId} />;
+    return <SearchUI {...searchEndpointData} courseId={courseId} closeSearch={closeSearch} />;
   }
   return (
     <>

src/search-modal/SearchModal.jsx

@@ -1,8 +1,8 @@
 /* eslint-disable react/prop-types */
 // @ts-check
 import React from 'react';
-import { ModalDialog } from '@openedx/paragon';
 import { useIntl } from '@edx/frontend-platform/i18n';
+import { ModalDialog } from '@openedx/paragon';
 
 import SearchEndpointLoader from './SearchEndpointLoader';
 import messages from './messages';
@@ -24,7 +24,7 @@ const SearchModal = ({ courseId, ...props }) => {
       isFullscreenOnMobile
       className="courseware-search-modal"
     >
-      <SearchEndpointLoader courseId={courseId} />
+      <SearchEndpointLoader courseId={courseId} closeSearch={props.onClose} />
     </ModalDialog>
   );
 };

src/search-modal/SearchModal.scss

@@ -64,8 +64,7 @@
     }
   }
 
-  .ais-InfiniteHits-loadPrevious,
-  .ais-InfiniteHits-loadMore--disabled {
-    display: none; // temporary; remove this once we implement our own <Hits>/<InfiniteHits> component.
+  .fs-large {
+    font-size: $font-size-base * 1.25;
   }
 }

src/search-modal/SearchModal.test.jsx

@@ -23,6 +23,11 @@ const queryClient = new QueryClient({
   },
 });
 
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useSelector: jest.fn(),
+}));
+
 const RootWrapper = () => (
   <AppProvider store={store}>
     <IntlProvider locale="en" messages={{}}>
@@ -59,7 +64,7 @@ describe('<SearchModal />', () => {
       apiKey: 'test-api-key',
     });
     const { findByText } = render(<RootWrapper />);
-    expect(await findByText('Enter a keyword or select a filter to begin searching.')).toBeInTheDocument();
+    expect(await findByText('Start searching to find content')).toBeInTheDocument();
   });
 
   it('should render the spinner while the config is loading', () => {