added default message to be last commit message

damansdhillon · damansdhillon · commit bf284a94b72d · 2023-01-24T19:06:56.000-08:00
diff --git a/src/commands/commit/shareProjectUpdate.ts b/src/commands/commit/shareProjectUpdate.ts
@@ -1,4 +1,5 @@
 import * as vscode from "vscode";
+import { API } from "../../@types/git";
 import { CommitAPI } from "../../commitAPI";
 import { getWebviewContent } from "../../utils";
 
@@ -43,7 +44,7 @@ const shareProjectUpdate = (context: vscode.ExtensionContext) => {
       }
 
       // Show list of projects and get the selection
-      const selectedProjectTitle = await vscode.window.showQuickPick(
+      let selectedProjectTitle = await vscode.window.showQuickPick(
         projects.map((project: Project) => {
           return (
             project.title +
@@ -55,14 +56,16 @@ const shareProjectUpdate = (context: vscode.ExtensionContext) => {
         }
       );
 
-      if (!selectedProjectTitle) {
+      if (!selectedProjectTitle || selectedProjectTitle === undefined) {
         return;
       }
 
+      // Remove (Default) from the title
+      selectedProjectTitle = selectedProjectTitle.replace(" (Default)", "");
+
       // Get the Project Object
       const selectedProject: Project | undefined = projects.find(
-        (project: { title: string }) =>
-          project.title === selectedProjectTitle.replace("(Default)", "")
+        (project: { title: string }) => project.title === selectedProjectTitle
       );
 
       if (!selectedProject || selectedProject === undefined) {
@@ -82,9 +85,10 @@ const shareProjectUpdate = (context: vscode.ExtensionContext) => {
 
       // Send Project ID to the WebView
       shareProjectUpdatePanel.webview.postMessage({
-        command: "setProjectId",
+        command: "setWebViewProject",
         data: JSON.stringify({
           projectId: selectedProject.id,
+          lastCommitMessage: await getCommitMessage(context),
         }),
       });
 
@@ -128,4 +132,33 @@ const processWebviewMessage = async (
   }
 };
 
+const getCommitMessage = async (context: vscode.ExtensionContext) => {
+  const gitAPI = context.workspaceState.get<API>("gitAPI");
+  if (!gitAPI) {
+    return;
+  }
+
+  // Get workspace folder
+  const workspaceFolders = vscode.workspace.workspaceFolders;
+  if (!workspaceFolders) {
+    return;
+  }
+
+  // Get root path
+  const rootPath = workspaceFolders[0].uri.fsPath;
+
+  // Get repository
+  const repository = gitAPI.repositories.find(
+    (repo) => repo.rootUri.fsPath === rootPath
+  );
+
+  if (!repository) {
+    return;
+  }
+
+  // Get commit message
+  const commit = await repository.getCommit("HEAD");
+  return commit?.message || "";
+};
+
 export default shareProjectUpdate;
diff --git a/src/extension.ts b/src/extension.ts
@@ -149,39 +149,6 @@ const getGitExtension = async (context: vscode.ExtensionContext) => {
   context.workspaceState.update("gitAPI", gitAPI);
 };
 
-const getCommitMessage = async (context: vscode.ExtensionContext) => {
-  const gitAPI = context.workspaceState.get<API>("gitAPI");
-  if (!gitAPI) {
-    return;
-  }
-
-  // Get workspace folder
-  const workspaceFolders = vscode.workspace.workspaceFolders;
-  if (!workspaceFolders) {
-    return;
-  }
-
-  // Get root path
-  const rootPath = workspaceFolders[0].uri.fsPath;
-
-  // Get repository
-  const repository = gitAPI.repositories.find(
-    (repo) => repo.rootUri.fsPath === rootPath
-  );
-
-  if (!repository) {
-    return;
-  }
-
-  // Get commit message
-  const commit = await repository.getCommit("HEAD");
-
-  const commitMEssage = commit?.message;
-
-  // const commitMessage: string | undefined = repository.state.HEAD?.commit;
-  return "commitMessage";
-};
-
 // This method is called when your extension is deactivated
 export function deactivate() {
   // Get extension context
diff --git a/static/webview/index.html b/static/webview/index.html
@@ -9,10 +9,11 @@
 </head>
 
 <body class="container bg-transparent text-white">
-    <h1>Update Project</h1>
+    <h1 class="d-flex justify-content-center py-2">Add Update Project</h1>
+    <p class="d-flex justify-content-center fst-italic">Update field is pre populated with last commit message from local git history</p>
     <!-- Markdown Editor and Preview -->
     <div class="d-flex justify-content-between">
-        <textarea class="px-2 py-1 rounded" style="width: 47%" name="update-input" id="update-input" rows="20"></textarea>
+        <textarea class="px-2 py-1 rounded" style="width: 47%" id="update-input" rows="20"></textarea>
         <p class="px-2 py-1 rounded bg-light h-auto m-0 overflow-auto text-black" style="width: 47%" id="update-preview"></p>
     </div>
 
@@ -28,8 +29,13 @@ <h1>Update Project</h1>
         const vscode = acquireVsCodeApi();
         var converter = new showdown.Converter();
         let projectId = "";
+        let lastCommitMessage = "";
 
         window.onload = () => {
+            console.log("Loading")
+                // Set the value of the input field
+            const updateInput = document.getElementById("update-input");
+            updateInput.value = lastCommitMessage;
             // Get focus on the input field
             document.getElementById("update-input").focus();
         };
@@ -76,10 +82,14 @@ <h1>Update Project</h1>
             const data = eventData.data;
 
             switch (command) {
-                case "setProjectId":
+                case "setWebViewProject":
                     // Update the project id
                     const parsedData = JSON.parse(data);
                     projectId = parsedData.projectId;
+                    lastCommitMessage = parsedData.lastCommitMessage;
+                    // Set the value of the input field
+                    const updateInput = document.getElementById("update-input");
+                    updateInput.value = lastCommitMessage;
                     break;
                 default:
                     break;
diff --git a/static/webview/index.js b/static/webview/index.js
