Skip to content
Merged

Main #76

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/ISSUE_TEMPLATE/testing_issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ body:
- "All Workgroups"
- "Archival Workgroup"
- "Dework PBL"
- "Education Guild"
- "Gamers Guild"
- "Governance Workgroup"
- "Knowledge Base Workgroup"
Expand All @@ -69,6 +70,9 @@ body:
- "Treasury Guild"
- "Video Workgroup"
- "Writers Workgroup"
- "Research and Development Guild"
- "Ambassadors Town Hall"
- "Deep Funding Town Hall"
default: 0
validations:
required: true
Expand Down
13 changes: 1 addition & 12 deletions components/SummaryAgendaItems.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
14 changes: 7 additions & 7 deletions components/SummaryMeetingInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -346,13 +346,7 @@ const SummaryMeetingInfo: React.FC<SummaryMeetingInfoProps> = ({ workgroup, onUp
updateMyVariable={updateMyVariable}
/>
)}
{myVariable.workgroup?.preferred_template?.meetingInfo?.timestampedVideo == 1 && (
<TimestampedVideo
onUpdate={handleVideoDataUpdate}
initialData={meetingInfo.timestampedVideo}
/>
)}
{myVariable.workgroup?.preferred_template?.meetingInfo?.googleSlides == 1 && (<>
{myVariable.workgroup?.preferred_template?.meetingInfo?.googleSlides == 1 && (<>
<label className={styles['form-label']}>
Google Slides (Optional):
</label>
Expand All @@ -365,6 +359,12 @@ const SummaryMeetingInfo: React.FC<SummaryMeetingInfoProps> = ({ workgroup, onUp
autoComplete="off"
/>
</>)}
{myVariable.workgroup?.preferred_template?.meetingInfo?.timestampedVideo == 1 && (
<TimestampedVideo
onUpdate={handleVideoDataUpdate}
initialData={meetingInfo.timestampedVideo}
/>
)}
</div>
</>
);
Expand Down
3 changes: 1 addition & 2 deletions context/MyVariableContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ type MyVariable = {
tags?: any;
currentUser?: string;
agendaItemOrder: any;
selectedDate: any;
// other keys go here
};

Expand All @@ -43,7 +42,7 @@ interface MyVariableProviderProps {
}

export const MyVariableProvider: React.FC<MyVariableProviderProps> = ({ children }) => {
const [myVariable, setMyVariable] = useState<MyVariable>({ groupInfo: [], projectInfo: undefined, workgroup: undefined, summaries: undefined, summary: undefined, roles: undefined, isLoggedIn: undefined, names: [], tags: {}, currentUser: "", agendaItemOrder: {}, selectedDate: undefined });
const [myVariable, setMyVariable] = useState<MyVariable>({ groupInfo: [], projectInfo: undefined, workgroup: undefined, summaries: undefined, summary: undefined, roles: undefined, isLoggedIn: undefined, names: [], tags: {}, currentUser: "", agendaItemOrder: {} });

return (
<MyVariableContext.Provider value={{ myVariable, setMyVariable }}>
Expand Down
5 changes: 3 additions & 2 deletions pages/submit-meeting-summary/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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(() => {
Expand Down