perf(spec-paser): update $when in AC card to enhance compatibility (#…

…11880) Co-authored-by: rentu <[email protected]>
OfficeDev · Jun 24, 2024 · f11682a · f11682a
1 parent 4b23e7a
commit f11682a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/packages/spec-parser/src/adaptiveCardGenerator.ts b/packages/spec-parser/src/adaptiveCardGenerator.ts
@@ -155,15 +155,15 @@ export class AdaptiveCardGenerator {
             {
               type: "Image",
               url: `\${${name}}`,
-              $when: `\${${name} != null}`,
+              $when: `\${${name} != null && ${name} != ''}`,
             },
           ];
         } else {
           return [
             {
               type: "Image",
               url: "${$data}",
-              $when: "${$data != null}",
+              $when: "${$data != null && $data != ''}",
             },
           ];
         }

diff --git a/packages/spec-parser/src/adaptiveCardWrapper.ts b/packages/spec-parser/src/adaptiveCardWrapper.ts
@@ -86,7 +86,7 @@ export function inferPreviewCardTemplate(card: AdaptiveCard): PreviewCardTemplat
     result.image = {
       url: `\${${inferredProperties.imageUrl}}`,
       alt: `\${if(${inferredProperties.imageUrl}, ${inferredProperties.imageUrl}, 'N/A')}`,
-      $when: `\${${inferredProperties.imageUrl} != null}`,
+      $when: `\${${inferredProperties.imageUrl} != null && ${inferredProperties.imageUrl} != ''}`,
     };
   }
 

diff --git a/packages/spec-parser/test/adaptiveCardGenerator.test.ts b/packages/spec-parser/test/adaptiveCardGenerator.test.ts
@@ -90,7 +90,7 @@ describe("adaptiveCardGenerator", () => {
           {
             type: "Image",
             url: "${photo_url}",
-            $when: "${photo_url != null}",
+            $when: "${photo_url != null && photo_url != ''}",
           },
           {
             type: "TextBlock",
@@ -183,7 +183,7 @@ describe("adaptiveCardGenerator", () => {
               {
                 type: "Image",
                 url: `\${image}`,
-                $when: `\${image != null}`,
+                $when: `\${image != null && image != ''}`,
               },
             ],
           },
@@ -520,7 +520,7 @@ describe("adaptiveCardGenerator", () => {
             {
               type: "Image",
               url: "${$data}",
-              $when: "${$data != null}",
+              $when: "${$data != null && $data != ''}",
             },
           ],
         },
@@ -797,7 +797,7 @@ describe("adaptiveCardGenerator", () => {
                 {
                   type: "Image",
                   url: `\${iconUrl}`,
-                  $when: `\${iconUrl != null}`,
+                  $when: `\${iconUrl != null && iconUrl != ''}`,
                 },
               ],
             },

diff --git a/packages/spec-parser/test/adaptiveCardWrapper.test.ts b/packages/spec-parser/test/adaptiveCardWrapper.test.ts
@@ -34,7 +34,7 @@ describe("adaptiveCardWrapper", () => {
             wrap: true,
           },
           {
-            $when: "${imageUrl != null}",
+            $when: "${imageUrl != null && imageUrl != ''}",
             type: "Image",
             url: "${imageUrl}",
           },
@@ -257,7 +257,7 @@ describe("adaptiveCardWrapper", () => {
       expect(result.image).to.be.deep.equal({
         url: "${photoUrl}",
         alt: "${if(photoUrl, photoUrl, 'N/A')}",
-        $when: "${photoUrl != null}",
+        $when: "${photoUrl != null && photoUrl != ''}",
       });
     });
   });
@@ -333,7 +333,7 @@ describe("adaptiveCardWrapper", () => {
           subtitle: "${if(petId, petId, 'N/A')}",
           image: {
             url: "${imageUrl}",
-            $when: "${imageUrl != null}",
+            $when: "${imageUrl != null && imageUrl != ''}",
             alt: "${if(imageUrl, imageUrl, 'N/A')}",
           },
         },

diff --git a/packages/spec-parser/test/manifestUpdater.test.ts b/packages/spec-parser/test/manifestUpdater.test.ts
@@ -232,7 +232,7 @@ describe("updateManifestWithAiPlugin", () => {
                       wrap: true,
                     },
                     {
-                      $when: "${imageUrl != null}",
+                      $when: "${imageUrl != null && imageUrl != ''}",
                       type: "Image",
                       url: "${imageUrl}",
                     },
@@ -531,7 +531,7 @@ describe("updateManifestWithAiPlugin", () => {
                       wrap: true,
                     },
                     {
-                      $when: "${imageUrl != null}",
+                      $when: "${imageUrl != null && imageUrl != ''}",
                       type: "Image",
                       url: "${imageUrl}",
                     },
@@ -738,7 +738,7 @@ describe("updateManifestWithAiPlugin", () => {
                       type: "Container",
                     },
                     {
-                      $when: "${imageUrl != null}",
+                      $when: "${imageUrl != null && imageUrl != ''}",
                       type: "Image",
                       url: "${imageUrl}",
                     },