pywebexec 2.2.6__tar.gz → 2.2.8__tar.gz

{pywebexec-2.2.6/pywebexec.egg-info → pywebexec-2.2.8}/PKG-INFO

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

{pywebexec-2.2.6 → pywebexec-2.2.8}/pywebexec/static/css/form.css

@@ -226,6 +226,17 @@
       margin-right: 4px;
     }
   }
+  .alert {
+    padding: 5px 10px;
+    margin-bottom: 2px;
+    border: 1px solid transparent;
+    border-radius: 15px;
+    font-size: 14px;
+    font-family: Arial, Helvetica, sans-serif;
+    color: #a94442;
+    background-color: #f2dede;
+    border-color: #ebccd1;  
+  }
 }
 
 .swagger-ui textarea {

{pywebexec-2.2.6 → pywebexec-2.2.8}/pywebexec/static/js/executables.js

@@ -260,7 +260,7 @@ paramsInput.addEventListener('focus', () => {
     const currentCmd = commandInput.value;
     paramsInput.name = currentCmd;
     if (gExecutables[currentCmd] && gExecutables[currentCmd].schema && gExecutables[currentCmd].schema.properties && paramsContainer.style.display == 'none') {
-        createSchemaForm($('#schemaForm'), gExecutables[currentCmd].schema, async function (errors, values) {
+        jsForm = createSchemaForm($('#schemaForm'), gExecutables[currentCmd].schema, async function (errors, values) {
             const commandName = commandInput.value;
             fitAddon.fit();
             terminal.clear();
@@ -293,12 +293,18 @@ paramsInput.addEventListener('focus', () => {
                 console.log('Error running command:', error);
             }
         }, currentCmd);
+        schemaFormPW = jsForm.root.ownerTree.domRoot;
         setHelpDivPosition();
         paramsContainer.style.display = 'block';
         const input1 = schemaFormPW.querySelector('input, select, textarea');
         if (input1) {
             input1.focus();
         }
+        schemaFormPW.addEventListener('submit', (event) => {
+            console.log('Form submitted');
+            paramsContainer.style.display = 'none';
+            event.preventDefault();
+        });
     } else {
         paramsContainer.style.display = 'none';
     }
@@ -318,7 +324,3 @@ paramsInput.addEventListener('blur', () => {
 window.addEventListener('resize', setHelpDivPosition);
 window.addEventListener('scroll', setHelpDivPosition);
 
-schemaFormPW.addEventListener('submit', (event) => {
-    paramsContainer.style.display = 'none';
-    event.preventDefault();
-});

{pywebexec-2.2.6 → pywebexec-2.2.8}/pywebexec/static/js/schemaform.js

@@ -92,8 +92,21 @@ function convertTextareaToArray(values, formDesc, schema) {
   return values;
 }
 
-// ...existing code...
-
+function validateSchemaForm(form, formDesc, schema, values, schemaName) {
+  schemaValues[schemaName] = convertTextareaToArray(values, formDesc, schema);
+  localStorage.setItem('schemaValues', JSON.stringify(schemaValues));
+  env = JSV.createEnvironment();
+  report = env.validate(values, schema);
+  errors = report.errors;
+  err = form.querySelector('.alert');
+  if (errors.length > 0) {
+    err.innerText = errors[0].uri.split('#')[1].slice(1).replaceAll('/', '.') + ': ' + errors[0].message + ': ' + errors[0].details;
+    err.style.display = 'block';
+    return false;
+  }
+  err.style.display = 'none';
+  return true;
+}
 function createSchemaForm($form, schema, onSubmit, schemaName) {
   if (schema && schema.schema_options) {
     schema_options = schema.schema_options;
@@ -214,16 +227,14 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
       }
     }
   }
-  schemaForm.classList.add('form-inline');
+  // schemaForm.classList.add('form-inline');
   jsform = $form.jsonForm({
     schema: schema,
     onSubmit: function (errors, values) {
-      convertTextareaToArray(values, formDesc, schema);
-      env = JSV.createEnvironment();
-      report = env.validate(values, schema);
-      errors = report.errors;
-      if (errors.length > 0) {
-        alert(errors[0].message);
+      if (! validateSchemaForm(event.target, formDesc, schema, values, schemaName)) {
+        event.preventDefault();
+        event.stopPropagation();
+        event.stopImmediatePropagation();
         return false;
       }
       onSubmit(errors, values);
@@ -236,6 +247,11 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
     // }
   });
   schemaForm.firstChild.classList.add('form-inline');
+  err = document.createElement('div');
+  err.classList.add('alert');
+  err.style.display = 'none';
+  schemaForm.appendChild(err);
+  validateSchemaForm(schemaForm, formDesc, schema, value, schemaName);
   schemaForm.querySelectorAll('textarea').forEach(txt => {
     txt.style.height = "0";  
     setTimeout(() => adjustTxtHeight(txt), 1);
@@ -243,8 +259,7 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
     txt.addEventListener("input", () => adjustTxtHeight(txt));
   });
   schemaForm.addEventListener('input', (e) => {
-    schemaValues[schemaName] = convertTextareaToArray(jsform.root.getFormValues(), formDesc, schema);
-    localStorage.setItem('schemaValues', JSON.stringify(schemaValues));
+    validateSchemaForm(schemaForm, formDesc, schema, jsform.root.getFormValues(), schemaName);
     if (e.target.tagName === 'INPUT' && e.target.type === 'text') {
       adjustInputWidth(e.target);
     }

{pywebexec-2.2.6 → pywebexec-2.2.8}/pywebexec/templates/swagger_ui.html

@@ -14,6 +14,7 @@
     <script src="/static/js/swagger-ui/swagger-ui-standalone-preset.js"></script>
     <script type="text/javascript" src="/static/jsonform/deps/jquery.min.js"></script>
     <script type="text/javascript" src="/static/jsonform/deps/underscore.js"></script>
+    <script type="text/javascript" src="/static/jsonform/deps/jsv.js"></script>
     <script type="text/javascript" src="/static/jsonform/lib/jsonform.js"></script>
     <script type="text/javascript" src="/static/js/js-yaml/js-yaml.min.js"></script>
     <script src="/static/js/schemaform.js"></script>

{pywebexec-2.2.6 → pywebexec-2.2.8}/pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.2.6'
-__version_tuple__ = version_tuple = (2, 2, 6)
+__version__ = version = '2.2.8'
+__version_tuple__ = version_tuple = (2, 2, 8)

{pywebexec-2.2.6 → pywebexec-2.2.8/pywebexec.egg-info}/PKG-INFO

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