@nocobase/client 0.14.0-alpha.2 → 0.14.0-alpha.4

package/es/index.mjs

@@ -2032,6 +2032,19 @@ class APIClient extends APIClient$1 {
     });
     super.interceptors();
     this.useNotificationMiddleware();
+    this.axios.interceptors.response.use(
+      (response) => {
+        return response;
+      },
+      (error2) => {
+        var _a, _b;
+        const errs = ((_b = (_a = error2 == null ? void 0 : error2.response) == null ? void 0 : _a.data) == null ? void 0 : _b.errors) || [{ message: "Server error" }];
+        if (errs.find((error22) => error22.code === "ROLE_NOT_FOUND_ERR")) {
+          this.auth.setRole(null);
+        }
+        throw error2;
+      }
+    );
   }
   useNotificationMiddleware() {
     this.axios.interceptors.response.use(
@@ -2267,7 +2280,7 @@ const useSaveCurrentUserValues$1 = () => {
     run() {
       return __async(this, null, function* () {
         yield form.submit();
-        yield api.resource("users").changePassword({
+        yield api.resource("auth").changePassword({
           values: form.values
         });
         yield form.reset();
@@ -6041,6 +6054,7 @@ const DuplicateAction = observer((props) => {
             ) : /* @__PURE__ */ jsx(
               Button,
               __spreadProps(__spreadValues({
+                "data-testid": "duplicate-action",
                 disabled,
                 style: {
                   opacity: designable && ((_b = field == null ? void 0 : field.data) == null ? void 0 : _b.hidden) && 0.1
@@ -9840,12 +9854,26 @@ function useIsShowMultipleSwitch() {
     return !field.readPretty && fieldSchema["x-component"] !== "TableField" && hasMultiple && fieldMode !== "SubTable";
   };
 }
+const getTestId = (schema3) => {
+  var _a;
+  const resource = (_a = schema3 == null ? void 0 : schema3["x-decorator-props"]) == null ? void 0 : _a["resource"];
+  if (resource) {
+    return `${resource}-resource`;
+  }
+  const field = schema3["x-collection-field"];
+  if (field) {
+    return `${field}-field`;
+  }
+  return `${schema3.name}-item`;
+};
 const BlockItem = (props) => {
   const { className, children } = useProps(props);
   const Designer4 = useDesigner();
+  const schema3 = useFieldSchema();
   return /* @__PURE__ */ jsxs(
     SortableItem,
     {
+      "data-testid": getTestId(schema3),
       className: cls(
         "nb-block-item",
         className,
@@ -10130,7 +10158,7 @@ const useFilterableFields = (collectionName) => {
       return false;
     }
     const fieldInterface = getInterface(field.interface);
-    if (!fieldInterface.filterable) {
+    if (!(fieldInterface == null ? void 0 : fieldInterface.filterable)) {
       return false;
     }
     return true;
@@ -10243,6 +10271,7 @@ const DesignableSwitch = () => {
   return /* @__PURE__ */ jsx(Tooltip$1, { title: t("UI Editor"), children: /* @__PURE__ */ jsx(
     Button,
     {
+      "data-testid": "ui-editor-button",
       icon: /* @__PURE__ */ jsx(HighlightOutlined, {}),
       title: t("UI Editor"),
       style,
@@ -10921,7 +10950,7 @@ const useGetFilterFieldOptions = () => {
       return;
     }
     const fieldInterface = getInterface(field.interface);
-    if (!fieldInterface.filterable) {
+    if (!(fieldInterface == null ? void 0 : fieldInterface.filterable)) {
       return;
     }
     const { nested, children, operators: operators2 } = fieldInterface.filterable;
@@ -10978,7 +11007,7 @@ const useFilterFieldOptions = (fields2) => {
       return;
     }
     const fieldInterface = getInterface(field.interface);
-    if (!fieldInterface.filterable) {
+    if (!(fieldInterface == null ? void 0 : fieldInterface.filterable)) {
       return;
     }
     const { nested, children, operators: operators2 } = fieldInterface.filterable;
@@ -13219,8 +13248,9 @@ const TableColumnDesigner$1 = (props) => {
         title: t("Field component"),
         options: readOnlyMode === "read-pretty" ? [
           { label: t("Title"), value: "Select" },
+          isFileField && { label: t("File manager"), value: "FileManager" },
           { label: t("Tag"), value: "Tag" }
-        ] : fieldModeOptions,
+        ].filter(Boolean) : fieldModeOptions,
         value: fieldMode,
         onChange: (mode) => {
           const schema3 = {
@@ -15788,7 +15818,7 @@ const useVariableTypes = (currentCollection, excludes = []) => {
             return;
           }
           const fieldInterface = getInterface(field.interface);
-          if (!fieldInterface.filterable) {
+          if (!(fieldInterface == null ? void 0 : fieldInterface.filterable)) {
             return;
           }
           const { nested, children } = fieldInterface.filterable;
@@ -22342,7 +22372,9 @@ const Action = observer(
       }
       return /* @__PURE__ */ jsxs(
         SortableItem,
-        __spreadProps(__spreadValues({}, others), {
+        __spreadProps(__spreadValues({
+          "data-testid": `${fieldSchema["x-action"] || fieldSchema.name}-action`
+        }, others), {
           loading: (_b2 = field == null ? void 0 : field.data) == null ? void 0 : _b2.loading,
           icon: icon2 ? /* @__PURE__ */ jsx(Icon, { type: icon2 }) : null,
           disabled,
@@ -28274,6 +28306,10 @@ const getWebSocketURL = () => {
   const subApp = getSubAppName();
   const queryString = subApp ? `?__appName=${subApp}` : "";
   if (process.env.WEBSOCKET_URL) {
+    const url2 = new URL(process.env.WEBSOCKET_URL);
+    if (url2.hostname === "localhost") {
+      return `${location.protocol === "https:" ? "wss" : "ws"}://${location.hostname}:${url2.port}/ws${queryString}`;
+    }
     return `${process.env.WEBSOCKET_URL}${queryString}`;
   }
   try {
@@ -32446,9 +32482,13 @@ const ReadPrettyInternalViewer = observer(
 );
 const useTableSelectorProps$1 = () => {
   const field = useField();
-  const { multiple, options = [], setSelectedRows, selectedRows: rcSelectRows = [], onChange } = useContext(
-    RecordPickerContext
-  );
+  const {
+    multiple,
+    options = [],
+    setSelectedRows,
+    selectedRows: rcSelectRows = [],
+    onChange
+  } = useContext(RecordPickerContext);
   const _a = useTableSelectorProps$3(), { onRowSelectionChange, rowKey = "id" } = _a, others = __objRest(_a, ["onRowSelectionChange", "rowKey"]);
   const { setVisible } = useActionContext();
   return __spreadProps(__spreadValues({}, others), {
@@ -32596,14 +32636,15 @@ const InternalFileManager = (props) => {
   ] });
 };
 const FileManageReadPretty = connect((props) => {
-  const field = useField();
   const fieldNames = useFieldNames$1(props);
+  const fieldSchema = useFieldSchema();
   const { getField } = useCollection();
-  const collectionField = getField(field.props.name);
+  const { getCollectionJoinField } = useCollectionManager();
+  const collectionField = getField(fieldSchema.name) || getCollectionJoinField(fieldSchema["x-collection-field"]);
   const labelUiSchema = useLabelUiSchema$1(collectionField == null ? void 0 : collectionField.target, (fieldNames == null ? void 0 : fieldNames.label) || "label");
   const showFilePicker = isShowFilePicker$1(labelUiSchema);
   if (showFilePicker) {
-    return collectionField ? /* @__PURE__ */ jsx(Preview, __spreadProps(__spreadValues({}, props), { fieldNames })) : null;
+    return /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: true, children: collectionField ? /* @__PURE__ */ jsx(Preview, __spreadProps(__spreadValues({}, props), { fieldNames })) : null });
   } else {
     return /* @__PURE__ */ jsx(ReadPrettyInternalViewer, __spreadValues({}, props));
   }
@@ -32616,33 +32657,34 @@ const InternalNester = observer(
     const insertNester = useInsertSchema("Nester");
     const { options: collectionField } = useAssociationFieldContext();
     const showTitle = (_b = (_a = fieldSchema["x-decorator-props"]) == null ? void 0 : _a.showTitle) != null ? _b : true;
+    const { actionName } = useACLActionParamsContext();
     useEffect(() => {
       insertNester(schema$1.Nester);
     }, []);
-    return /* @__PURE__ */ jsx(CollectionProvider, { name: collectionField.target, children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(
+    return /* @__PURE__ */ jsx(CollectionProvider, { name: collectionField.target, children: /* @__PURE__ */ jsx(ACLCollectionProvider, { actionPath: `${collectionField.target}:${actionName}`, children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(
       "div",
       {
         className: cx(
           css`
-                & .ant-formily-item-layout-vertical {
-                  margin-bottom: 10px;
-                }
-                .ant-card-body {
-                  padding: 15px 20px 5px;
-                }
-                .ant-divider-horizontal {
-                  margin: 10px 0;
-                }
-              `,
-          {
-            [css`
+                  & .ant-formily-item-layout-vertical {
+                    margin-bottom: 10px;
+                  }
                   .ant-card-body {
-                    padding: 0px 20px 20px 0px;
+                    padding: 15px 20px 5px;
                   }
-                  > .ant-card-bordered {
-                    border: none;
+                  .ant-divider-horizontal {
+                    margin: 10px 0;
                   }
-                `]: showTitle === false
+                `,
+          {
+            [css`
+                    .ant-card-body {
+                      padding: 0px 20px 20px 0px;
+                    }
+                    > .ant-card-bordered {
+                      border: none;
+                    }
+                  `]: showTitle === false
           }
         ),
         children: /* @__PURE__ */ jsx(
@@ -32657,7 +32699,7 @@ const InternalNester = observer(
           }
         )
       }
-    ) }) });
+    ) }) }) });
   },
   { displayName: "InternalNester" }
 );
@@ -32835,6 +32877,7 @@ const InternalSubTable = observer(
     const fieldSchema = useFieldSchema();
     const insert = useInsertSchema("SubTable");
     const { options } = useAssociationFieldContext();
+    const { actionName } = useACLActionParamsContext();
     useEffect(() => {
       insert(schema$1.SubTable);
       field.required = fieldSchema["required"];
@@ -32844,23 +32887,23 @@ const InternalSubTable = observer(
       "Radio.Group": Select,
       "Checkbox.Group": (props) => /* @__PURE__ */ jsx(Select, __spreadValues({ multiple: true, mode: "multiple" }, props))
     });
-    return /* @__PURE__ */ jsx(CollectionProvider, { name: options.target, children: /* @__PURE__ */ jsx(
+    return /* @__PURE__ */ jsx(CollectionProvider, { name: options.target, children: /* @__PURE__ */ jsx(ACLCollectionProvider, { actionPath: `${options.target}:${actionName}`, children: /* @__PURE__ */ jsx(
       FormLayout,
       {
         className: css`
-            .ant-formily-item-bordered-none {
-              .ant-input-number-group-addon {
-                border: none !important;
-                background: none;
-              }
-              .ant-checkbox-wrapper {
-                margin-left: 8px;
-              }
-              .ant-table {
-                margin: 0px !important;
+              .ant-formily-item-bordered-none {
+                .ant-input-number-group-addon {
+                  border: none !important;
+                  background: none;
+                }
+                .ant-checkbox-wrapper {
+                  margin-left: 8px;
+                }
+                .ant-table {
+                  margin: 0px !important;
+                }
               }
-            }
-          `,
+            `,
         layout: "vertical",
         bordered: false,
         children: /* @__PURE__ */ jsx(
@@ -32884,7 +32927,7 @@ const InternalSubTable = observer(
           }
         )
       }
-    ) });
+    ) }) });
   },
   { displayName: "InternalSubTable" }
 );
@@ -33304,7 +33347,7 @@ const useTableColumns$1 = (props) => {
   const { designable } = useDesignable();
   const { exists, render: render2 } = useSchemaInitializer(schema3["x-initializer"]);
   const columns = (_a = schema3.reduceProperties((buf, s2) => {
-    if (isColumnComponent$2(s2) && schemaInWhitelist(Object.values(s2.properties || {}).pop(), props == null ? void 0 : props.isSubTable)) {
+    if (isColumnComponent$2(s2) && schemaInWhitelist(Object.values(s2.properties || {}).pop())) {
       return buf.concat([s2]);
     }
     return buf;
@@ -43727,7 +43770,7 @@ const HeaderMenu = ({
       key: "x-designer-button",
       disabled: true,
       style: { padding: "0 8px", order: 9999 },
-      label: render2({ style: { background: "none" } }),
+      label: render2({ "data-testid": "add-menu-item-button-in-header", style: { background: "none" } }),
       notdelete: true
     };
     const result = getMenuItems(() => {
@@ -43807,6 +43850,7 @@ const SideMenu = ({
         key: "x-designer-button",
         disabled: true,
         label: render2({
+          "data-testid": "add-menu-item-button-in-side",
           insert: (s2) => {
             const dn = createDesignable({
               t,
@@ -50870,7 +50914,7 @@ const number = {
       }
     }
   },
-  availableTypes: ["double"],
+  availableTypes: ["double", "float"],
   hasDefaultValue: true,
   properties: __spreadProps(__spreadValues({}, defaultProps), {
     unique,
@@ -55091,9 +55135,9 @@ const CollectionFields = () => {
       groups2.pf.push(field2);
     } else if (field2.interface) {
       const conf = getInterface(field2.interface);
-      if (conf.group === "systemInfo") {
+      if ((conf == null ? void 0 : conf.group) === "systemInfo") {
         groups2.system.push(field2);
-      } else if (conf.group === "relation") {
+      } else if ((conf == null ? void 0 : conf.group) === "relation") {
         groups2.association.push(field2);
       } else {
         groups2.general.push(field2);
@@ -55168,7 +55212,6 @@ const CollectionFields = () => {
   );
   const addProps = { type: "primary", database };
   const syncProps = { type: "primary" };
-  console.log(dataSource2);
   return /* @__PURE__ */ jsx(ResourceActionProvider, __spreadProps(__spreadValues({}, resourceActionProps), { children: /* @__PURE__ */ jsx(FormContext.Provider, { value: form, children: /* @__PURE__ */ jsxs(FieldContext.Provider, { value: f, children: [
     /* @__PURE__ */ jsxs(
       Space$1,
@@ -56712,7 +56755,7 @@ const TabTitle = observer(
 const TabBar = ({ item }) => {
   const { t } = useTranslation();
   const compile2 = useCompile();
-  return /* @__PURE__ */ jsxs("span", { children: [
+  return /* @__PURE__ */ jsxs(Space$1, { children: [
     /* @__PURE__ */ jsx(Badge, { color: item.color }),
     t(compile2(item.name))
   ] });
@@ -57497,6 +57540,7 @@ const useResourceName = () => {
 function useACLRoleContext() {
   const { data, getActionAlias, inResources, getResourceActionParams, getStrategyActionParams } = useACLRolesCheck();
   const allowedActions = useAllowedActions();
+  const { getCollectionJoinField } = useCollectionManager();
   const verifyScope = (actionName, recordPkValue) => {
     const actionAlias = getActionAlias(actionName);
     if (!Array.isArray(allowedActions == null ? void 0 : allowedActions[actionAlias])) {
@@ -57506,7 +57550,9 @@ function useACLRoleContext() {
   };
   return __spreadProps(__spreadValues({}, data), {
     parseAction: (actionPath, options = {}) => {
+      var _a;
       const [resourceName, actionName] = actionPath.split(":");
+      const targetResource = (resourceName == null ? void 0 : resourceName.includes(".")) && ((_a = getCollectionJoinField(resourceName)) == null ? void 0 : _a.target);
       if (!getIgnoreScope(options)) {
         const r = verifyScope(actionName, options.recordPkValue);
         if (r !== null) {
@@ -57516,6 +57562,9 @@ function useACLRoleContext() {
       if (data == null ? void 0 : data.allowAll) {
         return {};
       }
+      if (inResources(targetResource)) {
+        return getResourceActionParams(`${targetResource}:${actionName}`);
+      }
       if (inResources(resourceName)) {
         return getResourceActionParams(actionPath);
       }
@@ -57529,7 +57578,7 @@ const ACLCollectionProvider = (props) => {
   if (allowAll) {
     return props.children;
   }
-  const actionPath = schema3 == null ? void 0 : schema3["x-acl-action"];
+  const actionPath = (schema3 == null ? void 0 : schema3["x-acl-action"]) || props.actionPath;
   if (!actionPath) {
     return props.children;
   }
@@ -57537,6 +57586,8 @@ const ACLCollectionProvider = (props) => {
   if (!params) {
     return null;
   }
+  const [_2, actionName] = actionPath.split(":");
+  params.actionName = actionName;
   return /* @__PURE__ */ jsx(ACLActionParamsContext.Provider, { value: params, children: props.children });
 };
 const useACLActionParamsContext = () => {
@@ -57597,7 +57648,8 @@ const ACLCollectionFieldProvider = (props) => {
   const field = useField();
   const { allowAll } = useACLRoleContext();
   const { whitelist } = useACLFieldWhitelist();
-  const allowed = whitelist.length > 0 ? whitelist.includes(fieldSchema.name) : true;
+  const [name] = fieldSchema.name.split(".");
+  const allowed = !fieldSchema["x-acl-ignore"] && whitelist.length > 0 ? whitelist.includes(name) : true;
   useEffect(() => {
     if (!allowed) {
       field.required = false;
@@ -59461,6 +59513,7 @@ const PluginManagerLink = () => {
   return /* @__PURE__ */ jsx(Tooltip$1, { title: t("Plugin manager"), children: /* @__PURE__ */ jsx(
     Button,
     {
+      "data-testid": "pm-button",
       icon: /* @__PURE__ */ jsx(ApiOutlined, {}),
       title: t("Plugin manager"),
       onClick: () => {