Merge pull request #3 from Zenfulcode/fix-load-currency-error

fix(currency): Improve error handling for currency and category fetching in product form

Author: gustaavik

Makefile

@@ -5,20 +5,14 @@ help: ## Show this help message
 	@echo "Available commands:"
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
 
-
-# Docker image commands
-docker-build: ## Build Docker image
-	docker build -t ghcr.io/zenfulcode/commercify-app:latest .
-
 docker-build-tag: ## Build Docker image with specific tag (use TAG=version)
 	@if [ -z "$(TAG)" ]; then echo "Error: TAG is required. Use: make docker-build-tag TAG=v1.0.0"; exit 1; fi
-	docker build -t ghcr.io/zenfulcode/commercify-app:$(TAG) -t ghcr.io/zenfulcode/commercify-app:latest -t ghcr.io/zenfulcode/commercify-app:dev .
+	docker build -t ghcr.io/zenfulcode/commercify-app:$(TAG) -t ghcr.io/zenfulcode/commercify-app:dev .
 
 docker-push: ## Push Docker image to registry (use REGISTRY and TAG)
 	@if [ -z "$(REGISTRY)" ]; then echo "Error: REGISTRY is required. Use: make docker-push REGISTRY=your-registry.com"; exit 1; fi
 	@if [ -z "$(TAG)" ]; then echo "Error: TAG is required. Use: make docker-push REGISTRY=your-registry.com TAG=v1.0.0"; exit 1; fi
 	docker push $(REGISTRY)/commercify-app:$(TAG)
-	docker push $(REGISTRY)/commercify-app:latest
 	docker push $(REGISTRY)/commercify-app:dev
 
 docker-build-push: docker-build-tag docker-push ## Build and push Docker image (use REGISTRY and TAG)

src/lib/mappers/currency.mapper.ts

@@ -16,8 +16,6 @@ export const currenyListMapper = (
 		};
 	}
 
-	console.log('Currency list fetched successfully:', dto.data);
-
 	return {
 		data: dto.data.map(currencyMapper),
 		success: dto.success,

src/routes/admin/products/new/+page.server.ts

@@ -13,10 +13,22 @@ export const load: PageServerLoad = async ({ locals }) => {
 		const form = await superValidate(zod(productSchema));
 
 		// Get available currencies for the form
-		const [currencies, categories] = await Promise.all([
+		const [currenciesResult, categoriesResult] = await Promise.allSettled([
 			commercify.currencies.list(),
 			commercify.categories.list()
 		]);
+
+		if (currenciesResult.status === 'rejected' || categoriesResult.status === 'rejected') {
+			console.error('Failed to fetch currencies or categories');
+			return fail(500, {
+				form,
+				message: 'Failed to load currencies or categories. Please try again later.'
+			});
+		}
+
+		const currencies = currenciesResult.value;
+		const categories = categoriesResult.value;
+
 		if (!currencies || !categories) {
 			console.error('Failed to fetch currencies or categories');
 			return fail(500, {
@@ -41,13 +53,11 @@ export const load: PageServerLoad = async ({ locals }) => {
 			});
 		}
 
-		form.data.currency = currencies.data!.items.find(
-			(currency: Currency) => currency.isDefault
-		)!.code;
+		form.data.currency = currencies.data.find((currency: Currency) => currency.isDefault)!.code;
 
 		return {
 			form,
-			currencies: currencies.success ? currencies.data?.items : [],
+			currencies: currencies.success ? currencies.data : [],
 			categories: categories.success ? categories.data : []
 		};
 	} catch (error) {