Cutlery/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-05-24 01:12:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat: Shopping List Editor Improvements (#3178)

Browse Source 
* modify new item factory to default to zero qty and use last isFood value

* automatically set the label of an item when choosing a food

* fix when switching to a food with no label

* removed trivial type annotation

* more lint

* removed debug log
This commit is contained in:
Michael Genson 2024-02-18 13:59:03 -06:00 committed by GitHub
parent a7775ea7ef
commit ea7005e822
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/components/Domain/ShoppingList/ShoppingListItemEditor.vue
View File

@ -95,7 +95,7 @@
</template>
<script lang="ts">
import { defineComponent, computed } from "@nuxtjs/composition-api";
import { defineComponent, computed, watch } from "@nuxtjs/composition-api";
import { ShoppingListItemCreate, ShoppingListItemOut } from "~/lib/api/types/group";
import { MultiPurposeLabelOut } from "~/lib/api/types/labels";
import { IngredientFood, IngredientUnit } from "~/lib/api/types/recipe";
@ -128,6 +128,16 @@ export default defineComponent({
context.emit("input", val);
},
});
watch(
() => props.value.food,
(newFood) => {
// @ts-ignore our logic already assumes there's a label attribute, even if TS doesn't think there is
listItem.value.label = newFood?.label || null;
listItem.value.labelId = listItem.value.label?.id || null;
}
);
return {
listItem,
};

10
frontend/pages/shopping-lists/_id.vue
View File

@ -644,15 +644,15 @@ export default defineComponent({
// Create New Item
const createEditorOpen = ref(false);
const createListItemData = ref<ShoppingListItemCreate>(ingredientResetFactory());
const createListItemData = ref<ShoppingListItemCreate>(listItemFactory());
function ingredientResetFactory(): ShoppingListItemCreate {
function listItemFactory(isFood = false): ShoppingListItemCreate {
return {
shoppingListId: id,
checked: false,
position: shoppingList.value?.listItems?.length || 1,
isFood: false,
quantity: 1,
isFood,
quantity: 0,
note: "",
labelId: undefined,
unitId: undefined,
@ -675,7 +675,7 @@ export default defineComponent({
loadingCounter.value -= 1;
if (data) {
createListItemData.value = ingredientResetFactory();
createListItemData.value = listItemFactory(createListItemData.value.isFood || false);
createEditorOpen.value = false;
refresh();
}