Skip to content

Commit 642a5ae

Browse files
committed
Merge branch 'devangbhavsar89-dev' into dev
2 parents 8c178f0 + f6108e1 commit 642a5ae

File tree

5 files changed

+35
-13
lines changed

5 files changed

+35
-13
lines changed

CHANGELOG.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,28 @@
99
### Enhancements
1010

1111
- `FilePicker`: Stock images option added [#593](https://github.com/pnp/sp-dev-fx-controls-react/issues/593)
12+
- `TaxonomyPicker`: Add the 'required' property [#216](https://github.com/pnp/sp-dev-fx-controls-react/issues/216)
13+
- `TaxonomyPicker`: Add `errorMessage` and `onGetErrorMessage` props [#600](https://github.com/pnp/sp-dev-fx-controls-react/pull/600)
14+
- `ListItemPicker`: ability to use substring search instead of startswith [#583](https://github.com/pnp/sp-dev-fx-controls-react/issues/583)
15+
- `Map`: return display name and address details for the location [#585](https://github.com/pnp/sp-dev-fx-controls-react/issues/585)
16+
- `Map`: support for draggable and static Bing maps [#586](https://github.com/pnp/sp-dev-fx-controls-react/issues/586)
17+
- `TaxonomyPicker`: onLoad validation [#602](https://github.com/pnp/sp-dev-fx-controls-react/issues/602)
18+
- `FieldCollectionData`: Add pagining and filtering [#617](https://github.com/pnp/sp-dev-fx-controls-react/pull/617)
1219

1320
### Fixes
1421

1522
- `ComboBoxListItemPicker`: fetching only 100 items [#569](https://github.com/pnp/sp-dev-fx-controls-react/issues/569)
1623
- `TaxonomyPicker`: browse (tree view) doesn't work with SP 2016 On-Premises [#183](https://github.com/pnp/sp-dev-fx-controls-react/issues/183)
24+
- `FilePicker`: default tab when opened shows hidden RecentTab [#477](https://github.com/pnp/sp-dev-fx-controls-react/issues/477)
25+
- `PeoplePicker`: The required error message not showing [#590](https://github.com/pnp/sp-dev-fx-controls-react/issues/590)
26+
- `ListItemAttachments`: fails in Microsoft Teams Tab SPFx applications [#582](fails in Microsoft Teams Tab SPFx applications)
27+
- `Carousel`: Changing pages doesn't work [#609](https://github.com/pnp/sp-dev-fx-controls-react/issues/609)
28+
- `TaxonomyPicker`: no suggestions are displayed if `anchorId` is not set
29+
- `TaxonomyPicker`: Suggestion/match does not work as expected [#604](https://github.com/pnp/sp-dev-fx-controls-react/issues/604)
1730

1831
### Contributors
1932

20-
Special thanks to our contributor: [Piotr Siatka](https://github.com/siata13).
33+
Special thanks to our contributors (in alphabetical order): [geltapatio](https://github.com/geltapatio), [Joel Jeffery](https://github.com/joeljeffery), [Piotr Siatka](https://github.com/siata13).
2134

2235
## 1.19.0
2336

docs/documentation/docs/about/release-notes.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,28 @@
99
### Enhancements
1010

1111
- `FilePicker`: Stock images option added [#593](https://github.com/pnp/sp-dev-fx-controls-react/issues/593)
12+
- `TaxonomyPicker`: Add the 'required' property [#216](https://github.com/pnp/sp-dev-fx-controls-react/issues/216)
13+
- `TaxonomyPicker`: Add `errorMessage` and `onGetErrorMessage` props [#600](https://github.com/pnp/sp-dev-fx-controls-react/pull/600)
14+
- `ListItemPicker`: ability to use substring search instead of startswith [#583](https://github.com/pnp/sp-dev-fx-controls-react/issues/583)
15+
- `Map`: return display name and address details for the location [#585](https://github.com/pnp/sp-dev-fx-controls-react/issues/585)
16+
- `Map`: support for draggable and static Bing maps [#586](https://github.com/pnp/sp-dev-fx-controls-react/issues/586)
17+
- `TaxonomyPicker`: onLoad validation [#602](https://github.com/pnp/sp-dev-fx-controls-react/issues/602)
18+
- `FieldCollectionData`: Add pagining and filtering [#617](https://github.com/pnp/sp-dev-fx-controls-react/pull/617)
1219

1320
### Fixes
1421

1522
- `ComboBoxListItemPicker`: fetching only 100 items [#569](https://github.com/pnp/sp-dev-fx-controls-react/issues/569)
1623
- `TaxonomyPicker`: browse (tree view) doesn't work with SP 2016 On-Premises [#183](https://github.com/pnp/sp-dev-fx-controls-react/issues/183)
24+
- `FilePicker`: default tab when opened shows hidden RecentTab [#477](https://github.com/pnp/sp-dev-fx-controls-react/issues/477)
25+
- `PeoplePicker`: The required error message not showing [#590](https://github.com/pnp/sp-dev-fx-controls-react/issues/590)
26+
- `ListItemAttachments`: fails in Microsoft Teams Tab SPFx applications [#582](fails in Microsoft Teams Tab SPFx applications)
27+
- `Carousel`: Changing pages doesn't work [#609](https://github.com/pnp/sp-dev-fx-controls-react/issues/609)
28+
- `TaxonomyPicker`: no suggestions are displayed if `anchorId` is not set
29+
- `TaxonomyPicker`: Suggestion/match does not work as expected [#604](https://github.com/pnp/sp-dev-fx-controls-react/issues/604)
1730

1831
### Contributors
1932

20-
Special thanks to our contributor: [Piotr Siatka](https://github.com/siata13).
33+
Special thanks to our contributors (in alphabetical order): [geltapatio](https://github.com/geltapatio), [Joel Jeffery](https://github.com/joeljeffery), [Piotr Siatka](https://github.com/siata13).
2134

2235
## 1.19.0
2336

package.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,5 @@
8787
"Rodrigues, Joel <>",
8888
"Struyf, Elio <[email protected]>",
8989
"Terentiev, Alex <>"
90-
],
91-
"husky": {
92-
"hooks": {
93-
"pre-commit": "npm run changelog"
94-
}
95-
}
90+
]
9691
}

src/controls/taxonomyPicker/TermParent.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ export default class TermParent extends React.Component<ITermParentProps, ITermP
3737
{
3838
const anchorTerm = this._terms.filter(t => t.Id.toLowerCase() === this.props.anchorId.toLowerCase()).shift();
3939
if (anchorTerm) {
40-
const anchorDepth = anchorTerm.PathDepth;
40+
// Append ';' separator, as a suffix to anchor term path.
41+
const anchorTermPath = `${anchorTerm.PathOfTerm};`;
4142
this._anchorName = anchorTerm.Name;
42-
var anchorTerms : ITerm[] = this._terms.filter(t => t.PathOfTerm.substring(0, anchorTerm.PathOfTerm.length) === anchorTerm.PathOfTerm && t.Id !== anchorTerm.Id);
43+
let anchorTerms : ITerm[] = this._terms.filter(t => t.PathOfTerm.substring(0, anchorTermPath.length) === anchorTermPath && t.Id !== anchorTerm.Id);
4344

4445
anchorTerms = anchorTerms.map(term => {
4546
term.PathDepth = term.PathDepth - anchorTerm.PathDepth;

src/services/SPTermStorePickerService.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,6 @@ export default class SPTermStorePickerService {
287287
return null;
288288
}
289289

290-
291290
private searchTermsBySearchText(terms, searchText) {
292291
if (terms) {
293292
return terms.filter((t) => { return t.name.toLowerCase().indexOf(searchText.toLowerCase()) > -1; });
@@ -296,7 +295,6 @@ export default class SPTermStorePickerService {
296295
return [];
297296
}
298297

299-
300298
public async searchTermsByTermId(searchText: string, termId: string): Promise<IPickerTerm[]> {
301299
if (Environment.type === EnvironmentType.Local) {
302300
// If the running environment is local, load the data from the mock
@@ -352,7 +350,9 @@ export default class SPTermStorePickerService {
352350
if (anchorId) {
353351
const anchorTerm = terms.filter(t => t.Id.toLowerCase() === anchorId.toLowerCase()).shift();
354352
if (anchorTerm) {
355-
const anchorTerms: ITerm[] = terms.filter(t => t.PathOfTerm.substring(0, anchorTerm.PathOfTerm.length) === anchorTerm.PathOfTerm && t.Id !== anchorTerm.Id);
353+
// Append ';' separator, as a suffix to anchor term path.
354+
const anchorTermPath = `${anchorTerm.PathOfTerm};`;
355+
const anchorTerms: ITerm[] = terms.filter(t => t.PathOfTerm.substring(0, anchorTermPath.length) === anchorTermPath && t.Id !== anchorTerm.Id);
356356

357357
anchorTerms.forEach(term => {
358358
returnTerms.push(this.convertTermToPickerTerm(term));

0 commit comments

Comments
 (0)