Fix parseValue for "title: $title" cases and missed data (#380)

* TDD: failing test for value parsing

* [fix] bullet-proof parseValue: all vars; fallback

* [fix] get strings and structures from parseValue

Co-authored-by: Nick Skriabin <[email protected]>
Co-authored-by: Max Tkachenko <[email protected]>

Author: 3 people

src/utils/__tests__/data.test.js

@@ -137,6 +137,10 @@ describe("parseValue", () => {
     expect(parseValue("$num2str", data)).toEqual("123");
   });
 
+  test("Text with one variable", () => {
+    expect(parseValue("URL: $url", data)).toEqual("URL: https://labelstud.io");
+  });
+
   test("Text with variables", () => {
     expect(parseValue("URL of $name is $url", data)).toEqual("URL of Label Studio is https://labelstud.io");
   });

src/utils/data.js

@@ -4,6 +4,8 @@ import get from "lodash.get";
 /**
  * Simple way to retrieve linked data in `value` param from task
  * Works only for prefixed values ($image); non-prefixed values left as is
+ * It's possible to add some text which will be left untouched; that's useful for
+ * visual Text tags to display some additional info ("Title: $title")
  * @param {string} value param
  * @param {object} task
  */
@@ -12,18 +14,12 @@ export const parseValue = (value, task) => {
 
   if (!value) return "";
 
-  if (value.match(reVar)?.length === 1) {
-    return get(task, value.substr(1));
+  // value can refer to structures, not only texts, so just replace wouldn't be enough
+  if (value.match(reVar)?.[0] === value) {
+    return get(task, value.substr(1)) ?? "";
   }
 
-  // case for visual Text tags to display some additional info ("Title: $title")
-  return value.replace(reVar, (v) => {
-    if (v && v.startsWith('$')) {
-      return get(task, v.substr(1));
-    }
-
-    return v;
-  });
+  return value.replace(reVar, (v) => get(task, v.substr(1) ?? ""));
 };
 
 /**