fix(h5p-server): library list works if library dependencies are missi…

…ng (#1342) Fixes #1183
Lumieducation · Apr 25, 2021 · 6dab877 · 6dab877
1 parent e5ac643
commit 6dab877
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
         "test:db": "npx jest --config jest.db.config.js --maxWorkers=${BUILD_WORKERS-`nproc`} --logHeapUsage",
         "test:html-exporter": "jest --config packages/h5p-html-exporter/jest.config.js --logHeapUsage --maxWorkers=${BUILD_WORKERS-`nproc`}",
         "test:integration": "npx jest --config jest.integration.config.js --maxWorkers=${BUILD_WORKERS-`nproc`} --logHeapUsage",
-        "test:server+upload": "npm run test:server+upload --repfix packages/h5p-server",
+        "test:server+upload": "npm run test:server+upload --prefix packages/h5p-server",
         "test:upload": "npm run test:upload --prefix packages/h5p-server",
         "test:watch": "npm run test:watch --prefix packages/h5p-server",
         "test:watch:h5p-express": "npm run test:watch --prefix packages/h5p-express",

diff --git a/packages/h5p-server/src/LibraryAdministration.ts b/packages/h5p-server/src/LibraryAdministration.ts
@@ -7,6 +7,9 @@ import {
     ILibraryAdministrationOverviewItem,
     IInstalledLibrary
 } from './types';
+import Logger from './helpers/Logger';
+
+const log = new Logger('LibraryAdministration');
 
 /**
  * This class has methods that perform library administration, i.e, deleted
@@ -48,17 +51,22 @@ export default class LibraryAdministration {
      * usage of libraries across all content objects on the system.
      */
     public async getLibraries(): Promise<ILibraryAdministrationOverviewItem[]> {
+        log.debug('Getting all libraries');
         const libraryNames = await this.libraryManager.libraryStorage.getInstalledLibraryNames();
         const libraryMetadata = (
             await Promise.all(
                 libraryNames.map((lib) => this.libraryManager.getLibrary(lib))
             )
         ).sort((a, b) => a.compare(b));
 
+        log.debug('Getting all dependents count');
         const dependents = await this.libraryManager.libraryStorage.getAllDependentsCount();
 
         return Promise.all(
             libraryMetadata.map(async (metadata) => {
+                log.debug(
+                    `Getting usage data of ${LibraryName.toUberName(metadata)}`
+                );
                 const usage = await this.contentManager.contentStorage.getUsage(
                     metadata
                 );

diff --git a/packages/h5p-server/src/implementation/fs/FileLibraryStorage.ts b/packages/h5p-server/src/implementation/fs/FileLibraryStorage.ts
@@ -235,7 +235,7 @@ export default class FileLibraryStorage implements ILibraryStorage {
                 const ubername = LibraryName.toUberName(dependency);
                 const index = librariesMetadataMap[
                     ubername
-                ].preloadedDependencies?.findIndex((ln) =>
+                ]?.preloadedDependencies?.findIndex((ln) =>
                     LibraryName.equal(ln, libraryMetadata)
                 );
                 if (index >= 0) {