feat: apply manifest - refactor

Author: RonenMars

src/utilities/errorHandler.utils.ts

@@ -0,0 +1,69 @@
+import { commands } from "vscode";
+
+import { getFirstMetadataValue } from "@api";
+import { Code, ConnectError } from "@connectrpc/connect";
+import { vsCommands, SUPPORT_EMAIL } from "@constants";
+import { translate } from "@i18n";
+
+/**
+ * Handles ConnectError by displaying appropriate error messages
+ * @param error The ConnectError to handle
+ * @param namespace Optional namespace for generic error messages
+ * @returns true if error was handled and caller should return, false if error should be ignored (e.g., AlreadyExists)
+ */
+export const handleConnectError = (error: ConnectError, namespace?: string): boolean => {
+	const errorType = getFirstMetadataValue(error, "x-error-type");
+
+	if (error.code === Code.AlreadyExists) {
+		// Resource already exists, caller should continue
+		return false;
+	}
+
+	if (errorType === "quota_limit_exceeded") {
+		const quotaLimit = getFirstMetadataValue(error, "x-quota-limit");
+		const quotaLimitUsed = getFirstMetadataValue(error, "x-quota-used");
+		const quotaLimitResource = getFirstMetadataValue(error, "x-quota-resource");
+
+		commands.executeCommand(
+			vsCommands.showErrorMessage,
+			translate().t("errors.quotaLimitExceeded", {
+				limit: quotaLimit,
+				used: quotaLimitUsed,
+				resource: quotaLimitResource,
+				email: SUPPORT_EMAIL,
+			})
+		);
+		return true;
+	}
+
+	if (errorType === "rate_limit_exceeded") {
+		commands.executeCommand(vsCommands.showErrorMessage, translate().t("errors.rateLimitExceeded"));
+		return true;
+	}
+
+	if (error.code === Code.ResourceExhausted) {
+		commands.executeCommand(
+			vsCommands.showErrorMessage,
+			translate().t("errors.resourceExhausted", { email: SUPPORT_EMAIL })
+		);
+		return true;
+	}
+
+	if (error.code === Code.Unauthenticated) {
+		commands.executeCommand(vsCommands.showErrorMessage, translate().t("errors.unauthenticated"));
+		return true;
+	}
+
+	if (error.code === Code.PermissionDenied) {
+		commands.executeCommand(vsCommands.showErrorMessage, translate().t("errors.permissionDenied"));
+		return true;
+	}
+
+	// Generic error handling
+	if (namespace) {
+		commands.executeCommand(vsCommands.showErrorMessage, namespace, error.message);
+	} else {
+		commands.executeCommand(vsCommands.showErrorMessage, error.message);
+	}
+	return true;
+};

src/utilities/index.ts

@@ -18,3 +18,4 @@ export {
 export { omit } from "@utilities/omit.utils";
 export { errorMessageWithLog } from "@utilities/messages.utils";
 export { getBaseURL, getWebUIURL, getOrganizationId } from "@utilities/url.utilities";
+export { handleConnectError } from "@utilities/errorHandler.utils";

src/vscommands/applyManifest.vscommands.ts

@@ -1,13 +1,12 @@
 import { commands, window } from "vscode";
 import { parse as parseYaml } from "yaml";
 
-import { getFirstMetadataValue } from "@api";
-import { Code, ConnectError } from "@connectrpc/connect";
-import { namespaces, vsCommands, SUPPORT_EMAIL } from "@constants";
+import { ConnectError } from "@connectrpc/connect";
+import { namespaces, vsCommands } from "@constants";
 import { getLocalResources } from "@controllers/utilities";
 import { translate } from "@i18n";
 import { LoggerService, ManifestService, ProjectsService } from "@services";
-import { getDirectoryOfFile, WorkspaceConfig } from "@utilities";
+import { getDirectoryOfFile, WorkspaceConfig, handleConnectError } from "@utilities";
 
 export const applyManifest = async () => {
 	if (!window.activeTextEditor) {
@@ -37,44 +36,11 @@ export const applyManifest = async () => {
 
 	if (createError) {
 		if (createError instanceof ConnectError) {
-			const errorType = getFirstMetadataValue(createError, "x-error-type");
-
-			if (createError.code === Code.AlreadyExists) {
-				// Project already exists, continue to apply manifest
-			} else if (errorType === "quota_limit_exceeded") {
-				const quotaLimit = getFirstMetadataValue(createError, "x-quota-limit");
-				const quotaLimitUsed = getFirstMetadataValue(createError, "x-quota-used");
-				const quotaLimitResource = getFirstMetadataValue(createError, "x-quota-resource");
-
-				commands.executeCommand(
-					vsCommands.showErrorMessage,
-					translate().t("errors.quotaLimitExceeded", {
-						limit: quotaLimit,
-						used: quotaLimitUsed,
-						resource: quotaLimitResource,
-						email: SUPPORT_EMAIL,
-					})
-				);
-				return;
-			} else if (errorType === "rate_limit_exceeded") {
-				commands.executeCommand(vsCommands.showErrorMessage, translate().t("errors.rateLimitExceeded"));
-				return;
-			} else if (createError.code === Code.ResourceExhausted) {
-				commands.executeCommand(
-					vsCommands.showErrorMessage,
-					translate().t("errors.resourceExhausted", { email: SUPPORT_EMAIL })
-				);
-				return;
-			} else if (createError.code === Code.Unauthenticated) {
-				commands.executeCommand(vsCommands.showErrorMessage, translate().t("errors.unauthenticated"));
-				return;
-			} else if (createError.code === Code.PermissionDenied) {
-				commands.executeCommand(vsCommands.showErrorMessage, translate().t("errors.permissionDenied"));
-				return;
-			} else {
-				commands.executeCommand(vsCommands.showErrorMessage, namespaces.applyManifest, createError.message);
+			const shouldReturn = handleConnectError(createError, namespaces.applyManifest);
+			if (shouldReturn) {
 				return;
 			}
+			// If handleConnectError returns false, it means Code.AlreadyExists - continue to apply manifest
 		} else {
 			// Non-ConnectError
 			commands.executeCommand(vsCommands.showErrorMessage, namespaces.applyManifest, (createError as Error).message);