Skip to content

Commit 0dc45da

Browse files
Akos Kittajbicker
Akos Kitta
authored andcommitted
aligned list view styles.
Signed-off-by: Akos Kitta <kittaakos@typefox.io>
1 parent 3fcf5a6 commit 0dc45da

File tree

4 files changed

+21
-4
lines changed

4 files changed

+21
-4
lines changed

arduino-ide-extension/src/browser/boards/boards-item-renderer.tsx

+17-1
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,38 @@ export class BoardItemRenderer extends ListItemRenderer<BoardPackage> {
1515
</div>;
1616

1717
const summary = <div className='summary'>{item.summary}</div>;
18+
const description = <div className='summary'>{item.description}</div>;
1819

1920
const moreInfo = !!item.moreInfoLink && <a href={item.moreInfoLink} onClick={this.onClick}>More info</a>;
2021
const installButton = item.installable && !item.installedVersion &&
2122
<button className='install' onClick={install.bind(this, item)}>INSTALL</button>;
2223

24+
const versions = (() => {
25+
const { availableVersions } = item;
26+
if (!!item.installedVersion || availableVersions.length === 0) {
27+
return undefined;
28+
} else if (availableVersions.length === 1) {
29+
return <label>{availableVersions[0]}</label>
30+
} else {
31+
return <select>{item.availableVersions.map(version => <option value={version} key={version}>{version}</option>)}</select>;
32+
}
33+
})();
34+
2335
return <div className='component-list-item noselect'>
2436
<div className='header'>
2537
<span>{name} by {author}</span>
2638
{installedVersion}
2739
</div>
2840
<div className='content'>
2941
{summary}
42+
{description}
3043
</div>
31-
<div className='footer'>
44+
<div className='info'>
3245
{moreInfo}
46+
</div>
47+
<div className='footer'>
3348
{installButton}
49+
{versions}
3450
</div>
3551
</div>;
3652
}

arduino-ide-extension/src/browser/library/library-item-renderer.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export class LibraryItemRenderer extends ListItemRenderer<Library> {
2222

2323
const versions = (() => {
2424
const { availableVersions } = item;
25-
if (availableVersions.length === 0) {
25+
if (!!item.installedVersion || availableVersions.length === 0) {
2626
return undefined;
2727
} else if (availableVersions.length === 1) {
2828
return <label>{availableVersions[0]}</label>

arduino-ide-extension/src/node/boards-service-impl.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,13 @@ export class BoardsServiceImpl implements BoardsService {
172172
id: item.getId(),
173173
name: item.getName(),
174174
author: item.getMaintainer(),
175-
availableVersions: [item.getInstalled()],
175+
availableVersions: [item.getLatest()],
176176
description: item.getBoardsList().map(b => b.getName()).join(", "),
177177
installable: true,
178178
summary: "Boards included in this package:",
179179
installedVersion,
180180
boards: item.getBoardsList().map(b => <Board>{ name: b.getName(), fqbn: b.getFqbn() }),
181+
moreInfoLink: item.getWebsite()
181182
}
182183
return result;
183184
});

arduino-ide-extension/src/node/library-service-impl.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export class LibraryServiceImpl implements LibraryService {
4141
const resp = await new Promise<LibrarySearchResp>((resolve, reject) => client.librarySearch(req, (err, resp) => !!err ? reject(err) : resolve(resp)));
4242
const items = resp.getLibrariesList()
4343
.filter(item => !!item.getLatest())
44-
.slice(0, 50)
44+
// .slice(0, 50)
4545
.map(item => {
4646
let installedVersion: string | undefined;
4747
const installed = installedLibsIdx.get(item.getName());

0 commit comments

Comments
 (0)