Skip to content

Commit cc25446

Browse files
ali-hamudali-hamud
committed
Merge remote-tracking branch 'powerbi/master'
2 parents a6766a5 + 2a3a49b commit cc25446

18 files changed

+1129
-135
lines changed

‎demo/v2-demo/scripts/codesamples.js

Lines changed: 376 additions & 10 deletions
Large diffs are not rendered by default.

‎demo/v2-demo/scripts/report.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ function OpenCodeStep(mode, entityType, tokenType) {
6565
$(classPrefix + 'Container').removeAttr('id');
6666
$(classPrefix + 'MobileContainer').removeAttr('id');
6767

68+
// remove ID if exists on any container
69+
$("#" + containerID).removeAttr('id');
70+
6871
const activeContainer = classPrefix + ($(".desktop-view").hasClass(active_class) ? 'Container' : 'MobileContainer');
6972

7073
$(activeContainer).attr('id', containerID);
@@ -154,7 +157,7 @@ function OpenInteractTab() {
154157
if (entityType == EntityType.Tile)
155158
{
156159
$("#settings").load("settings_interact_tile.html", function() {
157-
SetToggleHandler("tile-operations-div");
160+
SetToggleHandler("operation-categories");
158161
LoadCodeArea("#embedCodeDiv", "");
159162
});
160163
}

‎demo/v2-demo/scripts/step_embed.js

Lines changed: 65 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ function Page_GetFilters() {
8282
}
8383

8484
function Page_GetVisuals() {
85-
SetCode(_Page_GetVisuals);
85+
SetCode(_Page_GetVisuals);
8686
}
8787

8888
function Page_SetFilters() {
@@ -114,6 +114,26 @@ function Events_BookmarkApplied() {
114114
SetCode(_Events_BookmarkApplied);
115115
}
116116

117+
function Events_ReportLoaded() {
118+
SetCode(_Events_ReportLoaded);
119+
}
120+
121+
function Events_ReportRendered() {
122+
SetCode(_Events_ReportRendered);
123+
}
124+
125+
function Events_ReportSaved() {
126+
SetCode(_Events_ReportSaved);
127+
}
128+
129+
function Events_TileLoaded() {
130+
SetCode(_Events_TileLoaded);
131+
}
132+
133+
function Events_TileClicked() {
134+
SetCode(_Events_TileClicked);
135+
}
136+
117137
// ---- Edit and Save Operations ----------------------------------------------------
118138

119139
function Report_switchModeEdit() {
@@ -231,3 +251,47 @@ function Visual_ExportData_Summarized() {
231251
function Visual_ExportData_Underlying() {
232252
SetCode(_Visual_ExportData_Underlying);
233253
}
254+
255+
function ReportVisual_UpdateSettings() {
256+
SetCode(_ReportVisual_UpdateSettings);
257+
}
258+
259+
function ReportVisual_Report_SetFilters() {
260+
SetCode(_ReportVisual_Report_SetFilters);
261+
}
262+
263+
function ReportVisual_Report_GetFilters() {
264+
SetCode(_ReportVisual_Report_GetFilters);
265+
}
266+
267+
function ReportVisual_Report_RemoveFilters() {
268+
SetCode(_ReportVisual_Report_RemoveFilters);
269+
}
270+
271+
function ReportVisual_Page_SetFilters() {
272+
SetCode(_ReportVisual_Page_SetFilters);
273+
}
274+
275+
function ReportVisual_Page_GetFilters() {
276+
SetCode(_ReportVisual_Page_GetFilters);
277+
}
278+
279+
function ReportVisual_Page_RemoveFilters() {
280+
SetCode(_ReportVisual_Page_RemoveFilters);
281+
}
282+
283+
function ReportVisual_Visual_SetFilters() {
284+
SetCode(_ReportVisual_Visual_SetFilters);
285+
}
286+
287+
function ReportVisual_Visual_GetFilters() {
288+
SetCode(_ReportVisual_Visual_GetFilters);
289+
}
290+
291+
function ReportVisual_Visual_RemoveFilters() {
292+
SetCode(_ReportVisual_Visual_RemoveFilters);
293+
}
294+
295+
function ReportVisual_HideSingleVisualHeader() {
296+
SetCode(_ReportVisual_HideSingleVisualHeader);
297+
}

‎demo/v2-demo/scripts/step_interact.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@ function OpenNavigationOperations() {
4343
$("#navigation-operations").toggleClass("active");
4444
}
4545

46-
function OpenVisualDataOperations() {
47-
$("#visual-data-operations-ul").toggle();
48-
$("#visual-data-operations").toggleClass("active");
49-
}
50-
5146
function OpenDashboardGeneralOperations() {
5247
$("#dashboard-general-operations-ul").toggle();
5348
$("#dashboard-general-operations").toggleClass("active");

‎demo/v2-demo/scripts/utils.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ function ClearTextArea(textAreaSelector) {
108108

109109
function getEmbedContainerID(entityType) {
110110
switch (entityType) {
111-
case EntityType.Visual:
112-
return "visualContainer";
113111
case EntityType.Dashboard:
114112
return "dashboardContainer";
115113
case EntityType.Tile:

‎demo/v2-demo/settings_interact_report.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
<li onclick="Report_PrintCurrentReport()"><a href="#">Print</a></li>
1111
<li onclick="Report_Reload()"><a href="#">Reload</a></li>
1212
<li onclick="Report_Refresh()"><a href="#">Refresh</a></li>
13+
<li onclick="Events_ReportLoaded()"><a href="#">Loaded event</a></li>
14+
<li onclick="Events_ReportRendered()"><a href="#">Rendered event</a></li>
1315
<li onclick="Report_FullScreen()" class="hideOnMobile"><a href="#">Full screen</a></li>
1416
<li onclick="Report_ExitFullScreen()" class="hideOnMobile"><a href="#">Exit full screen</a></li>
1517
</ul>
@@ -46,6 +48,7 @@
4648
<li onclick="Report_save()" class="hideOnMobile"><a href="#">Save report</a></li>
4749
<li onclick="Report_saveAs()" class="hideOnMobile"><a href="#">SaveAs report</a></li>
4850
<li onclick="Events_SaveAsTriggered()" class="hideOnMobile"><a href="#">SaveAs triggered event</a></li>
51+
<li onclick="Events_ReportSaved()" class="hideOnMobile"><a href="#">Saved event</a></li>
4952
</ul>
5053
<li id="extensions-operations" onclick="OpenExtensionsOperations();"><a href="#">Menu Extensions</a></li>
5154
<ul id="extensions-operations-ul" class="function-ul" style="display: none;">

‎demo/v2-demo/settings_interact_tile.html

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
<div id="step-interact-wrapper">
2-
<div>
3-
<div id="category-browser">
4-
<div id="wrapper-operations-div" class="operations-div">
5-
<div id="operation-categories" class="operations-div">
6-
<p>No interactions available</p>
7-
</div>
2+
<div>
3+
<div id="category-browser">
4+
<div id="wrapper-operations-div" class="operations-div">
5+
<div id="operation-categories" class="operations-div">
6+
<ul class="operations-ul">
7+
<li id="general-operations" onclick="OpenGeneralOperations();"><a href="#">General Operations</a></li>
8+
<ul id="general-operations-ul" class="function-ul" style="display: none;">
9+
<li onclick="Events_TileLoaded()"><a href="#">Tile loaded event</a></li>
10+
<li onclick="Events_TileClicked()"><a href="#">Tile clicked event</a></li>
11+
</ul>
12+
</ul>
813
</div>
914
</div>
1015
</div>
11-
</div>
16+
</div>
17+
</div>

‎demo/v2-demo/settings_interact_visual.html

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,46 @@
44
<div id="wrapper-operations-div" class="operations-div">
55
<div id="operation-categories" class="operations-div">
66
<ul class="operations-ul">
7-
<li id="visual-data-operations" onclick="OpenVisualDataOperations();"><a href="#">Data</a></li>
8-
<ul id="visual-data-operations-ul" class="function-ul" style="display: none;">
7+
<li id="general-operations" onclick="OpenGeneralOperations();"><a href="#">General Operations</a></li>
8+
<ul id="general-operations-ul" class="function-ul" style="display: none;">
9+
<li onclick="ReportVisual_UpdateSettings()" class="hideOnMobile"><a href="#">Update settings</a></li>
10+
<li onclick="Report_PrintCurrentReport()"><a href="#">Print</a></li>
11+
<li onclick="Report_Reload()"><a href="#">Reload</a></li>
12+
<li onclick="Report_Refresh()"><a href="#">Refresh</a></li>
13+
<li onclick="Events_ReportLoaded()"><a href="#">Loaded event</a></li>
14+
<li onclick="Events_ReportRendered()"><a href="#">Rendered event</a></li>
15+
<li onclick="Report_FullScreen()" class="hideOnMobile"><a href="#">Full screen</a></li>
16+
<li onclick="Report_ExitFullScreen()" class="hideOnMobile"><a href="#">Exit full screen</a></li>
17+
</ul>
18+
<li id="reportproperties-operations" onclick="OpenReportPropertiesOperations();"><a href="#">Properties</a></li>
19+
<ul id="reportproperties-operations-ul" class="function-ul" style="display: none;">
20+
<li onclick="Report_GetId()"><a href="#">Get ID</a></li>
21+
</ul>
22+
<li id="filters-operations" onclick="OpenFiltersOperations();"><a href="#">Filters & Slicers</a></li>
23+
<ul id="filters-operations-ul" class="function-ul" style="display: none;">
24+
<li onclick="ReportVisual_Report_SetFilters()"><a href="#">Set report filters</a></li>
25+
<li onclick="ReportVisual_Report_GetFilters()"><a href="#">Get report filters</a></li>
26+
<li onclick="ReportVisual_Report_RemoveFilters()"><a href="#">Remove report filters</a></li>
27+
<li onclick="ReportVisual_Page_SetFilters()"><a href="#">Set page filters</a></li>
28+
<li onclick="ReportVisual_Page_GetFilters()"><a href="#">Get page filters</a></li>
29+
<li onclick="ReportVisual_Page_RemoveFilters()"><a href="#">Remove page filters</a></li>
30+
<li onclick="ReportVisual_Visual_SetFilters()"><a href="#">Set visual filters</a></li>
31+
<li onclick="ReportVisual_Visual_GetFilters()"><a href="#">Get visual filters</a></li>
32+
<li onclick="ReportVisual_Visual_RemoveFilters()"><a href="#">Remove visual filters</a></li>
33+
</ul>
34+
<li id="extensions-operations" onclick="OpenExtensionsOperations();"><a href="#">Menu Extensions</a></li>
35+
<ul id="extensions-operations-ul" class="function-ul" style="display: none;">
36+
<li onclick="Report_Extensions_OptionsMenu()"><a href="#">Extend options menu</a></li>
37+
<li onclick="Report_Extensions_ContextMenu()"><a href="#">Extend context menu</a></li>
38+
</ul>
39+
<li id="layout-operations" onclick="OpenLayoutOperations();"><a href="#">Layout</a></li>
40+
<ul id="layout-operations-ul" class="function-ul" style="display: none;">
41+
<li onclick="Report_HideAllVisualHeaders()"><a href="#">Hide all visual headers</a></li>
42+
<li onclick="Report_ShowAllVisualHeaders()"><a href="#">Show all visual headers</a></li>
43+
<li onclick="ReportVisual_HideSingleVisualHeader()"><a href="#">Hide single visual header</a></li>
44+
</ul>
45+
<li id="data-operations" onclick="OpenDataOperations();"><a href="#">Data</a></li>
46+
<ul id="data-operations-ul" class="function-ul" style="display: none;">
947
<li onclick="Visual_DataSelected()"><a href="#">Data selected</a></li>
1048
</ul>
1149
</ul>

‎dist/powerbi-client.d.ts

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! powerbi-client v2.6.6 | (c) 2016 Microsoft Corporation MIT */
1+
/*! powerbi-client v2.6.7 | (c) 2016 Microsoft Corporation MIT */
22
declare module "util" {
33
/**
44
* Raises a custom event with event data on the specified HTML element.
@@ -397,6 +397,10 @@ declare module "embed" {
397397
* Sets Iframe for embed
398398
*/
399399
private setIframe(isLoad, phasedRender?);
400+
/**
401+
* Sets Iframe's title
402+
*/
403+
setComponentTitle(title: string): void;
400404
/**
401405
* Adds the ability to get groupId from url.
402406
* By extracting the ID we can ensure that the ID is always explicitly provided as part of the load configuration.
@@ -625,6 +629,16 @@ declare module "page" {
625629
* @type {models.SectionVisibility}
626630
*/
627631
visibility: models.SectionVisibility;
632+
/**
633+
* Page size as saved in the report.
634+
* @type {models.ICustomPageSize}
635+
*/
636+
defaultSize: models.ICustomPageSize;
637+
/**
638+
* Page display options as saved in the report.
639+
* @type {models.ICustomPageSize}
640+
*/
641+
defaultDisplayOption: models.DisplayOption;
628642
/**
629643
* Creates an instance of a Power BI report page.
630644
*
@@ -634,7 +648,7 @@ declare module "page" {
634648
* @param {boolean} [isActivePage]
635649
* @param {models.SectionVisibility} [visibility]
636650
*/
637-
constructor(report: IReportNode, name: string, displayName?: string, isActivePage?: boolean, visibility?: models.SectionVisibility);
651+
constructor(report: IReportNode, name: string, displayName?: string, isActivePage?: boolean, visibility?: models.SectionVisibility, defaultSize?: models.ICustomPageSize, defaultDisplayOption?: models.DisplayOption);
638652
/**
639653
* Gets all page level filters within the report.
640654
*
@@ -1119,8 +1133,6 @@ declare module "visual" {
11191133
*/
11201134
export class Visual extends Report {
11211135
static type: string;
1122-
static GetFiltersNotSupportedError: string;
1123-
static SetFiltersNotSupportedError: string;
11241136
static GetPagesNotSupportedError: string;
11251137
static SetPageNotSupportedError: string;
11261138
/**
@@ -1146,28 +1158,29 @@ declare module "visual" {
11461158
*/
11471159
setPage(pageName: string): Promise<void>;
11481160
/**
1149-
* Gets filters that are applied at the visual level.
1161+
* Gets filters that are applied to the filter level.
1162+
* Default filter level is visual level.
11501163
*
11511164
* ```javascript
1152-
* // Get filters applied at visual level
1153-
* visual.getFilters()
1165+
* visual.getFilters(filtersLevel)
11541166
* .then(filters => {
11551167
* ...
11561168
* });
11571169
* ```
11581170
*
11591171
* @returns {Promise<models.IFilter[]>}
11601172
*/
1161-
getFilters(): Promise<models.IFilter[]>;
1173+
getFilters(filtersLevel?: models.FiltersLevel): Promise<models.IFilter[]>;
11621174
/**
1163-
* Sets filters at the visual level.
1175+
* Sets filters at the filter level.
1176+
* Default filter level is visual level.
11641177
*
11651178
* ```javascript
11661179
* const filters: [
11671180
* ...
11681181
* ];
11691182
*
1170-
* visual.setFilters(filters)
1183+
* visual.setFilters(filters, filtersLevel)
11711184
* .catch(errors => {
11721185
* ...
11731186
* });
@@ -1176,7 +1189,19 @@ declare module "visual" {
11761189
* @param {(models.IFilter[])} filters
11771190
* @returns {Promise<void>}
11781191
*/
1179-
setFilters(filters: models.IFilter[]): Promise<void>;
1192+
setFilters(filters: models.IFilter[], filtersLevel?: models.FiltersLevel): Promise<void>;
1193+
/**
1194+
* Removes all filters from the current filter level.
1195+
* Default filter level is visual level.
1196+
*
1197+
* ```javascript
1198+
* visual.removeFilters(filtersLevel);
1199+
* ```
1200+
*
1201+
* @returns {Promise<void>}
1202+
*/
1203+
removeFilters(filtersLevel?: models.FiltersLevel): Promise<void>;
1204+
private getFiltersLevelUrl(filtersLevel);
11801205
}
11811206
}
11821207
declare module "service" {

0 commit comments

Comments
 (0)