From 4015517c0aa5ee879700b9e06e6f8dfb8e0e08e8 Mon Sep 17 00:00:00 2001
From: smilerz <smilerz@gmail.com>
Date: Fri, 19 Mar 2021 16:06:02 -0500
Subject: [PATCH] more fix from super ugly merge

---
 cookbook/helper/recipe_html_import.py | 18 ++++++++++++------
 cookbook/templates/url_import.html    | 20 +++++++++++---------
 cookbook/views/api.py                 |  2 +-
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/cookbook/helper/recipe_html_import.py b/cookbook/helper/recipe_html_import.py
index 19ef4014..427d07b9 100644
--- a/cookbook/helper/recipe_html_import.py
+++ b/cookbook/helper/recipe_html_import.py
@@ -10,7 +10,7 @@ from cookbook.helper import recipe_url_import as helper
 # %%
 
 # %%
-def get_from_raw(text):
+def get_from_raw(text, space):
     def build_node(k, v):
         if isinstance(v, dict):
             node = {
@@ -85,8 +85,11 @@ def get_from_raw(text):
     for el in parse_list:
 
         if isinstance(el, Tag):
-            el = json.loads(el.string)
-            
+            try:
+                el = json.loads(el.string)
+            except TypeError:
+                continue
+
         for k, v in el.items():
             if isinstance(v, dict):
                 node = {
@@ -106,9 +109,12 @@ def get_from_raw(text):
                     'value': str(v)
                 }
             temp_tree.append(node)
-        if ('@type' in el and el['@type'] == 'Recipe'):
-            recipe_json = helper.find_recipe_json(el, None)
-            recipe_tree += [{'name': 'ld+json', 'children': temp_tree}]
+        # recipes type might be wrapped in @graph type
+        if '@graph' in el:
+            for x in el['@graph']:
+                if '@type' in x and x['@type'] == 'Recipe':
+                    recipe_json = helper.find_recipe_json(x, None, space)
+                    recipe_tree += [{'name': 'ld+json', 'children': temp_tree}]
         else:
             recipe_tree += [{'name': 'json', 'children': temp_tree}]
 
diff --git a/cookbook/templates/url_import.html b/cookbook/templates/url_import.html
index 8285c77e..a78449cf 100644
--- a/cookbook/templates/url_import.html
+++ b/cookbook/templates/url_import.html
@@ -85,7 +85,7 @@
                         </textarea>
                     </div>
                     <br>
-                    <button @click="loadPreviewHTML()" class="btn btn-primary shadow-none" type="button"
+                    <button @click="loadPreviewRaw()" class="btn btn-primary shadow-none" type="button"
                                 id="id_btn_HTML"><i class="fas fa-code"></i> {% trans 'Preview Import' %} 
                     </button>
                 </div>
@@ -136,7 +136,7 @@
 
                             <div class="card mb-2">
                                 <div class="card-header">
-                                    <div class="row" style="display:flex; justify-content:space-between;">
+                                    <div class="row px-3" style="justify-content:space-between;">
                                         {% trans 'Keywords' %}
                                         <i class="fas fa-eraser"  style="cursor:pointer;" @click="deletePreview('keywords')" title="{% trans 'Clear Contents'%}"></i>
                                     </div>
@@ -197,7 +197,7 @@
 
                             <div class="card mb-2">
                                 <div class="card-header">
-                                    <div class="row" style="display:flex; justify-content:space-between;">
+                                    <div class="row px-3" style="display:flex; justify-content:space-between;">
                                         {% trans 'Ingredients' %}
                                         <i class="fas fa-eraser"  style="cursor:pointer;" @click="deletePreview('ingredients')" title="{% trans 'Clear Contents'%}"></i>
                                     </div>
@@ -206,7 +206,7 @@
                                 <div class="card-body drop-zone"   @drop="replacePreview('ingredients', $event)" @dragover.prevent @dragenter.prevent>
                                     <ul class="list-group list-group">
                                         <div v-for="i in recipe_json.recipeIngredient">
-                                            <li class="row border" style="border:1px">
+                                            <li class="row border-light" >
                                                 <div class="col-sm-1 border">[[i.amount]]</div>
                                                 <div class="col-sm border">[[i.unit.text]]</div>
                                                 <div class="col-sm border">[[i.ingredient.text]]</div>
@@ -218,10 +218,13 @@
                             </div>
 
                             <div class="card mb-2">
-                                <div class="card-header" style="display:flex; justify-content:space-between;">
+                                <div class="card-header">
+                                    <div class="row px-3" style="justify-content:space-between;">    
                                         {% trans 'Instructions' %}
                                         <i class="fas fa-eraser"  style="cursor:pointer;" @click="deletePreview('instructions')" title="{% trans 'Clear Contents'%}"></i>
                                     </div>
+                                    <div class="small text-muted">{% trans 'Recipe instructions dragged here will be appended to current instructions.'%}</div>
+                                </div>
                                 <div class="card-body drop-zone"   @drop="replacePreview('instructions', $event)" @dragover.prevent @dragenter.prevent>
                                     <div class="card-text">[[recipe_json.recipeInstructions]]</div>
                                 </div>
@@ -229,7 +232,7 @@
                         </div>
                     </div>
                     <br/>
-                    <button @click="loadRecipeHTML()" class="btn btn-primary shadow-none" type="button"
+                    <button @click="loadRecipeRaw()" class="btn btn-primary shadow-none" type="button"
                                 id="id_btn_json"><i class="fas fa-code"></i> {% trans 'Import' %} 
                     </button>
                 </div>
@@ -596,13 +599,12 @@
                         this.makeToast(gettext('Error'), msg, 'danger')
                     })
                 },
-                loadRecipeHTML: function () {
-                    // TODO this needs refactored to get HTML elements
+                loadRecipeRaw: function () {
                     this.error = undefined
                     this.loading = true
                     this.parsed = false
                     this.recipe_json['@type'] = "Recipe"
-                    this.$http.post("{% url 'api_recipe_from_json' %}", {'html': JSON.stringify(this.raw_data)}, {emulateJSON: true}).then((response) => {
+                    this.$http.post("{% url 'api_recipe_from_json' %}", {'json': JSON.stringify(this.recipe_json)}, {emulateJSON: true}).then((response) => {
                         console.log(response.data)
                         this.recipe_data = response.data;
                         this.loading = false
diff --git a/cookbook/views/api.py b/cookbook/views/api.py
index a67b1591..8b99662f 100644
--- a/cookbook/views/api.py
+++ b/cookbook/views/api.py
@@ -618,7 +618,7 @@ def recipe_from_url_old(request):
 @group_required('user')
 def manual_recipe_from_json(request):
     json_data = request.POST['data']
-    recipe_json, recipe_tree = get_from_raw(json_data)
+    recipe_json, recipe_tree = get_from_raw(json_data, request.space)
     if len(recipe_tree) == 0 and len(recipe_json) == 0:
         return JsonResponse(
             {