Merge branch 'release/2.12.0'

UMN-LATIS · May 14, 2024 · 1258105 · 1258105
2 parents b158d57 + d02fbed
commit 1258105
Show file tree

Hide file tree

Showing 7 changed files with 22,810 additions and 17,920 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -35,17 +35,17 @@ jobs:
           docker-compose ps --all
 
       - run: docker-compose exec -T app ./bin/ci.sh
-      - run: yarn install --frozen-lockfile
-      - run: yarn build
+      - run: npm ci
+      - run: npm run build
       - run: docker-compose exec -T app php artisan key:generate
       - run: docker-compose exec -T app php artisan migrate:fresh
       - run: docker-compose exec -T app php artisan db:seed
 
       - name: Lint code
-        run: docker-compose exec -T app yarn run lint
+        run: docker-compose exec -T app npm run lint
 
       - name: Run unit tests with Jest
-        run: docker-compose exec -T app yarn run test:unit
+        run: docker-compose exec -T app npm run test:unit
 
       - name: Run E2E tests with Cypress
         uses: cypress-io/github-action@v6

diff --git a/app/Http/Controllers/LTI13Handler.php b/app/Http/Controllers/LTI13Handler.php
@@ -167,7 +167,7 @@ public function launch() {
                 if(isset($endpointData["lineitem"]) && $chime->lti_grade_mode == LTI13ResourceLink::LTI_GRADE_MODE_MULTIPLE_GRADES) {
 
                     // check if the lineitem attached matches a folder
-                    $folder = \App\Folder::where("lti_lineitem", $endpointData["lineitem"])->first();
+                    $folder = $chime->folders()->where("lti_lineitem", $endpointData["lineitem"])->first();
 
                     if(!$folder && $chime) {
                         // let's check if the chime has this folder created without a resource link

diff --git a/composer.json b/composer.json
@@ -46,7 +46,7 @@
     "laravel/tinker": "~2.0",
     "laravelcollective/html": "^6.1",
     "orangehill/iseed": "^3.0",
-    "packbackbooks/lti-1p3-tool": "dev-upstream-merge",
+    "packbackbooks/lti-1p3-tool": "dev-upstream-merge-2",
     "predis/predis": "^1.1",
     "razorbacks/laravel-shibboleth": "dev-umn",
     "sentry/sentry-laravel": "^3.1",