Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/ADF-1752/Confirm category propagation #2489

Merged
merged 4 commits into from
Jul 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion views/css/creator.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion views/css/creator.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 14 additions & 1 deletion views/js/controller/creator/helpers/categorySelector.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ define([
'lodash',
'i18n',
'core/eventifier',
'ui/dialog/confirm',
'ui/tooltip',
'taoQtiTest/controller/creator/templates/index',
'taoQtiTest/controller/creator/helpers/featureVisibility',
'select2'
], function ($, _, __, eventifier, tooltip, templates, featureVisibility) {
], function ($, _, __, eventifier, confirmDialog, tooltip, templates, featureVisibility) {
'use strict';

let allPresets = [];
Expand Down Expand Up @@ -109,6 +110,7 @@ define([
$customCategoriesSelect
.select2({
width: '100%',
containerCssClass: 'custom-categories',
tags: customCategories,
multiple: true,
tokenSeparators: [',', ' ', ';'],
Expand All @@ -119,6 +121,17 @@ define([
})
.on('change', () => this.updateCategories());

// when clicking on a partial category, ask the user if it wants to apply it to all items
$container.find('.custom-categories').on('click', '.partial', e => {
const $choice = $(e.target).closest('.select2-search-choice');
const tag = $choice.text().trim();

confirmDialog(__('Do you want to apply the category "%s" to all included items?', tag), () => {
$choice.removeClass('partial');
this.updateCategories();
});
});

// enable help tooltips
tooltip.lookup($container);
},
Expand Down
2 changes: 1 addition & 1 deletion views/js/loader/taoQtiTest.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion views/js/loader/taoQtiTest.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion views/js/loader/taoQtiTestRunner.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion views/js/loader/taoQtiTestXMLEditor.min.js.map

Large diffs are not rendered by default.

41 changes: 41 additions & 0 deletions views/js/test/creator/helpers/categorySelector/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,47 @@ define([
assert.equal($customCategories.eq(2).hasClass('partial'), true, 'custom2 is indeterminate');
});

QUnit.test('The user can propagate a state by clicking on a category', function (assert) {
var $container = $('#qunit-fixture'),
categorySelector = categorySelectorFactory($container),
selected = [
'x-tao-option-preset1-1', // use the alternative category
'x-tao-option-preset1-3', // use the alternative category
'x-tao-option-preset2.3',
'custom1',
'custom3'
],
indeterminate = ['x-tao-option-preset1.2', 'x-tao-option-preset2.2', 'custom2'],
$customCategories;

assert.expect(13);

categorySelector.createForm();
categorySelector.updateFormState(selected, indeterminate);

$customCategories = $container.find('.select2-search-choice');
assert.equal($customCategories.eq(0).text().trim(), 'custom1', 'custom1 has been rendered');
assert.equal($customCategories.eq(0).hasClass('partial'), false, 'custom1 is NOT indeterminate');
assert.equal($customCategories.eq(1).text().trim(), 'custom3', 'custom3 has been rendered');
assert.equal($customCategories.eq(1).hasClass('partial'), false, 'custom3 is NOT indeterminate');
assert.equal($customCategories.eq(2).text().trim(), 'custom2', 'custom2 has been rendered');
assert.equal($customCategories.eq(2).hasClass('partial'), true, 'custom2 is indeterminate');

assert.equal($('.modal').length, 0, 'no modal has been rendered');

$customCategories.eq(2).click();
assert.equal($('.modal').length, 1, 'a modal has been rendered');
$('.modal .modal-close').click();
assert.equal($('.modal').length, 0, 'the modal has been closed');
assert.equal($customCategories.eq(2).hasClass('partial'), true, 'custom2 is indeterminate');

$customCategories.eq(2).click();
assert.equal($('.modal').length, 1, 'a modal has been rendered');
$('.modal button.ok').click();
assert.equal($('.modal').length, 0, 'the modal has been closed');
assert.equal($customCategories.eq(2).hasClass('partial'), false, 'custom2 is NOT indeterminate');
});

QUnit.test('Transmit the correct state following user selection', function(assert) {
var ready = assert.async();
var $container = $('#qunit-fixture'),
Expand Down
6 changes: 6 additions & 0 deletions views/scss/creator.scss
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,12 @@
}
}

.custom-categories {
.partial {
cursor: pointer;
}
}

.props {
height: calc(100% - 65px);
overflow-y: scroll;
Expand Down
Loading