Add QHelpContentPlugin, so that supplemental instance meta data can accept help content. also add commonmark dep and getContentAsHtml method

This commit is contained in:
2025-07-08 10:49:19 -05:00
parent eb0c57e9a6
commit d7bb54eb16
5 changed files with 178 additions and 1 deletions

View File

@ -121,6 +121,11 @@
<artifactId>poi-ooxml</artifactId> <artifactId>poi-ooxml</artifactId>
<version>5.2.5</version> <version>5.2.5</version>
</dependency> </dependency>
<dependency>
<groupId>org.commonmark</groupId>
<artifactId>commonmark</artifactId>
<version>0.25.0</version>
</dependency>
<!-- adding to help FastExcel --> <!-- adding to help FastExcel -->
<dependency> <dependency>

View File

@ -36,6 +36,7 @@ import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryOutput;
import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.data.QRecord;
import com.kingsrook.qqq.backend.core.model.helpcontent.HelpContent; import com.kingsrook.qqq.backend.core.model.helpcontent.HelpContent;
import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
import com.kingsrook.qqq.backend.core.model.metadata.QSupplementalInstanceMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.dashboard.QWidgetMetaDataInterface; import com.kingsrook.qqq.backend.core.model.metadata.dashboard.QWidgetMetaDataInterface;
import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.help.HelpFormat; import com.kingsrook.qqq.backend.core.model.metadata.help.HelpFormat;
@ -163,6 +164,23 @@ public class QInstanceHelpContentManager
{ {
processHelpContentForInstance(qInstance, key, slotName, roles, helpContent); processHelpContentForInstance(qInstance, key, slotName, roles, helpContent);
} }
else
{
for(QSupplementalInstanceMetaData supplementalInstanceMetaData : qInstance.getSupplementalMetaData().values())
{
if(supplementalInstanceMetaData instanceof QHelpContentPlugin helpContentPlugin)
{
try
{
helpContentPlugin.acceptHelpContent(qInstance, helpContent, nameValuePairs);
}
catch(Exception e)
{
LOG.warn("Error processing a helpContent record in a helpContentPlugin", e, logPair("pluginName", supplementalInstanceMetaData.getName()), logPair("id", record.getValue("id")));
}
}
}
}
} }
catch(Exception e) catch(Exception e)
{ {

View File

@ -26,10 +26,13 @@ import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import com.kingsrook.qqq.backend.core.model.metadata.QMetaDataObject; import com.kingsrook.qqq.backend.core.model.metadata.QMetaDataObject;
import org.commonmark.node.Node;
import org.commonmark.parser.Parser;
import org.commonmark.renderer.html.HtmlRenderer;
/******************************************************************************* /*******************************************************************************
** meta-data defintion of "Help Content" to show to a user - for use in ** meta-data definition of "Help Content" to show to a user - for use in
** a specific "role" (e.g., insert screens but not view screens), and in a ** a specific "role" (e.g., insert screens but not view screens), and in a
** particular "format" (e.g., plain text, html, markdown). ** particular "format" (e.g., plain text, html, markdown).
** **
@ -48,6 +51,12 @@ public class QHelpContent implements QMetaDataObject
private HelpFormat format; private HelpFormat format;
private Set<HelpRole> roles; private Set<HelpRole> roles;
////////////////////////////////////
// these appear to be thread safe //
////////////////////////////////////
private static Parser commonMarkParser = Parser.builder().build();
private static HtmlRenderer commonMarkRenderer = HtmlRenderer.builder().build();
/******************************************************************************* /*******************************************************************************
@ -71,6 +80,38 @@ public class QHelpContent implements QMetaDataObject
/***************************************************************************
* Return the content as html string, based on its format.
* Only MARKDOWN actually gets processed (via commonmark) - but TEXT and
* HTML come out as-is.
***************************************************************************/
public String getContentAsHtml()
{
if(content == null)
{
return (null);
}
if(HelpFormat.MARKDOWN.equals(this.format))
{
//////////////////////////////
// convert markdown to HTML //
//////////////////////////////
Node document = commonMarkParser.parse(content);
String html = commonMarkRenderer.render(document);
return (html);
}
else
{
///////////////////////////////////////////////////
// other formats (html & text) just output as-is //
///////////////////////////////////////////////////
return (content);
}
}
/******************************************************************************* /*******************************************************************************
** Getter for content ** Getter for content
*******************************************************************************/ *******************************************************************************/

View File

@ -22,6 +22,7 @@
package com.kingsrook.qqq.backend.core.instances; package com.kingsrook.qqq.backend.core.instances;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -43,6 +44,7 @@ import com.kingsrook.qqq.backend.core.model.helpcontent.HelpContent;
import com.kingsrook.qqq.backend.core.model.helpcontent.HelpContentMetaDataProvider; import com.kingsrook.qqq.backend.core.model.helpcontent.HelpContentMetaDataProvider;
import com.kingsrook.qqq.backend.core.model.helpcontent.HelpContentRole; import com.kingsrook.qqq.backend.core.model.helpcontent.HelpContentRole;
import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
import com.kingsrook.qqq.backend.core.model.metadata.QSupplementalInstanceMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.dashboard.QWidgetMetaDataInterface; import com.kingsrook.qqq.backend.core.model.metadata.dashboard.QWidgetMetaDataInterface;
import com.kingsrook.qqq.backend.core.model.metadata.help.HelpRole; import com.kingsrook.qqq.backend.core.model.metadata.help.HelpRole;
import com.kingsrook.qqq.backend.core.model.metadata.help.QHelpContent; import com.kingsrook.qqq.backend.core.model.metadata.help.QHelpContent;
@ -477,6 +479,62 @@ class QInstanceHelpContentManagerTest extends BaseTest
/*******************************************************************************
**
*******************************************************************************/
@Test
void testSupplementalMetaDataHelpContentPlugin() throws QException
{
QInstance qInstance = QContext.getQInstance();
qInstance.withSupplementalMetaData(new TestSupplementalMetaDataHelpContentPlugin());
new HelpContentMetaDataProvider().defineAll(qInstance, TestUtils.MEMORY_BACKEND_NAME, null);
String content = "We are the priests";
QInstanceHelpContentManager.processHelpContentRecord(qInstance, new HelpContent()
.withId(1)
.withKey("someContentNotOtherwiseHandled")
.withContent(content)
.withRole(HelpContentRole.INSERT_SCREEN.getId()).toQRecord());
assertEquals(1, TestSupplementalMetaDataHelpContentPlugin.acceptedContent.size());
assertEquals(content, TestSupplementalMetaDataHelpContentPlugin.acceptedContent.get(0));
}
/***************************************************************************
*
***************************************************************************/
public static class TestSupplementalMetaDataHelpContentPlugin implements QSupplementalInstanceMetaData, QHelpContentPlugin
{
private static List<String> acceptedContent = new ArrayList<>();
/***************************************************************************
*
***************************************************************************/
@Override
public void acceptHelpContent(QInstance qInstance, QHelpContent helpContent, Map<String, String> nameValuePairs)
{
acceptedContent.add(helpContent.getContent());
}
/***************************************************************************
*
***************************************************************************/
@Override
public String getName()
{
return getClass().getName();
}
}
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/

View File

@ -0,0 +1,55 @@
/*
* QQQ - Low-code Application Framework for Engineers.
* Copyright (C) 2021-2025. Kingsrook, LLC
* 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
* contact@kingsrook.com
* https://github.com/Kingsrook/
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.kingsrook.qqq.backend.core.model.metadata.help;
import com.kingsrook.qqq.backend.core.BaseTest;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
/*******************************************************************************
** Unit test for QHelpContent
*******************************************************************************/
class QHelpContentTest extends BaseTest
{
/*******************************************************************************
**
*******************************************************************************/
@Test
void testGetContentAsHtml()
{
assertNull(new QHelpContent().withFormat(null).withContent(null).getContentAsHtml());
assertNull(new QHelpContent().withFormat(HelpFormat.MARKDOWN).withContent(null).getContentAsHtml());
assertNull(new QHelpContent().withFormat(HelpFormat.HTML).withContent(null).getContentAsHtml());
assertNull(new QHelpContent().withFormat(HelpFormat.TEXT).withContent(null).getContentAsHtml());
assertEquals("<p><em>hi</em></p>\n", new QHelpContent().withFormat(HelpFormat.MARKDOWN).withContent("*hi*").getContentAsHtml());
assertEquals("<i>hi</i>", new QHelpContent().withFormat(HelpFormat.HTML).withContent("<i>hi</i>").getContentAsHtml());
assertEquals("hi", new QHelpContent().withFormat(HelpFormat.TEXT).withContent("hi").getContentAsHtml());
assertEquals("*hi*", new QHelpContent().withFormat(HelpFormat.TEXT).withContent("*hi*").getContentAsHtml());
assertEquals("*hi*", new QHelpContent().withFormat(null).withContent("*hi*").getContentAsHtml());
}
}