Merge pull request #45 from SharePoint/dev

estruyf · web-flow · commit cdea66339307 · 2018-02-02T11:21:20.000+01:00
Bug fix + telemetry added
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Releases
 
+## 1.2.1
+
+**Fixes**
+
+- `FieldTaxonomyRenderer` got fixed to support single and multiple values
+
 ## 1.2.0
 
 **New controls**
diff --git a/docs/documentation/docs/about/release-notes.md b/docs/documentation/docs/about/release-notes.md
@@ -1,5 +1,11 @@
 # Releases
 
+## 1.2.1
+
+**Fixes**
+
+- `FieldTaxonomyRenderer` got fixed to support single and multiple values
+
 ## 1.2.0
 
 **New controls**
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@pnp/spfx-controls-react",
   "description": "Reusable React controls for SharePoint Framework solutions",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "engines": {
     "node": ">=0.10.0"
   },
diff --git a/src/controls/fields/fieldAttachmentsRenderer/FieldAttachmentsRenderer.tsx b/src/controls/fields/fieldAttachmentsRenderer/FieldAttachmentsRenderer.tsx
@@ -2,6 +2,7 @@ import { override } from '@microsoft/decorators';
 import * as React from 'react';
 import { css, Icon } from 'office-ui-fabric-react';
 import { IFieldRendererProps } from '../fieldCommon/IFieldRendererProps';
+import * as appInsights from '../../../common/appInsights';
 
 import styles from './FieldAttachmentsRenderer.module.scss';
 
@@ -31,6 +32,8 @@ export class FieldAttachmentsRenderer extends React.Component<IFieldAttachmentsR
     public constructor(props: IFieldAttachmentsRendererProps, state: IFieldAttahcmentsRendererState) {
         super(props, state);
 
+        appInsights.track('FieldAttachmentsRenderer', {});
+
         this.state = {};
     }
 
diff --git a/src/controls/fields/fieldBaseTextRenderer/FieldBaseTextRenderer.tsx b/src/controls/fields/fieldBaseTextRenderer/FieldBaseTextRenderer.tsx
@@ -4,6 +4,7 @@ import { css } from 'office-ui-fabric-react';
 
 import styles from './FieldBaseTextRenderer.module.scss';
 import { IFieldRendererProps } from '../fieldCommon/IFieldRendererProps';
+import * as appInsights from '../../../common/appInsights';
 
 export interface IFieldBaseTextRendererProps extends IFieldRendererProps {
     /**
@@ -30,6 +31,8 @@ export class FieldBaseTextRenderer extends React.Component<IFieldBaseTextRendere
     public constructor (props: IFieldBaseTextRendererProps, state: IFieldBaseTextRendererState) {
         super(props, state);
 
+        appInsights.track('FieldBaseTextRenderer', {});
+
         this.state = {};
     }
 
diff --git a/src/controls/fields/fieldDateRenderer/FieldDateRenderer.tsx b/src/controls/fields/fieldDateRenderer/FieldDateRenderer.tsx
@@ -3,6 +3,7 @@ import * as React from 'react';
 import { css } from 'office-ui-fabric-react';
 import { IFieldRendererProps } from '../fieldCommon/IFieldRendererProps';
 import { FieldBaseTextRenderer } from '../fieldBaseTextRenderer/FieldBaseTextRenderer';
+import * as appInsights from '../../../common/appInsights';
 
 export interface IFieldDateRendererProps extends IFieldRendererProps {
     /**
@@ -27,6 +28,8 @@ export class FieldDateRenderer extends React.Component<IFieldDateRendererProps,
     public constructor(props: IFieldDateRendererProps, state: IFieldDateRendererState) {
         super(props, state);
 
+        appInsights.track('FieldDateRenderer', {});
+
         this.state = {};
     }
 
diff --git a/src/controls/fields/fieldFileTypeRenderer/FieldFileTypeRenderer.tsx b/src/controls/fields/fieldFileTypeRenderer/FieldFileTypeRenderer.tsx
@@ -3,6 +3,7 @@ import * as React from 'react';
 import { css, ISerializableObject, Icon } from 'office-ui-fabric-react';
 import { IFieldRendererProps } from '../fieldCommon/IFieldRendererProps';
 import { FileTypeIcon, IconType } from '../../fileTypeIcon';
+import * as appInsights from '../../../common/appInsights';
 
 import styles from './FieldFileTypeRenderer.module.scss';
 import { findIndex } from '@microsoft/sp-lodash-subset';
@@ -34,6 +35,8 @@ export class FieldFileTypeRenderer extends React.Component<IFieldFileTypeRendere
   public constructor(props: IFieldFileTypeRendererProps, state: IFieldFileTypeRendererState) {
     super(props, state);
 
+    appInsights.track('FieldFileTypeRenderer', {});
+
     this.state = {};
   }
 
diff --git a/src/controls/fields/fieldLookupRenderer/FieldLookupRenderer.tsx b/src/controls/fields/fieldLookupRenderer/FieldLookupRenderer.tsx
@@ -4,6 +4,7 @@ import { css, DialogType, Link } from 'office-ui-fabric-react';
 
 import { ISPFieldLookupValue } from "../../../common/SPEntities";
 import { IFieldRendererProps } from '../fieldCommon/IFieldRendererProps';
+import * as appInsights from '../../../common/appInsights';
 
 import styles from './FieldLookupRenderer.module.scss';
 import IFrameDialog from '../../iFrameDialog/IFrameDialog';
@@ -47,6 +48,8 @@ export class FieldLookupRenderer extends React.Component<IFieldLookupRendererPro
     public constructor(props: IFieldLookupRendererProps, state: IFieldLookupRendererState) {
         super(props, state);
 
+        appInsights.track('FieldLookupRenderer', {});
+
         this.state = {
             hideDialog: true
         };
diff --git a/src/controls/fields/fieldNameRenderer/FieldNameRenderer.tsx b/src/controls/fields/fieldNameRenderer/FieldNameRenderer.tsx
@@ -6,6 +6,7 @@ import { Link, Icon } from 'office-ui-fabric-react';
 
 import { FieldBaseTextRenderer } from '../fieldBaseTextRenderer/FieldBaseTextRenderer';
 import { IFieldRendererProps } from '../fieldCommon/IFieldRendererProps';
+import * as appInsights from '../../../common/appInsights';
 
 import styles from './FieldNameRenderer.module.scss';
 import { GeneralHelper } from "../../../common/utilities/GeneralHelper";
@@ -60,6 +61,8 @@ export class FieldNameRenderer extends React.Component<IFieldNameRendererProps,
     public constructor(props: IFieldNameRendererProps, state: IFieldNameRendererState) {
         super(props, state);
 
+        appInsights.track('FieldNameRenderer', {});
+
         this.state = {};
     }
 
diff --git a/src/controls/fields/fieldTaxonomyRenderer/FieldTaxonomyRenderer.tsx b/src/controls/fields/fieldTaxonomyRenderer/FieldTaxonomyRenderer.tsx
@@ -4,14 +4,15 @@ import { css } from 'office-ui-fabric-react';
 
 import { ITerm } from '../../../common/SPEntities';
 import { IFieldRendererProps } from '../fieldCommon/IFieldRendererProps';
+import * as appInsights from '../../../common/appInsights';
 
 import styles from './FieldTaxonomyRenderer.module.scss';
 
 export interface IFieldTaxonomyRendererProps extends IFieldRendererProps {
     /**
      * terms to display
      */
-    terms: ITerm[];
+    terms: ITerm | ITerm[];
 }
 
 /**
@@ -30,14 +31,21 @@ export class FieldTaxonomyRenderer extends React.Component<IFieldTaxonomyRendere
     public constructor(props: IFieldTaxonomyRendererProps, state: IFieldTaxonomyRendererState) {
         super(props, state);
 
+        appInsights.track('FieldTaxonomyRenderer', {});
+
         this.state = {};
     }
 
     @override
     public render(): JSX.Element {
-        const termEls: JSX.Element[] = this.props.terms.map((term) => {
-            return <div className={styles.term} style={this.props.cssProps}><span>{term.Label}</span></div>;
-        });
+        let termEls: JSX.Element | JSX.Element[] = null;
+        if (Array.isArray(this.props.terms)) {
+            termEls = this.props.terms.map((term) => {
+                return <div className={styles.term} style={this.props.cssProps}><span>{term.Label}</span></div>;
+            });
+        } else {
+            termEls = <div className={styles.term} style={this.props.cssProps}><span>{this.props.terms.Label}</span></div>;
+        }
         return (<div style={this.props.cssProps} className={css(this.props.className)}>{termEls}</div>);
     }
 }
diff --git a/src/controls/fields/fieldTextRenderer/FieldTextRenderer.tsx b/src/controls/fields/fieldTextRenderer/FieldTextRenderer.tsx
@@ -6,6 +6,7 @@ import styles from './FieldTextRenderer.module.scss';
 
 import { FieldBaseTextRenderer } from '../fieldBaseTextRenderer/FieldBaseTextRenderer';
 import { IFieldRendererProps } from '../fieldCommon/IFieldRendererProps';
+import * as appInsights from '../../../common/appInsights';
 
 export interface IFieldTextRendererProps extends IFieldRendererProps {
     /**
@@ -43,6 +44,8 @@ export class FieldTextRenderer extends React.Component<IFieldTextRendererProps,
     public constructor(props: IFieldTextRendererProps, state: IFieldTextRendererState) {
         super(props, state);
 
+        appInsights.track('FieldTextRenderer', {});
+
         this.state = {};
     }
 
diff --git a/src/controls/fields/fieldTitleRenderer/FieldTitleRenderer.tsx b/src/controls/fields/fieldTitleRenderer/FieldTitleRenderer.tsx
@@ -4,6 +4,7 @@ import { Link, css } from 'office-ui-fabric-react';
 
 import { FieldBaseTextRenderer } from '../fieldBaseTextRenderer/FieldBaseTextRenderer';
 import { IFieldRendererProps } from '../fieldCommon/IFieldRendererProps';
+import * as appInsights from '../../../common/appInsights';
 
 export interface IFieldTitleRendererProps extends IFieldRendererProps {
     /**
@@ -56,6 +57,8 @@ export class FieldTitleRenderer extends React.Component<IFieldTitleRendererProps
     public constructor(props: IFieldTitleRendererProps, state: IFieldTitleRendererState) {
         super(props, state);
 
+        appInsights.track('FieldTitleRenderer', {});
+
         this.state = {};
     }
 
diff --git a/src/controls/fields/fieldUrlRenderer/FieldUrlRenderer.tsx b/src/controls/fields/fieldUrlRenderer/FieldUrlRenderer.tsx
@@ -3,6 +3,7 @@ import * as React from 'react';
 import { Link, css } from 'office-ui-fabric-react';
 
 import { IFieldRendererProps } from '../fieldCommon/IFieldRendererProps';
+import * as appInsights from '../../../common/appInsights';
 
 import styles from './FieldUrlRenderer.module.scss';
 
@@ -37,6 +38,8 @@ export class FieldUrlRenderer extends React.Component<IFieldUrlRendererProps, IF
     public constructor(props: IFieldUrlRendererProps, state: IFieldUrlRendererState) {
         super(props, state);
 
+        appInsights.track('FieldUrlRenderer', {});
+
         this.state = {};
     }
 
diff --git a/src/controls/fields/fieldUserRenderer/FieldUserRenderer.tsx b/src/controls/fields/fieldUserRenderer/FieldUserRenderer.tsx
@@ -12,6 +12,7 @@ import { IContext } from '../../../common/Interfaces';
 import { GeneralHelper } from '../../../common/utilities/GeneralHelper';
 import { SPHttpClient } from '@microsoft/sp-http';
 import FieldUserHoverCard, { IFieldUserHoverCardProps } from './FieldUserHoverCard';
+import * as appInsights from '../../../common/appInsights';
 
 import * as strings from 'ControlStrings';
 
@@ -96,6 +97,8 @@ export class FieldUserRenderer extends React.Component<IFieldUserRendererProps,
     public constructor(props: IFieldUserRendererProps, state: IFieldUserRendererState) {
         super(props, state);
 
+        appInsights.track('FieldUserRenderer', {});
+
         this._userImageUrl = `${GeneralHelper.trimSlash(props.context.pageContext.web.absoluteUrl)}/_layouts/15/userphoto.aspx?size=L&accountname={0}`;
 
         const users: IFieldUser[] = this.props.users ? this.props.users.map(user => {
diff --git a/src/controls/iFrameDialog/IFrameDialog.tsx b/src/controls/iFrameDialog/IFrameDialog.tsx
@@ -2,6 +2,7 @@ import * as React from "react";
 import * as ReactDOM from "react-dom";
 import { Dialog, IDialogProps } from 'office-ui-fabric-react';
 import IFrameDialogContent from './IFrameDialogContent';
+import * as appInsights from '../../common/appInsights';
 
 export interface IFrameDialogProps extends IDialogProps {
   /**
@@ -32,19 +33,21 @@ export default class IFrameDialog extends React.Component<IFrameDialogProps, IFr
 
   public constructor(props: IFrameDialogProps, state: IFrameDialogState) {
     super(props, state);
+
+    appInsights.track('IFrameDialog', {});
   }
 
   public render(): JSX.Element {
     return (
       <Dialog
         {...this.props}>
-        <IFrameDialogContent 
-          url={this.props.url} 
-          iframeOnLoad={this.props.iframeOnLoad} 
+        <IFrameDialogContent
+          url={this.props.url}
+          iframeOnLoad={this.props.iframeOnLoad}
           close={this.props.onDismiss}
           width={this.props.width}
           height={this.props.height} />
       </Dialog>);
 
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@pnp/spfx-controls-react",`
`3`	`3`	`"description": "Reusable React controls for SharePoint Framework solutions",`
`4`		`- "version": "1.2.0",`
	`4`	`+ "version": "1.2.1",`
`5`	`5`	`"engines": {`
`6`	`6`	`"node": ">=0.10.0"`
`7`	`7`	`},`