Merge pull request #909 from appwrite/fix-cli-qa

Fix cli qa

Author: christyjacob4

templates/cli/lib/commands/generic.js.twig

@@ -188,7 +188,8 @@ const logout = new Command("logout")
         const sessions = globalConfig.getSessions();
         const current = globalConfig.getCurrentSession();
 
-        if (current === '') {
+        if (current === '' || !sessions.length) {
+            log('No active sessions found.');
             return;
         }
         if (sessions.length === 1) {

templates/cli/lib/commands/pull.js.twig

@@ -27,7 +27,7 @@ const pullResources = async () => {
     if (cliConfig.all) {
         for (let action of Object.values(actions)) {
             cliConfig.all = true;
-            await action();
+            await action({});
         }
     } else {
         const answers = await inquirer.prompt(questionsPullResources[0]);
@@ -92,7 +92,7 @@ const pullFunctions = async ({ code }) => {
         if (!fs.existsSync(func['path'])) {
             fs.mkdirSync(func['path'], { recursive: true });
         }
-        
+
         if(code === false) {
             warn("Source code download skipped.");
         } else if(!func['deployment']) {
@@ -114,14 +114,14 @@ const pullFunctions = async ({ code }) => {
                     overrideForCli: true,
                     parseOutput: false
                 });
-    
+
                 tar.extract({
                     sync: true,
                     cwd: func['path'],
                     file: compressedFileName,
                     strict: false,
                 });
-    
+
                 fs.rmSync(compressedFileName);
             }
         }

templates/cli/lib/commands/push.js.twig

@@ -750,6 +750,8 @@ const pushResources = async () => {
 };
 
 const pushSettings = async () => {
+    checkDeployConditions(localConfig);
+
     try {
         log("Pushing project settings ...");
 
@@ -810,8 +812,6 @@ const pushSettings = async () => {
 }
 
 const pushFunction = async ({ functionId, async, returnOnZero } = { returnOnZero: false }) => {
-    let response = {};
-
     const functionIds = [];
 
     if (functionId) {
@@ -865,14 +865,15 @@ const pushFunction = async ({ functionId, async, returnOnZero } = { returnOnZero
     const failedDeployments = [];
 
     await Promise.all(functions.map(async (func) => {
+        let response = {};
+
         const ignore = func.ignore ? 'appwrite.json' : '.gitignore';
         let functionExists = false;
         let deploymentCreated = false;
 
         const updaterRow = new Spinner({ status: '', resource: func.name, id: func['$id'], end: `Ignoring using: ${ignore}` });
 
         updaterRow.update({ status: 'Getting' }).startSpinner(SPINNER_DOTS);
-
         try {
             response = await functionsGet({
                 functionId: func['$id'],
@@ -974,11 +975,6 @@ const pushFunction = async ({ functionId, async, returnOnZero } = { returnOnZero
                 let pollChecks = 0;
 
                 while (true) {
-                    if (pollChecks >= POLL_MAX_DEBOUNCE) {
-                        updaterRow.update({ end: 'Deployment is taking too long. Please check the console for more details.' })
-                        break;
-                    }
-
                     response = await functionsGetDeployment({
                         functionId: func['$id'],
                         deploymentId: deploymentId,
@@ -1017,7 +1013,7 @@ const pushFunction = async ({ functionId, async, returnOnZero } = { returnOnZero
                     }
 
                     pollChecks++;
-                    await new Promise(resolve => setTimeout(resolve, POLL_DEBOUNCE));
+                    await new Promise(resolve => setTimeout(resolve, POLL_DEBOUNCE * 1.5));
                 }
             } catch (e) {
                 updaterRow.fail({ errorMessage: e.message ?? 'Unknown error occurred. Please try again' })
@@ -1031,7 +1027,7 @@ const pushFunction = async ({ functionId, async, returnOnZero } = { returnOnZero
 
     failedDeployments.forEach((failed) => {
         const { name, deployment, $id } = failed;
-        const failUrl = `${globalConfig.getEndpoint().replace('/v1', '')}/console/project-${localConfig.getProject().projectId}/functions/function-${$id}/deployment-${deployment}`;
+        const failUrl = `${globalConfig.getEndpoint().slice(0, -3)}/console/project-${localConfig.getProject().projectId}/functions/function-${$id}/deployment-${deployment}`;
 
         error(`Deployment of ${name} has failed. Check at ${failUrl} for more details\n`);
     });

templates/cli/lib/spinner.js.twig

@@ -22,6 +22,7 @@ class Spinner {
             hideCursor,
             clearOnComplete,
             stopOnComplete: true,
+            linewrap: true,
             noTTYOutput: true
         });
     }