fix: Remove from queue behavior

Signed-off-by: Johannes Groß <[email protected]>
jo-gross · Dec 27, 2024 · ad21383 · ad21383
1 parent bcc146f
commit ad21383
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/components/cocktails/CocktailRecipeForm.tsx b/components/cocktails/CocktailRecipeForm.tsx
@@ -616,7 +616,7 @@ export function CocktailRecipeForm(props: CocktailRecipeFormProps) {
                               form={
                                 <GlassForm
                                   onSaved={async (id) => {
-                                    modalContext.closeModal();
+                                    modalContext.closeAllModals();
                                     await setFieldValue('glassId', id);
                                     fetchGlasses(workspaceId, setGlasses, setGlassesLoading);
                                   }}
@@ -1102,7 +1102,7 @@ export function CocktailRecipeForm(props: CocktailRecipeFormProps) {
                                                     <IngredientForm
                                                       formRef={createRef<FormikProps<any>>()}
                                                       onSaved={async (id) => {
-                                                        modalContext.closeModal();
+                                                        modalContext.closeAllModals();
                                                         await setFieldValue(`steps.${indexStep}.ingredients.${indexIngredient}.ingredientId`, id);
                                                         fetchIngredients(workspaceId, setIngredients, setIngredientsLoading);
                                                       }}
@@ -1329,7 +1329,7 @@ export function CocktailRecipeForm(props: CocktailRecipeFormProps) {
                                           <GarnishForm
                                             formRef={createRef<FormikProps<any>>()}
                                             onSaved={async (id) => {
-                                              modalContext.closeModal();
+                                              modalContext.closeAllModals();
                                               await setFieldValue(`garnishes.${indexGarnish}.garnishId`, id);
                                               fetchGarnishes(workspaceId, setGarnishes, setGarnishesLoading);
                                             }}

diff --git a/pages/api/workspaces/[workspaceId]/queue/add.ts b/pages/api/workspaces/[workspaceId]/queue/add.ts
@@ -21,7 +21,7 @@ export default withHttpMethods({
           id: cocktailId,
         },
       },
-      notes: notes ? (notes.trim() == '' ? undefined : notes.trim()) : undefined,
+      notes: notes ? (notes.trim() == '' || notes.trim() == '-' ? undefined : notes.trim()) : undefined,
     };
 
     const results = [];

diff --git a/pages/api/workspaces/[workspaceId]/queue/remove.ts b/pages/api/workspaces/[workspaceId]/queue/remove.ts
@@ -9,11 +9,13 @@ export default withHttpMethods({
   [HTTPMethod.POST]: withWorkspacePermission([Role.USER], async (req: NextApiRequest, res: NextApiResponse, user, workspace) => {
     const { cocktailId, notes } = req.body;
 
+    const notesTrimmed = notes ? (notes.trim() == '' || notes.trim() == '-' ? null : notes.trim()) : null;
+
     const firstQueueItem = await prisma.cocktailQueue.findFirst({
       where: {
         workspaceId: workspace.id,
         cocktailId: cocktailId,
-        notes: notes,
+        notes: notesTrimmed,
       },
       orderBy: {
         createdAt: 'asc',

diff --git a/pages/api/workspaces/[workspaceId]/statistics/cocktails/add.ts b/pages/api/workspaces/[workspaceId]/statistics/cocktails/add.ts
@@ -58,7 +58,7 @@ export default withHttpMethods({
           - if there are cocktails with notes in the queue, return an error "ask user wich one to remove" (oldest
          */
         if (notes) {
-          const searchNote = notes == '-' ? null : notes;
+          const searchNote: string | null = notes == '-' ? null : notes;
           const queueItem = await prisma.cocktailQueue.findFirst({
             where: {
               workspaceId: workspace.id,