Skip to content

Commit 5e060ff

Browse files
committed
#25: Adding homepage url and programming language as component fields
1 parent 16dea88 commit 5e060ff

File tree

3 files changed

+31
-0
lines changed

3 files changed

+31
-0
lines changed

assets/js/scancode.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ $(document).ready(function () {
4848
}));
4949
parties = $.unique(parties.concat(component.party.name));
5050

51+
var programming_language = $.unique($.map(subNodes, function(node, i) {
52+
return node.programming_language;
53+
}));
54+
programming_language = $.unique(programming_language.concat(component.programming_language));
55+
5156
// update select2 selectors for node view component
5257
$("#select-license").html('').select2({
5358
data: licenses,
@@ -71,12 +76,22 @@ $(document).ready(function () {
7176
tags: true
7277
}, true);
7378

79+
$("#select-language").html('').select2({
80+
data: programming_language,
81+
multiple: true,
82+
maximumSelectionLength: 1,
83+
placeholder: "Enter language",
84+
tags: true
85+
}, true);
86+
7487
$("#select-status").val(component.review_status);
7588
$('#component-name').val(component.name);
7689
$('#component-version').val(component.version);
7790
$('#select-license').val(component.licenses);
7891
$('#select-copyright').val(component.copyrights);
7992
$('#select-owner').val(component.party.name);
93+
$('#select-language').val(component.programming_language);
94+
$('#component-homepage-url').val(component.homepage_url);
8095
$('#component-notes').val(component.notes);
8196

8297
// Notify only select2 of changes
@@ -228,13 +243,19 @@ $(document).ready(function () {
228243
if ($('#select-owner').val()) {
229244
party = {name: $('#select-owner').val()[0], role: 'owner'}
230245
}
246+
var programming_language = "";
247+
if ($('#select-language').val()) {
248+
programming_language = $('#select-language').val()[0];
249+
}
231250
var component = {
232251
review_status: $("#select-status").val(),
233252
name: $('#component-name').val(),
234253
version: $('#component-version').val(),
235254
licenses: $('#select-license').val(),
236255
copyrights: $('#select-copyright').val(),
237256
party: party,
257+
programming_language: programming_language,
258+
homepage_url: $('#component-homepage-url').val(),
238259
notes: $('#component-notes').val()
239260
};
240261
scanData.setComponent(id, component);

index.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,14 @@ <h3 class="modal-title" id="nodeModalLabel">Modal title</h3>
128128
<fieldset class="form-group">
129129
<label>Copyright</label>
130130
<select data-hide-on-select="true" class="form-control" id="select-copyright" type="text"></select>
131+
</fieldset>
132+
<fieldset class="form-group">
133+
<label>Programming Language</label>
134+
<select data-hide-on-select="true" class="form-control" id="select-language" type="text"></select>
135+
</fieldset>
136+
<fieldset class="form-group">
137+
<label>Homepage URL</label>
138+
<input type="text" class="form-control" id="component-homepage-url" placeholder="Enter Homepage URL">
131139
</fieldset>
132140
<fieldset class="form-group">
133141
<label for="component-notes">Notes</label>

test/scanData.test.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ describe("testSavingAndLoading", function () {
198198
licenses: [ 'nexB Proprietary', 'ZLIB License' ],
199199
copyrights: [ 'Copyright (c) 2016 nexB, Inc.' ],
200200
party: [ 'nexB' ],
201+
programming_language: '',
201202
notes: ''
202203
}
203204
}
@@ -220,6 +221,7 @@ describe("testSavingAndLoading", function () {
220221
],
221222
copyrights: [ 'Copyright (c) 2016 nexB, Inc.' ],
222223
party: [ 'nexB' ],
224+
programming_language: '',
223225
notes: '',
224226
license_expression: "nexb proprietary and zlib license"
225227
}]

0 commit comments

Comments
 (0)