Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add delete button to recipe image modal #4708

Draft
wants to merge 9 commits into
base: mealie-next
Choose a base branch
from
13 changes: 12 additions & 1 deletion frontend/components/Domain/Recipe/RecipeImageUploadBtn.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{{ $t("general.image") }}
</v-btn>
</template>
<v-card width="400">
<v-card width="450">
<v-card-title class="headline flex mb-0">
<div>
{{ $t("recipe.recipe-image") }}
Expand All @@ -22,6 +22,10 @@
:post="false"
@uploaded="uploadImage"
/>
<v-btn class="ml-2" color="error" :loading="loading" :disabled="!slug" @click="deleteImage">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we disable this button if there's no image?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea! Will do :D

<v-icon> {{ $globals.icons.delete }} </v-icon>
{{ $t("general.delete") }}
</v-btn>
</v-card-title>
<v-card-text class="mt-n5">
<div>
Expand All @@ -45,6 +49,7 @@ import { useUserApi } from "~/composables/api";

const REFRESH_EVENT = "refresh";
const UPLOAD_EVENT = "upload";
const DELETE_EVENT = "delete";

export default defineComponent({
props: {
Expand All @@ -65,6 +70,11 @@ export default defineComponent({
state.menu = false;
}

function deleteImage() {
context.emit(DELETE_EVENT);
state.menu = false;
}

const api = useUserApi();
async function getImageFromURL() {
state.loading = true;
Expand All @@ -81,6 +91,7 @@ export default defineComponent({
return {
...toRefs(state),
uploadImage,
deleteImage,
getImageFromURL,
messages,
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="d-flex justify-start align-top py-2">
<RecipeImageUploadBtn class="my-1" :slug="recipe.slug" @upload="uploadImage" @refresh="imageKey++" />
<RecipeImageUploadBtn class="my-1" :slug="recipe.slug" @upload="uploadImage" @delete = "deleteImage" @refresh="imageKey++" />
<RecipeSettingsMenu
class="my-1 mx-1"
:value="recipe.settings"
Expand Down Expand Up @@ -59,7 +59,6 @@ export default defineComponent({
const { user } = usePageUser();
const api = useUserApi();
const { imageKey } = usePageState(props.recipe.slug);

const canEditOwner = computed(() => {
return user.id === props.recipe.userId || user.admin;
})
Expand All @@ -86,10 +85,21 @@ export default defineComponent({
imageKey.value++;
}

async function deleteImage() {
if (props.recipe.image == null) {
return;
}
const response = await api.recipes.deleteImage(props.recipe.slug);
if (response) {
props.recipe.image = null
}
}

return {
user,
canEditOwner,
uploadImage,
deleteImage,
imageKey,
allUsers,
ownerHousehold,
Expand Down
4 changes: 4 additions & 0 deletions frontend/lib/api/user/recipes/recipe.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ export class RecipeAPI extends BaseCRUDAPI<CreateRecipe, Recipe, Recipe> {
return this.requests.put<UpdateImageResponse, FormData>(routes.recipesRecipeSlugImage(slug), formData);
}

deleteImage(slug: string) {
return this.requests.delete<UpdateImageResponse>(routes.recipesRecipeSlugImage(slug));
}

updateImagebyURL(slug: string, url: string) {
return this.requests.post<UpdateImageResponse>(routes.recipesRecipeSlugImage(slug), { url });
}
Expand Down
5 changes: 5 additions & 0 deletions mealie/repos/repository_recipes.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,12 @@ def update_image(self, slug: str, _: str | None = None) -> int:
entry: RecipeModel = self._query_one(match_value=slug)
entry.image = randint(0, 255)
self.session.commit()
return entry.image

def delete_image(self, slug: str) -> None:
entry: RecipeModel = self._query_one(match_value=slug)
entry.image = None
self.session.commit()
return entry.image

def count_uncategorized(self, count=True, override_schema=None):
Expand Down
8 changes: 7 additions & 1 deletion mealie/routes/recipe/recipe_crud_routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -526,10 +526,16 @@ def update_recipe_image(self, slug: str, image: bytes = File(...), extension: st
recipe = self.mixins.get_one(slug)
data_service = RecipeDataService(recipe.id)
data_service.write_image(image, extension)

new_version = self.recipes.update_image(slug, extension)
return UpdateImageResponse(image=new_version)

@router.delete("/{slug}/image", tags=["Recipe: Images and Assets"])
def delete_recipe_image(self, slug: str):
recipe = self.mixins.get_one(slug)
data_service = RecipeDataService(recipe.id)
data_service.delete_image()
self.recipes.delete_image(slug)

@router.post("/{slug}/assets", response_model=RecipeAsset, tags=["Recipe: Images and Assets"])
def upload_recipe_asset(
self,
Expand Down
8 changes: 8 additions & 0 deletions mealie/services/recipe/recipe_data_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,14 @@ def write_image(self, file_data: bytes | Path, extension: str, image_dir: Path |

return image_path

def delete_image(self) -> None:
image_dir = self.dir_image

try:
shutil.rmtree(image_dir)
except Exception as e:
self.logger.exception(f"Failed to delete image data: {e}")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can leave off the exception, logger.exception already logs the full traceback

Suggested change
self.logger.exception(f"Failed to delete image data: {e}")
self.logger.exception(f"Failed to delete image data")

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!👍


async def scrape_image(self, image_url: str | dict[str, str] | list[str]) -> None:
self.logger.info(f"Image URL: {image_url}")

Expand Down
Loading