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 summary to recipe instructions #4410

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
"""'Add summary to recipe instructions'

Revision ID: 3897397b4631
Revises: 86054b40fd06
Create Date: 2024-10-20 09:47:46.844436

"""

import sqlalchemy as sa

import mealie.db.migration_types
from alembic import op

# revision identifiers, used by Alembic.
revision = "3897397b4631"
down_revision: str | None = "86054b40fd06"
branch_labels: str | tuple[str, ...] | None = None
depends_on: str | tuple[str, ...] | None = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table("recipe_instructions", schema=None) as batch_op:
batch_op.add_column(sa.Column("summary", sa.String(), nullable=True))

# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table("recipe_instructions", schema=None) as batch_op:
batch_op.drop_column("summary")

# ### end Alembic commands ###
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,22 @@
@click="toggleDisabled(index)"
>
<v-card-title :class="{ 'pb-0': !isChecked(index) }">
<span :class="isEditForm ? 'handle' : ''">
<v-icon v-if="isEditForm" size="26" class="pb-1">{{ $globals.icons.arrowUpDown }}</v-icon>
{{ $t("recipe.step-index", { step: index + 1 }) }}
<v-text-field
v-if="isEditForm"
v-model="step.summary"
class="headline handle"
hide-details
dense
solo
flat
:placeholder="$t('recipe.step-index', { step: index + 1 })"
>
<template #prepend>
<v-icon size="26">{{ $globals.icons.arrowUpDown }}</v-icon>
</template>
</v-text-field>
<span v-else>
{{ step.summary ? step.summary : $t("recipe.step-index", { step: index + 1 }) }}
</span>
<template v-if="isEditForm">
<div class="ml-auto">
Expand Down Expand Up @@ -339,7 +352,7 @@ export default defineComponent({
// ===============================================================
// UI State Helpers

function validateTitle(title: string | undefined) {
function hasSectionTitle(title: string | undefined) {
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This has no direct relevance to the PR, but I renamed this function to be more accurate to what it's doing.

return !(title === null || title === "" || title === undefined);
}

Expand All @@ -348,7 +361,7 @@ export default defineComponent({

v.forEach((element: RecipeStep) => {
if (element.id !== undefined) {
showTitleEditor.value[element.id] = validateTitle(element.title);
showTitleEditor.value[element.id] = hasSectionTitle(element.title);
}
});
});
Expand All @@ -359,7 +372,7 @@ export default defineComponent({
onMounted(() => {
props.value.forEach((element: RecipeStep) => {
if (element.id !== undefined) {
showTitleEditor.value[element.id] = validateTitle(element.title);
showTitleEditor.value[element.id] = hasSectionTitle(element.title);
}

// showCookMode.value = false;
Expand Down Expand Up @@ -576,7 +589,7 @@ export default defineComponent({
const sectionSteps: number[] = [];

for (let i = index; i < props.value.length; i++) {
if (!(i === index) && validateTitle(props.value[i].title)) {
if (!(i === index) && hasSectionTitle(props.value[i].title)) {
break;
} else {
sectionSteps.push(i);
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/Domain/Recipe/RecipePrintView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<h4 v-if="step.title" :key="`instruction-title-${stepIndex}`" class="instruction-title mb-2">
{{ step.title }}
</h4>
<h5>{{ $t("recipe.step-index", { step: stepIndex + instructionSection.stepOffset + 1 }) }}</h5>
<h5>{{ step.summary ? step.summary : $t("recipe.step-index", { step: stepIndex + instructionSection.stepOffset + 1 }) }}</h5>
<SafeMarkdown :source="step.text" class="recipe-step-body" />
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion mealie/db/models/recipe/instruction.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ class RecipeInstruction(SqlAlchemyBase):
recipe_id: Mapped[GUID | None] = mapped_column(GUID, ForeignKey("recipes.id"), index=True)
position: Mapped[int | None] = mapped_column(Integer, index=True)
type: Mapped[str | None] = mapped_column(String, default="")
title: Mapped[str | None] = mapped_column(String)
title: Mapped[str | None] = mapped_column(String) # This is the section title!!!
text: Mapped[str | None] = mapped_column(String, index=True)
summary: Mapped[str | None] = mapped_column(String)

ingredient_references: Mapped[list[RecipeIngredientRefLink]] = orm.relationship(
RecipeIngredientRefLink, cascade="all, delete-orphan"
Expand Down
3 changes: 2 additions & 1 deletion mealie/schema/recipe/recipe_step.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ class IngredientReferences(MealieModel):

class RecipeStep(MealieModel):
id: UUID | None = Field(default_factory=uuid4)
title: str | None = ""
title: str | None = "" # This is the section title!!!
summary: str | None = ""
text: str
ingredient_references: list[IngredientReferences] = []
model_config = ConfigDict(from_attributes=True)
Loading