CE-1887 - Update to return full icon object, not just name

This commit is contained in:
2024-10-31 11:19:24 -05:00
parent f01301e993
commit 45439d7596
8 changed files with 96 additions and 42 deletions

View File

@ -32,6 +32,7 @@ import com.kingsrook.qqq.middleware.javalin.schemabuilder.ToSchema;
import com.kingsrook.qqq.middleware.javalin.schemabuilder.annotations.OpenAPIDescription;
import com.kingsrook.qqq.middleware.javalin.schemabuilder.annotations.OpenAPIExclude;
import com.kingsrook.qqq.middleware.javalin.schemabuilder.annotations.OpenAPIListItems;
import com.kingsrook.qqq.middleware.javalin.schemabuilder.annotations.OpenAPIMapKnownEntries;
import com.kingsrook.qqq.middleware.javalin.schemabuilder.annotations.OpenAPIMapValueType;
@ -91,10 +92,11 @@ public class AppMetaData implements ToSchema
/***************************************************************************
**
***************************************************************************/
@OpenAPIDescription("Name of an icon for the app, from the material UI icon set")
public String getIconName()
@OpenAPIDescription("Icon to display for the app.")
@OpenAPIMapKnownEntries(value = Icon.class, useRef = true)
public Icon getIcon()
{
return (this.wrapped.getIconName());
return (this.wrapped.getIcon() == null ? null : new Icon(this.wrapped.getIcon()));
}

View File

@ -28,6 +28,7 @@ import com.kingsrook.qqq.middleware.javalin.schemabuilder.ToSchema;
import com.kingsrook.qqq.middleware.javalin.schemabuilder.annotations.OpenAPIDescription;
import com.kingsrook.qqq.middleware.javalin.schemabuilder.annotations.OpenAPIExclude;
import com.kingsrook.qqq.middleware.javalin.schemabuilder.annotations.OpenAPIListItems;
import com.kingsrook.qqq.middleware.javalin.schemabuilder.annotations.OpenAPIMapKnownEntries;
/***************************************************************************
@ -60,6 +61,7 @@ public class AppTreeNode implements ToSchema
}
/***************************************************************************
**
***************************************************************************/
@ -70,6 +72,7 @@ public class AppTreeNode implements ToSchema
}
/***************************************************************************
**
***************************************************************************/
@ -91,6 +94,7 @@ public class AppTreeNode implements ToSchema
}
/***************************************************************************
**
***************************************************************************/
@ -102,4 +106,15 @@ public class AppTreeNode implements ToSchema
}
/***************************************************************************
**
***************************************************************************/
@OpenAPIDescription("Icon to display for the item.")
@OpenAPIMapKnownEntries(value = Icon.class, useRef = true)
public Icon getIcon()
{
return (this.wrapped.getIcon() == null ? null : new Icon(this.wrapped.getIcon()));
}
}

View File

@ -26,6 +26,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.frontend.QFrontendProcessMe
import com.kingsrook.qqq.middleware.javalin.schemabuilder.ToSchema;
import com.kingsrook.qqq.middleware.javalin.schemabuilder.annotations.OpenAPIDescription;
import com.kingsrook.qqq.middleware.javalin.schemabuilder.annotations.OpenAPIExclude;
import com.kingsrook.qqq.middleware.javalin.schemabuilder.annotations.OpenAPIMapKnownEntries;
/***************************************************************************
@ -117,10 +118,11 @@ public class ProcessMetaDataLight implements ToSchema
/***************************************************************************
**
***************************************************************************/
@OpenAPIDescription("Name of an icon for the process, from the material UI icon set")
public String getIconName()
@OpenAPIDescription("Icon to display for the process.")
@OpenAPIMapKnownEntries(value = Icon.class, useRef = true)
public Icon getIcon()
{
return (this.wrapped.getIconName());
return (this.wrapped.getIcon() == null ? null : new Icon(this.wrapped.getIcon()));
}

View File

@ -31,6 +31,7 @@ import com.kingsrook.qqq.middleware.javalin.schemabuilder.ToSchema;
import com.kingsrook.qqq.middleware.javalin.schemabuilder.annotations.OpenAPIDescription;
import com.kingsrook.qqq.middleware.javalin.schemabuilder.annotations.OpenAPIExclude;
import com.kingsrook.qqq.middleware.javalin.schemabuilder.annotations.OpenAPIListItems;
import com.kingsrook.qqq.middleware.javalin.schemabuilder.annotations.OpenAPIMapKnownEntries;
/***************************************************************************
@ -100,10 +101,11 @@ public class TableMetaDataLight implements ToSchema
/***************************************************************************
**
***************************************************************************/
@OpenAPIDescription("Name of an icon for the table, from the material UI icon set")
public String getIconName()
@OpenAPIDescription("Icon to display for the table")
@OpenAPIMapKnownEntries(value = Icon.class, useRef = true)
public Icon getIcon()
{
return (this.wrapped.getIconName());
return (this.wrapped.getIcon() == null ? null : new Icon(this.wrapped.getIcon()));
}