@beseif-solutions/prow-core 0.2.2 → 0.2.3

package/dist/minified-utils/fields.js

@@ -422,6 +422,9 @@ const recursive_schema = async (field, data, options) => {
             if (options.alter) {
                 delete newField.altered_by;
             }
+            if (typeof newField.show === `boolean` && !newField.show) {
+                return;
+            }
         }
         const alteredField = lodash_1.default.cloneDeep(newField);
         if (newField.type === `file`) {
@@ -467,11 +470,7 @@ const recursive_schema = async (field, data, options) => {
         if (!calculatedSchema) {
             throw new Error(`Could not resolve schema for field ${newField.key}`);
         }
-        if (typeof newField.show === `boolean` && !newField.show) {
-            lodash_1.default.unset(data, relativeKey);
-            return;
-        }
-        else if (newField.disabled) {
+        if (newField.disabled) {
             lodash_1.default.unset(data, relativeKey);
         }
         return { schema: calculatedSchema, field: field.type === `file` ? alteredField : newField };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beseif-solutions/prow-core",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Prow core functionalities and classes",
   "main": "dist/index.js",
   "scripts": {

package/src/minified-utils/fields.ts

@@ -625,6 +625,8 @@ const recursive_schema = async (field: Field, data: Record<string, any>, options
 
       // remove altered_by only if it's not an array -> array alterations must be kept for front-end rendering
       if (options.alter) { delete newField.altered_by; }
+
+      if (typeof newField.show === `boolean` && !newField.show) { return; }
     }
 
     const alteredField: Field = _.cloneDeep(newField);
@@ -676,14 +678,8 @@ const recursive_schema = async (field: Field, data: Record<string, any>, options
 
     if (!calculatedSchema) { throw new Error(`Could not resolve schema for field ${newField.key}`); }
 
-    if (typeof newField.show === `boolean` && !newField.show) {
-      // if the field is hidden, we don't need to validate it
-      _.unset(data, relativeKey);
-      return;
-    } else if (newField.disabled) {
-      // TODO: check this
-      _.unset(data, relativeKey);
-    }
+    // if disabled schema validation is done but the value is not set
+    if (newField.disabled) { _.unset(data, relativeKey); }
 
     return { schema: calculatedSchema, field: field.type === `file` ? alteredField : newField };
   } catch (e) { throw e; }