pywebexec 2.2.1__tar.gz → 2.2.3__tar.gz

{pywebexec-2.2.1/pywebexec.egg-info → pywebexec-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pywebexec
-Version: 2.2.1
+Version: 2.2.3
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -62,6 +62,7 @@ Requires-Dist: ldap3>=2.9.1
 Requires-Dist: pyte>=0.8.1
 Requires-Dist: PyYAML>=6.0.1
 Requires-Dist: run-para>=1.0.2
+Dynamic: license-file
 
 [![Pypi version](https://img.shields.io/pypi/v/pywebexec.svg)](https://pypi.org/project/pywebexec/)
 ![Publish Package](https://github.com/joknarf/pywebexec/actions/workflows/python-publish.yml/badge.svg)

{pywebexec-2.2.1 → pywebexec-2.2.3}/pywebexec/static/css/form.css

@@ -211,6 +211,19 @@
     box-shadow: unset;
     outline: 0;
   }
+  .controls > .checkbox input {
+    top: 5px;
+  }
+  .checkbox {
+    label {
+      font-weight: normal;
+    }
+    input {
+      top: 1px;
+      display: unset;
+      margin-right: 4px;
+    }
+  }
 }
 
 .swagger-ui textarea {

{pywebexec-2.2.1 → pywebexec-2.2.3}/pywebexec/static/js/executables.js

@@ -259,9 +259,6 @@ async function fetchExecutables() {
 paramsInput.addEventListener('focus', () => {
     const currentCmd = commandInput.value;
     paramsInput.name = currentCmd;
-    if (paramsContainer.style.display == 'none') {
-        $('#schemaForm').html('');
-    }
     if (gExecutables[currentCmd] && gExecutables[currentCmd].schema && gExecutables[currentCmd].schema.properties && paramsContainer.style.display == 'none') {
         createSchemaForm($('#schemaForm'), gExecutables[currentCmd].schema, async function (errors, values) {
             const commandName = commandInput.value;

{pywebexec-2.2.1 → pywebexec-2.2.3}/pywebexec/static/js/schemaform.js

@@ -10,24 +10,20 @@ function adjustInputWidth(input) {
 
 function formInputHandle() {
   schemaForm.querySelectorAll('input[type="text"], input[type="number"]').forEach(input => {
-    if (! inputHandlers.includes(input)) {
-      val = input.placeholder;
-      if (val) {
-        size = Math.max(val.length, 2)
-        if (input.type== 'number') {
-          size += 2;
-        }
-      } else {
-        size = 12;
-      }
-      if (input.value) {
-        size = 2;
+    val = input.placeholder;
+    if (val) {
+      size = Math.max(val.length, 2)
+      if (input.type== 'number') {
+        size += 2;
       }
-      input.setAttribute('size', size);
-      setTimeout(() => adjustInputWidth(input), 1);
-      input.addEventListener('input', () => adjustInputWidth(input));
-      inputHandlers.push(input);
+    } else {
+      size = 12;
     }
+    if (input.value) {
+      size = 2;
+    }
+    input.setAttribute('size', size);
+    setTimeout(() => adjustInputWidth(input), 1);
   });
 }
 
@@ -84,6 +80,8 @@ function convertTextareaToArray(values, formDesc, schema) {
         const val = obj[lastKey];
         if (val) {
           obj[lastKey] = val.trim().split(/[\s\r,]+/).filter(x => x);
+        } else {
+          delete obj[lastKey];
         }
       }
     }
@@ -93,7 +91,7 @@ function convertTextareaToArray(values, formDesc, schema) {
 
 // ...existing code...
 
-function createSchemaForm(form, schema, onSubmit, schemaName) {
+function createSchemaForm($form, schema, onSubmit, schemaName) {
   if (schema && schema.schema_options) {
     schema_options = schema.schema_options;
   } else {
@@ -140,8 +138,14 @@ function createSchemaForm(form, schema, onSubmit, schemaName) {
   } else {
     value = {};
   }
-
-  schemaForm = form[0];
+  // recreate form to remove event listeners
+  $form.off();
+  $form.empty();
+  $form.html('');
+  $newform = $form.clone();
+  $form.replaceWith($newform);
+  $form = $newform;
+  schemaForm = $form[0];
   if (onSubmit != null) {
     if (schema_options && schema_options.batch_param) {
       schema.properties[schema_options.batch_param].required = true;
@@ -207,8 +211,8 @@ function createSchemaForm(form, schema, onSubmit, schemaName) {
       }
     }
   }
-  form[0].classList.add('form-inline');
-  jsform = form.jsonForm({
+  schemaForm.classList.add('form-inline');
+  jsform = $form.jsonForm({
     schema: schema,
     onSubmit: function (errors, values) {
       convertTextareaToArray(values, formDesc, schema);
@@ -228,23 +232,22 @@ function createSchemaForm(form, schema, onSubmit, schemaName) {
     //     fieldHtmlClass: "input-small",
     // }
   });
-  form[0].firstChild.classList.add('form-inline');
-  form[0].querySelectorAll('._jsonform-array-addmore').forEach(btn => {
-    btn.addEventListener('click', formInputHandle);
-  });
-  formInputHandle();
-
-  form[0].querySelectorAll('textarea').forEach(txt => {
+  schemaForm.firstChild.classList.add('form-inline');
+  schemaForm.querySelectorAll('textarea').forEach(txt => {
     txt.style.height = "0";  
     setTimeout(() => adjustTxtHeight(txt), 1);
     txt.setAttribute("spellcheck", "false");
     txt.addEventListener("input", () => adjustTxtHeight(txt));
   });
-  form[0].addEventListener('input', () => {
+  schemaForm.addEventListener('input', (e) => {
+    console.log(schemaName);
     schemaValues[schemaName] = convertTextareaToArray(jsform.root.getFormValues(), formDesc, schema);
     localStorage.setItem('schemaValues', JSON.stringify(schemaValues));
+    if (e.target.tagName === 'INPUT' && e.target.type === 'text') {
+      adjustInputWidth(e.target);
+    }
   });
-  
+  formInputHandle();
   return jsform;
 }
 function adjustTxtHeight(txt) {
@@ -286,7 +289,7 @@ async function getPostParametersSchema() {
 }
 
 let schemaForm;
-let inputHandlers = [];
+// let inputHandlers = [];
 let schemaValues = JSON.parse(localStorage.getItem('schemaValues')) || {};
 
 

{pywebexec-2.2.1 → pywebexec-2.2.3}/pywebexec/static/js/swagger-form.js

@@ -107,12 +107,12 @@ window.onload = function() {
             const form = document.createElement("form");
             form.id = routePathId;
             form.classList.add("schema-form");
+            paramtext.parentNode.insertBefore(form, paramtext.nextSibling);
             jsform = createSchemaForm($(form), swaggerSchemas[routePath], null, routePath);
-            // form.addEventListener("input", formInput(node, jsform));
+            newForm = jsform.root.ownerTree.domRoot;
             setTimeout(() => addFormInputListener(paramtext, jsform)(), 100);
-            form.addEventListener("input", addFormInputListener(paramtext, jsform));
-            paramtext.parentNode.insertBefore(form, paramtext.nextSibling);
-            item1 = form.querySelector("input, select, textarea");
+            newForm.addEventListener("input", addFormInputListener(paramtext, jsform));
+            item1 = newForm.querySelector("input, select, textarea");
             if (item1) {
               item1.focus();
             }

{pywebexec-2.2.1 → pywebexec-2.2.3}/pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.2.1'
-__version_tuple__ = version_tuple = (2, 2, 1)
+__version__ = version = '2.2.3'
+__version_tuple__ = version_tuple = (2, 2, 3)

{pywebexec-2.2.1 → pywebexec-2.2.3/pywebexec.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pywebexec
-Version: 2.2.1
+Version: 2.2.3
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -62,6 +62,7 @@ Requires-Dist: ldap3>=2.9.1
 Requires-Dist: pyte>=0.8.1
 Requires-Dist: PyYAML>=6.0.1
 Requires-Dist: run-para>=1.0.2
+Dynamic: license-file
 
 [![Pypi version](https://img.shields.io/pypi/v/pywebexec.svg)](https://pypi.org/project/pywebexec/)
 ![Publish Package](https://github.com/joknarf/pywebexec/actions/workflows/python-publish.yml/badge.svg)