remove php configuration from install php task, move it to start task itself; introduce import-db command and import-db option in start command;

Author: ejnshtein

build-packages/magento-scripts/index.js

@@ -14,7 +14,8 @@ const commands = [
     require('./lib/commands/stop'),
     require('./lib/commands/cleanup'),
     require('./lib/commands/status'),
-    require('./lib/commands/execute')
+    require('./lib/commands/execute'),
+    require('./lib/commands/import-db')
 ];
 
 process.title = 'magento-scripts';

build-packages/magento-scripts/lib/commands/import-db.js

@@ -0,0 +1,33 @@
+/* eslint-disable no-param-reassign */
+// const path = require('path');
+const logger = require('@scandipwa/scandipwa-dev-utils/logger');
+const { Listr } = require('listr2');
+const importDump = require('../tasks/import-dump');
+
+module.exports = (yargs) => {
+    yargs.command(
+        'import-db <importDb>',
+        'Import database dump to MySQL',
+        () => {},
+        async (args = {}) => {
+            const tasks = new Listr([importDump], {
+                exitOnError: true,
+                ctx: args,
+                concurrent: false,
+                rendererOptions: { collapse: false }
+            });
+
+            try {
+                await tasks.run();
+
+                logger.logN();
+                logger.warn(`If you had theme setup you might want to re-link theme by running command ${ logger.style.command('link') }!`);
+                logger.warn(`Also, it's recommended to run ${ logger.style.command('start') } properly configure setup!`);
+                process.exit(0);
+            } catch (e) {
+                logger.error(e.message || e);
+                process.exit(1);
+            }
+        }
+    );
+};

build-packages/magento-scripts/lib/commands/start.js

@@ -47,6 +47,14 @@ module.exports = (yargs) => {
                 default: false
             }
         );
+
+        yargs.option(
+            'import-db', {
+                describe: 'Import database dump to MySQL',
+                type: 'string'
+                // normalize: true
+            }
+        );
     }, async (args = {}) => {
         const tasks = new Listr([start], {
             exitOnError: true,

build-packages/magento-scripts/lib/tasks/import-dump.js

@@ -0,0 +1,26 @@
+/* eslint-disable no-param-reassign */
+const getMagentoVersionConfig = require('../config/get-magento-version-config');
+const { getCachedPorts } = require('../config/get-port-config');
+const { checkRequirements } = require('./requirements');
+const { importDumpToMySQL, fixDB } = require('./mysql');
+
+const importDump = {
+    title: 'Importing Database Dump',
+    task: (ctx, task) => {
+        task.title = `Importing database dump '${ctx.importDb}'`;
+        return task.newListr([
+            checkRequirements,
+            getMagentoVersionConfig,
+            getCachedPorts,
+            importDumpToMySQL,
+            fixDB
+        ], {
+            concurrent: false,
+            exitOnError: true,
+            ctx,
+            rendererOptions: { collapse: false }
+        });
+    }
+};
+
+module.exports = importDump;

build-packages/magento-scripts/lib/tasks/magento/setup-magento/delete-admin-users.js

@@ -0,0 +1,11 @@
+const deleteAdminUsers = {
+    title: 'Deleting old admin users',
+    task: async (ctx) => {
+        const { mysqlConnection } = ctx;
+        await mysqlConnection.query(`
+            DELETE FROM admin_user;
+        `);
+    }
+};
+
+module.exports = deleteAdminUsers;

build-packages/magento-scripts/lib/tasks/magento/setup-magento/index-products.js

@@ -0,0 +1,21 @@
+/* eslint-disable no-param-reassign */
+const runMagentoCommand = require('../../../util/run-magento');
+
+const indexProducts = {
+    title: 'Running magento index:reindex command...',
+    task: async (ctx, task) => {
+        const { magentoVersion } = ctx;
+
+        await runMagentoCommand('index:reindex', {
+            magentoVersion,
+            callback: (t) => {
+                task.output = t;
+            }
+        });
+    },
+    options: {
+        bottomBar: 10
+    }
+};
+
+module.exports = indexProducts;

build-packages/magento-scripts/lib/tasks/mysql/fix-db.js

@@ -0,0 +1,21 @@
+const adjustMagentoConfiguration = require('../magento/setup-magento/adjust-magento-configuration');
+const configureElasticsearch = require('../magento/setup-magento/configure-elasticsearch');
+const deleteAdminUsers = require('../magento/setup-magento/delete-admin-users');
+const indexProducts = require('../magento/setup-magento/index-products');
+
+const fixDB = {
+    title: 'Fixing database',
+    task: async (ctx, task) => task.newListr([
+        adjustMagentoConfiguration,
+        configureElasticsearch,
+        deleteAdminUsers,
+        indexProducts
+    ], {
+        concurrent: false,
+        exitOnError: true,
+        ctx,
+        rendererOptions: { collapse: false }
+    })
+};
+
+module.exports = fixDB;

build-packages/magento-scripts/lib/tasks/mysql/import-dump-to-mysql.js

@@ -0,0 +1,47 @@
+/* eslint-disable no-param-reassign */
+const { execAsyncSpawn } = require('../../util/exec-async-command');
+const pathExists = require('../../util/path-exists');
+
+const importDumpToMySQL = {
+    title: 'Importing Database Dump To MySQL',
+    task: async (ctx, task) => {
+        if (!await pathExists(ctx.importDb)) {
+            throw new Error(`Dump file at ${ctx.importDb} does not exist. Please provide correct relative path to the file`);
+        }
+
+        const { config: { docker }, ports } = ctx;
+
+        const { mysql } = docker.getContainers(ports);
+
+        const startImportTime = Date.now();
+        const tickInterval = setInterval(() => {
+            task.title = `Importing Database Dump To MySQL, ${Math.floor((Date.now() - startImportTime) / 1000)}s in progress...`;
+        }, 1000);
+
+        try {
+            await execAsyncSpawn(
+                `docker cp ${ctx.importDb} ${mysql.name}:/dump.sql`
+            );
+
+            await execAsyncSpawn(
+                `docker exec ${mysql.name} bash -c "cat dump.sql | mysql -umagento -pmagento magento"`,
+                {
+                    callback: (t) => {
+                        task.output = t;
+                    }
+                }
+            );
+        } catch (e) {
+            throw new Error(`Unexpected error during dump import.\n\n${e}`);
+        }
+
+        clearInterval(tickInterval);
+
+        task.title = 'Database imported!';
+    },
+    options: {
+        bottomBar: 10
+    }
+};
+
+module.exports = importDumpToMySQL;

build-packages/magento-scripts/lib/tasks/mysql/index.js

@@ -1,3 +1,5 @@
 module.exports = {
-    connectToMySQL: require('./connect-to-mysql')
+    connectToMySQL: require('./connect-to-mysql'),
+    importDumpToMySQL: require('./import-dump-to-mysql'),
+    fixDB: require('./fix-db')
 };

build-packages/magento-scripts/lib/tasks/php/index.js

@@ -50,8 +50,7 @@ const installPhp = {
         // eslint-disable-next-line consistent-return
         return task.newListr([
             updatePhpBrew,
-            compile,
-            configure
+            compile
         ], {
             concurrent: false,
             exitOnError: true,
@@ -63,4 +62,4 @@ const installPhp = {
     }
 };
 
-module.exports = { installPhp };
+module.exports = { installPhp, compilePhp: compile, configurePhp: configure };