null checks

cityssm · Jun 7, 2022 · 98a54d2 · 98a54d2
1 parent 30b2296
commit 98a54d2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/handlers/admin-get/licenceCategories.js b/handlers/admin-get/licenceCategories.js
@@ -5,8 +5,8 @@ import { getPrintEJSList } from "../../helpers/functions.print.js";
 export const handler = async (_request, response) => {
  cacheFunctions.clearAll();
  const licenceCategories = cacheFunctions.getLicenceCategories();
- const licenceLengthFunctionNames = getLicenceLengthFunctionNames();
- const additionalFeeFunctionNames = getAdditionalFeeFunctionNames();
+ const licenceLengthFunctionNames = getLicenceLengthFunctionNames() || [];
+ const additionalFeeFunctionNames = getAdditionalFeeFunctionNames() || [];
  const printEJSList = await getPrintEJSList();
  response.render("admin-licenceCategories", {
  headTitle: configFunctions.getProperty("settings.licenceAlias") + " Categories",

diff --git a/handlers/admin-get/licenceCategories.ts b/handlers/admin-get/licenceCategories.ts
@@ -11,8 +11,8 @@ export const handler: RequestHandler = async (_request, response) => {
 
  const licenceCategories = cacheFunctions.getLicenceCategories();
 
- const licenceLengthFunctionNames = getLicenceLengthFunctionNames();
- const additionalFeeFunctionNames = getAdditionalFeeFunctionNames();
+ const licenceLengthFunctionNames = getLicenceLengthFunctionNames() || [];
+ const additionalFeeFunctionNames = getAdditionalFeeFunctionNames() || [];
 
  const printEJSList = await getPrintEJSList();
 

diff --git a/helpers/functions.config.js b/helpers/functions.config.js
@@ -49,7 +49,7 @@ export const getLicenceLengthFunction = (licenceLengthFunctionName) => {
  return getProperty("licenceLengthFunctions")[licenceLengthFunctionName];
 };
 export const getAdditionalFeeFunctionNames = () => {
- return Object.keys(getProperty("additionalFeeFunctions"));
+ return Object.keys(getProperty("additionalFeeFunctions")) || [];
 };
 export const getAdditionalFeeFunction = (additionalFeeFunctionName) => {
  return getProperty("additionalFeeFunctions")[additionalFeeFunctionName];

diff --git a/helpers/functions.config.ts b/helpers/functions.config.ts
@@ -130,7 +130,7 @@ export const getLicenceLengthFunction = (licenceLengthFunctionName: string): con
 };
 
 export const getAdditionalFeeFunctionNames = (): string[] => {
- return Object.keys(getProperty("additionalFeeFunctions"));
+ return Object.keys(getProperty("additionalFeeFunctions")) || [];
 };
 
 export const getAdditionalFeeFunction = (additionalFeeFunctionName: string): configTypes.AdditionalFeeFunction => {