fix(composer): fix issue displaying 0 in overlay

awslabs · Aug 7, 2023 · b37b926 · b37b926
1 parent bb96f3b
commit b37b926
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/packages/scene-composer/src/utils/dataBindingVariableUtils.spec.ts b/packages/scene-composer/src/utils/dataBindingVariableUtils.spec.ts
@@ -1,7 +1,9 @@
 import { replaceBindingVariables } from './dataBindingVariableUtils';
 
 describe('replaceBindingVariables', () => {
-  const bindingValuesMap: Record<string, string> = {
+  const bindingValuesMap: Record<string, unknown> = {
+    zero: 0,
+    false: false,
     'binding a': '11',
     'binding~!@#$%^&*()': '22',
     '<随机>': '33',
@@ -15,6 +17,22 @@ describe('replaceBindingVariables', () => {
     expect(result).toEqual(expected);
   });
 
+  it('should replace variable with value 0 correctly', () => {
+    const original = 'abc ${zero} def,.';
+    const expected = 'abc 0 def,.';
+
+    const result = replaceBindingVariables(original, bindingValuesMap);
+    expect(result).toEqual(expected);
+  });
+
+  it('should replace variable with value false correctly', () => {
+    const original = 'abc ${false} def,.';
+    const expected = 'abc false def,.';
+
+    const result = replaceBindingVariables(original, bindingValuesMap);
+    expect(result).toEqual(expected);
+  });
+
   it('should replace variable containing special character with value correctly', () => {
     const original = 'abc ${binding~!@#$%^&*()} def,.';
     const expected = 'abc 22 def,.';

diff --git a/packages/scene-composer/src/utils/dataBindingVariableUtils.ts b/packages/scene-composer/src/utils/dataBindingVariableUtils.ts
@@ -2,16 +2,16 @@
 const bindingVariableRegex = /\$\{.+?\}/gi;
 const UNAVAILABLE_DATA = '-';
 
-export function replaceBindingVariables(content: string, bindingValuesMap: Record<string, string>): string {
+export function replaceBindingVariables(content: string, bindingValuesMap: Record<string, unknown>): string {
   let result = content;
 
   const variableMatches = content.match(bindingVariableRegex) || [];
   const variables = variableMatches.map((v: string) => v.substring(2, v.length - 1));
   // Only support replace variable with their latest property value for now.
   variables.forEach((variable, index) => {
     // Display "-" when value not available
-    const value = bindingValuesMap[variable] || UNAVAILABLE_DATA;
-    result = result.replaceAll(variableMatches[index], value);
+    const value = bindingValuesMap[variable] ?? UNAVAILABLE_DATA;
+    result = result.replaceAll(variableMatches[index], String(value));
   });
 
   return result;

diff --git a/release-please-config.json b/release-please-config.json
@@ -40,7 +40,7 @@
     },
     {
       "type": "linked-versions",
-      "group-name": "iot-app-kit",
+      "groupName": "iot-app-kit",
       "components": [
         "root",
         "components",