fix: Checks if project already exists

Author: MarwaneKoutar

vscode-extension/package.json

@@ -7,7 +7,7 @@
     "type": "git",
     "url": "https://github.com/swift-server-community/vscode-aws-lambda-swift-sam"
   },
-  "version": "1.1.7",
+  "version": "1.1.8",
   "workspaces": [
     "packages/*"
   ],

vscode-extension/packages/core-lib/src/sam/sam.ts

@@ -121,7 +121,7 @@ export async function getRegions(): Promise<RegionsResult> {
  * @returns {Promise<string>} The default path
  */
 export async function getDefaultPath(): Promise<string> {
-  const defaultPath = process.env.HOME + "/Documents/aws-lambda-swift";
+  const defaultPath = process.env.HOME + "/Documents/MySwiftLambdaFunctions";
   if (!fs.existsSync(defaultPath)) {
     fs.mkdirSync(defaultPath, { recursive: true });
   }

vscode-extension/src/commands/Commands.ts

@@ -34,9 +34,10 @@ export async function getFunctions(data: any) {
  * @returns {Promise<{ exists: boolean }>} An object containing whether the folder exists.
  */
 export async function checkFolderExists(data: any) {
-  const folderPath = data.folderPath;
-  const exists = await Sam.checkFolderExists(folderPath);
-  return { exists };
+  const path = data.path;
+  const type = data.type;
+  const exists = await Sam.checkFolderExists(path);
+  return { exists, type };
 }
 
 /**

vscode-extension/src/panels/MainPanel.ts

@@ -211,17 +211,17 @@ export class MainPanel {
         const data = message.data;
 
         switch (command) {
-          case "checkFolderExists":
+          case "checkExists":
             checkFolderExists(data)
               .then((response) => {
                 webview.postMessage({
-                  command: "folderCheckResult",
+                  command: "checkResult",
                   data: response,
                 });
               })
               .catch((error) => {
                 webview.postMessage({
-                  command: "folderCheckResult",
+                  command: "checkResult",
                   data: { success: false, error },
                 });
               });

vscode-extension/webview-ui/src/components/configuration/Configuration.css

@@ -38,9 +38,6 @@
 }
 
 .slash-separator {
-    display: flex;
-    align-items: center;
-    justify-content: center;
     font-size: 1.5rem;
     margin: 0 0.3rem;
 }

vscode-extension/webview-ui/src/components/configuration/Configuration.tsx

@@ -32,28 +32,35 @@ const Configuration = () => {
   // Hooks for translation and context
   const [t] = useTranslation("global");
   const { configuration, setConfiguration } = useContext(ConfigurationContext);
-  const [error, setError] = useState("");
+  const [errorFolder, setErrorFolder] = useState("");
+  const [errorName, setErrorName] = useState("");
 
-  const checkFolderExists = (folderPath: string) => {
-    if (folderPath) {
+  const checkExists = (path: string, type: string) => {
+    if (path) {
       vscode.postMessage({
-        command: "checkFolderExists",
+        command: "checkExists",
         data: {
-          folderPath,
+          path,
+          type,
         },
       });
     } else {
-      setError(t("configuration.error.emptyPath"));
+      if (type === "folder") setErrorFolder(t("configuration.error.emptyPath"));
+      else if (type === "name")
+        setErrorName(t("configuration.error.emptyName"));
     }
   };
 
   useEffect(() => {
     const listener = (event: any) => {
-      if (event.data.command === "folderCheckResult") {
-        if (!event.data.data.exists) {
-          setError(t("configuration.error.folderDoesNotExist"));
-        } else {
-          setError("");
+      if (event.data.command === "checkResult") {
+        const { exists, type } = event.data.data;
+        if (type === "folder") {
+          setErrorFolder(
+            exists ? "" : t("configuration.error.folderDoesNotExist"),
+          );
+        } else if (type === "name") {
+          setErrorName(exists ? t("configuration.error.alreadyExists") : "");
         }
       }
     };
@@ -84,12 +91,13 @@ const Configuration = () => {
                 });
               }}
               onBlur={(e: any) => {
-                checkFolderExists(e.target.value);
+                checkExists(e.target.value, "folder");
               }}
               placeholder={t("configuration.form.projectFolder.placeholder")}
-              className={error ? "error-textField" : ""}
+              className={errorFolder ? "error-textField" : ""}
             />
-            {error && <div className="error-message">{error}</div>}
+            {errorFolder && <div className="error-message">{errorFolder}</div>}
+            {errorName && <div className="error-message">{errorName}</div>}
           </div>
           <div className="slash-separator">
             <p>/</p>
@@ -107,7 +115,16 @@ const Configuration = () => {
                   projectName: e.target.value,
                 });
               }}
+              onBlur={(e: any) => {
+                checkExists(
+                  e.target.value
+                    ? configuration.projectFolder + "/" + e.target.value
+                    : e.target.value,
+                  "name",
+                );
+              }}
               placeholder={t("configuration.form.projectName.placeholder")}
+              className={errorName ? "error-textField" : ""}
             />
           </div>
         </div>

vscode-extension/webview-ui/src/i18n/en/global.json

@@ -39,7 +39,9 @@
         },
         "error": {
             "emptyPath": "Project folder path cannot be empty",
-            "folderDoesNotExist": "Folder does not exist"
+            "folderDoesNotExist": "Folder does not exist",
+            "emptyName": "Project name cannot be empty",
+            "alreadyExists": "Project already exists, please choose another name"
         }
     },
     "initializeProject": {
@@ -58,7 +60,10 @@
         "info": {
             "message": "This will create a new project with the selected template."
         },
-        "button": "Initialize"
+        "button": "Initialize",
+        "error": {
+            "folderAlreadyExists": "Project already exist, please choose another folder"
+        }
     },
     "buildProject": {
         "title": "Build Project",