Rename components with old names

webapp/cypress/component/NavbarTest.cy.jsx

@@ -21,7 +21,7 @@ describe("Navbar", () => {
         { path: "/samples", name: "Samples" },
         { path: "/collections", name: "Collections" },
         { path: "/starting-materials", name: "Inventory" },
-        { path: "/equipments", name: "Equipment" },
+        { path: "/equipment", name: "Equipment" },
         { path: "/item-graph", name: "GraphView" },
       ],
     });
@@ -91,7 +91,7 @@ describe("Navbar", () => {
       cy.contains("Samples").should("have.attr", "href", "/samples");
       cy.contains("Collections").should("have.attr", "href", "/collections");
       cy.contains("Inventory").should("have.attr", "href", "/starting-materials");
-      cy.contains("Equipment").should("have.attr", "href", "/equipments");
+      cy.contains("Equipment").should("have.attr", "href", "/equipment");
       cy.contains("Graph View").should("have.attr", "href", "/item-graph");
     });
   });
@@ -116,7 +116,7 @@ describe("Navbar", () => {
     cy.url().should("include", "/starting-materials");
 
     cy.contains("Equipment").click();
-    cy.url().should("include", "/equipments");
+    cy.url().should("include", "/equipment");
 
     cy.contains("Graph View").click();
     cy.url().should("include", "/item-graph");

webapp/src/components/AddToCollectionModal.vue

@@ -79,7 +79,7 @@ export default {
           getSampleList();
         } else if (this.itemsSelected.some((item) => item.type === "startingMaterials")) {
           getStartingMaterialList();
-        } else if (this.itemsSelected.some((item) => item.type === "equipments")) {
+        } else if (this.itemsSelected.some((item) => item.type === "equipment")) {
           getEquipmentList();
         }
         console.log("Items added successfully.");

webapp/src/components/DynamicButtonDataTable.vue

@@ -38,7 +38,7 @@
         Add a starting material
       </button>
       <button
-        v-if="dataType === 'equipments'"
+        v-if="dataType === 'equipment'"
         class="btn btn-default"
         @click="$emit('open-create-equipment-modal')"
       >
@@ -143,7 +143,7 @@ export default {
         this.deleteCollections();
       } else if (this.dataType === "startingMaterials") {
         this.deleteStartingMaterials();
-      } else if (this.dataType === "equipments") {
+      } else if (this.dataType === "equipment") {
         this.deleteEquipments();
       }
       this.$emit("delete-selected-items");

webapp/src/components/DynamicDataTable.vue

@@ -175,7 +175,7 @@ export default {
         samples: "sample-table",
         collections: "collection-table",
         startingMaterials: "starting-material-table",
-        equipments: "equipment-table",
+        equipment: "equipment-table",
       };
       return dataTestIdMap[this.dataType] || "default-table";
     },

webapp/src/components/EquipmentsTable.vue → webapp/src/components/EquipmentTable.vue

@@ -1,8 +1,8 @@
 <template>
   <DynamicDataTable
     :columns="equipmentColumn"
-    :data="equipments"
-    :data-type="'equipments'"
+    :data="equipment"
+    :data-type="'equipment'"
     :global-filter-fields="['item_id', 'name', 'location', 'creatorsList']"
   />
 </template>
@@ -25,7 +25,7 @@ export default {
     };
   },
   computed: {
-    equipments() {
+    equipment() {
       return this.$store.state.equipment_list.map((equipment) => ({
         ...equipment,
         // creatorsList: equipment.creators.map((creator) => creator.display_name).join(", "),

webapp/src/components/Navbar.vue

@@ -24,7 +24,7 @@
     <router-link to="/samples">Samples</router-link> |
     <router-link to="/collections">Collections</router-link> |
     <router-link to="/starting-materials">Inventory</router-link> |
-    <router-link to="/equipments">Equipment</router-link> |
+    <router-link to="/equipment">Equipment</router-link> |
     <router-link to="/item-graph"
       ><font-awesome-icon icon="project-diagram" />&nbsp;Graph View</router-link
     >

webapp/src/router/index.js

@@ -1,6 +1,6 @@
 import { createRouter, createWebHistory } from "vue-router";
 import Samples from "../views/Samples.vue";
-import Equipments from "../views/Equipments.vue";
+import Equipment from "../views/Equipment.vue";
 import StartingMaterials from "../views/StartingMaterials.vue";
 import Collections from "@/views/Collections.vue";
 import NotFound from "../views/NotFound.vue";
@@ -26,10 +26,10 @@ const routes = [
     component: Samples,
   },
   {
-    path: "/equipments",
-    name: "equipments",
+    path: "/equipment",
+    name: "equipment",
     alias: "/",
-    component: Equipments,
+    component: Equipment,
   },
   {
     path: "/edit/:id",

webapp/src/views/Collections.vue

@@ -4,21 +4,21 @@
   <div id="tableContainer" class="container">
     <div class="row">
       <div class="col-sm-12 mx-auto">
-        <CollectionsTable />
+        <CollectionTable />
       </div>
     </div>
   </div>
 </template>
 
 <script>
 import Navbar from "@/components/Navbar";
-import CollectionsTable from "@/components/CollectionsTable";
+import CollectionTable from "@/components/CollectionTable";
 
 export default {
   name: "Collections",
   components: {
     Navbar,
-    CollectionsTable,
+    CollectionTable,
   },
 };
 </script>

webapp/src/views/Equipments.vue → webapp/src/views/Equipment.vue

@@ -4,21 +4,21 @@
   <div id="tableContainer" class="container">
     <div class="row">
       <div class="col-sm-12 mx-auto">
-        <EquipmentsTable />
+        <EquipmentTable />
       </div>
     </div>
   </div>
 </template>
 
 <script>
 import Navbar from "@/components/Navbar";
-import EquipmentsTable from "@/components/EquipmentsTable";
+import EquipmentTable from "@/components/EquipmentTable";
 
 export default {
-  name: "Equipments",
+  name: "Equipment",
   components: {
     Navbar,
-    EquipmentsTable,
+    EquipmentTable,
   },
 };
 </script>

webapp/src/views/Samples.vue

@@ -4,21 +4,21 @@
   <div id="tableContainer" class="container">
     <div class="row">
       <div class="col-sm-12 mx-auto">
-        <SamplesTable />
+        <SampleTable />
       </div>
     </div>
   </div>
 </template>
 
 <script>
 import Navbar from "@/components/Navbar";
-import SamplesTable from "@/components/SamplesTable";
+import SampleTable from "@/components/SampleTable";
 
 export default {
   name: "Samples",
   components: {
     Navbar,
-    SamplesTable,
+    SampleTable,
   },
 };
 </script>

webapp/src/views/StartingMaterials.vue

@@ -4,21 +4,21 @@
   <div id="tableContainer" class="container">
     <div class="row">
       <div class="col-sm-12 mx-auto">
-        <StartingMaterialsTable />
+        <StartingMaterialTable />
       </div>
     </div>
   </div>
 </template>
 
 <script>
 import Navbar from "@/components/Navbar";
-import StartingMaterialsTable from "@/components/StartingMaterialsTable";
+import StartingMaterialTable from "@/components/StartingMaterialTable";
 
 export default {
   name: "StartingMaterials",
   components: {
     Navbar,
-    StartingMaterialsTable,
+    StartingMaterialTable,
   },
 };
 </script>