Skip to content

layout fix for nested arrays #350

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+72 −17
Open

layout fix for nested arrays #350

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a36b4d
fix listItems option not allowing empty arrays
felschr Jan 25, 2019
e6272ba
make listItems option work for flex layout as well
felschr Feb 20, 2020
31e5b74
layout fix for nested arrays
sa185375 Feb 15, 2023
21a89e7
Merge pull request #1 from felschr/patch-1
sa185375 Feb 15, 2023
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
89 changes: 72 additions & 17 deletions projects/ajsf-core/src/lib/shared/layout.functions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ export function buildLayout(jsf, widgetLibrary) {
}
jsf.dataMap.get(itemRefPointer).set('inputType', 'section');

let additionalItems;
// Fix insufficiently nested array item groups
if (newNode.items.length > 1) {
const arrayItemGroup = [];
Expand All @@ -312,19 +313,21 @@ export function buildLayout(jsf, widgetLibrary) {
subItem.removable = newNode.options.removable !== false;
}
}
if (arrayItemGroup.length) {
newNode.items.push({
_id: uniqueId(),
arrayItem: true,
arrayItemType: newNode.options.tupleItems > newNode.items.length ?

additionalItems = {
arrayItem: true,
items: arrayItemGroup,
layoutPointer: newNode.layoutPointer + '/items/-',
options: {
arrayItemType: newNode.tupleItems > newNode.items.length ?
'tuple' : 'list',
items: arrayItemGroup,
options: { removable: newNode.options.removable !== false, },
dataPointer: newNode.dataPointer + '/-',
type: 'section',
widget: widgetLibrary.getWidget('section'),
});
}
removable: newNode.options.removable !== false &&
(newNode.options.minItems || 0) <= newNode.items.length,
},
dataPointer: newNode.dataPointer + '/-',
type: 'fieldset',
widget: widgetLibrary.getWidget('fieldset'),
};
} else {
// TODO: Fix to hndle multiple items
newNode.items[0].arrayItem = true;
Expand All @@ -340,6 +343,9 @@ export function buildLayout(jsf, widgetLibrary) {
}
newNode.items[0].arrayItemType =
newNode.options.tupleItems ? 'tuple' : 'list';

additionalItems = newNode.items[0];
newNode.items = [];
}

if (isArray(newNode.items)) {
Expand All @@ -354,7 +360,7 @@ export function buildLayout(jsf, widgetLibrary) {

if (!hasOwn(jsf.layoutRefLibrary, itemRefPointer)) {
jsf.layoutRefLibrary[itemRefPointer] =
cloneDeep(newNode.items[newNode.items.length - 1]);
cloneDeep(additionalItems || newNode.items[newNode.items.length - 1]);
if (recursive) {
jsf.layoutRefLibrary[itemRefPointer].recursiveReference = true;
}
Expand All @@ -370,10 +376,7 @@ export function buildLayout(jsf, widgetLibrary) {

// Add any additional default items
if (!newNode.recursiveReference || newNode.options.required) {
const arrayLength = Math.min(Math.max(
newNode.options.tupleItems + newNode.options.listItems,
isArray(nodeValue) ? nodeValue.length : 0
), newNode.options.maxItems);
const arrayLength = 0;
for (let i = newNode.items.length; i < arrayLength; i++) {
newNode.items.push(getLayoutNode({
$ref: itemRefPointer,
Expand Down Expand Up @@ -455,6 +458,7 @@ export function buildLayout(jsf, widgetLibrary) {
if (newNode.type === 'submit') { hasSubmitButton = true; }
return newNode;
});
repairLayoutData(jsf, widgetLibrary, formLayout);
if (jsf.hasRootReference) {
const fullLayout = cloneDeep(formLayout);
if (fullLayout[fullLayout.length - 1].type === 'submit') { fullLayout.pop(); }
Expand Down Expand Up @@ -482,6 +486,57 @@ export function buildLayout(jsf, widgetLibrary) {
return formLayout;
}

function repairLayoutData(jsf, widgetLibrary, layoutItem, dataIndex?) {

let nodeValue;
let newDataIndex = dataIndex ? [...dataIndex] : [];
let path;
if (layoutItem) {
for (let i = 0; i < layoutItem.length; i++) {
if (layoutItem[i].items) {
if (layoutItem[i].arrayItem) { // If item is arrayItem, add to dataIndex
newDataIndex = dataIndex ? [...dataIndex, i] : [i];
}
if (layoutItem[i].type === 'array') { // If item is array, get data for the array
path = layoutItem[i].dataPointer;
if (dataIndex) {
for (let j = 0; j < dataIndex.length; j++) {
path = path.replace('-', dataIndex[j]);
}
}
nodeValue = JsonPointer.get(jsf.formValues, path); // Get value for array
}
if (layoutItem[i].options.minItems > 0) { // Add Items if there's a minimum
for (let k = 0; k < layoutItem[i].options.minItems; k++) {
layoutItem[i].items.unshift(getLayoutNode({
$ref: layoutItem[i].dataPointer + '/-',
dataPointer: layoutItem[i].dataPointer + '/-',
recursiveReference: layoutItem[i].recursiveReference,
}, jsf, widgetLibrary));
}
}

if ((Array.isArray(nodeValue) && nodeValue.length > 0)) { // Add necessary items to array item
for (let k = layoutItem[i].options.minItems; k < nodeValue.length; k++) {
if (k < layoutItem[i].options.maxItems) {
layoutItem[i].items.unshift(getLayoutNode({
$ref: layoutItem[i].dataPointer + '/-',
dataPointer: layoutItem[i].dataPointer + '/-',
recursiveReference: layoutItem[i].recursiveReference,
}, jsf, widgetLibrary));
}
}
}
if (layoutItem[i]) {
// Loop through new children for any new arrays in them
layoutItem[i].items = repairLayoutData(jsf, widgetLibrary, layoutItem[i].items, newDataIndex);
}
}
}
}
return layoutItem;
}

/**
* 'buildLayoutFromSchema' function
*
Expand Down