QRunIO/qqq-frontend-material-dashboard
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq-frontend-material-dashboard.git synced 2025-07-17 21:00:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

CE-889 - try to fix NPE's on localeCompares

Browse Source
This commit is contained in:
darin.kelkhoff
2024-03-04 15:09:22 -06:00
parent e925310173
commit ad7ea994a8
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/CommandMenu.tsx
View File

@ -36,7 +36,7 @@ import Icon from "@mui/material/Icon";
import Typography from "@mui/material/Typography"; import Typography from "@mui/material/Typography";
import {makeStyles} from "@mui/styles"; import {makeStyles} from "@mui/styles";
import {Command} from "cmdk"; import {Command} from "cmdk";
import React, {useContext, useEffect, useRef, useState} from "react"; import React, {useContext, useEffect, useRef} from "react";
import {useNavigate} from "react-router-dom"; import {useNavigate} from "react-router-dom";
import QContext from "QContext"; import QContext from "QContext";
import HistoryUtils, {QHistoryEntry} from "qqq/utils/HistoryUtils"; import HistoryUtils, {QHistoryEntry} from "qqq/utils/HistoryUtils";
@ -174,7 +174,9 @@ const CommandMenu = ({metaData}: Props) =>
}) })
tableNames = tableNames.sort((a: string, b:string) => tableNames = tableNames.sort((a: string, b:string) =>
{ {
return (metaData.tables.get(a).label.localeCompare(metaData.tables.get(b).label)); const labelA = metaData.tables.get(a).label ?? "";
const labelB = metaData.tables.get(b).label ?? "";
return (labelA.localeCompare(labelB));
}) })
const path = location.pathname; const path = location.pathname;
@ -222,7 +224,9 @@ const CommandMenu = ({metaData}: Props) =>
}) })
tableNames = tableNames.sort((a: string, b:string) => tableNames = tableNames.sort((a: string, b:string) =>
{ {
return (metaData.tables.get(a).label.localeCompare(metaData.tables.get(b).label)); const labelA = metaData.tables.get(a).label ?? "";
const labelB = metaData.tables.get(b).label ?? "";
return (labelA.localeCompare(labelB));
}) })
return( return(
<Command.Group heading="Tables"> <Command.Group heading="Tables">
@ -252,7 +256,9 @@ const CommandMenu = ({metaData}: Props) =>
appNames = appNames.sort((a: string, b:string) => appNames = appNames.sort((a: string, b:string) =>
{ {
return (getFullAppLabel(metaData.appTree, a, 1, "").localeCompare(getFullAppLabel(metaData.appTree, b, 1, ""))); const labelA = getFullAppLabel(metaData.appTree, a, 1, "") ?? "";
const labelB = getFullAppLabel(metaData.appTree, b, 1, "") ?? "";
return (labelA.localeCompare(labelB));
}) })
return( return(
@ -286,7 +292,9 @@ const CommandMenu = ({metaData}: Props) =>
appNames = appNames.sort((a: string, b:string) => appNames = appNames.sort((a: string, b:string) =>
{ {
return (metaData.apps.get(a).label.localeCompare(metaData.apps.get(b).label)); const labelA = metaData.apps.get(a).label ?? "";
const labelB = metaData.apps.get(b).label ?? "";
return (labelA.localeCompare(labelB));
}) })
const entryMap = new Map<string, boolean>(); const entryMap = new Map<string, boolean>();