Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(SPDX): Use new SPDX library and New SPDX feature for import/export/edit #1503

Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' into releases/feature-spdx_information_management
  • Loading branch information
tuannn2 committed Jun 23, 2022
commit 1e45b5b55c3cd7dcf61f9cb36012b869923ed342
Original file line number Diff line number Diff line change
@@ -1717,7 +1717,7 @@ public RequestStatus deleteRelease(String id, User user) throws SW360Exception {
spdxDocumentDatabaseHandler.deleteSPDXDocument(spdxId, user);
release = releaseRepository.get(id);
}
Component componentAfter=removeReleaseAndCleanUp(release);
Component componentAfter=removeReleaseAndCleanUp(release, user);
dbHandlerUtil.addChangeLogs(null, release, user.getEmail(), Operation.DELETE, attachmentConnector,
Lists.newArrayList(), null, null);
dbHandlerUtil.addChangeLogs(componentAfter, componentBefore, user.getEmail(), Operation.UPDATE,
Original file line number Diff line number Diff line change
@@ -210,7 +210,7 @@
<script>
document.title = $("<span></span>").html("<sw360:out value='${component.name}'/> - " + document.title).text();

require(['jquery','components/includes/releases/regexjs','components/includes/releases/linkProject', 'modules/button', 'modules/listgroup', 'utils/includes/clipboard'], function($,regexjs,linkProject, button, listgroup, clipboard) {
require(['jquery','components/includes/releases/regexjs','components/includes/releases/linkProject', 'modules/button', 'modules/listgroup', 'utils/includes/clipboard', 'modules/dialog'], function($,regexjs,linkProject, button, listgroup, clipboard, dialog) {
linkProject.initialize();
listgroup.initialize('detailTab', $('#detailTab').data('initial-tab') || 'tab-Summary');

Original file line number Diff line number Diff line change
@@ -273,8 +273,10 @@ struct Release {
90: optional DocumentState documentState,

200: optional map<RequestedAction, bool> permissions,

400: optional string spdxId,
204: optional string modifiedBy, // Last Modified By User Email
205: optional string modifiedOn, // Last Modified Date YYYY-MM-dd
}

enum ComponentType {
@@ -853,4 +855,8 @@ service ComponentService {
* parse a bom file and write the information to SW360
**/
RequestSummary exportSPDX(1: User user, 2:string releaseId, 3:string outputFormat);
/**
* Send email to the user once spreadsheet export completed
*/
void sendExportSpreadsheetSuccessMail(1: string url, 2: string userEmail);
}
Original file line number Diff line number Diff line change
@@ -187,7 +187,11 @@ static abstract class MultiStatusMixin extends MultiStatus {
"externalUrls",
"setVendor",
"setVendorId",
"setSpdxId"
"setSpdxId",
"setModifiedOn",
"modifiedOn",
"setModifiedBy",
"modifiedBy"
})
static abstract class ProjectMixin extends Project {

You are viewing a condensed version of this merge commit. You can view the full changes here.