From bcd262dd46553be1625549b365a00c9fb6704856 Mon Sep 17 00:00:00 2001 From: Ari Date: Wed, 18 May 2022 10:54:53 -0400 Subject: [PATCH] - fixed up optional metadata + + desc - using timestamp for default new ids ' --- .../AutomationEditor/AutoInfoBox.tsx | 4 +- .../AutomationList/AutomationList.stories.tsx | 52 +++++++++++++++++++ .../AutomationList/AutomationListBox.tsx | 8 +-- .../src/components/AutomationList/index.tsx | 2 +- webapp/src/types/validators/metadata.ts | 4 +- 5 files changed, 61 insertions(+), 9 deletions(-) diff --git a/webapp/src/components/AutomationEditor/AutoInfoBox.tsx b/webapp/src/components/AutomationEditor/AutoInfoBox.tsx index 16cbe49..89da26b 100644 --- a/webapp/src/components/AutomationEditor/AutoInfoBox.tsx +++ b/webapp/src/components/AutomationEditor/AutoInfoBox.tsx @@ -80,8 +80,8 @@ export const AutoInfoBox: FC = ({ return
- - + + 0) { if ( !( - a.metadata.description.toLocaleLowerCase().includes(searchText) || - a.metadata.alias.toLocaleLowerCase().includes(searchText) + (a.metadata.description ?? "").toLocaleLowerCase().includes(searchText) || + (a.metadata.alias ?? "").toLocaleLowerCase().includes(searchText) ) ) { return false @@ -169,8 +169,8 @@ export const MetadataBox: FC<{ let title = {"BadAuto<>"} if (auto.metadata) { title = <> - {String(auto.metadata.alias).slice(0, 15)} ({String(auto.metadata.id).slice(0, 5)}) - {String(auto.metadata.description).slice(0, 25)} + {String(auto.metadata.alias ?? "").slice(0, 15)} ({String(auto.metadata.id).slice(0, 5)}) + {String(auto.metadata.description ?? "").slice(0, 25)} } return
= ({ { - onAdd(defaultAutomation(`shortu-${automations.length}`)); + onAdd(defaultAutomation(String(Date.now()))); setCurrent(automations.length) }} onSelectAutomation={i => { diff --git a/webapp/src/types/validators/metadata.ts b/webapp/src/types/validators/metadata.ts index 2e272a2..38c76fb 100644 --- a/webapp/src/types/validators/metadata.ts +++ b/webapp/src/types/validators/metadata.ts @@ -3,8 +3,8 @@ import * as st from 'superstruct' export const AutomationMetadata = st.object({ id: st.string(), - alias: st.string(), - description: st.string(), + alias: st.optional(st.string()), + description: st.optional(st.string()), trigger_variables: st.optional(st.nullable(st.record(st.string(), st.string()))), mode: st.enums(["single", "restart", "queued", "parallel"]), }) \ No newline at end of file