Merge branch 'master' into multi-embed-fix

Author: ali-hamud

.gitignore

@@ -1,5 +1,4 @@
 node_modules/
-bower_components/
 coverage/
 docs
 typings/

CONTRIBUTING.md

@@ -58,9 +58,9 @@ The build and tests use webpack to compile all the source modules into one bundl
 ## Running the demo
 Navigate to `/demo` directory
 
-Install bower dependencies:
+Install npm dependencies:
 ```
-bower install
+npm install
 ```
 
 Serve the demo directory:
@@ -84,4 +84,12 @@ npm run gulp -- build:docs
 If the docs are correct then you may publish them to gh-pages using this command
 ```
 npm run gulp -- ghpages
-```
+```
+
+## Known issues
+Running demo fails with an error ERR_INVALID_REDIRECT
+This happens due to version 10 of http-server. To solve the problem, please install [email protected] globally using:
+
+```
+npm install -g [email protected]
+```

README.md

@@ -3,21 +3,20 @@ JavaScript library for embedding Power BI into your apps.
 
 [![Build Status](https://img.shields.io/travis/Microsoft/PowerBI-JavaScript/master.svg)](https://travis-ci.org/Microsoft/PowerBI-JavaScript)
 [![NPM Version](https://img.shields.io/npm/v/powerbi-client.svg)](https://www.npmjs.com/package/powerbi-client)
-[![Bower Version](https://img.shields.io/bower/v/powerbi-client.svg)](https://bower.io/search/?q=powerbi-client)
 [![Nuget Version](https://img.shields.io/nuget/v/Microsoft.PowerBI.JavaScript.svg)](https://www.nuget.org/packages/Microsoft.PowerBI.JavaScript/)
 [![NPM Total Downloads](https://img.shields.io/npm/dt/powerbi-client.svg)](https://www.npmjs.com/package/powerbi-client)
 [![NPM Monthly Downloads](https://img.shields.io/npm/dm/powerbi-client.svg)](https://www.npmjs.com/package/powerbi-client)
 [![GitHub tag](https://img.shields.io/github/tag/microsoft/powerbi-javascript.svg)](https://github.com/Microsoft/PowerBI-JavaScript/tags)
 [![Gitter](https://img.shields.io/gitter/room/Microsoft/PowerBI-JavaScript.svg)](https://gitter.im/Microsoft/PowerBI-JavaScript)
 
 ## Wiki
-See the [wiki](https://github.com/Microsoft/PowerBI-JavaScript/wiki) for more details about embedding, service configuration, setting default page, page navigation, dynamically applying filters, and more.
+See the [wiki](https://github.com/Microsoft/PowerBI-JavaScript/wiki) for more details about embedding, service configuration, setting a default page, page navigation, dynamically applying filters, and more.
 
 ## Code Docs
 See the [code docs](https://microsoft.github.io/PowerBI-JavaScript) for detailed information about classes, interfaces, types, etc.
 
 ## Demo
-New [live demo](https://microsoft.github.io/PowerBI-JavaScript/demo) for sample application using the powerbi-client library in scenarios such as page navigation, applying filters, updating settings, and more.
+New [live demo](https://microsoft.github.io/PowerBI-JavaScript/demo) for a sample application using the `powerbi-client` library in scenarios such as page navigation, applying filters, updating settings, and more.
 
 ## Installation
 
@@ -29,29 +28,25 @@ Install from NPM:
 
 `npm install --save powerbi-client`
 
-Install from Bower:
-
-`bower install powerbi-client --save`
-
 Installing beta versions:
 
 `npm install --save powerbi-client@beta`
 
 ## Include the library via import or manually
 
-Ideally you would use module loader or compilation step to import using ES6 modules as:
+Ideally you would use a module loader or a compilation step to import using ES6 modules as:
 
 ```javascript
 import * as pbi from 'powerbi-client';
 ```
 
-However, the library is exported as a Universal Module and the powerbi.js script can be included before your apps closing `</body>` tag as:
+However, the library is exported as a Universal Module and the powerbi.js script can be included before your app's closing `</body>` tag as:
 
 ```html
-<script src="/bower_components/powerbi-client/dist/powerbi.js"></script>
+<script src="/powerbi-client/dist/powerbi.js"></script>
 ```
 
-When included directly the library is exposd as a global named 'powerbi-client'.
-There is also another global `powerbi` which is an instance of the service.
+When included directly, the library is exposed as a global named `powerbi-client`.
+There is also another global named `powerbi` which is an instance of the service.
 
 

bower.json

@@ -6,7 +6,8 @@ const SessionKeys = {
     EmbedId : "embedId",
     GroupId : "groupId",
     IsSampleReport: "isSampleReport",
-    QnaQuestion: "qnaQuestion"
+    QnaQuestion: "qnaQuestion",
+    EntityIsAlreadyEmbedded: "EntityIsAlreadyEmbedded",
 };
 
 function GetParameterByName(name, url) {
@@ -45,7 +46,7 @@ function SetTextBoxesFromSessionOrUrlParam(accessTokenSelector, embedUrlSelector
     {
         accessToken = GetSession(SessionKeys.AccessToken);
     }
-    
+
     var embedUrl = GetParameterByName(SessionKeys.EmbedUrl);
     if (!embedUrl)
     {

demo/bower.json

@@ -25,17 +25,18 @@
   "ignore": [
     "**/.*",
     "node_modules",
-    "bower_components",
     "test",
     "tests"
   ],
   "dependencies": {
-    "bootstrap": "^3.3.6",
+    "bootstrap": "^4.1.2",
+    "ecstatic": "^3.3.1",
     "es6-promise": "^3.2.2",
     "fetch": "^1.0.0",
-    "http-server": "^0.10.0",
+    "http-server": "^0.9.0",
     "jquery": "^3.1.0",
-    "powerbi-client": "^2.6.5",
+    "powerbi-client": "file:..",
+    "powerbi-report-authoring": "^1.0.0",
     "syntaxhighlighter": "4.0.1"
   },
   "devDependencies": {}

demo/code-demo/scripts/session_utils.js

@@ -3,6 +3,7 @@
         <div class="docs-line">
             <div class="docs-links">
                 <h2>Getting started</h2>
+                <a href="https://app.powerbi.com/embedsetup">Set up your Power BI embedding environment</a><br>
                 <a href="https://github.com/Microsoft/powerbi-javascript/wiki">Power BI JavaScript API wiki</a><br>
                 <a href="https://docs.microsoft.com/en-us/power-bi/developer/embedding">Power BI embedding documentation</a><br>
             </div>