From e83df8fa2c03dda5622df184645b16ce31bd830a Mon Sep 17 00:00:00 2001 From: Neil MacDougall Date: Thu, 20 Aug 2020 13:47:07 +0100 Subject: [PATCH 1/2] Remove use of nodejs util module --- .../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..3a28a3fce5 --- /dev/null +++ b/src/frontend/packages/store/src/utils.ts @@ -0,0 +1,6 @@ +// We don't want to brin gin the utils package from nodejs +// We only used this one function + +export function isNullOrUndefined(obj: any): boolean { + return typeof obj === 'undefined' || obj === null; +} From 0c9c1bc48da0953b12a9b8c9c05e3fc2a5f2d053 Mon Sep 17 00:00:00 2001 From: Neil MacDougall Date: Thu, 20 Aug 2020 13:48:50 +0100 Subject: [PATCH 2/2] Fix comment typo --- src/frontend/packages/store/src/utils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontend/packages/store/src/utils.ts b/src/frontend/packages/store/src/utils.ts index 3a28a3fce5..4167318128 100644 --- a/src/frontend/packages/store/src/utils.ts +++ b/src/frontend/packages/store/src/utils.ts @@ -1,5 +1,5 @@ -// We don't want to brin gin the utils package from nodejs -// We only used this one function +// 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;