From e499f792e87b26ace299fecc3f0e501843062778 Mon Sep 17 00:00:00 2001
From: Chris Wilper <chris@atmire.com>
Date: Thu, 14 Feb 2019 14:52:43 -0500
Subject: [PATCH] DS-4107 Use isUndefined and isNotUndefined where appropriate

---
 src/app/core/shared/metadata.model.spec.ts | 9 +++++----
 src/app/core/shared/metadata.model.ts      | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/app/core/shared/metadata.model.spec.ts b/src/app/core/shared/metadata.model.spec.ts
index 8f44dee5fd..dfeff8d600 100644
--- a/src/app/core/shared/metadata.model.spec.ts
+++ b/src/app/core/shared/metadata.model.spec.ts
@@ -1,8 +1,9 @@
+import { isUndefined } from '../../shared/empty.util';
 import { MetadataValue, MetadataValueFilter } from './metadata.interfaces';
 import { Metadata } from './metadata.model';
 
 const mdValue = (value: string, language?: string): MetadataValue => {
-  return { value: value, language: language === undefined ? null : language };
+  return { value: value, language: isUndefined(language) ? null : language };
 }
 
 const dcDescription = mdValue('Some description');
@@ -24,12 +25,12 @@ const multiMap = {
 const testMethod = (fn, resultKind, mapOrMaps, keyOrKeys, expected, filter?) => {
   const keys = keyOrKeys instanceof Array ? keyOrKeys : [ keyOrKeys ];
   describe('and key' + (keys.length === 1 ? (' ' + keys[0]) : ('s ' + JSON.stringify(keys)))
-        + ' with ' + (filter === undefined ? 'no filter' : 'filter ' + JSON.stringify(filter)), () => {
+        + ' with ' + (isUndefined(filter) ? 'no filter' : 'filter ' + JSON.stringify(filter)), () => {
     const result = fn(mapOrMaps, keys, filter);
     let shouldReturn;
     if (resultKind === 'boolean') {
       shouldReturn = expected;
-    } else if (expected === undefined) {
+    } else if (isUndefined(expected)) {
       shouldReturn = 'undefined';
     } else if (expected instanceof Array) {
       shouldReturn = 'an array with ' + expected.length + ' ' + (expected.length > 1 ? 'ordered ' : '')
@@ -152,7 +153,7 @@ describe('Metadata', () => {
 
     const testValueMatches = (value: MetadataValue, expected: boolean, filter?: MetadataValueFilter) => {
       describe('with value ' + JSON.stringify(value) + ' and filter '
-          + (filter === undefined ? 'undefined' : JSON.stringify(filter)), () => {
+          + (isUndefined(filter) ? 'undefined' : JSON.stringify(filter)), () => {
         const result = Metadata.valueMatches(value, filter);
         it('should return ' + expected, () => {
           expect(result).toEqual(expected);
diff --git a/src/app/core/shared/metadata.model.ts b/src/app/core/shared/metadata.model.ts
index c64827ffdb..2b29659252 100644
--- a/src/app/core/shared/metadata.model.ts
+++ b/src/app/core/shared/metadata.model.ts
@@ -1,4 +1,4 @@
-import { isEmpty } from '../../shared/empty.util';
+import { isEmpty, isNotUndefined, isUndefined } from '../../shared/empty.util';
 import { MetadataMap, MetadataValue, MetadataValueFilter } from './metadata.interfaces';
 
 /**
@@ -93,7 +93,7 @@ export class Metadata {
   public static firstValue(mdMapOrMaps: MetadataMap | MetadataMap[], keyOrKeys: string | string[],
                            filter?: MetadataValueFilter): string {
     const value = Metadata.first(mdMapOrMaps, keyOrKeys, filter);
-    return value === undefined ? undefined : value.value;
+    return isUndefined(value) ? undefined : value.value;
   }
 
   /**
@@ -106,7 +106,7 @@ export class Metadata {
    */
   public static has(mdMapOrMaps: MetadataMap | MetadataMap[], keyOrKeys: string | string[],
                     filter?: MetadataValueFilter): boolean {
-    return Metadata.first(mdMapOrMaps, keyOrKeys, filter) !== undefined;
+    return isNotUndefined(Metadata.first(mdMapOrMaps, keyOrKeys, filter));
   }
 
   /**