Merged PR 18976: Merge dev to master

Edit & Save final. bug fixes.
microsoft · Mar 19, 2017 · b3fc219 · b3fc219
1 parent 933bdcd
commit b3fc219
Show file tree

Hide file tree

Showing 60 changed files with 6,807 additions and 666 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -0,0 +1,16 @@
+Microsoft.PowerBI.JavaScript
+
+THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
+Do Not Translate or Localize
+
+This project incorporates components from the projects listed below. The original copyright notices and the licenses under which Microsoft received such components are set forth below. Microsoft reserves all rights not expressly granted herein, whether by implication, estoppel or otherwise.
+
+	1. SyntaxHighlighter (https://github.com/syntaxhighlighter/syntaxhighlighter)
+
+	Copyright (c) 2004-2013, Alex Gorbatchev
+
+	Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+	The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/demo/LICENSE.txt b/demo/LICENSE.txt
@@ -0,0 +1,13 @@
+Microsoft.PowerBI.JavaScript
+
+Copyright (c) Microsoft Corporation
+
+All rights reserved. 
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/demo/NOTICE.txt b/demo/NOTICE.txt
@@ -0,0 +1,16 @@
+Microsoft.PowerBI.JavaScript
+
+THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
+Do Not Translate or Localize
+
+This project incorporates components from the projects listed below. The original copyright notices and the licenses under which Microsoft received such components are set forth below. Microsoft reserves all rights not expressly granted herein, whether by implication, estoppel or otherwise.
+
+	1. SyntaxHighlighter (https://github.com/syntaxhighlighter/syntaxhighlighter)
+
+	Copyright (c) 2004-2013, Alex Gorbatchev
+
+	Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+	The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/demo/app/dataselection.js b/demo/app/dataselection.js
@@ -3,7 +3,7 @@ $(function () {
 
   console.log('Scenario 7: Data Selection');
 
-  var reportUrl = 'https://powerbiembedapi.azurewebsites.net/api/reports/c52af8ab-0468-4165-92af-dc39858d66ad';
+  var reportUrl = 'https://powerbi-embed-api.azurewebsites.net/api/reports/c52af8ab-0468-4165-92af-dc39858d66ad';
   var $reportContainer = $('#reportContainer');
   var report;
   var $dataSelectedContainer = $("#dataSelectedContainer");
@@ -29,11 +29,11 @@ $(function () {
 });
 
 function initializeDataSelection(report, $dataSelectedContainer) {
-  report.on('dataSelected', event => {
+  report.on('dataSelected', function (event) {
     console.log('dataSelected: ', event);
 
     var data = event.detail;
 
     $dataSelectedContainer.text(JSON.stringify(data, null, '  '));
   });
-}
+}
diff --git a/demo/app/defaults.js b/demo/app/defaults.js
@@ -3,7 +3,7 @@ $(function () {
 
   console.log('Scenario 5: Default Page and/or Filter');
 
-  var staticReportUrl = 'https://powerbiembedapi.azurewebsites.net/api/reports/c52af8ab-0468-4165-92af-dc39858d66ad';
+  var staticReportUrl = 'https://powerbi-embed-api.azurewebsites.net/api/reports/c52af8ab-0468-4165-92af-dc39858d66ad';
   var $defaultPageReportContainer = $('#reportdefaults');
   var defaultPageReport;
   var defaultPageName = 'ReportSection2';
@@ -21,6 +21,8 @@ $(function () {
       }
     ]);
 
+  var defaultFilters = [defaultFilter];
+
   // Init
   fetch(staticReportUrl)
     .then(function (response) {
@@ -29,7 +31,7 @@ $(function () {
           .then(function (embedConfig) {
             var defaultsEmbedConfig = $.extend({}, embedConfig, {
               pageName: defaultPageName,
-              filter: defaultFilter.toJSON(),
+              filter: defaultFilters,
               settings: {
                 filterPaneEnabled: true,
                 navContentPaneEnabled: true
@@ -47,4 +49,4 @@ $(function () {
           });
       }
     });
-});
+});
diff --git a/demo/app/dynamic.js b/demo/app/dynamic.js
@@ -4,7 +4,7 @@ $(function () {
   console.log('Scenario 2: Dynamic Embed');
 
   // Declare Variables
-  var allReportsUrl = 'https://powerbiembedapi.azurewebsites.net/api/reports';
+  var allReportsUrl = 'https://powerbi-embed-api.azurewebsites.net/api/reports';
   var $reportsList = $('#reportslist');
   var $resetButton = $('#resetButton');
   var $dynamicReportContainer = $('#reportdynamic');

diff --git a/demo/app/filters.js b/demo/app/filters.js
@@ -3,7 +3,7 @@ $(function () {
 
   console.log('Scenario 4: Custom Filter Pane');
 
-  var reportUrl = 'https://powerbiembedapi.azurewebsites.net/api/reports/c52af8ab-0468-4165-92af-dc39858d66ad';
+  var reportUrl = 'https://powerbi-embed-api.azurewebsites.net/api/reports/c52af8ab-0468-4165-92af-dc39858d66ad';
   var $customFilterPaneContainer = $('#reportcustomfilter');
   var customFilterPaneReport;
   var customFilterPaneReportPages;

diff --git a/demo/app/index.js b/demo/app/index.js
@@ -2,7 +2,7 @@ $(function () {
   var models = window['powerbi-client'].models;
 
   // Scenario 1: Static Embed
-  var staticReportUrl = 'https://powerbiembedapi.azurewebsites.net/api/reports/c52af8ab-0468-4165-92af-dc39858d66ad';
+  var staticReportUrl = 'https://powerbi-embed-api.azurewebsites.net/api/reports/c52af8ab-0468-4165-92af-dc39858d66ad';
   var $staticReportContainer = $('#reportstatic');
   var staticReport;
 

diff --git a/demo/app/pagenavigation.js b/demo/app/pagenavigation.js
@@ -4,7 +4,7 @@ $(function () {
   console.log('Scenario 3: Custom Page Navigation');
 
   // Declare Variables
-  var staticReportUrl = 'https://powerbiembedapi.azurewebsites.net/api/reports/c52af8ab-0468-4165-92af-dc39858d66ad';
+  var staticReportUrl = 'https://powerbi-embed-api.azurewebsites.net/api/reports/c52af8ab-0468-4165-92af-dc39858d66ad';
   var $customPageNavContainer = $('#reportcustompagenav');
   var customPageNavReport;
   var $reportPagesList = $('#reportpagesbuttons');

diff --git a/demo/app/settings.js b/demo/app/settings.js
@@ -3,7 +3,7 @@ $(function () {
 
   console.log('Scenario 6: Update settings');
 
-  var reportUrl = 'https://powerbiembedapi.azurewebsites.net/api/reports/c52af8ab-0468-4165-92af-dc39858d66ad';
+  var reportUrl = 'https://powerbi-embed-api.azurewebsites.net/api/reports/c52af8ab-0468-4165-92af-dc39858d66ad';
   var $updateSettingsReport = $('#updatesettingsreport');
   var updateSettingsReport;
   var updateSettingsReportFilterPaneEnabled = false;

diff --git a/demo/code-demo/anyReport.html b/demo/code-demo/anyReport.html
@@ -0,0 +1,52 @@
+<div id="userReport" class="line">
+    <div class="pageTitle">
+        <h3>Embed your own report</h3>
+        <h8>You can also embed your own report by following the instructions below.</h8>
+    </div>
+    <div class="settings">
+        <div id="EmbedWithSpecificReportDiv">
+            <div class="line">
+                <h5>Prerequisites</h5>
+                <ul>
+                    <li>A workspace in the <a href="https://azure.microsoft.com/en-us/documentation/articles/power-bi-embedded-get-started/">Power BI embedded service.</a></li>
+                    <li>Power BI report imported to your workspace.</li>
+                </ul>
+            </div>
+
+            <div class="line">
+                <h5>Instructions to generate an embed App Token</h5>
+                Once you have improted a report into Power BI workspace, you are ready to embed it.
+
+                To embed a report, you need to get an embed App Token. You can create this token in multiple ways.
+                <ul>
+                    <li>Using <a href="https://github.com/Microsoft/PowerBI-cli">PowerBI-Cli</a> tool.</li>
+                    <li>From .Net Code using <a href="http://www.nuget.org/packages/Microsoft.PowerBI.Core/">Microsoft.PowerBI.Core</a> package.</li>
+                    <li>From NodeJS code using <a href="https://github.com/Microsoft/PowerBI-Node">powerbi-api</a> package.</li>
+                </ul>
+            </div>
+
+            <div id="authorizeParameterDiv" class="line">
+                <h5>Enter embed details</h5>
+
+                <table id="user-embed-details">
+                    <tr>
+                        <td class="td-field-name">Embed App Token</td>
+                        <td><input type="text" id="auth_txtAccessToken" onchange="UpdateSession(this, SessionKeys.AccessToken);" /></td>
+                    </tr>
+                    <tr>
+                        <td class="td-field-name">Embed URL</td>
+                        <td>
+                            <input type="text" id="auth_txtReportEmbed" onchange="UpdateSession(this, SessionKeys.EmbedUrl);" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="td-field-name">Report Id</td>
+                        <td><input type="text" id="auth_txtEmbedReportId" onchange="UpdateSession(this, SessionKeys.EmbedId);"/></td>
+                    </tr>
+                </table>
+                <button id="nextStep" class="blueButton" onclick="OpenEmbedStepFromUserSettings()">Next step - Embed</button>
+            </div>
+
+        </div>
+    </div>
+</div>
diff --git a/demo/code-demo/code_area.html b/demo/code-demo/code_area.html
@@ -2,10 +2,12 @@
 <div class="editorTitle">Code</div>
 <div class="textAreaControls">
     <button id="btnRunCode" class="textAreaControl">
-        <img src="images\run.png"/> Run
+        <img src="images\run.png" /> Run
     </button>
     <button id="btnCopyCode" class="textAreaControl" onclick="CopyCode();">
-        <img src="images\copy.png"/> Copy
+        <img src="images\copy.png" /> Copy
     </button>
 </div>
-<textarea id="txtCode" readonly />
+
+<div id="highlighter">
+</div>
diff --git a/demo/code-demo/docs.html b/demo/code-demo/docs.html
@@ -0,0 +1,26 @@
+<div>
+    <div class="title">
+        <h2>Getting Started</h2>
+    </div>
+    <div>
+        Please visit our 
+        <a href="https://docs.microsoft.com/en-us/azure/power-bi-embedded/power-bi-embedded-what-is-power-bi-embedded">documentation</a>
+        to start using Power BI Embedded.
+    </div>
+</div>
+
+<h2>Videos</h2>
+
+<div>
+    <div class="title">
+        1. Learn how to Embed and Interact with Power BI Reports.
+    </div>
+    <iframe class="video" src="https://www.youtube.com/embed/nfkVljh_9O4" frameborder="0" allowfullscreen></iframe>
+</div>
+
+<div>
+    <div class="title">
+        2. Learn how to Create, Edit and Save Power BI reports in Embedded view.
+    </div>
+    <iframe class="video" src="https://www.youtube.com/embed/ibuN4DzCl5c?showinfo=0" frameborder="0" allowfullscreen></iframe>
+</div>
diff --git a/demo/code-demo/index.html b/demo/code-demo/index.html
@@ -1,13 +1,16 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <link rel="stylesheet" href="/node_modules/bootstrap/dist/css/bootstrap.css" />
+    <link rel="stylesheet" href="../node_modules/bootstrap/dist/css/bootstrap.css" />
+    <link type="text/css" rel="stylesheet" href="syntaxHighlighter/theme.css">
     <link rel="stylesheet" type="text/css" href="style/style.css">
     <link rel="stylesheet" type="text/css" href="style/layout.css">
+    <link rel="stylesheet" type="text/css" href="style/syntaxHighlighterOverride.css">
+
 </head>
 
 <body>
@@ -16,45 +19,46 @@
           <div class="logo-text">
               <div class="logo-text-span">Microsoft Power BI – Report Embed Sample</div>
           </div>
-          <div id="steps-nav-bar">
-            <div id="steps-ul-dev">
-                <ul id="steps-ul" class="steps-ul">
-                    <li id="steps-auth" class="steps-li-active" onclick="OpenAuthStep();">
-                        <div><a href="#">Authorize</a></div>
-                        <div class="step-div">
-                        </div>
+          <div id="top-nav-bar">
+            <div id="top-ul-dev">
+                <ul id="top-ul" class="top-ul">
+                    <li id="top-sample" class="top-li-active" onclick="OpenSampleSection();">
+                        <div><a href="#">Sample</a></div>
                     </li>
-                    <li id="steps-embed" onclick="OpenEmbedStep();">
-                        <div><a href="#">Embed</a></div>
-                        <div class="step-div"></div>
+                    <li id="top-anyReport" class="top-li-active" onclick="OpenAnyReportSection();">
+                        <div><a href="#">Any Report</a></div>
                     </li>
-                    <li id="steps-interact" onclick="OpenInteractStep();">
-                        <div><a href="#">Interact</a></div>
-                        <div class="step-div"></div>
+                    <li id="top-docs" onclick="OpenDocumentationSection();">
+                        <div><a href="#">Documentation</a></div>
                     </li>
                 </ul>
             </div>
           </div>
         </div>
     </header>
 
-    <div id="mainContent">
-    </div>
+    <div id="contentWrapper">
+        <div id ="sampleContent" class="content">
+        </div>
+
+        <div id ="documentationContent" class="content">
+        </div>
 
-    <div id="oldSample">
-        <a href="/static.html">Old Sample</a>
+        <div id ="anyReportContent" class="content">
+        </div>
     </div>
 
-    <script src="/node_modules/jquery/dist/jquery.js"></script>
-    <script src="/node_modules/es6-promise/dist/es6-promise.js"></script>
-    <script src="/node_modules/powerbi-client/dist/powerbi.js"></script>
-    
+    <script src="../node_modules/jquery/dist/jquery.js"></script>
+    <script src="../node_modules/es6-promise/dist/es6-promise.js"></script>
+    <script src="../node_modules/powerbi-client/dist/powerbi.js"></script>
+
     <script src="scripts/codesamples.js"></script>
 
     <script src="scripts/index.js"></script>
     <script src="scripts/utils.js"></script>
     <script src="scripts/logger.js"></script>
     <script src="scripts/session_utils.js"></script>
+    <script src="scripts/function_mapping.js"></script>
 
     <script src="scripts/report.js"></script>
 

diff --git a/demo/code-demo/report.html b/demo/code-demo/report.html
@@ -23,10 +23,13 @@
     $("#authorize-step-wrapper").load("step_authorize.html");
 
     LoadLogWindow("#logWindow");
+
+    var modeUrlParam = GetParameterByName("mode");
+    var mode = modeUrlParam ? modeUrlParam : "view";
 
     if (GetParameterByName("embedUrl") || GetParameterByName("embedId") || GetParameterByName("accessToken"))
     {
-        OpenEmbedStep();
+        OpenEmbedStep(mode);
     }
     else
     {

diff --git a/demo/code-demo/sample.html b/demo/code-demo/sample.html
@@ -0,0 +1,24 @@
+<div id="steps-nav-bar">
+    <div id="steps-ul-dev">
+        <ul id="steps-ul" class="steps-ul">
+            <li id="steps-auth" class="steps-li-active" onclick="OpenAuthStep();">
+                <div class="stepsButton">
+                    <a href="#">1. Authorize</a>
+                </div>
+            </li>
+            <li id="steps-embed" onclick="OpenEmbedStep('view');">
+                <div class="stepsButton">
+                    <a href="#">2. Embed</a>
+                </div>
+            </li>
+            <li id="steps-interact" onclick="OpenInteractStep();">
+                <div class="stepsButton">
+                    <a href="#">3. Interact</a>
+                </div>
+            </li>
+        </ul>
+    </div>
+</div>
+
+<div id="mainContent">
+</div>