Fixed Table component and CRUD operations for the various pages that use the table

backend/api/routes/machine_groups.py

@@ -43,8 +43,18 @@ async def create_machine_group(
             status_code=status.HTTP_409_CONFLICT,
             detail="A machine group with that name already exists",
         )
+    machines = (
+        await session.scalars(
+            select(Machine).where(Machine.id.in_(request.machine_ids))
+        )
+    ).all()
+    if len(machines) != len(request.machine_ids):
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="One or more of the provided machine IDs is invalid",
+        )
 
-    new_machine_group = MachineGroup(name=request.name, machines=[])
+    new_machine_group = MachineGroup(name=request.name, machines=machines)
     session.add(new_machine_group)
     await session.commit()
     await session.refresh(new_machine_group)
@@ -171,7 +181,7 @@ async def edit_machine_group(
     differences = {
         "name": request.name if machine_group.name != request.name else None,
         "machine_ids": (
-            request.machine_ids
+            [str(x) for x in request.machine_ids]
             if set(machine_group.machines) != set(machines)
             else None
         ),
@@ -181,7 +191,7 @@ async def edit_machine_group(
     machine_group.machines = list(machines)
 
     audit_log = AuditLog(
-        type=LogType.MACHINE_GROUP_DELETED,
+        type=LogType.MACHINE_GROUP_EDITED,
         content={
             "machine_group_id": str(machine_group.id),
             "user_rcsid": current_user.RCSID,

backend/api/routes/machine_types.py

@@ -4,6 +4,7 @@
 from uuid import UUID
 from fastapi import APIRouter, Depends, HTTPException, status
 from sqlalchemy import and_, func, ScalarSelect, select
+from decimal import Decimal
 from sqlalchemy.orm import InstrumentedAttribute, joinedload, selectinload
 
 from models.audit_log import AuditLog
@@ -249,19 +250,20 @@ async def edit_machine_type(
     differences = {
         "name": request.name if machine_type.name != request.name else None,
         "resource_slots": (
-            request.resource_slot_ids
+            [str(x) for x in request.resource_slot_ids]
             if set(machine_type.resource_slots) != set(resource_slots)
             else None
         ),
         "cost_per_hour": (
-            request.cost_per_hour
-            if machine_type.cost_per_hour != request.cost_per_hour
+            float(request.cost_per_hour)
+            if float(machine_type.cost_per_hour) != float(request.cost_per_hour)
             else None
         ),
     }
 
     machine_type.name = request.name
     machine_type.resource_slots = list(resource_slots)
+    machine_type.cost_per_hour = Decimal(request.cost_per_hour)
 
     audit_log = AuditLog(
         type=LogType.MACHINE_TYPE_EDITED,

backend/api/routes/resource_slots.py

@@ -9,6 +9,7 @@
 from models.audit_log import AuditLog
 from models.resource import Resource
 from models.resource_slot import ResourceSlot
+from models.machine_type import MachineType, MachineTypeSlotAssociation
 from models.resource_usage_quantity import ResourceUsageQuantity
 from schemas.requests import ResourceSlotCreateRequest, ResourceSlotEditRequest
 from schemas.responses import (
@@ -207,8 +208,8 @@ async def edit_resource_slot(
             if resource_slot.display_name != request.display_name
             else None
         ),
-        "valid_resource_ids": (
-            request.resource_ids
+        "resource_ids": (
+            [str(r) for r in request.resource_ids]
             if set(resource_slot.valid_resources) != set(valid_resources)
             else None
         ),
@@ -262,6 +263,14 @@ async def delete_resource_slot(
             detail="Resource Slot with provided ID not found",
         )
 
+    slotAcc: MachineTypeSlotAssociation = await session.scalar(select(MachineTypeSlotAssociation).where(MachineTypeSlotAssociation.resource_slot_id == resource_slot_id))
+    if slotAcc:
+        mtypeWith: MachineType = await session.get(MachineType, slotAcc.machine_type_id)
+        raise HTTPException(
+            status_code=status.HTTP_406_NOT_ACCEPTABLE,
+            detail=f"One or more machine types is using this resource slot: {mtypeWith.name})"
+        )
+
     await session.delete(resource_slot)
 
     audit_log = AuditLog(

backend/api/routes/resources.py

@@ -8,6 +8,7 @@
 
 from models.audit_log import AuditLog
 from models.resource import Resource
+from models.resource_slot import ResourceSlot, ResourceSlotAssociation
 from schemas.requests import ResourceCreateRequest, ResourceEditRequest
 from schemas.responses import (
     AuditLogModel,
@@ -50,7 +51,7 @@ async def create_resource(
         )
 
     new_resource = Resource(
-        name=request.name, brand=request.brand, units=request.units, cost=request.cost
+        name=request.name, color=request.color, brand=request.brand, units=request.units, cost=request.cost
     )
     session.add(new_resource)
     await session.commit()
@@ -166,12 +167,14 @@ async def edit_resource(
     differences = {
         "name": request.name if resource.name != request.name else None,
         "brand": request.brand if resource.brand != request.brand else None,
+        "color": request.color if resource.color != request.color else None,
         "units": request.units if resource.units != request.units else None,
         "cost": request.cost if resource.cost != request.cost else None,
     }
 
     resource.name = request.name
     resource.brand = request.brand
+    resource.color = request.color
     resource.units = request.units
     resource.cost = request.cost
 
@@ -204,6 +207,14 @@ async def delete_resource(
             status_code=status.HTTP_404_NOT_FOUND,
             detail="Resource with provided ID not found",
         )
+
+    slotAcc: ResourceSlotAssociation = await session.scalar(select(ResourceSlotAssociation).where(ResourceSlotAssociation.resource_id == resource_id))
+    if slotAcc:
+        slotWith: ResourceSlot = await session.get(ResourceSlot, slotAcc.resource_slot_id)
+        raise HTTPException(
+            status_code=status.HTTP_406_NOT_ACCEPTABLE,
+            detail=f"One or more resource slots is using this resource: {slotWith.display_name})"
+        )
 
     await session.delete(resource)
 

backend/schemas/requests.py

@@ -178,6 +178,7 @@ class UserChangeRCSIDRequest(BaseRequest):
 
 class MachineGroupCreateRequest(BaseRequest):
     name: str
+    machine_ids: list[UUID4]
 
 
 class MachineGroupEditRequest(BaseRequest):

frontend/index.html

@@ -8,7 +8,7 @@
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
-      content="Web site created using create-react-app"
+      content="RPI Makerspace in CII 2037A"
     />
     <link rel="apple-touch-icon" href="/logo192.png" />
     <link rel="manifest" href="/manifest.json" />