adding variables to check authorizations, improving edit config page

Alexis Koralewski
1 parent c0087c92
Showing 4 changed files with 71 additions and 26 deletions Show diff stats
src/core/pyros_django/obsconfig/configpyros.py
src/core/pyros_django/obsconfig/templates/obsconfig/edit_config.html
src/core/pyros_django/obsconfig/templates/obsconfig/global_obs_configuration.html
src/core/pyros_django/obsconfig/views.py
@@ -16,7 +16,7 @@ class ConfigPyros:
     computers = None
     agents = None 
     obs_config_file_content = None
-    obs_config_path = os.environ["PATH_TO_OBSCONF_FOLDER"]
+    obs_config_path = os.environ.get("PATH_TO_OBSCONF_FOLDER",os.path.join(os.environ["DJANGO_PATH"],"../../../privatedev/config/default/"))
     errors = None
     def verify_if_pickle_needs_to_be_updated(self,observatory_config_file)->bool:
         """[summary]
@@ -42,8 +42,10 @@ class ConfigPyros:
                 # Create history folder if doesn't exist
                 Path(self.obs_config_path+"/history/").mkdir(parents=True, exist_ok=True)
                 file_name = f"{self.obs_config_path}/history/observatory_{pickle_datetime}.yml"
+                config_file = open(observatory_config_file,"r")
+
                 with open(file_name, 'w') as f:
-                    data = yaml.dump(obs_config, f)
+                    f.write(config_file.read())
                 return True
             if obs_config == None:
                 print(f"Error when trying to read config file (path of config file : {observatory_config_file}")
@@ -77,12 +79,30 @@ class ConfigPyros:
                         time.sleep(0.5)
             except IOError:
                 print("Error when reading the pickle file")
+            try:
+                self.obs_config = pickle_dict["obs_config"]
+                self.computers = pickle_dict["computers"]
+                self.devices = pickle_dict["devices"]
+                self.devices_links = pickle_dict["devices_links"]
+                self.obs_config_file_content = pickle_dict["obs_config_file_content"]
+                self.raw_config =  pickle_dict["raw_config"] 
+            except:
+                # we rewrite the pickle file, the content will be the same otherwise we would be in the else case
+                print("Rewritting the pickle file (an error occured while reading it, the content will be the same as it was")
+                pickle_dict = {}
-            self.obs_config = pickle_dict["obs_config"]
-            self.computers = pickle_dict["computers"]
-            self.devices = pickle_dict["devices"]
-            self.devices_links = pickle_dict["devices_links"]
-            self.obs_config_file_content = pickle_dict["obs_config_file_content"]
+                self.obs_config = self.read_and_check_config_file(observatory_config_file) 
+                obs_file = open(observatory_config_file,"r")
+                pickle_dict["raw_config"] = obs_file.read()
+                obs_file.close()
+                self.raw_config =  pickle_dict["raw_config"] 
+                pickle_dict["obs_config"] = self.obs_config
+                pickle_dict["devices"] = self.get_devices()
+                pickle_dict["computers"] = self.get_computers()
+                pickle_dict["devices_links"] = self.devices_links
+                pickle_dict["obs_config_file_content"] = self.read_and_check_config_file(observatory_config_file) 
+                print("Writing pickle file")
+                pickle.dump(pickle_dict,open(self.CONFIG_PATH+self.pickle_file,"wb"))    
         else:
             print("Pickle file needs to be created or updated")
             pickle_dict = {}
@@ -26,11 +26,7 @@
         left:80vw;
         top: 30vh;
     }
-    #message{
-        position:absolute;
-        left:80vw;
-        top: 25vh;
-    }
+
     .red{
         color:red;
     }
@@ -47,14 +43,17 @@
 </div>
 <div>
 {% csrf_token %}
-<button id="check_config">Check configuration</button>
+<button class="btn-primary" id="check_config">Check schema</button>
-<p id="message"></p>
 </div>
 <div id="save" class="hidden">
+<p id="message"></p>
+    {% comment %}
 <label> File name: (without ".yml" extension)</label>
+        
     <input id="file_name"></input>
-    <button id="save_btn">Save</button>
+    {% endcomment %}
+    <button class="btn-primary" id="save_btn">Save</button>
 <p id="save_message"></p>
 </div>
@@ -64,8 +63,7 @@
     editor.setTheme("ace/theme/eclipse");
     editor.session.setMode("ace/mode/yaml");
-    document.getElementById('inputfile')
-        .addEventListener('change', function() {
+    document.getElementById('inputfile').addEventListener('change', function() {
             // loading default file (current observatory configuration file)
             var fr=new FileReader();
             fr.onload=function(){
@@ -74,8 +72,13 @@
             fr.readAsText(this.files[0]);
             editor.resize();
-            
-    });
+        });
+    document.getElementById("editor").addEventListener("input",function(){
+            console.log("input")
+            $("#save").attr("class",'hidden')
+            $("#save_btn").removeAttr("disabled");
+            $("#save_message").empty();
+        });
     document.querySelector("#check_config").addEventListener('click',function(){
         //console.log(editor.getValue());
         csrf_value = $("[name='csrfmiddlewaretoken']").val();
@@ -85,6 +88,7 @@
             if(data["is_valid"] == true){
                 $("#message").empty().attr('class', 'normal').append("Valid configuration, do you want to save it ?");
                 $("#save").toggleClass('hidden');
+                $("#save_message").empty();
             }
             else{
                 $("#save").attr("class",'hidden')
@@ -110,6 +114,7 @@
         $.post('{% url 'save_config' %}', { "config": editor.getValue(), csrfmiddlewaretoken: csrf_value }, function(data,status) {
             if(status == "success"){
                 $("#save_message").empty().append("<p>Configuration saved !</p>");
+                $("#save_btn").prop("disabled","true")
             }
             else{
                 $("#save_message").empty().append("<p class='red'>Error while trying to save the configuration file</p>");
@@ -5,11 +5,19 @@
 <div class="obs">
 <h1>{{obs_name}} </h1>
     <ul>
-        <li> <a href="{% url 'edit_config' %}"> edit configuration </a> </li>
-        <li> <a href="{% url 'obs_hardware_config' %}"> Hardware configuration </a> </li>
+        {% if CAN_EDIT_CONFIG %}
-        <li> <a href="{% url 'obs_astronomer_config' %}"> Astronomer configuration </a> </li>
-        <li> <a href="{% url 'obs_agents_config' %}"> Agents configuration </a> </li>
+            <li> <a href="{% url 'edit_config' %}"> edit configuration </a> </li>
+        {% endif %}
+        {% if CAN_VIEW_HARDWARE_CONFIG %}
+            <li> <a href="{% url 'obs_hardware_config' %}"> Hardware configuration </a> </li>
+        {% endif %}
+        {% if CAN_VIEW_ASTRONOMER_CONFIG %}
+            <li> <a href="{% url 'obs_astronomer_config' %}"> Astronomer configuration </a> </li>
+        {% endif %}
+        {% if CAN_VIEW_AGENTS_CONFIG %}
+            <li> <a href="{% url 'obs_agents_config' %}"> Agents configuration </a> </li>
+        {% endif %}
     </ul>
     {% for unit_name in units_names %}
     <div class="unit" style="margin-left:15%;">
@@ -33,7 +33,19 @@ def obs_global_config(request):
     units_names = list(config.get_units().keys())
     pickle_file_mtime = os.path.getmtime(config.CONFIG_PATH+config.pickle_file)
     pickle_datetime = datetime.utcfromtimestamp(pickle_file_mtime).strftime("%Y/%m/%d %H:%M:%S")
-    return render(request,"obsconfig/global_obs_configuration.html",{"units_names" : units_names, "obs_name": config.get_obs_name(),"last_modification_time":pickle_datetime})
+    CAN_EDIT_CONFIG = request.session.get("role") in ("Admin","Operator","Unit-PI","Unit-board")
+    CAN_VIEW_HARDWARE_CONFIG = request.session.get("role") in ("Admin","Operator","Unit-PI","Unit-board")
+    CAN_VIEW_ASTRONOMER_CONFIG = request.session.get("role") in ("Admin","Operator","Unit-PI","Observer","Management board manager","Unit-board")
+    CAN_VIEW_AGENTS_CONFIG =  request.session.get("role") == "Admin"
+    return render(request,"obsconfig/global_obs_configuration.html",{
+        "units_names" : units_names,
+        "obs_name": config.get_obs_name(),
+        "last_modification_time":pickle_datetime,
+        "CAN_EDIT_CONFIG":CAN_EDIT_CONFIG,
+        "CAN_VIEW_HARDWARE_CONFIG": CAN_VIEW_HARDWARE_CONFIG,
+        "CAN_VIEW_ASTRONOMER_CONFIG":CAN_VIEW_ASTRONOMER_CONFIG,
+        "CAN_VIEW_AGENTS_CONFIG":CAN_VIEW_AGENTS_CONFIG
+    })
 @login_required
@@ -221,7 +233,7 @@ def obs_agents_config(request):
 @level_required("Admin","Operator","Unit-PI")
 def edit_config(request):
     config = ConfigPyros(os.environ["PATH_TO_OBSCONF_FILE"])
-    return render(request,"obsconfig/edit_config.html",{"config_file":yaml.dump(config.obs_config_file_content)})
+    return render(request,"obsconfig/edit_config.html",{"config_file":config.raw_config})
 @login_required
 @level_required("Admin","Operator","Unit-PI")
@@ -236,7 +248,7 @@ def verify_config(request):
         schema = config_file["schema"]
         errors = []
         if schema == None:
-            response["is_valid"] = False
+            response_data["is_valid"] = False
             response_data["message"] = "Missing schema"
         schema_path = os.path.join(os.environ["DJANGO_PATH"],"../../../config/schemas/")
         config = ConfigPyros.check_config(temp_config_file.name,schema_path+schema)