Task: Update adaptive cards templating (#2183)

microsoftgraph · Oct 31, 2022 · 62b227a · 62b227a
1 parent 49d2b4c
commit 62b227a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,8 +15,9 @@
                 "@microsoft/microsoft-graph-client": "3.0.2",
                 "@monaco-editor/react": "4.4.6",
                 "@ms-ofb/officebrowserfeedbacknpm": "file:packages/officebrowserfeedbacknpm-1.6.6.tgz",
+                "adaptive-expressions": "4.17.1",
                 "adaptivecards": "2.11.1",
-                "adaptivecards-templating": "1.4.0",
+                "adaptivecards-templating": "2.3.1",
                 "apg-js": "4.1.2",
                 "babel-loader": "8.2.5",
                 "babel-preset-react-app": "10.0.1",

diff --git a/src/app/services/actions/adaptive-cards-action-creator.ts b/src/app/services/actions/adaptive-cards-action-creator.ts
@@ -70,6 +70,7 @@ function createCardFromTemplate(templatePayload: any, payload: string): Adaptive
     $root: payload
   };
   AdaptiveCardsTemplateAPI.GlobalSettings.getUndefinedFieldValueSubstitutionString = (
+    // eslint-disable-next-line no-unused-vars
     _path: string
   ) => ' ';
   return template.expand(context);

diff --git a/src/app/views/query-response/adaptive-cards/AdaptiveCard.tsx b/src/app/views/query-response/adaptive-cards/AdaptiveCard.tsx
@@ -164,6 +164,7 @@ class AdaptiveCard extends Component<IAdaptiveCardProps> {
                   className={classes.copyIcon}
                   handleOnClick={handleCopy}
                   isIconButton={true}
+                  style={{ float: 'right', zIndex: 1 }}
                 />
                 <Monaco
                   language='json'