@nocobase/client 0.7.0-alpha.80 → 0.7.0-alpha.83

package/src/schema-initializer/buttons/FormActionInitializers.tsx

@@ -101,6 +101,28 @@ export const FormActionInitializers = {
             },
           },
         },
+        {
+          type: 'item',
+          title: '{{t("Custom request")}}',
+          component: 'CustomizeActionInitializer',
+          schema: {
+            title: '{{ t("Custom request") }}',
+            'x-component': 'Action',
+            'x-action': 'customize:form:request',
+            'x-designer': 'Action.Designer',
+            'x-action-settings': {
+              requestSettings: {},
+              onSuccess: {
+                manualClose: false,
+                redirecting: false,
+                successMessage: '{{t("Request success")}}',
+              },
+            },
+            'x-component-props': {
+              useProps: '{{ useCustomizeRequestActionProps }}',
+            },
+          },
+        },
       ],
     },
   ],
@@ -208,6 +230,28 @@ export const CreateFormActionInitializers = {
             },
           },
         },
+        {
+          type: 'item',
+          title: '{{t("Custom request")}}',
+          component: 'CustomizeActionInitializer',
+          schema: {
+            title: '{{ t("Custom request") }}',
+            'x-component': 'Action',
+            'x-action': 'customize:form:request',
+            'x-designer': 'Action.Designer',
+            'x-action-settings': {
+              requestSettings: {},
+              onSuccess: {
+                manualClose: false,
+                redirecting: false,
+                successMessage: '{{t("Request success")}}',
+              },
+            },
+            'x-component-props': {
+              useProps: '{{ useCustomizeRequestActionProps }}',
+            },
+          },
+        },
       ],
     },
   ],
@@ -315,6 +359,28 @@ export const UpdateFormActionInitializers = {
             },
           },
         },
+        {
+          type: 'item',
+          title: '{{t("Custom request")}}',
+          component: 'CustomizeActionInitializer',
+          schema: {
+            title: '{{ t("Custom request") }}',
+            'x-component': 'Action',
+            'x-action': 'customize:form:request',
+            'x-designer': 'Action.Designer',
+            'x-action-settings': {
+              requestSettings: {},
+              onSuccess: {
+                manualClose: false,
+                redirecting: false,
+                successMessage: '{{t("Request success")}}',
+              },
+            },
+            'x-component-props': {
+              useProps: '{{ useCustomizeRequestActionProps }}',
+            },
+          },
+        },
       ],
     },
   ],

package/src/schema-initializer/buttons/ReadPrettyFormActionInitializers.tsx

@@ -113,6 +113,28 @@ export const ReadPrettyFormActionInitializers = {
             },
           },
         },
+        {
+          type: 'item',
+          title: '{{t("Custom request")}}',
+          component: 'CustomizeActionInitializer',
+          schema: {
+            title: '{{ t("Custom request") }}',
+            'x-component': 'Action',
+            'x-action': 'customize:form:request',
+            'x-designer': 'Action.Designer',
+            'x-action-settings': {
+              requestSettings: {},
+              onSuccess: {
+                manualClose: false,
+                redirecting: false,
+                successMessage: '{{t("Request success")}}',
+              },
+            },
+            'x-component-props': {
+              useProps: '{{ useCustomizeRequestActionProps }}',
+            },
+          },
+        },
       ],
     },
   ],

package/src/schema-initializer/buttons/TableActionColumnInitializers.tsx

@@ -149,6 +149,28 @@ export const TableActionColumnInitializers = (props: any) => {
                 },
               },
             },
+            {
+              type: 'item',
+              title: '{{t("Custom request")}}',
+              component: 'CustomizeActionInitializer',
+              schema: {
+                title: '{{ t("Custom request") }}',
+                'x-component': 'Action.Link',
+                'x-action': 'customize:table:request',
+                'x-designer': 'Action.Designer',
+                'x-action-settings': {
+                  requestSettings: {},
+                  onSuccess: {
+                    manualClose: false,
+                    redirecting: false,
+                    successMessage: '{{t("Request success")}}',
+                  },
+                },
+                'x-component-props': {
+                  useProps: '{{ useCustomizeRequestActionProps }}',
+                },
+              },
+            },
           ],
         },
       ]}

package/src/schema-settings/SchemaSettings.tsx

@@ -7,6 +7,7 @@ import { Alert, Button, Dropdown, Menu, MenuItemProps, Modal, Select, Space, Swi
 import classNames from 'classnames';
 import { cloneDeep } from 'lodash';
 import React, { createContext, useContext, useMemo, useState } from 'react';
+import { createPortal } from 'react-dom';
 import { useTranslation } from 'react-i18next';
 import {
   ActionContext,
@@ -19,7 +20,7 @@ import {
   useActionContext,
   useAPIClient,
   useCollection,
-  useCompile
+  useCompile,
 } from '..';
 import { useSchemaTemplateManager } from '../schema-templates';
 import { useBlockTemplateContext } from '../schema-templates/BlockTemplate';
@@ -466,7 +467,7 @@ SchemaSettings.PopupItem = (props) => {
 };
 
 SchemaSettings.ActionModalItem = React.memo((props: any) => {
-  const { title, onSubmit, initialValues, initialSchema, modalTip, ...others } = props;
+  const { title, onSubmit, initialValues, initialSchema, schema, modalTip, components, ...others } = props;
   const [visible, setVisible] = useState(false);
   const [schemaUid, setSchemaUid] = useState<string>(props.uid);
   const { t } = useTranslation();
@@ -487,13 +488,14 @@ SchemaSettings.ActionModalItem = React.memo((props: any) => {
     setVisible(false);
   };
 
-  const submitHandler = () => {
+  const submitHandler = async () => {
+    await form.submit();
     onSubmit?.(cloneDeep(form.values));
     setVisible(false);
   };
 
   const openAssignedFieldValueHandler = async () => {
-    if (!schemaUid && initialSchema['x-uid']) {
+    if (!schemaUid && initialSchema?.['x-uid']) {
       fieldSchema['x-action-settings'].schemaUid = initialSchema['x-uid'];
       dn.emit('patch', { schema: fieldSchema });
       await api.resource('uiSchemas').insert({ values: initialSchema });
@@ -509,31 +511,40 @@ SchemaSettings.ActionModalItem = React.memo((props: any) => {
       <SchemaSettings.Item {...others} onClick={openAssignedFieldValueHandler}>
         {props.children || props.title}
       </SchemaSettings.Item>
-
-      <Modal
-        width={'50%'}
-        title={compile(title)}
-        {...others}
-        destroyOnClose
-        visible={visible}
-        onCancel={cancelHandler}
-        footer={
-          <Space>
-            <Button onClick={cancelHandler}>{t('Cancel')}</Button>
-            <Button type="primary" onClick={submitHandler}>
-              {t('Submit')}
-            </Button>
-          </Space>
-        }
-      >
-        <FormProvider form={form}>
-          <FormLayout layout={'vertical'}>
-            {modalTip && <Alert message={modalTip} />}
-            {modalTip && <br />}
-            {visible && <RemoteSchemaComponent noForm uid={schemaUid} />}
-          </FormLayout>
-        </FormProvider>
-      </Modal>
+      {createPortal(
+        <div
+          onClick={(e) => {
+            e.stopPropagation();
+          }}
+        >
+          <Modal
+            width={'50%'}
+            title={compile(title)}
+            {...others}
+            destroyOnClose
+            visible={visible}
+            onCancel={cancelHandler}
+            footer={
+              <Space>
+                <Button onClick={cancelHandler}>{t('Cancel')}</Button>
+                <Button type="primary" onClick={submitHandler}>
+                  {t('Submit')}
+                </Button>
+              </Space>
+            }
+          >
+            <FormProvider form={form}>
+              <FormLayout layout={'vertical'}>
+                {modalTip && <Alert message={modalTip} />}
+                {modalTip && <br />}
+                {visible && schemaUid && <RemoteSchemaComponent noForm components={components} uid={schemaUid} />}
+                {visible && schema && <SchemaComponent components={components} schema={schema} />}
+              </FormLayout>
+            </FormProvider>
+          </Modal>
+        </div>,
+        document.body,
+      )}
     </>
   );
 });

package/src/user/CurrentUser.tsx

@@ -36,7 +36,7 @@ export const CurrentUser = () => {
               <Menu.Item
                 onClick={async () => {
                   await api.resource('users').signout();
-                  api.setBearerToken(null);
+                  api.auth.setToken(null);
                   history.push('/signin');
                 }}
               >

package/src/user/LanguageSettings.tsx

@@ -34,6 +34,7 @@ export const LanguageSettings = () => {
               appLang: lang,
             },
           });
+          api.auth.setLocale(lang);
           await i18n.changeLanguage(lang);
           window.location.reload();
         }}

package/src/user/SigninPage.tsx

@@ -68,13 +68,8 @@ const useSignin = () => {
   return {
     async run() {
       await form.submit();
-      const response = await api.resource('users').signin({
-        values: form.values,
-      });
-      if (response?.data?.data?.token) {
-        api.setBearerToken(response?.data?.data?.token);
-        history.push(redirect || '/admin');
-      }
+      await api.auth.signIn(form.values);
+      history.push(redirect || '/admin');
     },
   };
 };

package/src/user/SwitchRole.tsx

@@ -1,4 +1,3 @@
-import { useCookieState } from 'ahooks';
 import { Menu, Select } from 'antd';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
@@ -30,9 +29,6 @@ export const SwitchRole = () => {
   const api = useAPIClient();
   const roles = useCurrentRoles();
   const { t } = useTranslation();
-  const [roleName, setRoleName] = useCookieState('currentRoleName', {
-    defaultValue: roles?.find((role) => role.default)?.name,
-  });
   if (roles.length <= 1) {
     return null;
   }
@@ -47,9 +43,9 @@ export const SwitchRole = () => {
           value: 'name',
         }}
         options={roles}
-        value={roleName}
+        value={api.auth.role}
         onChange={async (roleName) => {
-          setRoleName(roleName);
+          api.auth.setRole(roleName);
           await api.resource('users').setDefaultRole({ values: { roleName } });
           window.location.href = '/';
         }}

package/src/workflow/triggers/collection.tsx

@@ -26,7 +26,7 @@ const FieldsSelect = observer((props) => {
           && (field.uiSchema ? !field.uiSchema['x-read-pretty'] : true)
         ))
         .map(field => (
-          <Select.Option value={field.name}>{compile(field.uiSchema?.title)}</Select.Option>
+          <Select.Option key={field.name} value={field.name}>{compile(field.uiSchema?.title)}</Select.Option>
         ))}
     </Select>
   );

package/src/workflow/triggers/index.tsx

@@ -8,6 +8,7 @@ import { message, Tag } from "antd";
 import { SchemaComponent, useActionContext, useAPIClient, useCompile, useRecord, useRequest, useResourceActionContext } from '../../';
 import collection from './collection';
 import { nodeCardClass, nodeMetaClass } from "../style";
+import schedule from "./schedule";
 
 
 function useUpdateConfigAction() {
@@ -50,6 +51,7 @@ export interface Trigger {
 export const triggers = new Registry<Trigger>();
 
 triggers.register(collection.type, collection);
+triggers.register(schedule.type, schedule);
 
 export const TriggerConfig = () => {
   const { t } = useTranslation();