pywebexec 2.4.27__py3-none-any.whl → 2.4.28__py3-none-any.whl

pywebexec/static/js/schemaform.js

@@ -60,25 +60,28 @@ function extractKeys(obj, formkeys, formoptions, prefix = '') {
     return result;
 }
 
+// Helper function to get schema and check for properties
+function getSchemaForKey(schema, keyPath) {
+  const keys = keyPath.split('.');
+  let current = schema.properties;
+  for (const key of keys) {
+    if (current.properties) {
+      current = current.properties;
+    }
+    if (!current || !current[key]) return null;
+    current = current[key];
+  }
+  return current;
+}
 
 // Convert objects to JSON strings where schema type is object without properties
 function convertObjectsToJsonStrings(obj, schema, prefix = '') {
-  // Helper function to get schema type and check for properties
-  function getSchemaTypeForKey(schema, keyPath) {
-    const keys = keyPath.split('.');
-    let current = schema.properties;
-    for (const key of keys) {
-      if (!current || !current[key]) return null;
-      current = current[key];
-    }
-    return current;
-  }
 
   for (const key in obj) {
     const keyPath = prefix ? `${prefix}.${key}` : key;
-    const schemaType = getSchemaTypeForKey(schema, keyPath);
+    const schemaKey = getSchemaForKey(schema, keyPath);
     
-    if (schemaType && schemaType.type === 'object' && !schemaType.properties) {
+    if (schemaKey && schemaKey.type === 'object' && !schemaKey.properties) {
       if (typeof obj[key] === 'object' && obj[key] !== null) {
         obj[key] = JSON.stringify(obj[key], null, 2);
       }
@@ -148,11 +151,31 @@ function expandFieldset(fieldsetClass) {
   schemaForm.querySelector(`fieldset.${fieldsetClass} > div`).style.display = 'inline-flex';
 }
 
-function orderCheckboxes() {
+function setNestedValue(obj, keyPath, value) {
+  const keys = keyPath.split('.');
+  let current = obj;
+  for (let i = 0; i < keys.length - 1; i++) {
+      if (current[keys[i]] === undefined) {
+          current[keys[i]] = {};
+      }
+      current = current[keys[i]];
+  }
+  current[keys[keys.length - 1]] = value;
+}
+
+function orderCheckboxes(schema) {
+  let use_default = false;
+  if (! value) {
+    value = {};
+    use_default = true;
+  }
   schemaForm.querySelectorAll('.checkboxes > ul').forEach(checkboxes => {
     const key = checkboxes.getAttribute('name');
     const cboxes = checkboxes
     const matchingElements = [];
+    if (use_default) {
+      setNestedValue(value, key, getSchemaForKey(schema, key).default);
+    }
     if (! value || ! value[key] || !value[key].length) {
       return;
     }
@@ -441,8 +464,7 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
   err.classList.add('alert');
   err.style.display = 'none';
   schemaForm.appendChild(err);
-  cboxes = schemaForm.querySelector('.checkboxes > ul');
-  orderCheckboxes();
+  orderCheckboxes(schema);
   validateSchemaForm(schemaForm, formDesc, schema, jsform.root.getFormValues(), schemaName);
   schemaForm.querySelectorAll('textarea').forEach(txt => {
     txt.style.height = "0";

pywebexec/static/jsonform/lib/jsonform.js

@@ -2479,7 +2479,7 @@ formNode.prototype.computeInitialValues = function (values, ignoreDefaultValues)
     // be a complex structure that needs to be pushed down the subtree.
     // The easiest way is probably to generate a "values" object and
     // compute initial values from that object
-    // fjo start: TODO convert this.key to be used in values
+    // fjo start: add default values
     else if (this.schemaElement['default']) {
       values = {};
       setNestedValue(values, this.key, this.schemaElement['default']);

pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.4.27'
-__version_tuple__ = version_tuple = (2, 4, 27)
+__version__ = version = '2.4.28'
+__version_tuple__ = version_tuple = (2, 4, 28)

{pywebexec-2.4.27.dist-info → pywebexec-2.4.28.dist-info}/METADATA

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

{pywebexec-2.4.27.dist-info → pywebexec-2.4.28.dist-info}/RECORD

@@ -2,7 +2,7 @@ pywebexec/__init__.py,sha256=197fHJy0UDBwTTpGCGortZRr-w2kTaD7MxqdbVmTEi0,61
 pywebexec/host_ip.py,sha256=oiCMlo2o3AkkgXDarUSx8T3FWXKI0vk1-EPnx5FGBd8,1332
 pywebexec/pywebexec.py,sha256=avBfvbhLbjvrJ168bBmQVrm-DjbjGJoAapHHIEAD6V4,48515
 pywebexec/swagger.yaml,sha256=I_oLpp7Hqel8SDEEykvpmCT-Gv3ytGlziq9bvQOrtZY,7598
-pywebexec/version.py,sha256=YTgsYHJpLN60mTTPBB0zqf3bzBzBJ_hQ0Qv9OjTFm80,513
+pywebexec/version.py,sha256=bbq2FSCzcXGxzgbq3wH_4_DBJn7-tef7JTibaKvxIJg,513
 pywebexec/static/css/form.css,sha256=7N8-xP58JF6EM9ekDzkYBisTDWbZqe8Fyhhk5vt0jc0,9062
 pywebexec/static/css/markdown.css,sha256=br4-iK9wigTs54N2KHtjgZ4KLH0THVSvJo-XZAdMHiE,1970
 pywebexec/static/css/style.css,sha256=TX60M-mzIPTGVDmaypRCOcyxc8A7dOjx-p1_bpJ6t9M,11772
@@ -36,7 +36,7 @@ pywebexec/static/images/swagger-ui.svg,sha256=FR0yeOVwe4zCYKZAjCGcT_m0Mf25NexIVa
 pywebexec/static/js/exceljs.min.js,sha256=fknaaFiOJQ27i7oZDSyqirN4fMAoS9odiy-AXE33Qsk,947702
 pywebexec/static/js/executables.js,sha256=xD4rauofJUymUWyu3oUzUAm9djy4gp6G-Gh9tFBtlBI,11996
 pywebexec/static/js/popup.js,sha256=X-Q__R0jeZFO_I8EWucP1KkUJa9-Atz8bdnyWp6ibzY,11376
-pywebexec/static/js/schemaform.js,sha256=hCCfn21tjjBoF0wRsq84_ToHA_RJbaWdcakvOUEuNPk,16605
+pywebexec/static/js/schemaform.js,sha256=xPm7acOHS09zb_GBkiltWGpj1XPpuOiDGRRRXP00FPY,17101
 pywebexec/static/js/script.js,sha256=2Jys1IpB94ygkjnpFkUvcZdchM-gZrfPOFuS74SxgZI,21508
 pywebexec/static/js/swagger-form.js,sha256=CLcSHMhk5P4-_2MIRBoJLgEnIj_9keDDSzUugXHZjio,4565
 pywebexec/static/js/tablefilter.js,sha256=YuFc4Q7OOld6tX3v4HhG5lSToEJczQM9RlU2-pITSms,11099
@@ -71,14 +71,14 @@ pywebexec/static/jsonform/deps/ace/theme-github_light_default.js,sha256=4-_JXMA3
 pywebexec/static/jsonform/deps/ace/theme-twilight.js,sha256=3FCPUePtyW8RjnVAC51dgwKyNVpB7liV9AjEy4uEP8c,3474
 pywebexec/static/jsonform/deps/ace/worker-json.js,sha256=FalZfSbOglLQIOUYUprFqETrljooqsGwM5Tey7vhbxs,24390
 pywebexec/static/jsonform/deps/img/glyphicons-halflings.png,sha256=hpJM0AbbMLnU8UGOBs172D7vK-dooQ8n0s_ybml3zO0,13826
-pywebexec/static/jsonform/lib/jsonform.js,sha256=KldlYqOU4WhklAyjzL0uShT3-khcZi4ggozH8F8K0go,140410
+pywebexec/static/jsonform/lib/jsonform.js,sha256=JBkMyBV8slZA4pdV5rYxX0KpydVfEMN_oxVNCwn9ux0,140386
 pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pywebexec/templates/index.html,sha256=sTytur1jHuEAMTvuNqMEB3i3NNFoJRbYQgfmvDrAuJQ,4286
 pywebexec/templates/popup.html,sha256=3kpMccKD_OLLhJ4Y9KRw6Ny8wQWjVaRrUfV9y5-bDiQ,1580
 pywebexec/templates/swagger_ui.html,sha256=O7p8rsXUNo3PN5LttXfQudwUKUvBPSbXoVVU9ANJ9vM,1321
-pywebexec-2.4.27.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-2.4.27.dist-info/METADATA,sha256=pWrSBEzYMdSHF5rlb4_Zq-ZhOVA-gi6pf4v1yvPo7M4,13016
-pywebexec-2.4.27.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pywebexec-2.4.27.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-2.4.27.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-2.4.27.dist-info/RECORD,,
+pywebexec-2.4.28.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-2.4.28.dist-info/METADATA,sha256=14szX7vfy4pbjv0knpIOk0eVQYq47J11ejVM_vWJL3c,13016
+pywebexec-2.4.28.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pywebexec-2.4.28.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-2.4.28.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-2.4.28.dist-info/RECORD,,