Merged PR 21999: support configuration of locale

noanu · noanu · commit ced5998903d1 · 2017-07-17T13:12:17.000Z
support configuration of  locale
diff --git a/dist/powerbi-client.d.ts b/dist/powerbi-client.d.ts
@@ -1,4 +1,4 @@
-/*! powerbi-client v2.3.2 | (c) 2016 Microsoft Corporation MIT */
+/*! powerbi-client v2.3.3 | (c) 2016 Microsoft Corporation MIT */
 declare module "config" {
     const config: {
         version: string;
@@ -52,6 +52,16 @@ declare module "util" {
      * @returns {string}
      */
     export function createRandomString(): string;
+    /**
+     * Adds a parameter to the given url
+     *
+     * @export
+     * @param {string} url
+     * @param {string} paramName
+     * @param {string} value
+     * @returns {string}
+     */
+    export function addParamToUrl(url: string, paramName: string, value: string): string;
 }
 declare module "embed" {
     import * as service from "service";
@@ -78,7 +88,7 @@ declare module "embed" {
         uniqueId?: string;
         embedUrl?: string;
         accessToken?: string;
-        settings?: models.ISettings;
+        settings?: IEmbedSettings;
         pageName?: string;
         filters?: models.IFilter[];
         pageView?: models.PageView;
@@ -91,6 +101,13 @@ declare module "embed" {
         height?: number;
         width?: number;
     }
+    export interface ILocaleSettings {
+        language?: string;
+        formatLocale?: string;
+    }
+    export interface IEmbedSettings extends models.ISettings {
+        localeSettings?: ILocaleSettings;
+    }
     export interface IInternalEmbedConfiguration extends models.IReportLoadConfiguration {
         uniqueId: string;
         type: string;
@@ -291,6 +308,13 @@ declare module "embed" {
          * @returns {void}
          */
         private populateConfig(config);
+        /**
+         * Adds locale parameters to embedUrl
+         *
+         * @private
+         * @param {IEmbedConfiguration} config
+         */
+        private addLocaleToEmbedUrl(config);
         /**
          * Gets an embed url from the first available location: options, attribute.
          *
diff --git a/dist/powerbi.js b/dist/powerbi.js
diff --git a/dist/powerbi.js.map b/dist/powerbi.js.map
diff --git a/dist/powerbi.min.js b/dist/powerbi.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "powerbi-client",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "JavaScript library for embedding Power BI into your apps. Provides service which makes it easy to embed different types of components and an object model which allows easy interaction with these components such as changing pages, applying filters, and responding to data selection.",
   "main": "dist/powerbi.js",
   "typings": "dist/powerbi-client.d.ts",
diff --git a/src/config.ts b/src/config.ts
@@ -1,5 +1,5 @@
 const config = {
-  version: '2.3.2',
+  version: '2.3.3',
   type: 'js'
 };
 
diff --git a/src/embed.ts b/src/embed.ts
@@ -35,7 +35,7 @@ export interface IEmbedConfiguration {
   uniqueId?: string;
   embedUrl?: string;
   accessToken?: string;
-  settings?: models.ISettings;
+  settings?: IEmbedSettings;
   pageName?: string;
   filters?: models.IFilter[];
   pageView?: models.PageView;
@@ -49,6 +49,15 @@ export interface IEmbedConfiguration {
   width?: number;
 }
 
+export interface ILocaleSettings {
+  language?: string;
+  formatLocale?: string;
+}
+
+export interface IEmbedSettings extends models.ISettings {
+  localeSettings?: ILocaleSettings;
+}
+
 export interface IInternalEmbedConfiguration extends models.IReportLoadConfiguration {
   uniqueId: string;
   type: string;
@@ -382,7 +391,7 @@ export abstract class Embed {
       this.config = utils.assign({ settings }, config);
       this.config.uniqueId = this.getUniqueId();
       this.config.embedUrl = this.getEmbedUrl();
-
+      this.addLocaleToEmbedUrl(config);
       if(this.embeType === 'create') {
           this.createConfig = {
               datasetId: config.datasetId || this.getId(),
@@ -401,6 +410,24 @@ export abstract class Embed {
       }  
   }
 
+  /**
+   * Adds locale parameters to embedUrl
+   * 
+   * @private
+   * @param {IEmbedConfiguration} config
+   */
+  private addLocaleToEmbedUrl(config: IEmbedConfiguration): void {
+      if (!config.settings) {
+        return;
+      }
+      let localeSettings = config.settings.localeSettings
+      if (localeSettings && localeSettings.language) {
+        this.config.embedUrl = utils.addParamToUrl(this.config.embedUrl, 'language', localeSettings.language);
+      }
+      if (localeSettings && localeSettings.formatLocale) {
+        this.config.embedUrl = utils.addParamToUrl(this.config.embedUrl, 'formatLocale', localeSettings.formatLocale);
+      }
+  }
 
   /**
    * Gets an embed url from the first available location: options, attribute.
diff --git a/src/tile.ts b/src/tile.ts
@@ -15,11 +15,8 @@ export class Tile extends embed.Embed {
     static allowedEvents = ["tileClicked", "tileLoaded"];
 
     constructor(service: service.Service, element: HTMLElement, config: embed.IEmbedConfiguration) {
-        let url = config.embedUrl;
-        const urlParamMatch = url.indexOf("?") > 0;
-        let firstParamSign = urlParamMatch ? '&' : '?';
-        url = url + firstParamSign + 'dashboardId=' + config.dashboardId + '&tileId=' + config.id;
-        config.embedUrl = url;
+        config.embedUrl = utils.addParamToUrl(config.embedUrl, 'dashboardId', config.dashboardId);
+        config.embedUrl = utils.addParamToUrl(config.embedUrl, 'tileId', config.id);
 
         super(service, element, config);
         Array.prototype.push.apply(this.allowedEvents, Tile.allowedEvents);
diff --git a/src/util.ts b/src/util.ts
@@ -107,3 +107,18 @@ export function assign(...args) {
 export function createRandomString(): string {
   return (Math.random() + 1).toString(36).substring(7);
 }
+
+/**
+ * Adds a parameter to the given url
+ * 
+ * @export
+ * @param {string} url
+ * @param {string} paramName
+ * @param {string} value
+ * @returns {string}
+ */
+export function addParamToUrl(url: string, paramName: string, value: string): string {
+  let parameterPrefix = url.indexOf('?') > 0 ? '&' : '?';
+  url += parameterPrefix + paramName + '=' + value;
+  return url;
+}
diff --git a/test/test.spec.ts b/test/test.spec.ts
@@ -228,6 +228,29 @@ describe('service', function () {
       expect(component2).toBe(component3);
     });
 
+    it('Create embed url with correct locale parameters', function () {
+      // Arrange
+      const $reportContainer = $('<div powerbi-embed-url="https://app.powerbi.com/reportEmbed?reportId=ABC123" powerbi-type="report"></div>')
+        .appendTo('#powerbi-fixture');
+
+      const testConfiguration: embed.IEmbedConfiguration = {
+        accessToken: "fakeAccessToken",
+        embedUrl: 'fakeUrl?reportId=1',
+        id: 'report2',
+        type: 'report',
+        settings: {
+          localeSettings: {
+            language: 'languageName',
+            formatLocale: 'formatName'
+          }
+        }
+      };
+
+      powerbi.embed($reportContainer[0], testConfiguration);
+      var iframe = $reportContainer.find('iframe');
+      expect(iframe.attr('src')).toEqual('fakeUrl?reportId=1&language=languageName&formatLocale=formatName');
+    });
+
     it('if attempting to embed without specifying an embed url, throw error', function () {
       // Arrange
       const component = $('<div></div>')

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "powerbi-client",`
`3`		`- "version": "2.3.2",`
	`3`	`+ "version": "2.3.3",`
`4`	`4`	`"description": "JavaScript library for embedding Power BI into your apps. Provides service which makes it easy to embed different types of components and an object model which allows easy interaction with these components such as changing pages, applying filters, and responding to data selection.",`
`5`	`5`	`"main": "dist/powerbi.js",`
`6`	`6`	`"typings": "dist/powerbi-client.d.ts",`