chore: allow filter by compatible functionals

Exabyte-io · Aug 29, 2023 · f150162 · f150162
1 parent c9b8562
commit f150162
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/include/meta_properties/pseudopotential.js b/src/include/meta_properties/pseudopotential.js
@@ -3,6 +3,10 @@ import _ from "underscore";
 import { Property } from "../../property";
 
 export class Pseudopotential extends Property {
+    static compatibleExchangeCorrelation = {
+        hse06: ["pbe", "hse06"],
+    };
+
     get path() {
         return this.prop("path");
     }
@@ -68,11 +72,17 @@ export class Pseudopotential extends Property {
      * @param {String} exchangeCorrelation.functional
      */
     static filterRawDataByExchangeCorrelation(rawData, exchangeCorrelation) {
-        return rawData.filter((el) =>
-            Object.keys(exchangeCorrelation).reduce(
-                (mem, key) => mem && el.exchangeCorrelation[key] === exchangeCorrelation[key],
-            ),
+        const { functional } = exchangeCorrelation;
+        const isCompatibleWithOther = Object.keys(this.compatibleExchangeCorrelation).includes(
+            functional,
         );
+        return rawData.filter((item) => {
+            return isCompatibleWithOther
+                ? this.compatibleExchangeCorrelation[functional].includes(
+                      item.exchangeCorrelation?.functional,
+                  )
+                : functional === item.exchangeCorrelation?.functional;
+        });
     }
 
     // filter unique (assuming that path is always unique)