From b2015f44910e1544ed5b9528699a55ecd626eefa Mon Sep 17 00:00:00 2001
From: FirePhoenix555 <53152322+FirePhoenix555@users.noreply.github.com>
Date: Tue, 10 Feb 2026 20:14:33 -0800
Subject: [PATCH 01/16] kit object fields

---
 common/inventory.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/inventory.ts b/common/inventory.ts
index f34c8ac5..1fb237ff 100644
--- a/common/inventory.ts
+++ b/common/inventory.ts
@@ -16,7 +16,7 @@ export enum ITEM_RELATIVE_QUANTITY {
 export type ItemQuantity = ITEM_RELATIVE_QUANTITY | number;
 
 /**
- * TLocation - Location of an inventory item
+ * TInventoryItemLocation - Location of an inventory item
  * @property room - The UUID of an area where the item is stored
  * @property quantity - of item stored in this location
  * @property container - (optional) subsection of room
@@ -98,7 +98,7 @@ export const ITEM_ACCESS_DESCRIPTORS: {
  * @property available - (optional) The current available quantity
  *      after accounting for checkouts/reservations (only applicable to items
  *      with a number quantity, not relative quantity)
- * @property locations - See {@link TLocation} documentation
+ * @property locations - See {@link TInventoryItemLocation} documentation
  * @property reorder_url - (optional) url for reordering item
  * @property serial_number - (optional) serial number of item
  * @property kit_contents - (optional) if kit, lists all item UUIDs in this kit
@@ -108,6 +108,8 @@ export const ITEM_ACCESS_DESCRIPTORS: {
  *      allowed to use this item. A user must have at least one of
  *      these roles to checkout the given item. If null, any user may
  *      checkout this item.
+ * @property kit_contents - The contents of the item, if it is a kit
+ * @property parent_kit - The UUID of the parent kit (if this item is in one)
  */
 export type TInventoryItem = {
     uuid: InventoryItemUUID;
@@ -124,4 +126,6 @@ export type TInventoryItem = {
     keywords?: string[];
     required_certifications?: TRequiredCertificate[];
     authorized_roles?: UserRoleUUID[] | null;
+    kit_contents?: InventoryItemUUID[];
+    parent_kit?: InventoryItemUUID;
 };

From d4fba33c0011f58ebcc2df27c5a8fcd5576aa9fb Mon Sep 17 00:00:00 2001
From: FirePhoenix555 <53152322+FirePhoenix555@users.noreply.github.com>
Date: Sun, 15 Feb 2026 16:49:02 -0800
Subject: [PATCH 02/16] kit object fields properly working with mongodb

---
 server/models/inventory.model.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/models/inventory.model.ts b/server/models/inventory.model.ts
index 3d1e96bd..0fb39889 100644
--- a/server/models/inventory.model.ts
+++ b/server/models/inventory.model.ts
@@ -34,6 +34,8 @@ export const InventoryItem = new mongoose.Schema<TInventoryItem>(
             required: false,
         },
         authorized_roles: { type: [String], required: false },
+        kit_contents: { type: [String], required: false },
+        parent_kit: { type: String, required: false },
     },
     { collection: "inventory" },
 );

From 342e48e6bfdb4f8e6095d8ac4b552191110ab974 Mon Sep 17 00:00:00 2001
From: FirePhoenix555 <53152322+FirePhoenix555@users.noreply.github.com>
Date: Sun, 15 Feb 2026 16:50:18 -0800
Subject: [PATCH 03/16] can edit kit contents

---
 .../kiosks/admin/inventory/ItemEditorForm.tsx |  45 ++++-
 .../kiosks/admin/inventory/KitEditorModal.tsx | 178 ++++++++++++++++++
 2 files changed, 217 insertions(+), 6 deletions(-)
 create mode 100644 website/components/kiosks/admin/inventory/KitEditorModal.tsx

diff --git a/website/components/kiosks/admin/inventory/ItemEditorForm.tsx b/website/components/kiosks/admin/inventory/ItemEditorForm.tsx
index 6173fad4..f2f295e0 100644
--- a/website/components/kiosks/admin/inventory/ItemEditorForm.tsx
+++ b/website/components/kiosks/admin/inventory/ItemEditorForm.tsx
@@ -33,6 +33,7 @@ import {
     BookmarkIcon,
     UserIcon,
     GlobeAmericasIcon,
+    BriefcaseIcon,
 } from "@heroicons/react/24/solid";
 import { TUserRole } from "common/user";
 import ItemRoleIcon from "./ItemRoleIcon";
@@ -42,6 +43,7 @@ import { motion } from "motion/react";
 import ItemQuantityIcon from "./ItemQuantityIcon";
 import ItemLocationModal from "./ItemLocationModal";
 import { TArea } from "common/area";
+import KitEditorModal from "./KitEditorModal";
 
 // Define the mutation function that will run when the form is submitted
 const createUpdateItem = async ({
@@ -248,12 +250,14 @@ export default function ItemEditorForm({
     const [authrolesOpen, setAuthrolesOpen] = React.useState<boolean>(false); // whether authroles edit modal is open
     const [locationEditorOpen, setLocationEditorOpen] =
         React.useState<boolean>(false); // whether location editor modal is open
+    const [kitEditorOpen, setKitEditorOpen] = React.useState<boolean>(false); // whether kit content edit modal is open
 
     const reqcertsMutation = patchMutation(() => setReqcertsOpen(false));
     const authrolesMutation = patchMutation(() => setAuthrolesOpen(false));
     const locationEditorMutation = patchMutation(() =>
         setLocationEditorOpen(false),
     );
+    const kitEditorMutation = patchMutation(() => setKitEditorOpen(false));
 
     const [isNumericQuantity, setQtype] = React.useState<boolean>(
         item.quantity >= 0,
@@ -530,12 +534,7 @@ export default function ItemEditorForm({
                                     Area
                                 </span>
                             </SelectItem>
-                            <SelectItem
-                                key={ITEM_ROLE.KIT}
-                                textValue={"Kit"}
-                                isReadOnly
-                                className="text-default-400"
-                            >
+                            <SelectItem key={ITEM_ROLE.KIT} textValue={"Kit"}>
                                 <span className="flex gap-2 items-center">
                                     <ItemRoleIcon role={ITEM_ROLE.KIT} />
                                     Kit
@@ -689,6 +688,33 @@ export default function ItemEditorForm({
                                 {item.authorized_roles?.length ?? 0}
                             </Button>
                         </Tooltip>
+
+                        {item.role == ITEM_ROLE.KIT && (
+                            <Tooltip
+                                content={
+                                    isNew
+                                        ? "Create the item first, before editing kit contents."
+                                        : "Kit Contents"
+                                }
+                                className="w-fit p-2"
+                                delay={500}
+                                closeDelay={150}
+                                isDisabled={isDisabled}
+                            >
+                                <Button
+                                    // variant="flat"
+                                    color="primary"
+                                    onPress={() => !isNew && setKitEditorOpen(true)}
+                                    // isIconOnly
+                                    isDisabled={isDisabled}
+                                    className={isNew ? "opacity-disabled" : ""}
+                                    data-hover={!isNew && !isDisabled}
+                                >
+                                    <BriefcaseIcon className="size-7" />
+                                    {item.kit_contents?.length ?? 0}
+                                </Button>
+                            </Tooltip>
+                        )}
                         {/* </div> */}
                     </ButtonGroup>
                 </div>
@@ -748,6 +774,13 @@ export default function ItemEditorForm({
                 onOpenChange={setLocationEditorOpen}
                 patchMutation={locationEditorMutation}
             />
+            <KitEditorModal
+                key={"kitedit-" + item.uuid}
+                element={item}
+                isOpen={kitEditorOpen}
+                onOpenChange={setKitEditorOpen}
+                patchMutation={kitEditorMutation}
+            />
         </>
     );
 }
diff --git a/website/components/kiosks/admin/inventory/KitEditorModal.tsx b/website/components/kiosks/admin/inventory/KitEditorModal.tsx
new file mode 100644
index 00000000..8b9c39b7
--- /dev/null
+++ b/website/components/kiosks/admin/inventory/KitEditorModal.tsx
@@ -0,0 +1,178 @@
+import {
+    Button,
+    Modal,
+    Form,
+    ModalContent,
+    Input,
+} from "@heroui/react";
+import { PlusIcon, TrashIcon } from "@heroicons/react/24/outline";
+
+import React from "react";
+import { UseMutationResult } from "@tanstack/react-query";
+import clsx from "clsx";
+
+import { UUID } from "common/global";
+import { InventoryItemUUID } from "common/inventory";
+
+export default function KitEditorModal<
+    // Allow any type that has a uuid and optional required_certs list
+    T extends { uuid: UUID; kit_contents?: InventoryItemUUID[] },
+>({
+    element,
+    isOpen,
+    onOpenChange,
+    patchMutation,
+}: {
+    element: T;
+    isOpen: boolean;
+    onOpenChange: (isOpen: boolean) => void;
+    patchMutation: UseMutationResult<
+        T,
+        Error,
+        {
+            uuid: UUID;
+            patch: {
+                kit_contents?: InventoryItemUUID[];
+            };
+        }
+    >;
+}) {
+    const [hasEdits, setHasEdits] = React.useState<boolean>(false);
+    const [currentContents, setCurrentContents] = React.useState<
+        InventoryItemUUID[]
+    >(element.kit_contents || []);
+
+    const onSubmit = React.useCallback(
+        (e: React.FormEvent<HTMLFormElement>) => {
+            // Prevent default browser page refresh.
+            e.preventDefault();
+
+            if (!hasEdits) return;
+
+            patchMutation.reset();
+
+            // Run the mutation
+            patchMutation.mutate({
+                uuid: element.uuid,
+                patch: { kit_contents: currentContents },
+            });
+            onOpenChange(false);
+            setHasEdits(false);
+        },
+        [patchMutation, hasEdits, currentContents, element.uuid],
+    );
+
+    function wrapEdit( i: number ) {
+        return (val: InventoryItemUUID) => {
+            currentContents[i] = val;
+            setCurrentContents([...currentContents]); // update the instance list
+            setHasEdits(true);
+        };
+    }
+
+    const isValid = React.useMemo(() => {
+        for (let i = 0; i < currentContents.length; i++) {
+            if (currentContents[i] == "") {
+                return false; // invalid edit if either field is empty
+            }
+        }
+
+        return hasEdits; // otherwise, valid iff edits made
+    }, [hasEdits, currentContents]);
+
+    return (
+        <Modal
+            isOpen={isOpen}
+            onOpenChange={onOpenChange}
+            backdrop="blur"
+            size="3xl"
+        >
+            <ModalContent>
+                {(onClose) => (
+                    <Form
+                        onSubmit={onSubmit}
+                        className="flex flex-col gap-4 p-4"
+                    >
+                        <div className="text-lg font-semibold">
+                            Edit Kit Contents
+                        </div>
+
+                        {currentContents.map((content, i) => (
+                            <div
+                                className="flex flex-col sm:flex-row w-full gap-2 items-top"
+                                key={element.uuid + "-item-" + i + "-oo-" + currentContents.length}
+                            >
+
+                                <div className="w-full h-full flex flex-row gap-2 items-center">
+                                    <Input
+                                        type="text"
+                                        label="UUID"
+                                        name="uuid"
+                                        placeholder="UUID"
+                                        defaultValue={content}
+                                        onValueChange={wrapEdit(i)}
+                                        variant="faded"
+                                        color="primary"
+                                        size="md"
+                                        classNames={{
+                                            input: clsx([
+                                                "placeholder:text-default-500",
+                                                "placeholder:italic",
+                                                "text-default-700",
+                                            ]),
+                                        }}
+                                    />
+
+                                    <Button
+                                        variant="flat"
+                                        color="danger"
+                                        onPress={() => {
+                                            currentContents.splice(i, 1); // remove that cert
+                                            setCurrentContents([...currentContents]);
+                                            setHasEdits(true);
+                                        }}
+                                        isIconOnly
+                                    >
+                                        <TrashIcon className="size-6" />
+                                    </Button>
+                                </div>
+                            </div>
+                        ))}
+
+                        <div className="flex flex-row justify-between w-full gap-2">
+                            <Button
+                                variant="shadow"
+                                type="submit"
+                                color="primary"
+                                className="w-full sm:w-auto"
+                                isDisabled={!isValid}
+                                isLoading={patchMutation.isPending}
+                            >
+                                Submit
+                            </Button>
+                            <div className="flex gap-2">
+                                <Button
+                                    color="primary"
+                                    className="p-2 min-w-fit sm:w-1/3"
+                                    onPress={() => {
+                                        setCurrentContents([...currentContents, ""]); // add a copy of the emptyCert template
+                                        setHasEdits(true);
+                                    }}
+                                >
+                                    <PlusIcon className="size-6" />
+                                </Button>
+                                <Button
+                                    variant="flat"
+                                    color="danger"
+                                    onPress={onClose}
+                                >
+                                    Cancel
+                                </Button>
+                            </div>
+                        </div>
+                    </Form>
+                )}
+            </ModalContent>
+        </Modal>
+    );
+}

From 536fc5c0e2f2bbe7a0c0a5650cca0422f68fa18a Mon Sep 17 00:00:00 2001
From: FirePhoenix555 <53152322+FirePhoenix555@users.noreply.github.com>
Date: Sun, 15 Feb 2026 16:57:06 -0800
Subject: [PATCH 04/16] kit contents show in table

---
 .../components/kiosks/admin/inventory/InventoryTable.tsx  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/website/components/kiosks/admin/inventory/InventoryTable.tsx b/website/components/kiosks/admin/inventory/InventoryTable.tsx
index f0a01d4b..9cebc7f2 100644
--- a/website/components/kiosks/admin/inventory/InventoryTable.tsx
+++ b/website/components/kiosks/admin/inventory/InventoryTable.tsx
@@ -53,6 +53,7 @@ const baseColumns = [
     { name: "Locations", id: "locations" },
     { name: "Required Certs", id: "required_certifications" },
     { name: "Authorized Roles", id: "authorized_roles" },
+    { name: "Kit Contents", id: "kit_contents" },
     { name: "Keywords", id: "keywords" },
     { name: "Serial Number", id: "serial_number" },
     { name: "Reorder URL", id: "reorder_url" },
@@ -425,6 +426,13 @@ export default function InventoryTable({
                             ))}
                         </div>
                     ),
+                    kit_contents: (i) => (
+                        <div className="flex flex-col gap-1 overflow-auto max-w-1/2">
+                            {i.kit_contents?.map((content) => (
+                                <p>{content}</p>
+                            ))}
+                        </div>
+                    ),
                     access_type: (i) => (
                         <div className="text-default-700 bg-default-200 p-2 rounded-md">
                             {ITEM_ACCESS_DESCRIPTORS[i.access_type].label}

From cf4b00d8f9663b3e9d8fc7a45f3dc19abf357938 Mon Sep 17 00:00:00 2001
From: FirePhoenix555 <53152322+FirePhoenix555@users.noreply.github.com>
Date: Tue, 17 Feb 2026 19:54:20 -0800
Subject: [PATCH 05/16] more abilities in adding items to kits

- autocomplete element so you can search for items
- kit content items now update their parent uuid
---
 .../kiosks/admin/inventory/ItemEditor.tsx     |  3 +
 .../kiosks/admin/inventory/ItemEditorForm.tsx |  6 +-
 .../kiosks/admin/inventory/KitEditorModal.tsx | 99 ++++++++++++++-----
 website/pages/admin/InventoryKiosk.tsx        |  1 +
 4 files changed, 84 insertions(+), 25 deletions(-)

diff --git a/website/components/kiosks/admin/inventory/ItemEditor.tsx b/website/components/kiosks/admin/inventory/ItemEditor.tsx
index 195f2071..a019685e 100644
--- a/website/components/kiosks/admin/inventory/ItemEditor.tsx
+++ b/website/components/kiosks/admin/inventory/ItemEditor.tsx
@@ -16,6 +16,7 @@ export default function ItemEditor({
     certs,
     roles,
     areas,
+    items,
     isNew,
     isDisabled,
     onUpdate = () => {},
@@ -24,6 +25,7 @@ export default function ItemEditor({
     certs: TCertification[];
     roles: TUserRole[];
     areas: TArea[];
+    items: TInventoryItem[];
     isNew: boolean;
     isDisabled: boolean;
     onUpdate?: (isNew: boolean) => void;
@@ -45,6 +47,7 @@ export default function ItemEditor({
                 certs={certs}
                 roles={roles}
                 areas={areas}
+                items={items}
                 isMultiple={false}
                 isDisabled={isDisabled}
                 isNew={isNew}
diff --git a/website/components/kiosks/admin/inventory/ItemEditorForm.tsx b/website/components/kiosks/admin/inventory/ItemEditorForm.tsx
index f2f295e0..66f64d88 100644
--- a/website/components/kiosks/admin/inventory/ItemEditorForm.tsx
+++ b/website/components/kiosks/admin/inventory/ItemEditorForm.tsx
@@ -91,6 +91,7 @@ export default function ItemEditorForm({
     certs,
     roles,
     areas,
+    items,
     isMultiple,
     isDisabled,
     isNew,
@@ -100,6 +101,7 @@ export default function ItemEditorForm({
     certs: TCertification[];
     roles: TUserRole[];
     areas: TArea[];
+    items: TInventoryItem[];
     isMultiple: boolean;
     isDisabled: boolean;
     isNew: boolean;
@@ -777,9 +779,11 @@ export default function ItemEditorForm({
             <KitEditorModal
                 key={"kitedit-" + item.uuid}
                 element={item}
+                items={items}
                 isOpen={kitEditorOpen}
                 onOpenChange={setKitEditorOpen}
-                patchMutation={kitEditorMutation}
+                kitPatchMutation={kitEditorMutation}
+                contentPatchMutation={kitEditorMutation}
             />
         </>
     );
diff --git a/website/components/kiosks/admin/inventory/KitEditorModal.tsx b/website/components/kiosks/admin/inventory/KitEditorModal.tsx
index 8b9c39b7..b627712f 100644
--- a/website/components/kiosks/admin/inventory/KitEditorModal.tsx
+++ b/website/components/kiosks/admin/inventory/KitEditorModal.tsx
@@ -4,6 +4,8 @@ import {
     Form,
     ModalContent,
     Input,
+    Autocomplete,
+    AutocompleteItem,
 } from "@heroui/react";
 import { PlusIcon, TrashIcon } from "@heroicons/react/24/outline";
 
@@ -12,21 +14,24 @@ import { UseMutationResult } from "@tanstack/react-query";
 import clsx from "clsx";
 
 import { UUID } from "common/global";
-import { InventoryItemUUID } from "common/inventory";
+import { InventoryItemUUID, ITEM_ROLE, TInventoryItem } from "../../../../../common/inventory";
 
 export default function KitEditorModal<
     // Allow any type that has a uuid and optional required_certs list
     T extends { uuid: UUID; kit_contents?: InventoryItemUUID[] },
 >({
     element,
+    items,
     isOpen,
     onOpenChange,
-    patchMutation,
+    kitPatchMutation,
+    contentPatchMutation,
 }: {
     element: T;
+    items: TInventoryItem[];
     isOpen: boolean;
     onOpenChange: (isOpen: boolean) => void;
-    patchMutation: UseMutationResult<
+    kitPatchMutation: UseMutationResult<
         T,
         Error,
         {
@@ -36,11 +41,28 @@ export default function KitEditorModal<
             };
         }
     >;
+    contentPatchMutation: UseMutationResult<
+        T,
+        Error,
+        {
+            uuid: UUID;
+            patch: {
+                parent_kit?: InventoryItemUUID;
+            };
+        }
+    >;
 }) {
+    items = items.filter(itm => 
+        itm.role == ITEM_ROLE.MATERIAL ||
+        itm.role == ITEM_ROLE.TOOL ||
+        itm.role == ITEM_ROLE.MACHINE
+    );
+
     const [hasEdits, setHasEdits] = React.useState<boolean>(false);
     const [currentContents, setCurrentContents] = React.useState<
         InventoryItemUUID[]
     >(element.kit_contents || []);
+    const [removedContents, setRemovedContents] = React.useState<InventoryItemUUID[]>([]);
 
     const onSubmit = React.useCallback(
         (e: React.FormEvent<HTMLFormElement>) => {
@@ -49,22 +71,43 @@ export default function KitEditorModal<
 
             if (!hasEdits) return;
 
-            patchMutation.reset();
+            // Update "parent_kit" attribute of each (added or removed) item
+
+            for (const content of currentContents) {
+                contentPatchMutation.reset();
+                contentPatchMutation.mutate({
+                    uuid: content,
+                    patch: { parent_kit: element.uuid },
+                });
+            }
+
+            for (const content of removedContents) {
+                contentPatchMutation.reset();
+                contentPatchMutation.mutate({
+                    uuid: content,
+                    patch: { parent_kit: "" },
+                });
+            }
+
+            kitPatchMutation.reset();
 
             // Run the mutation
-            patchMutation.mutate({
+            kitPatchMutation.mutate({
                 uuid: element.uuid,
                 patch: { kit_contents: currentContents },
             });
+
             onOpenChange(false);
             setHasEdits(false);
         },
-        [patchMutation, hasEdits, currentContents, element.uuid],
+        [kitPatchMutation, contentPatchMutation, hasEdits, currentContents, removedContents, element.uuid],
     );
 
     function wrapEdit( i: number ) {
-        return (val: InventoryItemUUID) => {
-            currentContents[i] = val;
+        return (val: any) => {
+            removedContents.push(currentContents[i]); // old item has been removed from the kit
+            currentContents[i] = val as InventoryItemUUID;
+            setRemovedContents(removedContents.filter(c => !currentContents.includes(c))); // if a prev removed item was added back, it shouldn't be marked removed
             setCurrentContents([...currentContents]); // update the instance list
             setHasEdits(true);
         };
@@ -104,29 +147,37 @@ export default function KitEditorModal<
                             >
 
                                 <div className="w-full h-full flex flex-row gap-2 items-center">
-                                    <Input
-                                        type="text"
-                                        label="UUID"
-                                        name="uuid"
-                                        placeholder="UUID"
-                                        defaultValue={content}
-                                        onValueChange={wrapEdit(i)}
+                                    <Autocomplete
+                                        label="Item"
+                                        name={`item-${i}`}
+                                        placeholder="Search for an item..."
+                                        defaultSelectedKey={content}
+                                        onSelectionChange={wrapEdit(i)}
+                                        disabledKeys={[...currentContents.filter((c, j) => j != i), ...(items.filter(itm => itm.parent_kit != "" && itm.parent_kit != element.uuid) as any[])]}
                                         variant="faded"
                                         color="primary"
                                         size="md"
-                                        classNames={{
-                                            input: clsx([
-                                                "placeholder:text-default-500",
-                                                "placeholder:italic",
-                                                "text-default-700",
-                                            ]),
-                                        }}
-                                    />
+                                        isRequired={true}
+                                        
+                                        // classNames={{
+                                        //     input: clsx([
+                                        //         "placeholder:text-default-500",
+                                        //         "placeholder:italic",
+                                        //         "text-default-700",
+                                        //     ]),
+                                        // }}
+                                    >
+                                        {items.map((itm) => (
+                                            <AutocompleteItem key={itm.uuid}>{itm.name}</AutocompleteItem>
+                                        ))}
+                                    </Autocomplete>
 
                                     <Button
                                         variant="flat"
                                         color="danger"
                                         onPress={() => {
+                                            removedContents.push(currentContents[i]);
+                                            setRemovedContents([...removedContents]);
                                             currentContents.splice(i, 1); // remove that cert
                                             setCurrentContents([...currentContents]);
                                             setHasEdits(true);
@@ -146,7 +197,7 @@ export default function KitEditorModal<
                                 color="primary"
                                 className="w-full sm:w-auto"
                                 isDisabled={!isValid}
-                                isLoading={patchMutation.isPending}
+                                isLoading={kitPatchMutation.isPending || contentPatchMutation.isPending}
                             >
                                 Submit
                             </Button>
diff --git a/website/pages/admin/InventoryKiosk.tsx b/website/pages/admin/InventoryKiosk.tsx
index a88cfd99..f6c70bea 100644
--- a/website/pages/admin/InventoryKiosk.tsx
+++ b/website/pages/admin/InventoryKiosk.tsx
@@ -131,6 +131,7 @@ export default function InventoryKiosk() {
                     certs={certs}
                     roles={roles}
                     areas={areas}
+                    items={inventory}
                     isDisabled={
                         !isNewItem &&
                         (!item ||

From f9a8d8c21d9a0875ae08113df6307563146dff08 Mon Sep 17 00:00:00 2001
From: FirePhoenix555 <53152322+FirePhoenix555@users.noreply.github.com>
Date: Tue, 17 Feb 2026 19:59:45 -0800
Subject: [PATCH 06/16] kit items don't show in inv table

---
 website/components/kiosks/admin/inventory/InventoryTable.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/components/kiosks/admin/inventory/InventoryTable.tsx b/website/components/kiosks/admin/inventory/InventoryTable.tsx
index 9cebc7f2..1aabc5e3 100644
--- a/website/components/kiosks/admin/inventory/InventoryTable.tsx
+++ b/website/components/kiosks/admin/inventory/InventoryTable.tsx
@@ -326,7 +326,7 @@ export default function InventoryTable({
                 </div>
             </div>
             <MAKETable
-                content={filteredItems}
+                content={filteredItems.filter(item => !item.parent_kit)}
                 columns={columns}
                 visibleColumns={visibleColumns}
                 selectedKeys={selectedKeys}

From bbdeadfb52b6f438414aa1c2b99e8e394a625e21 Mon Sep 17 00:00:00 2001
From: FirePhoenix555 <53152322+FirePhoenix555@users.noreply.github.com>
Date: Sat, 21 Feb 2026 19:13:21 -0800
Subject: [PATCH 07/16] 404 bugfix

---
 .../kiosks/admin/inventory/KitEditorModal.tsx          | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/website/components/kiosks/admin/inventory/KitEditorModal.tsx b/website/components/kiosks/admin/inventory/KitEditorModal.tsx
index b627712f..d35f4e03 100644
--- a/website/components/kiosks/admin/inventory/KitEditorModal.tsx
+++ b/website/components/kiosks/admin/inventory/KitEditorModal.tsx
@@ -105,10 +105,16 @@ export default function KitEditorModal<
 
     function wrapEdit( i: number ) {
         return (val: any) => {
-            removedContents.push(currentContents[i]); // old item has been removed from the kit
+            let oldContent = currentContents[i];
             currentContents[i] = val as InventoryItemUUID;
-            setRemovedContents(removedContents.filter(c => !currentContents.includes(c))); // if a prev removed item was added back, it shouldn't be marked removed
             setCurrentContents([...currentContents]); // update the instance list
+
+            // if not being set for the first time
+            if (oldContent != "") {
+                removedContents.push(oldContent); // old item has been removed from the kit
+                setRemovedContents(removedContents.filter(c => !currentContents.includes(c))); // if a prev removed item was added back, it shouldn't be marked removed
+            }
+
             setHasEdits(true);
         };
     }

From 60e80d06a3f7dd2fbd17330152b6699147087ade Mon Sep 17 00:00:00 2001
From: FirePhoenix555 <53152322+FirePhoenix555@users.noreply.github.com>
Date: Sat, 21 Feb 2026 19:17:45 -0800
Subject: [PATCH 08/16] customizable if items in kits show in inv table

---
 website/components/kiosks/admin/inventory/InventoryTable.tsx | 4 +++-
 website/pages/admin/InventoryKiosk.tsx                       | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/website/components/kiosks/admin/inventory/InventoryTable.tsx b/website/components/kiosks/admin/inventory/InventoryTable.tsx
index 1aabc5e3..78493b79 100644
--- a/website/components/kiosks/admin/inventory/InventoryTable.tsx
+++ b/website/components/kiosks/admin/inventory/InventoryTable.tsx
@@ -83,6 +83,7 @@ export default function InventoryTable({
         "authorized_roles",
     ],
     customColumnComponents,
+    showsKitContents = false,
     editable = false,
     emptyContent,
     onCreate = undefined,
@@ -104,6 +105,7 @@ export default function InventoryTable({
     customColumnComponents?: {
         [column_id: string]: (item: TInventoryItem) => React.ReactNode;
     };
+    showsKitContents?: boolean;
     emptyContent?: string;
     editable?: React.ReactNode;
     onCreate?: (state: boolean) => void;
@@ -326,7 +328,7 @@ export default function InventoryTable({
                 </div>
             </div>
             <MAKETable
-                content={filteredItems.filter(item => !item.parent_kit)}
+                content={showsKitContents ? filteredItems : filteredItems.filter(item => !item.parent_kit)}
                 columns={columns}
                 visibleColumns={visibleColumns}
                 selectedKeys={selectedKeys}
diff --git a/website/pages/admin/InventoryKiosk.tsx b/website/pages/admin/InventoryKiosk.tsx
index f6c70bea..e5ebb75f 100644
--- a/website/pages/admin/InventoryKiosk.tsx
+++ b/website/pages/admin/InventoryKiosk.tsx
@@ -152,6 +152,7 @@ export default function InventoryKiosk() {
                     selectedKeys={selectedItems}
                     onSelectionChange={betterSelectionChange}
                     isLoading={inventoryLoading}
+                    showsKitContents={true}
                     editable
                     onCreate={setIsNewItem}
                 />

From 6992f6b640fc39376264b919114887a56005f777 Mon Sep 17 00:00:00 2001
From: FirePhoenix555 <53152322+FirePhoenix555@users.noreply.github.com>
Date: Sat, 21 Feb 2026 19:23:01 -0800
Subject: [PATCH 09/16] inv table shows kit content names (rather than uuids)

---
 website/components/kiosks/admin/inventory/InventoryTable.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/website/components/kiosks/admin/inventory/InventoryTable.tsx b/website/components/kiosks/admin/inventory/InventoryTable.tsx
index 78493b79..36e92b81 100644
--- a/website/components/kiosks/admin/inventory/InventoryTable.tsx
+++ b/website/components/kiosks/admin/inventory/InventoryTable.tsx
@@ -431,7 +431,9 @@ export default function InventoryTable({
                     kit_contents: (i) => (
                         <div className="flex flex-col gap-1 overflow-auto max-w-1/2">
                             {i.kit_contents?.map((content) => (
-                                <p>{content}</p>
+                                <div key={i.uuid + "-item-" + content}>
+                                    {inventory.find(a => a.uuid == content)?.name}
+                                </div>
                             ))}
                         </div>
                     ),

From 57b696350d3831de3fa0a9e7ba0433da7b2bc4e3 Mon Sep 17 00:00:00 2001
From: FirePhoenix555 <53152322+FirePhoenix555@users.noreply.github.com>
Date: Sat, 21 Feb 2026 20:40:11 -0800
Subject: [PATCH 10/16] can quick jump to kit content / parent kit

---
 .../kiosks/admin/inventory/ItemEditor.tsx     |  3 ++
 .../kiosks/admin/inventory/ItemEditorForm.tsx | 47 +++++++++++++++++++
 .../kiosks/admin/inventory/KitEditorModal.tsx | 16 ++++++-
 website/pages/admin/InventoryKiosk.tsx        |  1 +
 4 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/website/components/kiosks/admin/inventory/ItemEditor.tsx b/website/components/kiosks/admin/inventory/ItemEditor.tsx
index a019685e..a9c38aec 100644
--- a/website/components/kiosks/admin/inventory/ItemEditor.tsx
+++ b/website/components/kiosks/admin/inventory/ItemEditor.tsx
@@ -20,6 +20,7 @@ export default function ItemEditor({
     isNew,
     isDisabled,
     onUpdate = () => {},
+    setSelectedItem,
 }: {
     item: TInventoryItem;
     certs: TCertification[];
@@ -29,6 +30,7 @@ export default function ItemEditor({
     isNew: boolean;
     isDisabled: boolean;
     onUpdate?: (isNew: boolean) => void;
+    setSelectedItem: (s: Set<string>) => void;
 }) {
     const key = isNew ? "new" : item.uuid;
 
@@ -52,6 +54,7 @@ export default function ItemEditor({
                 isDisabled={isDisabled}
                 isNew={isNew}
                 onUpdate={onUpdate}
+                setSelectedItem={setSelectedItem}
             />
             <motion.div
                 initial={{
diff --git a/website/components/kiosks/admin/inventory/ItemEditorForm.tsx b/website/components/kiosks/admin/inventory/ItemEditorForm.tsx
index 66f64d88..f5ab5bd8 100644
--- a/website/components/kiosks/admin/inventory/ItemEditorForm.tsx
+++ b/website/components/kiosks/admin/inventory/ItemEditorForm.tsx
@@ -34,6 +34,7 @@ import {
     UserIcon,
     GlobeAmericasIcon,
     BriefcaseIcon,
+    EyeIcon,
 } from "@heroicons/react/24/solid";
 import { TUserRole } from "common/user";
 import ItemRoleIcon from "./ItemRoleIcon";
@@ -96,6 +97,7 @@ export default function ItemEditorForm({
     isDisabled,
     isNew,
     onUpdate = () => {},
+    setSelectedItem,
 }: {
     item: TInventoryItem;
     certs: TCertification[];
@@ -106,6 +108,7 @@ export default function ItemEditorForm({
     isDisabled: boolean;
     isNew: boolean;
     onUpdate?: (isNew: boolean) => void; // Function to run when the item is updated
+    setSelectedItem: (s: Set<string>) => void;
 }) {
     const [UUID, setUUID] = React.useState<string>(
         isNew ? crypto.randomUUID() : item.uuid,
@@ -606,6 +609,49 @@ export default function ItemEditorForm({
                             ]),
                         }}
                     />
+
+                    <div className="flex flex-row items-center">
+                        <Textarea
+                            type="text"
+                            label="Parent Kit"
+                            name="parent_kit"
+                            placeholder={placeholder("No parent kit")}
+                            isDisabled={true}
+                            defaultValue={items.find(i => i.uuid == item.parent_kit)?.name}
+                            minRows={1}
+                            variant="faded"
+                            color="primary"
+                            size="md"
+                            classNames={{
+                                input: clsx([
+                                    "placeholder:text-default-500",
+                                    "placeholder:italic",
+                                    "text-default-700",
+                                ]),
+                            }}
+                        />
+
+                        <Tooltip
+                            content="View parent kit"
+                            className="w-fit p-2"
+                            delay={500}
+                            closeDelay={150}
+                            isDisabled={isDisabled}
+                        >
+                            <Button
+                                isIconOnly
+                                size="lg"
+                                color="primary"
+                                variant="flat"
+                                isDisabled={isDisabled || !item.parent_kit}
+                                onPress={() => setSelectedItem(new Set([item.parent_kit ?? ""]))}
+                                className="ml-2"
+                            >
+                                <EyeIcon className="size-5" /> {/* haha eyecon */}
+                            </Button>
+                        </Tooltip>
+                    </div>
+
                     <Divider className="hidden sm:block h-[1px] bg-default-400" />
                     <ButtonGroup
                         size="lg"
@@ -784,6 +830,7 @@ export default function ItemEditorForm({
                 onOpenChange={setKitEditorOpen}
                 kitPatchMutation={kitEditorMutation}
                 contentPatchMutation={kitEditorMutation}
+                setSelectedItem={setSelectedItem}
             />
         </>
     );
diff --git a/website/components/kiosks/admin/inventory/KitEditorModal.tsx b/website/components/kiosks/admin/inventory/KitEditorModal.tsx
index d35f4e03..2ec6b28c 100644
--- a/website/components/kiosks/admin/inventory/KitEditorModal.tsx
+++ b/website/components/kiosks/admin/inventory/KitEditorModal.tsx
@@ -7,7 +7,7 @@ import {
     Autocomplete,
     AutocompleteItem,
 } from "@heroui/react";
-import { PlusIcon, TrashIcon } from "@heroicons/react/24/outline";
+import { EyeIcon, PlusIcon, TrashIcon } from "@heroicons/react/24/outline";
 
 import React from "react";
 import { UseMutationResult } from "@tanstack/react-query";
@@ -26,6 +26,7 @@ export default function KitEditorModal<
     onOpenChange,
     kitPatchMutation,
     contentPatchMutation,
+    setSelectedItem,
 }: {
     element: T;
     items: TInventoryItem[];
@@ -51,6 +52,7 @@ export default function KitEditorModal<
             };
         }
     >;
+    setSelectedItem: (s: Set<string>) => void;
 }) {
     items = items.filter(itm => 
         itm.role == ITEM_ROLE.MATERIAL ||
@@ -178,6 +180,18 @@ export default function KitEditorModal<
                                         ))}
                                     </Autocomplete>
 
+                                    <Button
+                                        isIconOnly
+                                        color="primary"
+                                        variant="flat"
+                                        onPress={() => {
+                                            setSelectedItem(new Set([content ?? ""]));
+                                            onClose();
+                                        }}
+                                    >
+                                        <EyeIcon className="size-6" /> {/* haha eyecon */}
+                                    </Button>
+
                                     <Button
                                         variant="flat"
                                         color="danger"
diff --git a/website/pages/admin/InventoryKiosk.tsx b/website/pages/admin/InventoryKiosk.tsx
index e5ebb75f..d6801b80 100644
--- a/website/pages/admin/InventoryKiosk.tsx
+++ b/website/pages/admin/InventoryKiosk.tsx
@@ -140,6 +140,7 @@ export default function InventoryKiosk() {
                     }
                     isNew={isNewItem}
                     onUpdate={() => setIsNewItem(false)}
+                    setSelectedItem={onSelectionChange}
                 />
                 <InventoryTable
                     requestingUser={requestingUser}

From 0f71661b376b705481d9be045ebc9fe3c115b583 Mon Sep 17 00:00:00 2001
From: FirePhoenix555 <53152322+FirePhoenix555@users.noreply.github.com>
Date: Sat, 21 Feb 2026 20:55:50 -0800
Subject: [PATCH 11/16] kit content locations show in table as "in (kit)"

---
 .../kiosks/admin/inventory/InventoryTable.tsx | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/website/components/kiosks/admin/inventory/InventoryTable.tsx b/website/components/kiosks/admin/inventory/InventoryTable.tsx
index 36e92b81..14d1403d 100644
--- a/website/components/kiosks/admin/inventory/InventoryTable.tsx
+++ b/website/components/kiosks/admin/inventory/InventoryTable.tsx
@@ -396,13 +396,31 @@ export default function InventoryTable({
                     },
                     locations: (i) => (
                         <div className="flex flex-col gap-2 min-w-max">
-                            {i.locations.map((location, index) => (
-                                <ItemLocationChip
-                                    key={`${location.area}-${index}`}
-                                    location={location}
-                                    areas={areas}
-                                />
-                            ))}
+                            {i.parent_kit ? (() => {
+                                let parent_kit = inventory.find(k => k.uuid == i.parent_kit);
+
+                                return (
+                                    parent_kit?.locations.map((location, index) => (
+                                        <ItemLocationChip
+                                            key={`${i.uuid}-location`}
+                                            location={{
+                                                area: location.area,
+                                                specific: `In ${parent_kit?.name}`,
+                                                container: ""
+                                            }}
+                                            areas={areas}
+                                        />
+                                    ))
+                                );
+                            })() : (
+                                i.locations.map((location, index) => (
+                                    <ItemLocationChip
+                                        key={`${location.area}-${index}`}
+                                        location={location}
+                                        areas={areas}
+                                    />
+                                ))
+                            )}
                         </div>
                     ),
                     required_certifications: (i) => (

From 7ada847bbf5c084d534a508f2dc25d3685352349 Mon Sep 17 00:00:00 2001
From: FirePhoenix555 <53152322+FirePhoenix555@users.noreply.github.com>
Date: Tue, 10 Mar 2026 19:58:19 -0700
Subject: [PATCH 12/16] reworked reqcerts to include parent kit certs if
 applicable

---
 server/controllers/checkout.controller.ts     | 10 +++++++-
 server/controllers/embed.controller.ts        |  1 +
 server/controllers/inventory.controller.ts    |  1 +
 .../kiosks/admin/certifications/CTable.tsx    |  1 +
 .../certifications/RequiredCertsModal.tsx     | 24 ++++++++++++++++++
 .../kiosks/admin/checkouts/CheckoutTable.tsx  |  1 +
 .../kiosks/admin/inventory/InventoryTable.tsx |  8 +++---
 .../kiosks/admin/inventory/ItemEditorForm.tsx |  6 ++++-
 .../kiosks/admin/inventory/ItemInfo.tsx       |  7 +++++-
 .../kiosks/admin/machines/Machine.tsx         |  1 +
 .../kiosks/admin/restock/RestockTable.tsx     |  1 +
 .../kiosks/admin/workshops/WorkshopTable.tsx  |  1 +
 website/pages/admin/CheckoutsKiosk.tsx        |  1 +
 website/utils.tsx                             | 25 +++++++++++++++++++
 14 files changed, 82 insertions(+), 6 deletions(-)

diff --git a/server/controllers/checkout.controller.ts b/server/controllers/checkout.controller.ts
index 8ff7746d..766d1a8a 100644
--- a/server/controllers/checkout.controller.ts
+++ b/server/controllers/checkout.controller.ts
@@ -35,6 +35,7 @@ import {
 } from "./machine.controller";
 import { clearAreaReservations, patchArea } from "./area.controller";
 import { getConfig } from "./config.controller";
+import { mergeRequiredCerts } from "../../website/utils";
 
 /**
  * Get all checkouts in the database
@@ -132,7 +133,14 @@ export async function validateCheckout(
                 };
             }
         }
-        for (const cert of item.required_certifications || []) {
+
+        const parent_kit = await Inventory.findOne({
+            uuid: item.parent_kit
+        });
+
+        const mergedCerts = mergeRequiredCerts(item.required_certifications || [], parent_kit?.required_certifications || []);
+
+        for (const cert of mergedCerts) {
             // User has no certs, so must not have the required certs.
             if (!user.active_certificates) {
                 return {
diff --git a/server/controllers/embed.controller.ts b/server/controllers/embed.controller.ts
index 1320ad05..90912abe 100644
--- a/server/controllers/embed.controller.ts
+++ b/server/controllers/embed.controller.ts
@@ -85,6 +85,7 @@ export async function getEmbedsVisibleToUser(
     ]);
 
     // Consider filter out items that require certifications the user doesn't have
+    // Should potentially check parent kit's required certifications as well?
     /*.filter((item) =>
         item.required_certifications?.every((cert) =>
             cert_uuids.includes(cert.certification_uuid),
diff --git a/server/controllers/inventory.controller.ts b/server/controllers/inventory.controller.ts
index ee932f2c..ae9ae7ab 100644
--- a/server/controllers/inventory.controller.ts
+++ b/server/controllers/inventory.controller.ts
@@ -94,6 +94,7 @@ export async function getInventoryVisibleToUser(
     ]);
 
     // Consider filter out items that require certifications the user doesn't have
+    // Should potentially check parent kit's required certifications as well?
     /*.filter((item) =>
         item.required_certifications?.every((cert) =>
             cert_uuids.includes(cert.certification_uuid),
diff --git a/website/components/kiosks/admin/certifications/CTable.tsx b/website/components/kiosks/admin/certifications/CTable.tsx
index 91cc1ff6..bb42e9fe 100644
--- a/website/components/kiosks/admin/certifications/CTable.tsx
+++ b/website/components/kiosks/admin/certifications/CTable.tsx
@@ -405,6 +405,7 @@ export default function CertificationsTable({
                     key={"certdocprereq-" + certOpenDoc.uuid}
                     certifications={certs}
                     element={certOpenDoc}
+                    parentKitCerts={undefined}
                     isOpen={prereqOpen}
                     onOpenChange={setPrereqOpen}
                     patchMutation={mutation}
diff --git a/website/components/kiosks/admin/certifications/RequiredCertsModal.tsx b/website/components/kiosks/admin/certifications/RequiredCertsModal.tsx
index 6db20566..79646b64 100644
--- a/website/components/kiosks/admin/certifications/RequiredCertsModal.tsx
+++ b/website/components/kiosks/admin/certifications/RequiredCertsModal.tsx
@@ -5,6 +5,7 @@ import {
     ModalContent,
     Input,
     NumberInput,
+    Divider,
 } from "@heroui/react";
 import { PlusIcon, TrashIcon } from "@heroicons/react/24/outline";
 
@@ -15,6 +16,7 @@ import clsx from "clsx";
 import { TRequiredCertificate, TCertification } from "common/certification";
 import { UUID } from "common/global";
 import { CertSelect } from "./CertSelect";
+import CertificationTag from "./CertificationTag";
 
 const emptyCert: TRequiredCertificate = {
     certification_uuid: "",
@@ -26,12 +28,14 @@ export default function RequiredCertsModal<
     T extends { uuid: UUID; required_certifications?: TRequiredCertificate[] },
 >({
     element,
+    parentKitCerts,
     certifications,
     isOpen,
     onOpenChange,
     patchMutation,
 }: {
     element: T;
+    parentKitCerts: TRequiredCertificate[] | undefined;
     certifications: TCertification[];
     isOpen: boolean;
     onOpenChange: (isOpen: boolean) => void;
@@ -190,6 +194,26 @@ export default function RequiredCertsModal<
                             </div>
                         ))}
 
+                        {parentKitCerts && (<>
+                            {currentCerts.length != 0 && (<Divider className="hidden sm:block h-[1px] bg-default-400" />)}
+                            <div className="w-full">
+                                <div className="text-lg font-semibold text-center">
+                                    Parent Kit Required Certifications
+                                </div>
+                                <div className="grid grid-cols-2 w-full gap-y-3 justify-evenly p-4">
+                                    {parentKitCerts?.map((cert, i) => (<div className={`flex content-center justify-center col-span-${i < parentKitCerts?.length - parentKitCerts?.length % 2 ? 1 : 2}`}>
+                                        <CertificationTag
+                                            cert_uuid={cert.certification_uuid}
+                                            certifications={certifications}
+                                            showVisibility={false}
+                                            level={cert.required_level}
+                                        >
+                                        </CertificationTag>
+                                    </div>))}
+                                </div>
+                            </div>
+                        </>)}
+
                         <div className="flex flex-row justify-between w-full gap-2">
                             <Button
                                 variant="shadow"
diff --git a/website/components/kiosks/admin/checkouts/CheckoutTable.tsx b/website/components/kiosks/admin/checkouts/CheckoutTable.tsx
index a811ffcf..567c4eab 100644
--- a/website/components/kiosks/admin/checkouts/CheckoutTable.tsx
+++ b/website/components/kiosks/admin/checkouts/CheckoutTable.tsx
@@ -391,6 +391,7 @@ export default function CheckoutTable({
                                         item_data={inventory.find(
                                             (item) => item.uuid === i.item_uuid,
                                         )}
+                                        inventory={inventory}
                                         areas={areas}
                                         certs={certs}
                                         quantity={i.quantity}
diff --git a/website/components/kiosks/admin/inventory/InventoryTable.tsx b/website/components/kiosks/admin/inventory/InventoryTable.tsx
index 14d1403d..aef7e7cb 100644
--- a/website/components/kiosks/admin/inventory/InventoryTable.tsx
+++ b/website/components/kiosks/admin/inventory/InventoryTable.tsx
@@ -28,10 +28,10 @@ import MAKETable from "../../../Table";
 import Fuse from "fuse.js";
 import React from "react";
 import { TUser, TUserRole } from "common/user";
-import { TCertification } from "common/certification";
+import { TCertification, TRequiredCertificate } from "common/certification";
 import { TRestockRequest } from "../../../../../common/restock";
 import { API_SCOPE } from "../../../../../common/global.ts";
-import { verifyScopes } from "../../../../utils.tsx";
+import { mergeRequiredCerts, verifyScopes } from "../../../../utils.tsx";
 import clsx from "clsx";
 import CertificationTag from "../certifications/CertificationTag";
 import UserRole from "../../../user/UserRole";
@@ -425,7 +425,9 @@ export default function InventoryTable({
                     ),
                     required_certifications: (i) => (
                         <div className="flex flex-col gap-1 overflow-auto max-w-1/2">
-                            {i.required_certifications?.map((c) => (
+                            {mergeRequiredCerts(i.required_certifications,
+                                inventory.find(k => k.uuid == i.parent_kit)?.required_certifications
+                            )?.map((c) => (
                                 <CertificationTag
                                     key={c.certification_uuid}
                                     cert_uuid={c.certification_uuid}
diff --git a/website/components/kiosks/admin/inventory/ItemEditorForm.tsx b/website/components/kiosks/admin/inventory/ItemEditorForm.tsx
index f5ab5bd8..6bb391d2 100644
--- a/website/components/kiosks/admin/inventory/ItemEditorForm.tsx
+++ b/website/components/kiosks/admin/inventory/ItemEditorForm.tsx
@@ -45,6 +45,7 @@ import ItemQuantityIcon from "./ItemQuantityIcon";
 import ItemLocationModal from "./ItemLocationModal";
 import { TArea } from "common/area";
 import KitEditorModal from "./KitEditorModal";
+import { mergeRequiredCerts } from "../../../../utils";
 
 // Define the mutation function that will run when the form is submitted
 const createUpdateItem = async ({
@@ -268,6 +269,8 @@ export default function ItemEditorForm({
         item.quantity >= 0,
     ); // type of quantity (true: numerical, false: categorical)
 
+    const parent_kit = items.find(i => i.uuid == item.parent_kit);
+
     return (
         <>
             <Form
@@ -708,7 +711,7 @@ export default function ItemEditorForm({
                                 data-hover={!isNew && !isDisabled}
                             >
                                 <BookmarkIcon className="size-7" />
-                                {item.required_certifications?.length ?? 0}
+                                {mergeRequiredCerts(item.required_certifications || [], parent_kit?.required_certifications || []).length}
                             </Button>
                         </Tooltip>
 
@@ -802,6 +805,7 @@ export default function ItemEditorForm({
                 key={"certreq-" + item.uuid}
                 certifications={certs}
                 element={item}
+                parentKitCerts={parent_kit?.required_certifications}
                 isOpen={reqcertsOpen}
                 onOpenChange={setReqcertsOpen}
                 patchMutation={reqcertsMutation}
diff --git a/website/components/kiosks/admin/inventory/ItemInfo.tsx b/website/components/kiosks/admin/inventory/ItemInfo.tsx
index ec5ce838..389121d2 100644
--- a/website/components/kiosks/admin/inventory/ItemInfo.tsx
+++ b/website/components/kiosks/admin/inventory/ItemInfo.tsx
@@ -15,14 +15,17 @@ import CertificationTag from "../certifications/CertificationTag";
 import { TCertification } from "common/certification";
 import { XMarkIcon } from "@heroicons/react/24/outline";
 import { Link } from "react-router-dom";
+import { mergeRequiredCerts } from "../../../../utils";
 
 export default function ItemInfo({
     item_data,
+    inventory,
     areas,
     certs,
     quantity,
 }: {
     item_data?: TInventoryItem;
+    inventory: TInventoryItem[];
     areas: TArea[];
     certs: TCertification[];
     quantity?: number;
@@ -99,7 +102,9 @@ export default function ItemInfo({
                                     <div>No Required Certifications</div>
                                 ) : (
                                     <div className="flex flex-row flex-wrap gap-1 overflow-auto max-w-1/2 items-center justify-center">
-                                        {item_data.required_certifications?.map(
+                                        {mergeRequiredCerts(item_data.required_certifications,
+                                            inventory.find(k => k.uuid == item_data.parent_kit)?.required_certifications
+                                        )?.map(
                                             (c) => (
                                                 <CertificationTag
                                                     key={c.certification_uuid}
diff --git a/website/components/kiosks/admin/machines/Machine.tsx b/website/components/kiosks/admin/machines/Machine.tsx
index 21cce3fa..4a70b5ea 100644
--- a/website/components/kiosks/admin/machines/Machine.tsx
+++ b/website/components/kiosks/admin/machines/Machine.tsx
@@ -197,6 +197,7 @@ export default function Machine({
                                     </Button>
                                     <RequiredCertsModal
                                         element={machine}
+                                        parentKitCerts={undefined}
                                         certifications={certifications}
                                         isOpen={certModal}
                                         onOpenChange={certModalOpenChange}
diff --git a/website/components/kiosks/admin/restock/RestockTable.tsx b/website/components/kiosks/admin/restock/RestockTable.tsx
index 88359bef..14ed7cdb 100644
--- a/website/components/kiosks/admin/restock/RestockTable.tsx
+++ b/website/components/kiosks/admin/restock/RestockTable.tsx
@@ -534,6 +534,7 @@ export default function RestockTable({
                                 item_data={inventory.find(
                                     (item) => item.uuid === restock.item_uuid,
                                 )}
+                                inventory={inventory}
                                 areas={areas}
                                 certs={certs}
                             />
diff --git a/website/components/kiosks/admin/workshops/WorkshopTable.tsx b/website/components/kiosks/admin/workshops/WorkshopTable.tsx
index f875a694..2946af26 100644
--- a/website/components/kiosks/admin/workshops/WorkshopTable.tsx
+++ b/website/components/kiosks/admin/workshops/WorkshopTable.tsx
@@ -531,6 +531,7 @@ export default function WorkshopTable({
                     <RequiredCertsModal
                         key={selectedWorkshop.uuid}
                         element={selectedWorkshop}
+                        parentKitCerts={undefined}
                         certifications={certs}
                         isOpen={certsIsOpen}
                         onOpenChange={certsOnOpenChange}
diff --git a/website/pages/admin/CheckoutsKiosk.tsx b/website/pages/admin/CheckoutsKiosk.tsx
index 1fe78435..0257c388 100644
--- a/website/pages/admin/CheckoutsKiosk.tsx
+++ b/website/pages/admin/CheckoutsKiosk.tsx
@@ -284,6 +284,7 @@ export default function CheckoutsKiosk() {
                                 // }}
                                 multiSelect={true}
                                 isLoading={inventoryLoading}
+                                showsKitContents={true}
                                 extraColumns={[{ name: "Cart", id: "cart" }]}
                                 defaultColumns={[
                                     "role",
diff --git a/website/utils.tsx b/website/utils.tsx
index b7b89041..adc8a757 100644
--- a/website/utils.tsx
+++ b/website/utils.tsx
@@ -10,6 +10,7 @@ import { API_SCOPE, UnixTimestamp } from "../common/global";
 import { TUser, TUserRole } from "common/user";
 import { TConfig } from "common/config";
 import { TShift, SHIFT_EVENT_TYPE, TShiftEvent } from "../common/shift";
+import { TRequiredCertificate } from "common/certification";
 
 /**
  * A file to contain useful utility functions for the website.
@@ -229,4 +230,28 @@ export function getForegroundColor(hex: string): string {
     } else {
         return "#000000";
     }
+}
+
+export function mergeRequiredCerts(a: TRequiredCertificate[] | undefined, b: TRequiredCertificate[] | undefined) {
+    // https://stackoverflow.com/questions/7486085/copy-array-by-value mfw
+    const res: TRequiredCertificate[] = JSON.parse(JSON.stringify(a ?? []));
+    const toMerge: TRequiredCertificate[] = JSON.parse(JSON.stringify(b ?? []));
+
+    for (let i = 0; i < res.length; i++) {
+        let uuid = res[i].certification_uuid;
+        let highestLevel = res[i].required_level;
+
+        for (let j = toMerge.length - 1; j >= 0; j--) {
+            if (toMerge[j].certification_uuid == uuid) {
+                if (toMerge[j].required_level > highestLevel) {
+                    highestLevel = toMerge[j].required_level;
+                }
+                toMerge.splice(j, 1);
+            }
+        }
+
+        res[i].required_level = highestLevel;
+    }
+
+    return [...res, ...toMerge];
 }
\ No newline at end of file

From 0826b5dbad00a4a16a952d54778c4bc147703811 Mon Sep 17 00:00:00 2001
From: FirePhoenix555 <53152322+FirePhoenix555@users.noreply.github.com>
Date: Tue, 24 Mar 2026 18:50:42 -0700
Subject: [PATCH 13/16] less recalculating merged reqcerts

---
 .../kiosks/admin/inventory/ItemEditorForm.tsx          |  5 +++--
 website/components/kiosks/admin/inventory/ItemInfo.tsx | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/website/components/kiosks/admin/inventory/ItemEditorForm.tsx b/website/components/kiosks/admin/inventory/ItemEditorForm.tsx
index 6bb391d2..0d230bd1 100644
--- a/website/components/kiosks/admin/inventory/ItemEditorForm.tsx
+++ b/website/components/kiosks/admin/inventory/ItemEditorForm.tsx
@@ -270,6 +270,7 @@ export default function ItemEditorForm({
     ); // type of quantity (true: numerical, false: categorical)
 
     const parent_kit = items.find(i => i.uuid == item.parent_kit);
+    const mergedReqCerts = mergeRequiredCerts(item.required_certifications || [], parent_kit?.required_certifications || []);
 
     return (
         <>
@@ -620,7 +621,7 @@ export default function ItemEditorForm({
                             name="parent_kit"
                             placeholder={placeholder("No parent kit")}
                             isDisabled={true}
-                            defaultValue={items.find(i => i.uuid == item.parent_kit)?.name}
+                            defaultValue={parent_kit?.name}
                             minRows={1}
                             variant="faded"
                             color="primary"
@@ -711,7 +712,7 @@ export default function ItemEditorForm({
                                 data-hover={!isNew && !isDisabled}
                             >
                                 <BookmarkIcon className="size-7" />
-                                {mergeRequiredCerts(item.required_certifications || [], parent_kit?.required_certifications || []).length}
+                                {mergedReqCerts.length}
                             </Button>
                         </Tooltip>
 
diff --git a/website/components/kiosks/admin/inventory/ItemInfo.tsx b/website/components/kiosks/admin/inventory/ItemInfo.tsx
index 389121d2..1340ef08 100644
--- a/website/components/kiosks/admin/inventory/ItemInfo.tsx
+++ b/website/components/kiosks/admin/inventory/ItemInfo.tsx
@@ -30,6 +30,9 @@ export default function ItemInfo({
     certs: TCertification[];
     quantity?: number;
 }) {
+    const parent_kit = inventory.find(k => k.uuid == item_data?.parent_kit);
+    const mergedReqCerts = mergeRequiredCerts(item_data?.required_certifications, parent_kit?.required_certifications);
+
     return (
         <div>
             <Popover placement="bottom">
@@ -96,15 +99,12 @@ export default function ItemInfo({
                             <div
                                 className={`bg-default-200 p-2 h-fit w-full rounded-md flex justify-center whitespace-nowrap, overflow-x-auto ${item_data ? "text-default-700" : "text-default-400"}`}
                             >
-                                {item_data.required_certifications &&
-                                item_data.required_certifications.length ==
+                                {mergedReqCerts.length ==
                                     0 ? (
                                     <div>No Required Certifications</div>
                                 ) : (
                                     <div className="flex flex-row flex-wrap gap-1 overflow-auto max-w-1/2 items-center justify-center">
-                                        {mergeRequiredCerts(item_data.required_certifications,
-                                            inventory.find(k => k.uuid == item_data.parent_kit)?.required_certifications
-                                        )?.map(
+                                        {mergedReqCerts?.map(
                                             (c) => (
                                                 <CertificationTag
                                                     key={c.certification_uuid}

From 7cf497fee0ce1a6539ed012d4714dbe599ead867 Mon Sep 17 00:00:00 2001
From: FirePhoenix555 <53152322+FirePhoenix555@users.noreply.github.com>
Date: Tue, 24 Mar 2026 19:09:07 -0700
Subject: [PATCH 14/16] fixed item info showing kit item location

---
 .../kiosks/admin/inventory/InventoryTable.tsx |  2 +-
 .../kiosks/admin/inventory/ItemInfo.tsx       | 20 ++++++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/website/components/kiosks/admin/inventory/InventoryTable.tsx b/website/components/kiosks/admin/inventory/InventoryTable.tsx
index aef7e7cb..10d8058b 100644
--- a/website/components/kiosks/admin/inventory/InventoryTable.tsx
+++ b/website/components/kiosks/admin/inventory/InventoryTable.tsx
@@ -402,7 +402,7 @@ export default function InventoryTable({
                                 return (
                                     parent_kit?.locations.map((location, index) => (
                                         <ItemLocationChip
-                                            key={`${i.uuid}-location`}
+                                            key={`${i.uuid}-location-${index}`}
                                             location={{
                                                 area: location.area,
                                                 specific: `In ${parent_kit?.name}`,
diff --git a/website/components/kiosks/admin/inventory/ItemInfo.tsx b/website/components/kiosks/admin/inventory/ItemInfo.tsx
index 1340ef08..238a9744 100644
--- a/website/components/kiosks/admin/inventory/ItemInfo.tsx
+++ b/website/components/kiosks/admin/inventory/ItemInfo.tsx
@@ -82,8 +82,22 @@ export default function ItemInfo({
                                 </Tooltip>
 
                                 <div className="flex-row gap-1 min-w-max flex-wrap">
-                                    {item_data.locations.map(
-                                        (location, index) => (
+                                    {parent_kit ? (
+                                        parent_kit.locations.map((location, index) => (
+                                            <div className="pb-1">
+                                                <ItemLocationChip
+                                                    key={`${item_data.uuid}-location-${index}`}
+                                                    location={{
+                                                        area: location.area,
+                                                        specific: `In ${parent_kit?.name}`,
+                                                        container: ""
+                                                    }}
+                                                    areas={areas}
+                                                />
+                                            </div>
+                                        ))
+                                    ) : (
+                                        item_data.locations.map((location, index) => (
                                             <div className="pb-1">
                                                 <ItemLocationChip
                                                     key={`${location.area}-${index}`}
@@ -91,7 +105,7 @@ export default function ItemInfo({
                                                     areas={areas}
                                                 />
                                             </div>
-                                        ),
+                                        ))
                                     )}
                                 </div>
                             </div>

From 2b37d1bd42370ddc14ce0b6cf07b8cfe76783d53 Mon Sep 17 00:00:00 2001
From: FirePhoenix555 <53152322+FirePhoenix555@users.noreply.github.com>
Date: Tue, 14 Apr 2026 19:12:25 -0700
Subject: [PATCH 15/16] auth roles split into available/visible

what a change
---
 common/area.d.ts                              |   7 +-
 common/certification.ts                       |   5 +-
 common/file.ts                                |   4 +-
 common/inventory.ts                           |   7 +-
 common/machine.ts                             |  14 ++-
 common/workshop.d.ts                          |   7 +-
 server/controllers/area.controller.ts         |   8 +-
 .../controllers/certification.controller.ts   |   6 +-
 server/controllers/checkout.controller.ts     |   8 +-
 server/controllers/embed.controller.ts        |   4 +-
 server/controllers/inventory.controller.ts    |   6 +-
 server/controllers/machine.controller.ts      |  16 +--
 server/controllers/workshop.controller.ts     |  25 +++-
 server/models/area.model.ts                   |   2 +-
 server/models/certification.model.ts          |   2 +-
 server/models/file.model.ts                   |   2 +-
 server/models/inventory.model.ts              |   3 +-
 server/models/machine.model.ts                |   3 +-
 server/models/workshop.model.ts               |   3 +-
 website/components/EditDocsModal.tsx          |  16 +--
 .../components/kiosks/admin/areas/Area.tsx    |   6 +-
 .../admin/areas/ReservableAreaModal.tsx       |  24 ++--
 .../kiosks/admin/areas/VisibilityModal.tsx    |   2 +-
 .../certifications/AuthorizedRolesModal.tsx   | 110 +++++++++++++++---
 .../kiosks/admin/certifications/CTable.tsx    |   9 +-
 .../admin/certifications/EditCertModal.tsx    |  16 +--
 .../kiosks/admin/inventory/InventoryTable.tsx |  21 +++-
 .../kiosks/admin/inventory/ItemEditorForm.tsx |  62 +++++++---
 .../kiosks/admin/machines/Machine.tsx         |  47 ++++++--
 .../kiosks/admin/settings/EditableEmbed.tsx   |   6 +-
 .../admin/workshops/WorkshopEditModal.tsx     |  71 +----------
 .../kiosks/admin/workshops/WorkshopTable.tsx  |  87 ++++++++++----
 website/pages/admin/CheckoutsKiosk.tsx        |   5 +-
 33 files changed, 390 insertions(+), 224 deletions(-)

diff --git a/common/area.d.ts b/common/area.d.ts
index 04c0f51e..ce578e13 100644
--- a/common/area.d.ts
+++ b/common/area.d.ts
@@ -35,9 +35,8 @@ export type TAreaStatus = {
  * @property status_logs - A list of past statuses
  * @property required_certifications - (optional) UUIDs of certs required to
  *      use/reserve the area
- * @property authorized_roles - (optional) A list of UserRole UUIDs that are
- *      allowed to see this area. A user must have at least one of these
- *      to reserve the area. If null, area needs to rolls to be reserved.
+ * @property available_to - (optional) A list of UserRole UUIDs that are
+ *      allowed to reserve this area. If null, area needs no roles to be reserved.
  *      If set as the empty list, only admin users will be able to reserve this area.
  * @property reservable - (optional) Whether this area is allowed to be reserved.
  *      Only users with the required certifications and authorized roles can
@@ -57,7 +56,7 @@ export type TArea = {
     equipment?: MachineUUID[];
     images?: FileUUID[];
     required_certifications?: TRequiredCertificate[];
-    authorized_roles?: UserRoleUUID[] | null;
+    available_to?: UserRoleUUID[] | null;
     reservable?: boolean;
     reserved?: boolean;
     visible_to?: UserRoleUUID[] | null;
diff --git a/common/certification.ts b/common/certification.ts
index e4690cb7..f0030371 100644
--- a/common/certification.ts
+++ b/common/certification.ts
@@ -28,7 +28,7 @@ export enum CERTIFICATION_VISIBILITY {
  *     certification, such as a training manual or a Google form link.
  * @property required_certifications - (optional) a list of required certificates
  *      that are prerequisites to getting this cert
- * @property authorized_roles - (optional) a list of UserRole UUIDs that are
+ * @property visible_to - (optional) a list of UserRole UUIDs that are
  *      allowed to see this certification. If not present, any user may see this
  *      certification
  */
@@ -42,7 +42,8 @@ export type TCertification = {
     seconds_valid_for?: number;
     documents?: TDocument[];
     required_certifications?: TRequiredCertificate[];
-    authorized_roles?: UserRoleUUID[];
+    visible_to?: UserRoleUUID[];
+    // TODO? available_to
 };
 
 /**
diff --git a/common/file.ts b/common/file.ts
index 62002704..740d4405 100644
--- a/common/file.ts
+++ b/common/file.ts
@@ -34,7 +34,7 @@ export type TFile = {
  * TAreaDocument - A document link for users to access
  * @property name - The name of the document
  * @property link - The link to the document
- * @property authorized_roles - (optional) A list of UserRole UUIDs that are
+ * @property visible_to - (optional) A list of UserRole UUIDs that are
  *      allowed to see this file. A user must have at least one of these
  *      roles to see the given file.
  *      If null, this file is public.
@@ -43,5 +43,5 @@ export type TFile = {
 export type TDocument = {
     name: string;
     link: string;
-    authorized_roles?: UserRoleUUID[] | null;
+    visible_to?: UserRoleUUID[] | null;
 };
diff --git a/common/inventory.ts b/common/inventory.ts
index 1fb237ff..63938dc2 100644
--- a/common/inventory.ts
+++ b/common/inventory.ts
@@ -104,10 +104,12 @@ export const ITEM_ACCESS_DESCRIPTORS: {
  * @property kit_contents - (optional) if kit, lists all item UUIDs in this kit
  * @property keywords - (optional) keywords associated with item
  * @property required_certs - UUIDs of certs required to use item
- * @property authorized_roles - (optional) A list of UserRole UUIDs that are
+ * @property available_to - (optional) A list of UserRole UUIDs that are
  *      allowed to use this item. A user must have at least one of
  *      these roles to checkout the given item. If null, any user may
  *      checkout this item.
+ * @property visible_to - (optional) A list of UserRole UUIDs that are allowed
+ *      to see this item. If null, the item is publicly visible.
  * @property kit_contents - The contents of the item, if it is a kit
  * @property parent_kit - The UUID of the parent kit (if this item is in one)
  */
@@ -125,7 +127,8 @@ export type TInventoryItem = {
     serial_number?: string;
     keywords?: string[];
     required_certifications?: TRequiredCertificate[];
-    authorized_roles?: UserRoleUUID[] | null;
+    available_to?: UserRoleUUID[] | null;
+    visible_to?: UserRoleUUID[] | null;
     kit_contents?: InventoryItemUUID[];
     parent_kit?: InventoryItemUUID;
 };
diff --git a/common/machine.ts b/common/machine.ts
index c295ab23..07c1ed7b 100644
--- a/common/machine.ts
+++ b/common/machine.ts
@@ -101,11 +101,14 @@ export type TMachineInstanceStatusLog = {
  * @property documents - (optional) A list of {@link TDocument | Document} objects
  *      about this machine (manuals, data sheets, how-to videos, etc.)
  * @property required_certs - UUIDs of certs required to use/reserve the machine
- * @property authorized_roles - (optional) A list of UserRole UUIDs that are
+ * @property available_to - (optional) A list of UserRole UUIDs that are
  *      allowed to use this machine. A user must have at least one of these
- *      roles to see the given machine in the area tab and reserve the machine.
- *      If null, this machine is public and reservable by anyone.
- *      If set as an empty list, only admins are able to see or reserve the machine.
+ *      roles to reserve the machine. If null, this machine is reservable by anyone;
+ *      if an empty list, only admins are able to reserve the machine.
+ * @property visible_to - (optional) A list of UserRole UUIDs that are allowed to
+ *      see this machine. A user must have at least one of these roles to see the
+ *      given machine in the area tab. If null, this machine is public; if an empty
+ *      list, this machine is only visible to admins.
  * @property reservable - (optional) Whether this machine is allowed to be
  *      reserved. Only users with the required certifications and at least one
  *      authorized role can reserve this machine.
@@ -123,7 +126,8 @@ export type TMachine = {
     status_logs: TMachineInstanceStatusLog[];
     documents?: TDocument[];
     required_certifications?: TRequiredCertificate[];
-    authorized_roles?: UserRoleUUID[] | null;
+    available_to?: UserRoleUUID[] | null;
+    visible_to?: UserRoleUUID[] | null;
     reservable?: boolean;
     reservation_type?:
         | ITEM_ACCESS_TYPE.CHECKOUT_IN_SPACE
diff --git a/common/workshop.d.ts b/common/workshop.d.ts
index 87c2aee1..7505a75e 100644
--- a/common/workshop.d.ts
+++ b/common/workshop.d.ts
@@ -37,7 +37,9 @@ export type TWorkshopUserRecord = {
  *     signed in to the workshop
  * @property images - (optional) a list UUIDs of {@link TFile | image Files} to
  *      display for this workshop
- * @property authorized_roles - (optional) a list of UserRole UUIDs that are
+ * @property available_to - (optional) a list of UserRole UUIDs that are allowed
+ *      to RSVP to this workshop. If null, any user may RSVP.
+ * @property visible_to - (optional) a list of UserRole UUIDs that are
  *      allowed to see this workshop. If null, any user may see this
  *      workshop
  */
@@ -56,7 +58,8 @@ export type TWorkshop = {
     reminder_emails_sent: number[];
     sign_in_list: TWorkshopUserRecord[];
     images?: FileUUID[];
-    authorized_roles?: UserRoleUUID[] | null;
+    available_to?: UserRoleUUID[] | null;
+    visible_to?: UserRoleUUID[] | null;
 };
 
 /**
diff --git a/server/controllers/area.controller.ts b/server/controllers/area.controller.ts
index 80b2e73a..30dfce46 100644
--- a/server/controllers/area.controller.ts
+++ b/server/controllers/area.controller.ts
@@ -156,7 +156,7 @@ export async function setAllAreas(area_objs: TArea[]): Promise<TArea[] | null> {
             equipment: area_obj.equipment,
             images: area_obj.images,
             required_certifications: area_obj.required_certifications,
-            authorized_roles: area_obj.authorized_roles,
+            available_to: area_obj.available_to,
             reservable: area_obj.reservable,
             reserved: area_obj.reserved,
             visible_to: area_obj.visible_to,
@@ -193,7 +193,8 @@ export async function patchArea(
         // refresh instance items
         (partial_area.reservable !== undefined ||
             partial_area.name ||
-            partial_area.authorized_roles ||
+            partial_area.available_to ||
+            partial_area.visible_to ||
             partial_area.required_certifications)
     ) {
         refreshAreaItem(updated_area);
@@ -278,7 +279,8 @@ export async function refreshAreaItem(area: TArea) {
                 },
             ],
             required_certifications: area.required_certifications,
-            authorized_roles: area.authorized_roles,
+            available_to: area.available_to,
+            visible_to: area.visible_to,
         };
         new Inventory(instance_item_data).save();
     } else if (area.reservable === false) {
diff --git a/server/controllers/certification.controller.ts b/server/controllers/certification.controller.ts
index 2fccee02..f4dd6d06 100644
--- a/server/controllers/certification.controller.ts
+++ b/server/controllers/certification.controller.ts
@@ -79,8 +79,8 @@ export async function getCertificationsVisibleToUser(
             { visibility: CERTIFICATION_VISIBILITY.PUBLIC },
             {
                 $or: [
-                    { authorized_roles: null },
-                    { authorized_roles: { $elemMatch: { $in: role_uuids } } },
+                    { visible_to: null },
+                    { visible_to: { $elemMatch: { $in: role_uuids } } },
                 ],
             },
         ],
@@ -97,7 +97,7 @@ async function getPublicCertifications(): Promise<TCertification[]> {
     // Only return certifications that have require no roles
     return Certifications.find({
         visibility: { $ne: CERTIFICATION_VISIBILITY.SCHEDULE },
-        authorized_roles: null,
+        visible_to: null,
     });
 }
 
diff --git a/server/controllers/checkout.controller.ts b/server/controllers/checkout.controller.ts
index 766d1a8a..ff1d8619 100644
--- a/server/controllers/checkout.controller.ts
+++ b/server/controllers/checkout.controller.ts
@@ -110,10 +110,10 @@ export async function validateCheckout(
         // For each item being checked out, verify that the user
         // has authorized roles and required certs as needed
         if (
-            item.authorized_roles !== null &&
-            item.authorized_roles !== undefined
+            item.available_to !== null &&
+            item.available_to !== undefined
         ) {
-            if (item.authorized_roles.length === 0) {
+            if (item.available_to.length === 0) {
                 // No user roles are authorized
                 return {
                     status: CHECKOUT_VALIDATION.MISSING_ROLE,
@@ -121,7 +121,7 @@ export async function validateCheckout(
                 };
             }
             if (
-                !item.authorized_roles.some((r) =>
+                !item.available_to.some((r) =>
                     user.active_roles.some((log) => log.role_uuid === r),
                 )
             ) {
diff --git a/server/controllers/embed.controller.ts b/server/controllers/embed.controller.ts
index 90912abe..214199c7 100644
--- a/server/controllers/embed.controller.ts
+++ b/server/controllers/embed.controller.ts
@@ -60,7 +60,7 @@ export async function getEmbedsVisibleToUser(
                             $or: [
                                 {
                                     $not: {
-                                        $isArray: "$$docs.authorized_roles",
+                                        $isArray: "$$docs.visible_to",
                                     },
                                 },
                                 {
@@ -68,7 +68,7 @@ export async function getEmbedsVisibleToUser(
                                         {
                                             $size: {
                                                 $setIntersection: [
-                                                    "$$docs.authorized_roles",
+                                                    "$$docs.visible_to",
                                                     role_uuids,
                                                 ],
                                             },
diff --git a/server/controllers/inventory.controller.ts b/server/controllers/inventory.controller.ts
index ae9ae7ab..f7df064c 100644
--- a/server/controllers/inventory.controller.ts
+++ b/server/controllers/inventory.controller.ts
@@ -73,8 +73,8 @@ export async function getInventoryVisibleToUser(
         {
             $match: {
                 $or: [
-                    { authorized_roles: null },
-                    { authorized_roles: { $in: role_uuids } },
+                    { visible_to: null },
+                    { visible_to: { $in: role_uuids } },
                 ],
             },
         },
@@ -116,7 +116,7 @@ async function getPublicInventory(): Promise<TInventoryItem[]> {
     return await Inventory.aggregate([
         {
             $match: {
-                authorized_roles: null,
+                visible_to: null,
                 // Required certifications must either be empty or not exist
                 $or: [
                     { required_certifications: null },
diff --git a/server/controllers/machine.controller.ts b/server/controllers/machine.controller.ts
index 379d2c1f..10789395 100644
--- a/server/controllers/machine.controller.ts
+++ b/server/controllers/machine.controller.ts
@@ -70,8 +70,8 @@ export async function getMachinesVisibleToUser(
         {
             $match: {
                 $or: [
-                    { authorized_roles: null },
-                    { authorized_roles: { $in: role_uuids } },
+                    { visible_to: null },
+                    { visible_to: { $in: role_uuids } },
                 ],
             },
         },
@@ -85,7 +85,7 @@ export async function getMachinesVisibleToUser(
                             $or: [
                                 {
                                     $not: {
-                                        $isArray: "$$docs.authorized_roles",
+                                        $isArray: "$$docs.visible_to",
                                     },
                                 },
                                 {
@@ -93,7 +93,7 @@ export async function getMachinesVisibleToUser(
                                         {
                                             $size: {
                                                 $setIntersection: [
-                                                    "$$docs.authorized_roles",
+                                                    "$$docs.visible_to",
                                                     role_uuids,
                                                 ],
                                             },
@@ -119,7 +119,7 @@ async function getPublicMachines(): Promise<TPublicMachineData[]> {
     const Machines = mongoose.model("Machine", Machine, "machines");
     // Get all machines that are public
     return Machines.find({
-        authorized_roles: null,
+        visible_to: null,
     }).select([
         // Remove private information from the machine
         "-status_logs",
@@ -220,7 +220,8 @@ export async function patchMachine(
         // refresh instance items
         (partial_machine.reservable !== undefined ||
             partial_machine.name ||
-            partial_machine.authorized_roles ||
+            partial_machine.available_to ||
+            partial_machine.visible_to ||
             partial_machine.reservation_type ||
             partial_machine.required_certifications)
     ) {
@@ -312,7 +313,8 @@ export async function refreshMachineItems(
                 access_type: machine.reservation_type,
                 locations: locations,
                 required_certifications: machine.required_certifications,
-                authorized_roles: machine.authorized_roles,
+                available_to: machine.available_to,
+                visible_to: machine.visible_to,
             };
             new Inventory(instance_item_data).save();
         });
diff --git a/server/controllers/workshop.controller.ts b/server/controllers/workshop.controller.ts
index bde77d21..640738f2 100644
--- a/server/controllers/workshop.controller.ts
+++ b/server/controllers/workshop.controller.ts
@@ -62,8 +62,8 @@ export async function getWorkshopsVisibleToUser(
     // user has
     return Workshops.find({
         $or: [
-            { authorized_roles: null },
-            { authorized_roles: { $in: role_uuids } },
+            { visible_to: null },
+            { visible_to: { $in: role_uuids } },
         ],
     });
 }
@@ -79,7 +79,7 @@ export async function getPublicWorkshops(): Promise<TPublicWorkshopData[]> {
     // Get all workshops that are currently public
     return Workshops.find({
         timestamp_public: { $lte: Date.now() / 1000 },
-        authorized_roles: null,
+        visible_to: null,
     }).select([
         // Remove private information from workshop
         "-timestamp_public",
@@ -234,6 +234,25 @@ export async function rsvpToWorkshop(
         });
         return null;
     }
+    // If the user does not have any sufficient accessor roles, the RSVP fails
+    if (
+        workshop.available_to !== null &&
+        !workshop.available_to?.some(workshop_role_uuid =>
+            user.active_roles?.some(
+                user_role =>
+                    user_role.role_uuid ===
+                        workshop_role_uuid
+            ),
+        )
+    ) {
+        logger.info(
+            `User ${user.uuid} was missing required roles for workshop ${workshop.uuid}.`,
+        );
+        res.status(StatusCodes.FORBIDDEN).json({
+            error: `Missing a required role!`,
+        });
+        return null;
+    }
     // Add the user to the rsvp list
     workshop.rsvp_list.push({
         user_uuid: user_uuid,
diff --git a/server/models/area.model.ts b/server/models/area.model.ts
index 46b0b118..f3d06dc9 100644
--- a/server/models/area.model.ts
+++ b/server/models/area.model.ts
@@ -16,7 +16,7 @@ export const Area = new mongoose.Schema<TArea>({
     equipment: { type: [String], required: false },
     images: { type: [String], required: false },
     required_certifications: { type: [RequiredCertificate], required: false },
-    authorized_roles: { type: [String], required: false },
+    available_to: { type: [String], required: false },
     reservable: { type: Boolean, required: false },
     reserved: { type: Boolean, required: false },
     visible_to: { type: [String], required: false },
diff --git a/server/models/certification.model.ts b/server/models/certification.model.ts
index cf7d0f9e..3a8e98af 100644
--- a/server/models/certification.model.ts
+++ b/server/models/certification.model.ts
@@ -40,7 +40,7 @@ export const Certification = new mongoose.Schema<TCertification>(
         seconds_valid_for: { type: Number, required: false },
         documents: { type: [Document], required: false },
         required_certifications: { type: [RequiredCertificate], required: false },
-        authorized_roles: { type: [String], required: false },
+        visible_to: { type: [String], required: false },
     },
     { collection: "certifications" },
 );
\ No newline at end of file
diff --git a/server/models/file.model.ts b/server/models/file.model.ts
index 029b3429..0820f87e 100644
--- a/server/models/file.model.ts
+++ b/server/models/file.model.ts
@@ -23,5 +23,5 @@ export const File = new mongoose.Schema<TFile>({
 export const Document = new mongoose.Schema<TDocument>({
     name: { type: String, required: true },
     link: { type: String, required: true },
-    authorized_roles: { type: [String], required: false },
+    visible_to: { type: [String], required: false },
 });
diff --git a/server/models/inventory.model.ts b/server/models/inventory.model.ts
index 0fb39889..b8b834dd 100644
--- a/server/models/inventory.model.ts
+++ b/server/models/inventory.model.ts
@@ -33,7 +33,8 @@ export const InventoryItem = new mongoose.Schema<TInventoryItem>(
             type: [RequiredCertificate],
             required: false,
         },
-        authorized_roles: { type: [String], required: false },
+        available_to: { type: [String], required: false },
+        visible_to: { type: [String], required: false },
         kit_contents: { type: [String], required: false },
         parent_kit: { type: String, required: false },
     },
diff --git a/server/models/machine.model.ts b/server/models/machine.model.ts
index 04437177..5d4bd754 100644
--- a/server/models/machine.model.ts
+++ b/server/models/machine.model.ts
@@ -49,7 +49,8 @@ export const Machine = new mongoose.Schema<TMachine>(
             type: [RequiredCertificate],
             required: false,
         },
-        authorized_roles: { type: [String], required: true },
+        available_to: { type: [String], required: false },
+        visible_to: { type: [String], required: false },
         reservable: { type: Boolean, required: false },
         reservation_type: { type: Number, required: false },
     },
diff --git a/server/models/workshop.model.ts b/server/models/workshop.model.ts
index 342b677b..e7096d22 100644
--- a/server/models/workshop.model.ts
+++ b/server/models/workshop.model.ts
@@ -29,7 +29,8 @@ export const Workshop = new mongoose.Schema<TWorkshop>(
         reminder_emails_sent: { type: [Number], required: true },
         sign_in_list: { type: [WorkshopUserRecord], required: true },
         images: { type: [String], required: false },
-        authorized_roles: { type: [String], required: false },
+        available_to: { type: [String], required: false },
+        visible_to: { type: [String], required: false },
     },
     { collection: "workshops" }, // Collection name
 );
diff --git a/website/components/EditDocsModal.tsx b/website/components/EditDocsModal.tsx
index 4086f637..33ac25ad 100644
--- a/website/components/EditDocsModal.tsx
+++ b/website/components/EditDocsModal.tsx
@@ -13,7 +13,7 @@ import { UserRoleUUID } from "common/user";
 const emptyDoc: TDocument = {
     name: "",
     link: "",
-    authorized_roles: null,
+    visible_to: null,
 };
 
 export default function EditDocsModal<
@@ -24,7 +24,7 @@ export default function EditDocsModal<
     isOpen,
     onOpenChange,
     patchMutation,
-    roleOption = false,
+    roleOption = true,
 }: {
     element: T;
     isOpen: boolean;
@@ -72,8 +72,8 @@ export default function EditDocsModal<
     const wrapRolesEdit = (i: number) => {
         return (val: any) => {
             if (!docs[i]) docs[i] = { ...emptyDoc }; // copy the emptyDoc template if necessary
-            docs[i]["authorized_roles"] = Array.from(val) as UserRoleUUID[]; // update the value
-            if (docs[i]["authorized_roles"].length == 0) {docs[i]["authorized_roles"] = null}; // makes sure empty lists not allowed
+            docs[i]["visible_to"] = Array.from(val) as UserRoleUUID[]; // update the value
+            if (docs[i]["visible_to"].length == 0) {docs[i]["visible_to"] = null}; // makes sure empty lists not allowed
             setDocs([...docs]); // update the docs list
 
             setHasEdits(true);
@@ -150,16 +150,16 @@ export default function EditDocsModal<
                                     className="w-full"
                                 />
 
-                                {roleOption && (
+                                {roleOption && ( // TODO: doesn't currently allow the distinction between [] (only visible to admins) and null (public)
                                     <div className="min-w-[15vw] max-w-full">
                                         <UserRoleSelect
                                             selectedKeys={
-                                                docs[i]["authorized_roles"] ??
+                                                docs[i]["visible_to"] ??
                                                 undefined
                                             }
                                             onSelectionChange={wrapRolesEdit(i)}
-                                            placeholder="Select authorized roles"
-                                            label="Authorized Roles"
+                                            placeholder="Select viewer roles"
+                                            label="Viewer Roles"
                                             labelPlacement="inside"
                                             classNames={{
                                                 value: "text-default-500",
diff --git a/website/components/kiosks/admin/areas/Area.tsx b/website/components/kiosks/admin/areas/Area.tsx
index 227a5c97..1de7b404 100644
--- a/website/components/kiosks/admin/areas/Area.tsx
+++ b/website/components/kiosks/admin/areas/Area.tsx
@@ -198,7 +198,7 @@ export default function Area({
                                 <div className="flex gap-2 sm:gap-3">
                                     <Tooltip
                                         color={
-                                            area.visible_to === null
+                                            area.visible_to == null
                                                 ? "success"
                                                 : area.visible_to &&
                                                     area.visible_to.length === 0
@@ -206,7 +206,7 @@ export default function Area({
                                                   : "primary"
                                         }
                                         content={
-                                            area.visible_to === null
+                                            area.visible_to == null
                                                 ? "Visible"
                                                 : area.visible_to &&
                                                     area.visible_to.length === 0
@@ -232,7 +232,7 @@ export default function Area({
                                                 )
                                             }
                                             color={
-                                                area.visible_to === null
+                                                area.visible_to == null
                                                     ? "success"
                                                     : area.visible_to &&
                                                         area.visible_to
diff --git a/website/components/kiosks/admin/areas/ReservableAreaModal.tsx b/website/components/kiosks/admin/areas/ReservableAreaModal.tsx
index a161a5ff..d870cae4 100644
--- a/website/components/kiosks/admin/areas/ReservableAreaModal.tsx
+++ b/website/components/kiosks/admin/areas/ReservableAreaModal.tsx
@@ -48,15 +48,15 @@ export default function ReservableConfirmationModal({
     onOpenChange: (open: boolean) => void;
 }) {
     const [reservable, setReservable] = useState(area.reservable);
-    const [authorizedRoles, setAuthorizedRoles] = useState(
-        area.authorized_roles || [],
+    const [availableToRoles, setAvailableToRoles] = useState(
+        area.available_to || [],
     );
     const [requiredCerts, setRequiredCerts] = useState(
         area.required_certifications || [],
     );
 
     const [openAuthorized, setOpenAuthorized] = useState(
-        area.authorized_roles === null,
+        area.available_to == null,
     );
 
     const [hasEdits, setHasEdits] = useState(false);
@@ -89,7 +89,7 @@ export default function ReservableConfirmationModal({
                     If an area is reservable, it will appear in the checkout
                     kiosk for users to reserve. Any user with all of the
                     required certifications and at least one of the authorized
-                    roles for will be able to reserve the area.
+                    roles will be able to reserve the area.
                     <Divider className="bg-default-200 h-0.5" />
                     <div className="flex w-full justify-center gap-12 font-bold">
                         Reservable?
@@ -212,7 +212,7 @@ export default function ReservableConfirmationModal({
                     <div className="flex flex-row w-full gap-2 items-center">
                         <UserRoleSelect
                             roles={roles}
-                            selectedKeys={authorizedRoles}
+                            selectedKeys={availableToRoles}
                             isDisabled={!reservable || openAuthorized}
                             label="Authorized Roles"
                             labelPlacement="inside"
@@ -223,18 +223,18 @@ export default function ReservableConfirmationModal({
                             }
                             onSelectionChange={(s) => {
                                 if (s === "all") {
-                                    setAuthorizedRoles(
+                                    setAvailableToRoles(
                                         roles.map((r) => r.uuid),
                                     );
                                 } else {
-                                    setAuthorizedRoles(
+                                    setAvailableToRoles(
                                         Array.from(s) as string[],
                                     );
                                 }
                                 setHasEdits(
                                     hasEdits ||
-                                        authorizedRoles !=
-                                            area.authorized_roles,
+                                        availableToRoles !=
+                                            area.available_to,
                                 );
                             }}
                         />
@@ -252,7 +252,7 @@ export default function ReservableConfirmationModal({
                                 isDisabled={!reservable}
                                 onValueChange={(v) => {
                                     setOpenAuthorized(v);
-                                    setAuthorizedRoles([]);
+                                    setAvailableToRoles([]);
                                     setHasEdits(true);
                                 }}
                                 color="primary"
@@ -277,9 +277,9 @@ export default function ReservableConfirmationModal({
                                 uuid: area.uuid,
                                 patch: {
                                     reservable: reservable,
-                                    authorized_roles: openAuthorized
+                                    available_to: openAuthorized
                                         ? null
-                                        : authorizedRoles,
+                                        : availableToRoles,
                                     required_certifications: requiredCerts,
                                 },
                             });
diff --git a/website/components/kiosks/admin/areas/VisibilityModal.tsx b/website/components/kiosks/admin/areas/VisibilityModal.tsx
index f0a95c51..53e34ab3 100644
--- a/website/components/kiosks/admin/areas/VisibilityModal.tsx
+++ b/website/components/kiosks/admin/areas/VisibilityModal.tsx
@@ -38,7 +38,7 @@ export default function RequiredRolesModal({
     // An open authorized object always has an empty role list and is available to anyone,
     // whereas an closed authorized object with an empty role list is available to no one.
     const [openVisible, setOpenVisible] = React.useState(
-        item.visible_to === null,
+        item.visible_to == null,
     );
 
     const onSubmit = React.useCallback(
diff --git a/website/components/kiosks/admin/certifications/AuthorizedRolesModal.tsx b/website/components/kiosks/admin/certifications/AuthorizedRolesModal.tsx
index cb4c3e9e..5aed4b27 100644
--- a/website/components/kiosks/admin/certifications/AuthorizedRolesModal.tsx
+++ b/website/components/kiosks/admin/certifications/AuthorizedRolesModal.tsx
@@ -7,39 +7,46 @@ import { UserRoleUUID, TUserRole } from "common/user";
 import { UUID } from "common/global";
 import { UserRoleSelect } from "../../../user/UserRoleSelect";
 
-export default function RequiredRolesModal<
-    // Allow any type that has a uuid and optional required_roles list
-    T extends { uuid: UUID; authorized_roles?: UserRoleUUID[] | null },
->({
+type Available = {
+    uuid: UUID,
+    available_to?: UserRoleUUID[] | null,
+}
+
+type Visible = {
+    uuid: UUID,
+    visible_to?: UserRoleUUID[] | null,
+}
+
+function RequiredRolesModal({
+    type,
     element,
     roles,
     isOpen,
     onOpenChange,
     patchMutation,
 }: {
-    element: T;
+    type: "available_to" | "visible_to";
+    element: any;
     roles: TUserRole[];
     isOpen: boolean;
     onOpenChange: (isOpen: boolean) => void;
     patchMutation: UseMutationResult<
-        T,
+        typeof element,
         Error,
         {
             uuid: UUID;
-            patch: {
-                authorized_roles?: UserRoleUUID[] | null;
-            };
+            patch: any;
         }
     >;
 }) {
     const [hasEdits, setHasEdits] = React.useState(false);
     const [currentRoles, setCurrentRoles] = React.useState<UserRoleUUID[]>(
-        element.authorized_roles || [],
+        element[type] || [],
     );
     // An open authorized object always has an empty role list and is available to anyone,
     // whereas an closed authorized object with an empty role list is available to no one.
     const [openAuthorized, setOpenAuthorized] = React.useState(
-        element.authorized_roles === null,
+        element[type] == null,
     );
 
     const onSubmit = React.useCallback(
@@ -51,15 +58,19 @@ export default function RequiredRolesModal<
 
             patchMutation.reset();
 
+            let patch: any = {};
+
             if (openAuthorized) {
+                patch[type] = null;
                 patchMutation.mutate({
                     uuid: element.uuid,
-                    patch: { authorized_roles: null },
+                    patch,
                 });
             } else {
+                patch[type] = currentRoles;
                 patchMutation.mutate({
                     uuid: element.uuid,
-                    patch: { authorized_roles: currentRoles },
+                    patch,
                 });
             }
             onOpenChange(false);
@@ -89,11 +100,11 @@ export default function RequiredRolesModal<
                         className="flex flex-col gap-4 p-4"
                     >
                         <div className="text-lg font-semibold">
-                            Edit Authorized Roles
+                            Edit {type == "available_to" ? "Accessor Roles" : "Viewer Roles"}
                         </div>
                         <div>
                             Users with at least one of the selected roles will
-                            be able to reserve this machine.
+                            have {type == "available_to" ? "use" : "view"} permissions.
                         </div>
 
                         <div
@@ -106,7 +117,7 @@ export default function RequiredRolesModal<
                                 label=""
                                 placeholder={
                                     openAuthorized
-                                        ? "Reservable by all roles"
+                                        ? `${type == "available_to" ? "Usable" : "Viewable"} by all roles`
                                         : "Select roles to authorize"
                                 }
                                 isDisabled={openAuthorized}
@@ -170,3 +181,70 @@ export default function RequiredRolesModal<
         </Modal>
     );
 }
+
+// Wrappers for the above component to account for both types of authorized roles
+// trying to figure out typescript things for this, so may not work lol
+
+export function AvailableToRolesModal<T extends Available>({
+    element,
+    roles,
+    isOpen,
+    onOpenChange,
+    patchMutation,
+}: {
+    element: T;
+    roles: TUserRole[];
+    isOpen: boolean;
+    onOpenChange: (isOpen: boolean) => void;
+    patchMutation: UseMutationResult<
+        T,
+        Error,
+        {
+            uuid: UUID;
+            patch: {
+                available_to?: UserRoleUUID[] | null;
+            };
+        }
+    >;
+}) {
+    return (<RequiredRolesModal
+        type="available_to"
+        element={element}
+        roles={roles}
+        isOpen={isOpen}
+        onOpenChange={onOpenChange}
+        patchMutation={patchMutation}
+    ></RequiredRolesModal>);
+}
+
+export function VisibleToRolesModal<T extends Visible>({
+    element,
+    roles,
+    isOpen,
+    onOpenChange,
+    patchMutation,
+}: {
+    element: T;
+    roles: TUserRole[];
+    isOpen: boolean;
+    onOpenChange: (isOpen: boolean) => void;
+    patchMutation: UseMutationResult<
+        T,
+        Error,
+        {
+            uuid: UUID;
+            patch: {
+                visible_to?: UserRoleUUID[] | null;
+            };
+        }
+    >;
+}) {
+    return (<RequiredRolesModal
+        type="visible_to"
+        element={element}
+        roles={roles}
+        isOpen={isOpen}
+        onOpenChange={onOpenChange}
+        patchMutation={patchMutation}
+    ></RequiredRolesModal>);
+}
\ No newline at end of file
diff --git a/website/components/kiosks/admin/certifications/CTable.tsx b/website/components/kiosks/admin/certifications/CTable.tsx
index bb42e9fe..9eaba1f8 100644
--- a/website/components/kiosks/admin/certifications/CTable.tsx
+++ b/website/components/kiosks/admin/certifications/CTable.tsx
@@ -47,7 +47,7 @@ const baseColumns = [
     { name: "Expires After", id: "seconds_valid_for" },
     { name: "Documents", id: "documents" },
     { name: "Prerequisites", id: "prerequisites" },
-    { name: "Authorized Roles", id: "authorized_roles" },
+    { name: "Viewer Roles", id: "visible_to" },
     { name: "Delete", id: "delete" }
 ];
 
@@ -85,7 +85,7 @@ export default function CertificationsTable({
         "documents",
         "visibility",
         "prerequisites",
-        "authorized_roles",
+        "visible_to",
         "delete"
     ],
     extraColumns = [],
@@ -237,7 +237,6 @@ export default function CertificationsTable({
                                         max_level: 0,
                                         seconds_valid_for: 0,
                                         documents: [],
-                                        authorized_roles: [],
                                         required_certifications: [],
                                     });
                                     setIsNew(true);
@@ -343,9 +342,9 @@ export default function CertificationsTable({
                             );
                         }
                     },
-                    authorized_roles: (cert: TCertification) => (
+                    visible_to: (cert: TCertification) => (
                         <div>
-                            {cert.authorized_roles?.map((role) => (
+                            {cert.visible_to?.map((role) => (
                                 <UserRole
                                     role_uuid={role}
                                     key={role}
diff --git a/website/components/kiosks/admin/certifications/EditCertModal.tsx b/website/components/kiosks/admin/certifications/EditCertModal.tsx
index ff902cbb..16bd91f1 100644
--- a/website/components/kiosks/admin/certifications/EditCertModal.tsx
+++ b/website/components/kiosks/admin/certifications/EditCertModal.tsx
@@ -129,8 +129,8 @@ export default function EditCertModal({
     const [prereqs, setPrereqs] = React.useState<TRequiredCertificate[]>(
         cert.required_certifications ?? [],
     );
-    const [authRoles, setAuthRoles] = React.useState<UserRoleUUID[]>(
-        cert.authorized_roles ?? [],
+    const [visibleToRoles, setVisibleToRoles] = React.useState<UserRoleUUID[] | undefined>(
+        cert.visible_to,
     );
     const [color, setColor] = React.useState<string>(cert.color);
 
@@ -154,7 +154,7 @@ export default function EditCertModal({
                 max_level: maxLevel,
                 seconds_valid_for: secondsValidFor,
                 documents: cert?.documents, // edit documents in separate modal
-                authorized_roles: authRoles,
+                visible_to: visibleToRoles,
                 required_certifications: prereqs,
             };
 
@@ -171,7 +171,7 @@ export default function EditCertModal({
             color,
             maxLevel,
             secondsValidFor,
-            authRoles,
+            visibleToRoles,
             prereqs,
             hasEdits,
         ],
@@ -356,10 +356,10 @@ export default function EditCertModal({
                             </div>
 
                             <UserRoleSelect
-                                selectedKeys={authRoles}
-                                onSelectionChange={wrapSetEdit(setAuthRoles)}
-                                placeholder="Select authorized roles"
-                                label="Authorized Roles"
+                                selectedKeys={visibleToRoles}
+                                onSelectionChange={wrapSetEdit(setVisibleToRoles)}
+                                placeholder="Select viewer roles"
+                                label="Viewer Roles"
                                 labelPlacement="inside"
                                 classNames={{
                                     value: "text-default-500",
diff --git a/website/components/kiosks/admin/inventory/InventoryTable.tsx b/website/components/kiosks/admin/inventory/InventoryTable.tsx
index 10d8058b..985ed901 100644
--- a/website/components/kiosks/admin/inventory/InventoryTable.tsx
+++ b/website/components/kiosks/admin/inventory/InventoryTable.tsx
@@ -52,7 +52,8 @@ const baseColumns = [
     { name: "Quantity", id: "quantity_ratio" },
     { name: "Locations", id: "locations" },
     { name: "Required Certs", id: "required_certifications" },
-    { name: "Authorized Roles", id: "authorized_roles" },
+    { name: "Accessor Roles", id: "available_to" },
+    { name: "Viewer Roles", id: "visible_to" },
     { name: "Kit Contents", id: "kit_contents" },
     { name: "Keywords", id: "keywords" },
     { name: "Serial Number", id: "serial_number" },
@@ -80,7 +81,8 @@ export default function InventoryTable({
         "quantity_ratio",
         "locations",
         "required_certifications",
-        "authorized_roles",
+        "available_to",
+        "visible_to",
     ],
     customColumnComponents,
     showsKitContents = false,
@@ -437,9 +439,20 @@ export default function InventoryTable({
                             ))}
                         </div>
                     ),
-                    authorized_roles: (i) => (
+                    available_to: (i) => (
                         <div className="flex flex-col gap-1 overflow-auto max-w-1/2">
-                            {i.authorized_roles?.map((role) => (
+                            {i.available_to?.map((role) => (
+                                <UserRole
+                                    key={role}
+                                    role_uuid={role}
+                                    role={roles.find((r) => r.uuid === role)}
+                                />
+                            ))}
+                        </div>
+                    ),
+                    visible_to: (i) => (
+                        <div className="flex flex-col gap-1 overflow-auto max-w-1/2">
+                            {i.visible_to?.map((role) => (
                                 <UserRole
                                     key={role}
                                     role_uuid={role}
diff --git a/website/components/kiosks/admin/inventory/ItemEditorForm.tsx b/website/components/kiosks/admin/inventory/ItemEditorForm.tsx
index 0d230bd1..1938f8af 100644
--- a/website/components/kiosks/admin/inventory/ItemEditorForm.tsx
+++ b/website/components/kiosks/admin/inventory/ItemEditorForm.tsx
@@ -39,7 +39,7 @@ import {
 import { TUserRole } from "common/user";
 import ItemRoleIcon from "./ItemRoleIcon";
 import RequiredCertsModal from "../certifications/RequiredCertsModal";
-import AuthorizedRolesModal from "../certifications/AuthorizedRolesModal";
+import { AvailableToRolesModal, VisibleToRolesModal } from "../certifications/AuthorizedRolesModal";
 import { motion } from "motion/react";
 import ItemQuantityIcon from "./ItemQuantityIcon";
 import ItemLocationModal from "./ItemLocationModal";
@@ -184,7 +184,8 @@ export default function ItemEditorForm({
                         ?.split(",")
                         .map((i) => i.trim()) ?? [],
                 required_certifications: item.required_certifications,
-                authorized_roles: item.authorized_roles,
+                available_to: item.available_to,
+                visible_to: item.visible_to,
                 quantity: quantity,
                 available: available,
             };
@@ -253,13 +254,15 @@ export default function ItemEditorForm({
     });
 
     const [reqcertsOpen, setReqcertsOpen] = React.useState<boolean>(false); // whether reqcerts edit modal is open
-    const [authrolesOpen, setAuthrolesOpen] = React.useState<boolean>(false); // whether authroles edit modal is open
+    const [acrolesOpen, setAcrolesOpen] = React.useState<boolean>(false); // whether accessor roles edit modal is open
+    const [vwrolesOpen, setVwrolesOpen] = React.useState<boolean>(false); // whether viewer roles edit modal is open
     const [locationEditorOpen, setLocationEditorOpen] =
         React.useState<boolean>(false); // whether location editor modal is open
     const [kitEditorOpen, setKitEditorOpen] = React.useState<boolean>(false); // whether kit content edit modal is open
 
     const reqcertsMutation = patchMutation(() => setReqcertsOpen(false));
-    const authrolesMutation = patchMutation(() => setAuthrolesOpen(false));
+    const acrolesMutation = patchMutation(() => setAcrolesOpen(false));
+    const vwrolesMutation = patchMutation(() => setVwrolesOpen(false));
     const locationEditorMutation = patchMutation(() =>
         setLocationEditorOpen(false),
     );
@@ -719,8 +722,8 @@ export default function ItemEditorForm({
                         <Tooltip
                             content={
                                 isNew
-                                    ? "Create the item first, before editing authorized roles."
-                                    : "Authorized Roles"
+                                    ? "Create the item first, before editing accessor roles."
+                                    : "Accessor Roles"
                             }
                             className="w-fit p-2"
                             delay={500}
@@ -730,14 +733,39 @@ export default function ItemEditorForm({
                             <Button
                                 // variant="flat"
                                 color="primary"
-                                onPress={() => !isNew && setAuthrolesOpen(true)}
+                                onPress={() => !isNew && setAcrolesOpen(true)}
                                 // isIconOnly
                                 isDisabled={isDisabled}
                                 className={isNew ? "opacity-disabled" : ""}
                                 data-hover={!isNew && !isDisabled}
                             >
                                 <UserIcon className="size-7" />
-                                {item.authorized_roles?.length ?? 0}
+                                {item.available_to?.length ?? 0}
+                            </Button>
+                        </Tooltip>
+
+                        <Tooltip
+                            content={
+                                isNew
+                                    ? "Create the item first, before editing viewer roles."
+                                    : "Viewer Roles"
+                            }
+                            className="w-fit p-2"
+                            delay={500}
+                            closeDelay={150}
+                            isDisabled={isDisabled}
+                        >
+                            <Button
+                                // variant="flat"
+                                color="primary"
+                                onPress={() => !isNew && setVwrolesOpen(true)}
+                                // isIconOnly
+                                isDisabled={isDisabled}
+                                className={isNew ? "opacity-disabled" : ""}
+                                data-hover={!isNew && !isDisabled}
+                            >
+                                <UserIcon className="size-7" />
+                                {item.visible_to?.length ?? 0}
                             </Button>
                         </Tooltip>
 
@@ -811,13 +839,21 @@ export default function ItemEditorForm({
                 onOpenChange={setReqcertsOpen}
                 patchMutation={reqcertsMutation}
             />
-            <AuthorizedRolesModal
-                key={"roleauth-" + item.uuid}
+            <AvailableToRolesModal
+                key={"acroleauth-" + item.uuid}
+                element={item}
+                roles={roles}
+                isOpen={acrolesOpen}
+                onOpenChange={setAcrolesOpen}
+                patchMutation={acrolesMutation}
+            />
+            <VisibleToRolesModal
+                key={"vwroleauth-" + item.uuid}
                 element={item}
                 roles={roles}
-                isOpen={authrolesOpen}
-                onOpenChange={setAuthrolesOpen}
-                patchMutation={authrolesMutation}
+                isOpen={vwrolesOpen}
+                onOpenChange={setVwrolesOpen}
+                patchMutation={vwrolesMutation}
             />
             <ItemLocationModal
                 key={"locedit-" + item.uuid}
diff --git a/website/components/kiosks/admin/machines/Machine.tsx b/website/components/kiosks/admin/machines/Machine.tsx
index 4a70b5ea..93dacdda 100644
--- a/website/components/kiosks/admin/machines/Machine.tsx
+++ b/website/components/kiosks/admin/machines/Machine.tsx
@@ -34,9 +34,9 @@ import {
 import CertificationTag from "../certifications/CertificationTag";
 import ReservableConfirmationModal from "./ReservableConfirmationModal";
 import RequiredCertsModal from "../certifications/RequiredCertsModal";
-import AuthorizedRolesModal from "../certifications/AuthorizedRolesModal";
 import DeleteModal from "../../../DeleteModal";
 import { Link } from "react-router-dom";
+import { AvailableToRolesModal, VisibleToRolesModal } from "../certifications/AuthorizedRolesModal";
 
 const patchMachine = async ({
     uuid,
@@ -88,9 +88,15 @@ export default function Machine({
     } = useDisclosure();
 
     const {
-        isOpen: roleModal,
-        onOpenChange: roleModalOpenChange,
-        onOpen: roleModalOpen,
+        isOpen: acroleModal,
+        onOpenChange: acroleModalOpenChange,
+        onOpen: acroleModalOpen,
+    } = useDisclosure();
+
+    const {
+        isOpen: vwroleModal,
+        onOpenChange: vwroleModalOpenChange,
+        onOpen: vwroleModalOpen,
     } = useDisclosure();
 
     const {
@@ -396,11 +402,22 @@ export default function Machine({
                             color="warning"
                             className="w-full px-2"
                             startContent={<UserCircleIcon className="size-7" />}
-                            onPress={roleModalOpen}
+                            onPress={acroleModalOpen}
+                        >
+                            Accessor Roles
+                            {machine.available_to
+                                ? ` (${machine.available_to.length})`
+                                : ""}
+                        </Button>
+                        <Button
+                            color="warning"
+                            className="w-full px-2"
+                            startContent={<UserCircleIcon className="size-7" />}
+                            onPress={vwroleModalOpen}
                         >
-                            Authorized Roles
-                            {machine.authorized_roles
-                                ? ` (${machine.authorized_roles.length})`
+                            Viewer Roles
+                            {machine.visible_to
+                                ? ` (${machine.visible_to.length})`
                                 : ""}
                         </Button>
                         <EditDocsModal
@@ -409,13 +426,19 @@ export default function Machine({
                             isOpen={editDocs}
                             onOpenChange={editDocsModalOpenChange}
                             patchMutation={patchMutation}
-                            roleOption={true}
                         />
-                        <AuthorizedRolesModal
+                        <AvailableToRolesModal
+                            element={machine}
+                            roles={roles}
+                            isOpen={acroleModal}
+                            onOpenChange={acroleModalOpenChange}
+                            patchMutation={patchMutation}
+                        />
+                        <VisibleToRolesModal
                             element={machine}
                             roles={roles}
-                            isOpen={roleModal}
-                            onOpenChange={roleModalOpenChange}
+                            isOpen={vwroleModal}
+                            onOpenChange={vwroleModalOpenChange}
                             patchMutation={patchMutation}
                         />
                     </div>
diff --git a/website/components/kiosks/admin/settings/EditableEmbed.tsx b/website/components/kiosks/admin/settings/EditableEmbed.tsx
index 614c9138..8a80694e 100644
--- a/website/components/kiosks/admin/settings/EditableEmbed.tsx
+++ b/website/components/kiosks/admin/settings/EditableEmbed.tsx
@@ -151,7 +151,7 @@ export default function EditableEmbed({
                         <div className="flex gap-2 sm:gap-3">
                             <Tooltip
                                 color={
-                                    embed.visible_to === null
+                                    embed.visible_to == null
                                         ? "success"
                                         : embed.visible_to &&
                                             embed.visible_to.length === 0
@@ -159,7 +159,7 @@ export default function EditableEmbed({
                                           : "primary"
                                 }
                                 content={
-                                    embed.visible_to === null
+                                    embed.visible_to == null
                                         ? "Visible"
                                         : embed.visible_to &&
                                             embed.visible_to.length === 0
@@ -185,7 +185,7 @@ export default function EditableEmbed({
                                         )
                                     }
                                     color={
-                                        embed.visible_to === null
+                                        embed.visible_to == null
                                             ? "success"
                                             : embed.visible_to &&
                                                 embed.visible_to.length === 0
diff --git a/website/components/kiosks/admin/workshops/WorkshopEditModal.tsx b/website/components/kiosks/admin/workshops/WorkshopEditModal.tsx
index a1f33841..5c8a21b3 100644
--- a/website/components/kiosks/admin/workshops/WorkshopEditModal.tsx
+++ b/website/components/kiosks/admin/workshops/WorkshopEditModal.tsx
@@ -35,6 +35,7 @@ import { parseZonedDateTime, ZonedDateTime } from "@internationalized/date";
 import clsx from "clsx";
 import { TConfig } from "common/config";
 import axios from "axios";
+import RequiredCertsModal from "../certifications/RequiredCertsModal";
 
 const updateCreateWorkshop = async ({
     workshop,
@@ -169,7 +170,8 @@ export default function WorkshopEditModal({
                 reminder_emails_sent: workshop.reminder_emails_sent,
                 sign_in_list: workshop.sign_in_list,
                 images: workshop.images,
-                authorized_roles: workshop.authorized_roles,
+                available_to: workshop.available_to,
+                visible_to: workshop.visible_to,
             };
 
             console.log("here");
@@ -403,73 +405,6 @@ export default function WorkshopEditModal({
                                     ]),
                                 }}
                             />
-                            {/* <Select<TCertification>
-                                    label="Required Certifications"
-                                    labelPlacement="inside"
-                                    selectionMode="multiple"
-                                    placeholder="Enter required certifications"
-                                    defaultSelectedKeys={
-                                        workshop.required_certifications
-                                    }
-                                    onSelectionChange={(keys) => {
-                                        if (keys === "all") {
-                                            wrapEdit("required_certifications")(
-                                                sortedFilteredWorkers.map(
-                                                    (u) => u.uuid,
-                                                ),
-                                            );
-                                        } else {
-                                            wrapEdit("required_certifications")(
-                                                Array.from(keys) as string[],
-                                            );
-                                        }
-                                    }}
-                                    // selectedKeys={requiredCertifications}
-                                    // onSelectionChange={wrapSetEdit(
-                                    //     setRequiredCertifications,
-                                    // )}
-                                    isMultiline
-                                    variant="faded"
-                                    color="primary"
-                                    classNames={{
-                                        value: clsx([
-                                            "text-default-500",
-                                            "italic",
-                                            "group-data-[has-value=true]:text-default-700",
-                                            "group-data-[has-value=true]:not-italic	",
-                                        ]),
-                                    }}
-                                    renderValue={(selectedKeys) => {
-                                        if (selectedKeys.length === 0) {
-                                            // If no prereqs are selected, show the placeholder
-                                            return "";
-                                        } else {
-                                            return (
-                                                // Otherwise, show the selected prereqs in a flexbox
-                                                <div className="flex flex-wrap gap-1 p-2">
-                                                    {selectedKeys.map((c) => {
-                                                        return c.key ? (
-                                                            <CertificationTag
-                                                                cert_uuid={
-                                                                    c.key as string
-                                                                }
-                                                                key={c.key}
-                                                            />
-                                                        ) : null;
-                                                    })}
-                                                </div>
-                                            );
-                                        }
-                                    }}
-                                >
-                                    {certs.map((cert) => (
-                                        <SelectItem key={cert.uuid}>
-                                            <CertificationTag
-                                                cert_uuid={cert.uuid}
-                                            />
-                                        </SelectItem>
-                                    ))}
-                                </Select> */}
 
                             <DateRangePicker
                                 label="Workshop Date Range"
diff --git a/website/components/kiosks/admin/workshops/WorkshopTable.tsx b/website/components/kiosks/admin/workshops/WorkshopTable.tsx
index 2946af26..1b029712 100644
--- a/website/components/kiosks/admin/workshops/WorkshopTable.tsx
+++ b/website/components/kiosks/admin/workshops/WorkshopTable.tsx
@@ -17,6 +17,7 @@ import {
     PlusIcon,
     TagIcon,
     DocumentDuplicateIcon,
+    RocketLaunchIcon,
 } from "@heroicons/react/24/outline";
 import { TWorkshop } from "common/workshop";
 import { TCertification } from "common/certification";
@@ -39,6 +40,7 @@ import { UUID } from "common/global.ts";
 import axios from "axios";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { getLocalTimeZone, now } from "@internationalized/date";
+import { AvailableToRolesModal, VisibleToRolesModal } from "../certifications/AuthorizedRolesModal.tsx";
 
 // TODO-
 // [] FIX TIME
@@ -56,7 +58,8 @@ const columns = [
     // {name: 'Sign-In List', id:'sign_in_list'},
     { name: "People", id: "signups" },
     { name: "Photos", id: "photos" },
-    // { name: "Authorized Roles", id: "authorized_roles" },
+    { name: "Accessor Roles", id: "available_to" },
+    { name: "Viewer Roles", id: "visible_to" },
     { name: "Edit", id: "edit" },
     { name: "Duplicate", id: "duplicate" },
     { name: "Delete", id: "delete" },
@@ -73,7 +76,8 @@ const defaultColumns = [
     // 'rsvp_list',
     // 'sign_in_list',
     "photos",
-    // "authorized_roles",
+    "available_to",
+    "visible_to",
     "edit",
     "duplicate",
     "delete",
@@ -113,7 +117,8 @@ const duplicateWorkshop = async ({ workshop }: { workshop: TWorkshop }) => {
         reminder_emails_sent: [],
         sign_in_list: [],
         images: [], // Exclude images in duplication
-        authorized_roles: workshop.authorized_roles,
+        available_to: workshop.available_to,
+        visible_to: workshop.visible_to,
     };
 
     return (
@@ -227,6 +232,16 @@ export default function WorkshopTable({
         onOpen: certsOnOpen,
         onOpenChange: certsOnOpenChange,
     } = useDisclosure();
+    const {
+        isOpen: acrolesIsOpen,
+        onOpen: acrolesOnOpen,
+        onOpenChange: acrolesOnOpenChange,
+    } = useDisclosure();
+    const {
+        isOpen: vwrolesIsOpen,
+        onOpen: vwrolesOnOpen,
+        onOpenChange: vwrolesOnOpenChange,
+    } = useDisclosure();
 
     return (
         <div className="flex flex-col max-h-full overflow-auto">
@@ -256,6 +271,8 @@ export default function WorkshopTable({
                             rsvp_list: [],
                             reminder_emails_sent: [],
                             sign_in_list: [],
+                            available_to: [],
+                            visible_to: [],
                         });
                         editOnOpen();
                     }}
@@ -427,24 +444,36 @@ export default function WorkshopTable({
                                 }}
                             />
                         ),
-                        // TODO: Add roles
-                        // "authorized_roles": (workshop) => {
-                        //     return (
-                        //         <div>
-                        //             {
-                        //                 workshop.authorized_roles ?
-
-                        //                 workshop.authorized_roles.map((roleUUID) => {
-                        //                     return <UserRole
-                        //                     role_uuid={workshop.authorized_roles}
-                        //                   />
-                        //                 })
-
-                        //             }
-
-                        //         </div>
-                        //     )
-                        // },
+                        "available_to": (workshop) => (
+                            <div className="flex w-full justify-center">
+                                <Button
+                                    isIconOnly
+                                    className="bg-default-300 mx-auto"
+                                    startContent={
+                                        <RocketLaunchIcon className="size-6" />
+                                    }
+                                    onPress={() => {
+                                        setSelectedWorkshop(workshop);
+                                        acrolesOnOpen();
+                                    }}
+                                />
+                            </div>
+                        ),
+                        "visible_to": (workshop) => (
+                            <div className="flex w-full justify-center">
+                                <Button
+                                    isIconOnly
+                                    className="bg-default-300 mx-auto"
+                                    startContent={
+                                        <RocketLaunchIcon className="size-6" />
+                                    }
+                                    onPress={() => {
+                                        setSelectedWorkshop(workshop);
+                                        vwrolesOnOpen();
+                                    }}
+                                />
+                            </div>
+                        ),
                         edit: (workshop) => {
                             return (
                                 <>
@@ -537,6 +566,22 @@ export default function WorkshopTable({
                         onOpenChange={certsOnOpenChange}
                         patchMutation={patchMutation}
                     />
+                    <AvailableToRolesModal
+                        key={`${selectedWorkshop.uuid}-acroles`}
+                        element={selectedWorkshop}
+                        roles={roles}
+                        isOpen={acrolesIsOpen}
+                        onOpenChange={acrolesOnOpenChange}
+                        patchMutation={patchMutation}
+                    />
+                    <VisibleToRolesModal
+                        key={`${selectedWorkshop.uuid}-vwroles`}
+                        element={selectedWorkshop}
+                        roles={roles}
+                        isOpen={vwrolesIsOpen}
+                        onOpenChange={vwrolesOnOpenChange}
+                        patchMutation={patchMutation}
+                    />
                 </>
             )}
         </div>
diff --git a/website/pages/admin/CheckoutsKiosk.tsx b/website/pages/admin/CheckoutsKiosk.tsx
index 0257c388..ecbf1059 100644
--- a/website/pages/admin/CheckoutsKiosk.tsx
+++ b/website/pages/admin/CheckoutsKiosk.tsx
@@ -292,7 +292,8 @@ export default function CheckoutsKiosk() {
                                     "quantity_ratio",
                                     "locations",
                                     "required_certifications",
-                                    "authorized_roles",
+                                    "available_to",
+                                    "visible_to",
                                     "cart",
                                 ]}
                                 customColumnComponents={{
@@ -400,7 +401,7 @@ export default function CheckoutsKiosk() {
                                     "max_level",
                                     "seconds_valid_for",
                                     "prerequisites",
-                                    "authorized_roles",
+                                    "visible_to",
                                     "grant_revoke",
                                 ]}
                                 extraColumns={[

From 67828b187e998c9593438591b0131607afaeefb3 Mon Sep 17 00:00:00 2001
From: FirePhoenix555 <53152322+FirePhoenix555@users.noreply.github.com>
Date: Tue, 14 Apr 2026 20:09:22 -0700
Subject: [PATCH 16/16] getPublicInventory() correctly includes parent kit
 auths

---
 server/controllers/inventory.controller.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/server/controllers/inventory.controller.ts b/server/controllers/inventory.controller.ts
index f7df064c..9f724336 100644
--- a/server/controllers/inventory.controller.ts
+++ b/server/controllers/inventory.controller.ts
@@ -113,7 +113,7 @@ async function getPublicInventory(): Promise<TInventoryItem[]> {
     const visible_areas = (await getPublicAreas()).map((area) => area.uuid);
 
     // Find all items that need no roles or certifications
-    return await Inventory.aggregate([
+    let filteredInv = await Inventory.aggregate([
         {
             $match: {
                 visible_to: null,
@@ -138,6 +138,17 @@ async function getPublicInventory(): Promise<TInventoryItem[]> {
             },
         },
     ]);
+
+    // if an item is in the filtered list but its parent kit isn't, it shouldn't be
+    // visible (parent kit isn't publicly visible. ...or DNE ig)
+    for (let i = filteredInv.length - 1; i >= 0; i--) {
+        let item = filteredInv[i];
+        if (item.parent_kit && !filteredInv.some(itm => itm.uuid == item.parent_kit)) {
+            filteredInv.splice(i, 1);
+        }
+    }
+
+    return filteredInv;
 }
 
 /**