CA: Update npm packages, some major version updates. Remove use of np…

…m option legacy-peer-deps (#2250) * CA: Update npm packages, some major version updates. Remove use of npm option legacy-peer-deps
cerpus · Sep 7, 2023 · 1a8424e · 1a8424e
1 parent 397b841
commit 1a8424e
Show file tree

Hide file tree

Showing 24 changed files with 9,663 additions and 9,498 deletions.
diff --git a/sourcecode/apis/contentauthor/Dockerfile b/sourcecode/apis/contentauthor/Dockerfile
@@ -52,7 +52,7 @@ WORKDIR /app
 RUN npm i -g node-gyp
 
 COPY package.json package-lock.json ./
-RUN npm i --legacy-peer-deps
+RUN npm i
 
 COPY --from=composer_deps /app/vendor/ckeditor/ckeditor vendor/ckeditor/ckeditor
 COPY --from=composer_deps /app/vendor/h5p vendor/h5p

diff --git a/sourcecode/apis/contentauthor/app/Libraries/H5P/Audio/NDLAAudioBrowser.php b/sourcecode/apis/contentauthor/app/Libraries/H5P/Audio/NDLAAudioBrowser.php
@@ -54,7 +54,6 @@ private function buildSearchQuery($queryObject): ?array
         if (empty($queryObject)) {
             return null;
         }
-        $queryObject = json_decode($queryObject, true);
         if (empty($queryObject['query'])) {
             unset($queryObject['query']);
         }

diff --git a/sourcecode/apis/contentauthor/app/Libraries/H5P/Video/NDLAVideoAdapter.php b/sourcecode/apis/contentauthor/app/Libraries/H5P/Video/NDLAVideoAdapter.php
@@ -85,13 +85,12 @@ private function buildSearchQuery($queryObject)
         }
 
         $query = [];
-        $queryObject = json_decode($queryObject);
-        if (!empty($queryObject->query)) {
-            $query['query'] = sprintf('text:%s', $queryObject->query);
+        if (!empty($queryObject['query'])) {
+            $query['query'] = sprintf('text:%s', $queryObject['query']);
         }
-        if (!empty($queryObject->limit) && isset($queryObject->offset)) {
-            $query['limit'] = $queryObject->limit;
-            $query['offset'] = $queryObject->offset;
+        if (!empty($queryObject['limit']) && isset($queryObject['offset'])) {
+            $query['limit'] = $queryObject['limit'];
+            $query['offset'] = $queryObject['offset'];
         }
         return $query;
     }