Small changes on the API to be more consistent

README.md

@@ -1,15 +1,9 @@
-<<<<<<< HEAD
-# data-weave-playground-ui
+# Data Weave Playground UI
+
 The UI of the playground
-=======
-# DataWeave playground
 
 An independent web-based development environment for the DataWeave language.
 
-## Running the playground
-
-`./gradlew backend:run`
-
 ## Running the UI locally
 
 *All these steps must be done inside the `frontend` directory.*
@@ -31,20 +25,3 @@ Run tests: `npm run test`
 
 Build a static deployable artifact: `npm run build:static`
 
-
-## How to build the Docker image
-
-```
- ./gradlew backend:distDocker
-```
-
-## Usage
-```
-docker pull machaval/dw-playground:2.3.0-SNAPSHOT
-docker run -it --rm -p8080:8080 machaval/dw-playground:2.3.0-SNAPSHOT
-```
-
-By default the playground starts in port 8080 and you can hit [http://localhost:8080/](http://localhost:8080/) 
-
-Check [https://hub.docker.com/r/machaval/dw-playground/tags](https://hub.docker.com/r/machaval/dw-playground/tags) for other available versions.
->>>>>>> Initial Commit

api/build.gradle

@@ -1,4 +1,4 @@
-
+apply plugin: 'java'
 task api(dependsOn: jar, type: Zip) {
     from('src/main/resources/')
     classifier = "api"

api/src/main/resources/playground/api/dwplayground.raml

@@ -12,11 +12,13 @@ types:
     type: object
     properties:
       main: string
-      resources:
+      fs:
         type: object
         properties:
           //: string
-      inputs: TransformInput[]
+      inputs:
+        properties:
+          //: TransformInput
     examples:
       simple:
         !include examples/transform-request.json
@@ -25,9 +27,12 @@ types:
   TransformInput:
     type: object
     properties:
-      name: string
-      content: string
-      contentType: string
+      value: string
+      kind:
+        type: string
+        enum:
+          - binary
+      mimeType: string
       properties?:
         type: object
 
@@ -44,8 +49,8 @@ types:
       result?:
         type: object
         properties:
-          content: string
-          contentType: string
+          value: string
+          mimeType: string
           encoding?: string
           logs: Log[]
     examples:

api/src/main/resources/playground/api/examples/transform-request-reader-options.json

@@ -1,16 +1,16 @@
 {
   "main": "/main.dwl",
-  "inputs": [
-    {
-      "name": "payload",
-      "content": "ewogICAgIm1lc3NhZ2UiOiAiSGVsbG8gd29ybGQhIgp9",
-      "contentType": "application/json",
+  "inputs": {
+    "payload": {
+      "value": "ewogICAgIm1lc3NhZ2UiOiAiSGVsbG8gd29ybGQhIgp9",
+      "kind": "binary",
+      "mimeType": "application/json",
       "properties": {
         "separator": ""
       }
     }
-  ],
-  "resources": {
-    "/main.dwl": "%dw 2.0\noutput application/json\n---\npayload."
+  },
+  "fs": {
+    "/main.dwl": "%dw 2.0\noutput application/json\n---\npayload"
   }
-}
+}

api/src/main/resources/playground/api/examples/transform-request.json

@@ -1,14 +1,14 @@
-
 {
   "main": "/main.dwl",
-  "inputs": [
-    {
-      "name": "payload",
-      "content": "ewogICAgIm1lc3NhZ2UiOiAiSGVsbG8gd29ybGQhIgp9",
-      "contentType": "application/json"
+  "inputs": {
+    "payload": {
+      "value": "ewogICAgIm1lc3NhZ2UiOiAiSGVsbG8gd29ybGQhIgp9",
+      "kind": "binary",
+      "properties": {},
+      "mimeType": "application/json"
     }
-  ],
-  "resources": {
-    "/main.dwl": "%dw 2.0\noutput application/json\n---\npayload."
+  },
+  "fs": {
+    "/main.dwl": "%dw 2.0\noutput application/json\n---\npayload"
   }
 }

api/src/main/resources/playground/api/examples/transform-response-success.json

@@ -1,8 +1,8 @@
 {
   "success": true,
   "result": {
-    "content": "{\n  \"message\": \"Hello world!\"\n}",
-    "contentType": "application/json",
+    "value": "{\n  \"message\": \"Hello world!\"\n}",
+    "mimeType": "application/json",
     "encoding": "UTF-8",
     "logs": [
 

build.gradle

@@ -3,28 +3,4 @@ subprojects {
 
     group = "org.mule.weave"
     version = uiVersion
-
-    repositories {
-        //mavenLocal()
-        mavenCentral()
-        //Mule repositories
-        maven {
-            name "mule-releases"
-            url "http://repository.mulesoft.org/nexus/content/repositories/releases/"
-        }
-        maven {
-            name "mule-snapshots"
-            url "http://repository.mulesoft.org/nexus/content/repositories/snapshots/"
-        }
-    }
-}
-
-
-buildscript {
-    repositories {
-        mavenCentral()
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-    }
 }

frontend/build.gradle

@@ -6,6 +6,10 @@ task runFastTest(type: NpmTask) {
     args = ['run','test']
 }
 
+task runClean(type: NpmTask) {
+    args = ['run', 'clean']
+}
+
 task staticWebpage(type: NpmTask) {
     args = ['run','build:static']
 }
@@ -14,6 +18,7 @@ task startStatic(type: NpmTask) {
   args = ['start']
 }
 
+clean.dependsOn(runClean)
 staticWebpage.dependsOn(npmInstall)
 build.dependsOn(staticWebpage)
 

frontend/package.json

@@ -9,7 +9,8 @@
   },
   "scripts": {
     "start": "npm run clear:build && node webpack/dev-server.js",
-    "clear:build": "rm -rf build && rm -rf dist && mkdir build && mkdir dist",
+    "clean": "rm -rf build && rm -rf dist ",
+    "clear:build": "npm run clean && mkdir build && mkdir dist",
     "test": "jest --verbose",
     "build:aliases": "node scripts/aliasesGenerator.js webpack/aliases.js -j package.json -t tsconfig.json",
     "build:static": "npm run clear:build && webpack --config webpack/config.production.js",

frontend/src/app/dataweave/actions.ts

@@ -71,7 +71,7 @@ export const fetchPreviewSuccess = (response: IExecutorResponse) => (dispatch, g
     dispatch({
       type: DataweaveAction.PREVIEW_REQUEST_SUCCESS,
       payload: {
-        content: response.result.content,
+        content: response.result.value,
       }
     });
     dispatch(updateLogs(response.logs));
@@ -114,7 +114,7 @@ export const fetchWeaveTypes = () =>
       });
 
       if (!response.success) throw new Error(response.error.message);
-      const wtype = await DWLanguageClient.getInstance().inferType(response.result.content)
+      const wtype = await DWLanguageClient.getInstance().inferType(response.result.value)
       dispatch(fetchWeaveTypesSuccess(wtype.toString(), input.path));
     } catch (e) {
       dispatch(

frontend/src/app/dataweave/types.ts

@@ -35,8 +35,8 @@ export interface IExecutorResponse {
   success: boolean;
   logs?: ILogEntry[];
   result?: {
-    contentType: MediaType;
-    content: string;
+    mimeType: MediaType;
+    value: string;
     encoding: string;
   };
   error?: {