Skip to content

Commit 796f5a8

Browse files
fix formatting. Update changelog
1 parent 7514352 commit 796f5a8

File tree

2 files changed

+51
-35
lines changed

2 files changed

+51
-35
lines changed

CHANGELOG.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
{
22
"versions": [
3+
{
4+
"version": "3.11.0",
5+
"changes": {
6+
"new": [],
7+
"enhancements": [
8+
"`DynamicForm`: Add taxonomy tree to test harness [#1269](https://github.com/pnp/sp-dev-fx-controls-react/pull/1269)"
9+
],
10+
"fixes": [
11+
]
12+
},
13+
"contributions": [
14+
"[Hilton Giesenow](https://github.com/HiltonGiesenow)"
15+
]
16+
},
317
{
418
"version": "3.10.0",
519
"changes": {

src/webparts/controlsTest/components/ControlsTest.tsx

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -501,9 +501,9 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
501501
selectedTeamChannels: [],
502502
errorMessage: "This field is required",
503503
selectedFilters: ["filter1"],
504-
termStoreInfo: null,
505-
termSetInfo: null,
506-
testTerms: [],
504+
termStoreInfo: null,
505+
termSetInfo: null,
506+
testTerms: [],
507507
};
508508

509509
this._onIconSizeChange = this._onIconSizeChange.bind(this);
@@ -518,13 +518,13 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
518518
public async componentDidMount() {
519519
const restApi = `${this.props.context.pageContext.web.absoluteUrl}/_api/web/GetFolderByServerRelativeUrl('Shared%20Documents')/files?$expand=ListItemAllFields`;
520520
const response = await this.props.context.spHttpClient.get(restApi, SPHttpClient.configurations.v1);
521-
const items = await response.json();
521+
const items = await response.json();
522522

523-
this.setState({
524-
items: items.value ? items.value : [],
525-
termStoreInfo: await this.spTaxonomyService.getTermStoreInfo(),
526-
termSetInfo: await this.spTaxonomyService.getTermSetInfo(Guid.parse("4bc86596-7caf-4e70-80c9-d9769e448988")),
527-
});
523+
this.setState({
524+
items: items.value ? items.value : [],
525+
termStoreInfo: await this.spTaxonomyService.getTermStoreInfo(),
526+
termSetInfo: await this.spTaxonomyService.getTermSetInfo(Guid.parse("4bc86596-7caf-4e70-80c9-d9769e448988")),
527+
});
528528

529529
// // Get Authors in the SharePoint Document library -- For People Picker Testing
530530
// const restAuthorApi = `${this.props.context.pageContext.web.absoluteUrl}/_api/web/lists/GetByTitle('Documents')/Items?$select=Id, Author/EMail&$expand=Author/EMail`;
@@ -728,12 +728,13 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
728728
}
729729

730730
private toggleToolbarFilter = (filterId: string) => {
731-
this.setState(({selectedFilters}) => {
732-
if (selectedFilters.includes(filterId)) {
733-
return { selectedFilters: selectedFilters.filter(f => f !== filterId) };
734-
} else {
735-
return { selectedFilters: [...selectedFilters, filterId] };
736-
}});
731+
this.setState(({ selectedFilters }) => {
732+
if (selectedFilters.includes(filterId)) {
733+
return { selectedFilters: selectedFilters.filter(f => f !== filterId) };
734+
} else {
735+
return { selectedFilters: [...selectedFilters, filterId] };
736+
}
737+
});
737738
}
738739

739740
private rootFolder: IFolder = {
@@ -1937,12 +1938,12 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
19371938
}
19381939
}
19391940
}}
1940-
filters={toolbarFilters}
1941-
onSelectedFiltersChange={this.onToolbarSelectedFiltersChange}
1941+
filters={toolbarFilters}
1942+
onSelectedFiltersChange={this.onToolbarSelectedFiltersChange}
19421943
/>
19431944

19441945
<div>
1945-
<h3>Controlled toolbar</h3>
1946+
<h3>Controlled toolbar</h3>
19461947
<Toolbar actionGroups={{
19471948
'group1': {
19481949
'action1': {
@@ -1955,7 +1956,8 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
19551956
iconName: 'Add',
19561957
onClick: () => { console.log('New action click'); }
19571958
}
1958-
}}}
1959+
}
1960+
}}
19591961
filters={toolbarFilters}
19601962
selectedFilterIds={this.state.selectedFilters}
19611963
onSelectedFiltersChange={this.onToolbarSelectedFiltersChange} />
@@ -2345,7 +2347,7 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
23452347
<AdaptiveCardDesignerHost
23462348
headerText={`Adaptive Card Designer`}
23472349
buttonText="Open Designer"
2348-
card={{"$schema":"http://adaptivecards.io/schemas/adaptive-card.json","type":"AdaptiveCard","version":"1.5","body":[{"type":"ColumnSet","columns":[{"width":"auto","items":[{"type":"Image","size":"Small","style":"Person","url":"/_layouts/15/userphoto.aspx?size=M&username=${$root['@context']['userInfo']['email']}"}],"type":"Column"},{"width":"stretch","items":[{"type":"TextBlock","text":"${$root['@context']['userInfo']['displayName']}","weight":"Bolder"},{"type":"TextBlock","spacing":"None","text":"${$root['@context']['userInfo']['email']}"}],"type":"Column"}]}]}}
2350+
card={{ "$schema": "http://adaptivecards.io/schemas/adaptive-card.json", "type": "AdaptiveCard", "version": "1.5", "body": [{ "type": "ColumnSet", "columns": [{ "width": "auto", "items": [{ "type": "Image", "size": "Small", "style": "Person", "url": "/_layouts/15/userphoto.aspx?size=M&username=${$root['@context']['userInfo']['email']}" }], "type": "Column" }, { "width": "stretch", "items": [{ "type": "TextBlock", "text": "${$root['@context']['userInfo']['displayName']}", "weight": "Bolder" }, { "type": "TextBlock", "spacing": "None", "text": "${$root['@context']['userInfo']['email']}" }], "type": "Column" }] }] }}
23492351
data={undefined}
23502352
context={this.props.context}
23512353
theme={this.props.themeVariant}
@@ -2388,22 +2390,22 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
23882390
/>
23892391
</div>
23902392

2391-
<div>
2393+
<div>
23922394
<h3>Modern Taxonomy Tree</h3>
2393-
{this.state.termStoreInfo && (
2394-
<TaxonomyTree
2395-
languageTag={this.state.termStoreInfo.defaultLanguageTag}
2396-
onLoadMoreData={this.spTaxonomyService.getTerms}
2397-
pageSize={50}
2398-
setTerms={(value) => this.setState({testTerms: value as any})}
2399-
termStoreInfo={this.state.termStoreInfo}
2400-
termSetInfo={this.state.termSetInfo}
2401-
terms={this.state.testTerms as any[]}
2402-
onRenderActionButton={() => <button>test button</button>}
2403-
hideDeprecatedTerms={false}
2404-
showIcons={true}
2405-
/>
2406-
)}
2395+
{this.state.termStoreInfo && (
2396+
<TaxonomyTree
2397+
languageTag={this.state.termStoreInfo.defaultLanguageTag}
2398+
onLoadMoreData={this.spTaxonomyService.getTerms}
2399+
pageSize={50}
2400+
setTerms={(value) => this.setState({ testTerms: value as any })}
2401+
termStoreInfo={this.state.termStoreInfo}
2402+
termSetInfo={this.state.termSetInfo}
2403+
terms={this.state.testTerms as any[]}
2404+
onRenderActionButton={() => <button>test button</button>}
2405+
hideDeprecatedTerms={false}
2406+
showIcons={true}
2407+
/>
2408+
)}
24072409
</div>
24082410

24092411
</div>

0 commit comments

Comments
 (0)