From ec8e2693ddb2c4294ae7c7e88b7c019839164fff Mon Sep 17 00:00:00 2001 From: Ali Hamud Date: Thu, 16 Mar 2017 12:10:46 +0000 Subject: [PATCH 1/4] Updated tsconfig.json --- tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index 06d4656..c5feabe 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,7 +4,8 @@ "declaration": true, "sourceMap": true, "noImplicitUseStrict": true, - "outDir": "dist" + "outDir": "dist", + "typeRoots": [ "node_modules/@types" ] }, "exclude": [ "node_modules", From 1fe3f8aa962c2a2bf72d9ea92f58d8d2197fa7aa Mon Sep 17 00:00:00 2001 From: Ali Hamud Date: Thu, 16 Mar 2017 17:09:09 +0200 Subject: [PATCH 2/4] update typescript version --- package.json | 2 +- tsconfig.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 625ee9d..bb801a5 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "ts-loader": "^0.8.2", "tslint": "^3.14.0", "typedoc": "^0.4.4", - "typescript": "^1.8.10", + "typescript": "^2.2.1", "typings": "^1.3.2", "webpack": "^1.13.2", "webpack-stream": "^3.2.0", diff --git a/tsconfig.json b/tsconfig.json index c5feabe..06d4656 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,8 +4,7 @@ "declaration": true, "sourceMap": true, "noImplicitUseStrict": true, - "outDir": "dist", - "typeRoots": [ "node_modules/@types" ] + "outDir": "dist" }, "exclude": [ "node_modules", From be50e3402f2eaeab577ccbd84a380db1e4a42baa Mon Sep 17 00:00:00 2001 From: Omri Armstrong Date: Thu, 6 Apr 2017 06:49:50 +0000 Subject: [PATCH 3/4] Merged PR 19527: adding tokenType adding tokenType to load/create configuration --- package.json | 2 +- src/models.ts | 7 +++++++ src/schemas/reportCreateConfiguration.json | 6 ++++++ src/schemas/reportLoadConfiguration.json | 6 ++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index bb801a5..c38511f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "powerbi-models", - "version": "0.11.1", + "version": "0.11.2", "description": "Contains JavaScript & TypeScript object models for Microsoft Power BI JavaScript SDK. For each model there is a TypeScript interface, a json schema definitions, and a validation function to ensure and object is valid.", "main": "dist/models.js", "typings": "dist/models.d.ts", diff --git a/src/models.ts b/src/models.ts index bb382b3..d82228c 100644 --- a/src/models.ts +++ b/src/models.ts @@ -82,6 +82,7 @@ export interface IReportLoadConfiguration { filters?: (IBasicFilter | IAdvancedFilter)[]; permissions?: Permissions; viewMode?: ViewMode; + tokenType?: TokenType; } export const validateReportLoad = validate(loadSchema, { @@ -96,6 +97,7 @@ export interface IReportCreateConfiguration { accessToken: string; datasetId: string; settings?: ISettings; + tokenType?: TokenType; } export const validateCreateReport = validate(createReportSchema); @@ -447,6 +449,11 @@ export enum ViewMode { Edit } +export enum TokenType { + Aad, + Embed +} + export interface ISaveAsParameters { name: string; } diff --git a/src/schemas/reportCreateConfiguration.json b/src/schemas/reportCreateConfiguration.json index e54953d..48c066b 100644 --- a/src/schemas/reportCreateConfiguration.json +++ b/src/schemas/reportCreateConfiguration.json @@ -15,6 +15,12 @@ "type": "datasetId must be a string", "required": "datasetId is required" } + }, + "tokenType": { + "type": "number", + "enum": [0, 1], + "default": 0, + "invalidMessage": "tokenType property is invalid" } }, "required": [ diff --git a/src/schemas/reportLoadConfiguration.json b/src/schemas/reportLoadConfiguration.json index e68666c..3da3bce 100644 --- a/src/schemas/reportLoadConfiguration.json +++ b/src/schemas/reportLoadConfiguration.json @@ -51,6 +51,12 @@ "enum": [0, 1], "default": 0, "invalidMessage": "viewMode property is invalid" + }, + "tokenType": { + "type": "number", + "enum": [0, 1], + "default": 0, + "invalidMessage": "tokenType property is invalid" } }, "required": [ From 822c709c49f056d72b166b7e6149702824cad7e6 Mon Sep 17 00:00:00 2001 From: Omri Armstrong Date: Wed, 12 Apr 2017 11:57:11 +0000 Subject: [PATCH 4/4] Merged PR 19698: Merge Dev/omarmstr/adding_embed_type_to_dashboard_embed to master Adding tokenType to dashboard embed configuration to enable PaaS dashboard embed in new method --- src/models.ts | 1 + src/schemas/dashboardLoadConfiguration.json | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/models.ts b/src/models.ts index d82228c..09bb64e 100644 --- a/src/models.ts +++ b/src/models.ts @@ -108,6 +108,7 @@ export interface IDashboardLoadConfiguration { accessToken: string; id: string; pageView?: PageView; + tokenType?: TokenType; } export const validateDashboardLoad = validate(dashboardLoadSchema); diff --git a/src/schemas/dashboardLoadConfiguration.json b/src/schemas/dashboardLoadConfiguration.json index 853a285..3d1c446 100644 --- a/src/schemas/dashboardLoadConfiguration.json +++ b/src/schemas/dashboardLoadConfiguration.json @@ -21,7 +21,13 @@ "messages": { "type": "pageView must be a string with one of the following values: \"actualSize\", \"fitToWidth\", \"oneColumn\"" } - } + }, + "tokenType": { + "type": "number", + "enum": [0, 1], + "default": 0, + "invalidMessage": "tokenType property is invalid" + } }, "required": [ "accessToken",