From 12a9abeaea1c78ec062d0bb08fce9a2c83f9d04f Mon Sep 17 00:00:00 2001 From: IRRDC Date: Fri, 4 Aug 2023 11:44:54 +0200 Subject: [PATCH 01/14] Bugfix for issue 1568 Dynamic Form accessed TaxonomyFieldTypeMulti without considering sub-array "results". --- src/controls/dynamicForm/DynamicForm.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controls/dynamicForm/DynamicForm.tsx b/src/controls/dynamicForm/DynamicForm.tsx index 86a5a8b70..f93607bc6 100644 --- a/src/controls/dynamicForm/DynamicForm.tsx +++ b/src/controls/dynamicForm/DynamicForm.tsx @@ -580,8 +580,8 @@ export class DynamicForm extends React.Component< hiddenName = response.value; termSetId = field.TermSetId; anchorId = field.AnchorId; - if (item !== null) { - item[field.InternalName].forEach((element) => { + if (item !== null && item[field.InternalName] !== null && item[field.InternalName].results !== null) { + item[field.InternalName].results.forEach((element) => { selectedTags.push({ key: element.TermGuid, name: element.Label, From 22b97702d62811058d13c33edf45d4165139e214 Mon Sep 17 00:00:00 2001 From: Guido Date: Mon, 14 Aug 2023 14:48:32 +0200 Subject: [PATCH 02/14] Added file handling in DynamicForm --- .../dynamicForm/DynamicForm.module.scss | 5 + src/controls/dynamicForm/DynamicForm.tsx | 191 ++++++++++++++++-- src/controls/dynamicForm/IDynamicFormProps.ts | 11 + src/controls/dynamicForm/IDynamicFormState.ts | 8 +- src/loc/bg-bg.ts | 3 + src/loc/ca-es.ts | 3 + src/loc/da-dk.ts | 3 + src/loc/de-de.ts | 3 + src/loc/el-gr.ts | 3 + src/loc/en-us.ts | 3 + src/loc/es-es.ts | 3 + src/loc/et-ee.ts | 3 + src/loc/eu-es.ts | 3 + src/loc/fi-fi.ts | 3 + src/loc/fr-ca.ts | 3 + src/loc/fr-fr.ts | 3 + src/loc/it-it.ts | 3 + src/loc/ja-jp.ts | 3 + src/loc/lt-lt.ts | 3 + src/loc/lv-lv.ts | 3 + src/loc/mystrings.d.ts | 3 + src/loc/nb-no.ts | 3 + src/loc/nl-nl.ts | 3 + src/loc/pl-pl.ts | 3 + src/loc/pt-br.ts | 3 + src/loc/pt-pt.ts | 3 + src/loc/ro-ro.ts | 3 + src/loc/ru-ru.ts | 3 + src/loc/sk-sk.ts | 3 + src/loc/sr-latn-rs.ts | 3 + src/loc/sv-se.ts | 3 + src/loc/tr-tr.ts | 3 + src/loc/vi-vn.ts | 3 + src/loc/zh-cn.ts | 3 + src/loc/zh-tw.ts | 3 + 35 files changed, 286 insertions(+), 22 deletions(-) diff --git a/src/controls/dynamicForm/DynamicForm.module.scss b/src/controls/dynamicForm/DynamicForm.module.scss index 8acbbed6b..51b1a4df7 100644 --- a/src/controls/dynamicForm/DynamicForm.module.scss +++ b/src/controls/dynamicForm/DynamicForm.module.scss @@ -147,3 +147,8 @@ } } } + +.selectedFileContainer { + display: flex; + margin: 10px 0px; +} diff --git a/src/controls/dynamicForm/DynamicForm.tsx b/src/controls/dynamicForm/DynamicForm.tsx index 86a5a8b70..81041ce55 100644 --- a/src/controls/dynamicForm/DynamicForm.tsx +++ b/src/controls/dynamicForm/DynamicForm.tsx @@ -12,7 +12,7 @@ import { IStackTokens, Stack } from "office-ui-fabric-react/lib/Stack"; import * as React from "react"; import { IUploadImageResult } from "../../common/SPEntities"; import SPservice from "../../services/SPService"; -import { IFilePickerResult } from "../filePicker"; +import { FilePicker, IFilePickerResult } from "../filePicker"; import { DynamicField } from "./dynamicField"; import { DateFormat, @@ -27,6 +27,7 @@ import { DialogFooter, DialogType, } from "office-ui-fabric-react/lib/Dialog"; +import { Icon } from 'office-ui-fabric-react'; import "@pnp/sp/lists"; import "@pnp/sp/content-types"; @@ -109,6 +110,7 @@ export class DynamicForm extends React.Component< ) : (
+ {this.props.enableFileSelection === true && this.renderFileSelectionControl()} {fieldCollection.map((v, i) => { if ( fieldOverrides && @@ -182,6 +184,9 @@ export class DynamicForm extends React.Component< onSubmitted, onBeforeSubmit, onSubmitError, + enableFileSelection, + validationErrorDialogProps, + returnListItemInstanceOnSubmit } = this.props; try { @@ -213,11 +218,22 @@ export class DynamicForm extends React.Component< } } }); + if (shouldBeReturnBack) { this.setState({ fieldCollection: fields, isValidationErrorDialogOpen: - this.props.validationErrorDialogProps + validationErrorDialogProps + ?.showDialogOnValidationError === true, + }); + return; + } + + if (enableFileSelection === true && this.state.selectedFile === undefined) { + this.setState({ + missingSelectedFile: true, + isValidationErrorDialogOpen: + validationErrorDialogProps ?.showDialogOnValidationError === true, }); return; @@ -316,7 +332,7 @@ export class DynamicForm extends React.Component< if (onSubmitted) { onSubmitted( iur.data, - this.props.returnListItemInstanceOnSubmit !== false + returnListItemInstanceOnSubmit !== false ? iur.item : undefined ); @@ -334,22 +350,27 @@ export class DynamicForm extends React.Component< contentTypeId === "" || !contentTypeId.startsWith("0x0120") ) { - // We are adding a new list item - try { - const iar = await sp.web.lists.getById(listId).items.add(objects); - if (onSubmitted) { - onSubmitted( - iar.data, - this.props.returnListItemInstanceOnSubmit !== false - ? iar.item - : undefined - ); - } - } catch (error) { - if (onSubmitError) { - onSubmitError(objects, error); + if (contentTypeId === undefined || enableFileSelection === true) { + await this.addFileToLibrary(objects); + } + else { + // We are adding a new list item + try { + const iar = await sp.web.lists.getById(listId).items.add(objects); + if (onSubmitted) { + onSubmitted( + iar.data, + returnListItemInstanceOnSubmit !== false + ? iar.item + : undefined + ); + } + } catch (error) { + if (onSubmitError) { + onSubmitError(objects, error); + } + console.log("Error", error); } - console.log("Error", error); } } else if (contentTypeId.startsWith("0x0120")) { // We are adding a folder or a Document Set @@ -397,6 +418,9 @@ export class DynamicForm extends React.Component< } console.log("Error", error); } + } else if (contentTypeId.startsWith("0x01") && enableFileSelection === true) { + // We are adding a folder or a Document Set + await this.addFileToLibrary(objects); } this.setState({ @@ -411,6 +435,66 @@ export class DynamicForm extends React.Component< } }; + private addFileToLibrary = async (objects: {}) => { + const { + selectedFile + } = this.state; + + const { + listId, + listItemId, + contentTypeId, + onSubmitted, + onBeforeSubmit, + onSubmitError, + returnListItemInstanceOnSubmit + } = this.props; + + try { + const idField = "ID"; + const contentTypeIdField = "ContentTypeId"; + + const library = await sp.web.lists.getById(listId); + const itemTitle = + selectedFile !== undefined && selectedFile.fileName !== undefined && selectedFile.fileName !== "" + ? (selectedFile.fileName as string).replace( + /["|*|:|<|>|?|/|\\||]/g, + "_" + ) // Replace not allowed chars in folder name + : ""; // Empty string will be replaced by SPO with Folder Item ID + + const fileCreatedResult = await library.rootFolder.files.add(itemTitle, selectedFile.downloadFileContent(), true); + const fields = await fileCreatedResult.file.listItemAllFields(); + + if (fields[idField]) { + // Read the ID of the just created folder or Document Set + const folderId = fields[idField]; + + // Set the content type ID for the target item + objects[contentTypeIdField] = contentTypeId; + // Update the just created folder or Document Set + const iur = await library.items.getById(folderId).update(objects); + if (onSubmitted) { + onSubmitted( + iur.data, + returnListItemInstanceOnSubmit !== false + ? iur.item + : undefined + ); + } + } else { + throw new Error( + "Unable to read the ID of the just created folder or Document Set" + ); + } + } catch (error) { + if (onSubmitError) { + onSubmitError(objects, error); + } + console.log("Error", error); + } + } + // trigger when the user change any value in the form private onChange = async ( internalName: string, @@ -840,4 +924,75 @@ export class DynamicForm extends React.Component< return errorMessage; }; + + private renderFileSelectionControl = (): React.ReactElement => { + const { + selectedFile, + missingSelectedFile + } = this.state; + + const labelEl = ; + + return
+
+ + {labelEl} +
+ { + if (filePickerResult.length === 1) { + this.setState({ + selectedFile: filePickerResult[0], + missingSelectedFile: false + }); + } + else { + this.setState({ + missingSelectedFile: true + }); + } + }} + required={true} + context={this.props.context} + hideWebSearchTab={true} + hideStockImages={true} + hideLocalMultipleUploadTab={true} + hideLinkUploadTab={true} + hideSiteFilesTab={true} + checkIfFileExists={true} + /> + {selectedFile &&
+ + {selectedFile.fileName} +
} + {missingSelectedFile === true && +
{strings.DynamicFormRequiredFileMessage}
} +
; + } + + private getFileIconFromExtension = (): string => { + const fileExtension = this.state.selectedFile.fileName.split('.').pop(); + switch (fileExtension) { + case 'pdf': + return 'PDF'; + case 'docx': + case 'doc': + return 'WordDocument'; + case 'pptx': + case 'ppt': + return 'PowerPointDocument'; + case 'xlsx': + case 'xls': + return 'ExcelDocument'; + case 'jpg': + case 'jpeg': + case 'png': + case 'gif': + return 'FileImage'; + default: + return 'Document'; + } + } } diff --git a/src/controls/dynamicForm/IDynamicFormProps.ts b/src/controls/dynamicForm/IDynamicFormProps.ts index f62e44196..2b0bdaf94 100644 --- a/src/controls/dynamicForm/IDynamicFormProps.ts +++ b/src/controls/dynamicForm/IDynamicFormProps.ts @@ -82,4 +82,15 @@ export interface IDynamicFormProps { * Specify validation error dialog properties */ validationErrorDialogProps?: IValidationErrorDialogProps; + + /** + * Specify if the form should support the creation of a new list item with a file. Default - false + */ + enableFileSelection?: boolean; + + /** + * Specify the supported file extensions for the file picker. Default - "docx", "doc", "pptx", "ppt", "xlsx", "xls", "pdf" + * Only used when enableFileSelection is true + */ + supportedFileExtensions?: string[]; } diff --git a/src/controls/dynamicForm/IDynamicFormState.ts b/src/controls/dynamicForm/IDynamicFormState.ts index b182c3caa..d86477259 100644 --- a/src/controls/dynamicForm/IDynamicFormState.ts +++ b/src/controls/dynamicForm/IDynamicFormState.ts @@ -1,11 +1,11 @@ - import { IDynamicFieldProps } from './dynamicField/IDynamicFieldProps'; +import { IFilePickerResult } from "../filePicker"; + export interface IDynamicFormState { fieldCollection: IDynamicFieldProps[]; isSaving?: boolean; etag?: string; isValidationErrorDialogOpen: boolean; + selectedFile?: IFilePickerResult; + missingSelectedFile?: boolean; } - - - diff --git a/src/loc/bg-bg.ts b/src/loc/bg-bg.ts index 657246024..d0bdc6223 100644 --- a/src/loc/bg-bg.ts +++ b/src/loc/bg-bg.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "Стойността трябва да е по-голяма от {0}", "DynamicFormNumberValueMustBeBetween": "Стойността трябва да е между {0} и {1}", "DynamicFormNumberValueMustBeLowerThan": "Стойността трябва да е по-ниска от {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Използвайте това местоположение:", "ListItemCommentDIalogDeleteSubText": "Наистина ли искате да изтриете този коментар?", "ListItemCommentsDialogDeleteTitle": "Потвърдете Изтриване на коментар", diff --git a/src/loc/ca-es.ts b/src/loc/ca-es.ts index 556f0370f..5645ba1ed 100644 --- a/src/loc/ca-es.ts +++ b/src/loc/ca-es.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "El valor ha de ser superior a {0}", "DynamicFormNumberValueMustBeBetween": "El valor ha d'estar entre {0} i {1}", "DynamicFormNumberValueMustBeLowerThan": "El valor ha de ser inferior a {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Utilitzeu aquesta ubicació:", "ListItemCommentDIalogDeleteSubText": "Esteu segur que voleu suprimir aquest comentari?", "ListItemCommentsDialogDeleteTitle": "Confirmació de la supressió del comentari", diff --git a/src/loc/da-dk.ts b/src/loc/da-dk.ts index 85077d2e1..f47d1c6ea 100644 --- a/src/loc/da-dk.ts +++ b/src/loc/da-dk.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "Værdien skal være større end {0}", "DynamicFormNumberValueMustBeBetween": "Værdien skal være mellem {0} og {1}", "DynamicFormNumberValueMustBeLowerThan": "Værdien skal være lavere end {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Brug denne placering:", "ListItemCommentDIalogDeleteSubText": "Er du sikker på, at du vil slette denne kommentar?", "ListItemCommentsDialogDeleteTitle": "Bekræft kommentar til sletning", diff --git a/src/loc/de-de.ts b/src/loc/de-de.ts index e4cadb1ed..9cc0e640a 100644 --- a/src/loc/de-de.ts +++ b/src/loc/de-de.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "Der Wert muss größer als {0} sein.", "DynamicFormNumberValueMustBeBetween": "Der Wert muss zwischen {0} und {1} liegen.", "DynamicFormNumberValueMustBeLowerThan": "Der Wert muss niedriger als {0} sein.", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Verwenden Sie diesen Speicherort:", "ListItemCommentDIalogDeleteSubText": "Sind Sie sicher, dass Sie diesen Kommentar löschen möchten?", "ListItemCommentsDialogDeleteTitle": "Kommentar löschen bestätigen", diff --git a/src/loc/el-gr.ts b/src/loc/el-gr.ts index 5768b6d9a..e2602a0c5 100644 --- a/src/loc/el-gr.ts +++ b/src/loc/el-gr.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "Η τιμή πρέπει να είναι μεγαλύτερη από {0}", "DynamicFormNumberValueMustBeBetween": "Η τιμή πρέπει να είναι μεταξύ {0} και {1}", "DynamicFormNumberValueMustBeLowerThan": "Η τιμή πρέπει να είναι μικρότερη από {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Χρησιμοποιήστε αυτήν τη θέση:", "ListItemCommentDIalogDeleteSubText": "Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το σχόλιο;", "ListItemCommentsDialogDeleteTitle": "Επιβεβαίωση διαγραφής σχολίου", diff --git a/src/loc/en-us.ts b/src/loc/en-us.ts index daeea6c12..1bb5072d8 100644 --- a/src/loc/en-us.ts +++ b/src/loc/en-us.ts @@ -387,6 +387,9 @@ define([], () => { DynamicFormNumberValueMustBeGreaterThan: "Value must be greater than {0}", DynamicFormNumberValueMustBeBetween: "Value must be between {0} and {1}", DynamicFormNumberValueMustBeLowerThan: "Value must be lower than {0}", + DynamicFormChooseFileLabel: "File", + DynamicFormChooseFileButtonText: "Select file", + DynamicFormRequiredFileMessage: "File is required.", customDisplayName: "Use this location:", ListItemCommentDIalogDeleteSubText: "Are you sure that you want to delete this comment?", ListItemCommentsDialogDeleteTitle: "Confirm Delete Comment", diff --git a/src/loc/es-es.ts b/src/loc/es-es.ts index 202970148..5eb162460 100644 --- a/src/loc/es-es.ts +++ b/src/loc/es-es.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "El valor debe ser mayor que {0}", "DynamicFormNumberValueMustBeBetween": "El valor debe estar entre {0} y {1}", "DynamicFormNumberValueMustBeLowerThan": "El valor debe ser inferior a {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Utilice esta ubicación:", "ListItemCommentDIalogDeleteSubText": "¿Está seguro de que desea eliminar este comentario?", "ListItemCommentsDialogDeleteTitle": "Confirmar comentario de eliminación", diff --git a/src/loc/et-ee.ts b/src/loc/et-ee.ts index 050d7fa9e..3e405310a 100644 --- a/src/loc/et-ee.ts +++ b/src/loc/et-ee.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "Väärtus peab olema suurem kui {0}", "DynamicFormNumberValueMustBeBetween": "Väärtus peab olema vahemikus {0} kuni {1}", "DynamicFormNumberValueMustBeLowerThan": "Väärtus peab olema väiksem kui {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Kasuta seda asukohta:", "ListItemCommentDIalogDeleteSubText": "Kas soovite kindlasti selle kommentaari kustutada?", "ListItemCommentsDialogDeleteTitle": "Kommentaari kustutamise kinnitamine", diff --git a/src/loc/eu-es.ts b/src/loc/eu-es.ts index fc6b030c8..d39f064b3 100644 --- a/src/loc/eu-es.ts +++ b/src/loc/eu-es.ts @@ -385,5 +385,8 @@ TermSetNavigationNoTerms: "No terms defined", "DynamicFormNumberValueMustBeGreaterThan": "Balioak {0} baino handiagoa izan behar du", "DynamicFormNumberValueMustBeBetween": "Balioak {0} eta {1} artean egon behar du", "DynamicFormNumberValueMustBeLowerThan": "Balioak {0} baino txikiagoa izan behar du", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", }; }); diff --git a/src/loc/fi-fi.ts b/src/loc/fi-fi.ts index daa8b4838..18fc8e38a 100644 --- a/src/loc/fi-fi.ts +++ b/src/loc/fi-fi.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "Arvon on oltava suurempi kuin {0}", "DynamicFormNumberValueMustBeBetween": "Tämän kentän arvon on oltava välillä {0} - {1}", "DynamicFormNumberValueMustBeLowerThan": "Arvon on oltava pienempi kuin {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Käytä tätä sijaintia:", "ListItemCommentDIalogDeleteSubText": "Haluatko varmasti poistaa tämän kommentin?", "ListItemCommentsDialogDeleteTitle": "Vahvista poista kommentti", diff --git a/src/loc/fr-ca.ts b/src/loc/fr-ca.ts index ce6cd7273..17e543318 100644 --- a/src/loc/fr-ca.ts +++ b/src/loc/fr-ca.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "La valeur doit être supérieure à {0}", "DynamicFormNumberValueMustBeBetween": "La valeur doit être comprise entre {0} et {1}", "DynamicFormNumberValueMustBeLowerThan": "La valeur doit être inférieure à {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Utilisez cet emplacement :", "ListItemCommentDIalogDeleteSubText": "Êtes-vous sûr de vouloir supprimer ce commentaire?", "ListItemCommentsDialogDeleteTitle": "Confirmer supprimer le commentaire", diff --git a/src/loc/fr-fr.ts b/src/loc/fr-fr.ts index 96b761670..0002353d9 100644 --- a/src/loc/fr-fr.ts +++ b/src/loc/fr-fr.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "La valeur doit être supérieure à {0}", "DynamicFormNumberValueMustBeBetween": "La valeur doit être comprise entre {0} et {1}", "DynamicFormNumberValueMustBeLowerThan": "La valeur doit être inférieure à {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Utilisez cet emplacement :", "ListItemCommentDIalogDeleteSubText": "Êtes-vous sûr de vouloir supprimer ce commentaire ?", "ListItemCommentsDialogDeleteTitle": "Confirmer la suppression du commentaire", diff --git a/src/loc/it-it.ts b/src/loc/it-it.ts index 17e8e53a5..39d159563 100644 --- a/src/loc/it-it.ts +++ b/src/loc/it-it.ts @@ -367,6 +367,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "Il valore inserito deve essere maggiore di {0}", "DynamicFormNumberValueMustBeBetween": "Il valore inserito deve essere compreso tra {0} e {1}", "DynamicFormNumberValueMustBeLowerThan": "Il valore inserito deve essere minore di {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Seleziona file", + "DynamicFormRequiredFileMessage": "Il file è obbligatorio.", "customDisplayName": "Utilizzare questa posizione:", "ListItemCommentDIalogDeleteSubText": "Eliminare questo commento?", "ListItemCommentsDialogDeleteTitle": "Conferma eliminazione commento", diff --git a/src/loc/ja-jp.ts b/src/loc/ja-jp.ts index c3f91d841..9aa425cbe 100644 --- a/src/loc/ja-jp.ts +++ b/src/loc/ja-jp.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "値は {0} より大きくなければなりません", "DynamicFormNumberValueMustBeBetween": "値は {0} から {1} の間である必要があります", "DynamicFormNumberValueMustBeLowerThan": "値は {0} より小さい必要があります", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "この場所を使用します。", "ListItemCommentDIalogDeleteSubText": "このコメントを削除しますか?", "ListItemCommentsDialogDeleteTitle": "コメントの削除の確認", diff --git a/src/loc/lt-lt.ts b/src/loc/lt-lt.ts index 30dd26c20..8babf88be 100644 --- a/src/loc/lt-lt.ts +++ b/src/loc/lt-lt.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "Reikšmė turi būti didesnė nei {0}", "DynamicFormNumberValueMustBeBetween": "Reikšmė turi būti nuo {0} iki {1}", "DynamicFormNumberValueMustBeLowerThan": "Vertė turi būti mažesnė nei {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Naudokite šią vietą:", "ListItemCommentDIalogDeleteSubText": "Ar tikrai norite panaikinti šį komentarą?", "ListItemCommentsDialogDeleteTitle": "Patvirtinti naikinimo komentarą", diff --git a/src/loc/lv-lv.ts b/src/loc/lv-lv.ts index 99f814d7a..ad05dd058 100644 --- a/src/loc/lv-lv.ts +++ b/src/loc/lv-lv.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "Vērtībai ir jābūt lielākai par {0}", "DynamicFormNumberValueMustBeBetween": "Vērtībai ir jābūt no {0} līdz {1}", "DynamicFormNumberValueMustBeLowerThan": "Vērtībai ir jābūt mazākai par {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Izmantojiet šo atrašanās vietu:", "ListItemCommentDIalogDeleteSubText": "Vai tiešām vēlaties dzēst šo komentāru?", "ListItemCommentsDialogDeleteTitle": "Apstiprināt dzēst komentāru", diff --git a/src/loc/mystrings.d.ts b/src/loc/mystrings.d.ts index c390bd064..a74034efc 100644 --- a/src/loc/mystrings.d.ts +++ b/src/loc/mystrings.d.ts @@ -371,6 +371,9 @@ declare interface IControlStrings { DynamicFormNumberValueMustBeGreaterThan: string; DynamicFormNumberValueMustBeBetween: string; DynamicFormNumberValueMustBeLowerThan: string; + DynamicFormChooseFileLabel: string; + DynamicFormChooseFileButtonText: string; + DynamicFormRequiredFileMessage: string; // Location picker customDisplayName: string; diff --git a/src/loc/nb-no.ts b/src/loc/nb-no.ts index 87fcb47a3..3c9d7d8c1 100644 --- a/src/loc/nb-no.ts +++ b/src/loc/nb-no.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "Verdien må være større enn {0}", "DynamicFormNumberValueMustBeBetween": "Verdien må være mellom {0} og {1}", "DynamicFormNumberValueMustBeLowerThan": "Verdien må være lavere enn {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Bruk denne plasseringen:", "ListItemCommentDIalogDeleteSubText": "Er du sikker på at du vil slette denne kommentaren?", "ListItemCommentsDialogDeleteTitle": "Bekreft sletting av kommentar", diff --git a/src/loc/nl-nl.ts b/src/loc/nl-nl.ts index d45a67361..a7e7404dd 100644 --- a/src/loc/nl-nl.ts +++ b/src/loc/nl-nl.ts @@ -367,6 +367,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "Waarde moet groter zijn dan {0}", "DynamicFormNumberValueMustBeBetween": "Waarde moet tussen {0} en {1} liggen", "DynamicFormNumberValueMustBeLowerThan": "Waarde moet lager zijn dan {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Gebruik deze locatie:", "ListItemCommentDIalogDeleteSubText": "Weet u zeker dat u deze opmerking wilt verwijderen?", "ListItemCommentsDialogDeleteTitle": "Opmerking verwijderen bevestigen", diff --git a/src/loc/pl-pl.ts b/src/loc/pl-pl.ts index 1b9e49f79..56a9abb94 100644 --- a/src/loc/pl-pl.ts +++ b/src/loc/pl-pl.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "Wartość musi być większa niż {0}", "DynamicFormNumberValueMustBeBetween": "Wartość musi mieścić się w przedziale od {0} do {1}", "DynamicFormNumberValueMustBeLowerThan": "Wartość musi być mniejsza niż {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Użyj tej lokalizacji:", "ListItemCommentDIalogDeleteSubText": "Czy na pewno chcesz usunąć ten komentarz?", "ListItemCommentsDialogDeleteTitle": "Potwierdź Usuń komentarz", diff --git a/src/loc/pt-br.ts b/src/loc/pt-br.ts index d92259aa1..f828f6ec0 100644 --- a/src/loc/pt-br.ts +++ b/src/loc/pt-br.ts @@ -367,6 +367,9 @@ define([], () => { DynamicFormNumberValueMustBeGreaterThan: "O valor deve ser maior que {0}", DynamicFormNumberValueMustBeBetween: "O valor deve estar entre {0} e {1}", DynamicFormNumberValueMustBeLowerThan: "O valor deve ser inferior a {0}", + DynamicFormChooseFileLabel: "File", + DynamicFormChooseFileButtonText: "Select file", + DynamicFormRequiredFileMessage: "File is required.", customDisplayName: "Utilize este local:", ListItemCommentDIalogDeleteSubText: "Tem a certeza que quer eliminar este comentário?", ListItemCommentsDialogDeleteTitle: "Confirmar Eliminar Comentário", diff --git a/src/loc/pt-pt.ts b/src/loc/pt-pt.ts index f924ce8f7..d6a5f174a 100644 --- a/src/loc/pt-pt.ts +++ b/src/loc/pt-pt.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "O valor deve ser maior que {0}", "DynamicFormNumberValueMustBeBetween": "O valor deve estar entre {0} e {1}", "DynamicFormNumberValueMustBeLowerThan": "O valor deve ser inferior a {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Utilize este local:", "ListItemCommentDIalogDeleteSubText": "Tem a certeza que quer eliminar este comentário?", "ListItemCommentsDialogDeleteTitle": "Confirmar Eliminar Comentário", diff --git a/src/loc/ro-ro.ts b/src/loc/ro-ro.ts index 9ff7cbb43..dba0e7718 100644 --- a/src/loc/ro-ro.ts +++ b/src/loc/ro-ro.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "Valoarea trebuie să fie mai mare decât {0}", "DynamicFormNumberValueMustBeBetween": "Valoarea trebuie să fie între {0} și {1}", "DynamicFormNumberValueMustBeLowerThan": "Valoarea trebuie să fie mai mică decât {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Utilizați această locație:", "ListItemCommentDIalogDeleteSubText": "Sunteți sigur că doriți să ștergeți acest comentariu?", "ListItemCommentsDialogDeleteTitle": "Confirmați ștergerea comentariului", diff --git a/src/loc/ru-ru.ts b/src/loc/ru-ru.ts index 3bf9a69c7..621817b45 100644 --- a/src/loc/ru-ru.ts +++ b/src/loc/ru-ru.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "Значение должно быть больше {0}", "DynamicFormNumberValueMustBeBetween": "Значение должно быть между {0} и {1}.", "DynamicFormNumberValueMustBeLowerThan": "Значение должно быть меньше {0}.", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Используйте это расположение:", "ListItemCommentDIalogDeleteSubText": "Вы уверены, что хотите удалить этот комментарий?", "ListItemCommentsDialogDeleteTitle": "Подтвердить удаление комментария", diff --git a/src/loc/sk-sk.ts b/src/loc/sk-sk.ts index 7d63fad4c..ca1f71afe 100644 --- a/src/loc/sk-sk.ts +++ b/src/loc/sk-sk.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "Hodnota musí byť väčšia ako {0}", "DynamicFormNumberValueMustBeBetween": "Hodnota musí byť medzi {0} a {1}", "DynamicFormNumberValueMustBeLowerThan": "Hodnota musí byť nižšia ako {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Použite toto umiestnenie:", "ListItemCommentDIalogDeleteSubText": "Naozaj chcete odstrániť tento komentár?", "ListItemCommentsDialogDeleteTitle": "Potvrdiť odstránenie komentára", diff --git a/src/loc/sr-latn-rs.ts b/src/loc/sr-latn-rs.ts index 5c08bc58c..9498dc9f3 100644 --- a/src/loc/sr-latn-rs.ts +++ b/src/loc/sr-latn-rs.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "Vrednost mora da bude veća od {0}", "DynamicFormNumberValueMustBeBetween": "Vrednost mora da bude između {0} i {1}", "DynamicFormNumberValueMustBeLowerThan": "Vrednost mora biti manja od {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Koristi ovu lokaciju:", "ListItemCommentDIalogDeleteSubText": "Želite li zaista da izbrišete ovaj komentar?", "ListItemCommentsDialogDeleteTitle": "Potvrda brisanja komentara", diff --git a/src/loc/sv-se.ts b/src/loc/sv-se.ts index 9b86d84d6..c6fa28d5f 100644 --- a/src/loc/sv-se.ts +++ b/src/loc/sv-se.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "Värdet måste vara större än {0}", "DynamicFormNumberValueMustBeBetween": "Värdet måste vara mellan {0} och {1}", "DynamicFormNumberValueMustBeLowerThan": "Värdet måste vara lägre än {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Använd den här platsen:", "ListItemCommentDIalogDeleteSubText": "Vill du ta bort den här kommentaren?", "ListItemCommentsDialogDeleteTitle": "Bekräfta ta bort kommentar", diff --git a/src/loc/tr-tr.ts b/src/loc/tr-tr.ts index bf40a39ba..b833ce806 100644 --- a/src/loc/tr-tr.ts +++ b/src/loc/tr-tr.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "Değer, {0} değerinden büyük olmalıdır", "DynamicFormNumberValueMustBeBetween": "Değer, {0} ile {1} arasında olmalıdır", "DynamicFormNumberValueMustBeLowerThan": "Değer, {0} değerinden düşük olmalıdır", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Bu konumu kullan:", "ListItemCommentDIalogDeleteSubText": "Bu yorumu silmek istediğinizden emin misiniz?", "ListItemCommentsDialogDeleteTitle": "Açıklamayı Sil'i Onayla", diff --git a/src/loc/vi-vn.ts b/src/loc/vi-vn.ts index 2e0688ca7..64faf4a3a 100644 --- a/src/loc/vi-vn.ts +++ b/src/loc/vi-vn.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "Giá trị phải lớn hơn {0}", "DynamicFormNumberValueMustBeBetween": "Giá trị phải nằm trong khoảng từ {0} đến {1}", "DynamicFormNumberValueMustBeLowerThan": "Giá trị phải thấp hơn {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "Sử dụng vị trí này:", "ListItemCommentDIalogDeleteSubText": "Bạn có chắc chắn rằng bạn muốn xóa bình luận này không?", "ListItemCommentsDialogDeleteTitle": "Xác nhận Xóa Chú thích", diff --git a/src/loc/zh-cn.ts b/src/loc/zh-cn.ts index 5d8a3c4ad..169c1c190 100644 --- a/src/loc/zh-cn.ts +++ b/src/loc/zh-cn.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "值必须大于 {0}", "DynamicFormNumberValueMustBeBetween": "值必须介于 {0} 和 {1} 之间", "DynamicFormNumberValueMustBeLowerThan": "值必须小于 {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "使用此位置：", "ListItemCommentDIalogDeleteSubText": "您确定要删除此评论吗？", "ListItemCommentsDialogDeleteTitle": "确认删除注释", diff --git a/src/loc/zh-tw.ts b/src/loc/zh-tw.ts index 9d10f883c..ae293ea60 100644 --- a/src/loc/zh-tw.ts +++ b/src/loc/zh-tw.ts @@ -369,6 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "值必須大於 {0}", "DynamicFormNumberValueMustBeBetween": "值必須介於 {0} 和 {1} 之間", "DynamicFormNumberValueMustBeLowerThan": "值必須小於 {0}", + "DynamicFormChooseFileLabel": "File", + "DynamicFormChooseFileButtonText": "Select file", + "DynamicFormRequiredFileMessage": "File is required.", "customDisplayName": "使用此位置：", "ListItemCommentDIalogDeleteSubText": "您確定要刪除此評論嗎？", "ListItemCommentsDialogDeleteTitle": "確認刪除註釋", From fc48461e7dfacac82d47c9997e8f97c5b5252e00 Mon Sep 17 00:00:00 2001 From: Guido Date: Mon, 14 Aug 2023 16:06:44 +0200 Subject: [PATCH 03/14] Updated pt-pt localization --- src/loc/pt-pt.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/loc/pt-pt.ts b/src/loc/pt-pt.ts index d6a5f174a..f8730f87d 100644 --- a/src/loc/pt-pt.ts +++ b/src/loc/pt-pt.ts @@ -369,9 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "O valor deve ser maior que {0}", "DynamicFormNumberValueMustBeBetween": "O valor deve estar entre {0} e {1}", "DynamicFormNumberValueMustBeLowerThan": "O valor deve ser inferior a {0}", - "DynamicFormChooseFileLabel": "File", - "DynamicFormChooseFileButtonText": "Select file", - "DynamicFormRequiredFileMessage": "File is required.", + "DynamicFormChooseFileLabel": "Ficheiro", + "DynamicFormChooseFileButtonText": "Selecionar ficheiro", + "DynamicFormRequiredFileMessage": "Ficheiro é necessário.", "customDisplayName": "Utilize este local:", "ListItemCommentDIalogDeleteSubText": "Tem a certeza que quer eliminar este comentário?", "ListItemCommentsDialogDeleteTitle": "Confirmar Eliminar Comentário", From ad27c5ce9289762ad03fd0d9c8a3f5448c23ceaf Mon Sep 17 00:00:00 2001 From: Guido Date: Fri, 18 Aug 2023 10:28:17 +0200 Subject: [PATCH 04/14] Changed file upload --- src/controls/dynamicForm/DynamicForm.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controls/dynamicForm/DynamicForm.tsx b/src/controls/dynamicForm/DynamicForm.tsx index 81041ce55..617fe8206 100644 --- a/src/controls/dynamicForm/DynamicForm.tsx +++ b/src/controls/dynamicForm/DynamicForm.tsx @@ -463,7 +463,7 @@ export class DynamicForm extends React.Component< ) // Replace not allowed chars in folder name : ""; // Empty string will be replaced by SPO with Folder Item ID - const fileCreatedResult = await library.rootFolder.files.add(itemTitle, selectedFile.downloadFileContent(), true); + const fileCreatedResult = await library.rootFolder.files.addChunked(encodeURI(itemTitle), await selectedFile.downloadFileContent()); const fields = await fileCreatedResult.file.listItemAllFields(); if (fields[idField]) { From b5425b445f70660f08884329df0954f299f1d0ba Mon Sep 17 00:00:00 2001 From: Guido Date: Fri, 18 Aug 2023 15:49:21 +0200 Subject: [PATCH 05/14] Removed file selection in edit mode --- src/controls/dynamicForm/DynamicForm.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/controls/dynamicForm/DynamicForm.tsx b/src/controls/dynamicForm/DynamicForm.tsx index 617fe8206..5484728ee 100644 --- a/src/controls/dynamicForm/DynamicForm.tsx +++ b/src/controls/dynamicForm/DynamicForm.tsx @@ -110,7 +110,9 @@ export class DynamicForm extends React.Component<
) : (
- {this.props.enableFileSelection === true && this.renderFileSelectionControl()} + {this.props.enableFileSelection === true && + this.props.listItemId === undefined && + this.renderFileSelectionControl()} {fieldCollection.map((v, i) => { if ( fieldOverrides && From 1d650a5413b50fa221fbc9d6cf731134b3087c7f Mon Sep 17 00:00:00 2001 From: guidozam Date: Tue, 26 Sep 2023 22:45:01 +0200 Subject: [PATCH 06/14] Updated loc files and removed unused props --- src/controls/dynamicForm/DynamicForm.tsx | 4 +--- src/loc/fr-ca.ts | 6 +++--- src/loc/fr-fr.ts | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/controls/dynamicForm/DynamicForm.tsx b/src/controls/dynamicForm/DynamicForm.tsx index 5484728ee..175f7c9f4 100644 --- a/src/controls/dynamicForm/DynamicForm.tsx +++ b/src/controls/dynamicForm/DynamicForm.tsx @@ -437,17 +437,15 @@ export class DynamicForm extends React.Component< } }; - private addFileToLibrary = async (objects: {}) => { + private addFileToLibrary = async (objects: {}): Promise => { const { selectedFile } = this.state; const { listId, - listItemId, contentTypeId, onSubmitted, - onBeforeSubmit, onSubmitError, returnListItemInstanceOnSubmit } = this.props; diff --git a/src/loc/fr-ca.ts b/src/loc/fr-ca.ts index 17e543318..8b8103023 100644 --- a/src/loc/fr-ca.ts +++ b/src/loc/fr-ca.ts @@ -369,9 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "La valeur doit être supérieure à {0}", "DynamicFormNumberValueMustBeBetween": "La valeur doit être comprise entre {0} et {1}", "DynamicFormNumberValueMustBeLowerThan": "La valeur doit être inférieure à {0}", - "DynamicFormChooseFileLabel": "File", - "DynamicFormChooseFileButtonText": "Select file", - "DynamicFormRequiredFileMessage": "File is required.", + "DynamicFormChooseFileLabel": "Fichier", + "DynamicFormChooseFileButtonText": "Sélectionnez un fichier", + "DynamicFormRequiredFileMessage": "Un fichier est requis.", "customDisplayName": "Utilisez cet emplacement :", "ListItemCommentDIalogDeleteSubText": "Êtes-vous sûr de vouloir supprimer ce commentaire?", "ListItemCommentsDialogDeleteTitle": "Confirmer supprimer le commentaire", diff --git a/src/loc/fr-fr.ts b/src/loc/fr-fr.ts index 0002353d9..f51b7447e 100644 --- a/src/loc/fr-fr.ts +++ b/src/loc/fr-fr.ts @@ -369,9 +369,9 @@ define([], () => { "DynamicFormNumberValueMustBeGreaterThan": "La valeur doit être supérieure à {0}", "DynamicFormNumberValueMustBeBetween": "La valeur doit être comprise entre {0} et {1}", "DynamicFormNumberValueMustBeLowerThan": "La valeur doit être inférieure à {0}", - "DynamicFormChooseFileLabel": "File", - "DynamicFormChooseFileButtonText": "Select file", - "DynamicFormRequiredFileMessage": "File is required.", + "DynamicFormChooseFileLabel": "Fichier", + "DynamicFormChooseFileButtonText": "Sélectionnez un fichier", + "DynamicFormRequiredFileMessage": "Un fichier est requis.", "customDisplayName": "Utilisez cet emplacement :", "ListItemCommentDIalogDeleteSubText": "Êtes-vous sûr de vouloir supprimer ce commentaire ?", "ListItemCommentsDialogDeleteTitle": "Confirmer la suppression du commentaire", From 626c0deb9781207d9cec2bd10f67e459bef55a1e Mon Sep 17 00:00:00 2001 From: guidozam Date: Tue, 26 Sep 2023 23:12:58 +0200 Subject: [PATCH 07/14] Updated IDynamicFormProps --- src/controls/dynamicForm/IDynamicFormProps.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/controls/dynamicForm/IDynamicFormProps.ts b/src/controls/dynamicForm/IDynamicFormProps.ts index 2b0bdaf94..9298cde5e 100644 --- a/src/controls/dynamicForm/IDynamicFormProps.ts +++ b/src/controls/dynamicForm/IDynamicFormProps.ts @@ -84,7 +84,8 @@ export interface IDynamicFormProps { validationErrorDialogProps?: IValidationErrorDialogProps; /** - * Specify if the form should support the creation of a new list item with a file. Default - false + * Specify if the form should support the creation of a new list item in a document library attaching a file to it. + * Default - false */ enableFileSelection?: boolean; From d59526d81a10cb56480dd932c155921cc0fba3cb Mon Sep 17 00:00:00 2001 From: guidozam Date: Sun, 22 Oct 2023 10:37:35 +0200 Subject: [PATCH 08/14] Added check for content type --- src/controls/dynamicForm/DynamicForm.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/controls/dynamicForm/DynamicForm.tsx b/src/controls/dynamicForm/DynamicForm.tsx index 606f8192a..61a06eafe 100644 --- a/src/controls/dynamicForm/DynamicForm.tsx +++ b/src/controls/dynamicForm/DynamicForm.tsx @@ -112,6 +112,8 @@ export class DynamicForm extends React.Component<
{this.props.enableFileSelection === true && this.props.listItemId === undefined && + this.props.contentTypeId !== undefined && + this.props.contentTypeId.startsWith("0x0101") && this.renderFileSelectionControl()} {fieldCollection.map((v, i) => { if ( @@ -215,7 +217,7 @@ export class DynamicForm extends React.Component< shouldBeReturnBack = true; } else if(val.fieldType === "Number"){ shouldBeReturnBack = this.validateNumberOnSubmit(val); - } + } } else if(val.fieldType === "Number"){ if(val.newValue === null){ val.newValue = val.fieldDefaultValue; @@ -364,7 +366,7 @@ export class DynamicForm extends React.Component< // We are adding a new list item try { const contentTypeIdField = "ContentTypeId"; - //check if item contenttype is passed, then update the object with content type id, else, pass the object + //check if item contenttype is passed, then update the object with content type id, else, pass the object contentTypeId !== undefined && contentTypeId.startsWith("0x01") ? objects[contentTypeIdField] = contentTypeId : objects; const iar = await sp.web.lists.getById(listId).items.add(objects); if (onSubmitted) { @@ -1005,6 +1007,7 @@ export class DynamicForm extends React.Component< default: return 'Document'; } + } private validateNumberOnSubmit = (val:IDynamicFieldProps): boolean => { let shouldBeReturnBack = false; From 4bc9cbc175bd4cdb1f54c6fb8c05b477fe992a94 Mon Sep 17 00:00:00 2001 From: guidozam Date: Sun, 22 Oct 2023 10:41:58 +0200 Subject: [PATCH 09/14] Improved enableFileSelection property description --- src/controls/dynamicForm/IDynamicFormProps.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/controls/dynamicForm/IDynamicFormProps.ts b/src/controls/dynamicForm/IDynamicFormProps.ts index 9298cde5e..0c67f558c 100644 --- a/src/controls/dynamicForm/IDynamicFormProps.ts +++ b/src/controls/dynamicForm/IDynamicFormProps.ts @@ -85,6 +85,7 @@ export interface IDynamicFormProps { /** * Specify if the form should support the creation of a new list item in a document library attaching a file to it. + * This option is only available for document libraries and works only when the contentTypeId is specified and has a base type of type Document. * Default - false */ enableFileSelection?: boolean; From 6b61ba195b61e3e6376067c9f299d14bfc63fdf5 Mon Sep 17 00:00:00 2001 From: Guido Zambarda Date: Wed, 1 Nov 2023 12:04:34 +0100 Subject: [PATCH 10/14] Update DynamicForm.md --- docs/documentation/docs/controls/DynamicForm.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/documentation/docs/controls/DynamicForm.md b/docs/documentation/docs/controls/DynamicForm.md index 19954739b..fdbda11bc 100644 --- a/docs/documentation/docs/controls/DynamicForm.md +++ b/docs/documentation/docs/controls/DynamicForm.md @@ -38,6 +38,7 @@ The `DynamicForm` can be configured with the following properties: | contentTypeId | string | no | content type ID | | disabled | boolean | no | Allows form to be disabled. Default value is `false`| | disabledFields | string[] | no | InternalName of fields that should be disabled. Default value is `false`| +| enableFileSelection | boolean | no | Specify if the form should support the creation of a new list item in a document library attaching a file to it. This option is only available for document libraries and works only when the contentTypeId is specified and has a base type of type Document. Default value is `false`| | hiddenFields | string[] | no | InternalName of fields that should be hidden. Default value is `false`| | onListItemLoaded | (listItemData: any) => Promise<void> | no | List item loaded handler. Allows to access list item information after it's loaded.| | onBeforeSubmit | (listItemData: any) => Promise<boolean> | no | Before submit handler. Allows to modify the object to be submitted or cancel the submission. To cancel, return `true`.| @@ -45,6 +46,7 @@ The `DynamicForm` can be configured with the following properties: | onSubmitError | (listItemData: any, error: Error) => void | no | Handler of submission error. | | onCancelled | () => void | no | Handler when form has been cancelled. | | returnListItemInstanceOnSubmit | boolean | no | Specifies if `onSubmitted` event should pass PnPJS list item (`IItem`) as a second parameter. Default - `true` | +| supportedFileExtensions | string[] | no | Specify the supported file extensions for the file picker. Only used when enableFileSelection is `true`. Default value is `["docx", "doc", "pptx", "ppt", "xlsx", "xls", "pdf"]`. | | webAbsoluteUrl | string | no | Absolute Web Url of target site (user requires permissions). | | fieldOverrides | {[columnInternalName: string] : {(fieldProperties: IDynamicFieldProps): React.ReactElement\}} | no | Key value pair for fields you want to override. Key is the internal field name, value is the function to be called for the custom element to render. | | respectEtag | boolean | no | Specifies if the form should respect the ETag of the item. Default - `true` | @@ -56,3 +58,14 @@ The `DynamicForm` can be configured with the following properties: | showDialogOnValidationError | boolean | no | Specifies if the dialog should be shown on validation error. Default - `false` | | customTitle | string | no | Specifies a custom title to be shown in the validation dialog. Default - empty | | customMessage | string | no | Specifies a custom message to be shown in the validation dialog. Default - empty | + +## File selection + +To upload a file when creating a new document in a document library you need to specify: +- enableFileSelection: Set this parameter to true to enable file selection. +- contentTypeId: This parameter specifies the target content type ID of the document you are creating. +- supportedFileExtensions: This parameter is optional and is used to specify the supported file extensions if they are different from the default ones. + +Enabling the file selection will display a new button on top of the form that allow the user to select a file from the recent files, browsing OneDrive or select and upload a file from the computer. + +![DynamicFormWithFileSelection](../assets/DynamicFormWithFileSelection.png) From 7458485b725d54c68ac47e4dadde39151e7a46ea Mon Sep 17 00:00:00 2001 From: Guido Zambarda Date: Wed, 1 Nov 2023 12:06:40 +0100 Subject: [PATCH 11/14] Added DynamicFormWithFileSelection.png --- .../assets/DynamicFormWithFileSelection.png | Bin 0 -> 16481 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/documentation/docs/assets/DynamicFormWithFileSelection.png diff --git a/docs/documentation/docs/assets/DynamicFormWithFileSelection.png b/docs/documentation/docs/assets/DynamicFormWithFileSelection.png new file mode 100644 index 0000000000000000000000000000000000000000..548b28573120121d12508d2db0bd41673a97cb11 GIT binary patch literal 16481 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 Date: Thu, 2 Nov 2023 17:26:06 +0100 Subject: [PATCH 12/14] Update DynamicForm.tsx --- src/controls/dynamicForm/DynamicForm.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controls/dynamicForm/DynamicForm.tsx b/src/controls/dynamicForm/DynamicForm.tsx index 61a06eafe..bedd13244 100644 --- a/src/controls/dynamicForm/DynamicForm.tsx +++ b/src/controls/dynamicForm/DynamicForm.tsx @@ -236,7 +236,7 @@ export class DynamicForm extends React.Component< return; } - if (enableFileSelection === true && this.state.selectedFile === undefined) { + if (enableFileSelection === true && this.state.selectedFile === undefined && this.props.listItemId === undefined)) { this.setState({ missingSelectedFile: true, isValidationErrorDialogOpen: From e36ce35a0df65286507af88af2366d04bf9c194d Mon Sep 17 00:00:00 2001 From: guidozam Date: Mon, 6 Nov 2023 11:10:20 +0100 Subject: [PATCH 13/14] Small fixes --- src/controls/dynamicForm/DynamicForm.tsx | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/controls/dynamicForm/DynamicForm.tsx b/src/controls/dynamicForm/DynamicForm.tsx index bedd13244..1af822d22 100644 --- a/src/controls/dynamicForm/DynamicForm.tsx +++ b/src/controls/dynamicForm/DynamicForm.tsx @@ -236,7 +236,7 @@ export class DynamicForm extends React.Component< return; } - if (enableFileSelection === true && this.state.selectedFile === undefined && this.props.listItemId === undefined)) { + if (enableFileSelection === true && this.state.selectedFile === undefined && this.props.listItemId === undefined) { this.setState({ missingSelectedFile: true, isValidationErrorDialogOpen: @@ -356,8 +356,8 @@ export class DynamicForm extends React.Component< else if ( contentTypeId === undefined || contentTypeId === "" || - !contentTypeId.startsWith("0x0120")|| - contentTypeId.startsWith("0x01") + (!contentTypeId.startsWith("0x0120") && + contentTypeId.startsWith("0x01")) ) { if (contentTypeId === undefined || enableFileSelection === true) { await this.addFileToLibrary(objects); @@ -365,18 +365,18 @@ export class DynamicForm extends React.Component< else { // We are adding a new list item try { - const contentTypeIdField = "ContentTypeId"; - //check if item contenttype is passed, then update the object with content type id, else, pass the object - contentTypeId !== undefined && contentTypeId.startsWith("0x01") ? objects[contentTypeIdField] = contentTypeId : objects; - const iar = await sp.web.lists.getById(listId).items.add(objects); - if (onSubmitted) { - onSubmitted( - iar.data, - returnListItemInstanceOnSubmit !== false - ? iar.item - : undefined - ); - } + const contentTypeIdField = "ContentTypeId"; + //check if item contenttype is passed, then update the object with content type id, else, pass the object + contentTypeId !== undefined && contentTypeId.startsWith("0x01") ? objects[contentTypeIdField] = contentTypeId : objects; + const iar = await sp.web.lists.getById(listId).items.add(objects); + if (onSubmitted) { + onSubmitted( + iar.data, + returnListItemInstanceOnSubmit !== false + ? iar.item + : undefined + ); + } } catch (error) { if (onSubmitError) { onSubmitError(objects, error); From 9a1184f34617941d4670b5cb6ac75a78a5dd4ebd Mon Sep 17 00:00:00 2001 From: guidozam Date: Sun, 26 Nov 2023 10:18:42 +0100 Subject: [PATCH 14/14] Updated DynamicForm doc --- .../docs/controls/DynamicForm.md | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/documentation/docs/controls/DynamicForm.md b/docs/documentation/docs/controls/DynamicForm.md index fdbda11bc..ce2326d4d 100644 --- a/docs/documentation/docs/controls/DynamicForm.md +++ b/docs/documentation/docs/controls/DynamicForm.md @@ -26,6 +26,17 @@ import { DynamicForm } from "@pnp/spfx-controls-react/lib/DynamicForm"; ``` ![DynamicForm](../assets/DynamicForm.png) +## File selection + +To upload a file when creating a new document in a document library you need to specify: +- enableFileSelection: Set this parameter to true to enable file selection. +- contentTypeId: This parameter specifies the target content type ID of the document you are creating. +- supportedFileExtensions: This parameter is optional and is used to specify the supported file extensions if they are different from the default ones. + +Enabling the file selection will display a new button on top of the form that allow the user to select a file from the recent files, browsing OneDrive or select and upload a file from the computer. + +![DynamicFormWithFileSelection](../assets/DynamicFormWithFileSelection.png) + ## Implementation The `DynamicForm` can be configured with the following properties: @@ -58,14 +69,3 @@ The `DynamicForm` can be configured with the following properties: | showDialogOnValidationError | boolean | no | Specifies if the dialog should be shown on validation error. Default - `false` | | customTitle | string | no | Specifies a custom title to be shown in the validation dialog. Default - empty | | customMessage | string | no | Specifies a custom message to be shown in the validation dialog. Default - empty | - -## File selection - -To upload a file when creating a new document in a document library you need to specify: -- enableFileSelection: Set this parameter to true to enable file selection. -- contentTypeId: This parameter specifies the target content type ID of the document you are creating. -- supportedFileExtensions: This parameter is optional and is used to specify the supported file extensions if they are different from the default ones. - -Enabling the file selection will display a new button on top of the form that allow the user to select a file from the recent files, browsing OneDrive or select and upload a file from the computer. - -![DynamicFormWithFileSelection](../assets/DynamicFormWithFileSelection.png)