SOF-6631: avoid toJSON, simplify filters

Exabyte-io · Aug 16, 2023 · 018bda5 · 018bda5
1 parent a43e150
commit 018bda5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
         "@exabyte-io/code.js": "2023.8.10-0",
         "@exabyte-io/eslint-config": "^2022.11.17-0",
         "@exabyte-io/made.js": "2022.6.15-0",
-        "@exabyte-io/application-flavors.js": "git+https://github.com/Exabyte-io/application-flavors#e1f10e79132659584dedc1bc37f9ce8969da075a",
+        "@exabyte-io/application-flavors.js": "git+https://github.com/Exabyte-io/application-flavors#de2c98f03a68ba740c26c5e4e0ffb1ca639c2deb",
         "chai": "^4.3.4",
         "eslint": "7.32.0",
         "eslint-config-airbnb": "19.0.2",

diff --git a/src/application.js b/src/application.js
@@ -96,18 +96,18 @@ export class Application extends NamedDefaultableInMemoryEntity {
 
     get executables() {
         const tree = getAppTree(this.prop("name"));
-        const executableList = Object.keys(tree).map((key) => {
-            return new this.constructor.Executable({ ...tree[key], name: key });
-        });
-        const allowedExecutables = executableList.filter((exe) => {
-            const { supportedApplicationVersions } = exe.toJSON();
-            return (
-                !supportedApplicationVersions ||
-                (supportedApplicationVersions &&
-                    supportedApplicationVersions.includes(this.prop("version")))
-            );
-        });
-        return allowedExecutables;
+        return Object.keys(tree)
+            .filter((key) => {
+                const { supportedApplicationVersions } = tree[key];
+                return (
+                    !supportedApplicationVersions ||
+                    (supportedApplicationVersions &&
+                        supportedApplicationVersions.includes(this.prop("version")))
+                );
+            })
+            .map((key) => {
+                return new this.constructor.Executable({ ...tree[key], name: key });
+            });
     }
 
     get hasAdvancedComputeOptions() {

diff --git a/src/executable.js b/src/executable.js
@@ -42,9 +42,9 @@ export class Executable extends mix(NamedDefaultableInMemoryEntity).with(Runtime
         return config ? this.getFlavorByName(config.name) : this.defaultFlavor;
     }
 
-    getFlavorByApplicationVersion(version) {
+    getFlavorsByApplicationVersion(version) {
         const filteredFlavors = this.flavors.filter((flavor) => {
-            const { supportedApplicationVersions } = flavor.toJSON();
+            const supportedApplicationVersions = flavor.prop("supportedApplicationVersions");
             return (
                 !supportedApplicationVersions ||
                 (supportedApplicationVersions && supportedApplicationVersions.includes(version))