Skip to content

Commit

Permalink
SOF-7194: merge main and resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
pranabdas committed Jan 23, 2024
2 parents d4fac95 + 97595f7 commit 341b6d3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
5 changes: 3 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@exabyte-io/code.js": "2023.11.22-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.git#5642817fb992c2fe744f1113de0219b5a6299fc5",
"@exabyte-io/application-flavors.js": "2024.1.23-0",
"chai": "^4.3.4",
"eslint": "7.32.0",
"eslint-config-airbnb": "19.0.2",
Expand Down
5 changes: 5 additions & 0 deletions src/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,9 @@ export class Application extends NamedDefaultableInMemoryEntity {
get isLicensed() {
return this.prop("isLicensed");
}

get isUsingMaterial() {
const materialUsingApplications = ["vasp", "nwchem", "espresso", "exabyteml"];
return materialUsingApplications.includes(this.name);
}
}

0 comments on commit 341b6d3

Please sign in to comment.