diff --git a/components/SummaryAgendaItems.tsx b/components/SummaryAgendaItems.tsx index 0421c9f..4d33de5 100644 --- a/components/SummaryAgendaItems.tsx +++ b/components/SummaryAgendaItems.tsx @@ -346,18 +346,7 @@ const SummaryAgendaItems = ({ onUpdate }: any) => { type WorkgroupKey = keyof typeof orderMapping; - const orderMapping = myVariable?.agendaItemOrder; /*{ - "Gamers Guild": ["narrative", "decisionItems", "actionItems", "gameRules", "leaderboard"], - "Writers Workgroup": ["narrative", "decisionItems", "actionItems", "learningPoints"], - "Video Workgroup": ["discussionPoints", "decisionItems", "actionItems"], - "Archival Workgroup": ["actionItems", "decisionItems", "learningPoints"], - "Treasury Guild": ["actionItems", "decisionItems", "discussionPoints"], - "Dework PBL": ["actionItems", "decisionItems", "discussionPoints"], - "Knowledge Base Workgroup": ["actionItems", "decisionItems", "discussionPoints"], - "Onboarding Workgroup": ["townHallUpdates", "discussionPoints", "decisionItems", "actionItems", "learningPoints", "issues"], - "Translation Workgroup": ["discussionPoints", "decisionItems", "actionItems", "issues"], - "Governance Workgroup": ["narrative", "decisionItems", "actionItems", "DiscussionPoints"] -};*/ + const orderMapping = myVariable?.agendaItemOrder; const reorderItemTypesConfig = (orderKey: WorkgroupKey) => { const order = orderMapping[orderKey]; diff --git a/components/SummaryMeetingInfo.tsx b/components/SummaryMeetingInfo.tsx index 76108b0..5294bb3 100644 --- a/components/SummaryMeetingInfo.tsx +++ b/components/SummaryMeetingInfo.tsx @@ -346,13 +346,7 @@ const SummaryMeetingInfo: React.FC = ({ workgroup, onUp updateMyVariable={updateMyVariable} /> )} - {myVariable.workgroup?.preferred_template?.meetingInfo?.timestampedVideo == 1 && ( - - )} - {myVariable.workgroup?.preferred_template?.meetingInfo?.googleSlides == 1 && (<> + {myVariable.workgroup?.preferred_template?.meetingInfo?.googleSlides == 1 && (<> @@ -365,6 +359,12 @@ const SummaryMeetingInfo: React.FC = ({ workgroup, onUp autoComplete="off" /> )} + {myVariable.workgroup?.preferred_template?.meetingInfo?.timestampedVideo == 1 && ( + + )} ); diff --git a/context/MyVariableContext.tsx b/context/MyVariableContext.tsx index 30c3094..a0006d6 100644 --- a/context/MyVariableContext.tsx +++ b/context/MyVariableContext.tsx @@ -27,7 +27,6 @@ type MyVariable = { tags?: any; currentUser?: string; agendaItemOrder: any; - selectedDate: any; // other keys go here }; @@ -43,7 +42,7 @@ interface MyVariableProviderProps { } export const MyVariableProvider: React.FC = ({ children }) => { - const [myVariable, setMyVariable] = useState({ groupInfo: [], projectInfo: undefined, workgroup: undefined, summaries: undefined, summary: undefined, roles: undefined, isLoggedIn: undefined, names: [], tags: {}, currentUser: "", agendaItemOrder: {}, selectedDate: undefined }); + const [myVariable, setMyVariable] = useState({ groupInfo: [], projectInfo: undefined, workgroup: undefined, summaries: undefined, summary: undefined, roles: undefined, isLoggedIn: undefined, names: [], tags: {}, currentUser: "", agendaItemOrder: {} }); return ( diff --git a/pages/submit-meeting-summary/index.tsx b/pages/submit-meeting-summary/index.tsx index 9549b31..8aca3f3 100644 --- a/pages/submit-meeting-summary/index.tsx +++ b/pages/submit-meeting-summary/index.tsx @@ -83,8 +83,9 @@ const SubmitMeetingSummary: NextPage = () => { "Governance Workgroup": ["narrative", "discussionPoints", "decisionItems", "actionItems"], "Education Workgroup": ["meetingTopics", "discussionPoints", "decisionItems", "actionItems"], "Marketing Guild": ["discussionPoints", "decisionItems", "actionItems"], - "Ambassador Town Hall": ["townHallSummary", "discussionPoints", "decisionItems", "actionItems"], - "Deep Funding Town Hall": ["townHallSummary", "discussionPoints", "decisionItems", "actionItems"] + "Ambassador Town Hall": ["townHallSummary"], + "Deep Funding Town Hall": ["townHallSummary"], + "One-off Event": ["Narative"] }; useEffect(() => {