Merged PR 13354: Add Q&A url params support and fix token url param bug

Add Q&A url params support and fix token url param bug

Author: Amit Shuster

demo/v2-demo/report.html

@@ -74,17 +74,7 @@
     const mode = modeUrlParam ? modeUrlParam : "view";
 
     const entityTypeUrlParam = GetParameterByName("entityType");
-    let entityType;
-    if (entityTypeUrlParam == "dashboard") {
-        entityType = EntityType.Dashboard;
-    } else if (entityTypeUrlParam == "tile") {
-        entityType = EntityType.Tile;
-    }
-    else if (entityTypeUrlParam == "visual") {
-        entityType = EntityType.Visual;
-    } else {
-        entityType = EntityType.Report;
-    }
+    let entityType = getEntityTypeFromParameter(entityTypeUrlParam);
 
     // set mode and type in session.
     SetSession(SessionKeys.EntityType, entityType);
@@ -97,7 +87,7 @@
 
         if (GetParameterByName("embedUrl") || GetParameterByName("embedId") || GetParameterByName("accessToken") || GetParameterByName("entityType"))
         {
-            OpenCodeStep(mode, entityType, 0);
+            OpenCodeStep(mode, entityType, GetParameterByName("tokenType") || 0);
         }
         else
         {

demo/v2-demo/scripts/report.js

@@ -355,17 +355,27 @@ function OpenEmbedMode(mode, entityType, tokenType)
     }
     else if (entityType == EntityType.Qna)
     {
+        LoadSettings = function() {
+            SetTextBoxesFromSessionOrUrlParam("#txtAccessToken", "#txtQnaEmbed", "#txtDatasetId");
+            SetTextboxFromSessionOrUrlParam(SessionKeys.QnaQuestion, "#txtQuestion");
+            setCodeAndShowEmbedSettings(mode, entityType, tokenType);
+            let qnaMode = GetParameterByName(SessionKeys.QnaMode);
+            if (qnaMode) {
+                SetSession(SessionKeys.QnaMode, qnaMode);
+                let modesRadios = $('input:radio[name=qnaMode]');
+                modesRadios.filter('[value=' + qnaMode + ']').prop('checked', true);
+            }
+        };
+
         if (IsEmbeddingSampleQna())
         {
             LoadSampleQnaIntoSession().then(function (response) {
-                SetTextBoxesFromSessionOrUrlParam("#txtAccessToken", "#txtQnaEmbed", "#txtDatasetId");
-                setCodeAndShowEmbedSettings(mode, entityType, tokenType);
+                LoadSettings();
             });
         }
         else
         {
-            SetTextBoxesFromSessionOrUrlParam("#txtAccessToken", "#txtQnaEmbed", "#txtDatasetId");
-            setCodeAndShowEmbedSettings(mode, entityType, tokenType);
+            LoadSettings();
         }
     }
 }
@@ -411,7 +421,7 @@ function ToggleQuestionBox(enabled) {
     let txtQuestion = $("#txtQuestion");
     if (enabled === true) {
         let question = GetSession(SessionKeys.QnaQuestion);
-        question = question? question : defaultQnaQuestion;
+        question = question ? question : defaultQnaQuestion;
         txtQuestion.val(question);
         txtQuestion.prop('disabled', false);
     }

demo/v2-demo/scripts/utils.js

@@ -121,7 +121,7 @@ function getEmbedContainerID(entityType) {
     }
 }
 
-function getEmbedContainerClassPrefix(entityType, isMobile) {
+function getEmbedContainerClassPrefix(entityType) {
     switch (entityType) {
         case EntityType.Visual:
             return ".visual";
@@ -136,6 +136,21 @@ function getEmbedContainerClassPrefix(entityType, isMobile) {
     }
 }
 
+function getEntityTypeFromParameter(urlParam) {
+  switch (urlParam) {
+      case "visual":
+          return EntityType.Visual;
+      case "dashboard":
+          return EntityType.Dashboard;
+      case "tile":
+          return EntityType.Tile;
+      case "qna":
+          return EntityType.Qna;
+      default:
+          return EntityType.Report;
+  }
+}
+
 function elementClicked(element) {
     $(element).addClass('elementClicked');
     setTimeout(function() {

demo/v2-demo/settings_embed_qna.html

@@ -4,7 +4,7 @@
         <div class="spacer" />
         <div id="modeSelector">
             <label class="radioContainer">
-                <div onclick="ToggleQuestionBox(false);"><input type="radio" name="qnaMode" value="Interactive"> Show Q&A </input>
+                <div onclick="ToggleQuestionBox(false);"><input type="radio" name="qnaMode" value="InteractiveNoQuestion"> Show Q&A </input>
                 <span class="checkmark"></span></div>
             </label>
             <label class="radioContainer">