Align ui-react file in policy-clamp and policy-gui

When the ui-react code was transferred to policy-gui, the white space
was cleaned up and reformatted. This makes it difficult to track the
real functional changes if any between ui-react in policy-clamp and
policy-gui.

This review brings the white space changes into ui-react in policy-clamp
to make file comparisons easier.

Issue-ID: POLICY-3358
Change-Id: Ic303e71b341e5c0f7ca0de0ed4c4962ebf2f988a
Signed-off-by: liamfallon <liam.fallon@est.tech>

1 files changed, 340 insertions, 337 deletions

diff --git a/runtime/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js b/runtime/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
index a4c1335d8..2552d7a3d 100644
--- a/runtime/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
+++ b/runtime/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
@@ -28,435 +28,438 @@ import ManageDictionaries from './ManageDictionaries';
 import TemplateMenuService from '../../../api/TemplateService'
 
 const TestDictionaryElements = {
-    name: "test",
-    secondLevelDictionary: 0,
-    subDictionaryType: "", 
-    dictionaryElements: [
-      {
-        shortName: "alertType",
-        name: "Alert Type",
-        description: "Type of Alert",
-        type: "string",
-        subDictionary: "", 
-        createdDate: "2020-06-12T13:58:51.443931Z",
-        updatedDate: "2020-06-13T16:27:57.084870Z",
-        updatedBy: "admin",
-        createdBy: "admin"
-      }
-    ]
+  name: "test",
+  secondLevelDictionary: 0,
+  subDictionaryType: "",
+  dictionaryElements: [
+    {
+      shortName: "alertType",
+      name: "Alert Type",
+      description: "Type of Alert",
+      type: "string",
+      subDictionary: "",
+      createdDate: "2020-06-12T13:58:51.443931Z",
+      updatedDate: "2020-06-13T16:27:57.084870Z",
+      updatedBy: "admin",
+      createdBy: "admin"
+    }
+  ]
 };
 
 const TestDictionaries =
-[
-  {
-    name: "test",
-    secondLevelDictionary: 0,
-    subDictionaryType: "string",
-    dictionaryElements: [ TestDictionaryElements ],
-    createdDate: "2020-06-14T21:00:33.231166Z",
-    updatedDate: "2020-06-14T21:00:33.231166Z",
-    updatedBy: "admin",
-    createdBy: "admin"
-  },
-  {
-    name: "testSub1",
-    secondLevelDictionary: 1,
-    subDictionaryType: "string",
-    dictionaryElements: [
-      {
-        shortName: "subElem",
-        name: "Sub Element",
-        description: "Sub Element Description",
-        type: "string",
-        createdDate: "2020-06-14T21:04:44.402287Z",
-        updatedDate: "2020-06-14T21:04:44.402287Z",
-        updatedBy: "admin",
-        createdBy: "admin"
-      }
-    ],
-    createdDate: "2020-06-14T21:01:16.390250Z",
-    updatedDate: "2020-06-14T21:01:16.390250Z",
-    updatedBy: "admin",
-    createdBy: "admin"
-  }
-];
+  [
+    {
+      name: "test",
+      secondLevelDictionary: 0,
+      subDictionaryType: "string",
+      dictionaryElements: [TestDictionaryElements],
+      createdDate: "2020-06-14T21:00:33.231166Z",
+      updatedDate: "2020-06-14T21:00:33.231166Z",
+      updatedBy: "admin",
+      createdBy: "admin"
+    },
+    {
+      name: "testSub1",
+      secondLevelDictionary: 1,
+      subDictionaryType: "string",
+      dictionaryElements: [
+        {
+          shortName: "subElem",
+          name: "Sub Element",
+          description: "Sub Element Description",
+          type: "string",
+          createdDate: "2020-06-14T21:04:44.402287Z",
+          updatedDate: "2020-06-14T21:04:44.402287Z",
+          updatedBy: "admin",
+          createdBy: "admin"
+        }
+      ],
+      createdDate: "2020-06-14T21:01:16.390250Z",
+      updatedDate: "2020-06-14T21:01:16.390250Z",
+      updatedBy: "admin",
+      createdBy: "admin"
+    }
+  ];
 
 
 const historyMock = { push: jest.fn() };
 
 let errorMessage = '';
 
-window.alert = jest.fn().mockImplementation((mesg) => { errorMessage = mesg ; return });
+window.alert = jest.fn().mockImplementation((mesg) => {
+  errorMessage = mesg;
+  return
+});
 
 TemplateMenuService.getDictionary = jest.fn().mockImplementation(() => {
-	return Promise.resolve(TestDictionaries);
+  return Promise.resolve(TestDictionaries);
 });
 
 TemplateMenuService.insDictionary = jest.fn().mockImplementation(() => {
-	return Promise.resolve({ ok: true, status: 200 });
+  return Promise.resolve({ ok: true, status: 200 });
 });
 
 TemplateMenuService.deleteDictionary = jest.fn().mockImplementation(() => {
-	return Promise.resolve("200");
+  return Promise.resolve("200");
 });
 
 TemplateMenuService.getDictionaryElements = jest.fn().mockImplementation(() => {
-	return Promise.resolve(TestDictionaryElements);
+  return Promise.resolve(TestDictionaryElements);
 });
 
 TemplateMenuService.deleteDictionaryElements = jest.fn().mockImplementation(() => {
-	return Promise.resolve("200");
+  return Promise.resolve("200");
 });
 
 TemplateMenuService.insDictionaryElements = jest.fn().mockImplementation(() => {
-	return Promise.resolve("200");
+  return Promise.resolve("200");
 });
 
 
 describe('Verify ManageDictionaries', () => {
 
-	beforeEach(() => {
-		fetch.resetMocks();
-	});
+  beforeEach(() => {
+    fetch.resetMocks();
+  });
+
+  it('Test API Successful', () => {
+    fetch.mockImplementationOnce(() => {
+      return Promise.resolve({
+        ok: true,
+        status: 200,
+        json: () => {
+          return Promise.resolve({
+            "name": "vtest",
+            "secondLevelDictionary": 1,
+            "subDictionaryType": "string",
+            "updatedBy": "test",
+            "updatedDate": "05-07-2019 19:09:42"
+          });
+        }
+      });
+    });
+    const component = shallow(<ManageDictionaries/>);
+    expect(component).toMatchSnapshot();
+  });
+
+  it('Test API Exception', () => {
+    fetch.mockImplementationOnce(() => {
+      return Promise.resolve({
+        ok: false,
+        status: 500,
+        json: () => {
+          return Promise.resolve({
+            "name": "vtest",
+            "secondLevelDictionary": 1,
+            "subDictionaryType": "string",
+            "updatedBy": "test",
+            "updatedDate": "05-07-2019 19:09:42"
+          });
+        }
+      });
+    });
+    const component = shallow(<ManageDictionaries/>);
+  });
+
+  it('Test Table icons', () => {
+
+    const component = mount(<ManageDictionaries/>);
+    expect(component.find('[className="MuiSelect-icon MuiTablePagination-selectIcon"]')).toBeTruthy();
+  });
+
+  test('Test add/replace and delete dictionary requests', async () => {
+
+    const component = shallow(<ManageDictionaries history={ historyMock }/>)
+    const instance = component.instance();
+
+    const flushPromises = () => new Promise(setImmediate);
+
+    instance.addReplaceDictionaryRequest({ name: "newdict", secondLevelDictionary: 0, subDictionaryType: "string" });
+    instance.deleteDictionaryRequest("test");
+
+    await flushPromises();
+
+    expect(component.state('currentSelectedDictionary')).toEqual(null);
+    expect(component.state('dictionaries')).toEqual(TestDictionaries);
+  });
 
-	it('Test API Successful', () => {
-		fetch.mockImplementationOnce(() => {
-			return Promise.resolve({
-				ok: true,
-				status: 200,
-				json: () => {
-					return Promise.resolve({
-						"name": "vtest",
-						"secondLevelDictionary": 1,
-						"subDictionaryType": "string",
-						"updatedBy": "test",
-						"updatedDate": "05-07-2019 19:09:42"
-					});
-				}
-			});
-		});
-		const component = shallow(<ManageDictionaries />);
-		expect(component).toMatchSnapshot();
-	});
+  test('Test update dictionary row', async () => {
 
-	it('Test API Exception', () => {
-		fetch.mockImplementationOnce(() => {
-			return Promise.resolve({
-				ok: false,
-				status: 500,
-				json: () => {
-					return Promise.resolve({
-						"name": "vtest",
-						"secondLevelDictionary": 1,
-						"subDictionaryType": "string",
-						"updatedBy": "test",
-						"updatedDate": "05-07-2019 19:09:42"
-					});
-				}
-			});
-		});
-		const component = shallow(<ManageDictionaries />);
-	});
+    const component = shallow(<ManageDictionaries history={ historyMock }/>)
+    const instance = component.instance();
+    const rowData = { name: "newdict", secondLevelDictionary: 0, subDictionaryType: "string" };
 
-	it('Test Table icons', () => {
+    await expect(instance.updateDictionaryRow(rowData, rowData)).resolves.toEqual(undefined);
 
-		const component = mount(<ManageDictionaries />);
-		expect(component.find('[className="MuiSelect-icon MuiTablePagination-selectIcon"]')).toBeTruthy();
-	});
+  }, 2000);
 
-	test('Test add/replace and delete dictionary requests', async () => {
+  test('Test add dictionary row', async () => {
 
-		const component = shallow(<ManageDictionaries history={historyMock}/>)
-		const instance = component.instance();
+    const addReplaceRequest = jest.spyOn(ManageDictionaries.prototype, 'addReplaceDictionaryRequest');
+    const component = shallow(<ManageDictionaries/>)
+    const instance = component.instance();
+    const rowData = { name: "newdict", secondLevelDictionary: 0, subDictionaryType: "string" };
 
-		const flushPromises = () => new Promise(setImmediate);
+    await instance.addDictionaryRow(rowData);
+    expect(addReplaceRequest).toHaveBeenCalledWith(rowData);
 
-		instance.addReplaceDictionaryRequest({name: "newdict", secondLevelDictionary: 0, subDictionaryType: "string"});
-		instance.deleteDictionaryRequest("test");
+  }, 2000);
 
-		await flushPromises();
+  test('Test add dictionary row with errors name already exists', async () => {
 
-		expect(component.state('currentSelectedDictionary')).toEqual(null);
-		expect(component.state('dictionaries')).toEqual(TestDictionaries);
-	});
+    const component = shallow(<ManageDictionaries/>)
+    const instance = component.instance();
+    let rowData = { name: "test", secondLevelDictionary: 0, subDictionaryType: "" };
 
-	test('Test update dictionary row', async () => {
+    await expect(instance.addDictionaryRow(rowData)).rejects.toEqual(undefined);
 
-		const component = shallow(<ManageDictionaries history={historyMock}/>)
-		const instance = component.instance();
-		const rowData = { name: "newdict", secondLevelDictionary: 0, subDictionaryType: "string" };
+  }, 2000);
 
-		await expect(instance.updateDictionaryRow(rowData, rowData)).resolves.toEqual(undefined);
+  test('Test add dictionary row with errors illegal chars in name', async () => {
 
-	}, 2000);
+    const component = shallow(<ManageDictionaries/>)
+    const instance = component.instance();
+    let rowData = { name: "test@@", secondLevelDictionary: 0, subDictionaryType: "" };
 
-	test('Test add dictionary row', async () => {
+    await expect(instance.addDictionaryRow(rowData)).rejects.toEqual(undefined);
 
-		const addReplaceRequest = jest.spyOn(ManageDictionaries.prototype,'addReplaceDictionaryRequest');
-		const component = shallow(<ManageDictionaries />)
-		const instance = component.instance();
-		const rowData = { name: "newdict", secondLevelDictionary: 0, subDictionaryType: "string" };
+  }, 2000);
 
-		await instance.addDictionaryRow(rowData);
-                expect(addReplaceRequest).toHaveBeenCalledWith(rowData);
+  test('Test update dictionary row with errors illegal chars in name', async () => {
 
-	}, 2000);
+    const component = shallow(<ManageDictionaries/>)
+    const instance = component.instance();
+    let rowData = { name: "test@@", secondLevelDictionary: 0, subDictionaryType: "" };
 
-	test('Test add dictionary row with errors name already exists', async () => {
+    await expect(instance.updateDictionaryRow(rowData)).rejects.toEqual(undefined);
+  });
 
-		const component = shallow(<ManageDictionaries />)
-		const instance = component.instance();
-		let  rowData = { name: "test", secondLevelDictionary: 0, subDictionaryType: "" };
 
-		await expect(instance.addDictionaryRow(rowData)).rejects.toEqual(undefined);
+  test('Test add dictionary row with errors (illegal chars)', async () => {
 
-	}, 2000);
+    const addReplaceRequest = jest.spyOn(ManageDictionaries.prototype, 'addReplaceDictionaryRequest');
+    const component = shallow(<ManageDictionaries/>)
+    const instance = component.instance();
+    let rowData = { name: "test@@", secondLevelDictionary: 0, subDictionaryType: "" };
 
-	test('Test add dictionary row with errors illegal chars in name', async () => {
+    await expect(instance.addDictionaryRow(rowData)).rejects.toEqual(undefined);
 
-		const component = shallow(<ManageDictionaries />)
-		const instance = component.instance();
-		let  rowData = { name: "test@@", secondLevelDictionary: 0, subDictionaryType: "" };
+  }, 2000);
 
-		await expect(instance.addDictionaryRow(rowData)).rejects.toEqual(undefined);
 
-	}, 2000);
+  test('Test delete dictionary row', async () => {
 
-	test('Test update dictionary row with errors illegal chars in name', async () => {
+    const deleteRequest = jest.spyOn(ManageDictionaries.prototype, 'deleteDictionaryRequest');
+    const component = shallow(<ManageDictionaries/>)
+    const instance = component.instance();
+    const rowData = { name: "newdict", secondLevelDictionary: 0, subDictionaryType: "string" };
 
-		const component = shallow(<ManageDictionaries />)
-		const instance = component.instance();
-		let  rowData = { name: "test@@", secondLevelDictionary: 0, subDictionaryType: "" };
+    await instance.deleteDictionaryRow(rowData);
+    expect(deleteRequest).toHaveBeenCalledWith("newdict");
 
-		await expect(instance.updateDictionaryRow(rowData)).rejects.toEqual(undefined);
-	});
+  }, 2000);
 
+  test('Test handle select dictionary row click', async () => {
 
-	test('Test add dictionary row with errors (illegal chars)', async () => {
+    const component = shallow(<ManageDictionaries/>)
+    const instance = component.instance();
+    const rowData = { name: "newdict", secondLevelDictionary: 0, subDictionaryType: "string" };
 
-		const addReplaceRequest = jest.spyOn(ManageDictionaries.prototype,'addReplaceDictionaryRequest');
-		const component = shallow(<ManageDictionaries />)
-		const instance = component.instance();
-		let  rowData = { name: "test@@", secondLevelDictionary: 0, subDictionaryType: "" };
+    instance.handleDictionaryRowClick("event", rowData);
+    expect(component.state('currentSelectedDictionary')).toEqual("newdict");
+  }, 2000);
 
-		await expect(instance.addDictionaryRow(rowData)).rejects.toEqual(undefined);
+  test('Test dictionary element row add, update, delete', async () => {
 
-	}, 2000);
+    const rowData = {
+      createdBy: "admin",
+      createdDate: "2020-06-15T13:59:20.467381Z",
+      description: "Description",
+      name: "Some Elem",
+      shortName: "someElem",
+      type: "string",
+      updatedBy: "admin",
+      updatedDate: "2020-06-15T13:59:20.467381Z"
+    };
 
+    const component = shallow(<ManageDictionaries/>)
+    const instance = component.instance();
 
-	test('Test delete dictionary row', async () => {
+    const badRowData = {
+      description: "Description",
+      name: "Some Elem",
+      shortName: "someElem",
+      type: "string"
+    };
 
-		const deleteRequest = jest.spyOn(ManageDictionaries.prototype,'deleteDictionaryRequest');
-		const component = shallow(<ManageDictionaries />)
-		const instance = component.instance();
-		const rowData = { name: "newdict", secondLevelDictionary: 0, subDictionaryType: "string" };
+    await instance.clickHandler();
+    await instance.getDictionaryElements("test");
 
-		await instance.deleteDictionaryRow(rowData);
-                expect(deleteRequest).toHaveBeenCalledWith("newdict");
+    await expect(instance.addDictionaryElementRow(rowData)).resolves.toEqual(undefined);
+    await expect(instance.updateDictionaryElementRow(rowData, rowData)).resolves.toEqual(undefined);
+    await expect(instance.deleteDictionaryElementRow(rowData)).resolves.toEqual(undefined);
+  });
 
-	}, 2000);
+  test('Test dictionary element row add with errors', async () => {
 
-	test('Test handle select dictionary row click', async () => {
+    const badRowData = {
+      description: "",
+      name: "",
+      shortName: "some#Elem",
+      type: ""
+    };
 
-		const component = shallow(<ManageDictionaries />)
-		const instance = component.instance();
-		const rowData = { name: "newdict", secondLevelDictionary: 0, subDictionaryType: "string" };
+    const component = shallow(<ManageDictionaries/>)
+    const instance = component.instance();
 
-		instance.handleDictionaryRowClick("event", rowData);
-		expect(component.state('currentSelectedDictionary')).toEqual("newdict");
-	}, 2000);
+    await expect(instance.addDictionaryElementRow(badRowData)).rejects.toEqual("");
+  });
 
-	test('Test dictionary element row add, update, delete', async () => {
+  test('Test dictionary element update with error illegal name', async () => {
 
-		const rowData = {
-			createdBy: "admin",
-			createdDate: "2020-06-15T13:59:20.467381Z",
-			description: "Description",
-			name: "Some Elem",
-			shortName: "someElem",
-			type: "string",
-			updatedBy: "admin",
-			updatedDate: "2020-06-15T13:59:20.467381Z"
-		};
+    const badRowData = {
+      description: "",
+      name: "test@@",
+      shortName: "some#Elem",
+      type: ""
+    };
 
-		const component = shallow(<ManageDictionaries/>)
-		const instance = component.instance();
+    const component = shallow(<ManageDictionaries/>)
+    const instance = component.instance();
 
-		const badRowData = {
-			description: "Description",
-			name: "Some Elem",
-			shortName: "someElem",
-			type: "string"
-		};
+    await expect(instance.updateDictionaryElementRow(badRowData)).rejects.toEqual(undefined);
+  });
 
-                await instance.clickHandler();
-                await instance.getDictionaryElements("test");
+  test('Test dictionary element addition with duplicate name error', async () => {
 
-		await expect(instance.addDictionaryElementRow(rowData)).resolves.toEqual(undefined);
-		await expect(instance.updateDictionaryElementRow(rowData, rowData)).resolves.toEqual(undefined);
-		await expect(instance.deleteDictionaryElementRow(rowData)).resolves.toEqual(undefined);
-	});
+    const badRowData = {
+      description: "description",
+      name: "Alert Type",
+      shortName: "alertType",
+      type: "string"
+    };
 
-	test('Test dictionary element row add with errors', async () => {
+    const component = shallow(<ManageDictionaries/>)
+    const instance = component.instance();
 
-		const badRowData = {
-			description: "",
-			name: "",
-			shortName: "some#Elem",
-			type: ""
-		};
+    component.setState({ currentSelectedDictionary: 'test' });
 
-		const component = shallow(<ManageDictionaries/>)
-		const instance = component.instance();
+    await instance.getDictionaryElements();
+    await expect(instance.addDictionaryElementRow(badRowData)).rejects.toEqual("");
+  });
 
-		await expect(instance.addDictionaryElementRow(badRowData)).rejects.toEqual("");
-	});
+  test('Test dictionary element addition with empty name error', async () => {
 
-	test('Test dictionary element update with error illegal name', async () => {
+    const badRowData = {
+      description: "description",
+      name: "Alert Type",
+      shortName: "",
+      type: "string"
+    };
 
-		const badRowData = {
-			description: "",
-			name: "test@@",
-			shortName: "some#Elem",
-			type: ""
-		};
+    const component = shallow(<ManageDictionaries/>)
+    const instance = component.instance();
 
-		const component = shallow(<ManageDictionaries/>)
-		const instance = component.instance();
+    component.setState({ currentSelectedDictionary: 'test' });
 
-		await expect(instance.updateDictionaryElementRow(badRowData)).rejects.toEqual(undefined);
-	});
+    await instance.getDictionaryElements();
+    await expect(instance.addDictionaryElementRow(badRowData)).rejects.toEqual("");
+  });
 
-	test('Test dictionary element addition with duplicate name error', async () => {
 
-		const badRowData = {
-			description: "description",
-			name: "Alert Type",
-			shortName: "alertType",
-			type: "string"
-		};
+  it('Test Import CSV Sunny Day', async () => {
 
-		const component = shallow(<ManageDictionaries/>)
-		const instance = component.instance();
+    TemplateMenuService.insDictionaryElements = jest.fn().mockImplementation(() => {
+      return Promise.resolve({ ok: true, status: 200 });
+    });
 
-		component.setState({ currentSelectedDictionary: 'test' });
+    let rawCsvData = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
+    rawCsvData += '"alertType","Alert Type","Alert Type Description","string","","admin","2020-06-11T13:56:14.927437Z"';
 
-		await instance.getDictionaryElements();
-		await expect(instance.addDictionaryElementRow(badRowData)).rejects.toEqual("");
-	});
+    let expectedResult = [
+      {
+        description: "Alert Type Description",
+        name: "Alert Type",
+        shortName: "alertType",
+        subDictionary: "",
+        type: "string"
+      }
+    ];
+
+    const updateDictionaryElementsRequest = jest.spyOn(ManageDictionaries.prototype, 'updateDictionaryElementsRequest');
+
+    const component = shallow(<ManageDictionaries/>)
+    const instance = component.instance();
+
+    await expect(instance.importCsvData(rawCsvData)).toEqual('');
+    expect(updateDictionaryElementsRequest).toHaveBeenCalledWith(expectedResult);
+  });
+
+  it('Test Import CSV Mandatory Field Check Errors', () => {
+
+    let rawCsvData = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
+    rawCsvData += '"","","","","","",""';
 
-	test('Test dictionary element addition with empty name error', async () => {
+    // The empty values for all the fields in row 1 of the rawCsvData will trigger a bunch of errors.
+    // Getting Enzyme to properly match them with embedded newlines turned out to be impossible
+    // and maybe not desirable anyway; so our test for "success" here is simply that the
+    // routine returns a non-empty error string.
 
-		const badRowData = {
-			description: "description",
-			name: "Alert Type",
-			shortName: "",
-			type: "string"
-		};
-
-		const component = shallow(<ManageDictionaries/>)
-		const instance = component.instance();
-
-		component.setState({ currentSelectedDictionary: 'test' });
-
-		await instance.getDictionaryElements();
-		await expect(instance.addDictionaryElementRow(badRowData)).rejects.toEqual("");
-	});
-
-
-	it('Test Import CSV Sunny Day', async () => {
-
-                TemplateMenuService.insDictionaryElements = jest.fn().mockImplementation(() => {
-                        return Promise.resolve({ ok: true, status: 200 });
-                });
-
-                let rawCsvData = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
-                rawCsvData += '"alertType","Alert Type","Alert Type Description","string","","admin","2020-06-11T13:56:14.927437Z"';
-
-                let expectedResult = [
-                                {
-                                        description: "Alert Type Description",
-                                        name: "Alert Type",
-                                        shortName: "alertType",
-                                        subDictionary: "",
-                                        type: "string"
-                                }
-		];
-
-		const updateDictionaryElementsRequest = jest.spyOn(ManageDictionaries.prototype,'updateDictionaryElementsRequest');
-
-		const component = shallow(<ManageDictionaries />)
-		const instance = component.instance();
-
-		await expect(instance.importCsvData(rawCsvData)).toEqual('');
-                expect(updateDictionaryElementsRequest).toHaveBeenCalledWith(expectedResult);
-	});
-
-	it('Test Import CSV Mandatory Field Check Errors', () => {
-
-                let rawCsvData = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
-                rawCsvData += '"","","","","","",""';
-
-		// The empty values for all the fields in row 1 of the rawCsvData will trigger a bunch of errors.
-		// Getting Enzyme to properly match them with embedded newlines turned out to be impossible
-		// and maybe not desirable anyway; so our test for "success" here is simply that the
-		// routine returns a non-empty error string.
-
-		const component = shallow(<ManageDictionaries />)
-		const instance = component.instance();
-		expect(instance.importCsvData(rawCsvData)).not.toEqual('');
-	});
-
-	it('Test Import CSV Errors in Row Data', async () => {
-
-                TemplateMenuService.insDictionaryElements = jest.fn().mockImplementation(() => {
-                        return Promise.resolve({ ok: true, status: 200 });
-                });
-
-                let rawCsvData = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
-                rawCsvData += '"alert@Type","Alert Type","Alert Type Description","strin","subby","admin","2020-06-11T13:56:14.927437Z"';
-
-                let expectedResult = [
-                                {
-                                        description: "Alert Type Description",
-                                        name: "Alert Type",
-                                        shortName: "alertType",
-                                        subDictionary: "",
-                                        type: "string"
-                                }
-		];
-
-		const updateDictionaryElementsRequest = jest.spyOn(ManageDictionaries.prototype,'updateDictionaryElementsRequest');
-
-		const component = shallow(<ManageDictionaries />)
-		const instance = component.instance();
-
-		await expect(instance.importCsvData(rawCsvData)).not.toEqual('');
-	});
-
-
-	it('Test handleClose', () => {
-		fetch.mockImplementationOnce(() => {
-			return Promise.resolve({
-				ok: true,
-				status: 200,
-				json: () => {
-					return Promise.resolve({
-						"name": "vtest",
-						"secondLevelDictionary": 1,
-						"subDictionaryType": "string",
-						"updatedBy": "test",
-						"updatedDate": "05-07-2019 19:09:42"
-					});
-				}
-			});
-		});
-		const handleClose = jest.spyOn(ManageDictionaries.prototype,'handleClose');
-		const component = shallow(<ManageDictionaries history={historyMock} />)
-		component.find('[variant="secondary"]').prop('onClick')();
-		expect(handleClose).toHaveBeenCalledTimes(1);
-		expect(component.state('show')).toEqual(false);
-		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
-		handleClose.mockClear();
-	});
+    const component = shallow(<ManageDictionaries/>)
+    const instance = component.instance();
+    expect(instance.importCsvData(rawCsvData)).not.toEqual('');
+  });
+
+  it('Test Import CSV Errors in Row Data', async () => {
+
+    TemplateMenuService.insDictionaryElements = jest.fn().mockImplementation(() => {
+      return Promise.resolve({ ok: true, status: 200 });
+    });
+
+    let rawCsvData = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
+    rawCsvData += '"alert@Type","Alert Type","Alert Type Description","strin","subby","admin","2020-06-11T13:56:14.927437Z"';
+
+    let expectedResult = [
+      {
+        description: "Alert Type Description",
+        name: "Alert Type",
+        shortName: "alertType",
+        subDictionary: "",
+        type: "string"
+      }
+    ];
+
+    const updateDictionaryElementsRequest = jest.spyOn(ManageDictionaries.prototype, 'updateDictionaryElementsRequest');
+
+    const component = shallow(<ManageDictionaries/>)
+    const instance = component.instance();
+
+    await expect(instance.importCsvData(rawCsvData)).not.toEqual('');
+  });
+
+
+  it('Test handleClose', () => {
+    fetch.mockImplementationOnce(() => {
+      return Promise.resolve({
+        ok: true,
+        status: 200,
+        json: () => {
+          return Promise.resolve({
+            "name": "vtest",
+            "secondLevelDictionary": 1,
+            "subDictionaryType": "string",
+            "updatedBy": "test",
+            "updatedDate": "05-07-2019 19:09:42"
+          });
+        }
+      });
+    });
+    const handleClose = jest.spyOn(ManageDictionaries.prototype, 'handleClose');
+    const component = shallow(<ManageDictionaries history={ historyMock }/>)
+    component.find('[variant="secondary"]').prop('onClick')();
+    expect(handleClose).toHaveBeenCalledTimes(1);
+    expect(component.state('show')).toEqual(false);
+    expect(historyMock.push.mock.calls[0]).toEqual(['/']);
+    handleClose.mockClear();
+  });
 });