@gadmin2n/schematics 0.0.69 → 0.0.70

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/role/list.tsx

@@ -1,16 +1,17 @@
-import React, { useCallback, useMemo, useState } from "react";
-import { useTable } from "@refinedev/antd";
-import { useGetLocale, useGetIdentity } from "@refinedev/core";
-import { Table, Button, Space, Tooltip, message } from "antd";
-
-import { EditModal } from "./Components/EditModal";
-import { CreateModal } from "./Components/CreateModal";
-import type { RolePageTreeNode } from "./types";
-import { useRolePage } from "./hooks/useRolePage";
-import { EditOutlined, EyeOutlined, CodeOutlined } from "@ant-design/icons";
-import { RoleDetailDrawer } from "./Components/RoleDetailDrawer";
-import { SqlModal, generateRoleSql } from "../../components/SqlModal";
-import { customRequest } from "@/helpers/http";
+import React, { useCallback, useMemo, useState } from 'react';
+import { useTable } from '@refinedev/antd';
+import { useGetLocale, useGetIdentity } from '@refinedev/core';
+import { Table, Button, Space, Tooltip, message } from 'antd';
+
+import { EditModal } from './Components/EditModal';
+import { CreateModal } from './Components/CreateModal';
+import type { RolePageTreeNode } from './types';
+import { useRolePage } from './hooks/useRolePage';
+import { EditOutlined, EyeOutlined, CodeOutlined } from '@ant-design/icons';
+import { RoleDetailDrawer } from './Components/RoleDetailDrawer';
+import { SqlModal, generateRoleSql } from '../../components/SqlModal';
+import { customRequest } from '@/helpers/http';
+import { buildPageTree } from '@/helpers/page-tree';
 
 type RolePageInfo = {
   id: number;
@@ -29,43 +30,50 @@ type RolePermissionSummary = {
 const PAGE_NAME_DISPLAY_LIMIT = 40;
 
 const normalizeToNumber = (value: unknown): number | null => {
-  if (typeof value === "number" && !Number.isNaN(value)) {
+  if (typeof value === 'number' && !Number.isNaN(value)) {
     return value;
   }
-  if (typeof value === "string" && value.trim().length > 0) {
+  if (typeof value === 'string' && value.trim().length > 0) {
     const parsedValue = Number(value);
     return Number.isNaN(parsedValue) ? null : parsedValue;
   }
   return null;
 };
 
-const extractActionsFromRelation = (relation: any, pageRecord: any): string[] => {
+const extractActionsFromRelation = (
+  relation: any,
+  pageRecord: any,
+): string[] => {
   const aggregatedActions = new Set<string>();
   const relationActions = relation?.actions ?? relation?.actionList;
 
   if (Array.isArray(relationActions)) {
     relationActions.forEach((action: any) => {
-      if (typeof action === "string" && action) {
+      if (typeof action === 'string' && action) {
         aggregatedActions.add(action);
-      } else if (typeof action === "object" && action?.name) {
+      } else if (typeof action === 'object' && action?.name) {
         aggregatedActions.add(action.name);
       }
     });
-  } else if (typeof relationActions === "string") {
+  } else if (typeof relationActions === 'string') {
     relationActions
-      .split(",")
+      .split(',')
       .map((action: string) => action.trim())
       .filter(Boolean)
-      .forEach(action => aggregatedActions.add(action));
+      .forEach((action) => aggregatedActions.add(action));
   }
 
   const pageResources =
-    relation?.pageResources ?? pageRecord?.pageResources ?? pageRecord?.resources ?? [];
+    relation?.pageResources ??
+    pageRecord?.pageResources ??
+    pageRecord?.resources ??
+    [];
 
   if (Array.isArray(pageResources)) {
     pageResources.forEach((resource: any) => {
-      const action = resource?.action ?? resource?.code ?? resource?.name ?? resource;
-      if (typeof action === "string" && action) {
+      const action =
+        resource?.action ?? resource?.code ?? resource?.name ?? resource;
+      if (typeof action === 'string' && action) {
         aggregatedActions.add(action);
       }
     });
@@ -80,21 +88,29 @@ export const RoleManagementListPage: React.FC = () => {
   const { data: identity } = useGetIdentity<any>();
 
   const { tableProps } = useTable({
-    resource: "role",
+    resource: 'role',
     pagination: {
       pageSize: 20,
     },
   });
 
-  const { rolePagesData, refetchRolePages, rolePagesQuery, pageData, refetchPages, pageQuery } =
-    useRolePage();
+  const {
+    rolePagesData,
+    refetchRolePages,
+    rolePagesQuery,
+    pageData,
+    refetchPages,
+    pageQuery,
+  } = useRolePage();
 
   const pageLookup = useMemo<Record<number, any>>(() => {
     const pages: any[] = Array.isArray(pageData?.data) ? pageData.data : [];
     const lookup: Record<number, any> = {};
 
     pages.forEach((page: any) => {
-      const pageId = normalizeToNumber(page?.id ?? page?.pageId ?? page?.page_id);
+      const pageId = normalizeToNumber(
+        page?.id ?? page?.pageId ?? page?.page_id,
+      );
       if (pageId !== null) {
         lookup[pageId] = page;
       }
@@ -105,94 +121,31 @@ export const RoleManagementListPage: React.FC = () => {
 
   const pageTreeData = useMemo<RolePageTreeNode[]>(() => {
     const pages: any[] = Array.isArray(pageData?.data) ? pageData.data : [];
-    const isZh = currentLocale === "zh_CN" || currentLocale === "zh";
-
-    const getPageTitle = (page: any, pageId: number): string => {
-      if (isZh) {
-        return page?.zhName || page?.name || page?.code || `Page ${pageId}`;
-      }
-      return page?.enName || page?.name || page?.code || `Page ${pageId}`;
-    };
-
-    const nodeMap = new Map<number, { node: RolePageTreeNode; parentId: number | null; sortOrder: number | null }>();
-
-    pages.forEach((page: any) => {
-      const pageId = normalizeToNumber(page?.id ?? page?.pageId ?? page?.page_id);
-      if (pageId === null) {
-        return;
-      }
-
-      const parentId =
-        normalizeToNumber(page?.parentId ?? page?.parent_id ?? page?.parent?.id) ?? null;
-      const title = getPageTitle(page, pageId);
-      const sortOrder = normalizeToNumber(page?.sortOrder ?? page?.sort_order);
-
-      nodeMap.set(pageId, {
-        node: {
-          title,
-          value: String(pageId),
-          key: String(pageId),
-          children: [],
-        },
-        parentId,
-        sortOrder,
-      });
-    });
-
-    const roots: RolePageTreeNode[] = [];
-
-    nodeMap.forEach(({ node, parentId }) => {
-      if (parentId !== null && nodeMap.has(parentId)) {
-        nodeMap.get(parentId)?.node.children?.push(node);
-      } else {
-        roots.push(node);
-      }
-    });
-
-    // Build a map from node key to sortOrder for sorting
-    const sortOrderMap = new Map<string, number | null>();
-    nodeMap.forEach(({ sortOrder }, pageId) => {
-      sortOrderMap.set(String(pageId), sortOrder);
-    });
-
-    const sortNodes = (nodes: RolePageTreeNode[]) => {
-      nodes.sort((a, b) => {
-        const orderA = sortOrderMap.get(a.key) ?? Infinity;
-        const orderB = sortOrderMap.get(b.key) ?? Infinity;
-        return (orderA as number) - (orderB as number);
-      });
-      nodes.forEach(child => {
-        if (child.children && child.children.length) {
-          sortNodes(child.children);
-        }
-      });
-    };
-
-    const pruneEmptyChildren = (nodes: RolePageTreeNode[]): RolePageTreeNode[] =>
-      nodes.map(node => {
-        if (node.children && node.children.length) {
-          return {
-            ...node,
-            children: pruneEmptyChildren(node.children),
-          };
-        }
-        const { children, ...rest } = node;
-        return rest as RolePageTreeNode;
-      });
-
-    sortNodes(roots);
-    return pruneEmptyChildren(roots);
+    const isZh = currentLocale === 'zh_CN' || currentLocale === 'zh';
+    return buildPageTree(pages, (page) =>
+      isZh
+        ? page?.zhName || page?.name || page?.code || `Page ${page.id}`
+        : page?.enName || page?.name || page?.code || `Page ${page.id}`,
+    ) as RolePageTreeNode[];
   }, [pageData, currentLocale]);
 
-  const rolePermissionSummary = useMemo<Record<number, RolePermissionSummary>>(() => {
-    const relations: any[] = Array.isArray(rolePagesData?.data) ? rolePagesData.data : [];
-    const isZh = currentLocale === "zh_CN" || currentLocale === "zh";
+  const rolePermissionSummary = useMemo<
+    Record<number, RolePermissionSummary>
+  >(() => {
+    const relations: any[] = Array.isArray(rolePagesData?.data)
+      ? rolePagesData.data
+      : [];
+    const isZh = currentLocale === 'zh_CN' || currentLocale === 'zh';
 
     const getLocalizedName = (pageRecord: any, fallback: string): string => {
       if (isZh) {
-        return pageRecord?.zhName || pageRecord?.name || pageRecord?.code || fallback;
+        return (
+          pageRecord?.zhName || pageRecord?.name || pageRecord?.code || fallback
+        );
       }
-      return pageRecord?.enName || pageRecord?.name || pageRecord?.code || fallback;
+      return (
+        pageRecord?.enName || pageRecord?.name || pageRecord?.code || fallback
+      );
     };
 
     const buildMenuPath = (pageId: number): string => {
@@ -203,10 +156,13 @@ export const RoleManagementListPage: React.FC = () => {
         visited.add(currentId);
         const record: any = pageLookup[currentId];
         if (!record) break;
-        parts.unshift(getLocalizedName(record, record?.name || `Page ${currentId}`));
-        currentId = normalizeToNumber(record?.parentId ?? record?.parent_id) ?? null;
+        parts.unshift(
+          getLocalizedName(record, record?.name || `Page ${currentId}`),
+        );
+        currentId =
+          normalizeToNumber(record?.parentId ?? record?.parent_id) ?? null;
       }
-      return parts.join(" / ");
+      return parts.join(' / ');
     };
 
     const summaryMap: Record<number, RolePermissionSummary> = {};
@@ -242,16 +198,16 @@ export const RoleManagementListPage: React.FC = () => {
       }
 
       const localizedName = getLocalizedName(pageRecord, pageName);
-      if (!summary.pageInfos.some(p => p.id === pageId)) {
+      if (!summary.pageInfos.some((p) => p.id === pageId)) {
         summary.pageInfos.push({
           id: pageId,
-          code: pageRecord?.code ?? "",
+          code: pageRecord?.code ?? '',
           name: localizedName,
           menuPath: buildMenuPath(pageId),
         });
       }
 
-      extractActionsFromRelation(relation, pageRecord).forEach(action => {
+      extractActionsFromRelation(relation, pageRecord).forEach((action) => {
         if (action && !summary.actions.includes(action)) {
           summary.actions.push(action);
         }
@@ -268,13 +224,14 @@ export const RoleManagementListPage: React.FC = () => {
         const record: any = pageLookup[currentId];
         if (!record) break;
         chain.unshift(record?.sortOrder ?? record?.sort_order ?? Infinity);
-        currentId = normalizeToNumber(record?.parentId ?? record?.parent_id) ?? null;
+        currentId =
+          normalizeToNumber(record?.parentId ?? record?.parent_id) ?? null;
       }
       return chain;
     };
 
     // Sort pageInfos by full ancestor sort-order chain
-    Object.values(summaryMap).forEach(summary => {
+    Object.values(summaryMap).forEach((summary) => {
       summary.pageInfos.sort((a, b) => {
         const chainA = getSortChain(a.id);
         const chainB = getSortChain(b.id);
@@ -294,7 +251,7 @@ export const RoleManagementListPage: React.FC = () => {
   const [drawerRole, setDrawerRole] = useState<any>(null);
 
   const [showModal, setShowModal] = useState<{
-    type: "show" | "edit" | "create" | null;
+    type: 'show' | 'edit' | 'create' | null;
     id: number | null;
   }>({
     type: null,
@@ -305,31 +262,48 @@ export const RoleManagementListPage: React.FC = () => {
     open: boolean;
     title: string;
     sql: string;
-  }>({ open: false, title: "", sql: "" });
-
-  const handleShowSql = useCallback(async (record: any) => {
-    const summary = rolePermissionSummary[record.id];
-    const rolePages = summary?.pageInfos?.map(p => ({ pageId: p.id, pageCode: p.code, pageName: p.name })) ?? [];
+  }>({ open: false, title: '', sql: '' });
+
+  const handleShowSql = useCallback(
+    async (record: any) => {
+      const summary = rolePermissionSummary[record.id];
+      const rolePages =
+        summary?.pageInfos?.map((p) => ({
+          pageId: p.id,
+          pageCode: p.code,
+          pageName: p.name,
+        })) ?? [];
+
+      let roleResources: Array<{
+        resourceCode: string;
+        resourceName: string;
+        actions: string[];
+      }> = [];
+      try {
+        const resp: any = await customRequest('roleResource/findMany', 'post', {
+          where: { roleId: record.id },
+          include: { resource: true },
+        });
+        const items: any[] = Array.isArray(resp?.data) ? resp.data : [];
+        roleResources = items.map((item) => ({
+          resourceCode: item.resource?.code ?? String(item.resourceId),
+          resourceName: item.resource?.name ?? String(item.resourceId),
+          actions: Array.isArray(item.actions) ? item.actions : [],
+        }));
+      } catch {
+        message.warning(
+          'Could not fetch role resource details; SQL will omit permissions.',
+        );
+      }
 
-    let roleResources: Array<{ resourceCode: string; resourceName: string; actions: string[] }> = [];
-    try {
-      const resp: any = await customRequest("roleResource/findMany", "post", {
-        where: { roleId: record.id },
-        include: { resource: true },
+      const sql = generateRoleSql(record, rolePages, roleResources, {
+        authorId: identity?.userid,
+        authorName: identity?.username,
       });
-      const items: any[] = Array.isArray(resp?.data) ? resp.data : [];
-      roleResources = items.map(item => ({
-        resourceCode: item.resource?.code ?? String(item.resourceId),
-        resourceName: item.resource?.name ?? String(item.resourceId),
-        actions: Array.isArray(item.actions) ? item.actions : [],
-      }));
-    } catch {
-      message.warning("Could not fetch role resource details; SQL will omit permissions.");
-    }
-
-    const sql = generateRoleSql(record, rolePages, roleResources, { authorId: identity?.userid, authorName: identity?.username });
-    setSqlModal({ open: true, title: `SQL — Role: ${record.name}`, sql });
-  }, [rolePermissionSummary]);
+      setSqlModal({ open: true, title: `SQL — Role: ${record.name}`, sql });
+    },
+    [rolePermissionSummary],
+  );
 
   const refreshRoleRelatedData = useCallback(() => {
     refetchRolePages(rolePagesQuery ?? {});
@@ -352,7 +326,7 @@ export const RoleManagementListPage: React.FC = () => {
           type="primary"
           onClick={() =>
             setShowModal({
-              type: "create",
+              type: 'create',
               id: null,
             })
           }
@@ -381,7 +355,7 @@ export const RoleManagementListPage: React.FC = () => {
                   type="default"
                   size="small"
                   icon={<EditOutlined />}
-                  onClick={() => setShowModal({ type: "edit", id: record.id })}
+                  onClick={() => setShowModal({ type: 'edit', id: record.id })}
                 />
               </Tooltip>
               <Tooltip title="Generate SQL">
@@ -404,7 +378,7 @@ export const RoleManagementListPage: React.FC = () => {
           onClose={() => setDrawerRole(null)}
         />
       )}
-      {showModal.type === "edit" && showModal.id && (
+      {showModal.type === 'edit' && showModal.id && (
         <EditModal
           id={showModal.id}
           onClose={handleModalClose}
@@ -413,7 +387,7 @@ export const RoleManagementListPage: React.FC = () => {
           rolePermissionSummary={rolePermissionSummary[showModal.id]}
         />
       )}
-      {showModal.type === "create" && (
+      {showModal.type === 'create' && (
         <CreateModal
           onClose={handleModalClose}
           onSuccess={handleModalSuccess}
@@ -422,7 +396,7 @@ export const RoleManagementListPage: React.FC = () => {
       )}
       <SqlModal
         open={sqlModal.open}
-        onClose={() => setSqlModal({ open: false, title: "", sql: "" })}
+        onClose={() => setSqlModal({ open: false, title: '', sql: '' })}
         title={sqlModal.title}
         sql={sqlModal.sql}
       />

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/role/types.ts

@@ -1,4 +1,4 @@
-import type { ReactNode } from "react";
+import type { ReactNode } from 'react';
 
 export type RolePageTreeNode = {
   title: ReactNode;

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/user/components/create-modal.tsx

@@ -1,6 +1,6 @@
-import React from "react";
+import React from 'react';
 
-import { UserFormModal } from "./form-modal";
+import { UserFormModal } from './form-modal';
 
 interface CreateModalProps {
   onClose: () => void;

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/user/components/edit-modal.tsx

@@ -1,6 +1,6 @@
-import React from "react";
+import React from 'react';
 
-import { UserFormModal } from "./form-modal";
+import { UserFormModal } from './form-modal';
 
 interface EditModalProps {
   id?: number;

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/user/components/form-modal.tsx

@@ -1,20 +1,20 @@
-import React, { useState } from "react";
+import React, { useState } from 'react';
 
-import { useModalForm } from "@refinedev/antd";
-import { type HttpError, type RedirectAction } from "@refinedev/core";
+import { useModalForm } from '@refinedev/antd';
+import { type HttpError, type RedirectAction } from '@refinedev/core';
 
-import { Button, Form, Input, Modal, Select, Space, Switch } from "antd";
-import { ReloadOutlined } from "@ant-design/icons";
+import { Button, Form, Input, Modal, Select, Space, Switch } from 'antd';
+import { ReloadOutlined } from '@ant-design/icons';
 
-import { useRoles } from "@/hooks/useRoles";
-import { User } from "@/types";
+import { useRoles } from '@/hooks/useRoles';
+import { User } from '@/types';
 
-import { UserSelect } from "../queries";
+import { UserSelect } from '../queries';
 
 const generateApiKey = () => crypto.randomUUID();
 
 type Props = {
-  action: "create" | "edit";
+  action: 'create' | 'edit';
   id?: number;
   redirect?: RedirectAction;
   onMutationSuccess?: () => void;
@@ -39,7 +39,7 @@ export const UserFormModal: React.FC<Props> = ({
     HttpError,
     Partial<User>
   >({
-    resource: "user",
+    resource: 'user',
     action,
     id,
     defaultVisible: true,
@@ -55,7 +55,7 @@ export const UserFormModal: React.FC<Props> = ({
   // fix react-query cache data type error
   if (
     formProps.initialValues?.roles &&
-    typeof formProps.initialValues.roles === "string"
+    typeof formProps.initialValues.roles === 'string'
   ) {
     formProps.initialValues.roles = JSON.parse(formProps.initialValues.roles);
   }
@@ -74,7 +74,7 @@ export const UserFormModal: React.FC<Props> = ({
 
   const handleIsApiKeyChange = (checked: boolean) => {
     setIsApiKey(checked);
-    if (checked && !form.getFieldValue("apiKey")) {
+    if (checked && !form.getFieldValue('apiKey')) {
       handleGenerateApiKey();
     }
     if (checked) {
@@ -98,14 +98,18 @@ export const UserFormModal: React.FC<Props> = ({
         //TODO: modalProps.onCancel expect an event so, I used close. Actually both of them are same.
         close();
       }}
-      title={action === "create" ? "Create User" : "Edit User"}
+      title={action === 'create' ? 'Create User' : 'Edit User'}
     >
       <Form {...formProps} layout="vertical">
-        <Form.Item rules={[{ required: true }]} name="userid" label="User ID(WecomId 或者 太湖帐号名)">
+        <Form.Item
+          rules={[{ required: true }]}
+          name="userid"
+          label="User ID(WecomId 或者 太湖帐号名)"
+        >
           <Input
             placeholder="Please enter user ID"
             onChange={(e) => {
-              if (action === "create" && !usernameTouched) {
+              if (action === 'create' && !usernameTouched) {
                 form.setFieldsValue({ username: e.target.value });
               }
             }}
@@ -155,13 +159,15 @@ export const UserFormModal: React.FC<Props> = ({
           <>
             <Form.Item
               label="API Key"
-              rules={[{ required: isApiKey, message: "Please generate API Key" }]}
+              rules={[
+                { required: isApiKey, message: 'Please generate API Key' },
+              ]}
             >
-              <Space.Compact style={{ width: "100%" }}>
+              <Space.Compact style={{ width: '100%' }}>
                 <Form.Item name="apiKey" noStyle>
                   <Input
                     placeholder="Click button to generate API Key"
-                    style={{ fontFamily: "monospace" }}
+                    style={{ fontFamily: 'monospace' }}
                   />
                 </Form.Item>
                 <Button
@@ -169,7 +175,7 @@ export const UserFormModal: React.FC<Props> = ({
                   icon={<ReloadOutlined />}
                   onClick={handleGenerateApiKey}
                 >
-                  {form.getFieldValue("apiKey") ? "Regenerate" : "Generate"}
+                  {form.getFieldValue('apiKey') ? 'Regenerate' : 'Generate'}
                 </Button>
               </Space.Compact>
             </Form.Item>

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/user/components/index.ts

@@ -1,5 +1,5 @@
-export * from "./create-modal";
-export * from "./edit-modal";
-export * from "./form-modal";
-export * from "./role-tag";
-export * from "./show-drawer";
+export * from './create-modal';
+export * from './edit-modal';
+export * from './form-modal';
+export * from './role-tag';
+export * from './show-drawer';

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/user/components/role-tag.tsx

@@ -1,7 +1,7 @@
-import React from "react";
+import React from 'react';
 
-import { CrownOutlined, StarOutlined, UserOutlined } from "@ant-design/icons";
-import { Tag, type TagProps } from "antd";
+import { CrownOutlined, StarOutlined, UserOutlined } from '@ant-design/icons';
+import { Tag, type TagProps } from 'antd';
 
 type Props = {
   role: any;
@@ -10,34 +10,34 @@ type Props = {
 export const RoleTag: React.FC<Props> = ({ role }) => {
   const variants: {
     [key in any]: {
-      color: TagProps["color"];
+      color: TagProps['color'];
       icon: React.ReactNode;
     };
   } = {
     ADMIN: {
-      color: "red",
+      color: 'red',
       icon: <CrownOutlined />,
     },
     SALES_INTERN: {
-      color: "blue",
+      color: 'blue',
       icon: <UserOutlined />,
     },
     SALES_PERSON: {
-      color: "geekblue",
+      color: 'geekblue',
       icon: <UserOutlined />,
     },
     SALES_MANAGER: {
-      color: "cyan",
+      color: 'cyan',
       icon: <StarOutlined />,
     },
   };
 
-  const text = role.replace("_", " ").toLowerCase();
+  const text = role.replace('_', ' ').toLowerCase();
 
   return (
     <Tag
       style={{
-        textTransform: "capitalize",
+        textTransform: 'capitalize',
       }}
       color={variants[role].color}
       icon={variants[role].icon}