Skip to content

Inline table don't detect block generated by other macro which contains MetaDataBlock #1

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
Josue-T wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Inline table don't detect block generated by other macro which contains MetaDataBlock #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46f14bc
XLIT-22: Inline table don't detect block generated by other macro whi…
Josue-T Mar 20, 2026
4064ea8
XLIT-22: Inline table don't detect block generated by other macro whi…
Josue-T Apr 3, 2026
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
151 changes: 80 additions & 71 deletions ...e-macro/src/main/java/org/xwiki/contrib/internal/LiveDataInlineTableMacroBlockFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,19 @@ private String buildJSON(Object object) throws JsonProcessingException
return objectMapper.writeValueAsString(object);
}

private <T> List<T> getDescendantsExcludeTableBlock(Block block, Class<? extends Block> type)
{
List<T> result = new ArrayList<>(block.getChildren().size());
for (Block child : block.getChildren()) {
if (type.isAssignableFrom(child.getClass())) {
result.add((T) child);
} else if (!(child instanceof TableBlock)) {
result.addAll(getDescendantsExcludeTableBlock(child, type));
}
}
return result;
}

/**
* Read a table and extract entries from it.
*
Expand All @@ -412,13 +425,10 @@ private ParsedTable tableToMap(TableBlock table, LiveDataInlineTableMacroParamet
// Extract the rows from the table while counting the number of properties.
List<TableRowBlock> rows = new ArrayList<>();
int propertiesCount = 0;

for (Block child : table.getChildren()) {
if (child instanceof TableRowBlock) {
TableRowBlock row = (TableRowBlock) child;
rows.add(row);
propertiesCount = Math.max(propertiesCount, row.getChildren().size());
}
List<TableRowBlock> rowBlocks = getDescendantsExcludeTableBlock(table, TableRowBlock.class);
for (TableRowBlock row : rowBlocks) {
rows.add(row);
propertiesCount = Math.max(propertiesCount, row.getChildren().size());
}
logger.debug("Detected " + propertiesCount + " rows.");

Expand All @@ -440,80 +450,79 @@ private ParsedTable tableToMap(TableBlock table, LiveDataInlineTableMacroParamet
for (TableRowBlock row : rows) {
Map<String, Object> entry = new HashMap<>();
int i = 0;
for (Block child : row.getChildren()) {
if (child instanceof TableCellBlock) {
logger.debug("Parsing a cell of column: " + i);
TableCellBlock cell = (TableCellBlock) child;
WikiPrinter textPrinter = new DefaultWikiPrinter();
List<TableCellBlock> cells = getDescendantsExcludeTableBlock(row, TableCellBlock.class);
for (TableCellBlock cell : cells) {
logger.debug("Parsing a cell of column: " + i);
WikiPrinter textPrinter = new DefaultWikiPrinter();

logger.debug("Rendering cell as text.");
plainTextRenderer.render(cell, textPrinter);

logger.debug("Rendered cell as text: " + textPrinter.toString());
if (entries.isEmpty() && cell instanceof TableHeadCellBlock) {
properties.set(i, textPrinter.toString());
inlineHeading = true;
logger.debug("Detected inline heading: " + textPrinter.toString());
}

logger.debug("Rendering cell as text.");
plainTextRenderer.render(cell, textPrinter);
// We need to render the content of the cell as a string so that we can pass it to LiveData.
WikiPrinter cellPrinter = new DefaultWikiPrinter();

logger.debug("Rendered cell as text: " + textPrinter.toString());
if (entries.isEmpty() && child instanceof TableHeadCellBlock) {
properties.set(i, textPrinter.toString());
inlineHeading = true;
logger.debug("Detected inline heading: " + textPrinter.toString());
}
// We need to run transformations in case there is another livedata-inline-table call inside the
// cell.

// We need to render the content of the cell as a string so that we can pass it to LiveData.
WikiPrinter cellPrinter = new DefaultWikiPrinter();
// We have to fiddle with the cell's attributes...
Map<String, String> parsedParameters = new HashMap<>(cell.getParameters());

// We need to run transformations in case there is another livedata-inline-table call inside the
// cell.

// We have to fiddle with the cell's attributes...
Map<String, String> parsedParameters = new HashMap<>(cell.getParameters());
// Update class parameter with our own class.
String classAttr = parsedParameters.getOrDefault(CLASS, "");
parsedParameters.put(CLASS, LIT_CELL_CLASS + " " + classAttr);

Block cellGroup = new GroupBlock(cell.getChildren(), parsedParameters);
logger.debug("Running cell transformations.");
try {
transformationManager.performTransformations(cellGroup,
this.context.getTransformationContext());
} catch (TransformationException e) {
throw new LiveDataInlineTableMacroRuntimeException("Failed to transform cell content.", e);
}

// Update class parameter with our own class.
String classAttr = parsedParameters.getOrDefault(CLASS, "");
parsedParameters.put(CLASS, LIT_CELL_CLASS + " " + classAttr);
logger.debug("Rendering cell as html.");
richTextRenderer.render(cellGroup, cellPrinter);
logger.debug("Rendered cell as html: " + cellPrinter.toString());
entry.put("" + i, cellPrinter.toString());
entry.put("text." + i, textPrinter.toString());
if (fieldsTypes.get(i).equals(DATE)) {
logger.debug("A date is expected, trying to parse.");
String datetimeString = "";
Object timestamp = "";
if (!textPrinter.toString().isBlank()) {

Block cellGroup = new GroupBlock(cell.getChildren(), parsedParameters);
logger.debug("Running cell transformations.");
try {
transformationManager.performTransformations(cellGroup,
this.context.getTransformationContext());
} catch (TransformationException e) {
throw new LiveDataInlineTableMacroRuntimeException("Failed to transform cell content.", e);
}
for (int j = 0; j < this.dateFormats.length; j++) {
try {
logger.debug("Trying to parse date using format: " + this.dateFormats[j]);

logger.debug("Rendering cell as html.");
richTextRenderer.render(cellGroup, cellPrinter);
logger.debug("Rendered cell as html: " + cellPrinter.toString());
entry.put("" + i, cellPrinter.toString());
entry.put("text." + i, textPrinter.toString());
if (fieldsTypes.get(i).equals(DATE)) {
logger.debug("A date is expected, trying to parse.");
String datetimeString = "";
Object timestamp = "";
if (!textPrinter.toString().isBlank()) {

for (int j = 0; j < this.dateFormats.length; j++) {
try {
logger.debug("Trying to parse date using format: " + this.dateFormats[j]);

Locale locale = this.contextProvider.get().getLocale();
SimpleDateFormat parser = new SimpleDateFormat(this.dateFormats[j], locale);
parser.setLenient(true);

Date date = parser.parse(textPrinter.toString());
datetimeString = new SimpleDateFormat(this.dateFormats[j], locale).format(date);
timestamp = date.toInstant().getEpochSecond();
logger.debug("Parsed date: " + datetimeString);
logger.debug("Parsed unix timestamp: " + timestamp);
entry.put("date." + i, timestamp);
break;
} catch (ParseException e) {
logger.debug("Failed to parse '" + textPrinter.toString() + "' using format "
+ this.dateFormats[j], e);
}
Locale locale = this.contextProvider.get().getLocale();
SimpleDateFormat parser = new SimpleDateFormat(this.dateFormats[j], locale);
parser.setLenient(true);

Date date = parser.parse(textPrinter.toString());
datetimeString = new SimpleDateFormat(this.dateFormats[j], locale).format(date);
timestamp = date.toInstant().getEpochSecond();
logger.debug("Parsed date: " + datetimeString);
logger.debug("Parsed unix timestamp: " + timestamp);
entry.put("date." + i, timestamp);
break;
} catch (ParseException e) {
logger.debug("Failed to parse '" + textPrinter.toString() + "' using format "
+ this.dateFormats[j], e);
}
}
}
i++;
}
i++;

}
entries.add(entry);
}
Expand All @@ -533,9 +542,9 @@ private void identifyPropertiesTypes(List<TableRowBlock> rows, List<String> fiel
logger.debug("Detecting the types of columns.");
for (TableRowBlock row : rows) {
int i = 0;
for (Block child : row.getChildren()) {
if (child instanceof TableCellBlock && !(child instanceof TableHeadCellBlock)) {
TableCellBlock cell = (TableCellBlock) child;
List<TableCellBlock> cells = getDescendantsExcludeTableBlock(row, TableCellBlock.class);
for (TableCellBlock cell : cells) {
if (!(cell instanceof TableHeadCellBlock)) {
WikiPrinter textPrinter = new DefaultWikiPrinter();
plainTextRenderer.render(cell, textPrinter);

Expand Down