Merge pull request #91 from SharePoint/dev

Merge for the v1.6.0 release
pnp · Jul 12, 2018 · f348346 · f348346
2 parents 23af35a + b3358fc
commit f348346
Show file tree

Hide file tree

Showing 37 changed files with 933 additions and 353 deletions.
diff --git a/CHANGELOG.JSON b/CHANGELOG.JSON
@@ -1,13 +1,27 @@
 {
   "versions": [
+    {
+      "version": "1.6.0",
+      "changes": {
+        "new": [],
+        "enhancements": [
+          "Disabled property for PeoplePicker [#88](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/88)"
+        ],
+        "fixes": [
+          "New telemetry approach which allows you to use Application Insights [#81](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/81)",
+          "PeoplePicker property selectedItems not implemented? [#90](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/90)"
+        ]
+      },
+      "contributions": ["Octavie van Haaften"]
+    },
     {
       "version": "1.5.0",
       "changes": {
         "new": [
           "New `PeoplePicker` control added [#19](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/19)"
         ],
         "enhancements": [
-          "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)"
+          "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)"
         ],
         "fixes": [
           "Bug in `TaxonomyPicker` where values are not updated by an async change [#83](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/83)",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Releases
 
+## 1.6.0
+
+**Enhancements**
+
+- Disabled property for PeoplePicker [#88](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/88)
+
+**Fixes**
+
+- New telemetry approach which allows you to use Application Insights [#81](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/81)
+- PeoplePicker property selectedItems not implemented? [#90](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/90)
+
 ## 1.5.0
 
 **New control(s)**
@@ -8,7 +19,7 @@
 
 **Enhancements**
 
-- 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)
+- 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)
 
 **Fixes**
 

diff --git a/docs/documentation/docs/about/release-notes.md b/docs/documentation/docs/about/release-notes.md
@@ -1,5 +1,16 @@
 # Releases
 
+## 1.6.0
+
+**Enhancements**
+
+- Disabled property for PeoplePicker [#88](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/88)
+
+**Fixes**
+
+- New telemetry approach which allows you to use Application Insights [#81](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/81)
+- PeoplePicker property selectedItems not implemented? [#90](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/90)
+
 ## 1.5.0
 
 **New control(s)**
@@ -8,7 +19,7 @@
 
 **Enhancements**
 
-- 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)
+- 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)
 
 **Fixes**
 

diff --git a/docs/documentation/docs/controls/PeoplePicker.md b/docs/documentation/docs/controls/PeoplePicker.md
@@ -34,6 +34,7 @@ import { PeoplePicker } from "@pnp/spfx-controls-react/lib/PeoplePicker";
     groupName={"Team Site Owners"} // Leave this blank in case you want to filter from all users
     showtooltip={true}
     isRequired={true}
+    disabled={true}
     selectedItems={this._getPeoplePickerItems} />
 ```
 
@@ -56,6 +57,7 @@ The People picker control can be configured with the following properties:
 | groupName | string | no | group from which users are fetched. Leave it blank if need to filter all users |
 | personSelectionLimit | number | no | Defines the limit of people that can be selected in the control|
 | isRequired | boolean | no | Set if the control is required or not |
+| disabled | boolean | no | Set if the control is disabled or not |
 | errorMessage | string | no | Specify the error message to display |
 | errorMessageclassName | string | no | applies custom styling to the error message section|
 | showtooltip | boolean | no | Defines if need a tooltip or not |

diff --git a/docs/documentation/docs/index.md b/docs/documentation/docs/index.md
@@ -36,7 +36,8 @@ The following controls are currently available:
 - [ListView](./controls/ListView) (List view control)
 - [Placeholder](./controls/Placeholder) (Control that can be used to show an initial placeholder if the web part has to be configured)
 - [SiteBreadcrumb](./controls/SiteBreadcrumb) (Breadcrumb control)
-- [SiteBreadcrumb](./controls/TaxonomyPicker) (Taxonomy Picker)
+- [TaxonomyPicker](./controls/TaxonomyPicker) (Taxonomy Picker)
+- [PeoplePicker](./controls/PeoplePicker) (People Picker)
 - [WebPartTitle](./controls/WebPartTitle) (Customizable web part title control)
 - [IFrameDialog](./controls/IFrameDialog) (renders a Dialog with an iframe as a content)
 

diff --git a/docs/documentation/mkdocs.yml b/docs/documentation/mkdocs.yml
@@ -11,6 +11,7 @@ pages:
     - WebPartTitle: 'controls/WebPartTitle.md'
     - SecurityTrimmedControl: 'controls/SecurityTrimmedControl.md'
     - TaxonomyPicker: 'controls/TaxonomyPicker.md'
+    - PeoplePicker: 'controls/PeoplePicker.md'
     - IFrameDialog: 'controls/IFrameDialog.md'
   - 'Field Controls':
     - 'Getting started': 'controls/fields/main.md'

diff --git a/gulpfile.js b/gulpfile.js
@@ -7,7 +7,7 @@ const fs = require('fs');
 // Update the version number in the version.ts file
 gulp.task('versionUpdater', (done) => {
   const pkgContents = require('./package.json');
-  const filePath = './src/common/appInsights/version.ts';
+  const filePath = './src/common/telemetry/version.ts';
   const fileContents = `export const version: string = "{versionPlaceholder}";`;
   const newContents = fileContents.replace("{versionPlaceholder}", pkgContents.version);
   console.log(`Updating version number to: ${pkgContents.version}`);
@@ -21,5 +21,3 @@ const karmaTask = build.karma;
 if (karmaTask) {
   karmaTask.taskConfig.configPath = './config/karma.config.js';
 }
-
-