raccoongang · monteri · Apr 29, 2024 · Apr 29, 2024 · Apr 29, 2024
diff --git a/src/course-outline/CourseOutline.jsx b/src/course-outline/CourseOutline.jsx
@@ -45,12 +45,12 @@ import HighlightsModal from './highlights-modal/HighlightsModal';
 import EmptyPlaceholder from './empty-placeholder/EmptyPlaceholder';
 import PublishModal from './publish-modal/PublishModal';
 import PageAlerts from './page-alerts/PageAlerts';
-import DraggableList from './drag-helper/DraggableList';
+import DraggableList from '../generic/drag-helper/DraggableList';
 import {
   canMoveSection,
   possibleUnitMoves,
   possibleSubsectionMoves,
-} from './drag-helper/utils';
+} from '../generic/drag-helper/utils';
 import { useCourseOutline } from './hooks';
 import messages from './messages';
 

diff --git a/src/course-outline/CourseOutline.scss b/src/course-outline/CourseOutline.scss
@@ -7,7 +7,7 @@
 @import "./empty-placeholder/EmptyPlaceholder";
 @import "./highlights-modal/HighlightsModal";
 @import "./publish-modal/PublishModal";
-@import "./drag-helper/SortableItem";
+@import "../generic/drag-helper/SortableItem";
 @import "./xblock-status/XBlockStatus";
 
 div.row:has(> div > div.highlight) {

diff --git a/src/course-outline/CourseOutline.test.jsx b/src/course-outline/CourseOutline.test.jsx
@@ -56,7 +56,7 @@ import {
   moveUnitOver,
   moveSubsection,
   moveUnit,
-} from './drag-helper/utils';
+} from '../generic/drag-helper/utils';
 
 let axiosMock;
 let store;

diff --git a/src/course-outline/section-card/SectionCard.jsx b/src/course-outline/section-card/SectionCard.jsx
@@ -13,8 +13,8 @@ import classNames from 'classnames';
 import { setCurrentItem, setCurrentSection } from '../data/slice';
 import { RequestStatus } from '../../data/constants';
 import CardHeader from '../card-header/CardHeader';
-import SortableItem from '../drag-helper/SortableItem';
-import { DragContext } from '../drag-helper/DragContextProvider';
+import SortableItem from '../../generic/drag-helper/SortableItem';
+import { DragContext } from '../../generic/drag-helper/DragContextProvider';
 import TitleButton from '../card-header/TitleButton';
 import XBlockStatus from '../xblock-status/XBlockStatus';
 import { getItemStatus, getItemStatusBorder, scrollToElement } from '../utils';

diff --git a/src/course-outline/subsection-card/SubsectionCard.jsx b/src/course-outline/subsection-card/SubsectionCard.jsx
@@ -14,8 +14,8 @@ import { isEmpty } from 'lodash';
 import { setCurrentItem, setCurrentSection, setCurrentSubsection } from '../data/slice';
 import { RequestStatus } from '../../data/constants';
 import CardHeader from '../card-header/CardHeader';
-import SortableItem from '../drag-helper/SortableItem';
-import { DragContext } from '../drag-helper/DragContextProvider';
+import SortableItem from '../../generic/drag-helper/SortableItem';
+import { DragContext } from '../../generic/drag-helper/DragContextProvider';
 import { useCopyToClipboard, PasteComponent } from '../../generic/clipboard';
 import TitleButton from '../card-header/TitleButton';
 import XBlockStatus from '../xblock-status/XBlockStatus';

diff --git a/src/course-outline/unit-card/UnitCard.jsx b/src/course-outline/unit-card/UnitCard.jsx
@@ -9,7 +9,7 @@ import { useSearchParams } from 'react-router-dom';
 import { setCurrentItem, setCurrentSection, setCurrentSubsection } from '../data/slice';
 import { RequestStatus } from '../../data/constants';
 import CardHeader from '../card-header/CardHeader';
-import SortableItem from '../drag-helper/SortableItem';
+import SortableItem from '../../generic/drag-helper/SortableItem';
 import TitleLink from '../card-header/TitleLink';
 import XBlockStatus from '../xblock-status/XBlockStatus';
 import { getItemStatus, getItemStatusBorder, scrollToElement } from '../utils';

diff --git a/src/course-unit/CourseUnit.test.jsx b/src/course-unit/CourseUnit.test.jsx
@@ -597,6 +597,14 @@ describe('<CourseUnit />', () => {
             name: 'New Cloned XBlock',
             block_id: '1234567890',
             block_type: 'drag-and-drop-v2',
+            actions: {
+              canCopy: true,
+              canDuplicate: true,
+              canMove: true,
+              canManageAccess: true,
+              canManageTags: true,
+              canDelete: true,
+            },
             user_partition_info: {},
           },
         ],
@@ -990,10 +998,7 @@ describe('<CourseUnit />', () => {
         children: [
           {
             ...courseVerticalChildrenMock.children[0],
-            actions: {
-              ...courseVerticalChildrenMock.children[0].actions,
-              updatedXBlockActions,
-            },
+            actions: updatedXBlockActions,
           },
         ],
       });
@@ -1009,7 +1014,7 @@ describe('<CourseUnit />', () => {
       const moveBtn = queryByRole('button', { name: courseXBlockMessages.blockLabelButtonMove.defaultMessage });
       const copyToClipboardBtn = queryByRole('button', { name: courseXBlockMessages.blockLabelButtonCopyToClipboard.defaultMessage });
       const manageAccessBtn = queryByRole('button', { name: courseXBlockMessages.blockLabelButtonManageAccess.defaultMessage });
-      const manageTagsBtn = queryByRole('button', { name: courseXBlockMessages.blockLabelButtonManageTags.defaultMessage });
+      const manageTagsBtn = queryByRole('link', { name: courseXBlockMessages.blockLabelButtonManageTags.defaultMessage });
 
       expect(deleteBtn).not.toBeInTheDocument();
       expect(duplicateBtn).not.toBeInTheDocument();

diff --git a/src/course-unit/course-xblock/CourseXBlock.scss b/src/course-unit/course-xblock/CourseXBlock.scss
@@ -22,11 +22,6 @@
       font-size: $font-size-sm;
     }
 
-    .pgn__card-header-subtitle-md {
-      margin-top: 0;
-      font-size: 1rem;
-    }
-
     .pgn__card-header-title-md {
       font: 700 1.375rem/1.75rem $font-family-sans-serif;
       color: $black;

diff --git a/src/course-unit/course-xblock/messages.js b/src/course-unit/course-xblock/messages.js
@@ -54,14 +54,6 @@ const messages = defineMessages({
     id: 'course-authoring.course-unit.xblock.button.manageTags.label',
     defaultMessage: 'Manage tags',
   },
-  visibilityMessage: {
-    id: 'course-authoring.course-unit.xblock.visibility.message',
-    defaultMessage: 'Access restricted to: {selectedGroupsLabel}',
-  },
-  validationSummary: {
-    id: 'course-authoring.course-unit.xblock.validation.summary',
-    defaultMessage: 'This component has validation issues.',
-  },
   expandTooltip: {
     id: 'course-authoring.course-unit.xblock.expandTooltip',
     defaultMessage: 'Collapse/Expand this block',

diff --git a/src/course-unit/header-title/HeaderTitle.jsx b/src/course-unit/header-title/HeaderTitle.jsx
@@ -50,7 +50,7 @@ const HeaderTitle = ({
 
   return (
     <>
-      <div className="d-flex align-items-center lead">
+      <div className="d-flex align-items-center lead" data-testid="unit-header-title">
         {isTitleEditFormOpen ? (
           <Form.Group className="m-0">
             <Form.Control

diff --git a/src/course-unit/header-title/messages.js b/src/course-unit/header-title/messages.js
@@ -26,14 +26,6 @@ const messages = defineMessages({
     defaultMessage: 'Access to some content in this unit is restricted to specific groups of learners.',
     description: 'The label text of some content restriction in this unit',
   },
-  definedVisibilityMessage: {
-    id: 'course-authoring.course-unit.heading.visibility.defined.message',
-    defaultMessage: 'Access to this unit is restricted to: {selectedGroupsLabel}',
-  },
-  commonVisibilityMessage: {
-    id: 'course-authoring.course-unit.heading.visibility.common.message',
-    defaultMessage: 'Access to some content in this unit is restricted to specific groups of learners.',
-  },
 });
 
 export default messages;
diff --git a/src/generic/drag-helper/DraggableList.jsx b/src/generic/drag-helper/DraggableList.jsx
@@ -16,7 +16,7 @@ import {
 import { restrictToVerticalAxis } from '@dnd-kit/modifiers';
 
 import DragContextProvider from './DragContextProvider';
-import { COURSE_BLOCK_NAMES } from '../constants';
+import { COURSE_BLOCK_NAMES } from '../../constants';
 import {
   moveSubsectionOver,
   moveUnitOver,

diff --git a/src/generic/modal-dropzone/ModalDropzone.test.jsx b/src/generic/modal-dropzone/ModalDropzone.test.jsx
@@ -138,13 +138,13 @@ describe('<ModalDropzone />', () => {
     const { getByText, getByRole } = render(<RootWrapper {...props} maxSize={maxSizeInBytes} />);
     const dropzoneInput = getByRole('presentation', { hidden: true });
 
-    const file = new File(
+    const imageFile = new File(
       [new ArrayBuffer(maxSizeInBytes + 1)],
       'test-file.png',
       { type: 'image/png' },
     );
 
-    userEvent.upload(dropzoneInput.firstChild, file);
+    userEvent.upload(dropzoneInput.firstChild, imageFile);
 
     await waitFor(() => {
       // Assert that the error message is displayed
@@ -164,13 +164,13 @@ describe('<ModalDropzone />', () => {
     );
     const dropzoneInput = getByRole('presentation', { hidden: true });
 
-    const file = new File(
+    const imageFile = new File(
       [new ArrayBuffer(maxSizeInBytes + 1)],
       'test-file.png',
       { type: 'image/png' },
     );
 
-    userEvent.upload(dropzoneInput.firstChild, file);
+    userEvent.upload(dropzoneInput.firstChild, imageFile);
 
     await waitFor(() => {
       expect(getByText(expectedErrorMessage)).toBeInTheDocument();