Change Advanced search to no preview (#284)

* Change Advanced search to no preview

Author: jlucaspains

api/requirements.txt

@@ -2,14 +2,13 @@
 # The Python Worker is managed by Azure Functions platform
 # Manually managing azure-functions-worker may cause unexpected issues
 
-azure-functions
-pint>=0.20.1
-recipe-scrapers>=14.24.0
-python-multipart>=0.0.5
-Pillow>=9.2.0
-pillow-avif-plugin>=1.4.3
-pytest
-openai
-azure-cosmos
-jsonschema
-azure-search-documents
+azure-functions~=1.18
+pint~=0.20
+recipe-scrapers~=14.55
+python-multipart~=0.0.5
+Pillow~=9.2
+pillow-avif-plugin~=1.4
+pytest~=8.1
+azure-cosmos~=4.6
+jsonschema~=4.21
+lxml==5.1.0

public/locales/en/translation.json

@@ -61,8 +61,6 @@
             "storageDescription": "Space used {{used}} of {{remaining}} available.",
             "enableRecipeHighlighting": "Enable recipe highlighting",
             "enableRecipeHighlightingDescription": "Highlight ingredient quantities and UOMs and step details",
-            "enableAdvancedSearch": "Enable advanced search (preview)",
-            "enableAdvancedSearchDescription": "Allows searching through recipe title, ingredients and steps",
             "enableYoutubeVideos": "Enable YouTube videos (preview)",
             "enableYoutubeVideosDescription": "Allows for adding YouTube videos to recipes in addition to images",
             "enableCloudShare": "Enable cloud share (preview)",

public/locales/pt/translation.json

@@ -61,8 +61,6 @@
             "storageDescription": "Espaço usado {{used}} de {{remaining}} disponível.",
             "enableRecipeHighlighting": "Ativar o realce da receita",
             "enableRecipeHighlightingDescription": "Realce quantidades de ingredientes, unidades de medida e detalhes da etapa",
-            "enableAdvancedSearch": "Ativar pesquisa avançada (preview)",
-            "enableAdvancedSearchDescription": "Permite pesquisar pelo título da receita, ingredientes e etapas",
             "enableYoutubeVideos": "Ativar videos do YouTube (preview)",
             "enableYoutubeVideosDescription": "Permite adicionar vídeos do YouTube em receitas",
             "enableCloudShare": "Ativar compartilhamento na nuvem (preview)",

src/pages/index.vue

@@ -20,7 +20,6 @@ let allRecipes = [] as RecipeViewModel[];
 let debouncedWatch: (currentValue: string, oldValue: string) => void;
 let debouncedScroll: (currentValue: number) => void;
 const addOptions = ref([] as Array<{ name: string, text: string, action: () => void }>);
-let enableAdvancedSearch = false;
 let enableCloudShare = false;
 
 function sortByTitle(items: Array<RecipeViewModel>) {
@@ -70,8 +69,6 @@ async function sort(type: string, items: Array<RecipeViewModel>, saveSort: boole
 }
 
 onMounted(async () => {
-  const enableAdvancedSearchSetting = await getSetting("EnableAdvancedSearch", "false");
-  enableAdvancedSearch = enableAdvancedSearchSetting == "true";
   const enableCloudShareSetting = await getSetting("EnableCloudShare", "false");
   enableCloudShare = enableCloudShareSetting == "true";
 
@@ -261,7 +258,7 @@ function simpleSearchInText(a: string, b: string) {
       <div class="flex flex-col mb-2">
         <input ref="searchInput" type="search" data-testid="search-input" :placeholder="t('pages.index.search')"
           v-model="searchText" class="p-2 my-2 rounded text-black" />
-        <div v-if="enableAdvancedSearch" class="flex">
+        <div class="flex">
           <button type="button" data-testid="search-by-title"
             class="bg-theme-primary hover:bg-theme-secondary text-white font-bold p-2 my-2 rounded"
             @click="setSearchType(t('pages.index.filterByTitle'))">{{ t("pages.index.filterByTitle") }}</button>

src/pages/options.vue

@@ -14,7 +14,6 @@ const state = useState()!;
 const router = useRouter()!;
 const version = ref("");
 const useFractions = ref(false);
-const enableAdvancedSearch = ref(false);
 const enableYoutubeVideos = ref(false);
 const enableCloudShare = ref(false);
 const enableNutritionFacts = ref(false);
@@ -33,14 +32,12 @@ onMounted(async () => {
 
   const stepsInvervalValue = await getSetting("StepsInterval", "5");
   const useFractionsValue = await getSetting("UseFractions", "false");
-  const enableAdvancedSearchValue = await getSetting("EnableAdvancedSearch", "false");
   const enableYoutubeVideosValue = await getSetting("EnableYoutubeVideos", "false");
   const enableCloudShareValue = await getSetting("EnableCloudShare", "false");
   const enableNutritionFactsValue = await getSetting("EnableNutritionFacts", "false");
 
   stepsInterval.value = parseInt(stepsInvervalValue);
   useFractions.value = useFractionsValue === "true";
-  enableAdvancedSearch.value = enableAdvancedSearchValue === "true";
   enableYoutubeVideos.value = enableYoutubeVideosValue === "true";
   enableCloudShare.value = enableCloudShareValue === "true";
   enableNutritionFacts.value = enableNutritionFactsValue === "true";
@@ -108,10 +105,6 @@ function updateUseFractions() {
   saveSetting("UseFractions", `${useFractions.value}`);
 }
 
-function updateEnableAdvancedSearch() {
-  saveSetting("EnableAdvancedSearch", `${enableAdvancedSearch.value}`);
-}
-
 function updateEnableYoutubeVideos() {
   saveSetting("EnableYoutubeVideos", `${enableYoutubeVideos.value}`);
 }
@@ -187,16 +180,6 @@ async function setSelectedLanguage() {
         <span class="text-gray-500 text-sm">{{ t("pages.options.multiplierTypeDescription") }}</span>
       </div>
     </div>
-    <div class="mt-4 p-2 rounded cursor-pointer active:bg-theme-secondary">
-      <span class="dark:text-white">{{ t("pages.options.enableAdvancedSearch") }}</span>
-      <label data-testid="enable-advanced-search-toggle" class="switch float-right align-middle">
-        <input v-model="enableAdvancedSearch" type="checkbox" @change="updateEnableAdvancedSearch">
-        <span class="slider round"></span>
-      </label>
-      <div>
-        <span class="text-gray-500 text-sm">{{ t("pages.options.enableAdvancedSearchDescription") }}</span>
-      </div>
-    </div>
     <div class="mt-4 p-2 rounded cursor-pointer active:bg-theme-secondary">
       <span class="dark:text-white">{{ t("pages.options.enableYoutubeVideos") }}</span>
       <label data-testid="enable-youtube-videos-toggle" class="switch float-right align-middle">

tests/main.spec.ts

@@ -120,13 +120,7 @@ test('search simple', async ({ page, isMobile }) => {
   await expect(names.first()).toHaveText('Favorite cookie');
 });
 
-async function enableAdvancedSearch(page: any) {
-    await page.goto('#/options');
-    await page.getByTestId('enable-advanced-search-toggle').click();
-}
-
 test('search advanced by typing title', async ({ page, isMobile }) => {
-  await enableAdvancedSearch(page);
   await createRecipe(page, 2, "Favorite cookie", 5, ["1 cookie dough"], ["Bake it!"]);
   await page.goto('/');
 
@@ -139,7 +133,6 @@ test('search advanced by typing title', async ({ page, isMobile }) => {
 });
 
 test('search advanced by typing ingredient', async ({ page, isMobile }) => {
-  await enableAdvancedSearch(page);
   await createRecipe(page, 2, "Favorite cookie", 5, ["1 cookie dough"], ["Bake it!"]);
   await page.goto('/');
 
@@ -152,7 +145,6 @@ test('search advanced by typing ingredient', async ({ page, isMobile }) => {
 });
 
 test('search advanced by typing step', async ({ page, isMobile }) => {
-  await enableAdvancedSearch(page);
   await createRecipe(page, 2, "Favorite cookie", 5, ["1 cookie dough"], ["Bake at 354F it!"]);
   await page.goto('/');
 
@@ -166,7 +158,6 @@ test('search advanced by typing step', async ({ page, isMobile }) => {
 
 
 test('search advanced by selecting title', async ({ page, isMobile }) => {
-  await enableAdvancedSearch(page);
   await createRecipe(page, 2, "Favorite cookie", 5, ["1 cookie dough"], ["Bake it!"]);
   await page.goto('/');
 
@@ -180,7 +171,6 @@ test('search advanced by selecting title', async ({ page, isMobile }) => {
 });
 
 test('search advanced by selecting ingredient', async ({ page, isMobile }) => {
-  await enableAdvancedSearch(page);
   await createRecipe(page, 2, "Favorite cookie", 5, ["1 cookie dough"], ["Bake it!"]);
   await page.goto('/');
 
@@ -194,7 +184,6 @@ test('search advanced by selecting ingredient', async ({ page, isMobile }) => {
 });
 
 test('search advanced by selecting step', async ({ page, isMobile }) => {
-  await enableAdvancedSearch(page);
   await createRecipe(page, 2, "Favorite cookie", 5, ["1 cookie dough"], ["Bake at 354F it!"]);
   await page.goto('/');
 

vite.config.ts

@@ -15,6 +15,7 @@ export default defineConfig({
     },
     registerType: 'autoUpdate',
     manifest: {
+      id: 'lpains.sharpcooking',
       name: 'Sharp Cooking',
       short_name: 'Sharp Cooking',
       description: 'Your recipe book app',
@@ -32,29 +33,35 @@ export default defineConfig({
           type: 'image/png',
         }
       ],
-      "shortcuts": [
+      shortcuts: [
         {
-          "name": "New Manual Recipe",
-          "short_name": "New Manual Recipe",
-          "description": "Create a new recipe manually",
-          "url": "/#/recipe/0/edit?fromShortcut=1",
-          "icons": [{ "src": "/shortcut-add-manual.png", "sizes": "192x192" }]
+          name: "New Manual Recipe",
+          short_name: "New Manual Recipe",
+          description: "Create a new recipe manually",
+          url: "/#/recipe/0/edit?fromShortcut=1",
+          icons: [{ "src": "/shortcut-add-manual.png", "sizes": "192x192" }]
         },
         {
-          "name": "Import From URL",
-          "short_name": "New Recipe",
-          "description": "Create a new recipe from a URL",
-          "url": "/#/recipe/0/edit?import=1&fromShortcut=1",
-          "icons": [{ "src": "/shortcut-add-url.png", "sizes": "192x192" }]
+          name: "Import From URL",
+          short_name: "New Recipe",
+          description: "Create a new recipe from a URL",
+          url: "/#/recipe/0/edit?import=1&fromShortcut=1",
+          icons: [{ "src": "/shortcut-add-url.png", "sizes": "192x192" }]
         },
         {
-          "name": "Scan a Recipe",
-          "short_name": "New Recipe",
-          "description": "Create a new recipe by scanning from an image",
-          "url": "/#/recipe/import-ocr?fromShortcut=1",
-          "icons": [{ "src": "/shortcut-add-scan.png", "sizes": "192x192" }]
+          name: "Scan a Recipe",
+          short_name: "New Recipe",
+          description: "Create a new recipe by scanning from an image",
+          url: "/#/recipe/import-ocr?fromShortcut=1",
+          icons: [{ "src": "/shortcut-add-scan.png", "sizes": "192x192" }]
         }
-      ]
+      ],
+      launch_handler: {
+        client_mode: "focus-existing"
+      },
+      orientation: "portrait-primary",
+      categories: ["food_and_drink"],
+      dir: "ltr",
     }
   }),
   Pages({