Merge branch 'master' into chris/FAL-4282-max-blocks-per-content

Author: ChrisChV

src/library-authoring/import-course/ImportDetailsPage.test.tsx

@@ -109,6 +109,7 @@ describe('<ImportDetailsPage />', () => {
   });
 
   it('should render Partial Succeeded state', async () => {
+    const user = userEvent.setup();
     mockGetModulestoreMigratedBlocksInfo.applyMockPartial();
     (useGetContentHits as jest.Mock).mockReturnValue({
       isPending: false,
@@ -143,12 +144,12 @@ describe('<ImportDetailsPage />', () => {
     expect(await screen.findByText(/partial import successful/i)).toBeInTheDocument();
 
     expect(await screen.findByText(/Total Blocks/i)).toBeInTheDocument();
-    expect(await screen.findByText('2/5')).toBeInTheDocument();
+    expect(await screen.findByText('2/3')).toBeInTheDocument();
     expect(await screen.findByText(/Components/i)).toBeInTheDocument();
-    expect(await screen.findByText('1/4')).toBeInTheDocument();
+    expect(await screen.findByText('1/2')).toBeInTheDocument();
 
     expect(await screen.findByText(
-      /40% of course test course has been imported successfully/i,
+      /66% of course test course has been imported successfully/i,
     )).toBeInTheDocument();
 
     expect(await screen.findByRole('cell', {
@@ -165,7 +166,7 @@ describe('<ImportDetailsPage />', () => {
       name: /view imported content/i,
     });
 
-    await viewImportedContentBtn.click();
+    await user.click(viewImportedContentBtn);
     await waitFor(() => expect(mockNavigate).toHaveBeenCalledWith('/library/lib:Axim:TEST/collection/coll'));
   });
 });

src/library-authoring/import-course/ImportDetailsPage.tsx

@@ -100,12 +100,6 @@ const ImportDetailsContent = () => {
         // The migrations of this block is failed
         counts.unsupported += 1;
         resultUnsupportedIds.push(block.sourceKey);
-
-        if (block.unsupportedReason) {
-          // Verify if the unsupported block has children
-          const match = block.unsupportedReason.match(/It has (\d+) children/);
-          counts.unsupported += match ? Number(match[1]) : 0;
-        }
       } else {
         counts.totalBlocks += 1;
         const blockType = getBlockType(block.sourceKey);

src/library-authoring/import-course/messages.ts

@@ -181,12 +181,12 @@ const messages = defineMessages({
   },
   importCourseAnalysisCompleteSomeContentBody: {
     id: 'library-authoring.import-course.review-details.analysis-complete.100.body',
-    defaultMessage: '{unsupportedBlockPercentage}% of content cannot be imported. For details see below.',
+    defaultMessage: '{supportedBlockPercentage}% of course content will be imported into a collection in your library called {courseName}. Some content will not be imported. For details see below.',
     description: 'Body of the info card when course import analysis is complete and some data can be imported.',
   },
   importCourseAnalysisDetailsUnsupportedBlocksBody: {
     id: 'library-authoring.import-course.review-details.analysis-details.unsupportedBlocks.body',
-    defaultMessage: 'The following block types cannot be imported into your library because they\'re are not yet supported. These block types will be replaced with a placeholder block in the library. For more information, reference the Help & Support sidebar.',
+    defaultMessage: 'Some block types cannot be imported into your library because they’re not yet supported. These blocks will be replaced with a placeholder block in the library. For more information, reference the Help & Support sidebar.',
     description: 'Body of analysis details when some unsupported blocks are present',
   },
   importCourseComponentsUnsupportedInfo: {

src/library-authoring/import-course/stepper/ReviewImportDetails.test.tsx

@@ -119,7 +119,7 @@ describe('ReviewImportDetails', () => {
     expect(await screen.findByRole('alert')).toBeInTheDocument();
     expect(await screen.findByText(/Import Analysis Complete/i)).toBeInTheDocument();
     expect(await screen.findByText(
-      /25.00% of content cannot be imported. For details see below./i,
+      /75% of course content will be imported into a collection in your library called Test Course. Some content will not be imported. For details see below./i,
     )).toBeInTheDocument();
     expect(await screen.findByText(/Total Blocks/i)).toBeInTheDocument();
     expect(await screen.findByText('15/20')).toBeInTheDocument();

src/library-authoring/import-course/stepper/ReviewImportDetails.tsx

@@ -115,7 +115,8 @@ const Banner = ({
           <FormattedMessage
             {...messages.importCourseAnalysisCompleteSomeContentBody}
             values={{
-              unsupportedBlockPercentage: unsupportedBlockPercentage.toFixed(2),
+              supportedBlockPercentage: (100 - unsupportedBlockPercentage).toFixed(0),
+              courseName: data?.title || '',
             }}
           />
         </p>