From 2a6ae0f2ffdbb82170d3614586dd7deb46110228 Mon Sep 17 00:00:00 2001
From: Alex Williams <alex.williams@brighter-technology.com>
Date: Wed, 29 May 2024 17:42:59 +0100
Subject: [PATCH 01/15] Modified export to EDOMH/EDEngineer page to be less
 'bodged', allow EDOMH button to be clickable without checking for EDEngineer
 API (If they have EDOMH, they probably don't have EDEngineer...) and added a
 workaround for Coriolis sending bogus data for bulkheads.

---
 src/app/components/ModalShoppingList.jsx | 61 +++++++++++++++++++-----
 src/app/i18n/en.json                     |  2 +
 src/less/app.less                        |  2 +-
 src/less/modal.less                      |  9 ++++
 4 files changed, 60 insertions(+), 14 deletions(-)

diff --git a/src/app/components/ModalShoppingList.jsx b/src/app/components/ModalShoppingList.jsx
index cd2e2ec3..5900d8ce 100644
--- a/src/app/components/ModalShoppingList.jsx
+++ b/src/app/components/ModalShoppingList.jsx
@@ -90,8 +90,10 @@ export default class ModalShoppingList extends TranslatedComponent {
     request
       .get('http://localhost:44405/commanders')
       .end((err, res) => {
+        this.display = 'block';
         if (err) {
           console.log(err);
+          this.display = 'none';
           return this.setState({ failed: true });
         }
         const cmdrs = JSON.parse(res.text);
@@ -178,8 +180,34 @@ export default class ModalShoppingList extends TranslatedComponent {
           if (g < module.m.blueprint.grade) {
             continue;
           }
+          let item = "";
+          // If the module blueprint fdname contains "Armour_" it's a bulkhead and we need to pre-populate the item field with the correct name from the ship object
+          if (module.m.blueprint.fdname.includes("Armour_")) {
+            switch (ship.bulkheads.m.name){
+              case "Lightweight Alloy":
+                item = ship.id + "_Armour_Grade1";
+                break;
+              case "Reinforced Alloy":
+                item = ship.id + "_Armour_Grade2";
+                break;
+              case "Military Grade Composite":
+                item = ship.id + "_Armour_Grade3";
+                break;
+              case "Mirrored Surface Composite":
+                item = ship.id + "_Armour_Mirrored";
+                break;
+              case "Reactive Surface Composite":
+                item = ship.id + "_Armour_Reactive";
+                break;
+            }
+            console.log(item);
+          }
+          else {
+            item = module.m.symbol;
+          }
+
           blueprints.push({
-            "item": module.m.symbol,
+            "item": item,
             "blueprint": module.m.blueprint.fdname,
             "grade": module.m.blueprint.grade,
             "highestGradePercentage":1.0
@@ -193,11 +221,12 @@ export default class ModalShoppingList extends TranslatedComponent {
       "version":1,
       "name":ship.name, // TO-DO: Import build name and put that here correctly
       "items": blueprints
-    }      
-    
+    }
+
     let JSONString = JSON.stringify(baseJson)
+    console.log(JSONString)
     let deflated = zlib.deflateSync(JSONString)
-    
+
     //actually encode
     let link = base64url.encode(deflated)
     link = "edomh://coriolis/?" + link;
@@ -320,16 +349,22 @@ export default class ModalShoppingList extends TranslatedComponent {
       <div>
         <textarea className='cb json' readOnly value={this.state.matsList} />
       </div>
-      <label hidden={!compatible} className={'l cap'}>{translate('CMDR Name')}</label>
-      <br/>
-      <select hidden={!compatible} className={'cmdr-select l cap'} onChange={this.cmdrChangeHandler} defaultValue={this.state.cmdrName}>
-        {this.state.cmdrs.map(e => <option key={e}>{e}</option>)}
-      </select>
-      <br/>
-      <p hidden={!this.state.failed} id={'failed'} className={'l'}>{translate('PHRASE_FAIL_EDENGINEER')}</p>
       <p hidden={compatible} id={'browserbad'} className={'l'}>{translate('PHRASE_FIREFOX_EDENGINEER')}</p>
-      <button className={'l cb dismiss cap'} disabled={!!this.state.failed || !compatible} onClick={this.sendToEDEng}>{translate('Send to EDEngineer')}</button>
-      <button style={{marginTop: 5}} className={'l cb dismiss cap'} disabled={!!this.state.failed} onClick={this.sendToEDOMH}>{translate('Send to EDOMH')}</button>
+      <p hidden={!this.state.failed} id={'failed'} className={'l'}>{translate('PHRASE_FAILED_TO_FIND_EDENGINEER')}</p>
+      <div id='edengineer' display={this.display} hidden={!!this.state.failed && !compatible}>
+        <label hidden={!compatible || !!this.state.failed} className={'l cap'}>{translate('CMDR Name')}</label>
+        <br/>
+        <select hidden={!compatible || !!this.state.failed} className={'cmdr-select l cap'} onChange={this.cmdrChangeHandler} defaultValue={this.state.cmdrName}>
+          {this.state.cmdrs.map(e => <option key={e}>{e}</option>)}
+        </select>
+        <br/>
+          <button className={'l cb dismiss cap'} hidden={!this.state.failed} disabled={!!this.state.failed || !compatible} onClick={this.sendToEDEng}>{translate('Send to EDEngineer')}</button>
+      </div>
+      <div id='edomh'>
+        <p>{translate('PHRASE_ENSURE_EDOMH')}</p>
+        <button style={{marginTop: 5}} className={'l cb dismiss cap'} onClick={this.sendToEDOMH}>{translate('Send to EDOMH')}</button>
+      </div>
+
       <button className={'r dismiss cap'} onClick={this.context.hideModal}>{translate('close')}</button>
     </div>;
   }
diff --git a/src/app/i18n/en.json b/src/app/i18n/en.json
index 09ed79d1..b856a2e4 100644
--- a/src/app/i18n/en.json
+++ b/src/app/i18n/en.json
@@ -82,7 +82,9 @@
     "TT_SUMMARY_LADEN_TOTAL_JUMP": "Farthest possible range with full cargo, a full fuel tank, and jumping as far as possible each time",
     "HELP_MODIFICATIONS_MENU": "Click on a number to enter a new value, or drag along the bar for small changes",
 	"PHRASE_FAIL_EDENGINEER": "Failed to send to EDEngineer (Launch EDEngineer and make sure the API is started then refresh the page.)",
+	"PHRASE_ENSURE_EDOMH": "Ensure EDO Material Helper is running, else this button will do nothing!",
 	"PHRASE_FIREFOX_EDENGINEER": "Sending to EDEngineer is not compatible with Firefox's security settings. Please try again with Chrome.",
+    "PHRASE_FAILED_TO_FIND_EDENGINEER": "Failed to find ED Engineer API. Please ensure it is running and try again.",
     "MISSING_MODULES": "Missing Modules",
     "am": "Auto Field-Maintenance Unit",
     "bh": "Bulkheads",
diff --git a/src/less/app.less b/src/less/app.less
index 566a9825..75d60911 100755
--- a/src/less/app.less
+++ b/src/less/app.less
@@ -183,4 +183,4 @@ footer {
 .announcement {
   border: 1px @secondary solid;
   padding: 10px;
-}
+}
\ No newline at end of file
diff --git a/src/less/modal.less b/src/less/modal.less
index c556a834..07c0a74d 100755
--- a/src/less/modal.less
+++ b/src/less/modal.less
@@ -41,6 +41,15 @@
   h2 {
     margin: 0;
   }
+
+  p {
+    clear: left;
+    padding: 30, 0, 0, 0;
+  }
+
+  button {
+    margin: 100px, 0;
+  }
 }
 
 textarea {

From d1217439bdb7a69804e75f25f054979ff2511346 Mon Sep 17 00:00:00 2001
From: Alex Williams <alex.williams@brighter-technology.com>
Date: Sun, 2 Jun 2024 11:02:52 +0100
Subject: [PATCH 02/15] Fixed autodeploy to do latest coriolis-data dist. Fixed
 sendToEDOMH function to only send the blueprint at the selected grade, not
 each grade up to that grade.

---
 .github/workflows/autodeploy.yml         | 1 +
 src/app/components/ModalShoppingList.jsx | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/autodeploy.yml b/.github/workflows/autodeploy.yml
index 8f28cc84..1933a2e9 100644
--- a/.github/workflows/autodeploy.yml
+++ b/.github/workflows/autodeploy.yml
@@ -22,6 +22,7 @@ jobs:
           git clone https://github.com/alex-williams/coriolis-data.git --single-branch --branch alpha
           cd coriolis-data
           npm install
+          npm start
           cd ../coriolis
           npm install
           npm run build
diff --git a/src/app/components/ModalShoppingList.jsx b/src/app/components/ModalShoppingList.jsx
index 5900d8ce..c8c0b571 100644
--- a/src/app/components/ModalShoppingList.jsx
+++ b/src/app/components/ModalShoppingList.jsx
@@ -173,11 +173,12 @@ export default class ModalShoppingList extends TranslatedComponent {
             "blueprint": module.m.blueprint.special.edname
           });
         }
-        for (const g in module.m.blueprint.grades) {
+        for (let g in module.m.blueprint.grades) {
           if (!module.m.blueprint.grades.hasOwnProperty(g)) {
             continue;
           }
-          if (g < module.m.blueprint.grade) {
+          // We only want the grade that the module is currently at, not every grade up to that point
+          if (Number(g) !== module.m.blueprint.grade) {
             continue;
           }
           let item = "";
@@ -200,11 +201,11 @@ export default class ModalShoppingList extends TranslatedComponent {
                 item = ship.id + "_Armour_Reactive";
                 break;
             }
-            console.log(item);
           }
           else {
             item = module.m.symbol;
           }
+          console.log(module.m)
 
           blueprints.push({
             "item": item,

From 42b2e39064dc089934b96a17789c5479443778e4 Mon Sep 17 00:00:00 2001
From: Alex Williams <alex.williams@brighter-technology.com>
Date: Wed, 29 May 2024 17:45:49 +0100
Subject: [PATCH 03/15] Issue 703 edomh integration (#7)

* Adds valid module checking to all types of modules on import

* Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo

* Changes as per comments on the PR

* Modified export to EDOMH/EDEngineer page to be less 'bodged', allow EDOMH button to be clickable without checking for EDEngineer API (If they have EDOMH, they probably don't have EDEngineer...) and added a workaround for Coriolis sending bogus data for bulkheads.

---------

Co-authored-by: David Sangrey <davidsangrey@gmail.com>
Co-authored-by: Felix Linker <linkerfelix@gmail.com>
---
 src/app/components/AvailableModulesMenu.jsx | 1 +
 src/app/components/ModalShoppingList.jsx    | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/components/AvailableModulesMenu.jsx b/src/app/components/AvailableModulesMenu.jsx
index 815cab51..b3d99b5a 100644
--- a/src/app/components/AvailableModulesMenu.jsx
+++ b/src/app/components/AvailableModulesMenu.jsx
@@ -340,6 +340,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
         disabled = 1 <= ship.internal.filter(o => o.m && o.m.grp === 'mlc').length;
       }
       let active = mountedModule && mountedModule.id === m.id;
+      
       let classes = cn(m.name ? 'lc' : 'c', {
         warning: !disabled && warningFunc && warningFunc(m),
         active,
diff --git a/src/app/components/ModalShoppingList.jsx b/src/app/components/ModalShoppingList.jsx
index c8c0b571..300e3332 100644
--- a/src/app/components/ModalShoppingList.jsx
+++ b/src/app/components/ModalShoppingList.jsx
@@ -205,7 +205,6 @@ export default class ModalShoppingList extends TranslatedComponent {
           else {
             item = module.m.symbol;
           }
-          console.log(module.m)
 
           blueprints.push({
             "item": item,

From bd2e6eaf510b98a19cacf9b55658b22ce6d0a300 Mon Sep 17 00:00:00 2001
From: Alex Williams <alex.williams@brighter-technology.com>
Date: Sun, 2 Jun 2024 11:36:36 +0100
Subject: [PATCH 04/15] Fixed miscalculation of mats and got rid of unhelpful
 'rolls' table, as the mats are calculated for the whole build and some
 blueprints may not be all the way up to g5.

---
 src/app/components/ModalShoppingList.jsx | 33 +++++++++++++-----------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/app/components/ModalShoppingList.jsx b/src/app/components/ModalShoppingList.jsx
index 300e3332..d6b70e71 100644
--- a/src/app/components/ModalShoppingList.jsx
+++ b/src/app/components/ModalShoppingList.jsx
@@ -248,33 +248,36 @@ export default class ModalShoppingList extends TranslatedComponent {
         if (!module.m.blueprint.grade || !module.m.blueprint.grades) {
           continue;
         }
-        for (const g in module.m.blueprint.grades) {
+        for (let g in module.m.blueprint.grades) {
           if (!module.m.blueprint.grades.hasOwnProperty(g)) {
             continue;
           }
-          if (g > module.m.blueprint.grade) {
+          // Ignore grades higher than the grade selected
+          if (Number(g) > module.m.blueprint.grade) {
             continue;
           }
-          for (const i in module.m.blueprint.grades[g].components) {
+          for (let i in module.m.blueprint.grades[g].components) {
             if (!module.m.blueprint.grades[g].components.hasOwnProperty(i)) {
               continue;
             }
+            console.log("Grade: " + g + " Component: " + i + " Amount: " + module.m.blueprint.grades[g].components[i] + " Rolls: " + this.state.matsPerGrade[g])
             if (mats[i]) {
               mats[i] += module.m.blueprint.grades[g].components[i] * this.state.matsPerGrade[g];
             } else {
               mats[i] = module.m.blueprint.grades[g].components[i] * this.state.matsPerGrade[g];
             }
+            console.log(mats[i])
           }
-          if (module.m.blueprint.special) {
-            for (const j in module.m.blueprint.special.components) {
-              if (!module.m.blueprint.special.components.hasOwnProperty(j)) {
-                continue;
-              }
-              if (mats[j]) {
-                mats[j] += module.m.blueprint.special.components[j];
-              } else {
-                mats[j] = module.m.blueprint.special.components[j];
-              }
+        }
+        if (module.m.blueprint.special) {
+          for (const j in module.m.blueprint.special.components) {
+            if (!module.m.blueprint.special.components.hasOwnProperty(j)) {
+              continue;
+            }
+            if (mats[j]) {
+              mats[j] += module.m.blueprint.special.components[j];
+            } else {
+              mats[j] = module.m.blueprint.special.components[j];
             }
           }
         }
@@ -332,7 +335,7 @@ export default class ModalShoppingList extends TranslatedComponent {
     this.sendToEDOMH = this.sendToEDOMH.bind(this);
     return <div className='modal' onClick={ (e) => e.stopPropagation() }>
       <h2>{translate('PHRASE_SHOPPING_MATS')}</h2>
-      <label>{translate('Grade 1 rolls ')}</label>
+      {/* <label>{translate('Grade 1 rolls ')}</label>
       <input id={1} type={'number'} min={0} defaultValue={this.state.matsPerGrade[1]} onChange={this.changeHandler} />
       <br/>
       <label>{translate('Grade 2 rolls ')}</label>
@@ -345,7 +348,7 @@ export default class ModalShoppingList extends TranslatedComponent {
       <input id={4} type={'number'} min={0} value={this.state.matsPerGrade[4]} onChange={this.changeHandler} />
       <br/>
       <label>{translate('Grade 5 rolls ')}</label>
-      <input id={5} type={'number'} min={0} value={this.state.matsPerGrade[5]} onChange={this.changeHandler} />
+      <input id={5} type={'number'} min={0} value={this.state.matsPerGrade[5]} onChange={this.changeHandler} /> */}
       <div>
         <textarea className='cb json' readOnly value={this.state.matsList} />
       </div>

From 4efc47dff00d982afca9524f48937978266425cd Mon Sep 17 00:00:00 2001
From: Alex Williams <alex.williams@brighter-technology.com>
Date: Sun, 2 Jun 2024 11:43:23 +0100
Subject: [PATCH 05/15] Removed console.log lines which were only needed for
 testing.

---
 src/app/components/ModalShoppingList.jsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/components/ModalShoppingList.jsx b/src/app/components/ModalShoppingList.jsx
index d6b70e71..4465d274 100644
--- a/src/app/components/ModalShoppingList.jsx
+++ b/src/app/components/ModalShoppingList.jsx
@@ -260,13 +260,11 @@ export default class ModalShoppingList extends TranslatedComponent {
             if (!module.m.blueprint.grades[g].components.hasOwnProperty(i)) {
               continue;
             }
-            console.log("Grade: " + g + " Component: " + i + " Amount: " + module.m.blueprint.grades[g].components[i] + " Rolls: " + this.state.matsPerGrade[g])
             if (mats[i]) {
               mats[i] += module.m.blueprint.grades[g].components[i] * this.state.matsPerGrade[g];
             } else {
               mats[i] = module.m.blueprint.grades[g].components[i] * this.state.matsPerGrade[g];
             }
-            console.log(mats[i])
           }
         }
         if (module.m.blueprint.special) {

From ee04416e2be78695f6e571eca55d9e92e5503cb5 Mon Sep 17 00:00:00 2001
From: Alex Williams <alex.williams@brighter-technology.com>
Date: Fri, 7 Jun 2024 10:06:53 +0100
Subject: [PATCH 06/15] Adding in buildname to EDOMH Export

---
 src/app/components/ModalShoppingList.jsx | 10 ++++++++--
 src/app/i18n/en.json                     |  7 ++++---
 src/app/pages/OutfittingPage.jsx         |  4 +++-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/app/components/ModalShoppingList.jsx b/src/app/components/ModalShoppingList.jsx
index 4465d274..2b12418c 100644
--- a/src/app/components/ModalShoppingList.jsx
+++ b/src/app/components/ModalShoppingList.jsx
@@ -12,7 +12,8 @@ const base64url = require('base64url');
 export default class ModalShoppingList extends TranslatedComponent {
 
   static propTypes = {
-    ship: PropTypes.object.isRequired
+    ship: PropTypes.object.isRequired,
+    buildName: PropTypes.string
   };
 
   /**
@@ -156,6 +157,7 @@ export default class ModalShoppingList extends TranslatedComponent {
   sendToEDOMH(event) {
     event.preventDefault();
     const ship = this.props.ship;
+    const buildName = this.props.buildName;
     let blueprints = [];
 
     //create the json
@@ -216,15 +218,18 @@ export default class ModalShoppingList extends TranslatedComponent {
       }
     }
 
+    let shipName = buildName + " - " + ship.name;
+
     //create JSON to encode
     let baseJson = {
       "version":1,
-      "name":ship.name, // TO-DO: Import build name and put that here correctly
+      "name": shipName, // TO-DO: Import build name and put that here correctly
       "items": blueprints
     }
 
     let JSONString = JSON.stringify(baseJson)
     console.log(JSONString)
+    console.log(ship)
     let deflated = zlib.deflateSync(JSONString)
 
     //actually encode
@@ -333,6 +338,7 @@ export default class ModalShoppingList extends TranslatedComponent {
     this.sendToEDOMH = this.sendToEDOMH.bind(this);
     return <div className='modal' onClick={ (e) => e.stopPropagation() }>
       <h2>{translate('PHRASE_SHOPPING_MATS')}</h2>
+      <p>{translate('PHRASE_DIFFERENT_ROLLS')}</p>
       {/* <label>{translate('Grade 1 rolls ')}</label>
       <input id={1} type={'number'} min={0} defaultValue={this.state.matsPerGrade[1]} onChange={this.changeHandler} />
       <br/>
diff --git a/src/app/i18n/en.json b/src/app/i18n/en.json
index b856a2e4..eef0c6ff 100644
--- a/src/app/i18n/en.json
+++ b/src/app/i18n/en.json
@@ -26,6 +26,7 @@
     "PHRASE_NO_SPECIAL": "No experimental effect",
     "PHRASE_SHOPPING_LIST": "Stations that sell this build",
     "PHRASE_SHOPPING_MATS": "Materials needed for this build",
+    "PHRASE_DIFFERENT_ROLLS": "NOTE: ED Engineer and/or EDOMH likely have their own 'rolls' configuration, so material requirements may differ!",
     "PHRASE_REFIT_SHOPPING_LIST": "Stations that sell required modules",
     "PHRASE_TOTAL_EFFECTIVE_SHIELD": "Total amount of damage that can be taken from each damage type, if using all shield cells",
     "PHRASE_TIME_TO_LOSE_SHIELDS": "Shields will hold for",
@@ -81,9 +82,9 @@
     "TT_SUMMARY_UNLADEN_TOTAL_JUMP": "Farthest possible range with no cargo, a full fuel tank, and jumping as far as possible each time",
     "TT_SUMMARY_LADEN_TOTAL_JUMP": "Farthest possible range with full cargo, a full fuel tank, and jumping as far as possible each time",
     "HELP_MODIFICATIONS_MENU": "Click on a number to enter a new value, or drag along the bar for small changes",
-	"PHRASE_FAIL_EDENGINEER": "Failed to send to EDEngineer (Launch EDEngineer and make sure the API is started then refresh the page.)",
-	"PHRASE_ENSURE_EDOMH": "Ensure EDO Material Helper is running, else this button will do nothing!",
-	"PHRASE_FIREFOX_EDENGINEER": "Sending to EDEngineer is not compatible with Firefox's security settings. Please try again with Chrome.",
+    "PHRASE_FAIL_EDENGINEER": "Failed to send to EDEngineer (Launch EDEngineer and make sure the API is started then refresh the page.)",
+    "PHRASE_ENSURE_EDOMH": "Ensure EDO Material Helper is installed and registered to handle edomh:// urls, else this button will do nothing!",
+    "PHRASE_FIREFOX_EDENGINEER": "Sending to EDEngineer is not compatible with Firefox's security settings. Please try again with Chrome.",
     "PHRASE_FAILED_TO_FIND_EDENGINEER": "Failed to find ED Engineer API. Please ensure it is running and try again.",
     "MISSING_MODULES": "Missing Modules",
     "am": "Auto Field-Maintenance Unit",
diff --git a/src/app/pages/OutfittingPage.jsx b/src/app/pages/OutfittingPage.jsx
index da012259..485a8189 100644
--- a/src/app/pages/OutfittingPage.jsx
+++ b/src/app/pages/OutfittingPage.jsx
@@ -700,7 +700,9 @@ export default class OutfittingPage extends Page {
    * Generates the shopping list
    */
   _genShoppingList() {
-    this.context.showModal(<ModalShoppingList ship={this.state.ship} />);
+    this.context.showModal(<ModalShoppingList
+      ship={this.state.ship}
+      buildName={this.state.buildName} />);
   }
 
   /**

From ab3c93d52d276da01980be94f04a60c77d7d01e1 Mon Sep 17 00:00:00 2001
From: Alex Williams <alex.williams@brighter-technology.com>
Date: Sun, 2 Jun 2024 11:04:37 +0100
Subject: [PATCH 07/15] Issue 703 edomh integration (#8)

* Adds valid module checking to all types of modules on import

* Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo

* Changes as per comments on the PR

* Modified export to EDOMH/EDEngineer page to be less 'bodged', allow EDOMH button to be clickable without checking for EDEngineer API (If they have EDOMH, they probably don't have EDEngineer...) and added a workaround for Coriolis sending bogus data for bulkheads.

* Fixed autodeploy to do latest coriolis-data dist. Fixed sendToEDOMH function to only send the blueprint at the selected grade, not each grade up to that grade.

---------

Co-authored-by: David Sangrey <davidsangrey@gmail.com>
Co-authored-by: Felix Linker <linkerfelix@gmail.com>
---
 src/app/components/ModalShoppingList.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/components/ModalShoppingList.jsx b/src/app/components/ModalShoppingList.jsx
index 2b12418c..79a32c0e 100644
--- a/src/app/components/ModalShoppingList.jsx
+++ b/src/app/components/ModalShoppingList.jsx
@@ -207,7 +207,6 @@ export default class ModalShoppingList extends TranslatedComponent {
           else {
             item = module.m.symbol;
           }
-
           blueprints.push({
             "item": item,
             "blueprint": module.m.blueprint.fdname,

From 7ccfa09ddd223bba12304f854f462a807ac55c1c Mon Sep 17 00:00:00 2001
From: Alex Williams <alex.williams@brighter-technology.com>
Date: Sun, 2 Jun 2024 11:38:06 +0100
Subject: [PATCH 08/15] Issue 703 edomh integration (#9)

* Adds valid module checking to all types of modules on import

* Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo

* Changes as per comments on the PR

* Modified export to EDOMH/EDEngineer page to be less 'bodged', allow EDOMH button to be clickable without checking for EDEngineer API (If they have EDOMH, they probably don't have EDEngineer...) and added a workaround for Coriolis sending bogus data for bulkheads.

* Fixed autodeploy to do latest coriolis-data dist. Fixed sendToEDOMH function to only send the blueprint at the selected grade, not each grade up to that grade.

* Fixed miscalculation of mats and got rid of unhelpful 'rolls' table, as the mats are calculated for the whole build and some blueprints may not be all the way up to g5.

---------

Co-authored-by: David Sangrey <davidsangrey@gmail.com>
Co-authored-by: Felix Linker <linkerfelix@gmail.com>
---
 src/app/components/ModalShoppingList.jsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/components/ModalShoppingList.jsx b/src/app/components/ModalShoppingList.jsx
index 79a32c0e..14716278 100644
--- a/src/app/components/ModalShoppingList.jsx
+++ b/src/app/components/ModalShoppingList.jsx
@@ -264,11 +264,13 @@ export default class ModalShoppingList extends TranslatedComponent {
             if (!module.m.blueprint.grades[g].components.hasOwnProperty(i)) {
               continue;
             }
+            console.log("Grade: " + g + " Component: " + i + " Amount: " + module.m.blueprint.grades[g].components[i] + " Rolls: " + this.state.matsPerGrade[g])
             if (mats[i]) {
               mats[i] += module.m.blueprint.grades[g].components[i] * this.state.matsPerGrade[g];
             } else {
               mats[i] = module.m.blueprint.grades[g].components[i] * this.state.matsPerGrade[g];
             }
+            console.log(mats[i])
           }
         }
         if (module.m.blueprint.special) {

From 105fc60f43a57f7990c21eee9c8a90969899819f Mon Sep 17 00:00:00 2001
From: Alex Williams <alex.williams@brighter-technology.com>
Date: Sun, 2 Jun 2024 11:43:52 +0100
Subject: [PATCH 09/15] Issue 703 edomh integration (#10)

* Adds valid module checking to all types of modules on import

* Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo

* Changes as per comments on the PR

* Modified export to EDOMH/EDEngineer page to be less 'bodged', allow EDOMH button to be clickable without checking for EDEngineer API (If they have EDOMH, they probably don't have EDEngineer...) and added a workaround for Coriolis sending bogus data for bulkheads.

* Fixed autodeploy to do latest coriolis-data dist. Fixed sendToEDOMH function to only send the blueprint at the selected grade, not each grade up to that grade.

* Fixed miscalculation of mats and got rid of unhelpful 'rolls' table, as the mats are calculated for the whole build and some blueprints may not be all the way up to g5.

* Removed console.log lines which were only needed for testing.

---------

Co-authored-by: David Sangrey <davidsangrey@gmail.com>
Co-authored-by: Felix Linker <linkerfelix@gmail.com>

From b86e90de4b5072ccca066d2e107c2c06745ed27f Mon Sep 17 00:00:00 2001
From: Alex Williams <alex.williams@brighter-technology.com>
Date: Sun, 2 Jun 2024 20:04:48 +0100
Subject: [PATCH 10/15] Issue 764 unknown modules are selectable (#11)

* Adds valid module checking to all types of modules on import

* Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo

* Changes as per comments on the PR

* Fixed 'Missing Module' category showing up in Optional Selection drop-down and fixed 'Missing Power Plant', 'Missing Power Distributor' and 'Missing Frameshift Drive' showing up in the Selection drop-downs for those module slots.

---------

Co-authored-by: David Sangrey <davidsangrey@gmail.com>
Co-authored-by: Felix Linker <linkerfelix@gmail.com>
---
 src/app/components/AvailableModulesMenu.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/components/AvailableModulesMenu.jsx b/src/app/components/AvailableModulesMenu.jsx
index b3d99b5a..815cab51 100644
--- a/src/app/components/AvailableModulesMenu.jsx
+++ b/src/app/components/AvailableModulesMenu.jsx
@@ -340,7 +340,6 @@ export default class AvailableModulesMenu extends TranslatedComponent {
         disabled = 1 <= ship.internal.filter(o => o.m && o.m.grp === 'mlc').length;
       }
       let active = mountedModule && mountedModule.id === m.id;
-      
       let classes = cn(m.name ? 'lc' : 'c', {
         warning: !disabled && warningFunc && warningFunc(m),
         active,

From 5d41575e66fc08cac67194b1e69127bbdc59d61d Mon Sep 17 00:00:00 2001
From: Alex Williams <alex.williams@brighter-technology.com>
Date: Thu, 6 Jun 2024 22:01:25 +0100
Subject: [PATCH 11/15] Adding tag to manual dispatch of workflow

---
 .github/workflows/autodeploy.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/autodeploy.yml b/.github/workflows/autodeploy.yml
index 1933a2e9..977f13f1 100644
--- a/.github/workflows/autodeploy.yml
+++ b/.github/workflows/autodeploy.yml
@@ -5,6 +5,9 @@ name: Auto-Deploy
 # Controls when the action will run. Workflow runs when the alpha branch receives a push event
 on:
   workflow_dispatch:
+    inputs:
+      tags:
+        description: "Manually Run Workflow"
   push:
     branches:
       - alpha

From 45935b90e48810cfe9d9e2a613dad091e226ee7f Mon Sep 17 00:00:00 2001
From: Alex Williams <alex.williams@brighter-technology.com>
Date: Thu, 6 Jun 2024 22:35:08 +0100
Subject: [PATCH 12/15] Adding fix for broken Armour Module Selection

---
 src/app/components/AvailableModulesMenu.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/components/AvailableModulesMenu.jsx b/src/app/components/AvailableModulesMenu.jsx
index 815cab51..87f188b6 100644
--- a/src/app/components/AvailableModulesMenu.jsx
+++ b/src/app/components/AvailableModulesMenu.jsx
@@ -322,7 +322,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
     for (let i = 0; i < sortedModules.length; i++) {
       let m = sortedModules[i];
       // If m.grp is mh or mm, or m.symbol contains 'Missing' skip it
-      if (m.grp == 'mh' || m.grp == 'mm' || m.symbol.includes("Missing")) {
+      if (m.grp == 'mh' || m.grp == 'mm' || (typeof(m.symbol) !== 'undefined' && m.symbol.includes("Missing"))) {
         // If this is a missing module, skip it
         continue;
       }

From ed5ffbc9f83b3cde53a76760938c2b7ecf2b8d73 Mon Sep 17 00:00:00 2001
From: Alex Williams <alex.williams@brighter-technology.com>
Date: Fri, 7 Jun 2024 10:49:23 +0100
Subject: [PATCH 13/15] Fixed issue with special blueprint item not being
 correctly jsonified for export to EDOMH

---
 src/app/components/ModalShoppingList.jsx | 57 ++++++++++++++++--------
 1 file changed, 39 insertions(+), 18 deletions(-)

diff --git a/src/app/components/ModalShoppingList.jsx b/src/app/components/ModalShoppingList.jsx
index 14716278..aa37f2d5 100644
--- a/src/app/components/ModalShoppingList.jsx
+++ b/src/app/components/ModalShoppingList.jsx
@@ -150,6 +150,34 @@ export default class ModalShoppingList extends TranslatedComponent {
     }
   }
 
+  /**
+   * Fix issues with the item name for bulkheads when sending to EDOMH
+   * @param {*} ship Ship object
+   * @param {*} item Item name
+   * @returns updated item name
+   */
+  fixArmourItemNameForEDOMH(ship, item) {
+    // The module blueprint fdname contains "Armour_" it's a bulkhead and we need to pre-populate the item field with the correct name from the ship object
+    switch (ship.bulkheads.m.name){
+      case "Lightweight Alloy":
+        item = ship.id + "_Armour_Grade1";
+        break;
+      case "Reinforced Alloy":
+        item = ship.id + "_Armour_Grade2";
+        break;
+      case "Military Grade Composite":
+        item = ship.id + "_Armour_Grade3";
+        break;
+      case "Mirrored Surface Composite":
+        item = ship.id + "_Armour_Mirrored";
+        break;
+      case "Reactive Surface Composite":
+        item = ship.id + "_Armour_Reactive";
+        break;
+    }
+    return item;
+  }
+
   /**
  * Send all blueprints to EDOMH. This is a modified copy of registerBPs because this.state.blueprints was empty when I tried to modify sendToEDEng and I couldn't figure out why
  * @param {Event} event React event
@@ -170,8 +198,17 @@ export default class ModalShoppingList extends TranslatedComponent {
           continue;
         }
         if (module.m.blueprint.special) {
+          let item = "";
+          // If the module blueprint fdname contains "Armour_" it's a bulkhead and we need to pre-populate the item field with the correct name from the ship object
+          if (module.m.blueprint.fdname.includes("Armour_")) {
+            item = this.fixArmourItemNameForEDOMH(ship, item)
+          }
+          else {
+            item = module.m.symbol;
+          }
+
           blueprints.push({
-            "item": module.m.symbol,
+            "item": item,
             "blueprint": module.m.blueprint.special.edname
           });
         }
@@ -186,23 +223,7 @@ export default class ModalShoppingList extends TranslatedComponent {
           let item = "";
           // If the module blueprint fdname contains "Armour_" it's a bulkhead and we need to pre-populate the item field with the correct name from the ship object
           if (module.m.blueprint.fdname.includes("Armour_")) {
-            switch (ship.bulkheads.m.name){
-              case "Lightweight Alloy":
-                item = ship.id + "_Armour_Grade1";
-                break;
-              case "Reinforced Alloy":
-                item = ship.id + "_Armour_Grade2";
-                break;
-              case "Military Grade Composite":
-                item = ship.id + "_Armour_Grade3";
-                break;
-              case "Mirrored Surface Composite":
-                item = ship.id + "_Armour_Mirrored";
-                break;
-              case "Reactive Surface Composite":
-                item = ship.id + "_Armour_Reactive";
-                break;
-            }
+            item = this.fixArmourItemNameForEDOMH(ship, item)
           }
           else {
             item = module.m.symbol;

From ca914015071258145461d9493afc44ba13363fed Mon Sep 17 00:00:00 2001
From: Alex Williams <alex.williams@brighter-technology.com>
Date: Fri, 7 Jun 2024 11:53:35 +0100
Subject: [PATCH 14/15] Removing Autodeploy from this branch, it was merged in
 by github

---
 .github/workflows/autodeploy.yml | 32 --------------------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 .github/workflows/autodeploy.yml

diff --git a/.github/workflows/autodeploy.yml b/.github/workflows/autodeploy.yml
deleted file mode 100644
index 977f13f1..00000000
--- a/.github/workflows/autodeploy.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-# This is a basic deployment workflow triggered by pushes to the alpha branch.
-
-name: Auto-Deploy
-
-# Controls when the action will run. Workflow runs when the alpha branch receives a push event
-on:
-  workflow_dispatch:
-    inputs:
-      tags:
-        description: "Manually Run Workflow"
-  push:
-    branches:
-      - alpha
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  downloadcode:
-    runs-on: self-hosted
-    steps:
-      - shell: bash
-        run: |
-          rm -Rf ./coriolis
-          rm -Rf ./coriolis-data
-          git clone https://github.com/alex-williams/coriolis.git --single-branch --branch alpha
-          git clone https://github.com/alex-williams/coriolis-data.git --single-branch --branch alpha
-          cd coriolis-data
-          npm install
-          npm start
-          cd ../coriolis
-          npm install
-          npm run build
-          sudo -u www-data cp -r ./build/* /var/www/newdisk/coriolis.brighter-applications.co.uk/
\ No newline at end of file

From 06552dd86032ba555f0ae933765e8fb8126f8a55 Mon Sep 17 00:00:00 2001
From: Alex Williams <alex.williams@brighter-technology.com>
Date: Fri, 7 Jun 2024 18:24:57 +0100
Subject: [PATCH 15/15] Removing debugging console.log entries that are no
 longer needed for EDOMH fix

---
 src/app/components/ModalShoppingList.jsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/app/components/ModalShoppingList.jsx b/src/app/components/ModalShoppingList.jsx
index aa37f2d5..b1f21e15 100644
--- a/src/app/components/ModalShoppingList.jsx
+++ b/src/app/components/ModalShoppingList.jsx
@@ -248,8 +248,6 @@ export default class ModalShoppingList extends TranslatedComponent {
     }
 
     let JSONString = JSON.stringify(baseJson)
-    console.log(JSONString)
-    console.log(ship)
     let deflated = zlib.deflateSync(JSONString)
 
     //actually encode
@@ -285,13 +283,11 @@ export default class ModalShoppingList extends TranslatedComponent {
             if (!module.m.blueprint.grades[g].components.hasOwnProperty(i)) {
               continue;
             }
-            console.log("Grade: " + g + " Component: " + i + " Amount: " + module.m.blueprint.grades[g].components[i] + " Rolls: " + this.state.matsPerGrade[g])
             if (mats[i]) {
               mats[i] += module.m.blueprint.grades[g].components[i] * this.state.matsPerGrade[g];
             } else {
               mats[i] = module.m.blueprint.grades[g].components[i] * this.state.matsPerGrade[g];
             }
-            console.log(mats[i])
           }
         }
         if (module.m.blueprint.special) {