From 2703f06b2351f83246b01c2b5b54cf3d4cc21589 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Wed, 26 Feb 2025 14:55:07 -0600 Subject: [PATCH] Add TOOLTIP type adornment; also, update url-encoding in FileDownload adornment to .replace("+", "%20") --- .../model/metadata/fields/AdornmentType.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/fields/AdornmentType.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/fields/AdornmentType.java index 9fb76f41..4cf6e42b 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/fields/AdornmentType.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/fields/AdornmentType.java @@ -46,6 +46,7 @@ public enum AdornmentType REVEAL, FILE_DOWNLOAD, FILE_UPLOAD, + TOOLTIP, ERROR; ////////////////////////////////////////////////////////////////////////// // keep these values in sync with AdornmentType.ts in qqq-frontend-core // @@ -92,9 +93,9 @@ public enum AdornmentType static String makeFieldDownloadUrl(String tableName, Serializable primaryKey, String fieldName, String fileName) { return ("/data/" + tableName + "/" - + URLEncoder.encode(Objects.requireNonNullElse(ValueUtils.getValueAsString(primaryKey), ""), StandardCharsets.UTF_8) + "/" + + URLEncoder.encode(Objects.requireNonNullElse(ValueUtils.getValueAsString(primaryKey), ""), StandardCharsets.UTF_8).replace("+", "%20") + "/" + fieldName + "/" - + URLEncoder.encode(Objects.requireNonNullElse(fileName, ""), StandardCharsets.UTF_8)); + + URLEncoder.encode(Objects.requireNonNullElse(fileName, ""), StandardCharsets.UTF_8).replace("+", "%20")); } } @@ -246,4 +247,15 @@ public enum AdornmentType } } + + + /******************************************************************************* + ** + *******************************************************************************/ + public interface TooltipValues + { + String STATIC_TEXT = "staticText"; + String TOOLTIP_DYNAMIC = "tooltipDynamic"; + } + }