Merge branch 'dev'

estruyf · estruyf · commit 66f0362252e6 · 2021-06-28T08:34:16.000+02:00
diff --git a/CHANGELOG.JSON b/CHANGELOG.JSON
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "version": "3.2.1",
+      "changes": {
+        "new": [],
+        "enhancements": [],
+        "fixes": [
+          "`ListPicker`: `ListPicker` stopped working in upgrade from 3.1.0 to 3.2.0 [#945](https://github.com/pnp/sp-dev-fx-controls-react/issues/945)"
+        ]
+      }
+    },
+    {
+      "version": "3.3.0",
+      "changes": {
+        "new": [
+        ],
+        "enhancements": [
+          "`ListItemAttachments`: Add new label and description properties [#943](https://github.com/pnp/sp-dev-fx-controls-react/pull/943)"
+        ],
+        "fixes": [
+          "`ListItemAttachments`: Fixed multiple bugs [#943](https://github.com/pnp/sp-dev-fx-controls-react/pull/943)"
+        ]
+      },
+      "contributions": [
+      ]
+    },
     {
       "version": "3.2.0",
       "changes": {
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Releases
 
+## 3.2.1
+
+### Fixes
+
+- `ListPicker`: `ListPicker` stopped working in upgrade from 3.1.0 to 3.2.0 [#945](https://github.com/pnp/sp-dev-fx-controls-react/issues/945)
+
+## 3.3.0
+
+### Enhancements
+
+- `ListItemAttachments`: Add new label and description properties [#943](https://github.com/pnp/sp-dev-fx-controls-react/pull/943)
+
+### Fixes
+
+- `ListItemAttachments`: Fixed multiple bugs [#943](https://github.com/pnp/sp-dev-fx-controls-react/pull/943)
+
 ## 3.2.0
 
 ### New control(s)
diff --git a/docs/documentation/docs/about/release-notes.md b/docs/documentation/docs/about/release-notes.md
@@ -1,5 +1,21 @@
 # Releases
 
+## 3.2.1
+
+### Fixes
+
+- `ListPicker`: `ListPicker` stopped working in upgrade from 3.1.0 to 3.2.0 [#945](https://github.com/pnp/sp-dev-fx-controls-react/issues/945)
+
+## 3.3.0
+
+### Enhancements
+
+- `ListItemAttachments`: Add new label and description properties [#943](https://github.com/pnp/sp-dev-fx-controls-react/pull/943)
+
+### Fixes
+
+- `ListItemAttachments`: Fixed multiple bugs [#943](https://github.com/pnp/sp-dev-fx-controls-react/pull/943)
+
 ## 3.2.0
 
 ### New control(s)
diff --git a/docs/documentation/docs/controls/ListItemAttachments.md b/docs/documentation/docs/controls/ListItemAttachments.md
@@ -59,6 +59,8 @@ The `ListItemAttachments` control can be configured with the following propertie
 | itemId | number | no | 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. |
+| label | string | no | Main text to display on the placeholder, next to the icon. |
+| description | string | no | Description text to display on the placeholder, below the main text and icon. |
 | disabled | boolean | no | Specifies if the control is disabled or not. |
 | openAttachmentsInNewWindow | boolean | no | Specifies if the attachment should be openend in a separate browser tab. Use this property set to `true` if you plan to use the component in Microsoft Teams. |
 
diff --git a/package-lock.json b/package-lock.json
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": "3.2.0",
+  "version": "3.2.1",
   "scripts": {
     "build": "gulp build",
     "clean": "gulp clean",
diff --git a/src/common/telemetry/version.ts b/src/common/telemetry/version.ts
@@ -1 +1 @@
-export const version: string = "3.2.0";
+export const version: string = "3.2.1";
diff --git a/src/controls/listItemAttachments/IListItemAttachmentsProps.ts b/src/controls/listItemAttachments/IListItemAttachmentsProps.ts
@@ -8,4 +8,12 @@ export interface IListItemAttachmentsProps {
   disabled?: boolean;
   context: BaseComponentContext;
   openAttachmentsInNewWindow?: boolean; // JJ - 20200613 - needed to support Microsoft Teams
+  /**
+   * Main text to display on the placeholder, next to the icon
+   */
+  label?:string;
+  /**
+   * Description text to display on the placeholder, below the main text and icon
+   */
+  description?:string;
 }
diff --git a/src/controls/listItemAttachments/IUploadAttachmentState.ts b/src/controls/listItemAttachments/IUploadAttachmentState.ts
@@ -1,8 +1,7 @@
 
 export interface IUploadAttachmentState {
-      file: any;
       hideDialog: boolean;
       dialogMessage: string;
       isLoading: boolean;
-     
+
 }
diff --git a/src/controls/listItemAttachments/ListItemAttachments.tsx b/src/controls/listItemAttachments/ListItemAttachments.tsx
@@ -120,22 +120,22 @@ export class ListItemAttachments extends React.Component<IListItemAttachmentsPro
           dialogMessage: strings.ListItemAttachmentserrorLoadAttachments.replace('{0}', error.message)
         });
       });
-  }
-  else if(this.state.filesToUpload && this.state.filesToUpload.length > 0){
-    let files = this.state.filesToUpload.map(file=>({
-      FileName: file.name,
-      ServerRelativeUrl: undefined
-    }));
-    await this.loadAttachmentsPreview(files);
-  }
-  else{
-    this.setState({
-      fireUpload: false,
-      hideDialog: true,
-      dialogMessage: '',
-      showPlaceHolder: true
-    });
-  }
+    }
+    else if(this.state.filesToUpload && this.state.filesToUpload.length > 0){
+      let files = this.state.filesToUpload.map(file=>({
+        FileName: file.name,
+        ServerRelativeUrl: undefined
+      }));
+      await this.loadAttachmentsPreview(files);
+    }
+    else{
+      this.setState({
+        fireUpload: false,
+        hideDialog: true,
+        dialogMessage: '',
+        showPlaceHolder: true
+      });
+    }
   }
 
   /**
@@ -255,8 +255,8 @@ export class ListItemAttachments extends React.Component<IListItemAttachmentsPro
           this.state.showPlaceHolder ?
             <Placeholder
               iconName='Upload'
-              iconText={strings.ListItemAttachmentslPlaceHolderIconText}
-              description={strings.ListItemAttachmentslPlaceHolderDescription}
+              iconText={this.props.label || strings.ListItemAttachmentslPlaceHolderIconText}
+              description={this.props.description || strings.ListItemAttachmentslPlaceHolderDescription}
               buttonLabel={strings.ListItemAttachmentslPlaceHolderButtonLabel}
               hideButton={this.props.disabled}
               onConfigure={() => this.setState({ fireUpload: true })} />
@@ -304,7 +304,7 @@ export class ListItemAttachments extends React.Component<IListItemAttachmentsPro
                 </div>
               );
             })}
-        {
+        { !this.state.hideDialog &&
 
           <Dialog
             hidden={this.state.hideDialog}
diff --git a/src/controls/listItemAttachments/UploadAttachment.tsx b/src/controls/listItemAttachments/UploadAttachment.tsx
@@ -12,12 +12,12 @@ import styles from './ListItemAttachments.module.scss';
 export class UploadAttachment extends React.Component<IUploadAttachmentProps, IUploadAttachmentState> {
   private _spservice: SPservice;
   private fileInput;
+  private _isFileExplorerOpen = false;
 
   constructor(props: IUploadAttachmentProps) {
     super(props);
 
     this.state = {
-      file: null,
       hideDialog: true,
       dialogMessage: '',
       isLoading: false,
@@ -35,9 +35,10 @@ export class UploadAttachment extends React.Component<IUploadAttachmentProps, IU
    * @param prevState
    */
   public componentDidUpdate(prevProps: IUploadAttachmentProps, prevState: IUploadAttachmentState): void {
-    if (this.props.fireUpload) {
+    if (this.props.fireUpload && !this._isFileExplorerOpen) {
       this.fileInput.current.value = '';
       this.fileInput.current.click();
+      this._isFileExplorerOpen = true;
     }
   }
 
@@ -62,19 +63,16 @@ export class UploadAttachment extends React.Component<IUploadAttachmentProps, IU
     const file = e.target.files[0];
     return new Promise<void>((resolve,errorCallback)=>{
       reader.onloadend = async () => {
-        this.setState({
-          file: file
-        });
-  
+
         try {
           if(this.props.itemId && this.props.itemId > 0){
             await this._spservice.addAttachment(this.props.listId, this.props.itemId, file.name, file, this.props.webUrl);
           }
-  
+
+          this.props.onAttachmentUpload(file);
           this.setState({
             isLoading: false
           });
-          this.props.onAttachmentUpload(file);
           resolve();
         } catch (error) {
           this.setState({
@@ -84,10 +82,11 @@ export class UploadAttachment extends React.Component<IUploadAttachmentProps, IU
           });
           errorCallback(error);
         }
+        this._isFileExplorerOpen = false;
       };
       reader.readAsDataURL(file);
     });
-   
+
   }
 
   /**
diff --git a/src/services/SPService.ts b/src/services/SPService.ts
@@ -70,14 +70,16 @@ export default class SPService implements ISPService {
 
     const data = await this._context.spHttpClient.get(queryUrl, SPHttpClient.configurations.v1);
     if (data.ok) {
-      var result: ISPLists = await data.json();
-      var filteredLists = filter(result.value, (aList: ISPList) => {
-        return find(aList.ContentTypes, (ct) => {
-          return ct.Id.StringValue.toUpperCase().startsWith(options.contentTypeId.toUpperCase());
-        });
+      const result: ISPLists = await data.json();
+      if (options.contentTypeId) {
+        const filteredLists = filter(result.value, (aList: ISPList) => {
+          return find(aList.ContentTypes, (ct) => {
+            return ct.Id.StringValue.toUpperCase().startsWith(options.contentTypeId.toUpperCase());
+          });
 
-      });
-      result.value = filteredLists as ISPList[];
+        });
+        result.value = filteredLists as ISPList[];
+      }
       return result as ISPLists;
     } else {
       return null;

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": "3.2.0",`
	`4`	`+ "version": "3.2.1",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"build": "gulp build",`
`7`	`7`	`"clean": "gulp clean",`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export const version: string = "3.2.0";`
	`1`	`+export const version: string = "3.2.1";`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`
`2`	`2`	`export interface IUploadAttachmentState {`
`3`		`- file: any;`
`4`	`3`	`hideDialog: boolean;`
`5`	`4`	`dialogMessage: string;`
`6`	`5`	`isLoading: boolean;`
`7`		`-`
	`6`	`+`
`8`	`7`	`}`