From 81f42637f0b31b768de0d90987a9e8395fd56d02 Mon Sep 17 00:00:00 2001
From: Alexis Koralewski <akoralewski@irap.omp.eu>
Date: Thu, 7 Oct 2021 14:43:06 +0200
Subject: [PATCH] F14 : When editing the obs config file, the website return yaml syntax errors

---
 src/core/pyros_django/obsconfig/templates/obsconfig/edit_config.html | 25 ++++++++++++++++++-------
 src/core/pyros_django/obsconfig/views.py                             | 13 ++++++++++++-
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/core/pyros_django/obsconfig/templates/obsconfig/edit_config.html b/src/core/pyros_django/obsconfig/templates/obsconfig/edit_config.html
index 9713796..9464468 100644
--- a/src/core/pyros_django/obsconfig/templates/obsconfig/edit_config.html
+++ b/src/core/pyros_django/obsconfig/templates/obsconfig/edit_config.html
@@ -26,6 +26,11 @@
         left:80vw;
         top: 30vh;
     }
+    #message{
+        position:absolute;
+        left:80vw;
+        top: 25vh;
+    }
 
     .red{
         color:red;
@@ -46,8 +51,8 @@
 <button class="btn-primary" id="check_config">Check schema</button>
 
 </div>
-<div id="save" class="hidden">
 <p id="message"></p>
+<div id="save" class="hidden">
     {% comment %}
 <label> File name: (without ".yml" extension)</label>
         
@@ -74,7 +79,6 @@
             editor.resize();
         });
     document.getElementById("editor").addEventListener("input",function(){
-            console.log("input")
             $("#save").attr("class",'hidden')
             $("#save_btn").removeAttr("disabled");
             $("#save_message").empty();
@@ -84,7 +88,6 @@
         csrf_value = $("[name='csrfmiddlewaretoken']").val();
         $.post('{% url 'verify_config' %}', { "config": editor.getValue(), csrfmiddlewaretoken: csrf_value }, function(data,status) {
             console.log(data);
-            console.log(status);
             if(data["is_valid"] == true){
                 $("#message").empty().attr('class', 'normal').append("Valid configuration, do you want to save it ?");
                 $("#save").toggleClass('hidden');
@@ -93,12 +96,20 @@
             else{
                 $("#save").attr("class",'hidden')
                 $("#message").empty().attr('class', 'red').append("Invalid configruation, see the errors below:");
-                for(error of data["message"] ){
-                    for(message of error){
-                        $("#message").append("<p>"+message+"</p>");
+                if (data["message"]){
+                    for(error of data["message"] ){
+                        for(message of error){
+                            $("#message").append("<p>"+message+"</p>");
 
-                    }
+                        }
 
+                    }
+                }
+                console.log(data["yaml_error_message"])
+                if (data["yaml_error_message"]){
+                    console.log("yaml_error_message")
+                    let message = data["yaml_error_message"];
+                    $("#message").append("<p><pre>"+message+"</pre></p>");
                 }
             }
         });
diff --git a/src/core/pyros_django/obsconfig/views.py b/src/core/pyros_django/obsconfig/views.py
index d18bc34..541230e 100644
--- a/src/core/pyros_django/obsconfig/views.py
+++ b/src/core/pyros_django/obsconfig/views.py
@@ -243,7 +243,18 @@ def verify_config(request):
         temp_config_file.write(request.POST.get("config"))
         temp_config_file.seek(0)
         response_data = {}
-        config_file = yaml.safe_load(temp_config_file.read())
+        try:
+            config_file = yaml.safe_load(temp_config_file.read())
+        except yaml.YAMLError as exc:
+            if hasattr(exc, 'problem_mark'):
+                yaml_error_message = ""
+                if exc.context != None:
+                    yaml_error_message += str(exc.problem_mark) + '\n  ' + str(exc.problem) + ' ' + str(exc.context) 
+                else:
+                    yaml_error_message = str(exc.problem_mark.name) + '\n  ' +str(exc.problem)
+                response_data["is_valid"] = False
+                response_data["yaml_error_message"] = yaml_error_message
+            return HttpResponse(json.dumps(response_data), content_type="application/json")
         temp_config_file.seek(0)
         schema = config_file["schema"]
         errors = []
--
libgit2 0.21.2