update: simplify type.

This commit is contained in:
Darshan
2025-10-26 15:31:09 +05:30
parent d9d2761471
commit 930dd963dc
18 changed files with 42 additions and 63 deletions
+4 -5
View File
@@ -1,6 +1,5 @@
<script lang="ts" module>
// TODO: @itznotabug - true | string | Error | void
export type DeleteOperationState = true | string | void;
export type DeleteOperationState = Error | void;
</script>
<script lang="ts">
@@ -106,7 +105,7 @@
showConfirmDeletion = true;
} else {
const state = await onDelete?.(selectedRows);
if (typeof state === 'string') {
if (state instanceof Error) {
// user should handle error on their own!
} else {
notifySuccess();
@@ -131,9 +130,9 @@
onDeleteError = null;
const state = await onDelete?.(selectedRows);
if (typeof state === 'string') {
if (state instanceof Error) {
disableModal = false;
onDeleteError = state || `Failed to delete ${resource}s`;
onDeleteError = state.message || `Failed to delete ${resource}s`;
} else {
notifySuccess();
selectedRows = [];
@@ -67,12 +67,10 @@
try {
await Promise.all(promises);
trackEvent(Submit.UserDelete, { total: selectedRows.length });
return true;
} catch (error) {
trackError(error, Submit.UserDelete);
return error.message;
return error;
} finally {
await invalidate(Dependencies.USERS);
}
@@ -51,12 +51,10 @@
try {
await Promise.all(promises);
trackEvent(Submit.TeamDelete, { total: selectedRows.length });
return true;
} catch (error) {
trackError(error, Submit.TeamDelete);
return error.message;
return error;
} finally {
await invalidate(Dependencies.TEAMS);
}
@@ -39,13 +39,12 @@
try {
await Promise.all(promises);
await invalidate(Dependencies.MEMBERSHIPS);
trackEvent(Submit.MembershipUpdate, { total: selectedRows.length });
return true;
} catch (error) {
trackError(error, Submit.MembershipUpdate);
return error.message;
return error;
} finally {
await invalidate(Dependencies.MEMBERSHIPS);
}
}
</script>
@@ -30,13 +30,12 @@
try {
await Promise.all(promises);
await invalidate(Dependencies.USER_IDENTITIES);
trackEvent(Submit.UserIdentityDelete, { total: selectedRows.length });
return true;
} catch (error) {
trackError(error, Submit.UserIdentityDelete);
return error.message;
return error;
} finally {
await invalidate(Dependencies.USER_IDENTITIES);
}
}
</script>
@@ -39,12 +39,10 @@
try {
await Promise.all(promises);
trackEvent(Submit.MembershipUpdate, { total: selectedRows.length });
return true;
} catch (error) {
trackError(error, Submit.MembershipUpdate);
return error.message;
return error;
} finally {
await invalidate(Dependencies.MEMBERSHIPS);
}
@@ -28,13 +28,12 @@
try {
await Promise.all(promises);
await invalidate(Dependencies.USER_TARGETS);
trackEvent(Submit.UserTargetDelete, { total: selectedRows.length });
return true;
} catch (error) {
trackError(error, Submit.UserTargetDelete);
return error.message;
return error;
} finally {
await invalidate(Dependencies.USER_TARGETS);
}
}
</script>
@@ -116,7 +116,6 @@
try {
await Promise.all(promises);
await invalidate(Dependencies.BACKUPS);
if (selectedBackup) {
addNotification({
@@ -131,13 +130,15 @@
message: error.message
});
} else {
return error.message;
return error;
}
} finally {
if (selectedBackup) {
showDelete = false;
selectedBackup = null;
}
await invalidate(Dependencies.BACKUPS);
}
}
@@ -26,14 +26,13 @@
);
try {
await Promise.all(promises);
await invalidate(Dependencies.TABLES);
subNavigation.update();
trackEvent(Submit.TableDelete);
return true;
} catch (error) {
trackError(error, Submit.TableDelete);
return error.message;
return error;
} finally {
await invalidate(Dependencies.TABLES);
subNavigation.update();
}
}
@@ -39,13 +39,12 @@
try {
await Promise.all(promises);
await invalidate(Dependencies.EXECUTIONS);
trackEvent(Submit.ExecutionDelete);
return true;
} catch (error) {
trackError(error, Submit.ExecutionDelete);
return error.message;
return error;
} finally {
await invalidate(Dependencies.EXECUTIONS);
}
}
</script>
@@ -59,13 +59,12 @@
);
try {
await Promise.all(promises);
await invalidate(Dependencies.DEPLOYMENTS);
trackEvent(Submit.DeploymentDelete);
return true;
} catch (error) {
trackError(error, Submit.DeploymentDelete);
return error.message;
return error;
} finally {
await invalidate(Dependencies.DEPLOYMENTS);
}
}
</script>
@@ -109,13 +109,12 @@
try {
await Promise.all(promises);
await invalidate(Dependencies.MESSAGING_MESSAGES);
trackEvent(Submit.MessagingMessageDelete, { total: selected.length });
return true;
} catch (error) {
trackError(error, Submit.MessagingMessageDelete);
return error.message;
return error;
} finally {
await invalidate(Dependencies.MESSAGING_MESSAGES);
}
}
@@ -29,13 +29,12 @@
try {
await Promise.all(promises);
await invalidate(Dependencies.MESSAGING_PROVIDERS);
trackEvent(Submit.MessagingProviderDelete, { total: selectedRows.length });
return true;
} catch (error) {
trackError(error, Submit.MessagingProviderDelete);
return error.message;
return error;
} finally {
await invalidate(Dependencies.MESSAGING_PROVIDERS);
}
}
</script>
@@ -29,12 +29,10 @@
try {
await Promise.all(promises);
trackEvent(Submit.MessagingTopicDelete, { total: selectedRows.length });
return true;
} catch (error) {
trackError(error, Submit.MessagingTopicDelete);
return error.message;
return error;
} finally {
await invalidate(Dependencies.MESSAGING_TOPICS);
}
@@ -50,12 +50,10 @@
try {
await Promise.all(promises);
trackEvent(Submit.MessagingTopicSubscriberDelete, { total: selectedRows.length });
return true;
} catch (error) {
trackError(error, Submit.MessagingTopicSubscriberDelete);
return error.message;
return error;
} finally {
await invalidate(Dependencies.MESSAGING_TOPIC_SUBSCRIBERS);
}
@@ -45,12 +45,10 @@
);
try {
await Promise.all(promises);
trackEvent(Submit.DeploymentDelete);
return true;
} catch (error) {
trackError(error, Submit.DeploymentDelete);
return error.message;
return error;
} finally {
await Promise.all([
invalidate(Dependencies.DEPLOYMENTS),
@@ -37,13 +37,12 @@
try {
await Promise.all(promises);
await invalidate(Dependencies.EXECUTIONS);
trackEvent(Submit.LogDelete);
return true;
} catch (error) {
trackError(error, Submit.LogDelete);
return error.message;
return error;
} finally {
await invalidate(Dependencies.EXECUTIONS);
}
}
</script>
@@ -78,7 +78,7 @@
trackEvent(Submit.FileDelete, { total: selectedRows.length });
} catch (error) {
trackError(error, Submit.FileDelete);
return error.message;
return error;
} finally {
await invalidate(Dependencies.FILES);
}