Merge

Piotr Siatka · Piotr Siatka · commit db7211440b73 · 2019-12-14T06:21:34.000+01:00
diff --git a/CHANGELOG.JSON b/CHANGELOG.JSON
@@ -6,14 +6,17 @@
         "new": [],
         "enhancements": [
           "`FilePicker`: Fixes for OneDrive CORS issues [#407](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/407)",
-          "`ListItemPicker`: added new control property `filter` [#392](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/392)"
+          "`ListItemPicker`: added new control property `filter` [#392](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/392)",
+          "allowing to use context from any type of SPFx extensions: [#419](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/419)"
         ],
         "fixes": [
           "Documentation fix for `FilePicker`: updated `accepts` value in props [#404](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/404)",
           "The `FilePicker` control doesn't work in many languages due to missing localization keys [#412](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/412)",
           "Documentation fix for broken links of Property Controls landing page [#388](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/388)",
           "Documentation fix to include new components from v 1.15.0 [#394](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/394)",
-          "`DateTimePicker`: dropdown for time not handling AM/PM correctly [#405](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/409)"
+          "`DateTimePicker`: dropdown for time not handling AM/PM correctly [#405](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/409)",
+          "Documentation fix for `index` page: updated link to Chart controls [#417](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/417)",
+          "Documentation update for SPFx On Premises notice: [#418](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/418)"
         ]
       },
       "contributions": [
@@ -22,7 +25,8 @@
         "[Siddharth Vaghasia](https://github.com/siddharth-vaghasia)",
         "[João Mendes](https://github.com/joaojmendes)",
         "[PrasadKasireddy](https://github.com/PrasadKasireddy)",
-        "[Chad Eiserloh](https://github.com/c-eiser13)"
+        "[Chad Eiserloh](https://github.com/c-eiser13)",
+        "[Koen Zomers](https://github.com/KoenZomers)"
       ]
     },
     {
diff --git a/docs/documentation/docs/controls/FilePicker.md b/docs/documentation/docs/controls/FilePicker.md
@@ -61,7 +61,7 @@ The FilePicker component can be configured with the following properties:
 | buttonIcon | string | no | In case it is provided the file picker will be rendered as an action button. |
 | onSave | (filePickerResult: IFilePickerResult) => void | yes | Handler when the file has been selected and picker has been closed. |
 | onChange | (filePickerResult: IFilePickerResult) => void | no | Handler when the file selection has been changed. |
-| context | ApplicationCustomizerContext | WebPartContext | yes | Current context. |
+| context | ExtensionContext \| WebPartContext | yes | Current context. |
 | accepts | string[] | no | Array of strings containing allowed files extensions. E.g. [".gif", ".jpg", ".jpeg", ".bmp", ".dib", ".tif", ".tiff", ".ico", ".png", ".jxr", ".svg"] |
 | required | boolean | no | Sets the label to inform that the value is required. |
 | bingAPIKey | string | no | Used to execute WebSearch. If not provided SearchTab will not be available. |
diff --git a/docs/documentation/docs/controls/ListItemAttachments.md b/docs/documentation/docs/controls/ListItemAttachments.md
@@ -36,7 +36,7 @@ The `ListItemAttachments` control can be configured with the following propertie
 
 | Property | Type | Required | Description |
 | ---- | ---- | ---- | ---- |
-| context | WebPartContext \| ApplicationCustomizerContext | yes | SPFx web part or extention context |
+| context | WebPartContext \| ExtensionContext | yes | SPFx web part or extention context |
 | itemId | number | yes | List Item Id  |
 | listId | string | yes | Guid of the list. |
 | webUrl | string | no | URL of the site. By default it uses the current site URL. |
diff --git a/docs/documentation/docs/controls/ListItemPicker.md b/docs/documentation/docs/controls/ListItemPicker.md
@@ -49,7 +49,7 @@ The `ListItemPicker` control can be configured with the following properties:
 | ---- | ---- | ---- | ---- |
 | columnInternalName | string | yes | InternalName of column to search and get values. |
 | keyColumnInternalName | string | no | InternalName of column to use as the key for the selection. Must be a column with unique values. Default: Id |
-| context | WebPartContext \| ApplicationCustomizerContext | yes | SPFx web part or extention context |
+| context | WebPartContext \| ExtensionContext | yes | SPFx web part or extention context |
 | listId | string | yes | Guid of the list. |
 | itemLimit | number | yes | Number of items which can be selected |
 | onSelectItem | (items: any[]) => void | yes | Callback function which returns the selected items. |
diff --git a/docs/documentation/docs/controls/ListPicker.md b/docs/documentation/docs/controls/ListPicker.md
@@ -49,7 +49,7 @@ The `ListPicker` control can be configured with the following properties:
 
 | Property | Type | Required | Description |
 | ---- | ---- | ---- | ---- |
-| context | WebPartContext OR ApplicationCustomizerContext | yes | The context object of the SPFx loaded webpart or customizer. |
+| context | WebPartContext \| ExtensionContext | yes | The context object of the SPFx loaded webpart or customizer. |
 | className | string | no | If provided, additional class name to provide on the dropdown element. |
 | disabled | boolean | no | Whether or not the control is disabled. |
 | baseTemplate | number | no | The SharePoint BaseTemplate ID to filter the list options by. |
diff --git a/docs/documentation/docs/controls/SecurityTrimmedControl.md b/docs/documentation/docs/controls/SecurityTrimmedControl.md
@@ -62,7 +62,7 @@ The `SecurityTrimmedControl` can be configured with the following properties:
 
 | Property | Type | Required | Description |
 | ---- | ---- | ---- | ---- |
-| context | WebPartContext or ApplicationCustomizerContext or FieldCustomizerContext or ListViewCommandSetContext | yes | Context of the web part, application customizer, field customizer, or list view command set. |
+| context | WebPartContext \| ExtensionContext | yes | Context of the web part, application customizer, field customizer, or list view command set. |
 | permissions | SPPermission[] | yes | The permissions to check for the user. |
 | level | PermissionLevel | yes | Specify where to check the user permissions: current site or list / remote site or list. |
 | remoteSiteUrl | string | no | The URL of the remote site. Required when you want to check permissions on remote site or list. |
diff --git a/docs/documentation/docs/controls/SiteBreadcrumb.md b/docs/documentation/docs/controls/SiteBreadcrumb.md
@@ -26,6 +26,6 @@ The SiteBreadcrumb control can be configured with the following properties:
 
 | Property | Type | Required | Description |
 | ---- | ---- | ---- | ---- |
-| context | WebPartContext OR ApplicationCustomizerContext | yes | Pass the context of your web part or application customizer extension. |
+| context | WebPartContext \| ExtensionContext | yes | Pass the context of your web part or application customizer extension. |
 
 ![](https://telemetry.sharepointpnp.com/sp-dev-fx-controls-react/wiki/controls/SiteBreadcrumb)
diff --git a/docs/documentation/docs/controls/TaxonomyPicker.md b/docs/documentation/docs/controls/TaxonomyPicker.md
@@ -105,7 +105,7 @@ The TaxonomyPicker control can be configured with the following properties:
 | panelTitle | string | yes | TermSet Picker Panel title. |
 | label | string | yes | Text displayed above the Taxonomy Picker. |
 | disabled | string | no | Specify if the control needs to be disabled. |
-| context | WebPartContext | yes | Context of the current web part. |
+| context | WebPartContext \| ExtensionContext | yes | Context of the current web part or extension. |
 | initialValues | IPickerTerms | no | Defines the selected by default term sets. |
 | allowMultipleSelections | boolean | no | Defines if the user can select only one or many term sets. Default value is false. |
 | termsetNameOrID | string | yes | The name or Id of your TermSet that you would like the Taxonomy Picker to chose terms from. |
diff --git a/docs/documentation/docs/index.md b/docs/documentation/docs/index.md
@@ -5,7 +5,7 @@ This repository provides developers with a set of reusable React controls that c
 ![Placeholder example](./assets/placeholder-intro.png)
 
 !!! attention
-    The controls project has a minimal dependency on SharePoint Framework version `1.3.0`. Be aware that the controls might not work in solutions your building for on-premises. As for on-premises solutions version `1.1.0` is currently used.
+    The controls project has a minimal dependency on SharePoint Framework version `1.3.0`. Be aware that the controls might not work in solutions your building for SharePoint 2016 with Feature Pack 2 on-premises. As for SharePoint 2016 with Feature Pack 2 version `1.1.0` of the SharePoint framework is the only version that can be used. SharePoint 2019 on-premises uses SharePoint framework `v1.4.0` and therefore should be fine to use with these controls.
 
 ## Getting started
 
@@ -35,7 +35,7 @@ Once the package is installed, you will have to configure the resource file of t
 The following controls are currently available:
 
 - [Carousel](./controls/Carousel) (Control displays children elements with 'previous/next element' options)
-- [Charts](./controls/ChartControls) (makes it easy to integrate [Chart.js](https://www.chartjs.org/) charts into web part)
+- [Charts](./controls/ChartControl) (makes it easy to integrate [Chart.js](https://www.chartjs.org/) charts into web part)
 - [DateTimePicker](./controls/DateTimePicker) (DateTime Picker)
 - [FilePicker](./controls/FilePicker) (control that allows to browse and select a file from various places)
 - [FileTypeIcon](./controls/FileTypeIcon) (Control that shows the icon of a specified file path or application)
diff --git a/src/controls/dateTimePicker/HoursComponent.tsx b/src/controls/dateTimePicker/HoursComponent.tsx
@@ -36,7 +36,7 @@ export default class HoursComponent extends React.Component<IHoursComponentProps
           label=''
           options={this._hours}
           onChanged={option => {
-            onChange(option.text)
+            onChange(option.text);
           }}
           dropdownWidth={110} />);
     }
diff --git a/src/controls/filePicker/FilePicker.types.ts b/src/controls/filePicker/FilePicker.types.ts
@@ -1,15 +1,15 @@
 import { WebPartContext } from "@microsoft/sp-webpart-base";
 import { IBreadcrumbItem } from "office-ui-fabric-react/lib/Breadcrumb";
 import { IFile, ILibrary } from "../../services/FileBrowserService.types";
-import { ApplicationCustomizerContext } from "@microsoft/sp-application-base";
+import { ExtensionContext } from "@microsoft/sp-extension-base";
 
 export interface FilePickerBreadcrumbItem extends IBreadcrumbItem {
   libraryData?: ILibrary;
   folderData?: IFile;
 }
 
 export interface IFilePickerTab {
-  context: ApplicationCustomizerContext | WebPartContext;
+  context: ExtensionContext | WebPartContext;
   accepts: string[];
   onSave: (value: IFilePickerResult) => void;
   onClose: () => void;
diff --git a/src/controls/filePicker/IFilePickerProps.ts b/src/controls/filePicker/IFilePickerProps.ts
@@ -1,6 +1,6 @@
 import { WebPartContext } from "@microsoft/sp-webpart-base";
 import { IFilePickerResult } from "./FilePicker.types";
-import { ApplicationCustomizerContext } from "@microsoft/sp-application-base";
+import { ExtensionContext } from "@microsoft/sp-extension-base";
 
 export interface IFilePickerProps {
   /**
@@ -30,7 +30,7 @@ export interface IFilePickerProps {
   /**
    * Current context.
    */
-  context: ApplicationCustomizerContext |  WebPartContext;
+  context: ExtensionContext |  WebPartContext;
 
   /**
    * File extensions to be displayed.
diff --git a/src/controls/filePicker/controls/FileBrowser/IFileBrowserProps.ts b/src/controls/filePicker/controls/FileBrowser/IFileBrowserProps.ts
@@ -1,4 +1,3 @@
-import { WebPartContext } from "@microsoft/sp-webpart-base";
 import { FileBrowserService } from "../../../../services/FileBrowserService";
 import { IFile } from "../../../../services/FileBrowserService.types";
 import { IFilePickerResult } from "../../FilePicker.types";
diff --git a/src/controls/listItemAttachments/IListItemAttachmentsProps.ts b/src/controls/listItemAttachments/IListItemAttachmentsProps.ts
@@ -1,11 +1,11 @@
 import { WebPartContext } from "@microsoft/sp-webpart-base";
-import { ApplicationCustomizerContext } from "@microsoft/sp-application-base";
+import { ExtensionContext } from "@microsoft/sp-extension-base";
 
 export interface IListItemAttachmentsProps {
   listId: string;
   itemId: number;
   className?: string;
   webUrl?:string;
   disabled?: boolean;
-  context: WebPartContext |  ApplicationCustomizerContext;
+  context: WebPartContext |  ExtensionContext;
 }
diff --git a/src/controls/listItemAttachments/IUploadAttachmentProps.ts b/src/controls/listItemAttachments/IUploadAttachmentProps.ts
@@ -1,13 +1,13 @@
 import { WebPartContext } from "@microsoft/sp-webpart-base";
-import { ApplicationCustomizerContext } from "@microsoft/sp-application-base";
+import { ExtensionContext } from "@microsoft/sp-extension-base";
 
 export interface IUploadAttachmentProps {
   listId: string;
   itemId: number;
   className?: string;
   webUrl?:string;
   disabled?: boolean;
-  context: WebPartContext |  ApplicationCustomizerContext;
+  context: WebPartContext |  ExtensionContext;
   fireUpload?:boolean;
   onAttachmentUpload: () => void;
 }
diff --git a/src/controls/listItemPicker/IListItemPickerProps.ts b/src/controls/listItemPicker/IListItemPickerProps.ts
@@ -1,10 +1,10 @@
 import { WebPartContext } from "@microsoft/sp-webpart-base";
-import { ApplicationCustomizerContext } from "@microsoft/sp-application-base";
+import { ExtensionContext } from "@microsoft/sp-extension-base";
 
 export interface IListItemPickerProps {
   columnInternalName: string;
   keyColumnInternalName?: string;
-  context: WebPartContext |  ApplicationCustomizerContext;
+  context: WebPartContext |  ExtensionContext;
   listId: string;
   itemLimit: number;
   filter?: string;
diff --git a/src/controls/listPicker/IListPicker.ts b/src/controls/listPicker/IListPicker.ts
@@ -1,6 +1,4 @@
-import { ApplicationCustomizerContext } from '@microsoft/sp-application-base';
 import { ExtensionContext } from '@microsoft/sp-extension-base';
-import IWebPartContext from "@microsoft/sp-webpart-base/lib/core/IWebPartContext";
 import { IDropdownOption } from "office-ui-fabric-react/lib/Dropdown";
 import { WebPartContext } from '@microsoft/sp-webpart-base';
 import { LibsOrderBy } from "../../services/ISPService";
diff --git a/src/controls/placeholder/PlaceholderComponent.test.tsx b/src/controls/placeholder/PlaceholderComponent.test.tsx
@@ -23,7 +23,7 @@ describe('<Placeholder />', () => {
     setIconOptions({
       disableWarnings: true
     });
-  })
+  });
 
   afterEach(() => {
     placeholder.unmount();
diff --git a/src/controls/securityTrimmedControl/ISecurityTrimmedControlProps.ts b/src/controls/securityTrimmedControl/ISecurityTrimmedControlProps.ts
@@ -1,14 +1,13 @@
-import { ApplicationCustomizerContext } from '@microsoft/sp-application-base';
-import { FieldCustomizerContext, ListViewCommandSetContext } from '@microsoft/sp-listview-extensibility';
 import { WebPartContext } from '@microsoft/sp-webpart-base';
 import { SPPermission } from '@microsoft/sp-page-context';
 import { PermissionLevel } from '.';
+import { ExtensionContext } from '@microsoft/sp-extension-base';
 
 export interface ISecurityTrimmedControlProps {
   /**
    * Context of the web part, application customizer, field customizer, or list view command set.
    */
-  context: WebPartContext | ApplicationCustomizerContext | FieldCustomizerContext | ListViewCommandSetContext;
+  context: WebPartContext | ExtensionContext;
   /**
    * The permissions to check for the user.
    */
diff --git a/src/controls/siteBreadcrumb/ISiteBreadcrumb.ts b/src/controls/siteBreadcrumb/ISiteBreadcrumb.ts
@@ -1,10 +1,10 @@
-import ApplicationCustomizerContext from '@microsoft/sp-application-base/lib/extensibility/ApplicationCustomizerContext';
 import { IBreadcrumbItem } from 'office-ui-fabric-react/lib/Breadcrumb';
 import { WebPartContext } from '@microsoft/sp-webpart-base';
+import { ExtensionContext } from '@microsoft/sp-extension-base';
 
 export interface ISiteBreadcrumbProps {
 
-  context: WebPartContext | ApplicationCustomizerContext;
+  context: WebPartContext | ExtensionContext;
 }
 
 export interface ISiteBreadcrumbState {
diff --git a/src/controls/taxonomyPicker/ITaxonomyPicker.ts b/src/controls/taxonomyPicker/ITaxonomyPicker.ts
@@ -1,9 +1,9 @@
-import { ApplicationCustomizerContext } from '@microsoft/sp-application-base';
 import { IPickerTerms } from './ITermPicker';
 import { ITermSet, ITerm } from '../../services/ISPTermStorePickerService';
 import { IWebPartContext } from '@microsoft/sp-webpart-base';
 import { ITermActions } from './termActions/ITermsActions';
 import SPTermStorePickerService from '../../services/SPTermStorePickerService';
+import { ExtensionContext } from '@microsoft/sp-extension-base';
 
 /**
  * PropertyFieldTermPickerHost properties interface
@@ -28,7 +28,7 @@ export interface ITaxonomyPickerProps  {
   /**
    * WebPart's context
    */
-  context: IWebPartContext | ApplicationCustomizerContext;
+  context: IWebPartContext | ExtensionContext;
   /**
    * Limit the terms that can be picked by the Term Set name or ID
    */
diff --git a/src/controls/taxonomyPicker/ITermPicker.ts b/src/controls/taxonomyPicker/ITermPicker.ts
@@ -1,5 +1,5 @@
-import { ApplicationCustomizerContext } from '@microsoft/sp-application-base';
 import { IWebPartContext } from '@microsoft/sp-webpart-base';
+import { ExtensionContext } from '@microsoft/sp-extension-base';
 
 /**
  * Selected terms
@@ -41,7 +41,7 @@ export interface IPropertyFieldTermPickerProps {
   /**
    * WebPart's context
    */
-  context: IWebPartContext | ApplicationCustomizerContext;
+  context: IWebPartContext | ExtensionContext;
   /**
    * Limit the term sets that can be used by the group name or ID
    */
diff --git a/src/controls/taxonomyPicker/TermPicker.tsx b/src/controls/taxonomyPicker/TermPicker.tsx
@@ -7,8 +7,8 @@ import { ITaxonomyPickerProps } from './ITaxonomyPicker';
 import { IWebPartContext } from '@microsoft/sp-webpart-base';
 import * as strings from 'ControlStrings';
 import { Icon } from 'office-ui-fabric-react/lib/Icon';
-import { ApplicationCustomizerContext } from '@microsoft/sp-application-base';
 import { ITermSet } from '../../services/ISPTermStorePickerService';
+import { ExtensionContext } from '@microsoft/sp-extension-base';
 
 export class TermBasePicker extends BasePicker<IPickerTerm, IBasePickerProps<IPickerTerm>>
 {
@@ -21,7 +21,7 @@ export interface ITermPickerState {
 
 export interface ITermPickerProps {
   termPickerHostProps: ITaxonomyPickerProps;
-  context: IWebPartContext | ApplicationCustomizerContext;
+  context: IWebPartContext | ExtensionContext;
   disabled: boolean;
   value: IPickerTerms;
   allowMultipleSelections : boolean;
diff --git a/src/services/FileBrowserService.ts b/src/services/FileBrowserService.ts
@@ -2,17 +2,17 @@ import { WebPartContext } from "@microsoft/sp-webpart-base";
 import { IFile, FilesQueryResult, ILibrary } from "./FileBrowserService.types";
 import { SPHttpClient } from "@microsoft/sp-http";
 import { GeneralHelper } from "..";
-import { ApplicationCustomizerContext } from "@microsoft/sp-application-base";
+import { ExtensionContext } from "@microsoft/sp-extension-base";
 
 export class FileBrowserService {
   protected itemsToDownloadCount: number;
-  protected context: ApplicationCustomizerContext | WebPartContext;
+  protected context: ExtensionContext | WebPartContext;
 
   protected driveAccessToken: string;
   protected mediaBaseUrl: string;
   protected callerStack: string;
 
-  constructor(context: ApplicationCustomizerContext | WebPartContext, itemsToDownloadCount: number = 100) {
+  constructor(context: ExtensionContext | WebPartContext, itemsToDownloadCount: number = 100) {
     this.context = context;
 
     this.itemsToDownloadCount = itemsToDownloadCount;
diff --git a/src/services/FilesSearchService.ts b/src/services/FilesSearchService.ts
@@ -1,8 +1,8 @@
 import { WebPartContext } from "@microsoft/sp-webpart-base";
-import { IHttpClientOptions, SPHttpClient, SPHttpClientResponse } from "@microsoft/sp-http";
+import { SPHttpClient } from "@microsoft/sp-http";
 import { ISearchResult, BingQuerySearchParams, IRecentFile } from "./FilesSearchService.types";
 import { find } from "office-ui-fabric-react/lib/Utilities";
-import { ApplicationCustomizerContext } from "@microsoft/sp-application-base";
+import { ExtensionContext } from "@microsoft/sp-extension-base";
 
 /**
  * Maximum file size when searching
@@ -15,10 +15,10 @@ const MAXFILESIZE = 52428800;
 const MAXRESULTS = 100;
 
 export class FilesSearchService {
-  private context: ApplicationCustomizerContext | WebPartContext;
+  private context: ExtensionContext | WebPartContext;
   private bingAPIKey: string;
 
-  constructor(context: ApplicationCustomizerContext | WebPartContext, bingAPIKey: string) {
+  constructor(context: ExtensionContext | WebPartContext, bingAPIKey: string) {
     this.context = context;
     this.bingAPIKey = bingAPIKey;
   }
diff --git a/src/services/OneDriveService.ts b/src/services/OneDriveService.ts
@@ -1,19 +1,18 @@
 // PnP
-import { sp, RenderListDataOptions } from "@pnp/sp";
 import { WebPartContext } from "@microsoft/sp-webpart-base";
 
 import { SPHttpClient } from '@microsoft/sp-http';
 import { FileBrowserService } from "./FileBrowserService";
 import { FilesQueryResult } from "./FileBrowserService.types";
-import { ApplicationCustomizerContext } from "@microsoft/sp-application-base";
+import { ExtensionContext } from "@microsoft/sp-extension-base";
 
 export class OneDriveService extends FileBrowserService {
   protected oneDrivePersonalUrl: string;
   protected oneDriveRootFolderRelativeUrl: string;
   protected oneDriveRootFolderAbsoluteUrl: string;
   protected oneDrivePersonalLibraryTitle: string;
 
-  constructor(context: ApplicationCustomizerContext | WebPartContext, itemsToDownloadCount?: number) {
+  constructor(context: ExtensionContext | WebPartContext, itemsToDownloadCount?: number) {
     super(context, itemsToDownloadCount);
 
     this.oneDrivePersonalUrl = null;
diff --git a/src/services/OrgAssetsService.ts b/src/services/OrgAssetsService.ts
diff --git a/src/services/SPServiceFactory.ts b/src/services/SPServiceFactory.ts
diff --git a/src/services/SPTermStorePickerService.ts b/src/services/SPTermStorePickerService.ts

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ export default class HoursComponent extends React.Component<IHoursComponentProps`
`36`	`36`	`label=''`
`37`	`37`	`options={this._hours}`
`38`	`38`	`onChanged={option => {`
`39`		`- onChange(option.text)`
	`39`	`+ onChange(option.text);`
`40`	`40`	`}}`
`41`	`41`	`dropdownWidth={110} />);`
`42`	`42`	`}`