Skip to content

[INLONG-6330][Dashboard] Other sinks support asynchronous loading of plugins #6355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leezng merged 1 commit into from
Nov 1, 2022
Merged

[INLONG-6330][Dashboard] Other sinks support asynchronous loading of plugins #6355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion inlong-dashboard/src/metas/sinks/defaults/Clickhouse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const clickhouseTargetTypes = [
value: item,
}));

export default class HiveSink extends SinkInfo implements DataWithBackend {
export default class ClickhouseSink extends SinkInfo implements DataWithBackend {
@FormField({
type: 'input',
rules: [{ required: true }],
Expand Down
132 changes: 75 additions & 57 deletions inlong-dashboard/src/metas/sinks/es.tsx → ...-dashboard/src/metas/sinks/defaults/Es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@
*/

import i18n from '@/i18n';
import type { FieldItemType } from '@/metas/common';
import EditableTable from '@/components/EditableTable';
import { sourceFields } from './common/sourceFields';
import { sourceFields } from '../common/sourceFields';
import { SinkInfo } from '../common/SinkInfo';
import { DataWithBackend } from '@/metas/DataWithBackend';

const { I18n, FormField, TableColumn } = DataWithBackend;

const esTypes = [
'text',
Expand All @@ -40,21 +43,20 @@ const esTypes = [
value: item,
}));

export const es: FieldItemType[] = [
{
name: 'indexName',
export default class EsSink extends SinkInfo implements DataWithBackend {
@FormField({
type: 'input',
label: i18n.t('meta.Sinks.Es.IndexName'),
rules: [{ required: true }],
props: values => ({
disabled: [110, 130].includes(values?.status),
}),
_renderTable: true,
},
{
name: 'enableCreateResource',
})
@TableColumn()
@I18n('meta.Sinks.Es.IndexName')
indexName: string;

@FormField({
type: 'radio',
label: i18n.t('meta.Sinks.EnableCreateResource'),
rules: [{ required: true }],
initialValue: 1,
tooltip: i18n.t('meta.Sinks.EnableCreateResourceHelp'),
Expand All @@ -71,93 +73,109 @@ export const es: FieldItemType[] = [
},
],
}),
},
{
name: 'username',
})
@I18n('meta.Sinks.EnableCreateResource')
enableCreateResource: number;

@FormField({
type: 'input',
label: i18n.t('meta.Sinks.Username'),
rules: [{ required: true }],
props: values => ({
disabled: [110, 130].includes(values?.status),
}),
_renderTable: true,
},
{
name: 'password',
})
@TableColumn()
@I18n('meta.Sinks.Username')
username: string;

@FormField({
type: 'password',
label: i18n.t('meta.Sinks.Password'),
rules: [{ required: true }],
props: values => ({
disabled: [110, 130].includes(values?.status),
}),
},
{
type: 'input',
label: i18n.t('meta.Sinks.Es.Host'),
name: 'host',
})
@TableColumn()
@I18n('meta.Sinks.Password')
password: string;

@FormField({
type: 'password',
rules: [{ required: true }],
props: values => ({
disabled: [110, 130].includes(values?.status),
}),
},
{
name: 'port',
})
@TableColumn()
@I18n('meta.Sinks.Es.Host')
host: string;

@FormField({
type: 'inputnumber',
label: i18n.t('meta.Sinks.Es.Port'),
initialValue: 9200,
rules: [{ required: true }],
props: values => ({
disabled: [110, 130].includes(values?.status),
min: 1,
max: 65535,
disabled: [110, 130].includes(values?.status),
}),
rules: [{ required: true }],
},
{
name: 'flushInterval',
})
@TableColumn()
@I18n('meta.Sinks.Es.Port')
port: number;

@FormField({
type: 'inputnumber',
label: i18n.t('meta.Sinks.Es.FlushInterval'),
initialValue: 1,
rules: [{ required: true }],
suffix: i18n.t('meta.Sinks.Es.FlushIntervalUnit'),
props: values => ({
disabled: [110, 130].includes(values?.status),
min: 1,
disabled: [110, 130].includes(values?.status),
}),
rules: [{ required: true }],
suffix: i18n.t('meta.Sinks.Es.FlushIntervalUnit'),
},
{
name: 'flushRecord',
})
@TableColumn()
@I18n('meta.Sinks.Es.FlushInterval')
flushInterval: number;

@FormField({
type: 'inputnumber',
label: i18n.t('meta.Sinks.Es.FlushRecord'),
initialValue: 1000,
rules: [{ required: true }],
suffix: i18n.t('meta.Sinks.Es.FlushRecordUnit'),
props: values => ({
disabled: [110, 130].includes(values?.status),
min: 1,
disabled: [110, 130].includes(values?.status),
}),
rules: [{ required: true }],
suffix: i18n.t('meta.Sinks.Es.FlushRecordUnit'),
},
{
name: 'retryTime',
})
@TableColumn()
@I18n('meta.Sinks.Es.FlushRecord')
flushRecord: number;

@FormField({
type: 'inputnumber',
label: i18n.t('meta.Sinks.Es.RetryTimes'),
initialValue: 3,
rules: [{ required: true }],
suffix: i18n.t('meta.Sinks.Es.RetryTimesUnit'),
props: values => ({
disabled: [110, 130].includes(values?.status),
min: 1,
disabled: [110, 130].includes(values?.status),
}),
rules: [{ required: true }],
suffix: i18n.t('meta.Sinks.Es.RetryTimesUnit'),
},
{
name: 'sinkFieldList',
})
@TableColumn()
@I18n('meta.Sinks.Es.RetryTimes')
retryTime: number;

@FormField({
type: EditableTable,
props: values => ({
size: 'small',
editing: ![110, 130].includes(values?.status),
columns: getFieldListColumns(values),
}),
},
];
})
sinkFieldList: Record<string, unknown>[];
}

const getFieldListColumns = sinkValues => {
return [
Expand Down
81 changes: 46 additions & 35 deletions ...g-dashboard/src/metas/sinks/greenplum.tsx → ...ard/src/metas/sinks/defaults/Greenplum.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@
*/

import i18n from '@/i18n';
import type { FieldItemType } from '@/metas/common';
import EditableTable from '@/components/EditableTable';
import { sourceFields } from './common/sourceFields';
import { sourceFields } from '../common/sourceFields';
import { SinkInfo } from '../common/SinkInfo';
import { DataWithBackend } from '@/metas/DataWithBackend';

const { I18n, FormField, TableColumn } = DataWithBackend;

const fieldTypesConf = {
SMALLINT: (m, d) => (1 <= m && m <= 6 ? '' : '1 <= M <= 6'),
Expand Down Expand Up @@ -55,41 +58,43 @@ const greenplumFieldTypes = Object.keys(fieldTypesConf).reduce(
[],
);

export const greenplum: FieldItemType[] = [
{
export default class GreenplumSink extends SinkInfo implements DataWithBackend {
@FormField({
type: 'input',
label: 'JDBC URL',
name: 'jdbcUrl',
rules: [{ required: true }],
props: values => ({
disabled: [110, 130].includes(values?.status),
placeholder: 'jdbc:postgresql://127.0.0.1:5432/write',
}),
},
{
})
@TableColumn()
@I18n('JDBC URL')
jdbcUrl: string;

@FormField({
type: 'input',
label: i18n.t('meta.Sinks.Greenplum.TableName'),
name: 'tableName',
rules: [{ required: true }],
props: values => ({
disabled: [110, 130].includes(values?.status),
}),
_renderTable: true,
},
{
})
@TableColumn()
@I18n('meta.Sinks.Greenplum.TableName')
tableName: string;

@FormField({
type: 'input',
label: i18n.t('meta.Sinks.Greenplum.PrimaryKey'),
name: 'primaryKey',
rules: [{ required: true }],
props: values => ({
disabled: [110, 130].includes(values?.status),
}),
_renderTable: true,
},
{
})
@TableColumn()
@I18n('meta.Sinks.Greenplum.PrimaryKey')
primaryKey: string;

@FormField({
type: 'radio',
label: i18n.t('meta.Sinks.EnableCreateResource'),
name: 'enableCreateResource',
rules: [{ required: true }],
initialValue: 1,
tooltip: i18n.t('meta.Sinks.EnableCreateResourceHelp'),
Expand All @@ -106,36 +111,42 @@ export const greenplum: FieldItemType[] = [
},
],
}),
},
{
})
@I18n('meta.Sinks.EnableCreateResource')
enableCreateResource: number;

@FormField({
type: 'input',
label: i18n.t('meta.Sinks.Username'),
name: 'username',
rules: [{ required: true }],
props: values => ({
disabled: [110, 130].includes(values?.status),
}),
_renderTable: true,
},
{
})
@TableColumn()
@I18n('meta.Sinks.Username')
username: string;

@FormField({
type: 'password',
label: i18n.t('meta.Sinks.Password'),
name: 'password',
rules: [{ required: true }],
props: values => ({
disabled: [110, 130].includes(values?.status),
}),
},
{
name: 'sinkFieldList',
})
@TableColumn()
@I18n('meta.Sinks.Password')
password: string;

@FormField({
type: EditableTable,
props: values => ({
size: 'small',
canDelete: ![110, 130].includes(values?.status),
editing: ![110, 130].includes(values?.status),
columns: getFieldListColumns(values),
}),
},
];
})
sinkFieldList: Record<string, unknown>[];
}

const getFieldListColumns = sinkValues => {
return [
Expand Down
Loading