From 747ac1f32b270d29afdbf9af4cd6f0edf2875137 Mon Sep 17 00:00:00 2001 From: Antanina Druzhkina Date: Sat, 4 May 2024 23:00:03 +0400 Subject: [PATCH 1/6] #1101: fix issue with adding link by typing in FilePicker "From a link" tab --- .../filePicker/LinkFilePickerTab/LinkFilePickerTab.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/controls/filePicker/LinkFilePickerTab/LinkFilePickerTab.tsx b/src/controls/filePicker/LinkFilePickerTab/LinkFilePickerTab.tsx index d037cb8ed..cc707c005 100644 --- a/src/controls/filePicker/LinkFilePickerTab/LinkFilePickerTab.tsx +++ b/src/controls/filePicker/LinkFilePickerTab/LinkFilePickerTab.tsx @@ -34,7 +34,6 @@ export default class LinkFilePickerTab extends React.Component this._getErrorMessagePromise(value)} autoAdjustHeight={false} underlined={false} @@ -64,7 +63,7 @@ export default class LinkFilePickerTab extends React.Component { - const filePickerResult: IFilePickerResult = fileUrl && this._isUrl(fileUrl) ? { + const filePickerResult: IFilePickerResult = fileUrl ? { fileAbsoluteUrl: fileUrl, fileName: GeneralHelper.getFileNameFromUrl(fileUrl), fileNameWithoutExtension: GeneralHelper.getFileNameWithoutExtension(fileUrl), @@ -81,7 +80,7 @@ export default class LinkFilePickerTab extends React.Component => { // DOn't give an error for blank or placeholder value, but don't make it a valid entry either - if (value === undefined || value === 'https://') { + if (value === undefined || value === '') { this.setState({ isValid: false }); return ''; } @@ -89,7 +88,7 @@ export default class LinkFilePickerTab extends React.Component Date: Wed, 15 May 2024 16:49:06 -0400 Subject: [PATCH 2/6] 3.19.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 37d806777..c2342d70a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@pnp/spfx-controls-react", - "version": "3.18.0", + "version": "3.19.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@pnp/spfx-controls-react", - "version": "3.18.0", + "version": "3.19.0", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 5b789d27a..855eba825 100644 --- 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.18.0", + "version": "3.19.0", "node": ">=16.13.0 <17.0.0 || >=18.17.1 <19.0.0", "scripts": { "build": "gulp build", From 2f7b6182d04b601f7dd76eacd30ea71e8850280a Mon Sep 17 00:00:00 2001 From: Alex Terentiev Date: Wed, 15 May 2024 16:51:34 -0400 Subject: [PATCH 3/6] bump version --- CHANGELOG.json | 9 +++++++++ src/common/telemetry/version.ts | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.json b/CHANGELOG.json index ec4f39565..1da6aa9d0 100644 --- a/CHANGELOG.json +++ b/CHANGELOG.json @@ -1,5 +1,14 @@ { "versions": [ + { + "version": "3.19.0", + "changes": { + "new": [], + "enhancements": [], + "fixes": [] + }, + "contributions": [] + }, { "version": "3.18.0", "changes": { diff --git a/src/common/telemetry/version.ts b/src/common/telemetry/version.ts index e4ed6e8bb..6944cba2f 100644 --- a/src/common/telemetry/version.ts +++ b/src/common/telemetry/version.ts @@ -1 +1 @@ -export const version: string = "3.18.0"; \ No newline at end of file +export const version: string = "3.19.0"; \ No newline at end of file From 8554bec989fd98c789e7e4c8ae14b5d00d118781 Mon Sep 17 00:00:00 2001 From: Alex Terentiev Date: Wed, 15 May 2024 16:51:44 -0400 Subject: [PATCH 4/6] precommit --- CHANGELOG.md | 2 ++ docs/documentation/docs/about/release-notes.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 244ee3c7b..edaab33cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Releases +## 3.19.0 + ## 3.18.0 ### Enhancements diff --git a/docs/documentation/docs/about/release-notes.md b/docs/documentation/docs/about/release-notes.md index 244ee3c7b..edaab33cd 100644 --- a/docs/documentation/docs/about/release-notes.md +++ b/docs/documentation/docs/about/release-notes.md @@ -1,5 +1,7 @@ # Releases +## 3.19.0 + ## 3.18.0 ### Enhancements From 77c81305b9866864f924686c91f3d68ec6bbc29e Mon Sep 17 00:00:00 2001 From: Elio Struyf Date: Wed, 29 May 2024 21:23:21 +0200 Subject: [PATCH 5/6] Update nl-nl.ts (#1823) Updated translation of the `Maroon` color Co-authored-by: Alex Terentiev --- src/loc/nl-nl.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/loc/nl-nl.ts b/src/loc/nl-nl.ts index 20ac59f31..8dba0fdb0 100644 --- a/src/loc/nl-nl.ts +++ b/src/loc/nl-nl.ts @@ -145,7 +145,7 @@ define([], () => { "HighlightColorTeal": "Taling", "HighlightColorDarkgreen": "Donkergroen", "HighlightColorPurple": "Paarse", - "HighlightColorMaroon": "Bosneger", + "HighlightColorMaroon": "Kastanjebruin", "HighlightColorGold": "Goud", "HighlightColorDarkgrey": "Donkergrijs", "HighlightColorGrey": "Grijs", From f4cc5ae3208fe526701d23f335b07b52266538f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Maillot?= Date: Wed, 29 May 2024 21:47:51 +0200 Subject: [PATCH 6/6] Creating version 3.18.1 --- CHANGELOG.json | 12 +++++++++--- CHANGELOG.md | 11 ++++++++++- docs/documentation/docs/about/release-notes.md | 11 ++++++++++- package-lock.json | 4 ++-- package.json | 2 +- src/common/telemetry/version.ts | 2 +- 6 files changed, 33 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.json b/CHANGELOG.json index 1da6aa9d0..9ea7985ec 100644 --- a/CHANGELOG.json +++ b/CHANGELOG.json @@ -1,13 +1,19 @@ { "versions": [ { - "version": "3.19.0", + "version": "3.18.1", "changes": { "new": [], "enhancements": [], - "fixes": [] + "fixes": [ + "`FilePicker`: Fix issue with adding link by typing in 'From a link' tab [#1814](https://github.com/pnp/sp-dev-fx-controls-react/pull/1814)", + "Update nl-nl.ts [#1823](https://github.com/pnp/sp-dev-fx-controls-react/pull/1823)" + ] }, - "contributions": [] + "contributions": [ + "[Antanina Druzhkina](https://github.com/Ateina)", + "[Elio Struyf](https://github.com/estruyf)" + ] }, { "version": "3.18.0", diff --git a/CHANGELOG.md b/CHANGELOG.md index edaab33cd..f3f3841fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,15 @@ # Releases -## 3.19.0 +## 3.18.1 + +### Fixes + +- `FilePicker`: Fix issue with adding link by typing in 'From a link' tab [#1814](https://github.com/pnp/sp-dev-fx-controls-react/pull/1814) +- Update nl-nl.ts [#1823](https://github.com/pnp/sp-dev-fx-controls-react/pull/1823) + +### Contributors + +Special thanks to our contributors (in alphabetical order): [Antanina Druzhkina](https://github.com/Ateina), [Elio Struyf](https://github.com/estruyf). ## 3.18.0 diff --git a/docs/documentation/docs/about/release-notes.md b/docs/documentation/docs/about/release-notes.md index edaab33cd..f3f3841fa 100644 --- a/docs/documentation/docs/about/release-notes.md +++ b/docs/documentation/docs/about/release-notes.md @@ -1,6 +1,15 @@ # Releases -## 3.19.0 +## 3.18.1 + +### Fixes + +- `FilePicker`: Fix issue with adding link by typing in 'From a link' tab [#1814](https://github.com/pnp/sp-dev-fx-controls-react/pull/1814) +- Update nl-nl.ts [#1823](https://github.com/pnp/sp-dev-fx-controls-react/pull/1823) + +### Contributors + +Special thanks to our contributors (in alphabetical order): [Antanina Druzhkina](https://github.com/Ateina), [Elio Struyf](https://github.com/estruyf). ## 3.18.0 diff --git a/package-lock.json b/package-lock.json index c2342d70a..e7589a165 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@pnp/spfx-controls-react", - "version": "3.19.0", + "version": "3.18.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@pnp/spfx-controls-react", - "version": "3.19.0", + "version": "3.18.1", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 855eba825..fcc461385 100644 --- 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.19.0", + "version": "3.18.1", "node": ">=16.13.0 <17.0.0 || >=18.17.1 <19.0.0", "scripts": { "build": "gulp build", diff --git a/src/common/telemetry/version.ts b/src/common/telemetry/version.ts index 6944cba2f..0cdef5191 100644 --- a/src/common/telemetry/version.ts +++ b/src/common/telemetry/version.ts @@ -1 +1 @@ -export const version: string = "3.19.0"; \ No newline at end of file +export const version: string = "3.18.1"; \ No newline at end of file