Skip to content
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.

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

[refactor]: (shared/api) add scripts to generate api exports #564

Merged
merged 2 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"icon:docs:build": "pnpm --filter @actiontech/icons docs:build",
"icon:build": "pnpm --filter @actiontech/icons build",
"dms:g": "pnpm --filter @actiontech/cli-create-dms-page build && create-dms-page",
"api:g": "npm_config_registry=http://10.186.18.19:4873 pnpx @actiontech/cli api-gen -y"
"api:g": "sh ./scripts/api/gen_api.sh"
},
"keywords": [],
"author": "",
Expand Down
10 changes: 4 additions & 6 deletions packages/base/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,18 @@ import {
SpinIndicator,
useTypedNavigate
} from '@actiontech/shared';
import {
useChangeTheme,
useNotificationContext
} from '@actiontech/shared/lib/hooks';
import { useNotificationContext } from '@actiontech/shared/lib/hooks';
import {
ResponseCode,
SupportLanguage,
SupportTheme
} from '@actiontech/shared/lib/enum';
import Nav from './page/Nav';
import {
useChangeTheme,
useCurrentUser,
useDbServiceDriver
useDbServiceDriver,
usePermission
} from '@actiontech/shared/lib/global';
import useSessionUser from './hooks/useSessionUser';
import { ConfigProvider, Spin, theme as antdTheme } from 'antd';
Expand All @@ -41,7 +40,6 @@ import updateLocale from 'dayjs/plugin/updateLocale';
import i18n from './locale';
import antd_zh_CN from 'antd/locale/zh_CN';
import antd_en_US from 'antd/locale/en_US';
import usePermission from '@actiontech/shared/lib/global/usePermission/usePermission';
import useFetchPermissionData from './hooks/useFetchPermissionData';
import { useDispatch } from 'react-redux';
import { updateModuleFeatureSupport } from './store/permission';
Expand Down
4 changes: 2 additions & 2 deletions packages/base/src/page/DataSource/components/List/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import {
import { TestConnectDisableReasonStyleWrapper } from '@actiontech/shared/lib/components/TestDatabaseConnectButton/style';
import {
useCurrentProject,
useDbServiceDriver
useDbServiceDriver,
usePermission
} from '@actiontech/shared/lib/global';
import useDbService from '../../../../hooks/useDbService';
import { useBoolean, useRequest } from 'ahooks';
Expand All @@ -31,7 +32,6 @@ import {
DataSourceListParamType,
filterDataMaskOptions
} from './columns';
import usePermission from '@actiontech/shared/lib/global/usePermission/usePermission';
import { DataSourceListActions, DataSourcePageHeaderActions } from './actions';
import { ROUTE_PATHS } from '@actiontech/shared/lib/data/routePaths';
import useStaticTips from '../../../../hooks/useStaticTips';
Expand Down
4 changes: 2 additions & 2 deletions packages/base/src/page/DataSourceManagement/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import GlobalDataSource from '../GlobalDataSource';
import SyncDataSource from '../SyncDataSource';
import {
PERMISSIONS,
PermissionsConstantType
PermissionsConstantType,
usePermission
} from '@actiontech/shared/lib/global';
import usePermission from '@actiontech/shared/lib/global/usePermission/usePermission';
import { DataSourceManagementPageHeaderActions } from './action';
import { ROUTE_PATHS } from '@actiontech/shared/lib/data/routePaths';

Expand Down
6 changes: 4 additions & 2 deletions packages/base/src/page/GlobalDataSource/List/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ import { useCallback, useEffect, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { message, Modal } from 'antd';
import { TestConnectDisableReasonStyleWrapper } from '@actiontech/shared/lib/components/TestDatabaseConnectButton/style';
import { useDbServiceDriver } from '@actiontech/shared/lib/global';
import {
useDbServiceDriver,
usePermission
} from '@actiontech/shared/lib/global';
import { useRequest } from 'ahooks';
import DBService from '@actiontech/shared/lib/api/base/service/DBService';
import ProjectService from '@actiontech/shared/lib/api/base/service/Project';
Expand All @@ -25,7 +28,6 @@ import eventEmitter from '../../../utils/EventEmitter';
import EmitterKey from '../../../data/EmitterKey';
import useProjectTips from '../../../hooks/useProjectTips';
import useGlobalDataSourceType from '../hooks/useGlobalDataSourceType';
import usePermission from '@actiontech/shared/lib/global/usePermission/usePermission';
import { GlobalDataSourceListActions } from './action';
import { useTypedNavigate } from '@actiontech/shared';
import { ROUTE_PATHS } from '@actiontech/shared/lib/data/routePaths';
Expand Down
2 changes: 1 addition & 1 deletion packages/base/src/page/Nav/SideMenu/MenuList/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
genMenuItemsWithMenuStructTree
} from './menus/common';
import { useLocation } from 'react-router-dom';
import { usePermission } from '@actiontech/shared/lib/global';
import {
CustomMenuItemType,
GenerateMenuItemI18nConfig,
Expand All @@ -15,7 +16,6 @@ import {
} from './menus/index.type';
import { SQLE_ALL_MENUS, SQLE_MENU_STRUCT } from './menus/menu.data';
import { DMS_ALL_MENUS, DMS_MENU_STRUCT } from './menus/menu.data.dms';
import usePermission from '@actiontech/shared/lib/global/usePermission/usePermission';
import { useTranslation } from 'react-i18next';
import { TypedLink } from '@actiontech/shared';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import { ContextMenuItem } from './ContextMenu/index.type';
import ContextMenu from './ContextMenu';
import {
PERMISSIONS,
PermissionsConstantType
PermissionsConstantType,
usePermission
} from '@actiontech/shared/lib/global';
import usePermission from '@actiontech/shared/lib/global/usePermission/usePermission';
import { useTypedNavigate } from '@actiontech/shared';

const GlobalSetting: React.FC = () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/base/src/page/SyncDataSource/List/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import {
import { useEffect } from 'react';
import eventEmitter from '../../../utils/EventEmitter';
import EmitterKey from '../../../data/EmitterKey';
import usePermission from '@actiontech/shared/lib/global/usePermission/usePermission';
import { SyncTaskListActions } from './action';
import { usePermission } from '@actiontech/shared/lib/global';

const SyncTaskList: React.FC = () => {
const { t } = useTranslation();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { useRequest } from 'ahooks';
import EventEmitter from '../../../../utils/EventEmitter';
import EmitterKey from '../../../../data/EmitterKey';
import { RoleListActions } from './action';
import usePermission from '@actiontech/shared/lib/global/usePermission/usePermission';
import { usePermission } from '@actiontech/shared/lib/global';

const RoleList: React.FC<{ activePage: UserCenterListEnum }> = ({
activePage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ import { UserListColumns } from './column';
import { ModalName } from '../../../../data/ModalName';
import EventEmitter from '../../../../utils/EventEmitter';
import EmitterKey from '../../../../data/EmitterKey';
import { useCurrentUser } from '@actiontech/shared/lib/global';
import usePermission from '@actiontech/shared/lib/global/usePermission/usePermission';
import { useCurrentUser, usePermission } from '@actiontech/shared/lib/global';
import { UserListActions } from './action';

const UserList: React.FC<{ activePage: UserCenterListEnum }> = ({
Expand Down
23 changes: 23 additions & 0 deletions packages/shared/lib/api/base/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
export { default as BasicInfoService } from './service/BasicInfo';
export { default as CBOperationLogsService } from './service/CBOperationLogs';
export { default as CloudBeaverService } from './service/CloudBeaver';
export { default as CompanyNoticeService } from './service/CompanyNotice';
export { default as ConfigurationService } from './service/Configuration';
export { default as DBServiceService } from './service/DBService';
export { default as DBServiceSyncTaskService } from './service/DBServiceSyncTask';
export { default as DMSPluginService } from './service/DMSPlugin';
export { default as DMSProxyService } from './service/DMSProxy';
export { default as DataExportTaskService } from './service/DataExportTask';
export { default as DataExportWorkflowsService } from './service/DataExportWorkflows';
export { default as MaskingService } from './service/Masking';
export { default as MemberService } from './service/Member';
export { default as MemberGroupService } from './service/MemberGroup';
export { default as NotificationService } from './service/Notification';
export { default as OAuth2Service } from './service/OAuth2';
export { default as OpPermissionService } from './service/OpPermission';
export { default as ProjectService } from './service/Project';
export { default as RoleService } from './service/Role';
export { default as SessionService } from './service/Session';
export { default as UserService } from './service/User';
export { default as UserGroupService } from './service/UserGroup';
export { default as WebhookService } from './service/Webhook';

This file was deleted.

145 changes: 0 additions & 145 deletions packages/shared/lib/api/base/service/DatabaseSourceService/index.ts

This file was deleted.

2 changes: 2 additions & 0 deletions packages/shared/lib/api/base/service/Project/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ export interface IListProjectsParams {
filter_by_project_uids?: string[];

filter_by_project_priority?: ListProjectsFilterByProjectPriorityEnum;

filter_by_desc?: string;
}

export interface IListProjectsReturn extends IListProjectReply {}
Expand Down
Loading
Loading