Merge pull request #97 from konflux-jp-repos/KONFLUX-6512

fix(KONFLUX-6512): restore allow input CVE for release
konflux-ci · Feb 5, 2025 · 7ea7e09 · 7ea7e09
2 parents 39c0ff7 + cfedee1
commit 7ea7e09
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/components/ReleaseService/ReleasePlan/TriggerRelease/AddIssueSection/CVEFormContent.tsx b/src/components/ReleaseService/ReleasePlan/TriggerRelease/AddIssueSection/CVEFormContent.tsx
@@ -40,7 +40,7 @@ const CVEFormContent: React.FC<CVEFormContentProps> = ({ modalToggle }) => {
           </TextContent>
         </StackItem>
         <StackItem>
-          <InputField data-test="cve-issue-id" label="CVE ID" name="id" required />
+          <InputField data-test="cve-issue-id" label="CVE ID" name="key" required />
         </StackItem>
         <StackItem>
           <ComponentField name="components" />

diff --git a/...leaseService/ReleasePlan/TriggerRelease/AddIssueSection/__tests__/CVEFormContent.spec.tsx b/...leaseService/ReleasePlan/TriggerRelease/AddIssueSection/__tests__/CVEFormContent.spec.tsx
@@ -26,7 +26,7 @@ describe('CVEFormContent', () => {
 
   it('should show correct values', () => {
     formikRenderer(<CVEFormContent modalToggle={null} />, {
-      id: 'CVE-120',
+      key: 'CVE-120',
       components: [
         { name: 'a', packages: ['p1', 'p2', 'p3'] },
         { name: 'b', packages: ['p1', 'p2', 'p3'] },
@@ -37,7 +37,7 @@ describe('CVEFormContent', () => {
 
   it('should render component fields ', async () => {
     formikRenderer(<CVEFormContent modalToggle={null} />, {
-      id: 'CVE-120',
+      key: 'CVE-120',
       components: [
         { name: 'a', packages: ['p1', 'p2', 'p3'] },
         { name: 'b', packages: ['p1', 'p2', 'p3'] },
@@ -52,7 +52,7 @@ describe('CVEFormContent', () => {
 
   it('should remove component fields ', () => {
     formikRenderer(<CVEFormContent modalToggle={null} />, {
-      id: 'CVE-120',
+      key: 'CVE-120',
       components: [
         { name: 'a', packages: ['p1', 'p2', 'p3'] },
         { name: 'b', packages: ['p1', 'p2', 'p3'] },
@@ -80,7 +80,7 @@ describe('CVEFormContent', () => {
 
   it('should render multiple packages ', () => {
     formikRenderer(<CVEFormContent modalToggle={null} />, {
-      id: 'CVE-120',
+      key: 'CVE-120',
       components: [
         { name: 'a', packages: ['p1', 'p2', 'p3'] },
         { name: 'b', packages: ['p3', 'p4', 'p3'] },

diff --git a/src/components/ReleaseService/ReleasePlan/TriggerRelease/__tests__/form-utils.spec.ts b/src/components/ReleaseService/ReleasePlan/TriggerRelease/__tests__/form-utils.spec.ts
@@ -62,9 +62,9 @@ describe('triggerReleasePlan', () => {
         topic: 'topic of release',
         references: 'references',
         issues: [
-          { id: 'RHTAP-5560', summary: 'summary1', url: 'test-url' },
-          { id: 'RHTAP-5561', summary: 'summary2', url: 'test-url2' },
-          { id: 'RHTAP-5562', summary: 'summary3', url: 'test-url2' },
+          { key: 'RHTAP-5560', summary: 'summary1', url: 'test-url' },
+          { key: 'RHTAP-5561', summary: 'summary2', url: 'test-url2' },
+          { key: 'RHTAP-5562', summary: 'summary3', url: 'test-url2' },
         ],
         labels: [],
       },

diff --git a/src/components/ReleaseService/ReleasePlan/TriggerRelease/form-utils.ts b/src/components/ReleaseService/ReleasePlan/TriggerRelease/form-utils.ts
@@ -11,7 +11,7 @@ export enum ReleasePipelineLocation {
 
 const getIssues = (issues): { id: string; source: string }[] => {
   return issues?.map((issue) => {
-    return { id: issue.id, source: issue.url };
+    return { id: issue.key, source: issue.url };
   });
 };