pywebexec 2.4.9__py3-none-any.whl → 2.4.11__py3-none-any.whl

pywebexec/static/css/form.css

@@ -296,11 +296,11 @@
     background-color: #f2dede;
     border-color: #ebccd1;  
   }
-  #reset-form:hover {
+  #reset-form:hover, #save-form:hover, #del-form:hover {
     background-color: #e8e8e8;
     border-color: #adadad;
   }
-  #reset-form {
+  #reset-form, #save-form, #del-form {
     position: relative;
     margin-bottom: 10px;
     height: 24px;
@@ -311,6 +311,19 @@
     color: #333;
     padding: 3px 13px;
   }
+  #save-form, #del-form {
+    position: relative;
+    margin-bottom: 2px;
+    height: 24px;
+    top: 0px;
+    background-color: #f5f5f5;
+    border-color: #ccc;
+    height: 24px;
+    color: #333;
+    padding: 3px 13px;
+  }
+
+
   legend {
     font-weight: bold;
   }
@@ -342,6 +355,17 @@
     gap: 0px 5px;
     padding-bottom: 5px;
   }
+
+  .fieldsavedoptions label {
+    display: none;
+  }
+
+  .ace_editor {
+    position: relative;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    resize: all;
+  }
 }
 
 .swagger-ui textarea {

pywebexec/static/js/schemaform.js

@@ -143,6 +143,12 @@ function validateSchemaForm(form, formDesc, schema, values, schemaName) {
   return true;
 }
 
+function expandFieldset(fieldsetClass) {
+  schemaForm.querySelector(`fieldset.${fieldsetClass}`).classList.add('expanded');
+  schemaForm.querySelector(`fieldset.${fieldsetClass} > legend`).setAttribute('aria-expanded', 'true');
+  schemaForm.querySelector(`fieldset.${fieldsetClass} > div`).style.display = 'inline-flex';
+}
+
 function createSchemaForm($form, schema, onSubmit, schemaName) {
   schema_options = undefined;
   schema_params_options = undefined;
@@ -152,7 +158,6 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
   if (schema && schema.properties && schema.properties.params && schema.properties.params.schema_options) {
     schema_params_options = schema.properties.params.schema_options;
   }
-
   formkeys = {};
   formoptions = {};
   if (schema_options) {
@@ -168,7 +173,17 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
       formoptions[`params.${key}`] = foptions[key];
     }
   }
+  if(schema.properties['savedValues']) {
+    delete schema.properties['savedValues'];
+  }
   formDesc = extractKeysAndPlaceholders(schema, formkeys, formoptions);
+  schema.properties["savedValues"] = {
+    type: "string",
+    title: " ",
+  };
+  if (savedValues[schemaName]) {
+    schema.properties["savedValues"].enum = [null, ...Object.keys(savedValues[schemaName]).sort()];
+  }
   if (schemaValues[schemaName]) {
     value = schemaValues[schemaName];
     // convert array for textarea formDesc type to string separated by newlines
@@ -262,6 +277,58 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
         items: items,
       });
     }
+    formDesc.push({
+      type: 'fieldset',
+      title: 'Favorites',
+      htmlClass: 'fieldsavedoptions',
+      expandable: true,
+      items: [
+        {
+          key: 'savedValues',
+          title: null,
+          placeholder: 'My Params',
+          htmlClass: 'fieldsavedoptions',
+          onChange: function (evt) {
+            evt.preventDefault();
+            evt.stopPropagation();
+            evt.stopImmediatePropagation();
+            const name = value = evt.target.value;
+            if (name in savedValues[schemaName]) {
+              schemaValues[schemaName] = savedValues[schemaName][name];
+              createSchemaForm($form, schema, onSubmit, schemaName);
+            }
+          }
+        },
+        {
+          type: 'button',
+          title: 'Save',
+          id: 'save-form',
+          onClick: function (evt) {
+            evt.preventDefault();
+            evt.stopPropagation();
+            evt.stopImmediatePropagation();
+            //const values = jsform.root.getFormValues();
+            saveFormValues(schemaValues[schemaName], schemaName);
+            createSchemaForm($form, schema, onSubmit, schemaName);
+            expandFieldset('fieldsavedoptions');
+          },
+        },
+        {
+          type: 'button',
+          title: 'Del',
+          id: 'del-form',
+          onClick: function (evt) {
+            evt.preventDefault();
+            evt.stopPropagation();
+            evt.stopImmediatePropagation();
+            delete savedValues[schemaName][schemaValues[schemaName].savedValues];
+            localStorage.setItem('savedValues', JSON.stringify(savedValues));
+            createSchemaForm($form, schema, onSubmit, schemaName);
+          },
+        },
+      ]
+    });
+
     formDesc.push({
       type: 'actions',
       items: [
@@ -329,6 +396,7 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
         event.stopImmediatePropagation();
         return false;
       }
+      delete values['savedValues'];
       onSubmit(errors, values);
     },
     form: formDesc,
@@ -359,11 +427,14 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
   schemaForm.addEventListener('mouseup', (e) => {
     // save form values when clicking on array buttons
     setTimeout(() => validateSchemaForm(schemaForm, formDesc, schema, jsform.root.getFormValues(), schemaName), 1);
+    // resize input fields when dragging
+    setTimeout(() => formInputHandle(), 100);
   });
   divopt = schemaForm.querySelector("fieldset.expandable > div");
   formInputHandle();
   return jsform;
 }
+
 function adjustTxtHeight(txt) {
   if (txt.value.includes('\n')) {
     delta = 2;
@@ -373,6 +444,7 @@ function adjustTxtHeight(txt) {
   txt.style.height = "0";
   txt.style.height = `${txt.scrollHeight+delta}px`;
 }
+
 async function getSwaggerSpec() {
   const response = await fetch('/swagger.yaml');
   if (!response.ok) {
@@ -402,6 +474,20 @@ async function getPostParametersSchema() {
   return result;
 }
 
+function saveFormValues(formValues, schemaName) {
+  const name = prompt('Enter name to save these values as:', formValues.savedValues);
+  if (!name) return;
+  if (!savedValues) {
+    savedValues = {};
+  }
+  if (!savedValues[schemaName]) {
+    savedValues[schemaName] = {};
+  }
+  formValues.savedValues = name;
+  savedValues[schemaName][name] = JSON.parse(JSON.stringify(formValues));
+  localStorage.setItem('savedValues', JSON.stringify(savedValues));
+}
+
 let schemaForm;
-// let inputHandlers = [];
 let schemaValues = JSON.parse(localStorage.getItem('schemaValues')) || {};
+let savedValues = JSON.parse(localStorage.getItem('savedValues')) || {};

pywebexec/static/js/tablefilter.js

@@ -260,8 +260,8 @@ function exportToExcel(table) {
 
     // Style header row
     const headerRow = worksheet.getRow(1);
-    headerRow.font = { bold: true };
-    headerRow.alignment = { vertical: 'middle', horizontal: 'left' };
+    // headerRow.font = { bold: true };
+    // headerRow.alignment = { vertical: 'middle', horizontal: 'left' };
     // headerRow.height = 20;
 
     // Add table after all rows are defined