Skip to content

Commit b4640f5

Browse files
remove warnings
1 parent 25f9af5 commit b4640f5

File tree

6 files changed

+22
-25
lines changed

6 files changed

+22
-25
lines changed

src/controls/viewPicker/IViewPicker.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { BaseComponentContext } from '@microsoft/sp-component-base';
2-
import { ISPView } from '../../../src/common/SPEntities';
32
import { IDropdownOption } from 'office-ui-fabric-react/lib/Dropdown';
43

54

@@ -93,4 +92,4 @@ export interface IViewPickerState {
9392
* Keys of the currently selected item(s).
9493
*/
9594
selectedView?: string | string[];
96-
}
95+
}

src/controls/viewPicker/ViewPicker.tsx

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ import * as React from 'react';
22
import cloneDeep from 'lodash/cloneDeep';
33
import { Dropdown, IDropdownOption, IDropdownProps } from 'office-ui-fabric-react/lib/Dropdown';
44
import { Async } from 'office-ui-fabric-react/lib/Utilities';
5-
import { Label } from 'office-ui-fabric-react/lib/Label';
6-
import { Spinner, SpinnerSize } from 'office-ui-fabric-react/lib/Spinner';
75
import * as telemetry from '../../common/telemetry';
86
import { ISPService } from '../../services/ISPService';
97
import { SPServiceFactory } from '../../services/SPServiceFactory';
108
import { IViewPickerProps, IViewPickerState } from './IViewPicker';
11-
import { ISPView, ISPViews } from "../../common/SPEntities";
9+
import { ISPView } from "../../common/SPEntities";
1210
import styles from './ViewPicker.module.scss';
1311

1412
// Empty view value
@@ -30,30 +28,30 @@ export class ViewPicker extends React.Component<IViewPickerProps, IViewPickerSta
3028
this.async = new Async(this);
3129
}
3230

33-
public componentDidMount(): void {
31+
public async componentDidMount(): Promise<void> {
3432
// Start retrieving the list views
35-
this.loadViews();
33+
await this.loadViews();
3634
}
3735

3836
/**
3937
* componentDidUpdate lifecycle hook
4038
* @param prevProps
4139
* @param prevState
4240
*/
43-
public componentDidUpdate(prevProps: IViewPickerProps, _prevState: IViewPickerState): void {
41+
public async componentDidUpdate(prevProps: IViewPickerProps, _prevState: IViewPickerState): Promise<void> {
4442
if (
45-
this.props.listId !== prevProps.listId ||
43+
this.props.listId !== prevProps.listId ||
4644
this.props.webAbsoluteUrl !== prevProps.webAbsoluteUrl ||
47-
this.props.orderBy !== prevProps.orderBy
45+
this.props.orderBy !== prevProps.orderBy
4846
) {
49-
this.loadViews();
47+
await this.loadViews();
5048
}
5149

5250
if(prevProps.selectedView !== this.props.selectedView){
5351
this.setSelectedViews();
5452
}
5553
}
56-
54+
5755
/**
5856
* Called when the component will unmount
5957
*/
@@ -67,9 +65,9 @@ export class ViewPicker extends React.Component<IViewPickerProps, IViewPickerSta
6765

6866

6967
const viewsToExclude: string[] = this.props.viewsToExclude || [];
70-
let options: IDropdownOption[] = [];
68+
const options: IDropdownOption[] = [];
7169
const service: ISPService = SPServiceFactory.createService(this.props.context, true, 5000, this.props.webAbsoluteUrl);
72-
let results = await service.getViews(
70+
const results = await service.getViews(
7371
this.props.listId,
7472
this.props.orderBy,
7573
this.props.filter
@@ -108,14 +106,14 @@ export class ViewPicker extends React.Component<IViewPickerProps, IViewPickerSta
108106
this.setState({
109107
results: options
110108
});
111-
109+
112110
}
113111

114112
/**
115113
* Set the currently selected views(s);
116114
*/
117115
private setSelectedViews(): void {
118-
let _selectedView = cloneDeep(this.props.selectedView);
116+
const _selectedView = cloneDeep(this.props.selectedView);
119117

120118
this.setState({
121119
selectedView:_selectedView
@@ -155,7 +153,7 @@ export class ViewPicker extends React.Component<IViewPickerProps, IViewPickerSta
155153
}
156154
}
157155

158-
156+
159157

160158
/**
161159
* Renders the ViewPicker controls with Office UI Fabric
@@ -179,7 +177,7 @@ export class ViewPicker extends React.Component<IViewPickerProps, IViewPickerSta
179177
placeholder,
180178
onChange: this.onChange,
181179
};
182-
180+
183181
if(multiSelect){
184182
dropdownProps.multiSelect = true;
185183
dropdownProps.selectedKeys = selectedView as string [];
@@ -194,4 +192,4 @@ export class ViewPicker extends React.Component<IViewPickerProps, IViewPickerSta
194192
);
195193
}
196194

197-
}
195+
}

src/services/ISPService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ISPContentType, ISPField, ISPLists, ISPView, ISPViews } from "../common/SPEntities";
1+
import { ISPContentType, ISPField, ISPLists, ISPViews } from "../common/SPEntities";
22
import {orderBy } from '../controls/viewPicker/IViewPicker';
33

44
export enum LibsOrderBy {

src/services/SPService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { BaseComponentContext } from '@microsoft/sp-component-base';
22
import { ISPHttpClientOptions, SPHttpClient } from "@microsoft/sp-http";
33
import filter from 'lodash/filter';
44
import find from 'lodash/find';
5-
import { ISPContentType, ISPField, ISPList, ISPLists, IUploadImageResult, ISPView, ISPViews } from "../common/SPEntities";
5+
import { ISPContentType, ISPField, ISPList, ISPLists, IUploadImageResult, ISPViews } from "../common/SPEntities";
66
import { SPHelper, urlCombine } from "../common/utilities";
77
import { IContentTypesOptions, IFieldsOptions, ILibsOptions, ISPService, LibsOrderBy } from "./ISPService";
88
import {orderBy } from '../controls/viewPicker/IViewPicker';

src/services/SPServiceMock.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ISPService, ILibsOptions, IFieldsOptions, IContentTypesOptions } from "./ISPService";
2-
import { ISPContentType, ISPField, ISPLists, ISPView, ISPViews } from "../common/SPEntities";
2+
import { ISPContentType, ISPField, ISPLists, ISPViews } from "../common/SPEntities";
33
import {orderBy } from '../controls/viewPicker/IViewPicker';
44

55
export default class SPServiceMock implements ISPService {

src/webparts/controlsTest/components/ControlsTest.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -556,9 +556,9 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
556556
isTaxonomyTreeDivVisible: false,
557557
isTestControlDivVisible: false,
558558
isUploadFilesDivVisible: false,
559+
isViewPickerDivVisible: false,
559560
toggleAll: false,
560-
showAllFilters: false,
561-
isViewPickerDivVisible: false
561+
showAllFilters: false,
562562
};
563563

564564
this._onIconSizeChange = this._onIconSizeChange.bind(this);
@@ -2719,4 +2719,4 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
27192719
isViewPickerDivVisible: checked
27202720
});
27212721
}
2722-
}
2722+
}

0 commit comments

Comments
 (0)