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

pywebexec/pywebexec.py

@@ -871,7 +871,7 @@ def run_dynamic_command(cmd):
                         params += f"{prefix} "
                     continue
                 if isinstance(value, dict) or convert_values.get(param, None) == "json":
-                    value = shlex.quote(json.dumps(value))
+                    value = shlex.quote(json.dumps(value, indent=2, sort_keys=False))
                 elif convert_values.get(param, None) == "quote":
                     value = shlex.quote(str(value))
                 else:

pywebexec/static/css/form.css

@@ -209,6 +209,7 @@
   }
   ._jsonform-array-addmore, ._jsonform-array-deletecurrent {
     box-shadow: unset;
+    outline: 0;
   }
 }
 

pywebexec/static/js/executables.js

@@ -256,6 +256,7 @@ async function fetchExecutables() {
 
 }
 
+let schemaValues = {};
 
 paramsInput.addEventListener('focus', () => {
     const currentCmd = commandInput.value;
@@ -266,11 +267,16 @@ 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;
             } else {
                 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'];
@@ -300,7 +306,7 @@ paramsInput.addEventListener('focus', () => {
                     console.log('Error running command:', error);
                 }
             }
-        });
+        }, schemaValues[currentCmd]);
         setHelpDivPosition();
         paramsContainer.style.display = 'block';
         const input1 = schemaFormPW.querySelector('input, select, textarea');

pywebexec/static/js/schemaform.js

@@ -20,7 +20,11 @@ function formInputHandle() {
       } else {
         size = 12;
       }
+      if (input.value) {
+        size = 2;
+      }
       input.setAttribute('size', size);
+      setTimeout(() => adjustInputWidth(input), 1);
       input.addEventListener('input', () => adjustInputWidth(input));
       inputHandlers.push(input);
     }
@@ -49,7 +53,7 @@ function extractKeysAndPlaceholders(obj, formoptions, prefix = '') {
     return result;
 }
 
-function createSchemaForm(form, schema, onSubmit) {
+function createSchemaForm(form, schema, onSubmit, value={}) {
   if (schema && schema.schema_options) {
     schema_options = schema.schema_options;
   } else {
@@ -141,6 +145,7 @@ function createSchemaForm(form, schema, onSubmit) {
     schema: schema,
     onSubmit: onSubmit,
     form: formDesc,
+    value: value,
     // params: {
     //     fieldHtmlClass: "input-small",
     // }
@@ -152,18 +157,18 @@ function createSchemaForm(form, schema, onSubmit) {
   formInputHandle();
 
   form[0].querySelectorAll('textarea').forEach(txt => {
-    txt.style.height = "0";
-    txt.style.height = txt.scrollHeight + "px";
-    txt.setAttribute("spellcheck", "false")
-    txt.addEventListener("input", (e) => {
-      e.target.style.height = "0";
-      e.target.style.height = (e.target.scrollHeight+2) + "px";
-    });
+    txt.style.height = "0";  
+    setTimeout(() => adjustTxtHeight(txt), 1);
+    txt.setAttribute("spellcheck", "false");
+    txt.addEventListener("input", () => adjustTxtHeight(txt));
   });
     
   return jsform;
 }
-
+function adjustTxtHeight(txt) {
+  txt.style.height = "0";
+  txt.style.height = txt.scrollHeight + "px";
+}
 async function getSwaggerSpec() {
   const response = await fetch('/swagger.yaml');
   if (!response.ok) {

pywebexec/static/js/script.js

@@ -262,7 +262,7 @@ async function viewOutput(command_id) {
         const commandInfo = document.getElementById('commandInfo');
         const command = `${data.command.replace(/^\.\//, '')} ${data.params.join(' ')}`;
         setCommandStatus(data.status)
-        commandInfo.innerText = command;
+        commandInfo.innerHTML = command;
         commandInfo.setAttribute('title', command);
         if (data.command == 'term')
             terminal.options.cursorInactiveStyle = 'outline';