Merge pull request #36 from intersystems-ib/fix/rf2-json-compatibility

compat with rf2 json fields

Author: isc-afuentes

CONTRIB.md

@@ -8,18 +8,29 @@ Please, go through the following steps if you want to contribute to this project
 # Development Environment
 You need a running **iris-datapipe** instance in order to get the iris-datapipeUI working.
 
-You have two options to set up your development environment:
-
 ## Setup
-You need a local `Node.js` installation.
+* Install Node
+
+* Install local Angular
 
-Install project dependencies using `npm`:
 ```
-npm install
+mkdir angular-8
+cd angular-8
+npm install npm@latest
+npm install @angular/cli@8.3.21
 ```
 
-Run development server:
+* Install project dependencies
+
 ```
+cd iris-datapipeUI
+npm install --legacy-peer-deps
+```
+
+* Run development server
+
+```bash
+export NODE_OPTIONS=--openssl-legacy-provider       # see https://github.com/webpack/webpack/issues/14532
 ng serve
 ```
 

README.md

@@ -1,40 +1,20 @@
-**DataPipeUI** is a frontend build on *Angular* for [iris-datapipe](https://github.com/intersystems-ib/iris-datapipe), an **InterSystems IRIS** application which provides a set of re-usable components you can use to handle incoming data flow into ingestion, staging and operation phases in a homogeneus and flexible way.
+**DataPipeUI** is a user interface [iris-datapipe](https://github.com/intersystems-ib/iris-datapipe), an interoperability framework to ingest data in InterSystems IRIS in a flexible way.
 
-<img src="img/iris-datapipeUI.gif">
+<img src="img/iris-datapipeUI-arch.png" width="600" />
 
-Want to contribute to this project? See [CONTRIB.md](./CONTRIB.md)
+# QuickStart
+* Be sure you have [iris-datapipe](https://github.com/intersystems-ib/iris-datapipe) running.
+* After that, you can run the UI container:
+```
+docker-compose up -d
+```
+* Access the UI at http://localhost:8080/ and log-in using your InterSystems IRIS credentials.
+
+<img src="img/iris-datapipeUI.gif">
 
 # Configuration
 Set up environment files so you can reach you [iris-datapipe](https://github.com/intersystems-ib/iris-datapipe) instance.
 * [environment.ts](./src/environments/environment.ts) - non production environment
 * [environment.prod.ts](./src/environments/environment.ts) - production environment
 
-# Build & Run 
-*DataPipeUI* is an Angular application, so you can use usual Angular approachs to run it. You can do it locally or using a container.
-
-# Local
-If you have a local *Node.js* installation you build the application as follows:
-
-```console
-# install project dependencies
-npm install
-# non-production build
-ng build
-```
-
-Then, to run the application:
-* Copy the generated `dist/DataPipeUI` package into you web server.
-
-# Container
-You can also run the application using a web server in a container.
-
-Check that [docker-compose.yml](./docker-compose.yml) is using a network so you can reach your iris-datapipe instance.
-
-Build & run the application:
-```console
-docker-compose up -d
-```
-
-Application will be available at:
-* *Credentials*: use your *iris-datapipe* instance credentials
-* *URL*: http://localhost:8080/
+Want to contribute to this project? See [CONTRIB.md](./CONTRIB.md)

img/iris-datapipeUI-arch.png

@@ -251,10 +251,9 @@ export class DatapipeService {
   /**
    * StagingStatus format 
    */
-  getStagingStatusChipFormat(status: string, errors?: string): any {
-    let errorArr: any[];
-    if (errors) {
-      errorArr = JSON.parse(errors);
+  getStagingStatusChipFormat(status: string, errorArr: any[]): any {
+    if (typeof(errorArr) == "string" && errorArr !== "") {
+      errorArr = JSON.parse(errorArr);
     }
     return { 
       cssClass: 'staging-' + status.toLowerCase().replace('/', ''),
@@ -271,10 +270,9 @@ export class DatapipeService {
   /**
    * OperStatus format
    */
-  getOperStatusChipFormat(status: string, retries?: number, errors?: string): any {
-    let errorArr: any[];
-    if (errors) {
-      errorArr = JSON.parse(errors);
+  getOperStatusChipFormat(status: string, retries?: number, errorArr?: string[]): any {
+    if (typeof(errorArr) == "string" && errorArr !== "") {
+      errorArr = JSON.parse(errorArr);
     }
     return { 
       cssClass: 'oper-' + status.toLowerCase().replace('/', ''),