style: Nits in the code

Author: ChrisChV

src/generic/key-utils.test.ts

@@ -2,7 +2,6 @@ import {
   buildCollectionUsageKey,
   ContainerType,
   getBlockType,
-  getBlockTypeBlockV1,
   getLibraryId,
   isLibraryKey,
   isLibraryV1Key,
@@ -19,13 +18,19 @@ describe('component utils', () => {
       ['lct:org:lib:unit:my-unit-9284e2', 'unit'],
       ['lct:org:lib:section:my-section-9284e2', 'section'],
       ['lct:org:lib:subsection:my-section-9284e2', 'subsection'],
+      ['block-v1:org+type@html+block@1', 'html'],
+      ['block-v1:OpenCraftX+type@html+block@1571fe018-f3ce-45c9-8f53-5dafcb422fdd', 'html'],
+      ['block-v1:Axim+type@problem+block@571fe018-f3ce-45c9-8f53-5dafcb422fdd', 'problem'],
+      ['block-v1:org+type@unit+block@1', 'unit'],
+      ['block-v1:org+type@section+block@1', 'section'],
+      ['block-v1:org+type@subsection+block@1', 'subsection'],
     ]) {
       it(`returns '${expected}' for usage key '${input}'`, () => {
         expect(getBlockType(input)).toStrictEqual(expected);
       });
     }
 
-    for (const input of ['', undefined, null, 'not a key', 'lb:foo']) {
+    for (const input of ['', undefined, null, 'not a key', 'lb:foo', 'block-v1:foo']) {
       it(`throws an exception for usage key '${input}'`, () => {
         expect(() => getBlockType(input as any)).toThrow(`Invalid usageKey: ${input}`);
       });
@@ -143,25 +148,4 @@ describe('component utils', () => {
       });
     }
   });
-
-  describe('getBlockTypeBlockV1', () => {
-    for (const [input, expected] of [
-      ['block-v1:org+type@html+block@1', 'html'],
-      ['block-v1:OpenCraftX+type@html+block@1571fe018-f3ce-45c9-8f53-5dafcb422fdd', 'html'],
-      ['block-v1:Axim+type@problem+block@571fe018-f3ce-45c9-8f53-5dafcb422fdd', 'problem'],
-      ['block-v1:org+type@unit+block@1', 'unit'],
-      ['block-v1:org+type@section+block@1', 'section'],
-      ['block-v1:org+type@subsection+block@1', 'subsection'],
-    ]) {
-      it(`returns '${expected}' for usage key '${input}'`, () => {
-        expect(getBlockTypeBlockV1(input)).toStrictEqual(expected);
-      });
-    }
-
-    for (const input of ['', undefined, null, 'not a key', 'block-v1:foo']) {
-      it(`throws an exception for usage key '${input}'`, () => {
-        expect(() => getBlockTypeBlockV1(input as any)).toThrow(`Invalid usageKey: ${input}`);
-      });
-    }
-  });
 });

src/generic/key-utils.ts

@@ -1,13 +1,20 @@
 /**
- * Given a usage key like `lb:org:lib:html:id`, get the type (e.g. `html`)
- * @param usageKey e.g. `lb:org:lib:html:id`
+ * Given a usage key like `lb:org:lib:html:id` or `block-v1:org+type@html+block@1`, get the type (e.g. `html`)
+ * @param usageKey e.g. `lb:org:lib:html:id`, `block-v1:org+type@html+block@1`
  * @returns The block type as a string
  */
 export function getBlockType(usageKey: string): string {
-  if (usageKey && (usageKey.startsWith('lb:') || usageKey.startsWith('lct:'))) {
-    const blockType = usageKey.split(':')[3];
-    if (blockType) {
-      return blockType;
+  if (usageKey) {
+    if (usageKey.startsWith('lb:') || usageKey.startsWith('lct:')) {
+      const blockType = usageKey.split(':')[3];
+      if (blockType) {
+        return blockType;
+      }
+    } else if (usageKey.startsWith('block-v1:')) {
+      const blockType = usageKey.match(/type@([^+]+)/);
+      if (blockType) {
+        return blockType[1];
+      }
     }
   }
   throw new Error(`Invalid usageKey: ${usageKey}`);
@@ -126,18 +133,3 @@ export function normalizeContainerType(containerType: ContainerType | string) {
       return containerType;
   }
 }
-
-/**
- * Given a usage key of V1 block like `block-v1:org+type@html+block@1`, get the type (e.g. `html`)
- * @param usageKey e.g. `block-v1:org+type@html+block@1`
- * @returns The block type as a string
- */
-export function getBlockTypeBlockV1(usageKey: string): string {
-  if (usageKey && usageKey.startsWith('block-v1:')) {
-    const blockType = usageKey.match(/type@([^+]+)/);
-    if (blockType) {
-      return blockType[1];
-    }
-  }
-  throw new Error(`Invalid usageKey: ${usageKey}`);
-}

src/library-authoring/data/api.mocks.ts

@@ -1137,7 +1137,7 @@ export async function mockGetCourseImports(libraryId: string): ReturnType<typeof
 mockGetCourseImports.libraryId = mockContentLibrary.libraryId;
 mockGetCourseImports.emptyLibraryId = mockContentLibrary.libraryId2;
 mockGetCourseImports.succeedImport = {
-  taskUuid: '1',
+  taskUuid: '2d35e36b-1234-1234-1234-123456789000',
   source: {
     key: 'course-v1:edX+DemoX+2025_T1',
     displayName: 'DemoX 2025 T1',

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

@@ -56,7 +56,7 @@ const render = (migrationTaskId: string) => (
   )
 );
 
-describe('', () => {
+describe('<ImportDetailsPage />', () => {
   beforeEach(() => {
     const newMocks = initializeMocks();
     axiosMock = newMocks.axiosMock;