From 18767c54cea88ff114ded418d0e4742841f4bc1a Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Mon, 11 Mar 2024 19:46:37 +0100 Subject: [PATCH] working on model select --- recipes/settings.py | 1 + vue3/package.json | 1 + vue3/src/components/inputs/ModelSelect.vue | 140 +- vue3/src/openapi/.openapi-generator/FILES | 1 - vue3/src/openapi/.openapi-generator/VERSION | 2 +- vue3/src/openapi/apis/ApiApi.ts | 5384 ++++++++++------- vue3/src/openapi/apis/ApiImportOpenDataApi.ts | 16 +- vue3/src/openapi/apis/ApiTokenAuthApi.ts | 47 +- vue3/src/openapi/apis/index.ts | 2 + vue3/src/openapi/index.ts | 6 +- vue3/src/openapi/models/AccessToken.ts | 30 +- vue3/src/openapi/models/AuthToken.ts | 26 +- vue3/src/openapi/models/Automation.ts | 64 +- vue3/src/openapi/models/AutomationTypeEnum.ts | 46 +- vue3/src/openapi/models/BaseUnitEnum.ts | 74 +- vue3/src/openapi/models/BlankEnum.ts | 10 +- vue3/src/openapi/models/BookmarkletImport.ts | 31 +- .../openapi/models/BookmarkletImportList.ts | 28 +- .../openapi/models/ConnectorConfigConfig.ts | 58 +- vue3/src/openapi/models/CookLog.ts | 51 +- vue3/src/openapi/models/CustomFilter.ts | 35 +- vue3/src/openapi/models/DefaultPageEnum.ts | 22 +- vue3/src/openapi/models/ExportLog.ts | 49 +- vue3/src/openapi/models/Food.ts | 212 +- vue3/src/openapi/models/FoodInheritField.ts | 100 +- vue3/src/openapi/models/FoodSimple.ts | 29 +- vue3/src/openapi/models/Group.ts | 91 +- vue3/src/openapi/models/ImportLog.ts | 46 +- vue3/src/openapi/models/Ingredient.ts | 71 +- vue3/src/openapi/models/InviteLink.ts | 54 +- vue3/src/openapi/models/Keyword.ts | 101 +- vue3/src/openapi/models/KeywordLabel.ts | 21 +- vue3/src/openapi/models/MealPlan.ts | 70 +- vue3/src/openapi/models/MealType.ts | 38 +- vue3/src/openapi/models/MethodEnum.ts | 18 +- .../openapi/models/NutritionInformation.ts | 38 +- vue3/src/openapi/models/OpenDataCategory.ts | 110 +- vue3/src/openapi/models/OpenDataConversion.ts | 61 +- vue3/src/openapi/models/OpenDataFood.ts | 167 +- .../openapi/models/OpenDataFoodProperty.ts | 30 +- vue3/src/openapi/models/OpenDataProperty.ts | 116 +- vue3/src/openapi/models/OpenDataStore.ts | 47 +- .../openapi/models/OpenDataStoreCategory.ts | 34 +- vue3/src/openapi/models/OpenDataUnit.ts | 133 +- .../openapi/models/OpenDataUnitBaseUnit.ts | 13 +- .../openapi/models/OpenDataUnitTypeEnum.ts | 18 +- vue3/src/openapi/models/OpenDataVersion.ts | 98 +- .../openapi/models/PaginatedAutomationList.ts | 43 +- .../openapi/models/PaginatedCookLogList.ts | 43 +- .../models/PaginatedCustomFilterList.ts | 43 +- .../openapi/models/PaginatedExportLogList.ts | 43 +- vue3/src/openapi/models/PaginatedFoodList.ts | 43 +- .../openapi/models/PaginatedImportLogList.ts | 43 +- .../openapi/models/PaginatedIngredientList.ts | 43 +- .../openapi/models/PaginatedKeywordList.ts | 43 +- .../models/PaginatedRecipeOverviewList.ts | 43 +- vue3/src/openapi/models/PaginatedStepList.ts | 43 +- ...aginatedSupermarketCategoryRelationList.ts | 43 +- .../openapi/models/PaginatedSyncLogList.ts | 43 +- vue3/src/openapi/models/PaginatedUnitList.ts | 43 +- .../openapi/models/PaginatedUserSpaceList.ts | 43 +- .../openapi/models/PaginatedViewLogList.ts | 43 +- vue3/src/openapi/models/PatchedAccessToken.ts | 35 +- vue3/src/openapi/models/PatchedAutomation.ts | 67 +- .../models/PatchedBookmarkletImport.ts | 35 +- .../models/PatchedConnectorConfigConfig.ts | 61 +- vue3/src/openapi/models/PatchedCookLog.ts | 55 +- .../src/openapi/models/PatchedCustomFilter.ts | 39 +- vue3/src/openapi/models/PatchedExportLog.ts | 53 +- vue3/src/openapi/models/PatchedFood.ts | 219 +- vue3/src/openapi/models/PatchedImportLog.ts | 51 +- vue3/src/openapi/models/PatchedIngredient.ts | 81 +- vue3/src/openapi/models/PatchedInviteLink.ts | 59 +- vue3/src/openapi/models/PatchedKeyword.ts | 109 +- vue3/src/openapi/models/PatchedMealPlan.ts | 79 +- vue3/src/openapi/models/PatchedMealType.ts | 41 +- .../openapi/models/PatchedOpenDataCategory.ts | 115 +- .../models/PatchedOpenDataConversion.ts | 71 +- .../src/openapi/models/PatchedOpenDataFood.ts | 177 +- .../openapi/models/PatchedOpenDataProperty.ts | 121 +- .../openapi/models/PatchedOpenDataStore.ts | 53 +- .../src/openapi/models/PatchedOpenDataUnit.ts | 139 +- .../openapi/models/PatchedOpenDataVersion.ts | 101 +- vue3/src/openapi/models/PatchedProperty.ts | 103 +- .../src/openapi/models/PatchedPropertyType.ts | 55 +- vue3/src/openapi/models/PatchedRecipe.ts | 131 +- vue3/src/openapi/models/PatchedRecipeBook.ts | 53 +- .../openapi/models/PatchedRecipeBookEntry.ts | 33 +- .../models/PatchedShoppingListEntry.ts | 87 +- .../models/PatchedShoppingListRecipe.ts | 47 +- vue3/src/openapi/models/PatchedSpace.ts | 143 +- vue3/src/openapi/models/PatchedStep.ts | 75 +- vue3/src/openapi/models/PatchedStorage.ts | 53 +- vue3/src/openapi/models/PatchedSupermarket.ts | 111 +- .../models/PatchedSupermarketCategory.ts | 99 +- .../PatchedSupermarketCategoryRelation.ts | 37 +- vue3/src/openapi/models/PatchedSync.ts | 43 +- vue3/src/openapi/models/PatchedUnit.ts | 117 +- .../openapi/models/PatchedUnitConversion.ts | 59 +- vue3/src/openapi/models/PatchedUser.ts | 33 +- .../openapi/models/PatchedUserPreference.ts | 157 +- vue3/src/openapi/models/PatchedUserSpace.ts | 55 +- vue3/src/openapi/models/PatchedViewLog.ts | 29 +- vue3/src/openapi/models/Property.ts | 98 +- vue3/src/openapi/models/PropertyType.ts | 54 +- vue3/src/openapi/models/Recipe.ts | 117 +- vue3/src/openapi/models/RecipeBook.ts | 49 +- vue3/src/openapi/models/RecipeBookEntry.ts | 28 +- vue3/src/openapi/models/RecipeFlat.ts | 29 +- vue3/src/openapi/models/RecipeImage.ts | 31 +- vue3/src/openapi/models/RecipeOverview.ts | 74 +- .../openapi/models/RecipeShoppingUpdate.ts | 38 +- vue3/src/openapi/models/RecipeSimple.ts | 24 +- vue3/src/openapi/models/ShoppingListEntry.ts | 78 +- .../openapi/models/ShoppingListEntryBulk.ts | 25 +- vue3/src/openapi/models/ShoppingListRecipe.ts | 40 +- vue3/src/openapi/models/Space.ts | 129 +- .../openapi/models/SpaceNavTextColorEnum.ts | 18 +- vue3/src/openapi/models/SpaceThemeEnum.ts | 34 +- vue3/src/openapi/models/Step.ts | 70 +- vue3/src/openapi/models/Storage.ts | 50 +- vue3/src/openapi/models/Supermarket.ts | 108 +- .../src/openapi/models/SupermarketCategory.ts | 97 +- .../models/SupermarketCategoryRelation.ts | 34 +- vue3/src/openapi/models/Sync.ts | 39 +- vue3/src/openapi/models/SyncLog.ts | 31 +- vue3/src/openapi/models/ThemeEnum.ts | 30 +- vue3/src/openapi/models/Unit.ts | 115 +- vue3/src/openapi/models/UnitConversion.ts | 53 +- vue3/src/openapi/models/User.ts | 30 +- vue3/src/openapi/models/UserFile.ts | 29 +- vue3/src/openapi/models/UserFileView.ts | 25 +- vue3/src/openapi/models/UserPreference.ts | 154 +- .../models/UserPreferenceNavTextColorEnum.ts | 14 +- vue3/src/openapi/models/UserSpace.ts | 46 +- vue3/src/openapi/models/ViewLog.ts | 25 +- vue3/src/openapi/models/index.ts | 3 +- vue3/src/openapi/openapitools.json | 2 +- vue3/src/pages/MealPlanPage.vue | 5 +- vue3/yarn.lock | 29 +- 140 files changed, 7674 insertions(+), 5947 deletions(-) diff --git a/recipes/settings.py b/recipes/settings.py index 68f9afc78f..576f74b287 100644 --- a/recipes/settings.py +++ b/recipes/settings.py @@ -305,6 +305,7 @@ 'TITLE': 'Tandoor', 'DESCRIPTION': 'Tandoor API Docs', 'SERVE_INCLUDE_SCHEMA': False, + 'ENUM_ADD_EXPLICIT_BLANK_NULL_CHOICE': False, } ROOT_URLCONF = 'recipes.urls' diff --git a/vue3/package.json b/vue3/package.json index 956be53f75..bb0f8448a8 100644 --- a/vue3/package.json +++ b/vue3/package.json @@ -11,6 +11,7 @@ "dependencies": { "@mdi/font": "7.2.96", "@types/luxon": "^3.4.2", + "@vueuse/core": "^10.9.0", "luxon": "^3.4.4", "mavon-editor": "^3.0.1", "pinia": "^2.1.7", diff --git a/vue3/src/components/inputs/ModelSelect.vue b/vue3/src/components/inputs/ModelSelect.vue index 960631d14f..1c51909b2d 100644 --- a/vue3/src/components/inputs/ModelSelect.vue +++ b/vue3/src/components/inputs/ModelSelect.vue @@ -1,34 +1,79 @@