pywebexec 2.1.17__py3-none-any.whl → 2.1.19__py3-none-any.whl

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/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/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/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.dist-info → pywebexec-2.1.19.dist-info}/METADATA

@@ -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.dist-info → pywebexec-2.1.19.dist-info}/RECORD

@@ -2,7 +2,7 @@ pywebexec/__init__.py,sha256=197fHJy0UDBwTTpGCGortZRr-w2kTaD7MxqdbVmTEi0,61
 pywebexec/host_ip.py,sha256=Ud_HTflWVQ8789aoQ2RZdT1wGI-ccvrwSWGz_c7T3TI,1241
 pywebexec/pywebexec.py,sha256=kufip6m7MWjCIjtheUYuFUZgnNS5_W3kC5gVFVSUVX8,45662
 pywebexec/swagger.yaml,sha256=zP_Nz69vZx0iwbKTwiQgSs8rJRUTiGKRyIkWzMPANOE,6688
-pywebexec/version.py,sha256=6B1QsV14vku3b3mzQ60TgvM-e03ET7xDx-6ZZcUvbqI,513
+pywebexec/version.py,sha256=H0zgjQHhg7kQrNE7IoxjBFCFnEnqqBnOnQe-ScWOyb4,513
 pywebexec/static/css/form.css,sha256=eApJskeJ3MCzC7_p4gXgoIbvbG5s8m4bP1O4KHHqeiA,5293
 pywebexec/static/css/markdown.css,sha256=3RzUnpVBdF6cQuB_NXV7hMTc0quYU8sfyuZcpsREj6A,1939
 pywebexec/static/css/style.css,sha256=ynccbEDzK07rurLm-UirUs5j_hVfXlIgaHeUIq9WvA0,9969
@@ -33,11 +33,11 @@ pywebexec/static/images/resume.svg,sha256=99LP1Ya2JXakRCO9kW8JMuT_4a_CannF65Eiuw
 pywebexec/static/images/running.svg,sha256=fBCYwYb2O9K4N3waC2nURP25NRwZlqR4PbDZy6JQMww,610
 pywebexec/static/images/success.svg,sha256=NVwezvVMplt46ElW798vqGfrL21Mw_DWHUp_qiD_FU8,489
 pywebexec/static/images/swagger-ui.svg,sha256=FR0yeOVwe4zCYKZAjCGcT_m0Mf25NexIVaSXifIkoU0,2117
-pywebexec/static/js/executables.js,sha256=DgkpsiXYRLzS57W8s8zTa-bqk4aErQaQnC7Y_icJITs,12301
+pywebexec/static/js/executables.js,sha256=V9SUmRQP9M69jYbahNrsV4_oI0ASZv_F6Ax9wj0S0Ww,12171
 pywebexec/static/js/popup.js,sha256=0fr3pp4j9D2fXEVnHyQrx2bPWFHfgbb336dbewgH1d8,9023
-pywebexec/static/js/schemaform.js,sha256=AcJky1SuxlcPFmVsHSXTTHBUtb3ZJ8SlDk1Yq2Zb_Es,6096
+pywebexec/static/js/schemaform.js,sha256=mpOYvAiCcuG6-3dJiOLaGKK14mBic0UWN5WrrKxCA_g,6403
 pywebexec/static/js/script.js,sha256=KrtLF77vKvKomKAIy0rix-T1hx4VTgjkQunHvgs-jaA,17631
-pywebexec/static/js/swagger-form.js,sha256=BU64XxyfrWx4DnpAuaWtG-9YpcHF3OzzAYzjiSH0NGo,3826
+pywebexec/static/js/swagger-form.js,sha256=o2ovbTpqwy6H2yubV1NIi7VBQfAqW7seZWQ6O78ACb8,3837
 pywebexec/static/js/js-yaml/LICENSE,sha256=oHvCRGi5ZUznalR9R6LbKC0HcztxXbTHOpi9Y5YflVA,1084
 pywebexec/static/js/js-yaml/js-yaml.min.js,sha256=Rdw90D3AegZwWiwpibjH9wkBPwS9U4bjJ51ORH8H69c,39430
 pywebexec/static/js/marked/LICENSE.md,sha256=jjo_gvWaYJWPVsoI9EVkfDKkcz3HymwsRvbriYRxq5w,2942
@@ -67,9 +67,9 @@ pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 pywebexec/templates/index.html,sha256=w18O2plH_yS8bqlPsu5hwFFmCj9H2hWLSV8B6ADcSwU,3900
 pywebexec/templates/popup.html,sha256=3kpMccKD_OLLhJ4Y9KRw6Ny8wQWjVaRrUfV9y5-bDiQ,1580
 pywebexec/templates/swagger_ui.html,sha256=9ngyldkyEdLonBjl97mbIZUlVk-jxwcHrvFzMSrveyU,1067
-pywebexec-2.1.17.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-2.1.17.dist-info/METADATA,sha256=KCKxVgXAdHSNNrg9xrxNUjL5PrTJDkYQXv1ZlkMhAl0,12811
-pywebexec-2.1.17.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-pywebexec-2.1.17.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-2.1.17.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-2.1.17.dist-info/RECORD,,
+pywebexec-2.1.19.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-2.1.19.dist-info/METADATA,sha256=NDtHARH0QFd_0FthJ2ui5LPVdw2O-1TtP4stJSenWWY,12811
+pywebexec-2.1.19.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+pywebexec-2.1.19.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-2.1.19.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-2.1.19.dist-info/RECORD,,