Merge pull request #292 from oat-sa/release-1.2.0

Release 1.2.0
oat-sa · May 25, 2022 · c9dcd1f · c9dcd1f
2 parents 7e48ad1 + 8254f3f
commit c9dcd1f
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 20 deletions.
diff --git a/environment/config.js b/environment/config.js
@@ -97,4 +97,11 @@ define(['/node_modules/@oat-sa/tao-core-libs/dist/pathdefinition.js'], function(
     }));
     define('taoQtiItem/portableElementRegistry/provider/sideLoadingProviderFactory', [], () => {});
     define('taoQtiItem/portableElementRegistry/assetManager/portableAssetStrategy', [], () => {});
+    define('services/features', function() {
+        return {
+            isVisible: function() {
+                return true;
+            }
+        }
+    });
 });
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@oat-sa/tao-item-runner-qti",
-    "version": "1.1.10",
+    "version": "1.2.0",
     "displayName": "TAO Item Runner QTI",
     "description": "TAO QTI Item Runner modules",
     "files": [

diff --git a/src/qtiCommonRenderer/renderers/choices/SimpleChoice.ChoiceInteraction.js b/src/qtiCommonRenderer/renderers/choices/SimpleChoice.ChoiceInteraction.js
@@ -22,12 +22,14 @@
  */
 import tpl from 'taoQtiItem/qtiCommonRenderer/tpl/choices/simpleChoice.choiceInteraction';
 import containerHelper from 'taoQtiItem/qtiCommonRenderer/helpers/container';
+import features from 'services/features';
 
 export default {
     qtiClass: 'simpleChoice.choiceInteraction',
     getContainer: containerHelper.get,
     getData: function(choice, data) {
         data.unique = parseInt(data.interaction.attributes.maxChoices) === 1;
+        data.allowElimination = features.isVisible('taoQtiItem/creator/interaction/choice/property/allowElimination');
         return data;
     },
     template: tpl

diff --git a/src/qtiCommonRenderer/renderers/interactions/ChoiceInteraction.js b/src/qtiCommonRenderer/renderers/interactions/ChoiceInteraction.js
@@ -30,6 +30,7 @@ import instructionMgr from 'taoQtiItem/qtiCommonRenderer/helpers/instructions/in
 import pciResponse from 'taoQtiItem/qtiCommonRenderer/helpers/PciResponse';
 import sizeAdapter from 'taoQtiItem/qtiCommonRenderer/helpers/sizeAdapter';
 import adaptSize from 'util/adaptSize';
+import features from 'services/features';
 
 const KEY_CODE_SPACE = 32;
 const KEY_CODE_ENTER = 13;
@@ -392,7 +393,8 @@ const getCustomData = function getCustomData(interaction, data) {
     return _.merge(data || {}, {
         horizontal: interaction.attr('orientation') === 'horizontal',
         listStyle: listStyles.pop(),
-        eliminable: isEliminable(interaction)
+        eliminable: isEliminable(interaction),
+        allowEliminationVisible: features.isVisible('taoQtiItem/creator/interaction/choice/property/allowElimination')
     });
 };
 

diff --git a/src/qtiCommonRenderer/renderers/interactions/ExtendedTextInteraction.js b/src/qtiCommonRenderer/renderers/interactions/ExtendedTextInteraction.js
@@ -41,6 +41,9 @@ import loggerFactory from 'core/logger';
  */
 const logger = loggerFactory('taoQtiItem/qtiCommonRenderer/renderers/interactions/ExtendedTextInteraction.js');
 
+const hideXhtmlConstraints = !features.isVisible('taoQtiItem/creator/interaction/extendedText/property/xhtmlConstraints');
+const hideXhtmlRecommendations = !features.isVisible('taoQtiItem/creator/interaction/extendedText/property/xhtmlRecommendations');
+
 /**
  * Init rendering, called after template injected into the DOM
  * All options are listed in the QTI v2.1 information model:
@@ -84,11 +87,15 @@ const render = function render(interaction) {
                 $el.attr('placeholder', placeholderText);
             }
             if (_getFormat(interaction) === 'xhtml') {
-                
-                if(!features.isVisible('taoQtiItem/creator/interaction/extendedText/property/xhtmlConstraints') && !features.isVisible('taoQtiItem/creator/interaction/extendedText/property/xhtmlRecommendations')) {
+
+                if(hideXhtmlConstraints && hideXhtmlRecommendations) {
                     $container.find('.text-counter').hide();
                 }
 
+                if(hideXhtmlConstraints) {
+                    limiter.enabled = false;
+                }
+
                 _styleUpdater = function () {
                     let qtiItemStyle, $editorBody, qtiItem;
 

diff --git a/src/qtiCommonRenderer/tpl/choices/simpleChoice.choiceInteraction.tpl b/src/qtiCommonRenderer/tpl/choices/simpleChoice.choiceInteraction.tpl
@@ -29,7 +29,9 @@
             </div>
         </div>
     </div>
+    {{#if allowElimination}}
     <label data-eliminable="container" data-label="{{__ "Eliminate"}}">
         <span data-eliminable="trigger" class="icon-checkbox"></span>
     </label>
+    {{/if}}
 </li>
diff --git a/src/qtiCommonRenderer/tpl/interactions/choiceInteraction.tpl b/src/qtiCommonRenderer/tpl/interactions/choiceInteraction.tpl
@@ -1,6 +1,6 @@
 <div
   {{#if attributes.id}}id="{{attributes.id}}"{{/if}}
-  class="qti-interaction qti-blockInteraction qti-choiceInteraction{{#if attributes.class}} {{attributes.class}}{{/if}}"
+  class="qti-interaction qti-blockInteraction qti-choiceInteraction{{#if attributes.class}} {{attributes.class}}{{/if}}{{#if allowEliminationVisible}} allow-elimination-visible{{/if}}"
   data-serial="{{serial}}"
   data-qti-class="choiceInteraction"
   {{#if attributes.xml:lang}} lang="{{attributes.xml:lang}}"{{/if}}

diff --git a/test/qtiCommonRenderer/interactions/extendedText/test.html b/test/qtiCommonRenderer/interactions/extendedText/test.html
@@ -7,13 +7,6 @@
         <script type="text/javascript">
             require(['/environment/config.js'], function() {
                 require(['qunitEnv'], function() {
-                    define('services/features', function() {
-                        return {
-                            isVisible: function() {
-                                return true;
-                            }
-                        }
-                    });
                     require(['taoQtiItem/test/qtiCommonRenderer/interactions/extendedText/test'], function() {
                         QUnit.start();
                         QUnit.config.reorder = false;

diff --git a/test/reviewRenderer/interactions/extendedText/test.html b/test/reviewRenderer/interactions/extendedText/test.html
@@ -7,13 +7,6 @@
         <script type="text/javascript">
             require(['/environment/config.js'], function () {
                 require(['qunitEnv'], function () {
-                    define('services/features', function() {
-                        return {
-                            isVisible: function() {
-                                return true;
-                            }
-                        }
-                    });
                     require(['taoQtiItem/test/reviewRenderer/interactions/extendedText/test'], function () {
                         QUnit.start();
                         QUnit.config.reorder = false;