From ef6ddf72bffb0fe637cab54fe5fc62566bff5ab1 Mon Sep 17 00:00:00 2001
From: markdhooper <markushooper@gmail.com>
Date: Thu, 16 Nov 2023 09:43:07 -0400
Subject: [PATCH] updated all instances of 2UTM for F2 as the new Stornado was
 renamed to Stornado F2

---
 ...stornado-chassis.png => f2-stornado-chassis.png} | Bin
 45drives-disks/src/App.vue                          |   4 ++--
 45drives-disks/src/components/CanvasSection.vue     |   8 ++++----
 .../{P5Stornado2UTM.vue => P5StornadoF2.vue}        |   8 ++++----
 CHANGELOG.md                                        |   4 ++--
 manifest.json                                       |   4 ++--
 packaging/el8/main.spec                             |   2 ++
 packaging/focal/changelog                           |   6 ++++++
 8 files changed, 22 insertions(+), 14 deletions(-)
 rename 45drives-disks/public/img/chassis/{2utm-stornado-chassis.png => f2-stornado-chassis.png} (100%)
 rename 45drives-disks/src/components/{P5Stornado2UTM.vue => P5StornadoF2.vue} (98%)

diff --git a/45drives-disks/public/img/chassis/2utm-stornado-chassis.png b/45drives-disks/public/img/chassis/f2-stornado-chassis.png
similarity index 100%
rename from 45drives-disks/public/img/chassis/2utm-stornado-chassis.png
rename to 45drives-disks/public/img/chassis/f2-stornado-chassis.png
diff --git a/45drives-disks/src/App.vue b/45drives-disks/src/App.vue
index abf7c71..71d41c7 100644
--- a/45drives-disks/src/App.vue
+++ b/45drives-disks/src/App.vue
@@ -144,7 +144,7 @@ export default {
             case "2U":
               pageLayout.value = "A";
               break;
-            case "2UTM":
+            case "F2":
               pageLayout.value = "A";
               break;
             case "AV15":
@@ -190,7 +190,7 @@ export default {
             case "2U":
               pageLayout.value = "AZ";
               break;       
-            case "2UTM":
+            case "F2":
               pageLayout.value = "AZ";
               break;                       
             case "AV15":
diff --git a/45drives-disks/src/components/CanvasSection.vue b/45drives-disks/src/components/CanvasSection.vue
index 3d00477..c945f61 100644
--- a/45drives-disks/src/components/CanvasSection.vue
+++ b/45drives-disks/src/components/CanvasSection.vue
@@ -29,7 +29,7 @@
       ref="canvasCardBody"
       class="card-body flex-auto flex flex-col items-center content-center p-0 overflow-visible"
     >
-      <P5Stornado2UTM v-if="activeSketchStr === 'Stornado2UTM'" />
+      <P5StornadoF2 v-if="activeSketchStr === 'StornadoF2'" />
       <P5F8X1 v-if="activeSketchStr === 'StorinatorF8X1'" />
       <P5F8X2 v-if="activeSketchStr === 'StorinatorF8X2'" />
       <P5F8X3 v-if="activeSketchStr === 'StorinatorF8X3'" />
@@ -62,7 +62,7 @@
 </template>
 
 <script>
-import P5Stornado2UTM from "./P5Stornado2UTM.vue";
+import P5StornadoF2 from "./P5StornadoF2.vue";
 import P5F8X1 from "./P5F8X1.vue";
 import P5F8X2 from "./P5F8X2.vue";
 import P5F8X3 from "./P5F8X3.vue";
@@ -86,7 +86,7 @@ import { Switch, SwitchGroup, SwitchLabel } from '@headlessui/vue'
 
 export default {
   components: {
-    P5Stornado2UTM,
+    P5StornadoF2,
     P5F8X1,
     P5F8X2,
     P5F8X3,
@@ -118,7 +118,7 @@ export default {
     const zfsInfo = inject("zfsInfo");
     const enableSketch = (modelString) => {
       let testString =
-        /(Storinator|Stornado|HomeLab)-(H8)?(H16|H32)?-?(HL15|AV15|Q30|S45|XL60|2UTM|2U|MI4|C8|F8X1|F8X2|F8X3)/m.exec(
+        /(Storinator|Stornado|HomeLab)-(H8)?(H16|H32)?-?(HL15|AV15|Q30|S45|XL60|F2|2U|MI4|C8|F8X1|F8X2|F8X3)/m.exec(
           modelString
         );
       let enableString = testString
diff --git a/45drives-disks/src/components/P5Stornado2UTM.vue b/45drives-disks/src/components/P5StornadoF2.vue
similarity index 98%
rename from 45drives-disks/src/components/P5Stornado2UTM.vue
rename to 45drives-disks/src/components/P5StornadoF2.vue
index 922e2ea..f277388 100644
--- a/45drives-disks/src/components/P5Stornado2UTM.vue
+++ b/45drives-disks/src/components/P5StornadoF2.vue
@@ -1,5 +1,5 @@
 <template>
-    <div id="p5-stornado2utm" class="self-stretch m-2 flex justify-center"></div>
+    <div id="p5-stornadof2" class="self-stretch m-2 flex justify-center"></div>
   </template>
   
   <script>
@@ -11,7 +11,7 @@
   
   const assets = {
     chassis: {
-      path: "img/chassis/2utm-stornado-chassis.png",
+      path: "img/chassis/f2-stornado-chassis.png",
       image: null,
     },
     disks: {
@@ -340,7 +340,7 @@
 ];
   
   export default {
-    name: "P5Stornado2UTM",
+    name: "P5StornadoF2",
     setup() {
       const diskInfoObj = ref({});
       const currentDisk = inject("currentDisk");
@@ -494,7 +494,7 @@
             assets.chassis.image.width,
             assets.chassis.image.height
           );
-          canvas.parent("p5-stornado2utm");
+          canvas.parent("p5-stornadof2");
           p5.frameRate(24);
           resizeHook(p5,canvas.id(),assets.chassis.image.width);
         };
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f06d2b..b4c85da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,3 @@
-## cockpit-45drives-hardware 2.3.3-1
+## cockpit-45drives-hardware 2.3.3-2
 
-* added support for HL15 servers in 45Drives-Disks and 45Drives-System
\ No newline at end of file
+* changed all instances of 2UTM to F2 for new Stornado server
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 43a149f..3331a40 100644
--- a/manifest.json
+++ b/manifest.json
@@ -4,7 +4,7 @@
     "title": "cockpit-45drives-hardware",
     "prerelease": true,
     "version": "2.3.3",
-    "buildVersion": "1",
+    "buildVersion": "2",
     "author": "Mark Hooper <mhooper@45drives.com>",
     "url": "https://github.com/45Drives/cockpit-hardware",
     "category": "utils",
@@ -59,7 +59,7 @@
     "changelog": {
         "urgency": "medium",
         "version": "2.3.3",
-        "buildVersion": "1",
+        "buildVersion": "2",
         "ignore": [],
         "date": null,
         "packager": "Mark Hooper <mhooper@45drives.com>",
diff --git a/packaging/el8/main.spec b/packaging/el8/main.spec
index f9244f7..00ee75d 100644
--- a/packaging/el8/main.spec
+++ b/packaging/el8/main.spec
@@ -42,6 +42,8 @@ make DESTDIR=%{buildroot} install
 /usr/lib/udev/rules.d/68-cockpit-45drives-disks.rules
 
 %changelog
+* Thu Nov 16 2023 Mark Hooper <mhooper@45drives.com> 2.3.3-2
+- changed all instances of 2UTM to F2 for new Stornado server
 * Wed Oct 04 2023 Mark Hooper <mhooper@45drives.com> 2.3.3-1
 - added support for HL15 servers in 45Drives-Disks and 45Drives-System
 * Fri Jun 23 2023 Mark Hooper <mhooper@45drives.com> 2.3.2-1
diff --git a/packaging/focal/changelog b/packaging/focal/changelog
index e5fcef1..fe8cda1 100644
--- a/packaging/focal/changelog
+++ b/packaging/focal/changelog
@@ -1,3 +1,9 @@
+cockpit-45drives-hardware (2.3.3-2focal) focal; urgency=medium
+
+  * changed all instances of 2UTM to F2 for new Stornado server
+
+ -- Mark Hooper <mhooper@45drives.com>  Thu, 16 Nov 2023 05:42:24 -0400
+
 cockpit-45drives-hardware (2.3.3-1focal) focal; urgency=medium
 
   * added support for HL15 servers in 45Drives-Disks and 45Drives-System