Merge branch '125-transformation-input-data-accept-array' into 'master'

Resolve "Transformation: input data accept array"

Closes #125

See merge request profoss/open-data-service/ods-main!82

ui/src/transformation/CodeEditor.vue

@@ -17,7 +17,6 @@ import { Watch } from 'vue-property-decorator'
 import MonacoEditor, { MonacoEditorConstructor } from 'vue-monaco'
 import * as monaco from 'monaco-editor'
 
-import { Data } from './interfaces/data'
 import JobResult from './interfaces/jobResult'
 import JobError from './interfaces/jobError'
 
@@ -56,7 +55,7 @@ export default class CodeEditor extends Props {
  this.$emit('input', code)
  }
 
- setEditorJavascriptDefaults (data: Data): void {
+ setEditorJavascriptDefaults (data: object): void {
  const monaco = this.$refs.editor.monaco
  const json = JSON.stringify(data)
  const code = `let data = ${json}`
@@ -130,7 +129,7 @@ export default class CodeEditor extends Props {
  }
 
  @Watch('data')
- onDataChanged (val: Data): void {
+ onDataChanged (val: object): void {
  this.setEditorJavascriptDefaults(val)
  }
 

ui/src/transformation/MonacoDataProvider.vue

@@ -21,15 +21,13 @@ import { Prop } from 'vue-property-decorator'
 
 import MonacoEditor from 'vue-monaco'
 
-import { Data } from './interfaces/data'
-
 @Component({
  components: {
  MonacoEditor
  }
 })
 export default class MonacoDataProvider extends Vue {
- @Prop() readonly value!: Data
+ @Prop() readonly value!: object
 
  editorOptions = {
  minimap: {

ui/src/transformation/TextAreaDataProvider.vue

@@ -17,11 +17,9 @@ import Vue from 'vue'
 import Component from 'vue-class-component'
 import { Prop } from 'vue-property-decorator'
 
-import { Data } from './interfaces/data'
-
 @Component({})
 export default class TextAreaDataProvider extends Vue {
- @Prop() readonly value!: Data
+ @Prop() readonly value!: object
 
  object = this.value
  text = this.formatJson(this.value)

ui/src/transformation/TransformationMain.vue

@@ -47,7 +47,6 @@ import MonacoDataProvider from './MonacoDataProvider.vue'
 import TextAreaDataProvider from './TextAreaDataProvider.vue'
 import CodeEditor from './CodeEditor.vue'
 import ResultView from './ResultView.vue'
-import { Data } from './interfaces/data'
 
 const namespace = { namespace: 'transformation' }
 
@@ -75,7 +74,7 @@ export default class TransformationMain extends Vue {
  @Action('transformData', namespace)
  private transformData!: (request: TransformationRequest) => void
 
- private dataInput: Data = { a: 1, b: 2, c: 3 }
+ private dataInput: object = { a: 1, b: 2, c: 3 }
  private functionInput = 'return data;'
 
  private submit (): void {

ui/src/transformation/interfaces/transformationRequest.ts

@@ -1,6 +1,4 @@
-import { Data } from './data'
-
 export default interface TransformationRequest {
  func: string;
- data: Data;
+ data: object;
 }