adapt-authoring-adaptframework 1.9.1 → 1.9.3

package/.github/workflows/new.yml

@@ -1,29 +1,15 @@
-name: Add to main project
+# Calls the org-level reusable workflow to add PRs to the TODO Board
+
+name: Add PR to Project
 
 on:
-  issues:
-    types:
-      - opened
   pull_request:
     types:
       - opened
+      - reopened
 
 jobs:
   add-to-project:
-    name: Add to main project
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/add-to-project@v0.1.0
-        with:
-          project-url: https://github.com/orgs/adapt-security/projects/5
-          github-token: ${{ secrets.PROJECTS_SECRET }}
-          
-  handle_precommit_pr:
-    if: contains(github.event.pull_request.title, '[pre-commit.ci]')
-    runs-on: ubuntu-latest
-    
-    steps:
-      - name: Label pull request with "_bot"
-        run: gh pr edit ${{ github.event.pull_request.number }} -R ${{ github.repository }} --add-label "_bot"
-        env:
-          GH_TOKEN: ${{ secrets.PROJECTS_SECRET }}
+    uses: adapt-security/.github/.github/workflows/new.yml@main
+    secrets:
+      PROJECTS_SECRET: ${{ secrets.PROJECTS_SECRET }}

package/lib/AdaptFrameworkModule.js

@@ -60,9 +60,6 @@ class AdaptFrameworkModule extends AbstractModule {
     const content = await this.app.waitForModule('content')
     content.accessCheckHook.tap(this.checkContentAccess.bind(this))
 
-    this.postInstallHook.tap(this.installFrameworkModules.bind(this))
-    this.postUpdateHook.tap(this.installFrameworkModules.bind(this))
-
     await this.installFramework()
 
     if (this.app.args['update-framework'] === true) {
@@ -90,20 +87,6 @@ class AdaptFrameworkModule extends AbstractModule {
     return this._version
   }
 
-  /**
-   * Run npm install on framework directory to install/update any dependencies
-   * @type {Promise}
-   */
-  async installFrameworkModules () {
-    this.log('verbose', 'INSTALL_NPM_MODULES')
-    try {
-      await FWUtils.spawnPromise('npm install')
-    } catch (e) {
-      this.log('error', `failed to run npm install, ${e.message}`)
-      throw this.app.errors.FW_INSTALL_FAILED
-    }
-  }
-
   /**
    * Installs a local copy of the Adapt framework
    * @return {Promise}
@@ -113,14 +96,14 @@ class AdaptFrameworkModule extends AbstractModule {
     try {
       try {
         await fs.readFile(path.resolve(this.path, 'package.json'))
-        if (!force) {
-          this.log('verbose', 'INSTALL no action, force !== true')
-          return
+        if (force) {
+          this.log('verbose', 'INSTALL forcing new framework install')
+        } else {
+          return this.log('verbose', 'INSTALL no action, force !== true')
         }
-        this.log('verbose', 'INSTALL forcing new framework install')
         await fs.rm(this.path, { recursive: true })
       } catch (e) {
-        // if src and node_modules are missing, install required
+        // package is missing, an install is required
       }
       await this.runCliCommand('installFramework', { version })
     } catch (e) {
@@ -219,7 +202,7 @@ class AdaptFrameworkModule extends AbstractModule {
     }
     const shareWithUsers = course?._shareWithUsers.map(id => id.toString()) ?? []
     const userId = req.auth.user._id.toString()
-    return course._isShared || shareWithUsers.includes(userId)
+    return course.createdBy.toString() === userId || course._isShared || shareWithUsers.includes(userId)
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-adaptframework",
-  "version": "1.9.1",
+  "version": "1.9.3",
   "description": "Adapt framework integration for the Adapt authoring tool",
   "homepage": "https://github.com/adapt-security/adapt-authoring-adaptframework",
   "license": "GPL-3.0",

package/.github/workflows/labelled_prs.yml

@@ -1,16 +0,0 @@
-name: Add labelled PRs to project
-
-on:
-  pull_request:
-    types: [ labeled ]
-
-jobs:
-  add-to-project:
-    if: ${{ github.event.label.name == 'dependencies' }}
-    name: Add to main project
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/add-to-project@v0.1.0
-        with:
-          project-url: https://github.com/orgs/adapt-security/projects/5
-          github-token: ${{ secrets.PROJECTS_SECRET }}