Skip to content

arrayIndices to allow conditions to access the array index in nested arrays #652

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.

Sign up for GitHub

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

Closed
wants to merge 6 commits into from
Closed

arrayIndices to allow conditions to access the array index in nested arrays #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
91b86c9
Added arrayIndices to allow conditions to access the array index in n…
joelwkent Mar 18, 2016
c95cb9c
Alternative method of determining array depth
joelwkent Apr 5, 2016
730fbed
Add tests for array.object.object.array structure
joelwkent Apr 7, 2016
e1383aa
Bug fix: 2 x $parent required
joelwkent Apr 7, 2016
c13017b
Test for conditions on 4 deep array
joelwkent May 26, 2016
ac6cee4
Array index and array indices for onClick
joelwkent Jun 8, 2016
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
15 changes: 12 additions & 3 deletions src/directives/field.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,23 @@ angular.module('schemaForm').directive('sfField',
};

scope.buttonClick = function($event, form) {
var arrayDepth = form.key.filter(function(e) { return e === '' }).length;
var arrayIndices = (arrayDepth > 1 ? Array(arrayDepth - 1).join('$parent.$parent.$parent.') + '$parent.$parent.$index,' : '');
for (var i = arrayDepth; i > 2; i--) {
arrayIndices += Array(i - 1).join('$parent.$parent.$parent.') + '$index,';
}
arrayIndices += '$index';
arrayIndices = scope.$eval('[' + arrayIndices + ']');

if (angular.isFunction(form.onClick)) {
form.onClick($event, form);

form.onClick($event, form, arrayIndices[arrayDepth-1], arrayIndices);
} else if (angular.isString(form.onClick)) {
if (sfSchema) {
//evaluating in scope outside of sfSchemas isolated scope
sfSchema.evalInParentScope(form.onClick, {'$event': $event, form: form});
sfSchema.evalInParentScope(form.onClick, {'$event': $event, form: form, arrayIndex: arrayIndices[arrayDepth-1], arrayIndices: arrayIndices});
} else {
scope.$eval(form.onClick, {'$event': $event, form: form});
scope.$eval(form.onClick, {'$event': $event, form: form, arrayIndex: '$index', arrayIndices: '[' + arrayIndices + ']'});
}
}
};
Expand Down
7 changes: 7 additions & 0 deletions src/services/builder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,14 @@ angular.module('schemaForm').provider('sfBuilder', ['sfPathProvider', function(s
'.condition, { model: model, "arrayIndex": $index})';
if (args.form.key) {
var strKey = sfPathProvider.stringify(args.form.key);
var arrayDepth = args.form.key.filter(function(e) { return e === '' }).length;
var arrayIndices = '$index';
for (var i = 1; i < arrayDepth; i++) {
arrayIndices = Array(i + 1).join('$parent.$parent.') + '$index,' + arrayIndices;
}

evalExpr = 'evalExpr(' + args.path + '.condition,{ model: model, "arrayIndex": $index, ' +
'"arrayIndices": [' + arrayIndices + '],' +
'"modelValue": model' + (strKey[0] === '[' ? '' : '.') + strKey + '})';
}

Expand Down
10 changes: 6 additions & 4 deletions src/services/decorators.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,16 @@ angular.module('schemaForm').provider('schemaFormDecorators',
};

scope.buttonClick = function($event, form) {
var arrayIndices = form.key.filter(function(e) { return e === parseInt(e, 10)});

if (angular.isFunction(form.onClick)) {
form.onClick($event, form);
form.onClick($event, form, arrayIndices[arrayIndices.length-1], arrayIndices);
} else if (angular.isString(form.onClick)) {
if (sfSchema) {
//evaluating in scope outside of sfSchemas isolated scope
sfSchema.evalInParentScope(form.onClick, {'$event': $event, form: form});
sfSchema.evalInParentScope(form.onClick, {'$event': $event, form: form, arrayIndex: arrayIndices[arrayIndices.length-1], arrayIndices: arrayIndices});
} else {
scope.$eval(form.onClick, {'$event': $event, form: form});
scope.$eval(form.onClick, {'$event': $event, form: form, arrayIndex: arrayIndices[arrayIndices.length-1], arrayIndices: arrayIndices});
}
}
};
Expand Down Expand Up @@ -207,7 +209,7 @@ angular.module('schemaForm').provider('schemaFormDecorators',

var evalExpr = 'evalExpr(form.condition,{ model: model, "arrayIndex": arrayIndex})';
if (form.key) {
evalExpr = 'evalExpr(form.condition,{ model: model, "arrayIndex": arrayIndex, "modelValue": model' + sfPath.stringify(form.key) + '})';
evalExpr = 'evalExpr(form.condition,{ model: model, "arrayIndex": arrayIndex, "arrayIndices": [' + form.key.filter(function(e) { return e === parseInt(e, 10)}).toString() + '], "modelValue": model' + sfPath.stringify(form.key) + '})';
}

angular.forEach(element.children(), function(child) {
Expand Down
262 changes: 262 additions & 0 deletions test/directives/schema-form-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2537,6 +2537,268 @@ describe('directive',function(){
});


it('should remove or add fields in an array depending on conditions using arrayIndices', function (done) {

inject(function ($compile, $rootScope) {
var scope = $rootScope.$new();
scope.model = {
"transportCategory": [
{
"mode": "Car",
"transportOption": [
{
"name": "Bertie",
"forSale": "yes",
"price": 100,
"history": {
"historyKnown": "no"
}
},
{
"name": "Lightning McQueen",
"forSale": "no",
"history": {
"historyKnown": "yes",
"previousOwners": [
{
"ownerName": ""
},
{
"ownerName": "Arlo",
"logBookProvided": "yes",
"logBookEntry": [
{
"entryId": 2,
"entryDate": "2015-06-23"
},
{
"entryId": 4
}
]
}
]
}
}
]
},
{
"mode": "Horse",
"transportOption": [
{
"name": "Phar Lap",
"forSale": "no"
},
{
"name": "Greyhound",
"forSale": "yes",
"price": 1000,
"history": {
"historyKnown": "yes",
"previousOwners": [
{
"ownerName": "Tom"
}
]
}
}
]
}
]
};

scope.schema = {
type: "object",
properties: {
transportCategory: {
type: "array",
items: {
type: "object",
properties: {
mode: { type: "string", enum: ["Car", "Motorbike", "Horse"] },
transportOption: {
type: "array",
items: {
type: "object",
properties: {
name: { type: "string" },
numberOfWheels: { type: "number" },
forSale: { type: "string", enum: ["yes", "no"] },
price: { type: "number" },
history: {
type: "object",
properties: {
historyKnown: { type: "string", enum: ["yes", "no"] },
previousOwners: {
type: "array",
items: {
type: "object",
properties: {
ownerName: { type: "string" },
purchaseDate: { type: "string" },
logBookProvided: { type: "string", enum: ["yes", "no"] },
logBookEntry: {
type: "array",
items: {
type: "object",
properties: {
entryId: { type: "number" },
entryDate: { type: "string" },
entryNote: { type: "string" }
}
}
}
}
}
}
}
}
}
}
}
}
}
}
}
};

scope.form = [
{
key: "transportCategory",
items: [
"transportCategory[].mode",
{
key: "transportCategory[].transportOption",
items: [
"transportCategory[].transportOption[].name",
{
key: "transportCategory[].transportOption[].numberOfWheels",
condition: "model.transportCategory[arrayIndices[0]].mode != 'Horse'"
},
"transportCategory[].transportOption[].forSale",
{
key: "transportCategory[].transportOption[].price",
condition: "model.transportCategory[arrayIndices[0]].transportOption[arrayIndices[1]].forSale == 'yes'"
},
"transportCategory[].transportOption[].history.historyKnown",
{
key: "transportCategory[].transportOption[].history.previousOwners",
condition: "model.transportCategory[arrayIndices[0]].transportOption[arrayIndices[1]].history.historyKnown == 'yes'",
items: [
"transportCategory[].transportOption[].history.previousOwners[].ownerName",
{
key: "transportCategory[].transportOption[].history.previousOwners[].purchaseDate",
condition: "model.transportCategory[arrayIndices[0]].transportOption[arrayIndices[1]].history.previousOwners[arrayIndices[2]].ownerName.length > 2",
},
{
key: "transportCategory[].transportOption[].history.previousOwners[].logBookProvided",
condition: "model.transportCategory[arrayIndices[0]].mode != 'Horse' && model.transportCategory[arrayIndices[0]].transportOption[arrayIndices[1]].history.previousOwners[arrayIndices[2]].ownerName.length > 2"
},
{
key: "transportCategory[].transportOption[].history.previousOwners[].logBookEntry",
condition: "model.transportCategory[arrayIndices[0]].transportOption[arrayIndices[1]].history.previousOwners[arrayIndices[2]].logBookProvided == 'yes'",
items: [
"transportCategory[].transportOption[].history.previousOwners[].logBookEntry[].entryId",
"transportCategory[].transportOption[].history.previousOwners[].logBookEntry[].entryDate",
{
key: "transportCategory[].transportOption[].history.previousOwners[].logBookEntry[].entryNote",
condition: "model.transportCategory[arrayIndices[0]].transportOption[arrayIndices[1]].history.previousOwners[arrayIndices[2]].logBookEntry[arrayIndices[3]].entryDate.length > 2"
}
]
}
]
}
]
}
]
}
];

var tmpl = angular.element('<form sf-schema="schema" sf-form="form" sf-model="model"></form>');

$compile(tmpl)(scope);
$rootScope.$apply();

//References to sections of the rendered form to make the test more readable
var renderedForm = {
node: tmpl.children().eq(0).children().eq(1),
transportCategory: [
{
node: tmpl.children().eq(0).children().eq(1).children().eq(0),
},
{
node: tmpl.children().eq(0).children().eq(1).children().eq(1),
}
]
};

renderedForm.transportCategory[0]['transportOption'] = [
{ node: renderedForm.transportCategory[0].node.children().eq(2).children().eq(1).children().eq(0) },
{ node: renderedForm.transportCategory[0].node.children().eq(2).children().eq(1).children().eq(1) }
];

renderedForm.transportCategory[1]['transportOption'] = [
{ node: renderedForm.transportCategory[1].node.children().eq(2).children().eq(1).children().eq(0) },
{ node: renderedForm.transportCategory[1].node.children().eq(2).children().eq(1).children().eq(1) }
];

renderedForm.transportCategory[0].transportOption[1]['history'] = {
previousOwners: [
{ node: renderedForm.transportCategory[0].transportOption[1].node.children().eq(5).children().eq(0) },
{ node: renderedForm.transportCategory[0].transportOption[1].node.children().eq(5).children().eq(1) }
]
};

renderedForm.transportCategory[0].transportOption[1].history.previousOwners[1]['logBookEntry'] = [
{ node: renderedForm.transportCategory[0].transportOption[1].history.previousOwners[1].node.children().eq(1).children().eq(4).children().eq(1).children().eq(0) },
{ node: renderedForm.transportCategory[0].transportOption[1].history.previousOwners[1].node.children().eq(1).children().eq(4).children().eq(1).children().eq(1) }
];

/*** transportCategory[].transportOption[].numberOfWheels condition tests ***/
renderedForm.transportCategory[0].node.find('input[name="numberOfWheels"]').length.should.be.eq(2);
renderedForm.transportCategory[1].node.find('input[name="numberOfWheels"]').length.should.be.eq(0);
renderedForm.transportCategory[0].transportOption[0].node.find('input[name="numberOfWheels"]').length.should.be.eq(1);
renderedForm.transportCategory[0].transportOption[1].node.find('input[name="numberOfWheels"]').length.should.be.eq(1);
renderedForm.transportCategory[1].transportOption[0].node.find('input[name="numberOfWheels"]').length.should.be.eq(0);
renderedForm.transportCategory[1].transportOption[1].node.find('input[name="numberOfWheels"]').length.should.be.eq(0);

/*** transportCategory[].transportOption[].price field condition tests ***/
renderedForm.node.children().find('input[name="price"]').length.should.be.eq(2);
renderedForm.transportCategory[0].transportOption[0].node.find('input[name="price"]').length.should.be.eq(1);
renderedForm.transportCategory[0].transportOption[1].node.find('input[name="price"]').length.should.be.eq(0);
renderedForm.transportCategory[1].transportOption[0].node.find('input[name="price"]').length.should.be.eq(0);
renderedForm.transportCategory[1].transportOption[1].node.find('input[name="price"]').length.should.be.eq(1);

/*** transportCategory[].transportOption[].history.previousOwners.ownerName field condition tests ***/
renderedForm.transportCategory[0].transportOption[0].node.find('input[name="ownerName"]').length.should.be.eq(0);
renderedForm.transportCategory[0].transportOption[1].node.find('input[name="ownerName"]').length.should.be.eq(2);
renderedForm.transportCategory[1].transportOption[0].node.find('input[name="ownerName"]').length.should.be.eq(0);
renderedForm.transportCategory[1].transportOption[1].node.find('input[name="ownerName"]').length.should.be.eq(1);

/*** transportCategory[].transportOption[].history.previousOwners[].purchaseDate field condition tests ***/
renderedForm.transportCategory[0].transportOption[0].node.find('input[name="purchaseDate"]').length.should.be.eq(0);
renderedForm.transportCategory[0].transportOption[1].node.find('input[name="purchaseDate"]').length.should.be.eq(1);
renderedForm.transportCategory[0].transportOption[1].history.previousOwners[0].node.find('input[name="purchaseDate"]').length.should.be.eq(0);
renderedForm.transportCategory[0].transportOption[1].history.previousOwners[1].node.find('input[name="purchaseDate"]').length.should.be.eq(1);

renderedForm.transportCategory[1].transportOption[0].node.find('input[name="purchaseDate"]').length.should.be.eq(0);
renderedForm.transportCategory[1].transportOption[1].node.find('input[name="purchaseDate"]').length.should.be.eq(1);

/*** transportCategory[].transportOption[].history.previousOwners[].logBookProvided field condition tests ***/
renderedForm.transportCategory[0].transportOption[0].node.find('select[name="logBookProvided"]').length.should.be.eq(0);
renderedForm.transportCategory[0].transportOption[1].node.find('select[name="logBookProvided"]').length.should.be.eq(1);
renderedForm.transportCategory[0].transportOption[1].history.previousOwners[0].node.find('select[name="logBookProvided"]').length.should.be.eq(0);
renderedForm.transportCategory[0].transportOption[1].history.previousOwners[1].node.find('select[name="logBookProvided"]').length.should.be.eq(1);

renderedForm.transportCategory[1].transportOption[0].node.find('select[name="logBookProvided"]').length.should.be.eq(0);
renderedForm.transportCategory[1].transportOption[1].node.find('select[name="logBookProvided"]').length.should.be.eq(0);

/*** transportCategory[].transportOption[].history.previousOwners[].logBookEntry[].entryNote field condition tests ***/
renderedForm.transportCategory[0].transportOption[1].history.previousOwners[1].logBookEntry[0].node.find('input[name="entryNote"]').length.should.be.eq(1);
renderedForm.transportCategory[0].transportOption[1].history.previousOwners[1].logBookEntry[1].node.find('input[name="entryNote"]').length.should.be.eq(0);

done();
});
});
});

});