This is an automated email from the ASF dual-hosted git repository.
leezng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 1fa4fba22 [INLONG-5508][Dashboard] Adaptive naming conventions (#5509)
1fa4fba22 is described below
commit 1fa4fba22335ea79180d83090a4585f7d8839366
Author: Daniel <[email protected]>
AuthorDate: Fri Aug 12 12:09:25 2022 +0800
[INLONG-5508][Dashboard] Adaptive naming conventions (#5509)
---
inlong-dashboard/src/configs/menus/index.ts | 2 +-
inlong-dashboard/src/configs/routes/index.tsx | 16 ++++++++--------
.../src/{meta => metas}/consumption/index.tsx | 0
inlong-dashboard/src/{meta => metas}/group/index.tsx | 0
.../src/{meta => metas}/sinks/clickhouse.tsx | 0
.../src/{meta => metas}/sinks/common/sourceFields.ts | 0
inlong-dashboard/src/{meta => metas}/sinks/es.tsx | 0
inlong-dashboard/src/{meta => metas}/sinks/greenplum.tsx | 0
inlong-dashboard/src/{meta => metas}/sinks/hbase.tsx | 0
inlong-dashboard/src/{meta => metas}/sinks/hive.tsx | 0
inlong-dashboard/src/{meta => metas}/sinks/iceberg.tsx | 0
inlong-dashboard/src/{meta => metas}/sinks/index.ts | 0
inlong-dashboard/src/{meta => metas}/sinks/kafka.tsx | 0
inlong-dashboard/src/{meta => metas}/sinks/mysql.tsx | 0
inlong-dashboard/src/{meta => metas}/sinks/oracle.tsx | 0
.../src/{meta => metas}/sinks/postgreSql.tsx | 0
inlong-dashboard/src/{meta => metas}/sinks/sqlServer.tsx | 0
.../src/{meta => metas}/sinks/tdsqlPostgreSql.tsx | 0
inlong-dashboard/src/{meta => metas}/sources/autoPush.ts | 0
inlong-dashboard/src/{meta => metas}/sources/binLog.ts | 0
inlong-dashboard/src/{meta => metas}/sources/file.ts | 0
inlong-dashboard/src/{meta => metas}/sources/index.ts | 0
inlong-dashboard/src/{meta => metas}/stream/index.tsx | 2 +-
inlong-dashboard/src/pages/ConsumeDetail/Info/config.tsx | 2 +-
.../ExecutionLogModal.tsx | 0
.../pages/{AccessDashboard => GroupDashboard}/config.tsx | 0
.../pages/{AccessDashboard => GroupDashboard}/index.tsx | 0
.../pages/{AccessDashboard => GroupDashboard}/status.tsx | 0
.../pages/{AccessDetail => GroupDetail}/Audit/config.tsx | 0
.../pages/{AccessDetail => GroupDetail}/Audit/index.tsx | 0
.../DataSources/DetailModal.tsx | 2 +-
.../{AccessDetail => GroupDetail}/DataSources/index.tsx | 2 +-
.../{AccessDetail => GroupDetail}/DataSources/status.tsx | 0
.../DataStorage/DetailModal.tsx | 2 +-
.../{AccessDetail => GroupDetail}/DataStorage/index.tsx | 2 +-
.../{AccessDetail => GroupDetail}/DataStorage/status.tsx | 0
.../DataStream/StreamItemModal.tsx | 4 ++--
.../{AccessDetail => GroupDetail}/DataStream/config.tsx | 0
.../{AccessDetail => GroupDetail}/DataStream/helper.ts | 0
.../{AccessDetail => GroupDetail}/DataStream/index.tsx | 0
.../{AccessDetail => GroupDetail}/DataStream/status.tsx | 0
.../pages/{AccessDetail => GroupDetail}/Info/config.tsx | 2 +-
.../pages/{AccessDetail => GroupDetail}/Info/index.tsx | 0
.../src/pages/{AccessDetail => GroupDetail}/common.d.ts | 0
.../src/pages/{AccessDetail => GroupDetail}/index.tsx | 8 ++++++--
.../src/pages/{Approvals => Process}/Applies/config.tsx | 4 ++--
.../src/pages/{Approvals => Process}/Applies/index.tsx | 0
.../src/pages/{Approvals => Process}/Applies/status.tsx | 0
.../pages/{Approvals => Process}/Approvals/config.tsx | 4 ++--
.../src/pages/{Approvals => Process}/Approvals/index.tsx | 0
.../pages/{Approvals => Process}/Approvals/status.tsx | 0
.../src/pages/{Approvals => Process}/index.tsx | 2 +-
.../pages/{ApprovalDetail => ProcessDetail}/Access.tsx | 0
.../{ApprovalDetail => ProcessDetail}/AccessConfig.tsx | 2 +-
.../pages/{ApprovalDetail => ProcessDetail}/Consume.tsx | 0
.../{ApprovalDetail => ProcessDetail}/ConsumeConfig.tsx | 2 +-
.../pages/{ApprovalDetail => ProcessDetail}/Steps.tsx | 0
.../pages/{ApprovalDetail => ProcessDetail}/common.d.ts | 0
.../pages/{ApprovalDetail => ProcessDetail}/index.tsx | 10 +++++-----
.../DetailModal.tsx | 0
.../{ApprovalManagement => ProcessManagement}/config.tsx | 0
.../{ApprovalManagement => ProcessManagement}/index.tsx | 0
62 files changed, 36 insertions(+), 32 deletions(-)
diff --git a/inlong-dashboard/src/configs/menus/index.ts
b/inlong-dashboard/src/configs/menus/index.ts
index 857dc393e..abbdcf9a8 100644
--- a/inlong-dashboard/src/configs/menus/index.ts
+++ b/inlong-dashboard/src/configs/menus/index.ts
@@ -48,7 +48,7 @@ const menus: MenuItemType[] = [
],
},
{
- path: '/audit',
+ path: '/process',
name: i18n.t('configs.menus.ApprovalManagement'),
},
// {
diff --git a/inlong-dashboard/src/configs/routes/index.tsx
b/inlong-dashboard/src/configs/routes/index.tsx
index d95793d8f..c4fffda09 100644
--- a/inlong-dashboard/src/configs/routes/index.tsx
+++ b/inlong-dashboard/src/configs/routes/index.tsx
@@ -33,17 +33,17 @@ const routes: RouteProps[] = [
},
{
path: '/access',
- component: () => import('@/pages/AccessDashboard'),
+ component: () => import('@/pages/GroupDashboard'),
exact: true,
childRoutes: [
{
path: '/create/:id?',
- component: () => import('@/pages/AccessDetail'),
+ component: () => import('@/pages/GroupDetail'),
exact: true,
},
{
path: '/detail/:id',
- component: () => import('@/pages/AccessDetail'),
+ component: () => import('@/pages/GroupDetail'),
exact: true,
},
],
@@ -66,24 +66,24 @@ const routes: RouteProps[] = [
],
},
{
- path: '/audit',
+ path: '/process',
exact: true,
childRoutes: [
{
path: '/:type?',
- component: () => import('@/pages/Approvals'),
+ component: () => import('@/pages/Process'),
exact: true,
childRoutes: [
{
path: '/:id',
- component: () => import('@/pages/ApprovalDetail'),
+ component: () => import('@/pages/ProcessDetail'),
exact: true,
},
],
},
{
path: '/detail/:id',
- component: () => import('@/pages/ApprovalDetail'),
+ component: () => import('@/pages/ProcessDetail'),
exact: true,
},
],
@@ -100,7 +100,7 @@ const routes: RouteProps[] = [
},
{
path: '/approval',
- component: () => import('@/pages/ApprovalManagement'),
+ component: () => import('@/pages/ProcessManagement'),
exact: true,
},
{
diff --git a/inlong-dashboard/src/meta/consumption/index.tsx
b/inlong-dashboard/src/metas/consumption/index.tsx
similarity index 100%
rename from inlong-dashboard/src/meta/consumption/index.tsx
rename to inlong-dashboard/src/metas/consumption/index.tsx
diff --git a/inlong-dashboard/src/meta/group/index.tsx
b/inlong-dashboard/src/metas/group/index.tsx
similarity index 100%
rename from inlong-dashboard/src/meta/group/index.tsx
rename to inlong-dashboard/src/metas/group/index.tsx
diff --git a/inlong-dashboard/src/meta/sinks/clickhouse.tsx
b/inlong-dashboard/src/metas/sinks/clickhouse.tsx
similarity index 100%
rename from inlong-dashboard/src/meta/sinks/clickhouse.tsx
rename to inlong-dashboard/src/metas/sinks/clickhouse.tsx
diff --git a/inlong-dashboard/src/meta/sinks/common/sourceFields.ts
b/inlong-dashboard/src/metas/sinks/common/sourceFields.ts
similarity index 100%
rename from inlong-dashboard/src/meta/sinks/common/sourceFields.ts
rename to inlong-dashboard/src/metas/sinks/common/sourceFields.ts
diff --git a/inlong-dashboard/src/meta/sinks/es.tsx
b/inlong-dashboard/src/metas/sinks/es.tsx
similarity index 100%
rename from inlong-dashboard/src/meta/sinks/es.tsx
rename to inlong-dashboard/src/metas/sinks/es.tsx
diff --git a/inlong-dashboard/src/meta/sinks/greenplum.tsx
b/inlong-dashboard/src/metas/sinks/greenplum.tsx
similarity index 100%
rename from inlong-dashboard/src/meta/sinks/greenplum.tsx
rename to inlong-dashboard/src/metas/sinks/greenplum.tsx
diff --git a/inlong-dashboard/src/meta/sinks/hbase.tsx
b/inlong-dashboard/src/metas/sinks/hbase.tsx
similarity index 100%
rename from inlong-dashboard/src/meta/sinks/hbase.tsx
rename to inlong-dashboard/src/metas/sinks/hbase.tsx
diff --git a/inlong-dashboard/src/meta/sinks/hive.tsx
b/inlong-dashboard/src/metas/sinks/hive.tsx
similarity index 100%
rename from inlong-dashboard/src/meta/sinks/hive.tsx
rename to inlong-dashboard/src/metas/sinks/hive.tsx
diff --git a/inlong-dashboard/src/meta/sinks/iceberg.tsx
b/inlong-dashboard/src/metas/sinks/iceberg.tsx
similarity index 100%
rename from inlong-dashboard/src/meta/sinks/iceberg.tsx
rename to inlong-dashboard/src/metas/sinks/iceberg.tsx
diff --git a/inlong-dashboard/src/meta/sinks/index.ts
b/inlong-dashboard/src/metas/sinks/index.ts
similarity index 100%
rename from inlong-dashboard/src/meta/sinks/index.ts
rename to inlong-dashboard/src/metas/sinks/index.ts
diff --git a/inlong-dashboard/src/meta/sinks/kafka.tsx
b/inlong-dashboard/src/metas/sinks/kafka.tsx
similarity index 100%
rename from inlong-dashboard/src/meta/sinks/kafka.tsx
rename to inlong-dashboard/src/metas/sinks/kafka.tsx
diff --git a/inlong-dashboard/src/meta/sinks/mysql.tsx
b/inlong-dashboard/src/metas/sinks/mysql.tsx
similarity index 100%
rename from inlong-dashboard/src/meta/sinks/mysql.tsx
rename to inlong-dashboard/src/metas/sinks/mysql.tsx
diff --git a/inlong-dashboard/src/meta/sinks/oracle.tsx
b/inlong-dashboard/src/metas/sinks/oracle.tsx
similarity index 100%
rename from inlong-dashboard/src/meta/sinks/oracle.tsx
rename to inlong-dashboard/src/metas/sinks/oracle.tsx
diff --git a/inlong-dashboard/src/meta/sinks/postgreSql.tsx
b/inlong-dashboard/src/metas/sinks/postgreSql.tsx
similarity index 100%
rename from inlong-dashboard/src/meta/sinks/postgreSql.tsx
rename to inlong-dashboard/src/metas/sinks/postgreSql.tsx
diff --git a/inlong-dashboard/src/meta/sinks/sqlServer.tsx
b/inlong-dashboard/src/metas/sinks/sqlServer.tsx
similarity index 100%
rename from inlong-dashboard/src/meta/sinks/sqlServer.tsx
rename to inlong-dashboard/src/metas/sinks/sqlServer.tsx
diff --git a/inlong-dashboard/src/meta/sinks/tdsqlPostgreSql.tsx
b/inlong-dashboard/src/metas/sinks/tdsqlPostgreSql.tsx
similarity index 100%
rename from inlong-dashboard/src/meta/sinks/tdsqlPostgreSql.tsx
rename to inlong-dashboard/src/metas/sinks/tdsqlPostgreSql.tsx
diff --git a/inlong-dashboard/src/meta/sources/autoPush.ts
b/inlong-dashboard/src/metas/sources/autoPush.ts
similarity index 100%
rename from inlong-dashboard/src/meta/sources/autoPush.ts
rename to inlong-dashboard/src/metas/sources/autoPush.ts
diff --git a/inlong-dashboard/src/meta/sources/binLog.ts
b/inlong-dashboard/src/metas/sources/binLog.ts
similarity index 100%
rename from inlong-dashboard/src/meta/sources/binLog.ts
rename to inlong-dashboard/src/metas/sources/binLog.ts
diff --git a/inlong-dashboard/src/meta/sources/file.ts
b/inlong-dashboard/src/metas/sources/file.ts
similarity index 100%
rename from inlong-dashboard/src/meta/sources/file.ts
rename to inlong-dashboard/src/metas/sources/file.ts
diff --git a/inlong-dashboard/src/meta/sources/index.ts
b/inlong-dashboard/src/metas/sources/index.ts
similarity index 100%
rename from inlong-dashboard/src/meta/sources/index.ts
rename to inlong-dashboard/src/metas/sources/index.ts
diff --git a/inlong-dashboard/src/meta/stream/index.tsx
b/inlong-dashboard/src/metas/stream/index.tsx
similarity index 98%
rename from inlong-dashboard/src/meta/stream/index.tsx
rename to inlong-dashboard/src/metas/stream/index.tsx
index 8bfb3abba..f0f136bc8 100644
--- a/inlong-dashboard/src/meta/stream/index.tsx
+++ b/inlong-dashboard/src/metas/stream/index.tsx
@@ -22,7 +22,7 @@ import { FormItemProps } from '@/components/FormGenerator';
import { pickObjectArray } from '@/utils';
import EditableTable from '@/components/EditableTable';
import i18n from '@/i18n';
-import { fieldTypes as sourceFieldsTypes } from
'@/meta/sinks/common/sourceFields';
+import { fieldTypes as sourceFieldsTypes } from
'@/metas/sinks/common/sourceFields';
type RestParams = {
// Whether the fieldList is in edit mode
diff --git a/inlong-dashboard/src/pages/ConsumeDetail/Info/config.tsx
b/inlong-dashboard/src/pages/ConsumeDetail/Info/config.tsx
index 770ac4641..9a6468319 100644
--- a/inlong-dashboard/src/pages/ConsumeDetail/Info/config.tsx
+++ b/inlong-dashboard/src/pages/ConsumeDetail/Info/config.tsx
@@ -17,7 +17,7 @@
* under the License.
*/
-import getConsumptionFields from '@/meta/consumption';
+import getConsumptionFields from '@/metas/consumption';
export const getFormContent = ({ editing, initialValues, isCreate }) => {
const keys = [
diff --git a/inlong-dashboard/src/pages/AccessDashboard/ExecutionLogModal.tsx
b/inlong-dashboard/src/pages/GroupDashboard/ExecutionLogModal.tsx
similarity index 100%
rename from inlong-dashboard/src/pages/AccessDashboard/ExecutionLogModal.tsx
rename to inlong-dashboard/src/pages/GroupDashboard/ExecutionLogModal.tsx
diff --git a/inlong-dashboard/src/pages/AccessDashboard/config.tsx
b/inlong-dashboard/src/pages/GroupDashboard/config.tsx
similarity index 100%
rename from inlong-dashboard/src/pages/AccessDashboard/config.tsx
rename to inlong-dashboard/src/pages/GroupDashboard/config.tsx
diff --git a/inlong-dashboard/src/pages/AccessDashboard/index.tsx
b/inlong-dashboard/src/pages/GroupDashboard/index.tsx
similarity index 100%
rename from inlong-dashboard/src/pages/AccessDashboard/index.tsx
rename to inlong-dashboard/src/pages/GroupDashboard/index.tsx
diff --git a/inlong-dashboard/src/pages/AccessDashboard/status.tsx
b/inlong-dashboard/src/pages/GroupDashboard/status.tsx
similarity index 100%
rename from inlong-dashboard/src/pages/AccessDashboard/status.tsx
rename to inlong-dashboard/src/pages/GroupDashboard/status.tsx
diff --git a/inlong-dashboard/src/pages/AccessDetail/Audit/config.tsx
b/inlong-dashboard/src/pages/GroupDetail/Audit/config.tsx
similarity index 100%
rename from inlong-dashboard/src/pages/AccessDetail/Audit/config.tsx
rename to inlong-dashboard/src/pages/GroupDetail/Audit/config.tsx
diff --git a/inlong-dashboard/src/pages/AccessDetail/Audit/index.tsx
b/inlong-dashboard/src/pages/GroupDetail/Audit/index.tsx
similarity index 100%
rename from inlong-dashboard/src/pages/AccessDetail/Audit/index.tsx
rename to inlong-dashboard/src/pages/GroupDetail/Audit/index.tsx
diff --git
a/inlong-dashboard/src/pages/AccessDetail/DataSources/DetailModal.tsx
b/inlong-dashboard/src/pages/GroupDetail/DataSources/DetailModal.tsx
similarity index 98%
rename from inlong-dashboard/src/pages/AccessDetail/DataSources/DetailModal.tsx
rename to inlong-dashboard/src/pages/GroupDetail/DataSources/DetailModal.tsx
index a480885af..04871e68d 100644
--- a/inlong-dashboard/src/pages/AccessDetail/DataSources/DetailModal.tsx
+++ b/inlong-dashboard/src/pages/GroupDetail/DataSources/DetailModal.tsx
@@ -24,7 +24,7 @@ import FormGenerator, { useForm } from
'@/components/FormGenerator';
import { useRequest, useUpdateEffect } from '@/hooks';
import { useTranslation } from 'react-i18next';
import { FormItemProps } from '@/components/FormGenerator';
-import { sources, SourceType } from '@/meta/sources';
+import { sources, SourceType } from '@/metas/sources';
export interface Props extends ModalProps {
type: 'MYSQL_BINLOG' | 'FILE';
diff --git a/inlong-dashboard/src/pages/AccessDetail/DataSources/index.tsx
b/inlong-dashboard/src/pages/GroupDetail/DataSources/index.tsx
similarity index 99%
rename from inlong-dashboard/src/pages/AccessDetail/DataSources/index.tsx
rename to inlong-dashboard/src/pages/GroupDetail/DataSources/index.tsx
index 8838b955d..2bbe94f4c 100644
--- a/inlong-dashboard/src/pages/AccessDetail/DataSources/index.tsx
+++ b/inlong-dashboard/src/pages/GroupDetail/DataSources/index.tsx
@@ -23,7 +23,7 @@ import HighTable from '@/components/HighTable';
import { defaultSize } from '@/configs/pagination';
import { useRequest } from '@/hooks';
import DetailModal from './DetailModal';
-import { sources } from '@/meta/sources';
+import { sources } from '@/metas/sources';
import i18n from '@/i18n';
import request from '@/utils/request';
import { CommonInterface } from '../common';
diff --git a/inlong-dashboard/src/pages/AccessDetail/DataSources/status.tsx
b/inlong-dashboard/src/pages/GroupDetail/DataSources/status.tsx
similarity index 100%
rename from inlong-dashboard/src/pages/AccessDetail/DataSources/status.tsx
rename to inlong-dashboard/src/pages/GroupDetail/DataSources/status.tsx
diff --git
a/inlong-dashboard/src/pages/AccessDetail/DataStorage/DetailModal.tsx
b/inlong-dashboard/src/pages/GroupDetail/DataStorage/DetailModal.tsx
similarity index 99%
rename from inlong-dashboard/src/pages/AccessDetail/DataStorage/DetailModal.tsx
rename to inlong-dashboard/src/pages/GroupDetail/DataStorage/DetailModal.tsx
index 54ef0368a..950f5b7f4 100644
--- a/inlong-dashboard/src/pages/AccessDetail/DataStorage/DetailModal.tsx
+++ b/inlong-dashboard/src/pages/GroupDetail/DataStorage/DetailModal.tsx
@@ -27,7 +27,7 @@ import FormGenerator, {
FormItemProps,
FormGeneratorProps,
} from '@/components/FormGenerator';
-import { Sinks, SinkType } from '@/meta/sinks';
+import { Sinks, SinkType } from '@/metas/sinks';
export interface DetailModalProps extends ModalProps {
inlongGroupId: string;
diff --git a/inlong-dashboard/src/pages/AccessDetail/DataStorage/index.tsx
b/inlong-dashboard/src/pages/GroupDetail/DataStorage/index.tsx
similarity index 99%
rename from inlong-dashboard/src/pages/AccessDetail/DataStorage/index.tsx
rename to inlong-dashboard/src/pages/GroupDetail/DataStorage/index.tsx
index 7600820e0..c760b0861 100644
--- a/inlong-dashboard/src/pages/AccessDetail/DataStorage/index.tsx
+++ b/inlong-dashboard/src/pages/GroupDetail/DataStorage/index.tsx
@@ -24,7 +24,7 @@ import { defaultSize } from '@/configs/pagination';
import { useRequest } from '@/hooks';
import i18n from '@/i18n';
import DetailModal from './DetailModal';
-import { Sinks } from '@/meta/sinks';
+import { Sinks } from '@/metas/sinks';
import request from '@/utils/request';
import { CommonInterface } from '../common';
import { statusList, genStatusTag } from './status';
diff --git a/inlong-dashboard/src/pages/AccessDetail/DataStorage/status.tsx
b/inlong-dashboard/src/pages/GroupDetail/DataStorage/status.tsx
similarity index 100%
rename from inlong-dashboard/src/pages/AccessDetail/DataStorage/status.tsx
rename to inlong-dashboard/src/pages/GroupDetail/DataStorage/status.tsx
diff --git
a/inlong-dashboard/src/pages/AccessDetail/DataStream/StreamItemModal.tsx
b/inlong-dashboard/src/pages/GroupDetail/DataStream/StreamItemModal.tsx
similarity index 97%
rename from
inlong-dashboard/src/pages/AccessDetail/DataStream/StreamItemModal.tsx
rename to inlong-dashboard/src/pages/GroupDetail/DataStream/StreamItemModal.tsx
index 52438e82b..4b1a9a037 100644
--- a/inlong-dashboard/src/pages/AccessDetail/DataStream/StreamItemModal.tsx
+++ b/inlong-dashboard/src/pages/GroupDetail/DataStream/StreamItemModal.tsx
@@ -23,8 +23,8 @@ import { ModalProps } from 'antd/es/modal';
import FormGenerator, { useForm } from '@/components/FormGenerator';
import { useUpdateEffect, useRequest } from '@/hooks';
import i18n from '@/i18n';
-import getGroupFields from '@/meta/group';
-import getStreamFields from '@/meta/stream';
+import getGroupFields from '@/metas/group';
+import getStreamFields from '@/metas/stream';
import request from '@/utils/request';
import { dataToValues, valuesToData } from './helper';
diff --git a/inlong-dashboard/src/pages/AccessDetail/DataStream/config.tsx
b/inlong-dashboard/src/pages/GroupDetail/DataStream/config.tsx
similarity index 100%
rename from inlong-dashboard/src/pages/AccessDetail/DataStream/config.tsx
rename to inlong-dashboard/src/pages/GroupDetail/DataStream/config.tsx
diff --git a/inlong-dashboard/src/pages/AccessDetail/DataStream/helper.ts
b/inlong-dashboard/src/pages/GroupDetail/DataStream/helper.ts
similarity index 100%
rename from inlong-dashboard/src/pages/AccessDetail/DataStream/helper.ts
rename to inlong-dashboard/src/pages/GroupDetail/DataStream/helper.ts
diff --git a/inlong-dashboard/src/pages/AccessDetail/DataStream/index.tsx
b/inlong-dashboard/src/pages/GroupDetail/DataStream/index.tsx
similarity index 100%
rename from inlong-dashboard/src/pages/AccessDetail/DataStream/index.tsx
rename to inlong-dashboard/src/pages/GroupDetail/DataStream/index.tsx
diff --git a/inlong-dashboard/src/pages/AccessDetail/DataStream/status.tsx
b/inlong-dashboard/src/pages/GroupDetail/DataStream/status.tsx
similarity index 100%
rename from inlong-dashboard/src/pages/AccessDetail/DataStream/status.tsx
rename to inlong-dashboard/src/pages/GroupDetail/DataStream/status.tsx
diff --git a/inlong-dashboard/src/pages/AccessDetail/Info/config.tsx
b/inlong-dashboard/src/pages/GroupDetail/Info/config.tsx
similarity index 98%
rename from inlong-dashboard/src/pages/AccessDetail/Info/config.tsx
rename to inlong-dashboard/src/pages/GroupDetail/Info/config.tsx
index 7fd1b9e30..47d1e1fd3 100644
--- a/inlong-dashboard/src/pages/AccessDetail/Info/config.tsx
+++ b/inlong-dashboard/src/pages/GroupDetail/Info/config.tsx
@@ -18,7 +18,7 @@
*/
// import React from 'react';
-import getGroupFields from '@/meta/group';
+import getGroupFields from '@/metas/group';
export const getFormContent = ({ editing, initialValues, isCreate, isUpdate })
=> {
const keys = [
diff --git a/inlong-dashboard/src/pages/AccessDetail/Info/index.tsx
b/inlong-dashboard/src/pages/GroupDetail/Info/index.tsx
similarity index 100%
rename from inlong-dashboard/src/pages/AccessDetail/Info/index.tsx
rename to inlong-dashboard/src/pages/GroupDetail/Info/index.tsx
diff --git a/inlong-dashboard/src/pages/AccessDetail/common.d.ts
b/inlong-dashboard/src/pages/GroupDetail/common.d.ts
similarity index 100%
rename from inlong-dashboard/src/pages/AccessDetail/common.d.ts
rename to inlong-dashboard/src/pages/GroupDetail/common.d.ts
diff --git a/inlong-dashboard/src/pages/AccessDetail/index.tsx
b/inlong-dashboard/src/pages/GroupDetail/index.tsx
similarity index 96%
rename from inlong-dashboard/src/pages/AccessDetail/index.tsx
rename to inlong-dashboard/src/pages/GroupDetail/index.tsx
index 90282281a..56caf302f 100644
--- a/inlong-dashboard/src/pages/AccessDetail/index.tsx
+++ b/inlong-dashboard/src/pages/GroupDetail/index.tsx
@@ -178,8 +178,12 @@ const Comp: React.FC = () => {
style={{ marginBottom: 20, width: 600 }}
onChange={c => setCurrent(c)}
>
- {list.map(item => (
- <Steps.Step key={item.label} title={item.label} />
+ {list.map((item, index) => (
+ <Steps.Step
+ key={item.label}
+ title={item.label}
+ disabled={index > current && !hasOpened(index)}
+ />
))}
</Steps>
)}
diff --git a/inlong-dashboard/src/pages/Approvals/Applies/config.tsx
b/inlong-dashboard/src/pages/Process/Applies/config.tsx
similarity index 93%
rename from inlong-dashboard/src/pages/Approvals/Applies/config.tsx
rename to inlong-dashboard/src/pages/Process/Applies/config.tsx
index 1e1b260fe..54d53a0a6 100644
--- a/inlong-dashboard/src/pages/Approvals/Applies/config.tsx
+++ b/inlong-dashboard/src/pages/Process/Applies/config.tsx
@@ -52,7 +52,7 @@ export const getColumns = activedName => [
title: i18n.t('pages.Approvals.ProcessID'),
dataIndex: 'id',
width: 90,
- render: text => <Link to={`/audit/${activedName}/${text}`}>{text}</Link>,
+ render: text => <Link to={`/process/${activedName}/${text}`}>{text}</Link>,
},
{
title: i18n.t('pages.Approvals.ApplicationType'),
@@ -88,7 +88,7 @@ export const getColumns = activedName => [
dataIndex: 'action',
width: 100,
render: (text, record) => (
- <Link
to={`/audit/${activedName}/${record.id}`}>{i18n.t('basic.Detail')}</Link>
+ <Link
to={`/process/${activedName}/${record.id}`}>{i18n.t('basic.Detail')}</Link>
),
},
];
diff --git a/inlong-dashboard/src/pages/Approvals/Applies/index.tsx
b/inlong-dashboard/src/pages/Process/Applies/index.tsx
similarity index 100%
rename from inlong-dashboard/src/pages/Approvals/Applies/index.tsx
rename to inlong-dashboard/src/pages/Process/Applies/index.tsx
diff --git a/inlong-dashboard/src/pages/Approvals/Applies/status.tsx
b/inlong-dashboard/src/pages/Process/Applies/status.tsx
similarity index 100%
rename from inlong-dashboard/src/pages/Approvals/Applies/status.tsx
rename to inlong-dashboard/src/pages/Process/Applies/status.tsx
diff --git a/inlong-dashboard/src/pages/Approvals/Approvals/config.tsx
b/inlong-dashboard/src/pages/Process/Approvals/config.tsx
similarity index 93%
rename from inlong-dashboard/src/pages/Approvals/Approvals/config.tsx
rename to inlong-dashboard/src/pages/Process/Approvals/config.tsx
index b3300adbc..b45158b7b 100644
--- a/inlong-dashboard/src/pages/Approvals/Approvals/config.tsx
+++ b/inlong-dashboard/src/pages/Process/Approvals/config.tsx
@@ -57,7 +57,7 @@ export const getColumns = activedName => [
title: i18n.t('pages.Approvals.ProcessID'),
dataIndex: 'processId',
render: (text, record) => (
- <Link
to={`/audit/${activedName}/${text}?taskId=${record.id}`}>{text}</Link>
+ <Link
to={`/process/${activedName}/${text}?taskId=${record.id}`}>{text}</Link>
),
},
{
@@ -87,7 +87,7 @@ export const getColumns = activedName => [
title: i18n.t('basic.Operating'),
dataIndex: 'action',
render: (text, record) => (
- <Link
to={`/audit/${activedName}/${record.processId}?taskId=${record.id}`}>
+ <Link
to={`/process/${activedName}/${record.processId}?taskId=${record.id}`}>
{i18n.t('basic.Detail')}
</Link>
),
diff --git a/inlong-dashboard/src/pages/Approvals/Approvals/index.tsx
b/inlong-dashboard/src/pages/Process/Approvals/index.tsx
similarity index 100%
rename from inlong-dashboard/src/pages/Approvals/Approvals/index.tsx
rename to inlong-dashboard/src/pages/Process/Approvals/index.tsx
diff --git a/inlong-dashboard/src/pages/Approvals/Approvals/status.tsx
b/inlong-dashboard/src/pages/Process/Approvals/status.tsx
similarity index 100%
rename from inlong-dashboard/src/pages/Approvals/Approvals/status.tsx
rename to inlong-dashboard/src/pages/Process/Approvals/status.tsx
diff --git a/inlong-dashboard/src/pages/Approvals/index.tsx
b/inlong-dashboard/src/pages/Process/index.tsx
similarity index 98%
rename from inlong-dashboard/src/pages/Approvals/index.tsx
rename to inlong-dashboard/src/pages/Process/index.tsx
index 7ed316d3e..2cd9c07f2 100644
--- a/inlong-dashboard/src/pages/Approvals/index.tsx
+++ b/inlong-dashboard/src/pages/Process/index.tsx
@@ -84,7 +84,7 @@ const Comp: React.FC = () => {
const onTabsChange = value => {
setActived(value);
history.push({
- pathname: `/audit/${value}`,
+ pathname: `/process/${value}`,
});
};
diff --git a/inlong-dashboard/src/pages/ApprovalDetail/Access.tsx
b/inlong-dashboard/src/pages/ProcessDetail/Access.tsx
similarity index 100%
rename from inlong-dashboard/src/pages/ApprovalDetail/Access.tsx
rename to inlong-dashboard/src/pages/ProcessDetail/Access.tsx
diff --git a/inlong-dashboard/src/pages/ApprovalDetail/AccessConfig.tsx
b/inlong-dashboard/src/pages/ProcessDetail/AccessConfig.tsx
similarity index 98%
rename from inlong-dashboard/src/pages/ApprovalDetail/AccessConfig.tsx
rename to inlong-dashboard/src/pages/ProcessDetail/AccessConfig.tsx
index 6621075c2..00e262180 100644
--- a/inlong-dashboard/src/pages/ApprovalDetail/AccessConfig.tsx
+++ b/inlong-dashboard/src/pages/ProcessDetail/AccessConfig.tsx
@@ -20,7 +20,7 @@
import React from 'react';
import { Divider, Table } from 'antd';
import i18n from '@/i18n';
-import getGroupFields from '@/meta/group';
+import getGroupFields from '@/metas/group';
const getContent = (initialValues, isFinished, isViwer) => [
...getGroupFields(
diff --git a/inlong-dashboard/src/pages/ApprovalDetail/Consume.tsx
b/inlong-dashboard/src/pages/ProcessDetail/Consume.tsx
similarity index 100%
rename from inlong-dashboard/src/pages/ApprovalDetail/Consume.tsx
rename to inlong-dashboard/src/pages/ProcessDetail/Consume.tsx
diff --git a/inlong-dashboard/src/pages/ApprovalDetail/ConsumeConfig.tsx
b/inlong-dashboard/src/pages/ProcessDetail/ConsumeConfig.tsx
similarity index 98%
rename from inlong-dashboard/src/pages/ApprovalDetail/ConsumeConfig.tsx
rename to inlong-dashboard/src/pages/ProcessDetail/ConsumeConfig.tsx
index f68a182de..4474a2294 100644
--- a/inlong-dashboard/src/pages/ApprovalDetail/ConsumeConfig.tsx
+++ b/inlong-dashboard/src/pages/ProcessDetail/ConsumeConfig.tsx
@@ -20,7 +20,7 @@
import React from 'react';
import { Divider } from 'antd';
import i18n from '@/i18n';
-import getConsumptionFields from '@/meta/consumption';
+import getConsumptionFields from '@/metas/consumption';
const getContent = initialValues => {
return getConsumptionFields(
diff --git a/inlong-dashboard/src/pages/ApprovalDetail/Steps.tsx
b/inlong-dashboard/src/pages/ProcessDetail/Steps.tsx
similarity index 100%
rename from inlong-dashboard/src/pages/ApprovalDetail/Steps.tsx
rename to inlong-dashboard/src/pages/ProcessDetail/Steps.tsx
diff --git a/inlong-dashboard/src/pages/ApprovalDetail/common.d.ts
b/inlong-dashboard/src/pages/ProcessDetail/common.d.ts
similarity index 100%
rename from inlong-dashboard/src/pages/ApprovalDetail/common.d.ts
rename to inlong-dashboard/src/pages/ProcessDetail/common.d.ts
diff --git a/inlong-dashboard/src/pages/ApprovalDetail/index.tsx
b/inlong-dashboard/src/pages/ProcessDetail/index.tsx
similarity index 96%
rename from inlong-dashboard/src/pages/ApprovalDetail/index.tsx
rename to inlong-dashboard/src/pages/ProcessDetail/index.tsx
index c1a042d5a..5e46014be 100644
--- a/inlong-dashboard/src/pages/ApprovalDetail/index.tsx
+++ b/inlong-dashboard/src/pages/ProcessDetail/index.tsx
@@ -101,7 +101,7 @@ const Comp: React.FC = () => {
method: 'POST',
data: submitData,
});
- history.push('/audit/approvals');
+ history.push('/process/approvals');
message.success(i18n.t('basic.OperatingSuccess'));
};
@@ -117,7 +117,7 @@ const Comp: React.FC = () => {
remark,
},
});
- history.push('/audit/approvals');
+ history.push('/process/approvals');
message.success(i18n.t('pages.ApprovalDetail.RejectSuccess'));
},
});
@@ -135,7 +135,7 @@ const Comp: React.FC = () => {
remark: '',
},
});
- history.push('/audit/applies');
+ history.push('/process/applies');
message.success(i18n.t('pages.ApprovalDetail.RevokeSuccess'));
},
});
@@ -156,7 +156,7 @@ const Comp: React.FC = () => {
{i18n.t('pages.ApprovalDetail.Ok')}
</Button>
<Button
onClick={onReject}>{i18n.t('pages.ApprovalDetail.Reject')}</Button>
- <Button onClick={() => history.push('/audit/approvals')}>
+ <Button onClick={() => history.push('/process/approvals')}>
{i18n.t('pages.ApprovalDetail.Back')}
</Button>
</Space>
@@ -164,7 +164,7 @@ const Comp: React.FC = () => {
{type === 'applies' && processInfo?.status === 'PROCESSING' && (
<Space style={{ display: 'flex', justifyContent: 'center' }}>
<Button
onClick={onCancel}>{i18n.t('pages.ApprovalDetail.Withdraw')}</Button>
- <Button onClick={() => history.push('/audit/applies')}>
+ <Button onClick={() => history.push('/process/applies')}>
{i18n.t('pages.ApprovalDetail.Back')}
</Button>
</Space>
diff --git a/inlong-dashboard/src/pages/ApprovalManagement/DetailModal.tsx
b/inlong-dashboard/src/pages/ProcessManagement/DetailModal.tsx
similarity index 100%
rename from inlong-dashboard/src/pages/ApprovalManagement/DetailModal.tsx
rename to inlong-dashboard/src/pages/ProcessManagement/DetailModal.tsx
diff --git a/inlong-dashboard/src/pages/ApprovalManagement/config.tsx
b/inlong-dashboard/src/pages/ProcessManagement/config.tsx
similarity index 100%
rename from inlong-dashboard/src/pages/ApprovalManagement/config.tsx
rename to inlong-dashboard/src/pages/ProcessManagement/config.tsx
diff --git a/inlong-dashboard/src/pages/ApprovalManagement/index.tsx
b/inlong-dashboard/src/pages/ProcessManagement/index.tsx
similarity index 100%
rename from inlong-dashboard/src/pages/ApprovalManagement/index.tsx
rename to inlong-dashboard/src/pages/ProcessManagement/index.tsx
