@churchapps/apphelper 0.1.6 → 0.1.7

package/src/components/notes/Conversations.tsx

@@ -1,58 +1,58 @@
-import React from "react";
-import { Loading } from "../";
-import { ApiHelper, ArrayHelper } from "../../helpers";
-import { ConversationInterface, UserContextInterface } from "../../interfaces";
-import { Conversation } from "./Conversation";
-import { NewConversation } from "./NewConversation";
-
-interface Props {
-  contentType: string;
-  contentId: string;
-  groupId: string;
-  context: UserContextInterface;
-}
-
-export function Conversations(props: Props) {
-
-  const [conversations, setConversations] = React.useState<ConversationInterface[]>(null)
-  //const [editMessageId, setEditMessageId] = React.useState(null)
-
-  const loadConversations = async () => {
-    const conversations: ConversationInterface[] = (props.contentId) ? await ApiHelper.get("/conversations/" + props.contentType + "/" + props.contentId, "MessagingApi") : [];
-    if (conversations.length > 0) {
-      const peopleIds: string[] = [];
-      conversations.forEach(c => {
-        c.messages.forEach(m => {
-          if (peopleIds.indexOf(m.personId) === -1) peopleIds.push(m.personId);
-        });
-      })
-      const people = await ApiHelper.get("/people/ids?ids=" + peopleIds.join(","), "MembershipApi");
-      conversations.forEach(c => {
-        c.messages.forEach(m => {
-          m.person = ArrayHelper.getOne(people, "id", m.personId);
-        });
-      })
-    }
-    setConversations(conversations);
-    //setEditMessageId(null);
-  };
-
-  const getConversations = () => {
-    if (conversations.length === 0) return <></>
-    else {
-      let noteArray: React.ReactNode[] = [];
-      for (let i = 0; i < conversations.length; i++) noteArray.push(<Conversation context={props.context} conversation={conversations[i]} key={conversations[i].id} />);
-      return noteArray;
-    }
-  }
-
-  React.useEffect(() => { loadConversations() }, [props.contentId]); //eslint-disable-line
-
-  if (!conversations) return <Loading />
-  else return (
-    <>
-      <NewConversation context={props.context} contentType={props.contentType} contentId={props.contentId} onUpdate={loadConversations} groupId={props.groupId} visibility="public" />
-      {getConversations()}
-    </>
-  );
-};
+import React from "react";
+import { Loading } from "../";
+import { ApiHelper, ArrayHelper } from "../../helpers";
+import { ConversationInterface, UserContextInterface } from "../../interfaces";
+import { Conversation } from "./Conversation";
+import { NewConversation } from "./NewConversation";
+
+interface Props {
+  contentType: string;
+  contentId: string;
+  groupId: string;
+  context: UserContextInterface;
+}
+
+export function Conversations(props: Props) {
+
+  const [conversations, setConversations] = React.useState<ConversationInterface[]>(null)
+  //const [editMessageId, setEditMessageId] = React.useState(null)
+
+  const loadConversations = async () => {
+    const conversations: ConversationInterface[] = (props.contentId) ? await ApiHelper.get("/conversations/" + props.contentType + "/" + props.contentId, "MessagingApi") : [];
+    if (conversations.length > 0) {
+      const peopleIds: string[] = [];
+      conversations.forEach(c => {
+        c.messages.forEach(m => {
+          if (peopleIds.indexOf(m.personId) === -1) peopleIds.push(m.personId);
+        });
+      })
+      const people = await ApiHelper.get("/people/ids?ids=" + peopleIds.join(","), "MembershipApi");
+      conversations.forEach(c => {
+        c.messages.forEach(m => {
+          m.person = ArrayHelper.getOne(people, "id", m.personId);
+        });
+      })
+    }
+    setConversations(conversations);
+    //setEditMessageId(null);
+  };
+
+  const getConversations = () => {
+    if (conversations.length === 0) return <></>
+    else {
+      let noteArray: React.ReactNode[] = [];
+      for (let i = 0; i < conversations.length; i++) noteArray.push(<Conversation context={props.context} conversation={conversations[i]} key={conversations[i].id} />);
+      return noteArray;
+    }
+  }
+
+  React.useEffect(() => { loadConversations() }, [props.contentId]); //eslint-disable-line
+
+  if (!conversations) return <Loading />
+  else return (
+    <>
+      <NewConversation context={props.context} contentType={props.contentType} contentId={props.contentId} onUpdate={loadConversations} groupId={props.groupId} visibility="public" />
+      {getConversations()}
+    </>
+  );
+};

package/src/components/notes/NewConversation.tsx

@@ -1,78 +1,78 @@
-import { Icon, Paper, Stack, TextField } from "@mui/material";
-import React from "react";
-import { ApiHelper, PersonHelper } from "../../helpers";
-import { ConversationInterface, MessageInterface, UserContextInterface } from "../../interfaces";
-import { ErrorMessages } from "../ErrorMessages";
-import { SmallButton } from "../SmallButton";
-
-interface Props {
-  contentType: string;
-  contentId: string;
-  groupId: string;
-  visibility: "public" | "hidden";
-  context: UserContextInterface;
-  onUpdate: () => void;
-}
-
-export function NewConversation({ context, ...props }: Props) {
-  const [message, setMessage] = React.useState<MessageInterface>({})
-  const [errors, setErrors] = React.useState<string[]>([]);
-  const [isSubmitting, setIsSubmitting] = React.useState(false);
-
-  const handleChange = (e: React.ChangeEvent<HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement>) => {
-    setErrors([]);
-    const m = { ...message } as MessageInterface;
-    m.content = e.target.value;
-    setMessage(m);
-  }
-
-  const validate = () => {
-    const result = [];
-    if (!message.content.trim()) result.push("Please enter a note.");
-    setErrors(result);
-    return result.length === 0;
-  }
-
-  async function handleSave() {
-    if (validate()) {
-      setIsSubmitting(true);
-
-      const conv: ConversationInterface = { contentType: props.contentType, contentId: props.contentId, title: props.contentType + " " + props.contentId + " Conversation", groupId: props.groupId, visibility: props.visibility, allowAnonymousPosts: false }
-      const result = await ApiHelper.post("/conversations", [conv], "MessagingApi");
-      const cId = result[0].id;
-
-      const m = { ...message };
-      m.conversationId = cId;
-      ApiHelper.post("/messages", [m], "MessagingApi")
-        .then(() => {
-          props.onUpdate();
-          const m = { ...message } as MessageInterface;
-          m.content = "";
-          setMessage(m);
-        })
-        .finally(() => { setIsSubmitting(false); });
-
-    }
-  };
-
-  const image = PersonHelper.getPhotoUrl(context?.person)
-
-  return (
-    <Paper sx={{ padding: 1, marginBottom: 2 }}>
-      <ErrorMessages errors={errors} />
-
-      <Stack direction="row" spacing={1.5} style={{ marginTop: 15 }} justifyContent="end">
-
-        {image ? <img src={image} alt="user" style={{ width: 60, height: 45, borderRadius: 5, marginLeft: 8 }} /> : <Icon>person</Icon>}
-        <Stack direction="column" spacing={2} style={{ width: "100%" }} justifyContent="end">
-          <div><b>{context?.person?.name?.display}</b></div>
-          <TextField fullWidth name="noteText" aria-label={"Start a conversation"} placeholder="Start a conversation" multiline style={{ marginTop: 0, border: "none" }} variant="standard" onChange={handleChange} value={message.content} />
-        </Stack>
-        <Stack direction="column" spacing={1} justifyContent="end">
-          <SmallButton icon="send" onClick={handleSave} disabled={isSubmitting} />
-        </Stack>
-      </Stack>
-    </Paper>
-  );
-
-};
+import { Icon, Paper, Stack, TextField } from "@mui/material";
+import React from "react";
+import { ApiHelper, PersonHelper } from "../../helpers";
+import { ConversationInterface, MessageInterface, UserContextInterface } from "../../interfaces";
+import { ErrorMessages } from "../ErrorMessages";
+import { SmallButton } from "../SmallButton";
+
+interface Props {
+  contentType: string;
+  contentId: string;
+  groupId: string;
+  visibility: "public" | "hidden";
+  context: UserContextInterface;
+  onUpdate: () => void;
+}
+
+export function NewConversation({ context, ...props }: Props) {
+  const [message, setMessage] = React.useState<MessageInterface>({})
+  const [errors, setErrors] = React.useState<string[]>([]);
+  const [isSubmitting, setIsSubmitting] = React.useState(false);
+
+  const handleChange = (e: React.ChangeEvent<HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement>) => {
+    setErrors([]);
+    const m = { ...message } as MessageInterface;
+    m.content = e.target.value;
+    setMessage(m);
+  }
+
+  const validate = () => {
+    const result = [];
+    if (!message.content.trim()) result.push("Please enter a note.");
+    setErrors(result);
+    return result.length === 0;
+  }
+
+  async function handleSave() {
+    if (validate()) {
+      setIsSubmitting(true);
+
+      const conv: ConversationInterface = { contentType: props.contentType, contentId: props.contentId, title: props.contentType + " " + props.contentId + " Conversation", groupId: props.groupId, visibility: props.visibility, allowAnonymousPosts: false }
+      const result = await ApiHelper.post("/conversations", [conv], "MessagingApi");
+      const cId = result[0].id;
+
+      const m = { ...message };
+      m.conversationId = cId;
+      ApiHelper.post("/messages", [m], "MessagingApi")
+        .then(() => {
+          props.onUpdate();
+          const m = { ...message } as MessageInterface;
+          m.content = "";
+          setMessage(m);
+        })
+        .finally(() => { setIsSubmitting(false); });
+
+    }
+  };
+
+  const image = PersonHelper.getPhotoUrl(context?.person)
+
+  return (
+    <Paper sx={{ padding: 1, marginBottom: 2 }}>
+      <ErrorMessages errors={errors} />
+
+      <Stack direction="row" spacing={1.5} style={{ marginTop: 15 }} justifyContent="end">
+
+        {image ? <img src={image} alt="user" style={{ width: 60, height: 45, borderRadius: 5, marginLeft: 8 }} /> : <Icon>person</Icon>}
+        <Stack direction="column" spacing={2} style={{ width: "100%" }} justifyContent="end">
+          <div><b>{context?.person?.name?.display}</b></div>
+          <TextField fullWidth name="noteText" aria-label={"Start a conversation"} placeholder="Start a conversation" multiline style={{ marginTop: 0, border: "none" }} variant="standard" onChange={handleChange} value={message.content} />
+        </Stack>
+        <Stack direction="column" spacing={1} justifyContent="end">
+          <SmallButton icon="send" onClick={handleSave} disabled={isSubmitting} />
+        </Stack>
+      </Stack>
+    </Paper>
+  );
+
+};

package/src/components/notes/Note.tsx

@@ -1,44 +1,44 @@
-import { Icon, IconButton, Stack, Box } from "@mui/material";
-import React, { useState, useEffect } from "react";
-import { DateHelper, PersonHelper } from "../../helpers"
-import { MessageInterface } from "../../interfaces"
-
-interface Props {
-  message: MessageInterface;
-  showEditNote: (noteId?: string) => void
-}
-
-export const Note: React.FC<Props> = (props) => {
-  const [message, setMessage] = useState<MessageInterface>(null);
-
-  useEffect(() => setMessage(props.message), [props.message]);
-
-  if (message === null) return null;
-  const photoUrl = PersonHelper.getPhotoUrl(message.person);
-  let datePosted = new Date(message.timeUpdated || message.timeSent);
-  const displayDuration = DateHelper.getDisplayDuration(datePosted);
-
-  const isEdited = message.timeUpdated && message.timeUpdated !== message.timeSent && <>(edited)</>;
-  const contents = message.content?.split("\n");
-  return (
-    <div className="note">
-      <div className="postedBy">
-        <img src={photoUrl} alt="avatar" />
-      </div>
-      <Box sx={{ width: "100%" }} className="note-contents">
-        <Stack direction="row" justifyContent="space-between">
-          <div>
-            <b>{message.person?.name?.display}</b> · <span className="text-grey">{displayDuration}{isEdited}</span>
-            {contents.map((c, i) => c ? <p key={i}>{c}</p> : <br />)}
-          </div>
-          <div>
-            <IconButton aria-label="editNote" onClick={() => props.showEditNote(message.id)}>
-              <Icon style={{ color: "#03a9f4" }}>edit</Icon>
-            </IconButton>
-          </div>
-        </Stack>
-
-      </Box>
-    </div>
-  );
-};
+import { Icon, IconButton, Stack, Box } from "@mui/material";
+import React, { useState, useEffect } from "react";
+import { DateHelper, PersonHelper } from "../../helpers"
+import { MessageInterface } from "../../interfaces"
+
+interface Props {
+  message: MessageInterface;
+  showEditNote: (noteId?: string) => void
+}
+
+export const Note: React.FC<Props> = (props) => {
+  const [message, setMessage] = useState<MessageInterface>(null);
+
+  useEffect(() => setMessage(props.message), [props.message]);
+
+  if (message === null) return null;
+  const photoUrl = PersonHelper.getPhotoUrl(message.person);
+  let datePosted = new Date(message.timeUpdated || message.timeSent);
+  const displayDuration = DateHelper.getDisplayDuration(datePosted);
+
+  const isEdited = message.timeUpdated && message.timeUpdated !== message.timeSent && <>(edited)</>;
+  const contents = message.content?.split("\n");
+  return (
+    <div className="note">
+      <div className="postedBy">
+        <img src={photoUrl} alt="avatar" />
+      </div>
+      <Box sx={{ width: "100%" }} className="note-contents">
+        <Stack direction="row" justifyContent="space-between">
+          <div>
+            <b>{message.person?.name?.display}</b> · <span className="text-grey">{displayDuration}{isEdited}</span>
+            {contents.map((c, i) => c ? <p key={i}>{c}</p> : <br />)}
+          </div>
+          <div>
+            <IconButton aria-label="editNote" onClick={() => props.showEditNote(message.id)}>
+              <Icon style={{ color: "#03a9f4" }}>edit</Icon>
+            </IconButton>
+          </div>
+        </Stack>
+
+      </Box>
+    </div>
+  );
+};

package/src/components/notes/Notes.tsx

@@ -1,68 +1,69 @@
-import React from "react";
-import { Note } from "./Note";
-import { AddNote } from "./AddNote";
-import { DisplayBox, Loading } from "../";
-import { ApiHelper, ArrayHelper } from "../../helpers";
-import { MessageInterface, UserContextInterface } from "../../interfaces";
-
-interface Props {
-  //showEditNote: (messageId?: string) => void;
-  conversationId: string;
-  createConversation?: () => Promise<string>;
-  noDisplayBox?: boolean;
-  context: UserContextInterface;
-  maxHeight?: any;
-}
-
-export function Notes(props: Props) {
-
-  const [messages, setMessages] = React.useState<MessageInterface[]>(null)
-  const [editMessageId, setEditMessageId] = React.useState(null)
-
-  const loadNotes = async () => {
-    const messages: MessageInterface[] = (props.conversationId) ? await ApiHelper.get("/messages/conversation/" + props.conversationId, "MessagingApi") : [];
-    if (messages.length > 0) {
-      const peopleIds = ArrayHelper.getIds(messages, "personId");
-      const people = await ApiHelper.get("/people/ids?ids=" + peopleIds.join(","), "MembershipApi");
-      messages.forEach(n => {
-        n.person = ArrayHelper.getOne(people, "id", n.personId);
-      })
-    }
-    setMessages(messages);
-    setEditMessageId(null);
-  };
-
-  const getNotes = () => {
-    if (!messages) return <Loading />
-    if (messages.length === 0) return <></>
-    else {
-      let noteArray: React.ReactNode[] = [];
-      for (let i = 0; i < messages.length; i++) noteArray.push(<Note message={messages[i]} key={messages[i].id} showEditNote={setEditMessageId} />);
-      return noteArray;
-    }
-  }
-
-  const getNotesWrapper = () => {
-    const notes = getNotes();
-    if (props.maxHeight) return <div id="notesScroll" style={{maxHeight: props.maxHeight, overflowY: "scroll"}}>{notes}</div>
-    else return notes;
-  }
-
-  React.useEffect(() => { loadNotes() }, [props.conversationId]); //eslint-disable-line
-
-  React.useEffect(() => {
-    if (props.maxHeight && messages?.length>0) {
-      setTimeout(() => {
-        const element = window?.document?.getElementById("notesScroll");
-        if (element) element.scrollTop = element.scrollHeight;
-      }, 100);
-    }
-  }, [messages, props.maxHeight]);
-
-  let result = <>
-    {getNotesWrapper()}
-    {messages && (<AddNote context={props.context} conversationId={props.conversationId} onUpdate={loadNotes} createConversation={props.createConversation} messageId={editMessageId} />)}
-  </>
-  if (props.noDisplayBox) return result;
-  else return (<DisplayBox id="notesBox" data-cy="notes-box" headerIcon="sticky_note_2" headerText="Notes">{result}</DisplayBox>);
-};
+import React from "react";
+import { Note } from "./Note";
+import { AddNote } from "./AddNote";
+import { DisplayBox, Loading } from "../";
+import { ApiHelper, ArrayHelper } from "../../helpers";
+import { MessageInterface, UserContextInterface } from "../../interfaces";
+
+interface Props {
+  //showEditNote: (messageId?: string) => void;
+  conversationId: string;
+  createConversation?: () => Promise<string>;
+  noDisplayBox?: boolean;
+  context: UserContextInterface;
+  maxHeight?: any;
+  refreshKey?: number;
+}
+
+export function Notes(props: Props) {
+
+  const [messages, setMessages] = React.useState<MessageInterface[]>(null)
+  const [editMessageId, setEditMessageId] = React.useState(null)
+
+  const loadNotes = async () => {
+    const messages: MessageInterface[] = (props.conversationId) ? await ApiHelper.get("/messages/conversation/" + props.conversationId, "MessagingApi") : [];
+    if (messages.length > 0) {
+      const peopleIds = ArrayHelper.getIds(messages, "personId");
+      const people = await ApiHelper.get("/people/ids?ids=" + peopleIds.join(","), "MembershipApi");
+      messages.forEach(n => {
+        n.person = ArrayHelper.getOne(people, "id", n.personId);
+      })
+    }
+    setMessages(messages);
+    setEditMessageId(null);
+  };
+
+  const getNotes = () => {
+    if (!messages) return <Loading />
+    if (messages.length === 0) return <></>
+    else {
+      let noteArray: React.ReactNode[] = [];
+      for (let i = 0; i < messages.length; i++) noteArray.push(<Note message={messages[i]} key={messages[i].id} showEditNote={setEditMessageId} />);
+      return noteArray;
+    }
+  }
+
+  const getNotesWrapper = () => {
+    const notes = getNotes();
+    if (props.maxHeight) return <div id="notesScroll" style={{maxHeight: props.maxHeight, overflowY: "scroll"}}>{notes}</div>
+    else return notes;
+  }
+
+  React.useEffect(() => { loadNotes() }, [props.conversationId, props.refreshKey]); //eslint-disable-line
+
+  React.useEffect(() => {
+    if (props.maxHeight && messages?.length>0) {
+      setTimeout(() => {
+        const element = window?.document?.getElementById("notesScroll");
+        if (element) element.scrollTop = element.scrollHeight;
+      }, 100);
+    }
+  }, [messages, props.maxHeight]);
+
+  let result = <>
+    {getNotesWrapper()}
+    {messages && (<AddNote context={props.context} conversationId={props.conversationId} onUpdate={loadNotes} createConversation={props.createConversation} messageId={editMessageId} />)}
+  </>
+  if (props.noDisplayBox) return result;
+  else return (<DisplayBox id="notesBox" data-cy="notes-box" headerIcon="sticky_note_2" headerText="Notes">{result}</DisplayBox>);
+};

package/src/components/notes/index.ts

@@ -1,5 +1,5 @@
-export { Notes } from "./Notes";
-export { Note } from "./Note";
-export { Conversation } from "./Conversation";
-export { Conversations } from "./Conversations";
-export { AddNote } from "./AddNote";
+export { Notes } from "./Notes";
+export { Note } from "./Note";
+export { Conversation } from "./Conversation";
+export { Conversations } from "./Conversations";
+export { AddNote } from "./AddNote";