Merge pull request #134 from vishnoianil/fix-knowledge

Fix follow knowledge form related issues
instructlab · Aug 27, 2024 · 564c847 · 564c847
2 parents 8770353 + 92218fb
commit 564c847
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/src/app/api/pr/knowledge/route.ts b/src/app/api/pr/knowledge/route.ts
@@ -31,7 +31,7 @@ export async function POST(req: NextRequest) {
 
   try {
     const body = await req.json();
-    const { content, name, email, submission_summary, attribution, filePath } = body;
+    const { content, attribution, name, email, submissionSummary, documentOutline, filePath } = body;
 
     const knowledgeData: KnowledgeYamlData = yaml.load(content) as KnowledgeYamlData;
     const attributionData: AttributionData = attribution;
@@ -78,11 +78,11 @@ Creator names: ${attributionData.creator_names}
         { path: newAttributionFilePath, content: attributionContent }
       ],
       branchName,
-      `${submission_summary}\n\nSigned-off-by: ${name} <${email}>`
+      `${submissionSummary}\n\nSigned-off-by: ${name} <${email}>`
     );
 
     // Create a pull request from the user's fork to the upstream repository
-    const pr = await createPullRequest(headers, githubUsername, branchName, submission_summary);
+    const pr = await createPullRequest(headers, githubUsername, branchName, submissionSummary, documentOutline);
 
     return NextResponse.json(pr, { status: 201 });
   } catch (error) {
@@ -257,13 +257,14 @@ async function getCommitSha(headers: HeadersInit, username: string, branchName:
   return data.object.sha;
 }
 
-async function createPullRequest(headers: HeadersInit, username: string, branchName: string, knowledgeSummary: string) {
+async function createPullRequest(headers: HeadersInit, username: string, branchName: string, knowledgeSummary: string, documentOutline: string) {
   const response = await fetch(`${GITHUB_API_URL}/repos/${UPSTREAM_REPO_OWNER}/${UPSTREAM_REPO_NAME}/pulls`, {
     method: 'POST',
     headers,
     body: JSON.stringify({
       title: `Knowledge: ${knowledgeSummary}`,
       head: `${username}:${branchName}`,
+      body: documentOutline,
       base: BASE_BRANCH
     })
   });

diff --git a/src/components/Contribute/Knowledge/Submit/Submit.tsx b/src/components/Contribute/Knowledge/Submit/Submit.tsx
@@ -55,12 +55,21 @@ const Submit: React.FC<Props> = ({ knowledgeFormData, setActionGroupAlertContent
     const name = knowledgeFormData.name;
     const email = knowledgeFormData.email;
     const submissionSummary = knowledgeFormData.submissionSummary;
+    const documentOutline = knowledgeFormData.documentOutline;
     const response = await fetch('/api/pr/knowledge', {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json'
       },
-      body: JSON.stringify({ content: yamlString, attribution: attributionData, name, email, submissionSummary, filePath: sanitizedFilePath })
+      body: JSON.stringify({
+        content: yamlString,
+        attribution: attributionData,
+        name,
+        email,
+        submissionSummary,
+        documentOutline,
+        filePath: sanitizedFilePath
+      })
     });
 
     if (!response.ok) {
@@ -76,7 +85,8 @@ const Submit: React.FC<Props> = ({ knowledgeFormData, setActionGroupAlertContent
     const result = await response.json();
     const actionGroupAlertContent: ActionGroupAlertContent = {
       title: 'Knowledge contribution submitted successfully!',
-      message: `A new pull request has been created for your knowledge submission ${result.html_url}`,
+      message: `A new pull request has been created for your knowledge submission.`,
+      url: `${result.html_url}`,
       success: true
     };
     setActionGroupAlertContent(actionGroupAlertContent);

diff --git a/src/components/Contribute/Knowledge/index.tsx b/src/components/Contribute/Knowledge/index.tsx
@@ -54,6 +54,7 @@ export interface KnowledgeFormData {
 export interface ActionGroupAlertContent {
   title: string;
   message: string;
+  url?: string;
   success: boolean;
 }
 
@@ -370,7 +371,12 @@ export const KnowledgeForm: React.FunctionComponent = () => {
           title={actionGroupAlertContent.title}
           actionClose={<AlertActionCloseButton onClose={onCloseActionGroupAlert} />}
         >
-          {actionGroupAlertContent.message}
+          <p>
+            {actionGroupAlertContent.message}{' '}
+            <a href={actionGroupAlertContent.url} target="_blank" rel="noreferrer">
+              {actionGroupAlertContent.url}
+            </a>
+          </p>
         </Alert>
       )}
     </Form>