Skip to content

Commit 6bc9d06

Browse files
committed
move getValenceOrbitalsByElement to method data context mixin
1 parent 2800b06 commit 6bc9d06

File tree

2 files changed

+19
-12
lines changed

2 files changed

+19
-12
lines changed

src/context/mixins/MethodDataContextMixin.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,19 @@ export function methodDataContextMixin(item) {
5858
};
5959
});
6060
},
61+
62+
getValenceOrbitalsByElement(element) {
63+
const valenceOrbitals = this.valenceOrbitals || [];
64+
let orbitals = [];
65+
valenceOrbitals.every((entry) => {
66+
if (entry.element === element) {
67+
orbitals = entry?.valenceOrbitals || [];
68+
}
69+
return entry.element !== element; // break when first match is found
70+
});
71+
72+
return orbitals;
73+
},
6174
};
6275

6376
Object.defineProperties(item, Object.getOwnPropertyDescriptors(properties));

src/context/providers/HubbardUContextProvider.js

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -75,23 +75,17 @@ export class HubbardUContextProvider extends JSONSchemaFormDataProvider {
7575
};
7676
}
7777

78-
getValenceOrbitalsByElement = (element) => {
79-
const valenceOrbitals = this.valenceOrbitals || [];
80-
let orbitals = [];
81-
valenceOrbitals.every((item) => {
82-
if (item.element === element) {
83-
orbitals = item?.valenceOrbitals || [];
84-
}
85-
return item.element !== element; // break when first match is found
86-
});
87-
88-
return Utils.array.sortArrayByOrder(orbitals, this.orbitalListByStability);
78+
sortedValanceOrbitalsByElement = (element) => {
79+
return Utils.array.sortArrayByOrder(
80+
this.getValenceOrbitalsByElement(element),
81+
this.orbitalListByStability,
82+
);
8983
};
9084

9185
orbitalDependencyArray = (elementList, atomicSpecies, atomicOrbital) => {
9286
return {
9387
oneOf: elementList.map((elementWithLabel) => {
94-
const orbitals = this.getValenceOrbitalsByElement(
88+
const orbitals = this.sortedValanceOrbitalsByElement(
9589
Made.Basis.stripLabelToGetElementSymbol(elementWithLabel),
9690
);
9791
return {

0 commit comments

Comments
 (0)