From daf398bf5042f346be3e03465863d7bfcb651b4a Mon Sep 17 00:00:00 2001 From: Georg Schwarz Date: Tue, 19 Nov 2019 19:14:30 +0100 Subject: [PATCH] ui: replace Data type with object --- ui/src/transformation/CodeEditor.vue | 5 ++--- ui/src/transformation/MonacoDataProvider.vue | 4 +--- ui/src/transformation/TextAreaDataProvider.vue | 4 +--- ui/src/transformation/TransformationMain.vue | 3 +-- ui/src/transformation/interfaces/data.ts | 1 - ui/src/transformation/interfaces/transformationRequest.ts | 4 +--- 6 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 ui/src/transformation/interfaces/data.ts diff --git a/ui/src/transformation/CodeEditor.vue b/ui/src/transformation/CodeEditor.vue index ffafb361c..2af3a31bf 100644 --- a/ui/src/transformation/CodeEditor.vue +++ b/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) } diff --git a/ui/src/transformation/MonacoDataProvider.vue b/ui/src/transformation/MonacoDataProvider.vue index 27be5598a..ed22c9aae 100644 --- a/ui/src/transformation/MonacoDataProvider.vue +++ b/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: { diff --git a/ui/src/transformation/TextAreaDataProvider.vue b/ui/src/transformation/TextAreaDataProvider.vue index b66709662..ab21d619c 100644 --- a/ui/src/transformation/TextAreaDataProvider.vue +++ b/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) diff --git a/ui/src/transformation/TransformationMain.vue b/ui/src/transformation/TransformationMain.vue index 63fc5c231..b7a276fb3 100644 --- a/ui/src/transformation/TransformationMain.vue +++ b/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 { diff --git a/ui/src/transformation/interfaces/data.ts b/ui/src/transformation/interfaces/data.ts deleted file mode 100644 index 0c9f8e35b..000000000 --- a/ui/src/transformation/interfaces/data.ts +++ /dev/null @@ -1 +0,0 @@ -export type Data = object | Array diff --git a/ui/src/transformation/interfaces/transformationRequest.ts b/ui/src/transformation/interfaces/transformationRequest.ts index 277563d81..257188fd3 100644 --- a/ui/src/transformation/interfaces/transformationRequest.ts +++ b/ui/src/transformation/interfaces/transformationRequest.ts @@ -1,6 +1,4 @@ -import { Data } from './data' - export default interface TransformationRequest { func: string; - data: Data; + data: object; }