CarnegieLearningWeb
diff --git a/‎.github/actions/generic-npm-build/action.yml‎
Lines changed: 39 additions & 0 deletions b/‎.github/actions/generic-npm-build/action.yml‎
Lines changed: 39 additions & 0 deletions
diff --git a/‎.github/actions/get-dev-version/action.yml‎
Lines changed: 18 additions & 0 deletions b/‎.github/actions/get-dev-version/action.yml‎
Lines changed: 18 additions & 0 deletions
diff --git a/‎.github/pr-labeler-config.yml‎
Lines changed: 0 additions & 33 deletions b/‎.github/pr-labeler-config.yml‎
Lines changed: 0 additions & 33 deletions
diff --git a/‎.github/workflows/auto-merge-dependabot.yml‎
Lines changed: 0 additions & 13 deletions b/‎.github/workflows/auto-merge-dependabot.yml‎
Lines changed: 0 additions & 13 deletions
diff --git a/‎.husky/pre-commit‎
Lines changed: 5 additions & 6 deletions b/‎.husky/pre-commit‎
Lines changed: 5 additions & 6 deletions
diff --git a/‎.jenkins/projectBuilder.Jenkinsfile‎
Lines changed: 45 additions & 3 deletions b/‎.jenkins/projectBuilder.Jenkinsfile‎
Lines changed: 45 additions & 3 deletions
diff --git a/‎CHANGELOG.md‎
Lines changed: 31 additions & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 31 additions & 0 deletions
diff --git a/‎backend/Dockerrun.aws.json‎
Lines changed: 9 additions & 10 deletions b/‎backend/Dockerrun.aws.json‎
Lines changed: 9 additions & 10 deletions
diff --git a/‎backend/package.json‎
Lines changed: 4 additions & 2 deletions b/‎backend/package.json‎
Lines changed: 4 additions & 2 deletions
@@ -0,0 +1,39 @@
+name: Npm Build Script
+description: Installs dependencies and builds project with npm
+inputs:
+  working_directory:
+    description: Working directory to run build commands in
+    required: true
+  build_script:
+    description: Build script in package.json to run
+    required: false
+    default: build
+  version:
+    description: Version to set in package.json
+    required: false
+    default: ""
+  node_version:
+    description: Version of nodejs to build with
+    required: false
+    default: 18
+runs:
+  using: composite
+  steps:
+    - uses: tw3lveparsecs/github-actions-setvars@v0.1
+    - uses: actions/setup-node@v3
+      with:
+        node-version: ${{ inputs.node_version }}
+        check-latest: true
+    - name: Set Version
+      shell: bash
+      working-directory: ${{ inputs.working_directory }}
+      run: |
+        if [ -n "$INPUT_VERSION" ]; then
+          npm version ${{ inputs.version }} --allow-same-version
+        fi
+    - shell: bash
+      working-directory: ${{ inputs.working_directory }}
+      run: npm ci
+    - shell: bash
+      working-directory: ${{ inputs.working_directory }}
+      run: npm run ${{ inputs.build_script }}
@@ -0,0 +1,18 @@
+name: Get Dev Version
+description: Appends commit sha to the version number
+inputs:
+  dir:
+    description: Directory that package.json is in
+    required: true
+outputs:
+  version:
+    description: Version string for dev
+    value: ${{ steps.get-version.outputs.version }}
+runs:
+  using: composite
+  steps:
+    - id: get-version
+      shell: bash
+      run: |
+        VERSION=$(jq -r '.version' ${{ inputs.dir }}/package.json)
+        echo "::set-output name=version::$VERSION-${GITHUB_SHA:0:7}"
@@ -3,11 +3,10 @@
 
 npx lint-staged
 
-# Testing Frontend
+# Typecheck Frontend
 cd frontend
-npm run test
-cd ..
+npm run typecheck
 
-# Testing Backend Upgrade
-cd backend/packages/Upgrade
-npm start typecheck && npm test
+# Typecheck Backend Upgrade
+cd ../backend/packages/Upgrade
+npm start typecheck
@@ -1,8 +1,6 @@
 projectBuilderV5 (
     buildAgent:[
-        image: "467155500999.dkr.ecr.us-east-1.amazonaws.com/jenkins-agent:default",
-        cpu: 2048,
-        memory: 4096
+        taskDefinitionOverride: "upgrade-ci"
     ],
 
     projects: [
@@ -60,6 +58,11 @@ projectBuilderV5 (
                     githubCheck: '${projectName} npm ci --no-audit',
                     log: '${projectName}-npm-ci.log'
                 ],
+                [
+                    script: 'npm run test',
+                    githubCheck: "upgrade-frontend-test",
+                    log: "upgrade-frontend-test.log"
+                ],
                 [
                     script: 'npm run prebuild:project',
                     log: 'env-pre-build.log',
@@ -80,6 +83,28 @@ projectBuilderV5 (
                 "dev",
                 "release/.*"
             ]
+        ],
+        "upgrade-backend-tests": [
+            artifactType: "codeartifact",
+            versioning: "none",
+            projectDir: "backend",
+            runInProjectDir: true,
+            skipArtifactUpload: true,
+            dependencies: ["types"],
+            fileFilter: [
+                include: ["backend/packages/Upgrade/.*"]
+            ],
+            buildScripts: [
+                [
+                    script: 'npm run install:upgrade',
+                    log: '${projectName}-npm-ci.log'
+                ],
+                [
+                    script: 'npm run test:upgrade',
+                    githubCheck: '${projectName} test',
+                    log: '${projectName}-test.log'
+                ]
+            ]
         ],
          "scheduler-lambda": [
             artifactType: "s3",
@@ -163,5 +188,22 @@ projectBuilderV5 (
                 ]
             ]
         ],
+    ],
+    prChecks: [
+        "checks": [
+           "lint": [
+             buildScripts: [
+               [
+                 script: 'npm ci --no-audit',
+                 log: 'npm-ci.log'
+               ],
+               [
+                 script: 'npm run lint',
+                 githubCheck: 'lint',
+                 log: 'lint.log'
+               ]
+             ]
+           ]
+        ]
     ]
 )
@@ -1,3 +1,34 @@
+UpGrade 6.2 Release Notes
+
+Primarily bug fixes, enhancements, and vulnerable dependency updates
+
+UI:
+- Universally trims text inputs to avoid subtle bugs with unseen spaces or characters
+- Improved UX in paginated / search / filtering on experiment page
+- Improved consistency in UI elements / messages
+- Revised Mooclet TS_Configurable "reward metric" displays
+
+Backend:
+- Adds "batch assign" feature for querying multipe users' conditions
+- Fixes erroneous "competing decision point" assignments in some complex scenarios
+- Improved Metrics query performance
+- Fixed CSV export functionality so UI does not wait and accidentally cancel a long-running query
+- The algorithm for searching through sub-segments had been capped, it can now handle any depth of nested sub-segments
+- Tightening up of several API error-handling and validation cases
+
+Within-Subjects feature:
+- New `repeated-enrollment` db table necessary for performant future support
+- Fixed data exports
+
+DB changes (backwards compatible, no impact should be noticed):
+- Migration needed to add `repeated-enrollment` table
+- Migration for 'Draft' status enum added to support future experiment UI refresh
+
+Client Libraries:
+- Newest TS and Java clients will "cache" assign and feature flag responses by default, with option to ignore cache and force refetch
+- Java client will now require context in the constructor instead of in the getAllExperimentCondtions method
+- Backwards compatible, not required to update (but encouraged!)
+
 UpGrade 6.1 Release Notes
 
 Segments Refresh:
 
@@ -1,11 +1,10 @@
 {
-    "AWSEBDockerrunVersion": "1",
-    "Ports": [
-      {
-        "ContainerPort": "3030"
-      }
-    ],
-    "Volumes": [],
-    "Logging": "/var/log/eb-activity.log"
-  }
-  
+  "AWSEBDockerrunVersion": "1",
+  "Ports": [
+    {
+      "ContainerPort": "3030"
+    }
+  ],
+  "Volumes": [],
+  "Logging": "/var/log/eb-activity.log"
+}
@@ -1,12 +1,14 @@
 {
     "name": "ab_testing_backend",
-    "version": "6.2.0",
+    "version": "6.3.0",
     "description": "Backend for A/B Testing Project",
     "scripts": {
         "install:all": "npm ci && cd packages/Scheduler && npm ci && cd ../Upgrade && npm ci",
+        "install:upgrade": "npm ci --no-audit &&  cd packages/Upgrade && npm ci --no-audit",
         "production:upgrade": "cd packages/Upgrade && npm run production",
         "build:upgrade": "cd packages/Upgrade && npm run build",
         "test:upgrade": "cd packages/Upgrade && npm run test",
+        "test:upgrade-unit": "cd packages/Upgrade && npm run test:unit",
         "dockerConfig": "ts-node --transpile-only ./commands/dockerrun.ts",
         "deploy:schedule": "cd packages/Scheduler && npm run deploy"
     },
@@ -20,4 +22,4 @@
         "tslib": "^1.11.1",
         "typescript": "^3.8.3"
     }
-}
+}