diff --git a/frontend/src/api/recipe.js b/frontend/src/api/recipe.js index 1666e7554..4296fcbe9 100644 --- a/frontend/src/api/recipe.js +++ b/frontend/src/api/recipe.js @@ -1,7 +1,7 @@ import { baseURL } from "./api-utils"; import { apiReq } from "./api-utils"; import { store } from "../store"; -import i18n from '@/i18n.js'; +import i18n from "@/i18n.js"; const prefix = baseURL + "recipes/"; @@ -27,10 +27,10 @@ export const recipeAPI = { */ async createByURL(recipeURL) { const response = await apiReq.post( - recipeURLs.createByURL, + recipeURLs.createByURL, { url: recipeURL }, - function() { return i18n.t('recipe.recipe-creation-failed'); }, - function() { return i18n.t('recipe.recipe-created'); } + () => i18n.t("recipe.recipe-creation-failed"), + () => i18n.t("recipe.recipe-created") ); store.dispatch("requestRecentRecipes"); @@ -47,10 +47,10 @@ export const recipeAPI = { async create(recipeData) { const response = await apiReq.post( - recipeURLs.create, + recipeURLs.create, recipeData, - function() { return i18n.t('recipe.recipe-creation-failed'); }, - function() { return i18n.t('recipe.recipe-created'); } + () => i18n.t("recipe.recipe-creation-failed"), + () => i18n.t("recipe.recipe-created") ); store.dispatch("requestRecentRecipes"); return response.data; @@ -67,18 +67,22 @@ export const recipeAPI = { formData.append("extension", fileObject.name.split(".").pop()); let successMessage = null; - if(!overrideSuccessMsg) { - successMessage = function() { return overrideSuccessMsg ? null : i18n.t('recipe.recipe-image-updated'); }; + if (!overrideSuccessMsg) { + successMessage = function() { + return overrideSuccessMsg + ? null + : i18n.t("recipe.recipe-image-updated"); + }; } - + return apiReq.put( - recipeURLs.updateImage(recipeSlug), + recipeURLs.updateImage(recipeSlug), formData, - function() { return i18n.t('general.image-upload-failed'); }, + () => i18n.t("general.image-upload-failed"), successMessage ); }, - + async createAsset(recipeSlug, fileObject, name, icon) { const fd = new FormData(); fd.append("file", fileObject); @@ -88,24 +92,24 @@ export const recipeAPI = { let response = apiReq.post(recipeURLs.createAsset(recipeSlug), fd); return response; }, - + updateImagebyURL(slug, url) { return apiReq.post( - recipeURLs.updateImage(slug), + recipeURLs.updateImage(slug), { url: url }, - function() { return i18n.t('general.image-upload-failed'); }, - function() { return i18n.t('recipe.recipe-image-updated'); } + () => i18n.t("general.image-upload-failed"), + () => i18n.t("recipe.recipe-image-updated") ); }, async update(data) { let response = await apiReq.put( recipeURLs.update(data.slug), - data, - function() { return i18n.t('recipe.recipe-update-failed'); }, - function() { return i18n.t('recipe.recipe-updated'); } + data, + () => i18n.t("recipe.recipe-update-failed"), + () => i18n.t("recipe.recipe-updated") ); - if(response) { + if (response) { store.dispatch("patchRecipe", response.data); return response.data.slug; // ! Temporary until I rewrite to refresh page without additional request } @@ -117,13 +121,15 @@ export const recipeAPI = { return response.data; }, - delete(recipeSlug) { - return apiReq.delete( + async delete(recipeSlug) { + const response = await apiReq.delete( recipeURLs.delete(recipeSlug), null, - function() { return i18n.t('recipe.unable-to-delete-recipe'); }, - function() { return i18n.t('recipe.recipe-deleted'); } + () => i18n.t("recipe.unable-to-delete-recipe"), + () => i18n.t("recipe.recipe-deleted") ); + store.dispatch("dropRecipe", response.data); + return response; }, async allSummary(start = 0, limit = 9999) { diff --git a/tests/pre_test.py b/tests/pre_test.py index e665cdaec..d72b6d0da 100644 --- a/tests/pre_test.py +++ b/tests/pre_test.py @@ -6,3 +6,4 @@ DB_URL.unlink(missing_ok=True) if settings.DB_ENGINE != "postgres": # Monkeypatch Database Testing settings.DB_URL = determine_sqlite_path(path=False, suffix="test") +