diff --git a/packages/doorman-api/functions/api/door/info.js b/packages/doorman-api/functions/api/door/info.js index 3580dd1..c58c624 100644 --- a/packages/doorman-api/functions/api/door/info.js +++ b/packages/doorman-api/functions/api/door/info.js @@ -70,6 +70,7 @@ exports.handler = async function(context, event, callback) { fallbackNumbers: config.Item.fallbackNumbers.SS, pressKey: config.Item.pressKey.S, discordUsers: config.Item?.discordUsers?.SS || [], + greeting: config.Item?.greeting.S || "", }); }).catch((e) => { diff --git a/packages/doorman-api/functions/common/ddb.private.js b/packages/doorman-api/functions/common/ddb.private.js index 632fa5d..03ebb44 100644 --- a/packages/doorman-api/functions/common/ddb.private.js +++ b/packages/doorman-api/functions/common/ddb.private.js @@ -142,7 +142,7 @@ exports.getDoorConfigCommand = (door) => { S: `door-${door}`, }, "SK": { - S: "config-update", + S: "config", }, }, }); @@ -167,7 +167,7 @@ exports.replaceDoorConfigWithUpdateItem = (newConfigItem) => { ...newConfigItem.Item, SK: { S: "config" }, }; - + delete newItem.approvalId; return new PutItemCommand({ diff --git a/packages/doorman-ui/src/pages/DoorPage.tsx b/packages/doorman-ui/src/pages/DoorPage.tsx index 13d69a7..0fb6db4 100644 --- a/packages/doorman-ui/src/pages/DoorPage.tsx +++ b/packages/doorman-ui/src/pages/DoorPage.tsx @@ -254,7 +254,7 @@ export function DoorPage() { > - That's it! Enter the building and hit floor 11 on the elevator. We are unit 1105, just to the left off the elevator + {doorResponse.greeting || "The door is unlocked!"} diff --git a/packages/doorman-ui/src/pages/EditPage.tsx b/packages/doorman-ui/src/pages/EditPage.tsx index 00b7592..9c9b4b5 100644 --- a/packages/doorman-ui/src/pages/EditPage.tsx +++ b/packages/doorman-ui/src/pages/EditPage.tsx @@ -4,7 +4,7 @@ import { DoorResponse } from "../types/DoorResponse"; import { useForm } from "react-hook-form"; import { InputTokenGroup } from "../components/InputTokenGroup"; -export type DoorEditForm = DoorResponse & { pin: string, fallbackNumber: string, discordUser: string, greeting: string }; +export type DoorEditForm = DoorResponse & { pin: string, fallbackNumber: string, discordUser: string }; export const EditPage = () => { const doorResponse = useLoaderData() as DoorResponse; diff --git a/packages/doorman-ui/src/types/DoorResponse.ts b/packages/doorman-ui/src/types/DoorResponse.ts index 271d934..9a8a9a2 100644 --- a/packages/doorman-ui/src/types/DoorResponse.ts +++ b/packages/doorman-ui/src/types/DoorResponse.ts @@ -6,4 +6,5 @@ export interface DoorResponse { pressKey: string; discordUsers: string[]; buzzer: string; + greeting: string; };