From 9a70ea6ec551c32f712118f020c0e45dc69b5f09 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 21 Aug 2020 10:37:17 +0100
Subject: [PATCH] Remove use of nodejs util module (#4521)

* Remove use of nodejs util module

* Fix comment typo
---
 .../store/src/reducers/api-request-reducer/fail-request.ts  | 3 +--
 .../store/src/reducers/api-request-reducer/start-request.ts | 3 +--
 .../src/reducers/api-request-reducer/succeed-request.ts     | 3 +--
 .../src/reducers/api-request-reducer/update-request.ts      | 5 ++---
 src/frontend/packages/store/src/utils.ts                    | 6 ++++++
 5 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 src/frontend/packages/store/src/utils.ts

diff --git a/src/frontend/packages/store/src/reducers/api-request-reducer/fail-request.ts b/src/frontend/packages/store/src/reducers/api-request-reducer/fail-request.ts
index 1a3826a515..c32e437e5e 100644
--- a/src/frontend/packages/store/src/reducers/api-request-reducer/fail-request.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-reducer/fail-request.ts
@@ -1,7 +1,6 @@
-import { isNullOrUndefined } from 'util';
-
 import { BaseEntityRequestAction } from '../../entity-catalog/action-orchestrator/action-orchestrator';
 import { IFailedRequestAction } from '../../types/request.types';
+import { isNullOrUndefined } from '../../utils';
 import { getEntityRequestState, mergeUpdatingState, setEntityRequestState } from './request-helpers';
 
 export function failRequest(state, action: IFailedRequestAction) {
diff --git a/src/frontend/packages/store/src/reducers/api-request-reducer/start-request.ts b/src/frontend/packages/store/src/reducers/api-request-reducer/start-request.ts
index e6534502a7..7a2446129e 100644
--- a/src/frontend/packages/store/src/reducers/api-request-reducer/start-request.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-reducer/start-request.ts
@@ -1,7 +1,6 @@
-import { isNullOrUndefined } from 'util';
-
 import { BaseEntityRequestAction } from '../../entity-catalog/action-orchestrator/action-orchestrator';
 import { IStartRequestAction } from '../../types/request.types';
+import { isNullOrUndefined } from '../../utils';
 import {
   getEntityRequestState,
   mergeUpdatingState,
diff --git a/src/frontend/packages/store/src/reducers/api-request-reducer/succeed-request.ts b/src/frontend/packages/store/src/reducers/api-request-reducer/succeed-request.ts
index 71b79e9aaa..ee4089a1e1 100644
--- a/src/frontend/packages/store/src/reducers/api-request-reducer/succeed-request.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-reducer/succeed-request.ts
@@ -1,9 +1,8 @@
-import { isNullOrUndefined } from 'util';
-
 import { BaseRequestState } from '../../app-state';
 import { BaseEntityRequestAction } from '../../entity-catalog/action-orchestrator/action-orchestrator';
 import { mergeState } from '../../helpers/reducer.helper';
 import { ISuccessRequestAction, WrapperRequestActionSuccess } from '../../types/request.types';
+import { isNullOrUndefined } from '../../utils';
 import {
   createRequestStateFromResponse,
   getEntityRequestState,
diff --git a/src/frontend/packages/store/src/reducers/api-request-reducer/update-request.ts b/src/frontend/packages/store/src/reducers/api-request-reducer/update-request.ts
index 4d9cbc8ebe..c7e2bfd1a9 100644
--- a/src/frontend/packages/store/src/reducers/api-request-reducer/update-request.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-reducer/update-request.ts
@@ -1,8 +1,7 @@
-import { isNullOrUndefined } from 'util';
-
-import { BaseEntityRequestAction } from '../../entity-catalog/action-orchestrator/action-orchestrator';
 import { BaseRequestState } from '../../app-state';
+import { BaseEntityRequestAction } from '../../entity-catalog/action-orchestrator/action-orchestrator';
 import { IUpdateRequestAction } from '../../types/request.types';
+import { isNullOrUndefined } from '../../utils';
 import { getEntityRequestState, mergeUpdatingState, setEntityRequestState } from './request-helpers';
 
 export function updateRequest(state: BaseRequestState, action: IUpdateRequestAction) {
diff --git a/src/frontend/packages/store/src/utils.ts b/src/frontend/packages/store/src/utils.ts
new file mode 100644
index 0000000000..4167318128
--- /dev/null
+++ b/src/frontend/packages/store/src/utils.ts
@@ -0,0 +1,6 @@
+// We don't want to bring in the utils package from nodejs
+// We only use this one function:
+
+export function isNullOrUndefined(obj: any): boolean {
+  return typeof obj === 'undefined' || obj === null;
+}