From 6e26a017493d9400505d85a7579779e8b552b387 Mon Sep 17 00:00:00 2001 From: sgrtye <55668018+sgrtye@users.noreply.github.com> Date: Wed, 14 Feb 2024 18:09:34 +0000 Subject: [PATCH] Update src/widgets/customapi/component.jsx Co-authored-by: shamoon <4887959+shamoon@users.noreply.github.com> --- src/widgets/customapi/component.jsx | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/widgets/customapi/component.jsx b/src/widgets/customapi/component.jsx index 4ab0f4cb..b6ef9ac2 100644 --- a/src/widgets/customapi/component.jsx +++ b/src/widgets/customapi/component.jsx @@ -103,24 +103,22 @@ function getColor(mapping, customData) { const value = getValue(mapping.additionalField, customData); const color = mapping.additionalFieldColor; - if (color) { - if (color === "auto") { - const numberRegex = /-?\d*\.?\d+/g; - const matches = value.match(numberRegex); - - if (matches && matches.length > 0) { - return matches[0] > 0 ? "text-emerald-300" : "text-rose-300"; + switch (color) { + case "auto": + try { + const number = parseFloat(value); + return number > 0 ? "text-emerald-300" : "text-rose-300"; + } catch (e) { + return ""; } - } else if (color === "black") { + case ("black") : return `text-black`; - } else if (color === "white") { + case ("white") : return `text-white`; - } else if (color === "theme") { + case ("theme") : return `text-theme-500`; - } - } - - return ""; + default: + return "" } export default function Component({ service }) {