Skip to content

Commit b2bd1a7

Browse files
mttwcmttwc
committed
Clean up lint errors. Consume new version of api
1 parent 9d427d5 commit b2bd1a7

40 files changed

+499
-465
lines changed

‎package-lock.json

+129-120
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
],
77
"dependencies": {
88
"bulma": "^0.4.2",
9-
"onenoteapi": "^2.0.1",
9+
"onenoteapi": "2.0.5",
1010
"react": "^15.6.2",
1111
"react-dom": "^15.6.2"
1212
},
@@ -22,7 +22,7 @@
2222
"@types/sinon": "^2.3.1",
2323
"@types/webpack": "^2.2.15",
2424
"@types/webpack-env": "^1.13.0",
25-
"awesome-typescript-loader": "^3.1.3",
25+
"awesome-typescript-loader": "3.2.1",
2626
"cors": "^2.8.4",
2727
"cross-env": "^5.0.1",
2828
"css-loader": "^0.28.4",
@@ -61,7 +61,7 @@
6161
"style-loader": "^0.18.2",
6262
"ts-loader": "^2.1.0",
6363
"tslint": "^5.4.3",
64-
"typescript": "^2.3.4",
64+
"typescript": "2.5.2",
6565
"url-loader": "^0.5.8",
6666
"wallaby-webpack": "0.0.38",
6767
"webpack": "^3.1.0",

‎sampleApp/index.html

+16-13
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
<!DOCTYPE html>
22
<html lang="en" style="height:100%;background:#eff6fc">
3-
<head>
4-
<meta charset="utf-8">
5-
<title>OneNote Picker Sample</title>
6-
<link rel="stylesheet" href="https://static2.sharepointonline.com/files/fabric/office-ui-fabric-core/4.1.0/css/fabric.min.css">
7-
<link rel="stylesheet" href="dist/OneNotePicker.css">
8-
</head>
9-
<body style="min-height:100%" dir="ltr">
10-
<div id="oneNotePicker" style="width:350px;height:350px;margin:50px;overflow-y:scroll"></div>
11-
<button tabIndex="0">Ok</button>
12-
<button tabIndex="0">Back</button>
13-
<script src="dist/sample.js"></script>
14-
</body>
15-
</html>
3+
4+
<head>
5+
<meta charset="utf-8">
6+
<title>OneNote Picker Sample</title>
7+
<link rel="stylesheet" href="https://static2.sharepointonline.com/files/fabric/office-ui-fabric-core/4.1.0/css/fabric.min.css">
8+
<link rel="stylesheet" href="dist/OneNotePicker.css">
9+
</head>
10+
11+
<body style="min-height:100%" dir="ltr">
12+
<div id="oneNotePicker" style="width:350px;height:350px;margin:50px;overflow-y:scroll"></div>
13+
<button tabIndex="0">Ok</button>
14+
<button tabIndex="0">Back</button>
15+
<script src="dist/sample.js"></script>
16+
</body>
17+
18+
</html>

‎sampleApp/sample.tsx

+18-14
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import * as React from 'react';
22
import * as ReactDOM from 'react-dom';
33

4-
import {OneNotePicker} from '../src/oneNotePicker';
5-
import {GlobalProps} from '../src/props/globalProps';
6-
import {OneNoteDataProvider} from '../src/providers/oneNoteDataProvider';
7-
import {Notebook} from '../src/oneNoteDataStructures/notebook';
8-
import {OneNoteItemUtils} from '../src/oneNoteDataStructures/oneNoteItemUtils';
9-
import {NotebookListUpdater} from '../src/oneNoteDataStructures/notebookListUpdater';
10-
import {SampleOneNoteDataProvider} from './sampleOneNoteDataProvider';
4+
import { OneNotePicker } from '../src/oneNotePicker';
5+
import { GlobalProps } from '../src/props/globalProps';
6+
import { OneNoteDataProvider } from '../src/providers/oneNoteDataProvider';
7+
import { Notebook } from '../src/oneNoteDataStructures/notebook';
8+
import { OneNoteItemUtils } from '../src/oneNoteDataStructures/oneNoteItemUtils';
9+
import { NotebookListUpdater } from '../src/oneNoteDataStructures/notebookListUpdater';
10+
import { SampleOneNoteDataProvider } from './sampleOneNoteDataProvider';
1111

12-
let oneNoteDataProvider: OneNoteDataProvider = new SampleOneNoteDataProvider();
12+
const oneNoteDataProvider: OneNoteDataProvider = new SampleOneNoteDataProvider();
1313

14-
let render = (globalProps: GlobalProps, notebooks: Notebook[]) => {
14+
const render = (globalProps: GlobalProps, notebooks: Notebook[]) => {
1515
ReactDOM.render(
16-
<OneNotePicker globals={globalProps.globals} notebooks={notebooks}/>,
16+
<OneNotePicker globals={globalProps.globals} notebooks={notebooks} />,
1717
document.getElementById('oneNotePicker') as HTMLElement
1818
);
1919
};
@@ -23,12 +23,12 @@ oneNoteDataProvider.getNotebooks().then((notebooks) => {
2323
OneNoteItemUtils.prune(notebooks[i]);
2424
}
2525

26-
let updater = new NotebookListUpdater(notebooks);
26+
const updater = new NotebookListUpdater(notebooks);
2727

28-
let initialSelectedId = '0-752C1AAF7737895C!515';
28+
const initialSelectedId = '0-752C1AAF7737895C!515';
2929
OneNoteItemUtils.expandTo(notebooks, item => item.id === initialSelectedId);
3030

31-
let globalProps: GlobalProps = {
31+
const globalProps: GlobalProps = {
3232
globals: {
3333
focusOnMount: true,
3434
oneNoteDataProvider: oneNoteDataProvider,
@@ -40,13 +40,15 @@ oneNoteDataProvider.getNotebooks().then((notebooks) => {
4040
onSectionSelected: (section, breadcrumbs) => {
4141
globalProps.globals.selectedId = section.id;
4242

43+
// tslint:disable-next-line:no-console
4344
console.log(breadcrumbs.map(x => x.name).join(' > '));
4445

4546
render(globalProps, globalProps.globals.notebookListUpdater!.get());
4647
},
4748
onPageSelected: (page, breadcrumbs) => {
4849
globalProps.globals.selectedId = page.id;
4950

51+
// tslint:disable-next-line:no-console
5052
console.log(breadcrumbs.map(x => x.name).join(' > '));
5153

5254
render(globalProps, globalProps.globals.notebookListUpdater!.get());
@@ -57,10 +59,12 @@ oneNoteDataProvider.getNotebooks().then((notebooks) => {
5759
render(globalProps, globalProps.globals.notebookListUpdater!.get());
5860
}
5961
},
60-
selectedId: initialSelectedId
62+
selectedId: initialSelectedId,
63+
ariaSelectedId: initialSelectedId
6164
}
6265
};
6366
render(globalProps, notebooks);
6467
}).catch((value) => {
68+
// tslint:disable-next-line:no-console
6569
console.error(value);
6670
});

‎sampleApp/sampleOneNoteDataProvider.ts

+14-12
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
import '../node_modules/onenoteapi/target/oneNoteApi';
2+
import * as OneNoteApi from '../node_modules/onenoteapi/target/oneNoteApi';
23

3-
import {OneNoteDataProvider} from '../src/providers/oneNoteDataProvider';
4-
import {Notebook} from '../src/oneNoteDataStructures/notebook';
5-
import {Section} from '../src/oneNoteDataStructures/section';
6-
import {SharedNotebookApiProperties} from '../src/oneNoteDataStructures/sharedNotebook';
7-
import {Page} from '../src/oneNoteDataStructures/page';
8-
import {SharedNotebook} from '../src/oneNoteDataStructures/sharedNotebook';
9-
import {OneNoteApiResponseTransformer} from '../src/oneNoteDataStructures/oneNoteApiResponseTransformer';
4+
import { OneNoteDataProvider } from '../src/providers/oneNoteDataProvider';
5+
import { Notebook } from '../src/oneNoteDataStructures/notebook';
6+
import { Section } from '../src/oneNoteDataStructures/section';
7+
import { SharedNotebookApiProperties } from '../src/oneNoteDataStructures/sharedNotebook';
8+
import { Page } from '../src/oneNoteDataStructures/page';
9+
import { SharedNotebook } from '../src/oneNoteDataStructures/sharedNotebook';
10+
import { OneNoteApiResponseTransformer } from '../src/oneNoteDataStructures/oneNoteApiResponseTransformer';
1011

11-
let mockResponse: OneNoteApi.ResponsePackage<any> = {
12+
// tslint:disable-next-line:no-any
13+
const mockResponse: OneNoteApi.ResponsePackage<any> = {
1214
parsedResponse: JSON.parse(`{
1315
"@odata.context":"https://www.onenote.com/api/v1.0/$metadata#me/notes/notebooks","value":[
1416
{
@@ -193,14 +195,14 @@ let mockResponse: OneNoteApi.ResponsePackage<any> = {
193195

194196
export class SampleOneNoteDataProvider implements OneNoteDataProvider {
195197
getNotebooks(expands?: number, excludeReadOnlyNotebooks?: boolean): Promise<Notebook[]> {
196-
let responseTransformer = new OneNoteApiResponseTransformer();
197-
let notebooks = responseTransformer.transformNotebooks(mockResponse.parsedResponse.value);
198+
const responseTransformer = new OneNoteApiResponseTransformer();
199+
const notebooks = responseTransformer.transformNotebooks(mockResponse.parsedResponse.value);
198200
return Promise.resolve(notebooks);
199201
}
200202

201203
getPages(section: Section): Promise<Page[]> {
202-
let id = '' + (Math.floor(Math.random() * 500000));
203-
let pages = [{parent: section, id: id, name: 'Page:' + id, apiUrl: '', webUrl: ''}];
204+
const id = '' + (Math.floor(Math.random() * 500000));
205+
const pages = [{ parent: section, id: id, name: 'Page:' + id, apiUrl: '', webUrl: '' }];
204206
return Promise.resolve(pages);
205207
}
206208

‎sampleApp/standalone.html

+25-22
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,38 @@
11
<html>
2+
23
<head>
34
<title></title>
45
<link href="../dist/OneNotePicker.css" rel="stylesheet" type="text/css" />
56
<script src="https://unpkg.com/react@15/dist/react.js"></script>
67
<script src="https://unpkg.com/react-dom@15/dist/react-dom.js"></script>
78
<script src="../dist/OneNotePicker.js"></script>
89
</head>
10+
911
<body>
10-
<div id="oneNotePicker"></div>
11-
<script>
12-
var mockGlobals = {
13-
callbacks: {
14-
onNotebookSelected: function(value) {
15-
console.error(value)
12+
<div id="oneNotePicker"></div>
13+
<script>
14+
var mockGlobals = {
15+
callbacks: {
16+
onNotebookSelected: function (value) {
17+
console.error(value)
18+
}
1619
}
17-
}
18-
};
20+
};
1921

20-
var mockNotebooks = [
21-
{
22-
name: "NAME",
23-
id: "ID",
24-
expanded: true,
25-
sectionGroups: [],
26-
sections: []
27-
}
28-
];
22+
var mockNotebooks = [
23+
{
24+
name: "NAME",
25+
id: "ID",
26+
expanded: true,
27+
sectionGroups: [],
28+
sections: []
29+
}
30+
];
2931

30-
ReactDOM.render(
31-
React.createElement(OneNotePicker.OneNotePicker, { globals: mockGlobals, notebooks: mockNotebooks}, null),
32-
document.getElementById('oneNotePicker'));
33-
</script>
32+
ReactDOM.render(
33+
React.createElement(OneNotePicker.OneNotePicker, { globals: mockGlobals, notebooks: mockNotebooks }, null),
34+
document.getElementById('oneNotePicker'));
35+
</script>
3436
</body>
35-
</html>
37+
38+
</html>

‎src/components/notebookRenderStrategy.tsx

+10-10
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ import { OneNoteItemUtils } from '../oneNoteDataStructures/oneNoteItemUtils';
1010
import { InnerGlobals } from '../props/globalProps';
1111
import { NotebookOpenedIconSvg } from './icons/notebookOpenedIcon.svg';
1212
import { NotebookClosedIconSvg } from './icons/notebookClosedIcon.svg';
13-
import { ChevronSvg} from './icons/chevron.svg';
13+
import { ChevronSvg } from './icons/chevron.svg';
1414

1515
export class NotebookRenderStrategy implements ExpandableNodeRenderStrategy {
1616
onClickBinded = this.onClick.bind(this);
1717

1818
constructor(private notebook: Notebook, private globals: InnerGlobals) { }
19-
19+
2020
element(): JSX.Element {
2121
return (
2222
<div className={this.isSelected() ? 'picker-selectedItem notebook' : 'notebook'} title={this.notebook.name}>
2323
<div className={this.isExpanded() ? 'chevron-icon opened' : 'chevron-icon closed'}>
2424
<ChevronSvg />
2525
</div>
2626
<div className='picker-icon'>
27-
{this.isExpanded() ? <NotebookOpenedIconSvg/> : <NotebookClosedIconSvg />}
27+
{this.isExpanded() ? <NotebookOpenedIconSvg /> : <NotebookClosedIconSvg />}
2828
</div>
2929
<div className='picker-label'>
3030
<label>{this.notebook.name}</label>
@@ -41,18 +41,18 @@ export class NotebookRenderStrategy implements ExpandableNodeRenderStrategy {
4141
}
4242

4343
getChildren(childrenLevel: number): JSX.Element[] {
44-
let sectionGroupRenderStrategies = this.notebook.sectionGroups.map(sectionGroup => new SectionGroupRenderStrategy(sectionGroup, this.globals));
45-
let sectionGroups = sectionGroupRenderStrategies.map(renderStrategy =>
44+
const sectionGroupRenderStrategies = this.notebook.sectionGroups.map(sectionGroup => new SectionGroupRenderStrategy(sectionGroup, this.globals));
45+
const sectionGroups = sectionGroupRenderStrategies.map(renderStrategy =>
4646
!!this.globals.callbacks.onSectionSelected || !!this.globals.callbacks.onPageSelected ?
4747
<ExpandableNode
4848
expanded={renderStrategy.isExpanded()} node={renderStrategy} globals={this.globals}
4949
treeViewId={Constants.TreeView.id} key={renderStrategy.getId()}
50-
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()}/> :
50+
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()} /> :
5151
<LeafNode node={renderStrategy} treeViewId={Constants.TreeView.id} key={renderStrategy.getId()} globals={this.globals}
5252
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()} />);
5353

54-
let sectionRenderStrategies = this.notebook.sections.map(section => new SectionRenderStrategy(section, this.globals));
55-
let sections = sectionRenderStrategies.map(renderStrategy =>
54+
const sectionRenderStrategies = this.notebook.sections.map(section => new SectionRenderStrategy(section, this.globals));
55+
const sections = sectionRenderStrategies.map(renderStrategy =>
5656
!!this.globals.callbacks.onPageSelected ?
5757
<ExpandableNode
5858
expanded={renderStrategy.isExpanded()} node={renderStrategy} globals={this.globals}
@@ -77,13 +77,13 @@ export class NotebookRenderStrategy implements ExpandableNodeRenderStrategy {
7777
}
7878

7979
private onClick() {
80-
let onNotebookSelected = this.globals.callbacks.onNotebookSelected;
80+
const onNotebookSelected = this.globals.callbacks.onNotebookSelected;
8181
if (!!onNotebookSelected) {
8282
onNotebookSelected(this.notebook, OneNoteItemUtils.getAncestry(this.notebook));
8383
}
8484

8585
if (this.globals.callbacks.onSectionSelected || this.globals.callbacks.onPageSelected) {
8686
this.notebook.expanded = !this.notebook.expanded;
87-
}
87+
}
8888
}
8989
}

‎src/components/pageRenderStrategy.tsx

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import * as React from 'react';
22

3-
import {Strings} from '../strings';
4-
import {NodeRenderStrategy} from './treeView/nodeRenderStrategy';
5-
import {Page} from '../oneNoteDataStructures/page';
6-
import {OneNoteItemUtils} from '../oneNoteDataStructures/oneNoteItemUtils';
7-
import {InnerGlobals} from '../props/globalProps';
3+
import { Strings } from '../strings';
4+
import { NodeRenderStrategy } from './treeView/nodeRenderStrategy';
5+
import { Page } from '../oneNoteDataStructures/page';
6+
import { OneNoteItemUtils } from '../oneNoteDataStructures/oneNoteItemUtils';
7+
import { InnerGlobals } from '../props/globalProps';
88

99
export class PageRenderStrategy implements NodeRenderStrategy {
1010
onClickBinded = this.onClick.bind(this);
@@ -18,12 +18,12 @@ export class PageRenderStrategy implements NodeRenderStrategy {
1818
<div className='picker-icon'>
1919
<img
2020
src={require('../images/section_icon.png')}
21-
alt={Strings.get('Accessibility.PageIcon', this.globals.strings)}/>
21+
alt={Strings.get('Accessibility.PageIcon', this.globals.strings)} />
2222
</div>
2323
<div>
2424
<label className='ms-fontSize-sPlus'>{this.page.name}</label>
2525
</div>
26-
</div>
26+
</div>
2727
);
2828
}
2929

@@ -44,7 +44,7 @@ export class PageRenderStrategy implements NodeRenderStrategy {
4444
}
4545

4646
private onClick() {
47-
let onPageSelected = this.globals.callbacks.onPageSelected;
47+
const onPageSelected = this.globals.callbacks.onPageSelected;
4848
if (!!onPageSelected) {
4949
onPageSelected(this.page, OneNoteItemUtils.getAncestry(this.page));
5050
}

‎src/components/sectionGroupRenderStrategy.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import { Constants } from '../constants';
88
import { SectionGroup } from '../oneNoteDataStructures/sectionGroup';
99
import { InnerGlobals } from '../props/globalProps';
1010
import { SectionGroupIconSvg } from './icons/sectionGroupIcon.svg';
11-
import { ChevronSvg} from './icons/chevron.svg';
11+
import { ChevronSvg } from './icons/chevron.svg';
1212

1313
export class SectionGroupRenderStrategy implements ExpandableNodeRenderStrategy {
1414
onClickBinded = this.onClick.bind(this);
1515

1616
constructor(private sectionGroup: SectionGroup, private globals: InnerGlobals) { }
17-
17+
1818
element(): JSX.Element {
1919
return (
2020
<div className='section-group' title={this.sectionGroup.name}>
@@ -39,8 +39,8 @@ export class SectionGroupRenderStrategy implements ExpandableNodeRenderStrategy
3939
}
4040

4141
getChildren(childrenLevel: number): JSX.Element[] {
42-
let sectionGroupRenderStrategies = this.sectionGroup.sectionGroups.map(sectionGroup => new SectionGroupRenderStrategy(sectionGroup, this.globals));
43-
let sectionGroups = sectionGroupRenderStrategies.map(renderStrategy =>
42+
const sectionGroupRenderStrategies = this.sectionGroup.sectionGroups.map(sectionGroup => new SectionGroupRenderStrategy(sectionGroup, this.globals));
43+
const sectionGroups = sectionGroupRenderStrategies.map(renderStrategy =>
4444
!!this.globals.callbacks.onSectionSelected || !!this.globals.callbacks.onPageSelected ?
4545
<ExpandableNode
4646
expanded={renderStrategy.isExpanded()} node={renderStrategy} globals={this.globals}
@@ -49,8 +49,8 @@ export class SectionGroupRenderStrategy implements ExpandableNodeRenderStrategy
4949
<LeafNode node={renderStrategy} treeViewId={Constants.TreeView.id} key={renderStrategy.getId()} globals={this.globals}
5050
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()} />);
5151

52-
let sectionRenderStrategies = this.sectionGroup.sections.map(section => new SectionRenderStrategy(section, this.globals));
53-
let sections = sectionRenderStrategies.map(renderStrategy =>
52+
const sectionRenderStrategies = this.sectionGroup.sections.map(section => new SectionRenderStrategy(section, this.globals));
53+
const sections = sectionRenderStrategies.map(renderStrategy =>
5454
!!this.globals.callbacks.onPageSelected ?
5555
<ExpandableNode expanded={renderStrategy.isExpanded()} node={renderStrategy} globals={this.globals}
5656
treeViewId={Constants.TreeView.id} key={renderStrategy.getId()}

0 commit comments

Comments
 (0)