Skip to content

Commit 36f61e3

Browse files
author
Matt Mazzola
committed
Update powerbi-models and window-post-message-proxy to latest versions.
Update demo with cleaner presentation of predefined filters and remove all filters buttons
1 parent f257f0c commit 36f61e3

5 files changed

Lines changed: 90 additions & 76 deletions

File tree

‎demo/app/app.js‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ $(function () {
2828
var localReportOverride = {
2929
embedUrl: 'https://portal.analysis.windows-int.net/appTokenReportEmbed?unmin=true',
3030
id: 'c4d31ef0-7b34-4d80-9bcb-5974d1405572',
31-
accessToken: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXIiOiIwLjEuMCIsImF1ZCI6Imh0dHBzOi8vYW5hbHlzaXMud2luZG93cy5uZXQvcG93ZXJiaS9hcGkiLCJpc3MiOiJQb3dlckJJU0RLIiwidHlwZSI6ImVtYmVkIiwid2NuIjoiV2FsbGFjZSIsIndpZCI6IjUyMWNkYTJhLTRlZDItNDg5Ni1hYzA0LWM5YzM4MWRjMjUyYSIsInJpZCI6ImM0ZDMxZWYwLTdiMzQtNGQ4MC05YmNiLTU5NzRkMTQwNTU3MiIsIm5iZiI6MTQ2ODM2NTA5MywiZXhwIjoxNDY4MzY4NjkzfQ.ZnX8S6MfUsbUBF0b297fGd4RZT2QS_ZM_Ve3xUsUjhE'
31+
accessToken: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXIiOiIwLjEuMCIsImF1ZCI6Imh0dHBzOi8vYW5hbHlzaXMud2luZG93cy5uZXQvcG93ZXJiaS9hcGkiLCJpc3MiOiJQb3dlckJJU0RLIiwidHlwZSI6ImVtYmVkIiwid2NuIjoiV2FsbGFjZSIsIndpZCI6IjUyMWNkYTJhLTRlZDItNDg5Ni1hYzA0LWM5YzM4MWRjMjUyYSIsInJpZCI6ImM0ZDMxZWYwLTdiMzQtNGQ4MC05YmNiLTU5NzRkMTQwNTU3MiIsIm5iZiI6MTQ2ODYyMDIyNiwiZXhwIjoxNDY4NjIzODI2fQ.Lr7HC8BJJOrnpU81VZFbOY90BJ89TYSBFOmAYpRGLpg'
3232
};
3333

3434
/**
@@ -384,8 +384,11 @@ $(function () {
384384
event.preventDefault();
385385
console.log('submit');
386386

387-
var data = collectFormData();
388-
console.log(data);
387+
var data = {
388+
target: getFilterTypeTarget(),
389+
operator: getFilterOperatorAndValues(),
390+
reportTarget: getReportTarget()
391+
};
389392

390393
var filter;
391394
var values = Array.prototype.slice.call(data.operator.values);
@@ -394,7 +397,7 @@ $(function () {
394397
filter = new models.ValueFilter(data.target, data.operator.operator, values);
395398
}
396399
else if (data.operator.type === "advanced") {
397-
filter = new models.AdvancedFilter(data.target, data.operator.logicalOperator, values);
400+
filter = new models.AdvancedFilter(data.target, data.operator.operator, values);
398401
}
399402

400403
var target;
@@ -440,14 +443,6 @@ $(function () {
440443
customFilterPaneReport.addFilter(predefinedFilter3, predefinedTarget3);
441444
});
442445

443-
function collectFormData() {
444-
return {
445-
target: getFilterTypeTarget(),
446-
operator: getFilterOperatorAndValues(),
447-
reportTarget: getReportTarget()
448-
};
449-
}
450-
451446
function getFilterTypeTarget() {
452447
var filterType = $filterType.val().toLowerCase();
453448
var filterTypeTarget = {};
@@ -480,7 +475,7 @@ $(function () {
480475
});
481476
}
482477
else if (operatorType === "advanced") {
483-
operatorAndValues.logicalOperator = $('#filterlogicaloperator').val();
478+
operatorAndValues.operator = $('#filterlogicaloperator').val();
484479
operatorAndValues.values = $('.advanced-value')
485480
.map(function (index, element) {
486481
return {
@@ -572,6 +567,6 @@ $(function () {
572567
console.log('submit removeAllFiltersVisualForm', visualId);
573568
customFilterPaneReport.removeAllFilters(target);
574569

575-
})
570+
});
576571
})();
577572
});

‎demo/index.html‎

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,23 @@ <h2>Custom Filter Pane</h2>
5454
</div>
5555
</div>
5656
<div class="row">
57-
<div class="col-xs-12">
58-
<p>&nbsp;</p>
57+
<div class="col-md-4">
58+
<h4>Report</h4>
59+
</div>
60+
<div class="col-md-4">
61+
<h4>Page</h4>
62+
</div>
63+
<div class="col-md-4">
64+
<h4>Visual</h4>
5965
</div>
6066
</div>
6167
<div class="row">
6268
<div class="col-xs-4">
6369
<form id="removeAllFiltersReportForm">
6470
<div class="form-group">
65-
<p>N/A</p>
71+
<input class="form-control" disabled placeholder="N/A" />
6672
</div>
67-
<button type="submit" class="btn btn-warning">Remove All Filters at Report Level</button>
73+
<button type="submit" class="btn btn-warning btn-block">Remove All Filters at Report Level</button>
6874
</form>
6975
</div>
7076
<div class="col-xs-4">
@@ -73,7 +79,7 @@ <h2>Custom Filter Pane</h2>
7379
<select id="removeAllFiltersPagesList" class="form-control">
7480
</select>
7581
</div>
76-
<button type="submit" class="btn btn-warning">Remove All Filters at Page Level</button>
82+
<button type="submit" class="btn btn-warning btn-block">Remove All Filters at Page Level</button>
7783
</form>
7884
</div>
7985
<div class="col-xs-4">
@@ -86,10 +92,30 @@ <h2>Custom Filter Pane</h2>
8692
<option value="visualId4">Visual Id 4</option>
8793
</select>
8894
</div>
89-
<button type="submit" class="btn btn-warning">Remove All Filters at Visual Level</button>
95+
<button type="submit" class="btn btn-warning btn-block">Remove All Filters at Visual Level</button>
9096
</form>
9197
</div>
9298
</div>
99+
<div class="row">
100+
<div class="col-xs-12">
101+
<hr />
102+
</div>
103+
</div>
104+
<div class="row">
105+
<div class="col-md-4">
106+
<button type="button" id="predefinedFilter1" class="btn btn-primary btn-block">Predefined Basic Report Filter</button>
107+
<p>Store > Name 'In' or 'Park'</p>
108+
<button type="button" id="predefinedFilter2" class="btn btn-primary btn-block">Predefined Advanced Report Filter</button>
109+
<p>Store > Name contains 'Wash' or contains 'Park'</p>
110+
</div>
111+
<div class="col-md-4">
112+
<button type="button" id="predefinedFilter3" class="btn btn-primary btn-block">Predefined Advanced Page Filter</button>
113+
<p>Store > Name contains 'Wash' or contains 'Park' (Page: District Monthly Sales)</p>
114+
</div>
115+
<div class="col-md-4">
116+
N/A
117+
</div>
118+
</div>
93119
</div>
94120
<div class="col-md-3">
95121
<form id="customfilterform" name="abc">
@@ -259,13 +285,6 @@ <h5>Advanced Operators</h5>
259285
</div>
260286
</form>
261287

262-
<h2>Pre-Defined Filters:</h2>
263-
<button type="button" id="predefinedFilter1" class="btn btn-primary">Predefined Basic Report Filter</button>
264-
<p>Store > Name 'In' or 'Park'</p>
265-
<button type="button" id="predefinedFilter2" class="btn btn-primary">Predefined Advanced Report Filter</button>
266-
<p>Store > Name contains 'Wash' or contains 'Park'</p>
267-
<button type="button" id="predefinedFilter3" class="btn btn-primary">Predefined Advanced Page Filter</button>
268-
<p>Store > Name contains 'Wash' or contains 'Park' (Page: District Monthly Sales)</p>
269288
</div>
270289
</div>
271290
</div>

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@
6666
},
6767
"dependencies": {
6868
"http-post-message": "^0.2.0",
69-
"powerbi-models": "^0.3.0",
69+
"powerbi-models": "^0.5.0",
7070
"powerbi-router": "^0.1.0",
71-
"window-post-message-proxy": "^0.2.0"
71+
"window-post-message-proxy": "^0.2.1"
7272
},
7373
"publishConfig": {
7474
"tag": "beta"

‎src/report.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ export class Report extends embed.Embed {
153153
* Remove specific filter from report, page, or visual
154154
*
155155
* ```javascript
156-
* const filter = new models.ValueFilter(...);
156+
* const filter = new models.BasicFilter(...);
157157
*
158158
* report.removeFilter(filter)
159159
* .catch(error => { ... });
@@ -188,7 +188,7 @@ export class Report extends embed.Embed {
188188
* The existing filter will be replaced with the new filter.
189189
*
190190
* ```javascript
191-
* const filter = new models.ValueFilter(...);
191+
* const filter = new models.BasicFilter(...);
192192
* const target = {
193193
* type: "page",
194194
* name: "ReportSection2"

0 commit comments

Comments
 (0)