Dev/2.1.0

.github/workflows/release-build.yml

@@ -11,14 +11,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [18.13.0]
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Test and build with node ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
 
@@ -31,5 +31,5 @@ jobs:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         file: build/_output/*
         tag: ${{ github.ref }}
-        overwrite: false
-        file_glob: true
+        overwrite: true
+        file_glob: true

.github/workflows/test.yml

@@ -5,17 +5,17 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.3.1, 12.x]
+        node-version: [18.13.0]
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Run tests with Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm install -g yarn
     - run: yarn install
     - run: yarn test-ci
-    - run: yarn build
+    - run: yarn build

.gitignore

@@ -5,3 +5,4 @@ node_modules
 bower_components
 *build
 coverage
+.vscode/

package.json

@@ -5,17 +5,18 @@
   },
   "version": "2.0.5",
   "dependencies": {
-    "materia-widget-development-kit": "2.5.2"
+    "materia-widget-development-kit": "~3.0.0"
   },
   "devDependencies": {
+    "angular": "1.6.9",
     "angular-mocks": "~1.5.0",
     "jest": "^23.6.0",
     "jest-coffee-preprocessor": "^1.0.0"
   },
   "scripts": {
-    "start": "webpack-dev-server",
-    "build": "webpack -p",
-    "build-dev": "webpack",
+    "start": "mwdk-start",
+    "build": "mwdk-build-prod",
+    "build-dev": "mwdk-build-dev",
     "test": "TZ='America/New_York' jest --verbose",
     "test-ci": "TZ='America/New_York' CI=true jest --ci --useStderr --coverage --coverageReporters text-summary cobertura"
   },
@@ -37,10 +38,10 @@
     ],
     "coverageThreshold": {
       "global": {
-        "statements": 91,
+        "statements": 84,
         "branches": 60,
-        "functions": 80,
-        "lines": 90
+        "functions": 78,
+        "lines": 86
       }
     }
   },

src/audioControls.html

@@ -1,8 +1,10 @@
 <div class='audio-controls'>
-	<span class='play-btn'
+	<button class='play-btn'
+		aria-label="Play audio clue."
 		ng-class="{'paused' : audio.paused}"
-		ng-click='$event.stopPropagation(); play()'>
-	</span>
+		ng-click='$event.stopPropagation(); play()'
+		ng-keypress="$event.stopPropagation()">
+	</button>
 	<span class='time'>
 		<span class='seek-bar'>
 			<input type='range'

src/controllers/__snapshots__/creator.test.js.snap

@@ -86,6 +86,11 @@ Object {
       "name": "null",
     },
   ],
+  "options": Object {
+    "caseSensitive": null,
+    "enableQuestionBank": false,
+    "questionBankVal": 1,
+  },
 }
 `;
 
@@ -119,6 +124,11 @@ Object {
       "name": "null",
     },
   ],
+  "options": Object {
+    "caseSensitive": null,
+    "enableQuestionBank": false,
+    "questionBankVal": 1,
+  },
 }
 `;
 

src/controllers/creator.coffee

@@ -1,6 +1,5 @@
-Matching = angular.module 'matching', ['ngAnimate']
-
-Matching.controller 'matchingCreatorCtrl', ['$scope', '$sce', ($scope, $sce) ->
+angular.module 'matching', ['ngAnimate']
+.controller 'matchingCreatorCtrl', ['$scope', '$sce', ($scope, $sce) ->
 	_qset = {}
 	materiaCallbacks = {}
 	# Stores data to be gathered on save.
@@ -11,6 +10,10 @@ Matching.controller 'matchingCreatorCtrl', ['$scope', '$sce', ($scope, $sce) ->
 
 	$scope.acceptedMediaTypes = ['mp3']
 	audioRef = []
+	$scope.questionBankDialog = false
+	$scope.enableQuestionBank = false
+	$scope.questionBankValTemp = 1
+	$scope.questionBankVal = 1
 
 	# Adds and removes a pair of textareas for users to input a word pair.
 	$scope.addWordPair = (q=null, a=null, media=[0,0], id='') ->
@@ -28,6 +31,11 @@ Matching.controller 'matchingCreatorCtrl', ['$scope', '$sce', ($scope, $sce) ->
 	materiaCallbacks.initExistingWidget = (title, widget, qset, version, baseUrl) ->
 		_items = qset.items[0].items
 
+		if qset.options
+			$scope.enableQuestionBank = if qset.options.enableQuestionBank then qset.options.enableQuestionBank else false
+			$scope.questionBankVal = if qset.options.questionBankVal then qset.options.questionBankVal else 1
+			$scope.questionBankValTemp = if qset.options.questionBankVal then qset.options.questionBankVal else 1
+
 		$scope.$apply ->
 			$scope.widget.title = title
 			$scope.widget.wordPairs = []
@@ -77,7 +85,12 @@ Matching.controller 'matchingCreatorCtrl', ['$scope', '$sce', ($scope, $sce) ->
 		$scope.hideCover()
 
 	$scope.hideCover = ->
-		$scope.showTitleDialog = $scope.showIntroDialog = $scope.showErrorDialog = false
+		$scope.showTitleDialog = $scope.showIntroDialog = $scope.showErrorDialog = $scope.questionBankDialog = false
+		$scope.questionBankValTemp = $scope.questionBankVal
+
+	$scope.validateQuestionBankVal = ->
+		if ($scope.questionBankValTemp >= 1 && $scope.questionBankValTemp <= $scope.widget.wordPairs.length)
+			$scope.questionBankVal = $scope.questionBankValTemp
 
 	$scope.autoSize = (pair, audio) ->
 		question = pair.question or ''
@@ -116,6 +129,7 @@ Matching.controller 'matchingCreatorCtrl', ['$scope', '$sce', ($scope, $sce) ->
 
 	_buildSaveData = ->
 		_qset.items = []
+		_qset.options = {caseSensitive: null, enableQuestionBank: $scope.enableQuestionBank, questionBankVal: $scope.questionBankVal}
 		_qset.items[0] =
 			name: "null"
 			items: []
@@ -175,4 +189,4 @@ Matching.controller 'matchingCreatorCtrl', ['$scope', '$sce', ($scope, $sce) ->
 		assets: [questionMediaId, answerMediaId, answerAudioId]
 
 	Materia.CreatorCore.start materiaCallbacks
-]
+]

src/controllers/creator.test.js

@@ -200,6 +200,26 @@ describe('Matching Creator Controller', function(){
 		expect(successReport.qset).toMatchSnapshot()
 	});
 
+	it('should update questionBankVal if questionBankValTemp is valid within the range', function () {
+
+		qset.data.options = {enableQuestionBank: true, questionBankVal: 6};
+		materiaCallbacks.initExistingWidget('matcher', widgetInfo, qset.data);
+
+		// set initial values where questionBankValTemp is invalid
+		$scope.questionBankValTemp = 11;
+		$scope.validateQuestionBankVal();
+
+		// expect questionBankVal to change to wordPairs value
+		expect($scope.questionBankVal).toBe(6);
+
+		// this time questionBankValTemp is valid
+		$scope.questionBankValTemp = 8;
+		$scope.validateQuestionBankVal();
+
+		// expect questionBankVal to be updated to questionBankValTemp
+		expect($scope.questionBankVal).toBe(8);
+
+	});
 
 	it('should properly remove word pair', function(){
 		materiaCallbacks.initNewWidget('matcher');