Merge pull request appwrite#931 from appwrite/fix-cli-bugs

Fix cli bugs

Author: christyjacob4

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

@@ -2,7 +2,7 @@ const chalk = require('chalk');
 const inquirer = require("inquirer");
 const JSONbig = require("json-bigint")({ storeAsString: false });
 const { Command } = require("commander");
-const { localConfig, globalConfig, KeysAttributes, KeysFunction, whitelistKeys, KeysTopics, KeysStorage, KeysTeams, } = require("../config");
+const { localConfig, globalConfig, KeysAttributes, KeysFunction, whitelistKeys, KeysTopics, KeysStorage, KeysTeams, KeysCollection } = require("../config");
 const { Spinner, SPINNER_ARC, SPINNER_DOTS } = require('../spinner');
 const { paginate } = require('../paginate');
 const { questionsPushBuckets, questionsPushTeams, questionsPushFunctions, questionsGetEntrypoint, questionsPushCollections, questionPushChanges, questionPushChangesConfirmation, questionsPushMessagingTopics, questionsPushResources } = require("../questions");
@@ -341,42 +341,50 @@ const awaitPools = {
 }
 
 const getConfirmation = async () => {
-    if (!cliConfig.force) {
-        async function fixConfirmation() {
-            const answers = await inquirer.prompt(questionPushChangesConfirmation);
-            if(answers.changes !== 'YES' && answers.changes !== 'NO') {
-                return await fixConfirmation();
-            }
+    if (cliConfig.force) {
+        return true;
+    }
 
-            return answers.changes;
+    async function fixConfirmation() {
+        const answers = await inquirer.prompt(questionPushChangesConfirmation);
+        if (answers.changes !== 'YES' && answers.changes !== 'NO') {
+            return await fixConfirmation();
         }
 
-        let answers = await inquirer.prompt(questionPushChanges);
-        if(answers.changes !== 'YES' && answers.changes !== 'NO') {
-            answers.changes = await fixConfirmation();
-        }
+        return answers.changes;
+    }
 
-        if (answers.changes === 'YES') {
-            return true;
-        }
+    let answers = await inquirer.prompt(questionPushChanges);
 
-        warn('Skipping push action. Changes were not applied.');
-        return false;
+    if (answers.changes !== 'YES' && answers.changes !== 'NO') {
+        answers.changes = await fixConfirmation();
     }
 
-    return true;
+    if (answers.changes === 'YES') {
+        return true;
+    }
+
+    warn('Skipping push action. Changes were not applied.');
+    return false;
+
 };
 
-const approveChanges = async (resource, resourceGetFunction, keys, resourceName, resourcePlural, skipKeys = []) => {
+const approveChanges = async (resource, resourceGetFunction, keys, resourceName, resourcePlural, skipKeys = [], secondId = '', secondResourceName = '') => {
     log('Checking for changes ...');
     const changes = [];
 
     await Promise.all(resource.map(async (localResource) => {
         try {
-            const remoteResource = await resourceGetFunction({
+            const options = {
                 [resourceName]: localResource['$id'],
                 parseOutput: false,
-            });
+            };
+
+            if (secondId !== '' && secondResourceName !== '') {
+                options[secondResourceName] = localResource[secondId]
+            }
+
+            const remoteResource = await resourceGetFunction(options);
 
             for (let [key, value] of Object.entries(whitelistKeys(remoteResource, keys))) {
                 if (skipKeys.includes(key)) {
@@ -412,7 +420,7 @@ const approveChanges = async (resource, resourceGetFunction, keys, resourceName,
     }
 
     drawTable(changes);
-    if((await getConfirmation()) === true) {
+    if ((await getConfirmation()) === true) {
         return true;
     }
 
@@ -688,6 +696,20 @@ const deleteAttribute = async (collection, attribute, isIndex = false) => {
     });
 }
 
+const compareAttribute = (remote, local, reason, key) => {
+    if (Array.isArray(remote) && Array.isArray(local)) {
+        if (JSON.stringify(remote) !== JSON.stringify(local)) {
+            const bol = reason === '' ? '' : '\n';
+            reason += `${bol}${key} changed from ${chalk.red(remote)} to ${chalk.green(local)}`;
+        }
+    } else if (remote !== local) {
+        const bol = reason === '' ? '' : '\n';
+        reason += `${bol}${key} changed from ${chalk.red(remote)} to ${chalk.green(local)}`;
+    }
+
+    return reason
+}
+
 
 /**
  * Check if attribute non-changeable fields has been changed
@@ -715,11 +737,7 @@ const checkAttributeChanges = (remote, local, collection, recraeting = true) =>
 
         if (changeableKeys.includes(key)) {
             if (!recraeting) {
-                if (remote[key] !== local[key]) {
-                    const bol = reason === '' ? '' : '\n';
-                    reason += `${bol}${key} changed from ${chalk.red(remote[key])} to ${chalk.green(local[key])}`;
-                    attribute = local;
-                }
+                reason += compareAttribute(remote[key], local[key], reason, key)
             }
             continue;
         }
@@ -728,15 +746,7 @@ const checkAttributeChanges = (remote, local, collection, recraeting = true) =>
             continue;
         }
 
-        if (Array.isArray(remote[key]) && Array.isArray(local[key])) {
-            if (JSON.stringify(remote[key]) !== JSON.stringify(local[key])) {
-                const bol = reason === '' ? '' : '\n';
-                reason += `${bol}${key} changed from ${chalk.red(remote[key])} to ${chalk.green(local[key])}`;
-            }
-        } else if (remote[key] !== local[key]) {
-            const bol = reason === '' ? '' : '\n';
-            reason += `${bol}${key} changed from ${chalk.red(remote[key])} to ${chalk.green(local[key])}`;
-        }
+        reason += compareAttribute(remote[key], local[key], reason, key)
     }
 
     return reason === '' ? undefined : { key: keyName, attribute, reason, action };
@@ -793,7 +803,7 @@ const attributesToCreate = async (remoteAttributes, localAttributes, collection,
             log(`Attribute recreation will cause ${chalk.red('loss of data')}`);
         }
 
-        if((await getConfirmation()) !== true) {
+        if ((await getConfirmation()) !== true) {
             return changedAttributes;
         }
     }
@@ -915,7 +925,7 @@ const pushSettings = async () => {
 
         if (changes.length > 0) {
             drawTable(changes);
-            if((await getConfirmation()) !== true) {
+            if ((await getConfirmation()) !== true) {
                 success(`Successfully pushed 0 project settings.`);
                 return;
             }
@@ -1308,8 +1318,6 @@ const pushCollection = async ({ returnOnZero, attempts } = { returnOnZero: false
 
     const databases = Array.from(new Set(collections.map(collection => collection['databaseId'])));
 
-    log('Checking for changes ...');
-
     // Parallel db actions
     await Promise.all(databases.map(async (databaseId) => {
         const localDatabase = localConfig.getDatabase(databaseId);
@@ -1340,6 +1348,10 @@ const pushCollection = async ({ returnOnZero, attempts } = { returnOnZero: false
         }
     }));
 
+
+    if (!(await approveChanges(collections, databasesGetCollection, KeysCollection, 'collectionId', 'collections', ['attributes', 'indexes'], 'databaseId', 'databaseId',))) {
+        return;
+    }
     // Parallel collection actions
     await Promise.all(collections.map(async (collection) => {
         try {

templates/cli/lib/config.js.twig

@@ -618,5 +618,6 @@ module.exports = {
     KeysTopics,
     KeysStorage,
     KeysTeams,
+    KeysCollection,
     whitelistKeys
 };

templates/cli/lib/questions.js.twig

@@ -662,7 +662,7 @@ const questionPushChanges = [
     }
 ];
 
-const questionPushChangesFix = [
+const questionPushChangesConfirmation = [
     {
         type: "input",
         name: "changes",
@@ -847,5 +847,5 @@ module.exports = {
     questionsInitResources,
     questionsCreateTeam,
     questionPushChanges,
-    questionPushChangesFix
+    questionPushChangesConfirmation
 };