diff --git a/packages/plugins/@tachybase/plugin-external-data-source/.npmignore b/packages/plugins/@tachybase/plugin-data-source-external/.npmignore similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/.npmignore rename to packages/plugins/@tachybase/plugin-data-source-external/.npmignore diff --git a/packages/plugins/@tachybase/plugin-external-data-source/README.md b/packages/plugins/@tachybase/plugin-data-source-external/README.md similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/README.md rename to packages/plugins/@tachybase/plugin-data-source-external/README.md diff --git a/packages/plugins/@tachybase/plugin-external-data-source/client.d.ts b/packages/plugins/@tachybase/plugin-data-source-external/client.d.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/client.d.ts rename to packages/plugins/@tachybase/plugin-data-source-external/client.d.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/client.js b/packages/plugins/@tachybase/plugin-data-source-external/client.js similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/client.js rename to packages/plugins/@tachybase/plugin-data-source-external/client.js diff --git a/packages/plugins/@tachybase/plugin-external-data-source/package.json b/packages/plugins/@tachybase/plugin-data-source-external/package.json similarity index 91% rename from packages/plugins/@tachybase/plugin-external-data-source/package.json rename to packages/plugins/@tachybase/plugin-data-source-external/package.json index f6924c9c4..9c3509b6d 100644 --- a/packages/plugins/@tachybase/plugin-external-data-source/package.json +++ b/packages/plugins/@tachybase/plugin-data-source-external/package.json @@ -1,5 +1,5 @@ { - "name": "@tachybase/plugin-external-data-source", + "name": "@tachybase/plugin-data-source-external", "version": "0.22.5", "main": "dist/server/index.js", "dependencies": { diff --git a/packages/plugins/@tachybase/plugin-external-data-source/server.d.ts b/packages/plugins/@tachybase/plugin-data-source-external/server.d.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/server.d.ts rename to packages/plugins/@tachybase/plugin-data-source-external/server.d.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/server.js b/packages/plugins/@tachybase/plugin-data-source-external/server.js similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/server.js rename to packages/plugins/@tachybase/plugin-data-source-external/server.js diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-add/AddCollection.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-add/AddCollection.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-add/AddCollection.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-add/AddCollection.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-add/AddCollectionAction.component.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-add/AddCollectionAction.component.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-add/AddCollectionAction.component.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-add/AddCollectionAction.component.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-add/CreateCollection.schema.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-add/CreateCollection.schema.tsx similarity index 85% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-add/CreateCollection.schema.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-add/CreateCollection.schema.tsx index a1d7309ca..878d4fdb8 100644 --- a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-add/CreateCollection.schema.tsx +++ b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-add/CreateCollection.schema.tsx @@ -4,11 +4,11 @@ import { uid } from '@tachybase/schema'; import lodash from 'lodash'; import { NAMESPACE, tval } from '../../../locale'; +import { useSchemaRequestAction } from './getSchemaRequestAction'; import { PreviewComponent } from './PreviewComponent'; import { PreviewFields } from './PreviewFields'; -import { getSchemaRequestAction } from './getSchemaRequestAction'; -export function getSchemaCollection(title, useAction, item: Record = {}) { +export function useSchemaCollection(title, useAction, item: Record = {}) { const cloneItem = lodash.cloneDeep(item); const data: Record = { @@ -20,6 +20,12 @@ export function getSchemaCollection(title, useAction, item: Record data.reverseField.name = `f_${uid()}`; } + const list = useSchemaRequestAction('list', `{{t("List",{ ns: "${NAMESPACE}" })}}`); + const get = useSchemaRequestAction('get', `{{t("Get",{ ns: "${NAMESPACE}" })}}`); + const create = useSchemaRequestAction('create', `{{t("Create",{ ns: "${NAMESPACE}" })}}`); + const update = useSchemaRequestAction('update', `{{t("Update",{ ns: "${NAMESPACE}" })}}`); + const destroy = useSchemaRequestAction('destroy', `{{t("Destroy",{ ns: "${NAMESPACE}" })}}`); + return { type: 'object', properties: { @@ -73,11 +79,11 @@ export function getSchemaCollection(title, useAction, item: Record defaultActiveKey: [], }, properties: { - list: getSchemaRequestAction('list', `{{t("List",{ ns: "${NAMESPACE}" })}}`), - get: getSchemaRequestAction('get', `{{t("Get",{ ns: "${NAMESPACE}" })}}`), - create: getSchemaRequestAction('create', `{{t("Create",{ ns: "${NAMESPACE}" })}}`), - update: getSchemaRequestAction('update', `{{t("Update",{ ns: "${NAMESPACE}" })}}`), - destroy: getSchemaRequestAction('destroy', `{{t("Destroy",{ ns: "${NAMESPACE}" })}}`), + list, + get, + create, + update, + destroy, }, }, fields: { diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-add/CreateCollection.view.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-add/CreateCollection.view.tsx similarity index 88% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-add/CreateCollection.view.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-add/CreateCollection.view.tsx index 7ba90faf1..158c74ba5 100644 --- a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-add/CreateCollection.view.tsx +++ b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-add/CreateCollection.view.tsx @@ -3,13 +3,13 @@ import { FormItem, SchemaComponent, TemplateSummary, useCancelAction } from '@ta import { ArrayItems, ArrayTable, FormCollapse, FormLayout } from '@tachybase/components'; import { tval } from '../../../locale'; -import { getSchemaCollection } from './CreateCollection.schema'; +import { useSchemaCollection } from './CreateCollection.schema'; import { useActionCreateCollection } from './useActionCreateCollection'; export const ViewCreateCollection = (props) => { const { scope, getContainer, item } = props; const title = tval('Create collection', true); - const schema = getSchemaCollection(title, useActionCreateCollection); + const schema = useSchemaCollection(title, useActionCreateCollection); return ( { - const ref: any = React.useRef(); +export const useSchemaRequestAction = (key, header) => { + const ref: any = useRef(); return { type: 'void', 'x-decorator': ProviderRequestActionItems, diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-add/useActionCreateCollection.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-add/useActionCreateCollection.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-add/useActionCreateCollection.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-add/useActionCreateCollection.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-delete/DeleteCollection.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-delete/DeleteCollection.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-delete/DeleteCollection.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-delete/DeleteCollection.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-delete/DeleteCollectionAction.component.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-delete/DeleteCollectionAction.component.tsx similarity index 81% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-delete/DeleteCollectionAction.component.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-delete/DeleteCollectionAction.component.tsx index a2b3dd68a..d4b19d017 100644 --- a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-delete/DeleteCollectionAction.component.tsx +++ b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-delete/DeleteCollectionAction.component.tsx @@ -16,7 +16,9 @@ export const DeleteCollectionAction = (props) => { const { item, isBulk, children, ...restProps } = props; const targetProps = _.omit(restProps, ['scope', 'getContainer', 'useAction']); const [visible, setVisible] = useState(false); - const { run } = isBulk ? useBulkDestroyActionAndRefreshCM() : useDestroyActionAndRefreshCM(); + const { run: runBulkDestroy } = useBulkDestroyActionAndRefreshCM(); + const { run: runDestroy } = useDestroyActionAndRefreshCM(); + const run = isBulk ? runBulkDestroy : runDestroy; const onClick = () => { modal.confirm({ title: t('Delete collection'), @@ -28,7 +30,9 @@ export const DeleteCollectionAction = (props) => { {isBulk ? ( - ) : ( {children || t('Delete')} diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-delete/useBulkDestroyActionAndRefreshCM.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-delete/useBulkDestroyActionAndRefreshCM.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-delete/useBulkDestroyActionAndRefreshCM.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-delete/useBulkDestroyActionAndRefreshCM.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-delete/useDestroyActionAndRefreshCM.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-delete/useDestroyActionAndRefreshCM.tsx similarity index 76% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-delete/useDestroyActionAndRefreshCM.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-delete/useDestroyActionAndRefreshCM.tsx index 96733132a..8a190906b 100644 --- a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-delete/useDestroyActionAndRefreshCM.tsx +++ b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-delete/useDestroyActionAndRefreshCM.tsx @@ -1,5 +1,13 @@ -import { useCollectionManager_deprecated, useAPIClient, useActionContext, useResourceContext, useRecord, useResourceActionContext } from "@tachybase/client"; -import { useParams } from "react-router-dom"; +import { + useActionContext, + useAPIClient, + useCollectionManager_deprecated, + useRecord, + useResourceActionContext, + useResourceContext, +} from '@tachybase/client'; + +import { useParams } from 'react-router-dom'; export function useDestroyActionAndRefreshCM() { const { run: runFunc } = useDestroyAction(); diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-edit/EditCollection.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-edit/EditCollection.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-edit/EditCollection.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-edit/EditCollection.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-edit/EditCollectionAction.component.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-edit/EditCollectionAction.component.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-edit/EditCollectionAction.component.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-edit/EditCollectionAction.component.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-edit/EditCollectionForm.view.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-edit/EditCollectionForm.view.tsx similarity index 87% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-edit/EditCollectionForm.view.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-edit/EditCollectionForm.view.tsx index 579dac5be..ebab31312 100644 --- a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/collection-edit/EditCollectionForm.view.tsx +++ b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/collection-edit/EditCollectionForm.view.tsx @@ -2,12 +2,12 @@ import React from 'react'; import { FormItem, SchemaComponent, TemplateSummary, useCancelAction } from '@tachybase/client'; import { ArrayItems, ArrayTable, FormCollapse, FormLayout } from '@tachybase/components'; -import { getSchemaCollection } from '../collection-add/CreateCollection.schema'; +import { useSchemaCollection } from '../collection-add/CreateCollection.schema'; import { useActionEditCollection } from './useActionEditCollection'; export const ViewEditCollectionForm = (props) => { const { scope, getContainer, item } = props; - const schema = getSchemaCollection('{{ t("Edit collection") }}', useActionEditCollection, item); + const schema = useSchemaCollection('{{ t("Edit collection") }}', useActionEditCollection, item); return ( { +export const useSchemaDebug = () => { const { t } = useTranslation(); const { actionKey, form, requestActionForm } = useContextRequestInfo(); const schemaChild = getSchemaParam(actionKey, form); diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/Debug.view.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/Debug.view.tsx similarity index 91% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/Debug.view.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/Debug.view.tsx index f606c0418..477db9869 100644 --- a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/Debug.view.tsx +++ b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/Debug.view.tsx @@ -6,13 +6,13 @@ import { Card, Col, Row, Select } from 'antd'; import { useTranslation } from '../../../../locale'; import { useVariableOptions } from '../../scopes/useVariableOptions'; -import { getSchemaDebug } from './Debug.schema'; +import { useSchemaDebug } from './Debug.schema'; import { useCancelAction } from './scopes/useCancelAction'; import { useDebugAction } from './scopes/useDebugAction'; export const ViewDebug = () => { const { t } = useTranslation(); - const schema = getSchemaDebug(); + const schema = useSchemaDebug(); return ( { const form = useForm(); diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/components/Headers.schema.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/components/Headers.schema.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/components/Headers.schema.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/components/Headers.schema.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/components/RequestHeaders.view.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/components/RequestHeaders.view.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/components/RequestHeaders.view.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/components/RequestHeaders.view.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/components/ResponseBody.schema.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/components/ResponseBody.schema.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/components/ResponseBody.schema.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/components/ResponseBody.schema.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/components/ResponseBody.view.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/components/ResponseBody.view.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/components/ResponseBody.view.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/components/ResponseBody.view.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/components/ResponseHeaders.view.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/components/ResponseHeaders.view.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/components/ResponseHeaders.view.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/components/ResponseHeaders.view.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/components/ResponseTab.item.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/components/ResponseTab.item.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/components/ResponseTab.item.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/components/ResponseTab.item.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/components/ResponseTab.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/components/ResponseTab.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/components/ResponseTab.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/components/ResponseTab.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/components/TooltipContainer.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/components/TooltipContainer.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/components/TooltipContainer.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/components/TooltipContainer.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/schemas/getSchemaAction.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/schemas/getSchemaAction.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/schemas/getSchemaAction.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/schemas/getSchemaAction.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/schemas/getSchemaParam.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/schemas/getSchemaParam.tsx similarity index 90% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/schemas/getSchemaParam.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/schemas/getSchemaParam.tsx index 9bd6a727b..32e0c7a29 100644 --- a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/schemas/getSchemaParam.tsx +++ b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/schemas/getSchemaParam.tsx @@ -8,7 +8,7 @@ export function getSchemaParam(actionKey, form) { const schemaMap = getSchemaAction(form, actionKey); - for (let param of targetParams) { + for (const param of targetParams) { schemaChild[param] = schemaMap[param]; } diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/scopes/useCancelAction.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/scopes/useCancelAction.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/scopes/useCancelAction.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/scopes/useCancelAction.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/scopes/useDebugAction.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/scopes/useDebugAction.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/debug-area/scopes/useDebugAction.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/debug-area/scopes/useDebugAction.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/method-path/FieldMethod.schema.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/method-path/FieldMethod.schema.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/method-path/FieldMethod.schema.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/method-path/FieldMethod.schema.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/method-path/FieldMethod.view.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/method-path/FieldMethod.view.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/method-path/FieldMethod.view.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/method-path/FieldMethod.view.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/method-path/FieldPath.schema.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/method-path/FieldPath.schema.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/method-path/FieldPath.schema.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/method-path/FieldPath.schema.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/method-path/FieldPath.view.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/method-path/FieldPath.view.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/method-path/FieldPath.view.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/method-path/FieldPath.view.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/method-path/MethodPathComponent.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/method-path/MethodPathComponent.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/method-path/MethodPathComponent.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/method-path/MethodPathComponent.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/request-tab/RequestBody.schema.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/request-tab/RequestBody.schema.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/request-tab/RequestBody.schema.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/request-tab/RequestBody.schema.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/request-tab/RequestBody.view.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/request-tab/RequestBody.view.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/request-tab/RequestBody.view.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/request-tab/RequestBody.view.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/request-tab/RequestHeaders.schema.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/request-tab/RequestHeaders.schema.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/request-tab/RequestHeaders.schema.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/request-tab/RequestHeaders.schema.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/request-tab/RequestHeaders.view.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/request-tab/RequestHeaders.view.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/request-tab/RequestHeaders.view.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/request-tab/RequestHeaders.view.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/request-tab/RequestParams.schema.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/request-tab/RequestParams.schema.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/request-tab/RequestParams.schema.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/request-tab/RequestParams.schema.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/request-tab/RequestParams.view.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/request-tab/RequestParams.view.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/request-tab/RequestParams.view.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/request-tab/RequestParams.view.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/request-tab/RequestTab.items.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/request-tab/RequestTab.items.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/request-tab/RequestTab.items.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/request-tab/RequestTab.items.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/request-tab/RequestTab.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/request-tab/RequestTab.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/request-tab/RequestTab.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/request-tab/RequestTab.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/request-tab/debounceClick.util.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/request-tab/debounceClick.util.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/request-tab/debounceClick.util.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/request-tab/debounceClick.util.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/request-transformer/ResponseTransformerComponent.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/request-transformer/ResponseTransformerComponent.tsx similarity index 95% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/request-transformer/ResponseTransformerComponent.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/request-transformer/ResponseTransformerComponent.tsx index 3f8823376..08fdb2fc8 100644 --- a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/request-configs/request-transformer/ResponseTransformerComponent.tsx +++ b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/request-configs/request-transformer/ResponseTransformerComponent.tsx @@ -3,8 +3,8 @@ import { useCollectionRecord, Variable } from '@tachybase/client'; import { useContextRequestInfo } from '../../contexts/RequestForm.context'; import { useVariableOptions } from '../../scopes/useVariableOptions'; -import { setFormValue } from '../../utils/setFormValue'; import { responseTransformerAe } from '../../utils/responseTransformerAe'; +import { setFormValue } from '../../utils/setFormValue'; export const ResponseTransformerComponent = () => { const { form, actionKey, responseTransformer, setResponseTransformer } = useContextRequestInfo(); @@ -24,6 +24,7 @@ export const ResponseTransformerComponent = () => { }); } }, []); + const options = useVariableOptions(true); return ( { value: 'name', label: 'title', }} - scope={() => useVariableOptions(true)} + scope={() => options} /> ); }; diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/scopes/useVariableOptions.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/scopes/useVariableOptions.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/scopes/useVariableOptions.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/scopes/useVariableOptions.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/utils/filterObjectWithMethodAndPath.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/utils/filterObjectWithMethodAndPath.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/utils/filterObjectWithMethodAndPath.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/utils/filterObjectWithMethodAndPath.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/utils/filterTree.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/utils/filterTree.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/utils/filterTree.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/utils/filterTree.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/utils/getRequestActions.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/utils/getRequestActions.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/utils/getRequestActions.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/utils/getRequestActions.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/utils/getRequestValues.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/utils/getRequestValues.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/utils/getRequestValues.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/utils/getRequestValues.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/utils/responseTransformerAe.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/utils/responseTransformerAe.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/utils/responseTransformerAe.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/utils/responseTransformerAe.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/utils/setFormValue.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/utils/setFormValue.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/features/rest-api/utils/setFormValue.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/features/rest-api/utils/setFormValue.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/forms/msql.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/forms/msql.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/forms/msql.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/forms/msql.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/forms/pg.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/forms/pg.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/forms/pg.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/forms/pg.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/index.tsx b/packages/plugins/@tachybase/plugin-data-source-external/src/client/index.tsx similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/index.tsx rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/index.tsx diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/client/locale.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/client/locale.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/client/locale.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/client/locale.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/index.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/index.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/index.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/index.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/locale/en-US.json b/packages/plugins/@tachybase/plugin-data-source-external/src/locale/en-US.json similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/locale/en-US.json rename to packages/plugins/@tachybase/plugin-data-source-external/src/locale/en-US.json diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/locale/zh-CN.json b/packages/plugins/@tachybase/plugin-data-source-external/src/locale/zh-CN.json similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/locale/zh-CN.json rename to packages/plugins/@tachybase/plugin-data-source-external/src/locale/zh-CN.json diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/collections/.gitkeep b/packages/plugins/@tachybase/plugin-data-source-external/src/server/collections/.gitkeep similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/collections/.gitkeep rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/collections/.gitkeep diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/http/plugin.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/server/http/plugin.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/http/plugin.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/http/plugin.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/http/services/http-api-repository.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/server/http/services/http-api-repository.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/http/services/http-api-repository.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/http/services/http-api-repository.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/http/services/http-collection-manager.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/server/http/services/http-collection-manager.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/http/services/http-collection-manager.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/http/services/http-collection-manager.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/http/services/http-collection.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/server/http/services/http-collection.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/http/services/http-collection.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/http/services/http-collection.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/http/services/http-data-source.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/server/http/services/http-data-source.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/http/services/http-data-source.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/http/services/http-data-source.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/http/services/http-request-builder.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/server/http/services/http-request-builder.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/http/services/http-request-builder.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/http/services/http-request-builder.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/http/services/transform-response.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/server/http/services/transform-response.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/http/services/transform-response.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/http/services/transform-response.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/http/services/type-interface-map.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/server/http/services/type-interface-map.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/http/services/type-interface-map.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/http/services/type-interface-map.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/http/services/utils.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/server/http/services/utils.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/http/services/utils.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/http/services/utils.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/index.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/server/index.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/index.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/index.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/mongo/.gitkeep b/packages/plugins/@tachybase/plugin-data-source-external/src/server/mongo/.gitkeep similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/mongo/.gitkeep rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/mongo/.gitkeep diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/mssql/.gitkeep b/packages/plugins/@tachybase/plugin-data-source-external/src/server/mssql/.gitkeep similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/mssql/.gitkeep rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/mssql/.gitkeep diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/mysql/database-introspector.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/server/mysql/database-introspector.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/mysql/database-introspector.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/mysql/database-introspector.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/mysql/mysql-collection-manager.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/server/mysql/mysql-collection-manager.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/mysql/mysql-collection-manager.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/mysql/mysql-collection-manager.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/mysql/mysql-data-source.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/server/mysql/mysql-data-source.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/mysql/mysql-data-source.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/mysql/mysql-data-source.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/mysql/type-interface-map.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/server/mysql/type-interface-map.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/mysql/type-interface-map.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/mysql/type-interface-map.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/pg/database-introspector.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/server/pg/database-introspector.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/pg/database-introspector.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/pg/database-introspector.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/pg/postgres-collection-manager.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/server/pg/postgres-collection-manager.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/pg/postgres-collection-manager.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/pg/postgres-collection-manager.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/pg/postgres-data-source.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/server/pg/postgres-data-source.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/pg/postgres-data-source.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/pg/postgres-data-source.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/pg/type-interface-map.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/server/pg/type-interface-map.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/pg/type-interface-map.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/pg/type-interface-map.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/pg/utils.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/server/pg/utils.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/pg/utils.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/pg/utils.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/plugin.ts b/packages/plugins/@tachybase/plugin-data-source-external/src/server/plugin.ts similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/plugin.ts rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/plugin.ts diff --git a/packages/plugins/@tachybase/plugin-external-data-source/src/server/sqlite/.gitkeep b/packages/plugins/@tachybase/plugin-data-source-external/src/server/sqlite/.gitkeep similarity index 100% rename from packages/plugins/@tachybase/plugin-external-data-source/src/server/sqlite/.gitkeep rename to packages/plugins/@tachybase/plugin-data-source-external/src/server/sqlite/.gitkeep diff --git a/packages/presets/base/package.json b/packages/presets/base/package.json index fc712983f..ef60bba0c 100644 --- a/packages/presets/base/package.json +++ b/packages/presets/base/package.json @@ -22,6 +22,7 @@ "@tachybase/plugin-client": "workspace:*", "@tachybase/plugin-collection-manager": "workspace:*", "@tachybase/plugin-custom-request": "workspace:*", + "@tachybase/plugin-data-source-external": "workspace:*", "@tachybase/plugin-data-source-manager": "workspace:*", "@tachybase/plugin-data-visualization": "workspace:*", "@tachybase/plugin-dingtalk": "workspace:*", diff --git a/packages/presets/base/src/server/index.ts b/packages/presets/base/src/server/index.ts index 30c2988ed..7cde07333 100644 --- a/packages/presets/base/src/server/index.ts +++ b/packages/presets/base/src/server/index.ts @@ -46,24 +46,25 @@ export class PresetTachyBase extends Plugin { #localPlugins = [ // optional plugins, default disabled + 'adapter-bullmq>=0.21.76', 'api-doc>=0.13.0-alpha.1', 'api-keys>=0.10.1-alpha.1', 'cas>=0.13.0-alpha.5', + 'data-source-external>=0.22.5', + 'dingtalk>=0.21.76', 'graph-collection-manager>=0.9.0-alpha.1', 'localization-management>=0.11.1-alpha.1', 'map>=0.8.1-alpha.3', 'mobile-client>=0.10.0-alpha.2', - 'dingtalk>=0.21.76', - 'adapter-bullmq>=0.21.76', 'multi-app-manager>=0.7.0-alpha.1', 'multi-app-share-collection>=0.9.2-alpha.1', 'oidc>=0.9.2-alpha.1', - 'work-wechat>=0.21.76', 'saml>=0.8.1-alpha.3', 'sms-auth>=0.10.0-alpha.2', 'snapshot-field>=0.8.1-alpha.3', 'theme-editor>=0.11.1-alpha.1', 'wechat-auth>=0.21.89', + 'work-wechat>=0.21.76', ]; get localPlugins() { diff --git a/packages/presets/mini/package.json b/packages/presets/mini/package.json index c71e132ca..da606b0c9 100644 --- a/packages/presets/mini/package.json +++ b/packages/presets/mini/package.json @@ -24,11 +24,11 @@ "@tachybase/plugin-client": "workspace:*", "@tachybase/plugin-collection-manager": "workspace:*", "@tachybase/plugin-custom-request": "workspace:*", + "@tachybase/plugin-data-source-external": "workspace:*", "@tachybase/plugin-data-source-manager": "workspace:*", "@tachybase/plugin-data-visualization": "workspace:*", "@tachybase/plugin-error-handler": "workspace:*", "@tachybase/plugin-export": "workspace:*", - "@tachybase/plugin-external-data-source": "workspace:*", "@tachybase/plugin-file-manager": "workspace:*", "@tachybase/plugin-formula-field": "workspace:*", "@tachybase/plugin-gantt": "workspace:*", diff --git a/packages/presets/rental/package.json b/packages/presets/rental/package.json index 199728dcc..998cb64e0 100644 --- a/packages/presets/rental/package.json +++ b/packages/presets/rental/package.json @@ -24,11 +24,11 @@ "@tachybase/plugin-client": "workspace:*", "@tachybase/plugin-collection-manager": "workspace:*", "@tachybase/plugin-custom-request": "workspace:*", + "@tachybase/plugin-data-source-external": "workspace:*", "@tachybase/plugin-data-source-manager": "workspace:*", "@tachybase/plugin-data-visualization": "workspace:*", "@tachybase/plugin-error-handler": "workspace:*", "@tachybase/plugin-export": "workspace:*", - "@tachybase/plugin-external-data-source": "workspace:*", "@tachybase/plugin-file-manager": "workspace:*", "@tachybase/plugin-formula-field": "workspace:*", "@tachybase/plugin-gantt": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f5f9966e3..c6317f324 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -133,10 +133,10 @@ importers: version: 8.4.0(eslint@9.10.0)(typescript@5.4.5) umi: specifier: ^4.3.3 - version: 4.3.3(@babel/core@7.22.10)(@types/node@20.14.2)(@types/react@18.3.3)(eslint@9.10.0)(lightningcss@1.26.0)(prettier@3.2.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@3.29.4)(sass@1.77.8)(stylelint@16.8.2(typescript@5.4.5))(terser@5.31.6)(type-fest@4.25.0)(typescript@5.4.5)(webpack@5.93.0) + version: 4.3.3(@babel/core@7.25.2)(@types/node@20.14.2)(@types/react@18.3.3)(eslint@9.10.0)(lightningcss@1.26.0)(prettier@3.2.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@3.29.4)(sass@1.77.8)(stylelint@16.8.2(typescript@5.4.5))(terser@5.31.6)(type-fest@4.25.0)(typescript@5.4.5)(webpack@5.93.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.2)(jsdom@24.1.1(canvas@2.11.2(encoding@0.1.13)))(less@4.1.3)(lightningcss@1.26.0)(sass@1.77.8)(terser@5.31.6) + version: 1.6.0(@types/node@20.14.2)(jsdom@24.1.1(canvas@2.11.2(encoding@0.1.13)))(less@4.2.0)(lightningcss@1.26.0)(sass@1.77.8)(terser@5.31.6) packages/core/acl: dependencies: @@ -1010,7 +1010,7 @@ importers: version: 5.4.4 umi: specifier: ^4.3.3 - version: 4.3.3(@babel/core@7.25.2)(@types/node@20.14.2)(@types/react@18.3.3)(eslint@8.55.0)(lightningcss@1.26.0)(prettier@3.2.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@3.29.4)(sass@1.77.8)(stylelint@16.8.2(typescript@5.4.4))(terser@5.31.6)(type-fest@4.25.0)(typescript@5.4.4)(webpack@5.93.0) + version: 4.3.3(@babel/core@7.22.10)(@types/node@20.14.2)(@types/react@18.3.3)(eslint@8.55.0)(lightningcss@1.26.0)(prettier@3.2.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@3.29.4)(sass@1.77.8)(stylelint@16.8.2(typescript@5.4.4))(terser@5.31.6)(type-fest@4.25.0)(typescript@5.4.4)(webpack@5.93.0) packages/core/evaluators: dependencies: @@ -2545,6 +2545,49 @@ importers: specifier: ~6.25.1 version: 6.25.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + packages/plugins/@tachybase/plugin-data-source-external: + dependencies: + '@ant-design/icons': + specifier: ^5.4.0 + version: 5.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@tachybase/client': + specifier: workspace:* + version: link:../../../core/client + '@tachybase/data-source-manager': + specifier: workspace:* + version: link:../../../core/data-source-manager + '@tachybase/database': + specifier: workspace:* + version: link:../../../core/database + '@tachybase/server': + specifier: workspace:* + version: link:../../../core/server + '@tachybase/test': + specifier: workspace:* + version: link:../../../core/test + antd: + specifier: 5.19.4 + version: 5.19.4(date-fns@3.6.0)(luxon@3.5.0)(moment@2.30.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + lodash: + specifier: ^4.17.21 + version: 4.17.21 + mysql2: + specifier: ^3.9.1 + version: 3.9.7 + pg: + specifier: ^8.11.3 + version: 8.11.3 + react-i18next: + specifier: ^14.1.2 + version: 14.1.2(i18next@23.13.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + react-router-dom: + specifier: ^6.25.1 + version: 6.25.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + devDependencies: + '@types/lodash': + specifier: ^4.17.5 + version: 4.17.5 + packages/plugins/@tachybase/plugin-data-source-manager: dependencies: '@tachybase/acl': @@ -2781,49 +2824,6 @@ importers: specifier: ^14.1.2 version: 14.1.2(i18next@23.13.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - packages/plugins/@tachybase/plugin-external-data-source: - dependencies: - '@ant-design/icons': - specifier: ^5.4.0 - version: 5.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@tachybase/client': - specifier: workspace:* - version: link:../../../core/client - '@tachybase/data-source-manager': - specifier: workspace:* - version: link:../../../core/data-source-manager - '@tachybase/database': - specifier: workspace:* - version: link:../../../core/database - '@tachybase/server': - specifier: workspace:* - version: link:../../../core/server - '@tachybase/test': - specifier: workspace:* - version: link:../../../core/test - antd: - specifier: 5.19.4 - version: 5.19.4(date-fns@3.6.0)(luxon@3.5.0)(moment@2.30.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - lodash: - specifier: ^4.17.21 - version: 4.17.21 - mysql2: - specifier: ^3.9.1 - version: 3.9.7 - pg: - specifier: ^8.11.3 - version: 8.11.3 - react-i18next: - specifier: ^14.1.2 - version: 14.1.2(i18next@23.13.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react-router-dom: - specifier: ^6.25.1 - version: 6.25.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - devDependencies: - '@types/lodash': - specifier: ^4.17.5 - version: 4.17.5 - packages/plugins/@tachybase/plugin-field-markdown-vditor: dependencies: '@tachybase/client': @@ -4467,6 +4467,9 @@ importers: '@tachybase/plugin-custom-request': specifier: workspace:* version: link:../../plugins/@tachybase/plugin-custom-request + '@tachybase/plugin-data-source-external': + specifier: workspace:* + version: link:../../plugins/@tachybase/plugin-data-source-external '@tachybase/plugin-data-source-manager': specifier: workspace:* version: link:../../plugins/@tachybase/plugin-data-source-manager @@ -4648,6 +4651,9 @@ importers: '@tachybase/plugin-custom-request': specifier: workspace:* version: link:../../plugins/@tachybase/plugin-custom-request + '@tachybase/plugin-data-source-external': + specifier: workspace:* + version: link:../../plugins/@tachybase/plugin-data-source-external '@tachybase/plugin-data-source-manager': specifier: workspace:* version: link:../../plugins/@tachybase/plugin-data-source-manager @@ -4660,9 +4666,6 @@ importers: '@tachybase/plugin-export': specifier: workspace:* version: link:../../plugins/@tachybase/plugin-export - '@tachybase/plugin-external-data-source': - specifier: workspace:* - version: link:../../plugins/@tachybase/plugin-external-data-source '@tachybase/plugin-file-manager': specifier: workspace:* version: link:../../plugins/@tachybase/plugin-file-manager @@ -4823,6 +4826,9 @@ importers: '@tachybase/plugin-custom-request': specifier: workspace:* version: link:../../plugins/@tachybase/plugin-custom-request + '@tachybase/plugin-data-source-external': + specifier: workspace:* + version: link:../../plugins/@tachybase/plugin-data-source-external '@tachybase/plugin-data-source-manager': specifier: workspace:* version: link:../../plugins/@tachybase/plugin-data-source-manager @@ -4835,9 +4841,6 @@ importers: '@tachybase/plugin-export': specifier: workspace:* version: link:../../plugins/@tachybase/plugin-export - '@tachybase/plugin-external-data-source': - specifier: workspace:* - version: link:../../plugins/@tachybase/plugin-external-data-source '@tachybase/plugin-file-manager': specifier: workspace:* version: link:../../plugins/@tachybase/plugin-file-manager @@ -38426,19 +38429,19 @@ snapshots: uglify-to-browserify@1.0.2: optional: true - umi@4.3.3(@babel/core@7.22.10)(@types/node@20.14.2)(@types/react@18.3.3)(eslint@9.10.0)(lightningcss@1.26.0)(prettier@3.2.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@3.29.4)(sass@1.77.8)(stylelint@16.8.2(typescript@5.4.5))(terser@5.31.6)(type-fest@4.25.0)(typescript@5.4.5)(webpack@5.93.0): + umi@4.3.3(@babel/core@7.22.10)(@types/node@20.14.2)(@types/react@18.3.3)(eslint@8.55.0)(lightningcss@1.26.0)(prettier@3.2.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@3.29.4)(sass@1.77.8)(stylelint@16.8.2(typescript@5.4.4))(terser@5.31.6)(type-fest@4.25.0)(typescript@5.4.4)(webpack@5.93.0): dependencies: '@babel/runtime': 7.23.6 '@umijs/bundler-utils': 4.3.3 - '@umijs/bundler-webpack': 4.3.3(type-fest@4.25.0)(typescript@5.4.5)(webpack@5.93.0) + '@umijs/bundler-webpack': 4.3.3(type-fest@4.25.0)(typescript@5.4.4)(webpack@5.93.0) '@umijs/core': 4.3.3 - '@umijs/lint': 4.3.3(eslint@9.10.0)(stylelint@16.8.2(typescript@5.4.5))(typescript@5.4.5) - '@umijs/preset-umi': 4.3.3(@types/node@20.14.2)(@types/react@18.3.3)(lightningcss@1.26.0)(rollup@3.29.4)(sass@1.77.8)(terser@5.31.6)(type-fest@4.25.0)(typescript@5.4.5)(webpack@5.93.0) + '@umijs/lint': 4.3.3(eslint@8.55.0)(stylelint@16.8.2(typescript@5.4.4))(typescript@5.4.4) + '@umijs/preset-umi': 4.3.3(@types/node@20.14.2)(@types/react@18.3.3)(lightningcss@1.26.0)(rollup@3.29.4)(sass@1.77.8)(terser@5.31.6)(type-fest@4.25.0)(typescript@5.4.4)(webpack@5.93.0) '@umijs/renderer-react': 4.3.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@umijs/server': 4.3.3 '@umijs/test': 4.3.3(@babel/core@7.22.10) '@umijs/utils': 4.3.3 - prettier-plugin-organize-imports: 3.2.4(prettier@3.2.5)(typescript@5.4.5) + prettier-plugin-organize-imports: 3.2.4(prettier@3.2.5)(typescript@5.4.4) prettier-plugin-packagejson: 2.4.3(prettier@3.2.5) transitivePeerDependencies: - '@babel/core' @@ -38473,19 +38476,19 @@ snapshots: - webpack-hot-middleware - webpack-plugin-serve - umi@4.3.3(@babel/core@7.25.2)(@types/node@20.14.2)(@types/react@18.3.3)(eslint@8.55.0)(lightningcss@1.26.0)(prettier@3.2.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@3.29.4)(sass@1.77.8)(stylelint@16.8.2(typescript@5.4.4))(terser@5.31.6)(type-fest@4.25.0)(typescript@5.4.4)(webpack@5.93.0): + umi@4.3.3(@babel/core@7.25.2)(@types/node@20.14.2)(@types/react@18.3.3)(eslint@9.10.0)(lightningcss@1.26.0)(prettier@3.2.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@3.29.4)(sass@1.77.8)(stylelint@16.8.2(typescript@5.4.5))(terser@5.31.6)(type-fest@4.25.0)(typescript@5.4.5)(webpack@5.93.0): dependencies: '@babel/runtime': 7.23.6 '@umijs/bundler-utils': 4.3.3 - '@umijs/bundler-webpack': 4.3.3(type-fest@4.25.0)(typescript@5.4.4)(webpack@5.93.0) + '@umijs/bundler-webpack': 4.3.3(type-fest@4.25.0)(typescript@5.4.5)(webpack@5.93.0) '@umijs/core': 4.3.3 - '@umijs/lint': 4.3.3(eslint@8.55.0)(stylelint@16.8.2(typescript@5.4.4))(typescript@5.4.4) - '@umijs/preset-umi': 4.3.3(@types/node@20.14.2)(@types/react@18.3.3)(lightningcss@1.26.0)(rollup@3.29.4)(sass@1.77.8)(terser@5.31.6)(type-fest@4.25.0)(typescript@5.4.4)(webpack@5.93.0) + '@umijs/lint': 4.3.3(eslint@9.10.0)(stylelint@16.8.2(typescript@5.4.5))(typescript@5.4.5) + '@umijs/preset-umi': 4.3.3(@types/node@20.14.2)(@types/react@18.3.3)(lightningcss@1.26.0)(rollup@3.29.4)(sass@1.77.8)(terser@5.31.6)(type-fest@4.25.0)(typescript@5.4.5)(webpack@5.93.0) '@umijs/renderer-react': 4.3.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@umijs/server': 4.3.3 '@umijs/test': 4.3.3(@babel/core@7.25.2) '@umijs/utils': 4.3.3 - prettier-plugin-organize-imports: 3.2.4(prettier@3.2.5)(typescript@5.4.4) + prettier-plugin-organize-imports: 3.2.4(prettier@3.2.5)(typescript@5.4.5) prettier-plugin-packagejson: 2.4.3(prettier@3.2.5) transitivePeerDependencies: - '@babel/core' @@ -38841,23 +38844,6 @@ snapshots: string_decoder: 1.3.0 util-deprecate: 1.0.2 - vite-node@1.6.0(@types/node@20.14.2)(less@4.1.3)(lightningcss@1.26.0)(sass@1.77.8)(terser@5.31.6): - dependencies: - cac: 6.7.14 - debug: 4.3.6(supports-color@8.1.1) - pathe: 1.1.2 - picocolors: 1.0.1 - vite: 5.2.13(@types/node@20.14.2)(less@4.1.3)(lightningcss@1.26.0)(sass@1.77.8)(terser@5.31.6) - transitivePeerDependencies: - - '@types/node' - - less - - lightningcss - - sass - - stylus - - sugarss - - supports-color - - terser - vite-node@1.6.0(@types/node@20.14.2)(less@4.2.0)(lightningcss@1.26.0)(sass@1.77.8)(terser@5.31.6): dependencies: cac: 6.7.14 @@ -38898,19 +38884,6 @@ snapshots: sass: 1.77.8 terser: 5.31.6 - vite@5.2.13(@types/node@20.14.2)(less@4.1.3)(lightningcss@1.26.0)(sass@1.77.8)(terser@5.31.6): - dependencies: - esbuild: 0.20.2 - postcss: 8.4.39 - rollup: 4.14.1 - optionalDependencies: - '@types/node': 20.14.2 - fsevents: 2.3.3 - less: 4.1.3 - lightningcss: 1.26.0 - sass: 1.77.8 - terser: 5.31.6 - vite@5.2.13(@types/node@20.14.2)(less@4.2.0)(lightningcss@1.26.0)(sass@1.75.0)(terser@5.31.6): dependencies: esbuild: 0.20.2 @@ -38971,40 +38944,6 @@ snapshots: - supports-color - terser - vitest@1.6.0(@types/node@20.14.2)(jsdom@24.1.1(canvas@2.11.2(encoding@0.1.13)))(less@4.1.3)(lightningcss@1.26.0)(sass@1.77.8)(terser@5.31.6): - dependencies: - '@vitest/expect': 1.6.0 - '@vitest/runner': 1.6.0 - '@vitest/snapshot': 1.6.0 - '@vitest/spy': 1.6.0 - '@vitest/utils': 1.6.0 - acorn-walk: 8.3.2 - chai: 4.3.10 - debug: 4.3.5(supports-color@5.5.0) - execa: 8.0.1 - local-pkg: 0.5.0 - magic-string: 0.30.8 - pathe: 1.1.2 - picocolors: 1.0.1 - std-env: 3.7.0 - strip-literal: 2.0.0 - tinybench: 2.6.0 - tinypool: 0.8.3 - vite: 5.2.13(@types/node@20.14.2)(less@4.1.3)(lightningcss@1.26.0)(sass@1.77.8)(terser@5.31.6) - vite-node: 1.6.0(@types/node@20.14.2)(less@4.1.3)(lightningcss@1.26.0)(sass@1.77.8)(terser@5.31.6) - why-is-node-running: 2.2.2 - optionalDependencies: - '@types/node': 20.14.2 - jsdom: 24.1.1(canvas@2.11.2(encoding@0.1.13)) - transitivePeerDependencies: - - less - - lightningcss - - sass - - stylus - - sugarss - - supports-color - - terser - vitest@1.6.0(@types/node@20.14.2)(jsdom@24.1.1(canvas@2.11.2(encoding@0.1.13)))(less@4.2.0)(lightningcss@1.26.0)(sass@1.77.8)(terser@5.31.6): dependencies: '@vitest/expect': 1.6.0