SOF-7010: refactor

Author: pranabdas

package-lock.json

@@ -9,7 +9,7 @@ const defaultHubbardConfig = {
 
 export class HubbardJContextProvider extends HubbardUContextProvider {
     get defaultData() {
-        const valenceOrbitals = this._getValenceOrbitals(this.firstElement);
+        const valenceOrbitals = this.getValenceOrbitals(this.firstElement);
         return [
             {
                 ...defaultHubbardConfig,
@@ -76,7 +76,7 @@ export class HubbardJContextProvider extends HubbardUContextProvider {
                                 parseInt(elementWithLabel.slice(-1), 10) + 1
                                     ? elementWithLabel.slice(0, -1)
                                     : elementWithLabel;
-                            const orbitals = this._getValenceOrbitals(element);
+                            const orbitals = this.getValenceOrbitals(element);
                             return {
                                 properties: {
                                     atomicSpecies: {

src/context/providers/HubbardJContextProvider.js

@@ -53,7 +53,7 @@ export class HubbardUContextProvider extends mix(JSONSchemaFormDataProvider).wit
     }
 
     get defaultData() {
-        const valenceOrbitals = this._getValenceOrbitals(this.firstElement);
+        const valenceOrbitals = this.getValenceOrbitals(this.firstElement);
         return [
             {
                 ...defaultHubbardConfig,
@@ -81,15 +81,12 @@ export class HubbardUContextProvider extends mix(JSONSchemaFormDataProvider).wit
         };
     }
 
-    _getValenceOrbitals = (element) => {
+    getValenceOrbitals = (element) => {
         const pseudos = this.methodData?.pseudo || [];
-        let valenceConfig = [];
-        pseudos.forEach((data) => {
-            if (data.element === element) {
-                valenceConfig = data?.valenceConfiguration || [];
-            }
-        });
+        const pseudoData = pseudos.find((data) => data.element === element);
+        const valenceConfig = pseudoData?.valenceConfiguration || [];
         const valenceOrbitals = valenceConfig.map((item) => item.orbitalName.toLowerCase());
+
         return sortArrayByOrder(valenceOrbitals, this.orbitalList);
     };
 
@@ -127,7 +124,7 @@ export class HubbardUContextProvider extends mix(JSONSchemaFormDataProvider).wit
                                 parseInt(elementWithLabel.slice(-1), 10) + 1
                                     ? elementWithLabel.slice(0, -1)
                                     : elementWithLabel;
-                            const orbitals = this._getValenceOrbitals(element);
+                            const orbitals = this.getValenceOrbitals(element);
                             return {
                                 properties: {
                                     atomicSpecies: {

src/context/providers/HubbardUContextProvider.js

@@ -12,8 +12,8 @@ const defaultHubbardConfig = {
 
 export class HubbardVContextProvider extends HubbardUContextProvider {
     get defaultData() {
-        const firstElementOrbitals = this._getValenceOrbitals(this.firstSpecies);
-        const secondElementOrbitals = this._getValenceOrbitals(this.secondSpecies);
+        const firstElementOrbitals = this.getValenceOrbitals(this.firstSpecies);
+        const secondElementOrbitals = this.getValenceOrbitals(this.secondSpecies);
         return [
             {
                 ...defaultHubbardConfig,
@@ -117,7 +117,7 @@ export class HubbardVContextProvider extends HubbardUContextProvider {
                                 parseInt(elementWithLabel.slice(-1), 10) + 1
                                     ? elementWithLabel.slice(0, -1)
                                     : elementWithLabel;
-                            const orbitals = this._getValenceOrbitals(element);
+                            const orbitals = this.getValenceOrbitals(element);
                             return {
                                 properties: {
                                     atomicSpecies: {
@@ -140,7 +140,7 @@ export class HubbardVContextProvider extends HubbardUContextProvider {
                                 parseInt(elementWithLabel.slice(-1), 10) + 1
                                     ? elementWithLabel.slice(0, -1)
                                     : elementWithLabel;
-                            const orbitals = this._getValenceOrbitals(element);
+                            const orbitals = this.getValenceOrbitals(element);
                             return {
                                 properties: {
                                     atomicSpecies2: {