only verify valid config once

Author: VeraZab

src/lib/unpackPlotProps.js

@@ -32,7 +32,7 @@ export function isValidCustomConfigObject(customConfig) {
     if (
       customConfig.visibility_rules.order &&
       Array.isArray(customConfig.visibility_rules.order) &&
-      customConfig.visibility_rules.order.some(o => !['blacklist', 'whitelist'].includes(o))
+      customConfig.visibility_rules.order.every(o => ['blacklist', 'whitelist'].includes(o))
     ) {
       console.error(
         "invalid customConfig: only 2 values are accepted in the visibility_rules.order array: 'blacklist' and 'whitelist'"
@@ -48,53 +48,46 @@ export function isValidCustomConfigObject(customConfig) {
 export function applyCustomConfigVisibility(props, fullValue, customConfig) {
   let isVisible = false;
 
-  if (
-    customConfig &&
-    customConfig === Object(customConfig) &&
-    Object.keys(customConfig).length &&
-    isValidCustomConfigObject(customConfig)
-  ) {
-    const matches = o => {
-      if (customConfig.visibility_rules[o]) {
-        return customConfig.visibility_rules[o].some(rule => {
-          const regex = RegExp(rule.regex_match);
-          return rule.type === 'attrName' && regex.test(props.attr);
-        });
-      }
-      return false;
-    };
+  const matches = o => {
+    if (customConfig.visibility_rules[o]) {
+      return customConfig.visibility_rules[o].some(rule => {
+        const regex = RegExp(rule.regex_match);
+        return rule.type === 'attrName' && regex.test(props.attr);
+      });
+    }
+    return false;
+  };
 
-    if (customConfig.visibility_rules.blacklist && customConfig.visibility_rules.whitelist) {
-      // Look to see if there was an order to blacklisting or whitelisting specified
-      const order =
-        customConfig.visibility_rules.order && customConfig.visibility_rules.order.length
-          ? customConfig.visibility_rules.order
-          : ['blacklist', 'whitelist'];
-
-      if (order[0] === 'blacklist') {
-        const shouldBlacklist = matches('blacklist') && !matches('whitelist');
-        if (!shouldBlacklist && hasFullValue(fullValue)) {
-          isVisible = true;
-        }
+  if (customConfig.visibility_rules.blacklist && customConfig.visibility_rules.whitelist) {
+    // Look to see if there was an order to blacklisting or whitelisting specified
+    const order =
+      customConfig.visibility_rules.order && customConfig.visibility_rules.order.length
+        ? customConfig.visibility_rules.order
+        : ['blacklist', 'whitelist'];
+
+    if (order[0] === 'blacklist') {
+      const shouldBlacklist = matches('blacklist') && !matches('whitelist');
+      if (!shouldBlacklist && hasFullValue(fullValue)) {
+        isVisible = true;
       }
+    }
 
-      if (order[0] === 'whitelist') {
-        const shouldWhitelist = matches('whitelist') && !matches('blacklist');
-        if (shouldWhitelist && hasFullValue(fullValue)) {
-          isVisible = true;
-        }
+    if (order[0] === 'whitelist') {
+      const shouldWhitelist = matches('whitelist') && !matches('blacklist');
+      if (shouldWhitelist && hasFullValue(fullValue)) {
+        isVisible = true;
       }
-    } else {
-      if (customConfig.visibility_rules.blacklist) {
-        if (!matches('blacklist') && hasFullValue(fullValue)) {
-          isVisible = true;
-        }
+    }
+  } else {
+    if (customConfig.visibility_rules.blacklist) {
+      if (!matches('blacklist') && hasFullValue(fullValue)) {
+        isVisible = true;
       }
+    }
 
-      if (customConfig.visibility_rules.whitelist) {
-        if (matches('whitelist') && hasFullValue(fullValue)) {
-          isVisible = true;
-        }
+    if (customConfig.visibility_rules.whitelist) {
+      if (matches('whitelist') && hasFullValue(fullValue)) {
+        isVisible = true;
       }
     }
   }