Revert "fix: Avoid Open library item info sidebar when selection from course or unit"

This reverts commit d0d6696.

Author: ChrisChV

src/course-outline/outline-sidebar/AddSidebar.tsx

@@ -304,7 +304,6 @@ const ShowLibraryContent = () => {
         visibleTabs={[ContentType.home]}
         FiltersComponent={SidebarFilters}
         onComponentSelected={onComponentSelected}
-        restrictOpenInfoSidebar
       />
     </MultiLibraryProvider>
   );

src/course-unit/unit-sidebar/AddSidebar.tsx

@@ -311,7 +311,6 @@ const AddLibraryContent = () => {
         visibleTabs={[ContentType.home]}
         FiltersComponent={SidebarFilters}
         onComponentSelected={handleSelection}
-        restrictOpenInfoSidebar
       />
     </MultiLibraryProvider>
   );

src/library-authoring/common/context/ComponentPickerContext.tsx

@@ -24,15 +24,13 @@ type NoComponentPickerType = {
   addComponentToSelectedComponents?: never;
   removeComponentFromSelectedComponents?: never;
   restrictToLibrary?: never;
-  restrictOpenInfoSidebar?: never;
   extraFilter?: never;
   isLoading?: never;
   setIsLoading?: never;
 };
 
 type BasePickerType = {
   restrictToLibrary: boolean;
-  restrictOpenInfoSidebar: boolean;
   extraFilter: string[];
   isLoading?: boolean;
   setIsLoading?: React.Dispatch<React.SetStateAction<boolean>>;
@@ -66,7 +64,6 @@ const ComponentPickerContext = createContext<ComponentPickerContextData | undefi
 
 type BasePickerProps = {
   restrictToLibrary?: boolean;
-  restrictOpenInfoSidebar?: boolean;
   /** Only show published components */
   extraFilter?: string[];
 };
@@ -96,7 +93,6 @@ export const ComponentPickerProvider = ({
   children,
   componentPickerMode,
   restrictToLibrary = false,
-  restrictOpenInfoSidebar = false,
   onComponentSelected,
   onChangeComponentSelection,
   extraFilter,
@@ -140,7 +136,6 @@ export const ComponentPickerProvider = ({
         return {
           componentPickerMode,
           restrictToLibrary,
-          restrictOpenInfoSidebar,
           onComponentSelected,
           extraFilter: extraFilter || [],
           isLoading,
@@ -150,7 +145,6 @@ export const ComponentPickerProvider = ({
         return {
           componentPickerMode,
           restrictToLibrary,
-          restrictOpenInfoSidebar,
           selectedComponents,
           addComponentToSelectedComponents,
           removeComponentFromSelectedComponents,

src/library-authoring/component-picker/ComponentPicker.test.tsx

@@ -18,9 +18,8 @@ import {
   mockGetContainerMetadata,
 } from '../data/api.mocks';
 
-import { ComponentPicker, LibraryAndComponentPicker } from './ComponentPicker';
-import { ContentType, allLibraryPageTabs } from '../routes';
-import { LibraryProvider } from '../common/context/LibraryContext';
+import { LibraryAndComponentPicker } from './ComponentPicker';
+import { ContentType } from '../routes';
 
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
@@ -458,70 +457,3 @@ describe('<LibraryAndComponentPicker />', () => {
     expect(screen.queryByText(/never published/i)).not.toBeInTheDocument();
   });
 });
-
-describe('<ComponentPicker restrictOpenInfoSidebar />', () => {
-  const { libraryId } = mockContentLibrary;
-
-  const renderPicker = (restrictOpenInfoSidebar: boolean) => render(
-    <LibraryProvider libraryId={libraryId}>
-      <ComponentPicker
-        componentPickerMode="single"
-        restrictOpenInfoSidebar={restrictOpenInfoSidebar}
-        visibleTabs={allLibraryPageTabs}
-      />
-    </LibraryProvider>,
-  );
-
-  beforeEach(() => {
-    initializeMocks();
-    mockSearchResult({ ...mockResult });
-  });
-
-  it('should open component info sidebar on card click when restrictOpenInfoSidebar is false', async () => {
-    const user = userEvent.setup();
-    renderPicker(false);
-
-    const [componentCard] = await screen.findAllByText('Introduction to Testing');
-
-    // Click on the component card body
-    await user.click(componentCard);
-
-    // Sidebar should open
-    expect(await screen.findByTestId('library-sidebar')).toBeInTheDocument();
-  });
-
-  it('should not open component info sidebar on card click when restrictOpenInfoSidebar is true', async () => {
-    const user = userEvent.setup();
-    renderPicker(true);
-
-    const [componentCard] = await screen.findAllByText('Introduction to Testing');
-
-    // Click on the component card body
-    await user.click(componentCard);
-
-    // Sidebar should NOT open
-    expect(screen.queryByTestId('library-sidebar')).not.toBeInTheDocument();
-  });
-
-  it('should open container info sidebar on card click when restrictOpenInfoSidebar is false', async () => {
-    const user = userEvent.setup();
-    renderPicker(false);
-
-    // Click on the unit card body
-    await user.click(await screen.findByText('Published Test Unit'));
-
-    // Sidebar should open
-    expect(await screen.findByTestId('library-sidebar')).toBeInTheDocument();
-  });
-
-  it('should not open container info sidebar on card click when restrictOpenInfoSidebar is true', async () => {
-    const user = userEvent.setup();
-    renderPicker(true);
-
-    // Click on the unit card body
-    await user.click(await screen.findByText('Published Test Unit'));
-
-    // Sidebar should NOT open
-    expect(screen.queryByTestId('library-sidebar')).not.toBeInTheDocument();
-  });
-});

src/library-authoring/component-picker/ComponentPicker.tsx

@@ -58,7 +58,6 @@ type PickerProps = {
   extraFilter?: string[];
   visibleTabs?: ContentType[];
   componentPickerMode?: 'single' | 'multiple';
-  restrictOpenInfoSidebar?: boolean;
   onComponentSelected?: ComponentSelectedEvent;
   onChangeComponentSelection?: ComponentSelectionChangedEvent;
   FiltersComponent?: React.ComponentType<FiltersProps>;
@@ -71,7 +70,6 @@ export const ComponentPicker = ({
   showOnlyPublished,
   extraFilter,
   componentPickerMode = 'single',
-  restrictOpenInfoSidebar = false,
   visibleTabs = allLibraryPageTabs,
   /** This default callback is used to send the selected component back to the parent window,
    * when the component picker is used in an iframe.
@@ -89,19 +87,15 @@ export const ComponentPicker = ({
 
   const restrictToLibrary = !!libraryId;
 
-  const componentPickerProviderProps = componentPickerMode === 'single' ?
-    {
-      componentPickerMode,
-      onComponentSelected,
-      restrictToLibrary,
-      restrictOpenInfoSidebar,
-    } :
-    {
-      componentPickerMode,
-      onChangeComponentSelection,
-      restrictToLibrary,
-      restrictOpenInfoSidebar,
-    };
+  const componentPickerProviderProps = componentPickerMode === 'single' ? {
+    componentPickerMode,
+    onComponentSelected,
+    restrictToLibrary,
+  } : {
+    componentPickerMode,
+    onChangeComponentSelection,
+    restrictToLibrary,
+  };
 
   return (
     <PublishedFilterContextProvider showOnlyPublished={calcShowOnlyPublished}>

src/library-authoring/components/ComponentCard.tsx

@@ -17,7 +17,7 @@ type ComponentCardProps = {
 
 const ComponentCard = ({ hit }: ComponentCardProps) => {
   const { openComponentInfoSidebar, openItemSidebar, sidebarItemInfo } = useSidebarContext();
-  const { componentPickerMode, restrictOpenInfoSidebar } = useComponentPickerContext();
+  const { componentPickerMode } = useComponentPickerContext();
   const { showOnlyPublished } = usePublishedFilterContext();
 
   const {
@@ -38,10 +38,6 @@ const ComponentCard = ({ hit }: ComponentCardProps) => {
     if (!componentPickerMode) {
       openItemSidebar(usageKey, SidebarBodyItemId.ComponentInfo);
     } else {
-      if (restrictOpenInfoSidebar) {
-        // Do nothing on select
-        return;
-      }
       // In component picker mode, we want to open the sidebar
       // without changing the URL
       openComponentInfoSidebar(usageKey);

src/library-authoring/containers/ContainerCard.tsx

@@ -262,7 +262,7 @@ type ContainerCardProps = {
 };
 
 const ContainerCard = ({ hit }: ContainerCardProps) => {
-  const { componentPickerMode, restrictOpenInfoSidebar } = useComponentPickerContext();
+  const { componentPickerMode } = useComponentPickerContext();
   const { showOnlyPublished } = usePublishedFilterContext();
   const { openContainerInfoSidebar, openItemSidebar, sidebarItemInfo } = useSidebarContext();
 
@@ -293,10 +293,6 @@ const ContainerCard = ({ hit }: ContainerCardProps) => {
   const selectContainer = useCallback((e?: React.MouseEvent) => {
     const doubleClicked = (e?.detail || 0) > 1;
     if (componentPickerMode) {
-      if (restrictOpenInfoSidebar) {
-        // Do nothing on select
-        return;
-      }
       // In component picker mode, we want to open the sidebar
       // without changing the URL
       openContainerInfoSidebar(containerKey);