From cdd7478cb27a45fae39d514a9dfef9b24cf6a043 Mon Sep 17 00:00:00 2001 From: Ritik Kapoor Date: Wed, 12 Jun 2024 00:47:10 +0000 Subject: [PATCH] feat: [code-1882] support to delete failed import (#2092) --- web/src/framework/strings/stringTypes.ts | 4 + web/src/i18n/strings.en.yaml | 6 +- .../RepositoriesListing.tsx | 120 ++++++++++++------ 3 files changed, 88 insertions(+), 42 deletions(-) diff --git a/web/src/framework/strings/stringTypes.ts b/web/src/framework/strings/stringTypes.ts index a7bb82baa..1028ef617 100644 --- a/web/src/framework/strings/stringTypes.ts +++ b/web/src/framework/strings/stringTypes.ts @@ -334,7 +334,9 @@ export interface StringsMap { deleteBranchConfirm: string deleteBranchText: string deleteCommentConfirm: string + deleteFailedImport: string deleteFile: string + deleteImport: string deleteNotAllowed: string deleteRepoText: string deleteRepoTitle: string @@ -345,6 +347,7 @@ export interface StringsMap { deleteTokenMsg: string deleteUser: string deleted: string + deletedImport: string deployKeys: string descending: string description: string @@ -442,6 +445,7 @@ export interface StringsMap { failedToCreateRepo: string failedToCreateSpace: string failedToDeleteBranch: string + failedToDeleteImport: string failedToDeleteWebhook: string failedToFetchFileContent: string failedToImportSpace: string diff --git a/web/src/i18n/strings.en.yaml b/web/src/i18n/strings.en.yaml index 7ebcf1996..98a0b88ee 100644 --- a/web/src/i18n/strings.en.yaml +++ b/web/src/i18n/strings.en.yaml @@ -12,8 +12,11 @@ public: Public private: Private cancel: Cancel cancelImport: Cancel Import +deleteImport: Delete Import cancelledImport: Cancelled Import -failedToCancelImport: failed to cancel import +deletedImport: Deleted Import +failedToCancelImport: Failed to cancel import +failedToDeleteImport: Failed to delete import name: Name value: Value help: help @@ -174,6 +177,7 @@ deleteTag: Delete Tag deleteTagConfirm: Are you sure you want to delete tag {{name}}? You can't undo this action. deleteBranchConfirm: Are you sure you want to delete branch {{name}}? You can't undo this action. cancelImportConfirm: Are you sure you want to abort import for {{name}}? You can't undo this action. +deleteFailedImport: Are you sure you want to delete {{name}}? browse: Browse browseFiles: Browse Files compare: Compare diff --git a/web/src/pages/RepositoriesListing/RepositoriesListing.tsx b/web/src/pages/RepositoriesListing/RepositoriesListing.tsx index b110bfcb8..89d8af57e 100644 --- a/web/src/pages/RepositoriesListing/RepositoriesListing.tsx +++ b/web/src/pages/RepositoriesListing/RepositoriesListing.tsx @@ -224,47 +224,85 @@ export default function RepositoriesListing() { const confirmCancelImport = useConfirmAct() return ( - {row?.original?.importProgress === ImportStatus.FAILED - ? null - : row.original.importing && ( - - confirmCancelImport({ - title: getString('cancelImport'), - confirmText: getString('cancelImport'), - intent: Intent.DANGER, - message: ( - - - - ), - action: async () => { - deleteRepo(`${row.original?.path as string}/+/`) - .then(() => { - showSuccess(getString('cancelledImport'), 2000) - refetch() - }) - .catch(err => { - showError(getErrorMessage(err), 0, getString('failedToCancelImport')) - }) - } - }) - } - ]} - /> - )} + {row?.original?.importProgress === ImportStatus.FAILED ? ( + + confirmCancelImport({ + title: getString('deleteImport'), + confirmText: getString('delete'), + intent: Intent.DANGER, + message: ( + + + + ), + action: async () => { + deleteRepo(`${row.original?.path as string}/+/`) + .then(() => { + showSuccess(getString('deletedImport'), 2000) + refetch() + }) + .catch(err => { + showError(getErrorMessage(err), 0, getString('failedToDeleteImport')) + }) + } + }) + } + ]} + /> + ) : ( + row.original.importing && ( + + confirmCancelImport({ + title: getString('cancelImport'), + confirmText: getString('cancelImport'), + intent: Intent.DANGER, + message: ( + + + + ), + action: async () => { + deleteRepo(`${row.original?.path as string}/+/`) + .then(() => { + showSuccess(getString('cancelledImport'), 2000) + refetch() + }) + .catch(err => { + showError(getErrorMessage(err), 0, getString('failedToCancelImport')) + }) + } + }) + } + ]} + /> + ) + )} ) }