yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 16:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

cancelling prompts is treated as error

Browse Source
This commit is contained in:
Ben Irvin 2023-03-02 17:42:43 +01:00
parent a9620ba6e4
commit a1f34b312a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/strapi/bin/strapi.js
View File

@ -342,7 +342,8 @@ program
} }
await confirmMessage( await confirmMessage(
'The transfer will delete all data in the remote database and media files. Are you sure you want to proceed?' 'The transfer will delete all data in the remote database and media files. Are you sure you want to proceed?',
{ failMessage: 'Transfer process aborted' }
)(thisCommand); )(thisCommand);
} }
) )
@ -450,7 +451,8 @@ program
.hook( .hook(
'preAction', 'preAction',
confirmMessage( confirmMessage(
'The import will delete all data in your database and media files. Are you sure you want to proceed?' 'The import will delete all data in your database and media files. Are you sure you want to proceed?',
{ failMessage: 'Import process aborted' }
) )
) )
.action(getLocalScript('transfer/import')); .action(getLocalScript('transfer/import'));

4
packages/core/strapi/lib/commands/utils/commander.js
View File

@ -97,7 +97,7 @@ const promptEncryptionKey = async (thisCommand) => {
* @param {string} message The message to confirm with user * @param {string} message The message to confirm with user
* @param {object} options Additional options * @param {object} options Additional options
*/ */
const confirmMessage = (message) => { const confirmMessage = (message, { failMessage } = {}) => {
return async (command) => { return async (command) => {
// if we have a force option, assume yes // if we have a force option, assume yes
const opts = command.opts(); const opts = command.opts();
@ -116,7 +116,7 @@ const confirmMessage = (message) => {
}, },
]); ]);
if (!answers.confirm) { if (!answers.confirm) {
exitWith(1); exitWith(1, failMessage);
} }
}; };
}; };