Skip to content

Commit 4fb91e1

Browse files
committed
Merge remote-tracking branch 'devops/master' into version_1.8.0
2 parents 2b94617 + 62e5b01 commit 4fb91e1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+6737
-6026
lines changed

.vscode/settings.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Place your settings in this file to overwrite default and user settings.
22
{
3-
"editor.tabSize": 2,
4-
"editor.detectIndentation": false,
5-
"editor.renderIndentGuides": true
3+
"editor.tabSize": 4,
4+
"editor.detectIndentation": false,
5+
"editor.renderIndentGuides": true
66
}

.vscode/tasks.json

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,29 @@
11
{
2-
// See https://go.microsoft.com/fwlink/?LinkId=733558
3-
// for the documentation about the tasks.json format
4-
"version": "0.1.0",
5-
"command": "npm",
6-
"isShellCommand": true,
7-
"showOutput": "always",
8-
"suppressTaskName": true,
9-
"tasks": [
10-
{
11-
"taskName": "build",
12-
"args": ["run", "build"],
13-
"isBuildCommand": true
14-
},
15-
{
16-
"taskName": "test",
17-
"args": ["run", "test", "--", "--chrome"],
18-
"isTestCommand": true
19-
}
20-
]
2+
// See https://go.microsoft.com/fwlink/?LinkId=733558
3+
// for the documentation about the tasks.json format
4+
"version": "2.0.0",
5+
"tasks": [
6+
{
7+
"label": "build",
8+
"type": "shell",
9+
"command": "gulp",
10+
"args": [
11+
"build"
12+
],
13+
"problemMatcher": [
14+
"$tsc",
15+
]
16+
},
17+
{
18+
"label": "test",
19+
"type": "shell",
20+
"command": "gulp",
21+
"args": [
22+
"test"
23+
],
24+
"problemMatcher": [
25+
"$tsc",
26+
]
27+
},
28+
]
2129
}

CONTRIBUTING.md

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,30 @@
33
## Setup
44

55
Clone the repository:
6-
```
6+
7+
```bash
78
git clone https://github.com/Microsoft/powerbi-models
89
```
910

1011
Navigate to the cloned directory
1112

1213
Install local dependencies:
13-
```
14+
15+
```bash
1416
npm install
1517
```
1618

1719
## Building
18-
```
20+
21+
```bash
1922
npm run build
2023
```
24+
2125
Or if using VS Code: `Ctrl + Shift + B`
2226

2327
## Testing
24-
```
28+
29+
```bash
2530
npm test
2631
```
2732

@@ -30,21 +35,25 @@ By default the tests run using PhantomJS
3035
There are various command line arguments that can be passed to the test command to facilitate debugging:
3136

3237
Run tests with Chrome
33-
```
38+
39+
```bash
3440
npm test -- --chrome
3541
```
3642

3743
Enable debug level logging for karma, and remove code coverage
38-
```
44+
45+
```bash
3946
npm test -- --debug
4047
```
4148

4249
Disable single run to remain open for debugging
43-
```
50+
51+
```bash
4452
npm test -- --watch
4553
```
4654

4755
These are often combined and typical command for debugging tests is:
48-
```
56+
57+
```bash
4958
npm test -- --chrome --debug --watch
50-
```
59+
```

README.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# powerbi-models
2+
23
[![Build Status](https://img.shields.io/travis/Microsoft/powerbi-models.svg)](https://travis-ci.org/Microsoft/powerbi-models)
34
[![NPM Version](https://img.shields.io/npm/v/powerbi-models.svg)](https://www.npmjs.com/package/powerbi-models)
45
[![NPM Total Downloads](https://img.shields.io/npm/dt/powerbi-models.svg)](https://www.npmjs.com/package/powerbi-models)
@@ -15,6 +16,7 @@ For each model there is a TypeScript interface, a json schema definitions, and a
1516
[Power BI Ideas](https://ideas.powerbi.com)
1617

1718
## Documentation
19+
1820
### [https://microsoft.github.io/powerbi-models](https://microsoft.github.io/powerbi-models)
1921

2022
## Getting Started
@@ -45,6 +47,7 @@ if(errors) {
4547
}
4648

4749
```
50+
4851
Would output to the console:
4952

5053
```typescript
@@ -56,6 +59,7 @@ Would output to the console:
5659
```
5760

5861
Creating filters:
62+
5963
```typescript
6064
const basicFilter: models.IBasicFilter = {
6165
target: {
@@ -91,6 +95,7 @@ const advancedFilter: models.IAdvancedFilter = {
9195
```
9296

9397
Or use the constructor methods:
98+
9499
```typescript
95100
const advancedFilter = new models.AdvancedFilter(
96101
{
@@ -110,16 +115,18 @@ const advancedFilter = new models.AdvancedFilter(
110115
```
111116

112117
## Date Formatting
118+
113119
Dates should be formated using [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) standard. Example: `2016-09-08T00:15:46.861Z`
114120

115121
This is how dates are naturally serialized to JSON:
116-
```
122+
123+
```typescript
117124
new Date().toJSON(); //=> 2016-09-08T00:15:46.861Z
118125
```
119126

120127
An example filter using this Date format would look like the following:
121128

122-
```
129+
```JSON
123130
{
124131
"$schema": "http://powerbi.com/product/schema#advanced",
125132
"target": {

0 commit comments

Comments
 (0)