Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CA: Update npm packages, some major version updates. Remove use of npm option legacy-peer-deps #2250

Merged
merged 7 commits into from
Sep 7, 2023
Merged

CA: Update npm packages, some major version updates. Remove use of npm option legacy-peer-deps #2250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6c9d5e3
CA: Update npm packages, some major version updates. Remove use of np…
chrieinv Apr 13, 2023
2a32d2b
Merge branch 'master' into ca-npm-update-202304
chrieinv Apr 14, 2023
2700910
Merge branch 'master' into ca-npm-update-202304
chrieinv Apr 19, 2023
b00f958
Merge branch 'master' into ca-npm-update-202304
chrieinv Aug 21, 2023
3283dae
Fix typo
chrieinv Aug 21, 2023
b1a5eac
Merge branch 'master' into ca-npm-update-202304
chrieinv Aug 24, 2023
6bcf243
Update npm packages
chrieinv Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sourcecode/apis/contentauthor/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ WORKDIR /app
RUN npm i -g npm 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
Expand Down
1 change: 0 additions & 1 deletion sourcecode/apis/contentauthor/app/Libraries/H5P/Audio/NDLAAudioBrowser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']);
}
Expand Down
11 changes: 5 additions & 6 deletions sourcecode/apis/contentauthor/app/Libraries/H5P/Video/NDLAVideoAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,12 @@
}

$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']);

Check warning on line 89 in sourcecode/apis/contentauthor/app/Libraries/H5P/Video/NDLAVideoAdapter.php

View check run for this annotation

Codecov / codecov/patch

sourcecode/apis/contentauthor/app/Libraries/H5P/Video/NDLAVideoAdapter.php#L88-L89 

Added lines #L88 - L89 were not covered by tests
}
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'];

Check warning on line 93 in sourcecode/apis/contentauthor/app/Libraries/H5P/Video/NDLAVideoAdapter.php

View check run for this annotation

Codecov / codecov/patch

sourcecode/apis/contentauthor/app/Libraries/H5P/Video/NDLAVideoAdapter.php#L91-L93 

Added lines #L91 - L93 were not covered by tests
}
return $query;
}
Expand Down
Loading