Added null handling for urls

Author: jzongker

src/helpers/PageHelper.ts

@@ -6,8 +6,10 @@ export class PageHelper {
 
   static sortLevel(items: PageLink[]) {
     return items.sort((a, b) => {
-      if (a.url < b.url) return -1;
-      if (a.url > b.url) return 1;
+      const aUrl = a.url || "";
+      const bUrl = b.url || "";
+      if (aUrl < bUrl) return -1;
+      if (aUrl > bUrl) return 1;
       return 0;
     });
   }
@@ -19,8 +21,9 @@ export class PageHelper {
 
     const groupPage = result.find((p) => p.url === "/groups");
     customPages.forEach((p: any) => {
-      const page: PageLink = { pageId: p.id, title: p.title, url: p.url, custom: true };
-      if (p.url.indexOf("/groups") === -1) {
+      const url = p.url || "";
+      const page: PageLink = { pageId: p.id, title: p.title, url: url, custom: true };
+      if (url.indexOf("/groups") === -1) {
         const existing = result.find((r) => r.url === p.url);
         if (existing) { existing.title = p.title; existing.custom = true; existing.pageId = p.id; } else result.push(page);
       } else {

src/site/PagesPage.tsx

@@ -56,7 +56,7 @@ export const PagesPage = () => {
     const result: React.ReactElement[] = [];
     items.forEach((item) => {
       result.push(
-        <TableRow key={item.url} sx={{ "&:hover": { backgroundColor: "action.hover" }, transition: "background-color 0.2s ease" }}>
+        <TableRow key={item.url || item.pageId || item.title} sx={{ "&:hover": { backgroundColor: "action.hover" }, transition: "background-color 0.2s ease" }}>
           <TableCell sx={{ width: 120 }}>
             {item.custom ? (
               <Button

src/site/components/AddPageModal.tsx

@@ -218,7 +218,7 @@ export function AddPageModal(props: Props) {
         url: SlugHelper.slugifyString(
           "/" + assembledPage.title.toLowerCase().replace(/\s+/g, "-"),
           "urlPath"
-        )
+        ) || "/untitled"
       };
 
       // Create page record
@@ -278,6 +278,7 @@ export function AddPageModal(props: Props) {
           const p = { ...page };
           const slugString = link?.text || page.title || "new-page";
           p.url = props.requestedSlug || SlugHelper.slugifyString("/" + slugString.toLowerCase().replace(" ", "-"), "urlPath");
+          if (!p.url) p.url = "/untitled";
 
           pageData = await ApiHelper.post("/pages", [p], "ContentApi").then((data: any) => {
             setPage(data[0]);