openxiangda-cli 2.0.0-alpha.61 → 2.0.0-alpha.62

package/template/apps/web/src/Shell.tsx

@@ -1,69 +1,18 @@
-import {
-  ApartmentOutlined,
-  AppstoreOutlined,
-  BookOutlined,
-  DownOutlined,
-  ExperimentOutlined,
-  HomeOutlined,
-  LeftOutlined,
-  MenuUnfoldOutlined,
-  SettingOutlined,
-  TeamOutlined,
-} from '@ant-design/icons';
-import {
-  Avatar,
-  Breadcrumb,
-  Button,
-  Layout,
-  Menu,
-  Space,
-  Typography,
-  type MenuProps,
-} from 'antd';
+import { AppstoreOutlined, DatabaseOutlined, LeftOutlined, MenuUnfoldOutlined, SettingOutlined } from '@ant-design/icons';
+import { Avatar, Breadcrumb, Button, Empty, Layout, Menu, Space, Typography, type MenuProps } from 'antd';
 import type { ReactNode } from 'react';
 import { useEffect, useMemo, useState } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
+import { resourceDefinitions } from '../../../packages/contracts/src/generated.js';
 import { resolveDirectory } from './platform-client';
 import { useRuntime } from './runtime';
 
 const { Content, Header, Sider } = Layout;
+type Definition = { code: string; name: string; capabilities: { read: string }; surface: { generated?: boolean } };
+const definitions = resourceDefinitions as unknown as Record<string, Definition>;
 
-type PageMeta = { title: string; breadcrumbs: string[]; selectedKey: string };
-
-function pageMeta(pathname: string): PageMeta {
-  if (pathname === '/colleges') {
-    return {
-      title: '学院字典',
-      breadcrumbs: ['首页', '基础数据', '学院字典'],
-      selectedKey: '/colleges',
-    };
-  }
-  if (pathname.endsWith('/new')) {
-    return {
-      title: '新增仪器',
-      breadcrumbs: ['首页', '仪器管理', '仪器资源', '新增仪器'],
-      selectedKey: '/instruments',
-    };
-  }
-  if (pathname.endsWith('/edit')) {
-    return {
-      title: '编辑仪器',
-      breadcrumbs: ['首页', '仪器管理', '仪器资源', '编辑仪器'],
-      selectedKey: '/instruments',
-    };
-  }
-  if (/^\/instruments\/[^/]+$/.test(pathname)) {
-    return {
-      title: '仪器详情',
-      breadcrumbs: ['首页', '仪器管理', '仪器资源', '仪器详情'],
-      selectedKey: '/instruments',
-    };
-  }
-  return {
-    title: '仪器资源',
-    breadcrumbs: ['首页', '仪器管理', '仪器资源'],
-    selectedKey: '/instruments',
-  };
+function currentDefinition(pathname: string) {
+  return Object.values(definitions).find(definition => pathname === `/${definition.code}` || pathname.startsWith(`/${definition.code}/`) || pathname === `/m/${definition.code}` || pathname.startsWith(`/m/${definition.code}/`));
 }
 
 export function Shell({ children }: { children: ReactNode }) {
@@ -72,169 +21,48 @@ export function Shell({ children }: { children: ReactNode }) {
   const navigate = useNavigate();
   const [collapsed, setCollapsed] = useState(false);
   const [user, setUser] = useState({ label: '当前用户', description: '平台用户' });
-  const meta = pageMeta(location.pathname);
-
+  const definition = currentDefinition(location.pathname);
   useEffect(() => {
     let active = true;
-    void resolveDirectory('user', [identity.userId])
-      .then(page => {
-        const entry = page.items[0];
-        if (active && entry) {
-          setUser({
-            label: entry.label || '当前用户',
-            description: entry.description || '平台用户',
-          });
-        }
-      })
-      .catch(() => {
-        if (active) setUser({ label: '当前用户', description: '平台用户' });
-      });
-    return () => {
-      active = false;
-    };
+    void resolveDirectory('user', [identity.userId]).then(page => {
+      const entry = page.items[0];
+      if (active && entry) setUser({ label: entry.label || '当前用户', description: entry.description || '平台用户' });
+    }).catch(() => undefined);
+    return () => { active = false; };
   }, [identity.userId]);
-
-  const menuItems = useMemo<MenuProps['items']>(
-    () => [
-      {
-        key: 'overview',
-        icon: <AppstoreOutlined />,
-        label: '总览',
-        children: [
-          { key: 'workbench', icon: <HomeOutlined />, label: '工作台' },
-        ],
-      },
-      {
-        key: 'instrument-management',
-        icon: <ExperimentOutlined />,
-        label: '仪器管理',
-        children: [
-          {
-            key: '/instruments',
-            icon: <ExperimentOutlined />,
-            label: '仪器资源',
-          },
-          {
-            key: 'open-records',
-            icon: <BookOutlined />,
-            label: '开放记录',
-            disabled: true,
-          },
-        ],
-      },
-      {
-        key: 'base-data',
-        icon: <ApartmentOutlined />,
-        label: '基础数据',
-        children: hasCapability('app:instrument-center:data:colleges:read')
-          ? [
-              {
-                key: '/colleges',
-                icon: <ApartmentOutlined />,
-                label: '学院字典',
-              },
-            ]
-          : [],
-      },
-      {
-        key: 'system-settings',
-        icon: <SettingOutlined />,
-        label: '系统设置',
-        children: [
-          {
-            key: 'application-admins',
-            icon: <TeamOutlined />,
-            label: '应用管理员',
-            disabled: true,
-          },
-        ],
-      },
-    ],
-    [hasCapability]
-  );
-
+  const menuItems = useMemo<MenuProps['items']>(() => [
+    { key: 'overview', icon: <AppstoreOutlined />, label: '总览', children: [{ key: 'home', label: '首页' }] },
+    {
+      key: 'resources',
+      icon: <DatabaseOutlined />,
+      label: '数据管理',
+      children: Object.values(definitions)
+        .filter(item => item.surface.generated !== false && hasCapability(item.capabilities.read))
+        .map(item => ({ key: `/${item.code}`, icon: <DatabaseOutlined />, label: item.name })),
+    },
+    { key: 'settings', icon: <SettingOutlined />, label: '系统设置', children: [{ key: 'settings-disabled', label: '应用设置', disabled: true }] },
+  ], [hasCapability]);
   return (
     <Layout className="oxa-app-layout">
-      <Sider
-        className="oxa-sider"
-        breakpoint="lg"
-        collapsed={collapsed}
-        collapsedWidth={76}
-        collapsible
-        onBreakpoint={setCollapsed}
-        theme="light"
-        trigger={null}
-        width={240}
-      >
-        <div className="oxa-brand">
-          <div aria-hidden className="oxa-brand-mark">
-            <span />
-          </div>
-          {!collapsed && (
-            <div className="oxa-brand-copy">
-              <strong>仪器资源管理</strong>
-              <span>仪器、学院与开放管理</span>
-            </div>
-          )}
-        </div>
-        <Menu
-          className="oxa-menu"
-          defaultOpenKeys={[
-            'overview',
-            'instrument-management',
-            'base-data',
-            'system-settings',
-          ]}
-          inlineCollapsed={collapsed}
-          items={menuItems}
-          mode="inline"
-          onClick={({ key }) => {
-            if (key === 'workbench' || key === '/instruments') {
-              navigate('/instruments');
-            } else if (key === '/colleges') {
-              navigate('/colleges');
-            }
-          }}
-          selectedKeys={[meta.selectedKey]}
-        />
-        <div className="oxa-sider-footer">
-          <Button
-            aria-label={collapsed ? '展开侧边栏' : '收起侧边栏'}
-            block
-            icon={collapsed ? <MenuUnfoldOutlined /> : <LeftOutlined />}
-            onClick={() => setCollapsed(value => !value)}
-            type="text"
-          >
-            {!collapsed && '收起侧边栏'}
-          </Button>
-        </div>
+      <Sider className="oxa-sider" collapsed={collapsed} collapsedWidth={76} collapsible onBreakpoint={setCollapsed} theme="light" trigger={null} width={240}>
+        <div className="oxa-brand"><div aria-hidden className="oxa-brand-mark"><span /></div>{!collapsed && <div className="oxa-brand-copy"><strong>OpenXiangda 应用</strong><span>标准资源管理工作台</span></div>}</div>
+        <Menu className="oxa-menu" defaultOpenKeys={['overview', 'resources', 'settings']} inlineCollapsed={collapsed} items={menuItems} mode="inline" onClick={({ key }) => {
+          if (key === 'home') navigate(Object.keys(definitions)[0] ? `/${Object.keys(definitions)[0]}` : '/');
+          else if (typeof key === 'string' && key.startsWith('/')) navigate(key);
+        }} selectedKeys={definition ? [`/${definition.code}`] : []} />
+        <div className="oxa-sider-footer"><Button aria-label={collapsed ? '展开侧边栏' : '收起侧边栏'} block icon={collapsed ? <MenuUnfoldOutlined /> : <LeftOutlined />} onClick={() => setCollapsed(value => !value)} type="text">{!collapsed && '收起侧边栏'}</Button></div>
       </Sider>
       <Layout className="oxa-workspace">
         <Header className="oxa-topbar">
-          <div className="oxa-topbar-page">
-            <Breadcrumb items={meta.breadcrumbs.map(title => ({ title }))} />
-            <Typography.Title
-              data-testid={meta.title === '仪器资源' ? 'instrument-title' : undefined}
-              level={3}
-            >
-              {meta.title}
-            </Typography.Title>
-          </div>
-          <Space className="oxa-current-user" size={12}>
-            <Avatar className="oxa-current-user-avatar" size={42}>
-              {user.label.slice(0, 1)}
-            </Avatar>
-            <div className="oxa-current-user-copy">
-              <strong>{user.label}</strong>
-              <span>{user.description}</span>
-            </div>
-            <DownOutlined className="oxa-current-user-chevron" />
-          </Space>
+          <div className="oxa-topbar-page"><Breadcrumb items={[{ title: '首页' }, ...(definition ? [{ title: definition.name }] : [])]} /><Typography.Title level={3}>{definition?.name || '应用首页'}</Typography.Title></div>
+          <Space className="oxa-current-user" size={12}><Avatar className="oxa-current-user-avatar" size={42}>{user.label.slice(0, 1)}</Avatar><div className="oxa-current-user-copy"><strong>{user.label}</strong><span>{user.description}</span></div></Space>
         </Header>
-        <Content className="oxa-content">
-          <main className="oxa-main">{children}</main>
-        </Content>
+        <Content className="oxa-content"><main className="oxa-main">{children}</main></Content>
       </Layout>
     </Layout>
   );
 }
+
+export function EmptyApplicationPage() {
+  return <Shell><Empty description="还没有声明数据资源；请在 platform/data 中添加 DataResource" /></Shell>;
+}

package/template/apps/web/src/components/platform-fields/AttachmentFileList.tsx

@@ -78,7 +78,7 @@ function openIsolatedWindow(url: string) {
 
 export function AttachmentFileList({
   files,
-  resourceCode = 'instruments',
+  resourceCode = 'resources',
   removable = false,
   onRemove,
 }: {

package/template/apps/web/src/components/resource/GeneratedResourceCrud.tsx

@@ -98,13 +98,27 @@ function normalizeFormValues(values: Record<string, unknown>, surface: DataResou
       const widget = surface.fields[key]?.widget;
       return widget === 'date' || widget === 'datetime'
         ? [key, value && typeof value === 'object' && 'format' in value
-            ? (value as { format: (pattern: string) => string }).format(widget === 'datetime' ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD')
+            ? (widget === 'datetime'
+              ? dayjs(value as never).toISOString()
+              : (value as { format: (pattern: string) => string }).format('YYYY-MM-DD'))
             : value]
         : [key, value];
     })
   );
 }
 
+function fieldWritable(
+  field: SurfaceField,
+  mode: 'create' | 'edit',
+  hasCapability: (code: string) => boolean,
+  isAppSuperAdmin: boolean
+) {
+  const capability = mode === 'create' ? field.createCapability : field.updateCapability;
+  if (isAppSuperAdmin) return true;
+  if (capability) return hasCapability(capability);
+  return mode === 'create';
+}
+
 function useGeneratedList(definition: GeneratedDefinition) {
   const { code, surface } = definition;
   const defaultSort = surface.list?.defaultSort || {
@@ -152,7 +166,7 @@ function GeneratedResourceListPage({ definition, variant }: { definition: Genera
 function GeneratedDesktopList({ definition }: { definition: GeneratedDefinition }) {
   const navigate = useNavigate();
   const { message } = App.useApp();
-  const { hasCapability } = useRuntime();
+  const { hasCapability, identity } = useRuntime();
   const state = useGeneratedList(definition);
   const { code, name, surface, capabilities } = definition;
   const fields = listSurfaceFields(surface.fields);
@@ -244,7 +258,7 @@ function GeneratedResourceFormPage({ definition, mode, variant }: { definition:
   const { id = '' } = useParams();
   const navigate = useNavigate();
   const { message } = App.useApp();
-  const { hasCapability } = useRuntime();
+  const { hasCapability, identity } = useRuntime();
   const [form] = Form.useForm();
   const create = useCreate<ResourceRecord>();
   const update = useUpdate<ResourceRecord>();
@@ -257,14 +271,21 @@ function GeneratedResourceFormPage({ definition, mode, variant }: { definition:
   const Page = variant === 'mobile' ? MobileResourceFormPage : ResourceFormPage;
   if (!hasCapability(mode === 'create' ? capabilities.create : capabilities.update)) return <Result status="403" title="当前平台用户无此操作权限" />;
   const submit = async (values: Record<string, unknown>) => {
-    const next = normalizeFormValues(values, surface);
+    const next = normalizeFormValues(
+      Object.fromEntries(
+        Object.entries(values).filter(([key]) =>
+          fieldWritable(surface.fields[key] ? { key, ...surface.fields[key] } : { key, label: key, widget: 'text' }, mode, hasCapability, identity.isAppSuperAdmin)
+        )
+      ),
+      surface
+    );
     if (mode === 'create') { await create.mutateAsync({ resource: code, values: next }); message.success(`${name}已创建`); navigate(listPath); }
     else { const result = await update.mutateAsync({ resource: code, id, values: next, meta: { expectedRevision: record?.revision } }); message.success('修改已保存'); navigate(`/${code}/${result.data.id}`); }
   };
   return (
     <Page backLabel={mode === 'edit' ? `返回${name}详情` : `返回${name}`} backPath={mode === 'edit' ? detailPath : listPath} capability={mode === 'create' ? capabilities.create : capabilities.update} detailPath={record ? detailPath : undefined} loading={mode === 'edit' && query.query.isLoading} mode={mode} notFound={mode === 'edit' && !record} recordSummary={record ? `${name} · 当前版本 ${record.revision}` : undefined} resource={code} surface={surface} title={name}>
       <Form className={variant === 'mobile' ? 'oxa-mobile-form' : 'oxa-form-full'} form={form} initialValues={undefined} layout="vertical" onFinish={values => void submit(values as Record<string, unknown>)}>
-        <div className="oxa-sections">{fieldsBySection(surface).map(group => <Card className="oxa-section-card" key={group.section} title={group.section === 'default' ? '基本信息' : group.section}><div className="oxa-grid">{group.fields.map(field => { const capability = mode === 'create' ? field.createCapability : field.updateCapability; return <SurfaceFieldControl key={field.key} disabled={Boolean(capability) && !hasCapability(capability!)} field={field} operation={mode === 'create' ? 'create' : 'update'} recordId={record?.id} renderers={{ upload: (current, file, recordId) => createNativeResourceClient(code, surface).upload(current.key, file, recordId) }} />; })}</div></Card>)}</div>
+        <div className="oxa-sections">{fieldsBySection(surface).map(group => <Card className="oxa-section-card" key={group.section} title={group.section === 'default' ? '基本信息' : group.section}><div className="oxa-grid">{group.fields.map(field => <SurfaceFieldControl key={field.key} disabled={!fieldWritable(field, mode, hasCapability, identity.isAppSuperAdmin)} field={field} operation={mode === 'create' ? 'create' : 'update'} recordId={record?.id} renderers={{ upload: (current, file, recordId) => createNativeResourceClient(code, surface).upload(current.key, file, recordId) }} />)}</div></Card>)}</div>
         <div className="oxa-actions"><Button onClick={() => navigate(mode === 'edit' ? detailPath : listPath)}>取消</Button><Button htmlType="submit" type="primary">{mode === 'create' ? '保存' : '保存修改'}</Button></div>
       </Form>
     </Page>

package/template/apps/web/src/components/resource/SurfaceFields.tsx

@@ -21,7 +21,7 @@ import type {
   DataFileRef,
 } from 'openxiangda-contracts/browser';
 import { useEffect, useMemo, useRef, useState, type ReactNode } from 'react';
-import { ResolvedValueText } from '../../AuthoritativeSelector';
+import { AuthoritativeSelector, ResolvedValueText } from '../../AuthoritativeSelector';
 import { AttachmentFileList } from '../platform-fields/AttachmentFileList';
 import { PlatformDirectoryPicker } from '../platform-fields/PlatformDirectoryPicker';
 
@@ -124,6 +124,8 @@ export function SurfaceFilterControl({
     case 'directory-user':
     case 'directory-department':
       return <PlatformDirectoryPicker kind={field.widget === 'directory-user' ? 'user' : 'department'} multiple={field.multiple} onChange={onChange as (value: string | string[] | undefined) => void} placeholder={placeholder} value={value as string | string[] | undefined} />;
+    case 'resource':
+      return <AuthoritativeSelector source="resource" resourceCode={field.reference?.kind === 'resource' ? field.reference.resourceCode : undefined} labelField={field.reference?.kind === 'resource' ? field.reference.labelField : undefined} multiple={field.multiple} onChange={onChange as (value: string | string[] | undefined) => void} placeholder={placeholder} value={value as string | string[] | undefined} operation="update" />;
     default:
       return <Input allowClear value={value as string | undefined} onChange={event => onChange(event.target.value)} placeholder={placeholder} />;
   }
@@ -193,6 +195,19 @@ export function SurfaceFieldControl({
         />
       );
       break;
+    case 'resource':
+      control = (
+        <AuthoritativeSelector
+          disabled={disabled}
+          labelField={field.reference?.kind === 'resource' ? field.reference.labelField : undefined}
+          multiple={field.multiple}
+          operation={operation}
+          placeholder={`搜索并选择${field.label}`}
+          resourceCode={field.reference?.kind === 'resource' ? field.reference.resourceCode : undefined}
+          source="resource"
+        />
+      );
+      break;
     case 'file':
       control = (
         <ManagedFileField
@@ -304,6 +319,19 @@ export function MobileSurfaceFieldControl({
         />
       );
       break;
+    case 'resource':
+      control = (
+        <AuthoritativeSelector
+          disabled={disabled}
+          labelField={field.reference?.kind === 'resource' ? field.reference.labelField : undefined}
+          multiple={field.multiple}
+          operation={operation}
+          placeholder={`搜索并选择${field.label}`}
+          resourceCode={field.reference?.kind === 'resource' ? field.reference.resourceCode : undefined}
+          source="resource"
+        />
+      );
+      break;
     case 'file':
       control = (
         <ManagedFileField
@@ -351,6 +379,9 @@ export function SurfaceFieldValue({
       />
     );
   }
+  if (field.widget === 'resource' && field.reference?.kind === 'resource') {
+    return <ResolvedValueText labelField={field.reference.labelField} resourceCode={field.reference.resourceCode} source="resource" value={Array.isArray(value) ? value.map(String) : String(value)} />;
+  }
   if (field.widget === 'file') {
     const values = (Array.isArray(value) ? value : [value]).filter(isFileRef);
     return values.length ? <AttachmentFileList files={values} /> : <>-</>;

package/template/apps/web/src/data-provider.ts

@@ -1,10 +1,5 @@
 import type { DataProvider } from '@refinedev/core';
-import type { InstrumentListQuery, InstrumentRecord } from './instrument';
-import {
-  createNativeResourceClient,
-  instrumentDataApi,
-  type GenericResourceQuery,
-} from './platform-client';
+import { createNativeResourceClient, type GenericResourceQuery } from './platform-client';
 import { applicationCode } from './runtime-meta';
 import { resourceDefinitions } from '../../../packages/contracts/src/generated.js';
 
@@ -15,112 +10,38 @@ type GeneratedDefinition = {
   surface: import('openxiangda-contracts/browser').DataResourceSurface;
 };
 
-const generatedDefinitions = resourceDefinitions as unknown as Record<string, GeneratedDefinition>;
+const definitions = resourceDefinitions as unknown as Record<string, GeneratedDefinition>;
+type ListParams = Parameters<NonNullable<DataProvider['getList']>>[0];
+type OneParams = Parameters<NonNullable<DataProvider['getOne']>>[0];
+type CreateParams = Parameters<NonNullable<DataProvider['create']>>[0];
+type UpdateParams = Parameters<NonNullable<DataProvider['update']>>[0];
+type DeleteParams = Parameters<NonNullable<DataProvider['deleteOne']>>[0];
 
-function generatedClient(resource: string) {
-  const definition = generatedDefinitions[resource];
-  if (!definition || definition.surface.generated === false) {
-    throw new Error(`OPENXIANGDA_GENERATED_RESOURCE_NOT_DECLARED:${resource}`);
-  }
+function clientFor(resource: string) {
+  const definition = definitions[resource];
+  if (!definition) throw new Error(`OPENXIANGDA_GENERATED_RESOURCE_NOT_DECLARED:${resource}`);
   return createNativeResourceClient(resource, definition.surface);
 }
 
-export const instrumentProvider = {
-  getApiUrl: () =>
-    `/service/openxiangda-api/v2/applications/${applicationCode()}/native/data`,
-  getList: async ({ pagination, sorters, meta }) => {
-    const filters = (meta?.query || {}) as Partial<InstrumentListQuery>;
-    const sorter = sorters?.[0];
-    const result = await instrumentDataApi.list({
-      ...filters,
-      page: pagination?.currentPage || 1,
-      pageSize: pagination?.pageSize || 20,
-      sort: sorter
-        ? {
-            field: String(sorter.field),
-            order: sorter.order,
-          }
-        : { field: 'instrumentCode', order: 'asc' },
-    });
-    return { data: result.rows, total: result.total };
-  },
-  getOne: async ({ id }) => ({ data: await instrumentDataApi.get(String(id)) }),
-  create: async ({ variables }) => ({
-    data: await instrumentDataApi.create(variables as Partial<InstrumentRecord>),
-  }),
-  update: async ({ id, variables, meta }) => ({
-    data: await instrumentDataApi.update(
-      String(id),
-      Number(meta?.expectedRevision),
-      variables as Partial<InstrumentRecord>
-    ),
-  }),
-  deleteOne: async ({ id, meta }) => ({
-    data: await instrumentDataApi.remove(
-      String(id),
-      Number(meta?.expectedRevision)
-    ),
-  }),
-} as DataProvider;
-
-const generatedProvider = {
-  getApiUrl: () =>
-    `/service/openxiangda-api/v2/applications/${applicationCode()}/native/data`,
-  getList: async ({ resource, pagination, sorters, meta }) => {
+export const applicationProvider = {
+  getApiUrl: () => `/service/openxiangda-api/v2/applications/${applicationCode()}/native/data`,
+  getList: async ({ resource, pagination, sorters, meta }: ListParams) => {
     const query = (meta?.query || {}) as Partial<GenericResourceQuery>;
     const sorter = sorters?.[0];
-    const result = await generatedClient(resource).list({
-      ...query,
+    const result = await clientFor(resource).list({
       page: pagination?.currentPage || 1,
       pageSize: pagination?.pageSize || 20,
-      sort: sorter
-        ? { field: String(sorter.field), order: sorter.order || 'asc' }
-        : query.sort,
+      ...query,
+      ...(sorter ? { sort: { field: String(sorter.field), order: (sorter.order || 'asc') as 'asc' | 'desc' } } : {}),
     });
     return { data: result.rows, total: result.total };
   },
-  getOne: async ({ resource, id }) => ({
-    data: await generatedClient(resource).get(String(id)),
+  getOne: async ({ resource, id }: OneParams) => ({ data: await clientFor(resource).get(String(id)) }),
+  create: async ({ resource, variables }: CreateParams) => ({ data: await clientFor(resource).create(variables as Record<string, unknown>) }),
+  update: async ({ resource, id, variables, meta }: UpdateParams) => ({
+    data: await clientFor(resource).update(String(id), Number(meta?.expectedRevision), variables as Record<string, unknown>),
   }),
-  create: async ({ resource, variables }) => ({
-    data: await generatedClient(resource).create(variables as Record<string, unknown>),
+  deleteOne: async ({ resource, id, meta }: DeleteParams) => ({
+    data: await clientFor(resource).remove(String(id), Number(meta?.expectedRevision)),
   }),
-  update: async ({ resource, id, variables, meta }) => ({
-    data: await generatedClient(resource).update(
-      String(id),
-      Number(meta?.expectedRevision),
-      variables as Record<string, unknown>
-    ),
-  }),
-  deleteOne: async ({ resource, id, meta }) => ({
-    data: await generatedClient(resource).remove(
-      String(id),
-      Number(meta?.expectedRevision)
-    ),
-  }),
-} as DataProvider;
-
-/** One Refine provider: golden modules may override a resource, simple resources use generated CRUD. */
-export const applicationProvider = {
-  getApiUrl: instrumentProvider.getApiUrl,
-  getList: (args: Parameters<NonNullable<DataProvider['getList']>>[0]) =>
-    args.resource === 'instruments'
-      ? instrumentProvider.getList!(args)
-      : generatedProvider.getList!(args),
-  getOne: (args: Parameters<NonNullable<DataProvider['getOne']>>[0]) =>
-    args.resource === 'instruments'
-      ? instrumentProvider.getOne!(args)
-      : generatedProvider.getOne!(args),
-  create: (args: Parameters<NonNullable<DataProvider['create']>>[0]) =>
-    args.resource === 'instruments'
-      ? instrumentProvider.create!(args)
-      : generatedProvider.create!(args),
-  update: (args: Parameters<NonNullable<DataProvider['update']>>[0]) =>
-    args.resource === 'instruments'
-      ? instrumentProvider.update!(args)
-      : generatedProvider.update!(args),
-  deleteOne: (args: Parameters<NonNullable<DataProvider['deleteOne']>>[0]) =>
-    args.resource === 'instruments'
-      ? instrumentProvider.deleteOne!(args)
-      : generatedProvider.deleteOne!(args),
-} as DataProvider;
+} as unknown as DataProvider;