Skip to content
This repository was archived by the owner on Mar 25, 2021. It is now read-only.

Commit 9c32e15

Browse files
romanlabromanlab
authored
Merge pull request #34 from datreeio/fix-deprecated
Fix deprecated
2 parents 43cfceb + a736aaf commit 9c32e15

2 files changed

Lines changed: 21 additions & 58 deletions

File tree

‎lib/cli-renderer.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class Renderer {
6060
createPackageRow(data, type, hasHigherScore) {
6161
let style = chalk
6262
if (type === SOURCE_PACKAGE_TYPE) style = style.bold
63-
if (data.deprecated) style = style.red
63+
if (data.quality.deprecated) style = style.red
6464
const dataSet = [
6565
`${style(data.name || '')}`,
6666
`${style(data.recommendedVersion || 'No Insight')}`,
@@ -76,7 +76,7 @@ class Renderer {
7676
}
7777
createVersionRow(data) {
7878
let style = chalk
79-
if (data.deprecated) style = style.red
79+
if (data.quality.deprecated) style = style.red
8080

8181
return [
8282
`${style(data.name || '')}`,
@@ -165,7 +165,7 @@ class Renderer {
165165
}
166166

167167
renderLegend(packageList) {
168-
if (packageList.some(pkg => pkg.source.deprecated))
168+
if (packageList.some(pkg => pkg.source.quality.deprecated))
169169
this.queue.push(`${chalk.bgRed.bold(' ')} - ${chalk('Package is deprecated')}`)
170170
}
171171

@@ -185,7 +185,7 @@ class Renderer {
185185

186186
_renderSinglePackageLinks(packageList) {
187187
for (const pkg of packageList)
188-
if (pkg.source.deprecated)
188+
if (pkg.source.quality.deprecated)
189189
this.queue.push(chalk`{blue.bold https://platform.datree.io/pkg/single-package/${pkg.source.name}}`)
190190
}
191191
}

‎test/unit/cli-renderer.test.js‎

Lines changed: 17 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ describe('Renderer', function() {
2525
{
2626
source: {
2727
name: 'koa',
28+
quality: {},
2829
version: '2.4.1',
2930
description: 'Koa web app framework',
3031
score: {
@@ -37,16 +38,7 @@ describe('Renderer', function() {
3738
},
3839
publisherUsername: 'jongleberry',
3940
license: 'MIT',
40-
keywords: [
41-
'web',
42-
'app',
43-
'http',
44-
'application',
45-
'framework',
46-
'middleware',
47-
'rack'
48-
],
49-
deprecated: null,
41+
keywords: ['web', 'app', 'http', 'application', 'framework', 'middleware', 'rack'],
5042
date: '2017-11-06T14:31:37.351Z',
5143
status: 'found',
5244
size: 1912,
@@ -56,6 +48,7 @@ describe('Renderer', function() {
5648
alternatives: [
5749
{
5850
name: 'express',
51+
quality: {},
5952
version: '4.16.2',
6053
description: 'Fast, unopinionated, minimalist web framework',
6154
score: {
@@ -68,18 +61,7 @@ describe('Renderer', function() {
6861
},
6962
publisherUsername: 'dougwilson',
7063
license: 'MIT',
71-
keywords: [
72-
'express',
73-
'framework',
74-
'sinatra',
75-
'web',
76-
'rest',
77-
'restful',
78-
'router',
79-
'app',
80-
'api'
81-
],
82-
deprecated: null,
64+
keywords: ['express', 'framework', 'sinatra', 'web', 'rest', 'restful', 'router', 'app', 'api'],
8365
date: '2017-10-10T03:13:46.364Z',
8466
status: 'found',
8567
size: 8875,
@@ -88,6 +70,7 @@ describe('Renderer', function() {
8870
},
8971
{
9072
name: 'hapi',
73+
quality: {},
9174
version: '17.0.2',
9275
description: 'HTTP Server framework',
9376
score: {
@@ -166,6 +149,7 @@ describe('Renderer', function() {
166149
{
167150
source: {
168151
name: 'koa',
152+
quality: {},
169153
version: '2.4.1',
170154
description: 'Koa web app framework',
171155
score: {
@@ -178,16 +162,7 @@ describe('Renderer', function() {
178162
},
179163
publisherUsername: 'jongleberry',
180164
license: 'MIT',
181-
keywords: [
182-
'web',
183-
'app',
184-
'http',
185-
'application',
186-
'framework',
187-
'middleware',
188-
'rack'
189-
],
190-
deprecated: null,
165+
keywords: ['web', 'app', 'http', 'application', 'framework', 'middleware', 'rack'],
191166
date: '2017-11-06T14:31:37.351Z',
192167
status: 'found',
193168
size: 1912,
@@ -197,6 +172,7 @@ describe('Renderer', function() {
197172
alternatives: [
198173
{
199174
name: 'express',
175+
quality: {},
200176
version: '4.16.2',
201177
description: 'Fast, unopinionated, minimalist web framework',
202178
score: {
@@ -209,18 +185,8 @@ describe('Renderer', function() {
209185
},
210186
publisherUsername: 'dougwilson',
211187
license: 'MIT',
212-
keywords: [
213-
'express',
214-
'framework',
215-
'sinatra',
216-
'web',
217-
'rest',
218-
'restful',
219-
'router',
220-
'app',
221-
'api'
222-
],
223-
deprecated: null,
188+
keywords: ['express', 'framework', 'sinatra', 'web', 'rest', 'restful', 'router', 'app', 'api'],
189+
224190
date: '2017-10-10T03:13:46.364Z',
225191
status: 'found',
226192
size: 8875,
@@ -229,6 +195,7 @@ describe('Renderer', function() {
229195
},
230196
{
231197
name: 'hapi',
198+
quality: {},
232199
version: '17.0.2',
233200
description: 'HTTP Server framework',
234201
score: {
@@ -242,7 +209,7 @@ describe('Renderer', function() {
242209
publisherUsername: 'hueniverse',
243210
license: 'BSD-3-Clause',
244211
keywords: ['framework', 'http', 'api', 'web'],
245-
deprecated: null,
212+
246213
date: '2017-11-21T07:25:37.190Z',
247214
status: 'found',
248215
size: 12589,
@@ -266,9 +233,9 @@ describe('Renderer', function() {
266233
const renderer = new Renderer({ logger })
267234
before(function() {
268235
renderer.renderLink('single', [
269-
{ source: { name: 'koa', deprecated: true } },
270-
{ source: { name: 'mongoose', deprecated: true } },
271-
{ source: { name: 'notDeprecated', deprecated: false } }
236+
{ source: { name: 'koa', quality: { deprecated: true } } },
237+
{ source: { name: 'mongoose', quality: { deprecated: true } } },
238+
{ source: { name: 'notDeprecated', quality: { deprecated: false } } }
272239
])
273240
})
274241

@@ -277,12 +244,8 @@ describe('Renderer', function() {
277244
})
278245

279246
it('should have the correct links for the footer', function() {
280-
renderer.queue[0].should.eql(
281-
chalk`{blue.bold https://platform.datree.io/pkg/single-package/koa}`
282-
)
283-
renderer.queue[1].should.eql(
284-
chalk`{blue.bold https://platform.datree.io/pkg/single-package/mongoose}`
285-
)
247+
renderer.queue[0].should.eql(chalk`{blue.bold https://platform.datree.io/pkg/single-package/koa}`)
248+
renderer.queue[1].should.eql(chalk`{blue.bold https://platform.datree.io/pkg/single-package/mongoose}`)
286249
})
287250
})
288251
})

0 commit comments

Comments
 (0)