Skip to content

Commit

Permalink
Remove conclusion from docs
Browse files Browse the repository at this point in the history
Signed-off-by: Omkar Phansopkar <[email protected]>
  • Loading branch information
OmkarPh committed May 1, 2022
1 parent 5564589 commit 0244dec
Show file tree
Hide file tree
Showing 13 changed files with 8 additions and 185 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ New Features
- Update app icon to a more visible one #382
- Add color to DataTables "Progress..." pop-up #407
- Update the display of scan headers #400
- Remove ability to edit conclusions & remove conclusions view

Bug Fixes
~~~~~~~~~
Expand Down
9 changes: 2 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,9 @@

ScanCode Workbench provides an advanced visual UI to help you quickly evaluate
license and other notices identified by
[ScanCode](https://github.com/nexB/scancode-toolkit/) and record your conclusion
about the effective license(s) for a component.
[ScanCode](https://github.com/nexB/scancode-toolkit/).
[ScanCode](https://github.com/nexB/scancode-toolkit/) detects licenses, copyrights
and other interesting information in your code. ScanCode Workbench allows you to take the
scan results from ScanCode and create conclusions. By creating these conclusions
within your codebase, you are creating a software inventory of your product.
The conclusions (Concluded License, Concluded Owner, etc.) you make when
creating your conclusion can be exported as a JSON file or saved as SQLite file.
and other interesting information in your code.

ScanCode Workbench is based on
[Electron](https://electron.atom.io/) and will be the primary desktop/GUI tool
Expand Down
9 changes: 4 additions & 5 deletions assets/app/js/renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ $(document).ready(() => {
// Save a SQLite Database file
saveSQLiteFileButton.click(saveSQLite);

// Show ScanData DataTable. Hide node view and conclusion summary table
// Show ScanData DataTable. Hide node view
showScanDataButton.click(() => {
splitter.show();
scanDataTable.redraw();
Expand Down Expand Up @@ -414,7 +414,7 @@ $(document).ready(() => {
});
}

/** Export JSON file with original ScanCode data and conclusions that have been created */
/** Export JSON file with original ScanCode data */
function exportJson() {
dialog.showSaveDialog({
properties: ['openFile'],
Expand Down Expand Up @@ -455,15 +455,14 @@ $(document).ready(() => {

Promise.all([scanCodeInfoPromise, workbenchInfoPromise,
filesCountPromise, scanDataFilesPromise])
.then(([scanCodeInfo, workbenchInfo, filesCount, scanDataFiles, conclusions]) => {
.then(([scanCodeInfo, workbenchInfo, filesCount, scanDataFiles]) => {
const json = {
workbench_notice: workbenchInfo.workbench_notice,
workbench_version: workbenchInfo.workbench_version,
scancode_version: scanCodeInfo.scancode_version,
scancode_options: scanCodeInfo.scancode_options,
files_count: filesCount,
files: scanDataFiles,
conclusions: conclusions
files: scanDataFiles
};

fs.writeFile(fileName, JSON.stringify(json), (err) => {
Expand Down

This file was deleted.

Binary file not shown.
Binary file not shown.
8 changes: 0 additions & 8 deletions docs/source/how-to-guides/create-conclusions/index.rst

This file was deleted.

1 change: 0 additions & 1 deletion docs/source/how-to-guides/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ a ``-clipeu`` scan of ``e2fsprogs-1.45.6.tar.gz``.
load-your-data/index
lookup-scan-version/index
explore-your-data/index
create-conclusions/index
export-json-records/index
troubleshooting/index
special-topics/index
2 changes: 0 additions & 2 deletions docs/source/overview/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ scans. With ScanCode Workbench, you can:
- Load a `ScanCode Toolkit <https://github.com/nexB/scancode-toolkit>`__ ``.json`` scan of
your codebase.
- Use an advanced visual UI to analyze license and other notices identified by ScanCode Toolkit.
- Record your conclusions about the effective license(s) for a component or package.
- Easily export your conclusions as a ``.json`` file.

Organization of the Documentation
=================================
Expand Down
7 changes: 0 additions & 7 deletions docs/source/ui-reference/conclusion-view.rst

This file was deleted.

1 change: 0 additions & 1 deletion docs/source/ui-reference/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@
license-info-dashboard
package-info-dashboard
chart-summary-view
conclusion-view
6 changes: 1 addition & 5 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -381,11 +381,7 @@ <h2 class="modal-title" id="helpModalLabel">ScanCode Workbench Help</h2>
<h3>Overview</h3>
<p>
ScanCode Workbench allows you take the scan results
from the ScanCode and create a conclusion-level
software inventory. The conclusions (Concluded License,
Concluded Owner, etc.) you make when creating your
conclusion can be exported as a JSON file or saved as
SQLite file. For more information, see our
from the ScanCode and evaluate it using charts
</p>
<p>
For more details, see our
Expand Down
54 changes: 0 additions & 54 deletions test/workbenchDB.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -331,60 +331,6 @@ describe('checkWorkbenchDB', () => {
});
});

describe('setConclusion', () => {
it('should create a conclusion in Component Table', () => {
const workbenchDB = new WorkbenchDB();
const conclusion = {
'license_expression': 'apache-1.1',
'copyright': '(c) 2004 by Henrik Ravn',
'copyrights': [
{
'statements': [
'(c) 2004 by Henrik Ravn'
]
}
],
'path': 'samples',
'review_status': 'attention',
'name': 'samples',
'version': '1.0',
'owner': 'Jean-loup Gailly, Brian Raiter',
'homepage_url': 'http://www.jboss.org/',
'programming_language': 'C',
'notes': ''
};

const conclusion2 = {
'license_expression': 'zlib',
'copyright': 'Copyright (c) 1995-2013 Jean-loup Gailly and Mark Adler',
'copyrights': [
{
'statements': [
'Copyright (c) 1995-2013 Jean-loup Gailly and Mark Adler'
]
}
],
'path': 'samples/zlib',
'review_status': 'analyzed',
'name': 'zlib',
'version': '1.0',
'owner': 'Jean-loup Gailly and Mark Adler',
'homepage_url': 'http://www.zlib.net/',
'programming_language': 'C#',
'notes': ''
};

return workbenchDB.sync
.then(() => workbenchDB.setConclusion(conclusion))
.then(() => workbenchDB.db.Conclusion.count())
.then((rowCount) => assert.strictEqual(rowCount, 1))
.then((row) => assert.containSubset(row.toJSON(), conclusion))
.then(() => workbenchDB.setConclusion(conclusion2))
.then(() => workbenchDB.db.Conclusion.count())
.then((rowCount) => assert.strictEqual(rowCount, 2));
});
});

describe('getFileCount', () => {
it('should return the ScanCode files_count', () => {
const workbenchDB = new WorkbenchDB();
Expand Down

0 comments on commit 0244dec

Please sign in to comment.