pywebexec 2.1.17__tar.gz → 2.1.19__tar.gz

{pywebexec-2.1.17/pywebexec.egg-info → pywebexec-2.1.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 2.1.17
+Version: 2.1.19
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau

{pywebexec-2.1.17 → pywebexec-2.1.19}/pywebexec/static/js/executables.js

@@ -256,8 +256,6 @@ async function fetchExecutables() {
 
 }
 
-let schemaValues = {};
-
 paramsInput.addEventListener('focus', () => {
     const currentCmd = commandInput.value;
     paramsInput.name = currentCmd;
@@ -267,8 +265,6 @@ paramsInput.addEventListener('focus', () => {
     if (gExecutables[currentCmd] && gExecutables[currentCmd].schema && gExecutables[currentCmd].schema.properties && paramsContainer.style.display == 'none') {
         createSchemaForm($('#schemaForm'), gExecutables[currentCmd].schema, async function (errors, values) {
             if (errors) {
-                schemaValues[currentCmd] = values;
-
                 console.log(errors);
                 alert(errors[0].message);
                 return false;
@@ -276,7 +272,6 @@ paramsInput.addEventListener('focus', () => {
                 const commandName = commandInput.value;
                 fitAddon.fit();
                 terminal.clear();
-                schemaValues[currentCmd] = values;
                 payload = { params: values, rows: terminal.rows, cols: terminal.cols }
                 if ('parallel' in values) {
                     payload['parallel'] = values['parallel'];
@@ -306,7 +301,7 @@ paramsInput.addEventListener('focus', () => {
                     console.log('Error running command:', error);
                 }
             }
-        }, schemaValues[currentCmd]);
+        }, currentCmd.toString());
         setHelpDivPosition();
         paramsContainer.style.display = 'block';
         const input1 = schemaFormPW.querySelector('input, select, textarea');

{pywebexec-2.1.17 → pywebexec-2.1.19}/pywebexec/static/js/schemaform.js

@@ -35,16 +35,17 @@ function extractKeysAndPlaceholders(obj, formoptions, prefix = '') {
     let result = [];
   
     for (let key in obj.properties) {
+      k = prefix ? `${prefix}.${key}` : key;
       if (obj.properties[key].type === 'object' && obj.properties[key].properties) {
-        result = result.concat(extractKeysAndPlaceholders(obj.properties[key], formoptions, prefix ? `${prefix}.${key}` : key));
+        result = result.concat(extractKeysAndPlaceholders(obj.properties[key], formoptions, k));
       } else {
-        if (formoptions[`${prefix}.${key}`]) {
-          foptions = formoptions[`${prefix}.${key}`];
+        if (formoptions[k]) {
+          foptions = formoptions[k];
         } else {
           foptions = {};
         }
         result.push({
-          key: prefix ? `${prefix}.${key}` : key,
+          key: k,
           placeholder: obj.properties[key].example || null,
           ... foptions
         });
@@ -53,7 +54,12 @@ function extractKeysAndPlaceholders(obj, formoptions, prefix = '') {
     return result;
 }
 
-function createSchemaForm(form, schema, onSubmit, value={}) {
+function createSchemaForm(form, schema, onSubmit, schemaName) {
+  if (schemaValues[schemaName]) {
+    value = schemaValues[schemaName];
+  } else {
+    value = {};
+  }
   if (schema && schema.schema_options) {
     schema_options = schema.schema_options;
   } else {
@@ -162,7 +168,11 @@ function createSchemaForm(form, schema, onSubmit, value={}) {
     txt.setAttribute("spellcheck", "false");
     txt.addEventListener("input", () => adjustTxtHeight(txt));
   });
-    
+  form[0].addEventListener('input', () => {
+    schemaValues[schemaName] = jsform.root.getFormValues();
+    localStorage.setItem('schemaValues', JSON.stringify(schemaValues));
+  });
+  
   return jsform;
 }
 function adjustTxtHeight(txt) {
@@ -200,5 +210,6 @@ async function getPostParametersSchema() {
 
 let schemaForm;
 let inputHandlers = [];
+let schemaValues = JSON.parse(localStorage.getItem('schemaValues')) || {};
 
 

{pywebexec-2.1.17 → pywebexec-2.1.19}/pywebexec/static/js/swagger-form.js

@@ -88,7 +88,7 @@ window.onload = function() {
             const form = document.createElement("form");
             form.id = routePathId;
             form.classList.add("schema-form");
-            jsform = createSchemaForm($(form), swaggerSchemas[routePath], null);
+            jsform = createSchemaForm($(form), swaggerSchemas[routePath], null, routePath);
             // form.addEventListener("input", formInput(node, jsform)); 
             form.addEventListener("input", addFormInputListener(node, jsform));
             node.parentNode.insertBefore(form, node.nextSibling);

{pywebexec-2.1.17 → pywebexec-2.1.19}/pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.1.17'
-__version_tuple__ = version_tuple = (2, 1, 17)
+__version__ = version = '2.1.19'
+__version_tuple__ = version_tuple = (2, 1, 19)

{pywebexec-2.1.17 → pywebexec-2.1.19/pywebexec.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 2.1.17
+Version: 2.1.19
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau