-
Notifications
You must be signed in to change notification settings - Fork 88
fix(externalIds): handle package-url stored as JSON array string #1617
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
Open
bibhuti230185
wants to merge
4
commits into
eclipse-sw360:main
Choose a base branch
from
siemens:fix/package-url-external-key
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+100
−15
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
ba620fb
fix(actions): do not build docker cron
GMishx 6ea93c0
Merge branch 'eclipse-sw360:main' into main
GMishx ab32633
fix(externalIds): handle package-url stored as JSON array string
bibhuti230185 5049cb5
Merge branch 'main' into fix/package-url-external-key
amritkv File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,7 @@ | |
| 'use client' | ||
|
|
||
| import { useTranslations } from 'next-intl' | ||
| import React, { type JSX, useEffect, useState } from 'react' | ||
| import React, { type JSX, useCallback, useEffect, useState } from 'react' | ||
| import { OverlayTrigger, Tooltip } from 'react-bootstrap' | ||
| import { BsFillTrashFill } from 'react-icons/bs' | ||
| import DeleteItemWarning from '@/components/sw360/DeleteItemWarning/DeleteItemWarning' | ||
|
|
@@ -44,6 +44,33 @@ function AddKeyValue(props: Props): JSX.Element { | |
| props.data, | ||
| ]) | ||
|
|
||
| /** | ||
| * Converts an input list to a map, with special handling for 'package-url' key. | ||
| * Multiple 'package-url' entries are combined into a single JSON array string. | ||
| */ | ||
| const convertListToMap = useCallback((list: Input[]): Map<string, string> => { | ||
| const map = new Map<string, string>() | ||
| const packageUrls: string[] = [] | ||
|
|
||
| list.forEach((item) => { | ||
| if (item.key === 'package-url') { | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hey @bibhuti230185 ! |
||
| // Collect all package-url values | ||
| if (item.value.trim() !== '') { | ||
| packageUrls.push(item.value) | ||
| } | ||
| } else { | ||
| map.set(item.key, item.value) | ||
| } | ||
| }) | ||
|
|
||
| // Combine package-url values into a JSON array string | ||
| if (packageUrls.length > 0) { | ||
| map.set('package-url', JSON.stringify(packageUrls)) | ||
| } | ||
|
|
||
| return map | ||
| }, []) | ||
|
|
||
| const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>, index: number) => { | ||
| const { name, value } = e.target | ||
| const list: Input[] = [ | ||
|
|
@@ -52,11 +79,7 @@ function AddKeyValue(props: Props): JSX.Element { | |
| list[index][name as keyof Input] = value | ||
| props.setData(list) | ||
| if (props.setObject) { | ||
| const map = new Map<string, string>() | ||
| list.forEach((item) => { | ||
| map.set(item.key, item.value) | ||
| }) | ||
| props.setObject(map) | ||
| props.setObject(convertListToMap(list)) | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -67,11 +90,7 @@ function AddKeyValue(props: Props): JSX.Element { | |
| list[index].key = value | ||
| props.setData(list) | ||
| if (props.setObject) { | ||
| const map = new Map<string, string>() | ||
| list.forEach((item) => { | ||
| map.set(item.key, item.value) | ||
| }) | ||
| props.setObject(map) | ||
| props.setObject(convertListToMap(list)) | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey @bibhuti230185 !
I think we need this schedule cron job