Skip to content

Commit f348346

Browse files
authored
Merge pull request pnp#91 from SharePoint/dev
Merge for the v1.6.0 release
2 parents 23af35a + b3358fc commit f348346

File tree

37 files changed

+933
-353
lines changed

37 files changed

+933
-353
lines changed

CHANGELOG.JSON

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
11
{
22
"versions": [
3+
{
4+
"version": "1.6.0",
5+
"changes": {
6+
"new": [],
7+
"enhancements": [
8+
"Disabled property for PeoplePicker [#88](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/88)"
9+
],
10+
"fixes": [
11+
"New telemetry approach which allows you to use Application Insights [#81](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/81)",
12+
"PeoplePicker property selectedItems not implemented? [#90](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/90)"
13+
]
14+
},
15+
"contributions": ["Octavie van Haaften"]
16+
},
317
{
418
"version": "1.5.0",
519
"changes": {
620
"new": [
721
"New `PeoplePicker` control added [#19](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/19)"
822
],
923
"enhancements": [
10-
"Added a properties to the `TaxonomyPicker` to specify which terms are disabled/not-selectable [#82](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/82)"
24+
"Added properties to the `TaxonomyPicker` to specify which terms are disabled/not-selectable [#82](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/82)"
1125
],
1226
"fixes": [
1327
"Bug in `TaxonomyPicker` where values are not updated by an async change [#83](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/83)",

CHANGELOG.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# Releases
22

3+
## 1.6.0
4+
5+
**Enhancements**
6+
7+
- Disabled property for PeoplePicker [#88](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/88)
8+
9+
**Fixes**
10+
11+
- New telemetry approach which allows you to use Application Insights [#81](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/81)
12+
- PeoplePicker property selectedItems not implemented? [#90](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/90)
13+
314
## 1.5.0
415

516
**New control(s)**
@@ -8,7 +19,7 @@
819

920
**Enhancements**
1021

11-
- Added a properties to the `TaxonomyPicker` to specify which terms are disabled/not-selectable [#82](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/82)
22+
- Added properties to the `TaxonomyPicker` to specify which terms are disabled/not-selectable [#82](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/82)
1223

1324
**Fixes**
1425

docs/documentation/docs/about/release-notes.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# Releases
22

3+
## 1.6.0
4+
5+
**Enhancements**
6+
7+
- Disabled property for PeoplePicker [#88](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/88)
8+
9+
**Fixes**
10+
11+
- New telemetry approach which allows you to use Application Insights [#81](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/81)
12+
- PeoplePicker property selectedItems not implemented? [#90](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/90)
13+
314
## 1.5.0
415

516
**New control(s)**
@@ -8,7 +19,7 @@
819

920
**Enhancements**
1021

11-
- Added a properties to the `TaxonomyPicker` to specify which terms are disabled/not-selectable [#82](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/82)
22+
- Added properties to the `TaxonomyPicker` to specify which terms are disabled/not-selectable [#82](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/82)
1223

1324
**Fixes**
1425

docs/documentation/docs/controls/PeoplePicker.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import { PeoplePicker } from "@pnp/spfx-controls-react/lib/PeoplePicker";
3434
groupName={"Team Site Owners"} // Leave this blank in case you want to filter from all users
3535
showtooltip={true}
3636
isRequired={true}
37+
disabled={true}
3738
selectedItems={this._getPeoplePickerItems} />
3839
```
3940

@@ -56,6 +57,7 @@ The People picker control can be configured with the following properties:
5657
| groupName | string | no | group from which users are fetched. Leave it blank if need to filter all users |
5758
| personSelectionLimit | number | no | Defines the limit of people that can be selected in the control|
5859
| isRequired | boolean | no | Set if the control is required or not |
60+
| disabled | boolean | no | Set if the control is disabled or not |
5961
| errorMessage | string | no | Specify the error message to display |
6062
| errorMessageclassName | string | no | applies custom styling to the error message section|
6163
| showtooltip | boolean | no | Defines if need a tooltip or not |

docs/documentation/docs/index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ The following controls are currently available:
3636
- [ListView](./controls/ListView) (List view control)
3737
- [Placeholder](./controls/Placeholder) (Control that can be used to show an initial placeholder if the web part has to be configured)
3838
- [SiteBreadcrumb](./controls/SiteBreadcrumb) (Breadcrumb control)
39-
- [SiteBreadcrumb](./controls/TaxonomyPicker) (Taxonomy Picker)
39+
- [TaxonomyPicker](./controls/TaxonomyPicker) (Taxonomy Picker)
40+
- [PeoplePicker](./controls/PeoplePicker) (People Picker)
4041
- [WebPartTitle](./controls/WebPartTitle) (Customizable web part title control)
4142
- [IFrameDialog](./controls/IFrameDialog) (renders a Dialog with an iframe as a content)
4243

docs/documentation/mkdocs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ pages:
1111
- WebPartTitle: 'controls/WebPartTitle.md'
1212
- SecurityTrimmedControl: 'controls/SecurityTrimmedControl.md'
1313
- TaxonomyPicker: 'controls/TaxonomyPicker.md'
14+
- PeoplePicker: 'controls/PeoplePicker.md'
1415
- IFrameDialog: 'controls/IFrameDialog.md'
1516
- 'Field Controls':
1617
- 'Getting started': 'controls/fields/main.md'

gulpfile.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const fs = require('fs');
77
// Update the version number in the version.ts file
88
gulp.task('versionUpdater', (done) => {
99
const pkgContents = require('./package.json');
10-
const filePath = './src/common/appInsights/version.ts';
10+
const filePath = './src/common/telemetry/version.ts';
1111
const fileContents = `export const version: string = "{versionPlaceholder}";`;
1212
const newContents = fileContents.replace("{versionPlaceholder}", pkgContents.version);
1313
console.log(`Updating version number to: ${pkgContents.version}`);
@@ -21,5 +21,3 @@ const karmaTask = build.karma;
2121
if (karmaTask) {
2222
karmaTask.taskConfig.configPath = './config/karma.config.js';
2323
}
24-
25-

0 commit comments

Comments
 (0)