pywebexec 2.4.16__py3-none-any.whl → 2.4.18__py3-none-any.whl

pywebexec/static/css/form.css

@@ -76,7 +76,7 @@
     color: #808080;
     display: block;
     margin-top: 5px;
-    margin-bottom: 10px;
+    margin-bottom: 5px;
     max-width: 300px;
   }
   .form-control {
@@ -162,11 +162,11 @@
     width: 110px;;
   }
 
-  .controls > div:not([id]) { /* for checkboxes */
+  .controls > div:not([id]), .checkboxes { /* for checkboxes */
     scrollbar-width: thin;
     scrollbar-gutter: stable;
     overflow-y: auto;
-    max-height: 100px;
+    max-height: 157px;
     border: solid 1px #ccc;
     border-radius: 5px;
     padding: 5px 2px;
@@ -326,6 +326,7 @@
 
   legend {
     font-weight: bold;
+    color: #444;
   }
   .expandable > legend::before {
     content: '\25B8';
@@ -338,9 +339,12 @@
   fieldset {
     border: 1px solid #ccc;
     border-radius: 5px;
-    padding-top: 9px;
+    padding-top: 5px;
     height: fit-content;
+    display: flex;
+    gap: 5px;
     /* width: 100%; */
+    padding-bottom: 3px;
     label {
       padding-right: 5px;
     }
@@ -349,6 +353,10 @@
   fieldset > div {
     /* display: block ruby; */
     padding-bottom: 5px;
+  }
+   fieldset.expandable {
+    position: relative;
+    top: -1px;
   }
   fieldset.expandable > div {
     display: inline-flex;
@@ -377,6 +385,16 @@
   .tab-content > .active {
     display: block;
   }
+  .tab-container{
+    border: none;
+    padding: 0;
+  }
+  li.checkbox .draggable {
+    padding-top: 1px;
+  }
+  li.checkbox label {
+    margin-left: 0px;
+  }
 }
 
 .swagger-ui textarea {

pywebexec/static/js/executables.js

@@ -92,15 +92,14 @@ commandInput.addEventListener('input', (event) => {
 });
 
 commandInput.addEventListener('keydown', (event) => {
+    paramsContainer.style.display = 'none';
     if (event.key === ' ' || event.key === 'ArrowRight' || event.key === 'Tab') {
         event.preventDefault();
-        paramsContainer.style.display = 'none';
         paramsInput.focus();
         paramsInput.setSelectionRange(0, paramsInput.value.length);
         commandListDiv.style.display = 'none'
     } else if (event.key === 'ArrowDown') {
         if (commandListDiv.children.length > 1) {
-            paramsContainer.style.display = 'none';
             commandListDiv.style.display = 'block';
             commandListDiv.children[firstVisibleItem].focus();
         }

pywebexec/static/js/schemaform.js

@@ -35,7 +35,7 @@ function formInputHandle() {
   });
 }
 
-function extractKeysAndPlaceholders(obj, formkeys, formoptions, prefix = '') {
+function extractKeys(obj, formkeys, formoptions, prefix = '') {
     let result = [];
   
     for (let key in obj.properties) {
@@ -44,7 +44,7 @@ function extractKeysAndPlaceholders(obj, formkeys, formoptions, prefix = '') {
         continue;
       }
       if (obj.properties[key].type === 'object' && obj.properties[key].properties) {
-        result = result.concat(extractKeysAndPlaceholders(obj.properties[key], formkeys, formoptions, k));
+        result = result.concat(extractKeys(obj.properties[key], formkeys, formoptions, k));
       } else {
         if (formkeys[k]) {
           foptions = formkeys[k];
@@ -53,7 +53,6 @@ function extractKeysAndPlaceholders(obj, formkeys, formoptions, prefix = '') {
         }
         result.push({
           key: k,
-          placeholder: obj.properties[key].example || null,
           ... foptions
         });
       }
@@ -149,7 +148,33 @@ function expandFieldset(fieldsetClass) {
   schemaForm.querySelector(`fieldset.${fieldsetClass} > div`).style.display = 'inline-flex';
 }
 
+function orderCheckboxes() {
+  schemaForm.querySelectorAll('.checkboxes > ul').forEach(checkboxes => {
+    const key = checkboxes.getAttribute('name');
+    const cboxes = checkboxes
+    const matchingElements = [];
+    if (! value || ! value[key] || !value[key].length) {
+      return;
+    }
+    for (let val = 0; val < value[key].length; val++) {
+      for (let i = 0; i < cboxes.children.length; i++) {
+      if (cboxes.children[i].querySelector('label').innerText === value.scope[val]) {
+        matchingElements.push(cboxes.children[i]);
+        break;
+      }
+      }
+    }
+    // Append matching elements to the top in the order of value.scope
+    matchingElements.reverse().forEach(element => {
+      cboxes.insertBefore(element, cboxes.firstChild);
+    });
+  });
+}
+
 function createSchemaForm($form, schema, onSubmit, schemaName) {
+  if (!schemaName in savedValues) {
+    savedValues[schemaName] = {};
+  }
   schema_options = undefined;
   schema_params_options = undefined;
   if (schema && schema.schema_options) {
@@ -176,7 +201,7 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
   if(schema.properties['savedValues']) {
     delete schema.properties['savedValues'];
   }
-  formDesc = extractKeysAndPlaceholders(schema, formkeys, formoptions);
+  formDesc = extractKeys(schema, formkeys, formoptions);
   schema.properties["savedValues"] = {
     type: "string",
     title: " ",
@@ -209,7 +234,7 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
     }
     convertObjectsToJsonStrings(value, schema);
   } else {
-    value = {};
+    value = undefined;
   }
 // recreate form to remove event listeners
   $form.off();
@@ -349,7 +374,7 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
             evt.preventDefault();
             evt.stopPropagation();
             evt.stopImmediatePropagation();
-            schemaValues[schemaName] = {};
+            delete schemaValues[schemaName];
             createSchemaForm($form, schema, onSubmit, schemaName);
           },
         },
@@ -390,7 +415,7 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
       });
     }
   }
-  console.log('formDesc', formDesc);
+  //console.log('formDesc', formDesc);
   // schemaForm.classList.add('form-inline');
   jsform = $form.jsonForm({
     schema: schema,
@@ -416,6 +441,8 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
   err.classList.add('alert');
   err.style.display = 'none';
   schemaForm.appendChild(err);
+  cboxes = schemaForm.querySelector('.checkboxes > ul');
+  orderCheckboxes();
   validateSchemaForm(schemaForm, formDesc, schema, jsform.root.getFormValues(), schemaName);
   schemaForm.querySelectorAll('textarea').forEach(txt => {
     txt.style.height = "0";  

pywebexec/static/jsonform/lib/jsonform.js

@@ -267,7 +267,7 @@ var inputFieldTemplate = function (type) {
       '<%= (node.schemaElement && node.schemaElement.required && (node.schemaElement.type !== "boolean") ? " required=\'required\'" : "") %>' +
       '<%= (node.schemaElement && (node.schemaElement.type === "number") && !isNaN(node.schemaElement.maximum) ? " max=" + \'"\' + node.schemaElement.maximum + \'"\' : "")%>' +
       '<%= (node.schemaElement && (node.schemaElement.type === "number") && !isNaN(node.schemaElement.minimum) ? " min=" + \'"\' + node.schemaElement.minimum + \'"\' : "")%>' +
-      '<%= (node.placeholder? " placeholder=" + \'"\' + escape(node.placeholder) + \'"\' : "")%>' +
+      '<%= (node.placeholder ? " placeholder=" + \'"\' + escape(node.placeholder) + \'"\' : "")||(node.schemaElement && node.schemaElement.example ? " placeholder=" + \'"\' + escape(node.schemaElement.example) + \'"\' : "")%>' +
       ' />',
     'fieldtemplate': true,
     'inputfield': true
@@ -834,23 +834,24 @@ jsonform.elementTypes = {
       $(node.el).find('input:checked').parent().addClass(activeClass)
     }
   },
-  'checkboxes':{
-    'template': '<div><%= choiceshtml %></div>',
+  'checkboxes': {
+    'template': '<div id="<%= id %>" class="checkboxes" ><ul name="<%= node.key %>"class="_jsonform-array-ul sortable"><%= choiceshtml %></ul></div>',
     'fieldtemplate': true,
     'inputfield': true,
     'onBeforeRender': function (data, node) {
-      // Build up choices from the enumeration list
       var choices = null;
       var choiceshtml = null;
-      var template = '<div class="checkbox"><label>' +
+      var template = '<li class="checkbox" data-idx="<%= idx %>">' +
+        '<span class="draggable line"><i class="glyphicon glyphicon-list" title="Move item"></i></span>' +
+        '<label>' +
         '<input type="checkbox" <% if (value) { %> checked="checked" <% } %> name="<%= name %>" value="1"' +
         '<%= (node.disabled? " disabled" : "")%>' +
-        '/><%= title %></label></div>';
+        '/><%= title %></label></li>';
+
       if (!node || !node.schemaElement) return;
 
       if (node.schemaElement.items) {
-        choices =
-          node.schemaElement.items["enum"] ||
+        choices = node.schemaElement.items["enum"] || 
           node.schemaElement.items[0]["enum"];
       } else {
         choices = node.schemaElement["enum"];
@@ -860,6 +861,7 @@ jsonform.elementTypes = {
       choiceshtml = '';
       _.each(choices, function (choice, idx) {
         choiceshtml += _.template(template, fieldTemplateSettings)({
+          idx: idx,
           name: node.key + '[' + idx + ']',
           value: _.include(node.value, choice),
           title: hasOwnProperty(node.formElement.titleMap, choice) ? node.formElement.titleMap[choice] : choice,
@@ -868,6 +870,15 @@ jsonform.elementTypes = {
       });
 
       data.choiceshtml = choiceshtml;
+    },
+    'onInsert': function(evt, node) {
+      var $list = $(node.el).find('ul._jsonform-array-ul');
+
+      if (!isSet(node.formElement.draggable) || node.formElement.draggable) {
+        if ($list.sortable) {
+          $list.sortable();
+        }
+      }
     }
   },
   'array': {
@@ -2446,11 +2457,13 @@ 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
     else if (this.schemaElement['default']) {
+      values = {};
+      values[this.key] = this.schemaElement['default'];
       nbChildren = this.schemaElement['default'].length;
     }
-    */
+    // fjo end
     else if (nbChildren === 0) {
       // If form has already been submitted with no children, the array
       // needs to be rendered without children. If there are no previously

pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.4.16'
-__version_tuple__ = version_tuple = (2, 4, 16)
+__version__ = version = '2.4.18'
+__version_tuple__ = version_tuple = (2, 4, 18)

{pywebexec-2.4.16.dist-info → pywebexec-2.4.18.dist-info}/METADATA

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

{pywebexec-2.4.16.dist-info → pywebexec-2.4.18.dist-info}/RECORD

@@ -2,8 +2,8 @@ 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=_A38yq5XuhaqaNvvHUshJ5D7Tj6xkHHvY9tmNuQKWsI,513
-pywebexec/static/css/form.css,sha256=DhglYtCU-2UHrh-MSV3CAYLnskWQpkEQtAHjHF1vM_o,8346
+pywebexec/version.py,sha256=tklCNhruYVYrAzUgM2IxG6oUw5E6t_A3tDtn6RUMsSk,513
+pywebexec/static/css/form.css,sha256=pLM_llJw-arBEgxcKSte_SYVRwDSsLWCOMUYabXWQZU,8658
 pywebexec/static/css/markdown.css,sha256=br4-iK9wigTs54N2KHtjgZ4KLH0THVSvJo-XZAdMHiE,1970
 pywebexec/static/css/style.css,sha256=TX60M-mzIPTGVDmaypRCOcyxc8A7dOjx-p1_bpJ6t9M,11772
 pywebexec/static/css/swagger-ui.css,sha256=xhXN8fnUaIACGHuPIEIr9-qmyYr6Zx0k2wv4Qy7Bg1Y,154985
@@ -34,9 +34,9 @@ pywebexec/static/images/running.svg,sha256=fBCYwYb2O9K4N3waC2nURP25NRwZlqR4PbDZy
 pywebexec/static/images/success.svg,sha256=NVwezvVMplt46ElW798vqGfrL21Mw_DWHUp_qiD_FU8,489
 pywebexec/static/images/swagger-ui.svg,sha256=FR0yeOVwe4zCYKZAjCGcT_m0Mf25NexIVaSXifIkoU0,2117
 pywebexec/static/js/exceljs.min.js,sha256=fknaaFiOJQ27i7oZDSyqirN4fMAoS9odiy-AXE33Qsk,947702
-pywebexec/static/js/executables.js,sha256=pWnEFZcQ-hKHFzwNKs5KFgyT9A_1wx3m2thlOGJwU3g,12052
+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=qDmY3L9jhP2QQIOfkYRsRtlP4upx1S2LNEb5hINmgPw,15683
+pywebexec/static/js/schemaform.js,sha256=ZtBn_He94NKSpSb-H0m7Shz7chrvgNvcdStxWWV7tyI,16515
 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=U-BvOgq5gCvSUo36qSAK7Y91RPKOq7vZShkIYpzwlkk,138525
+pywebexec/static/jsonform/lib/jsonform.js,sha256=X1pR8KATWk2JOFcYABbHCDQpfgPlELKSq5sdGDgkd0Q,139254
 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=MAPr-z96VERAecDvX37V8q2Nxph-O0fNDBul1x2w9SI,1147
-pywebexec-2.4.16.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-2.4.16.dist-info/METADATA,sha256=9oLCGxXcASh0es8NV--NELsoNuVZewcHDzX5oKpSxwk,13016
-pywebexec-2.4.16.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pywebexec-2.4.16.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-2.4.16.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-2.4.16.dist-info/RECORD,,
+pywebexec-2.4.18.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-2.4.18.dist-info/METADATA,sha256=XWDHCOENOpiWFxN2oXSKfjjnWNXFpMEPqGFYuP-k0F8,13016
+pywebexec-2.4.18.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pywebexec-2.4.18.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-2.4.18.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-2.4.18.dist-info/RECORD,,