create-cundi-app 1.0.13 → 1.0.16

package/index.js

@@ -44,6 +44,14 @@ async function main() {
         projectName = response.projectName;
     }
 
+    // Ask if samples should be included
+    const { includeSamples } = await prompts({
+        type: "confirm",
+        name: "includeSamples",
+        message: "Include sample pages? (Article, Product, BasicTypeTest, TiptapTest, DrawioTest)",
+        initial: false,
+    });
+
     const targetDir = path.resolve(process.cwd(), projectName);
 
     // Check if directory already exists
@@ -65,6 +73,9 @@ async function main() {
 
     console.log();
     console.log(kleur.blue(`Creating project in ${kleur.bold(targetDir)}...`));
+    if (includeSamples) {
+        console.log(kleur.gray("Including sample pages..."));
+    }
     console.log();
 
     // Copy template files
@@ -73,12 +84,39 @@ async function main() {
     try {
         await fs.copy(templateDir, targetDir, {
             filter: (src) => {
-                // Skip node_modules and dist if they exist
                 const relativePath = path.relative(templateDir, src);
-                return !relativePath.includes("node_modules") && !relativePath.includes("dist");
+                // Skip node_modules and dist if they exist
+                if (relativePath.includes("node_modules") || relativePath.includes("dist")) {
+                    return false;
+                }
+                // Skip samples if not requested
+                if (!includeSamples && relativePath.includes("pages/samples")) {
+                    return false;
+                }
+                // Skip the alternative version files (they will be handled separately)
+                if (relativePath.endsWith(".no-samples.tsx") || relativePath.endsWith(".no-samples.ts")) {
+                    return false;
+                }
+                return true;
             },
         });
 
+        // Handle App.tsx and i18n.ts based on sample choice
+        if (!includeSamples) {
+            // If not including samples, use the no-samples versions
+            const appNoSamplesPath = path.join(templateDir, "src/App.no-samples.tsx");
+            const appPath = path.join(targetDir, "src/App.tsx");
+            if (fs.existsSync(appNoSamplesPath)) {
+                await fs.copy(appNoSamplesPath, appPath, { overwrite: true });
+            }
+
+            const i18nNoSamplesPath = path.join(templateDir, "src/i18n.no-samples.ts");
+            const i18nPath = path.join(targetDir, "src/i18n.ts");
+            if (fs.existsSync(i18nNoSamplesPath)) {
+                await fs.copy(i18nNoSamplesPath, i18nPath, { overwrite: true });
+            }
+        }
+
         // Generate package.json with project name
         const pkgTemplatePath = path.join(targetDir, "package.json.template");
         const pkgTargetPath = path.join(targetDir, "package.json");
@@ -96,7 +134,7 @@ async function main() {
             await fs.writeFile(
                 envExamplePath,
                 `# API Configuration
-VITE_API_URL=http://localhost:5000/api
+VITE_API_URL=http://localhost:5000
 
 # Keycloak Configuration (Optional)
 VITE_KEYCLOAK_URL=http://localhost:8080
@@ -129,6 +167,10 @@ VITE_REDIRECT_URI=http://localhost:5173/auth/callback
         // console.log(`  ${kleur.gray("$")} cp .env.example .env  ${kleur.gray("# Configure your environment")}`);
         console.log(`  ${kleur.gray("$")} npm run dev`);
         console.log();
+        if (includeSamples) {
+            console.log(kleur.yellow("Note: Sample pages are included. Make sure your backend has the corresponding Business Objects."));
+            console.log();
+        }
         console.log(kleur.gray("────────────────────────────────────"));
         console.log(kleur.blue("Happy coding! 🎉"));
         console.log();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cundi-app",
-  "version": "1.0.13",
+  "version": "1.0.16",
   "description": "Create a new Cundi app with React + Refine + Ant Design",
   "type": "module",
   "bin": {
@@ -11,7 +11,7 @@
     "template"
   ],
   "scripts": {
-    "pack": "npm pack --pack-destination ../../output/npm"
+    "pack": "node sync-version.js && npm pack --pack-destination ../../output/npm"
   },
   "keywords": [
     "create",

package/template/.env.example

@@ -1,5 +1,5 @@
 # API Configuration
-VITE_API_URL=http://localhost:5000/api
+VITE_API_URL=http://localhost:5000
 
 # Keycloak Configuration (Optional)
 VITE_KEYCLOAK_URL=http://localhost:8080

package/template/package.json.template

@@ -24,7 +24,7 @@
   "dependencies": {
     "@ant-design/icons": "^5.5.1",
     "@ant-design/v5-patch-for-react-19": "^1.0.3",
-    "@cundi/refine-xaf": "^1.0.11",
+    "@cundi/refine-xaf": "^1.0.14",
     "@refinedev/antd": "^6.0.3",
     "@refinedev/cli": "^2.16.50",
     "@refinedev/core": "^5.0.6",

package/template/src/App.no-samples.tsx

@@ -0,0 +1,249 @@
+import {
+    Refine,
+    Authenticated,
+} from "@refinedev/core";
+import {
+    useNotificationProvider,
+    ThemedLayout,
+    ErrorComponent,
+} from "@refinedev/antd";
+import {
+    DashboardOutlined,
+    UserOutlined,
+    SettingOutlined,
+    TeamOutlined,
+    FieldTimeOutlined,
+    ThunderboltOutlined,
+    CopyOutlined,
+} from "@ant-design/icons";
+import routerProvider, {
+    NavigateToResource,
+    CatchAllNavigate,
+    UnsavedChangesNotifier,
+    DocumentTitleHandler,
+} from "@refinedev/react-router";
+import { BrowserRouter, Routes, Route, Outlet } from "react-router";
+import { App as AntdApp } from "antd";
+import { useTranslation } from "react-i18next";
+import "./i18n";
+
+import "@ant-design/v5-patch-for-react-19";
+import "@refinedev/antd/dist/reset.css";
+
+import { DashboardPage } from "./pages/dashboard";
+import {
+    authProvider,
+    dataProvider,
+    Header,
+    LoginPage,
+    KeycloakLoginPage,
+    AuthCallback,
+    ApplicationUserList,
+    ApplicationUserCreate,
+    ApplicationUserEdit,
+    RoleList,
+    RoleCreate,
+    RoleEdit,
+    ColorModeContextProvider,
+    BackgroundJobList,
+    TriggerRuleList,
+    TriggerRuleCreate,
+    TriggerRuleEdit,
+    TriggerLogList,
+    MirrorTypeMappingConfigList,
+    MirrorTypeMappingConfigCreate,
+    MirrorTypeMappingConfigEdit,
+} from "@cundi/refine-xaf";
+
+import { accessControlProvider } from "./accessControlProvider";
+
+const API_URL = import.meta.env.VITE_API_URL + "/api/odata";
+
+const InnerApp: React.FC = () => {
+    const { t, i18n } = useTranslation();
+
+    const i18nProvider = {
+        translate: (key: string, params: any) => t(key, params) as string,
+        changeLocale: (lang: string) => i18n.changeLanguage(lang),
+        getLocale: () => i18n.language,
+    };
+
+    return (
+        <BrowserRouter>
+            <AntdApp>
+                <Refine
+                    authProvider={authProvider}
+                    accessControlProvider={accessControlProvider}
+                    dataProvider={{ default: dataProvider(API_URL) }}
+                    i18nProvider={i18nProvider}
+                    routerProvider={routerProvider}
+                    resources={[
+                        {
+                            name: "dashboard",
+                            list: "/",
+                            meta: {
+                                label: t("sider.dashboard"),
+                                icon: <DashboardOutlined />,
+                            },
+                        },
+                        {
+                            name: "ApplicationUser",
+                            list: "/ApplicationUsers",
+                            create: "/ApplicationUsers/create",
+                            edit: "/ApplicationUsers/edit/:id",
+                            meta: {
+                                label: t("sider.users"),
+                                icon: <UserOutlined />,
+                                parent: "Settings",
+                            },
+                        },
+                        {
+                            name: "PermissionPolicyRole",
+                            list: "/PermissionPolicyRoles",
+                            create: "/PermissionPolicyRoles/create",
+                            edit: "/PermissionPolicyRoles/edit/:id",
+                            meta: {
+                                label: t("sider.roles"),
+                                parent: "Settings",
+                                icon: <TeamOutlined />,
+                            },
+                        },
+                        {
+                            name: "BackgroundJobs",
+                            list: "/background-jobs",
+                            meta: {
+                                label: t("sider.backgroundJobs"),
+                                icon: <FieldTimeOutlined />,
+                                parent: "Settings",
+                            },
+                        },
+                        {
+                            name: "TriggerRule",
+                            list: "/TriggerRules",
+                            create: "/TriggerRules/create",
+                            edit: "/TriggerRules/edit/:id",
+                            meta: {
+                                label: t("sider.triggerRules"),
+                                parent: "Settings",
+                                icon: <ThunderboltOutlined />,
+                            },
+                        },
+                        {
+                            name: "TriggerLog",
+                            list: "/TriggerLogs",
+                            meta: {
+                                label: t("sider.triggerLogs"),
+                                parent: "Settings",
+                                icon: <ThunderboltOutlined />,
+                            },
+                        },
+                        {
+                            name: "MirrorTypeMappingConfig",
+                            list: "/MirrorTypeMappingConfigs",
+                            create: "/MirrorTypeMappingConfigs/create",
+                            edit: "/MirrorTypeMappingConfigs/edit/:id",
+                            meta: {
+                                label: t("sider.mirrorConfigs"),
+                                parent: "Settings",
+                                icon: <CopyOutlined />,
+                            },
+                        },
+                        {
+                            name: "Settings",
+                            meta: {
+                                label: t("sider.settings"),
+                                icon: <SettingOutlined />,
+                            },
+                        },
+                    ]}
+                    notificationProvider={useNotificationProvider}
+                    options={{
+                        syncWithLocation: true,
+                        warnWhenUnsavedChanges: true,
+                    }}
+                >
+                    <Routes>
+                        <Route
+                            element={
+                                <Authenticated
+                                    key="authenticated-routes"
+                                    fallback={<CatchAllNavigate to="/login" />}
+                                >
+                                    <ThemedLayout Header={Header}>
+                                        <Outlet />
+                                    </ThemedLayout>
+                                </Authenticated>
+                            }
+                        >
+                            <Route index element={<DashboardPage />} />
+
+                            <Route path="/ApplicationUsers">
+                                <Route index element={<ApplicationUserList />} />
+                                <Route path="create" element={<ApplicationUserCreate />} />
+                                <Route path="edit/:id" element={<ApplicationUserEdit />} />
+                            </Route>
+
+                            <Route path="/PermissionPolicyRoles">
+                                <Route index element={<RoleList />} />
+                                <Route path="create" element={<RoleCreate />} />
+                                <Route path="edit/:id" element={<RoleEdit />} />
+                            </Route>
+
+                            <Route path="/background-jobs" element={<BackgroundJobList title={t("sider.backgroundJobs")} />} />
+
+                            <Route path="/TriggerRules">
+                                <Route index element={<TriggerRuleList />} />
+                                <Route path="create" element={<TriggerRuleCreate />} />
+                                <Route path="edit/:id" element={<TriggerRuleEdit />} />
+                            </Route>
+                            <Route path="/TriggerLogs">
+                                <Route index element={<TriggerLogList />} />
+                            </Route>
+                            <Route path="/MirrorTypeMappingConfigs">
+                                <Route index element={<MirrorTypeMappingConfigList />} />
+                                <Route path="create" element={<MirrorTypeMappingConfigCreate />} />
+                                <Route path="edit/:id" element={<MirrorTypeMappingConfigEdit />} />
+                            </Route>
+                        </Route>
+
+                        <Route
+                            element={
+                                <Authenticated key="auth-pages" fallback={<Outlet />}>
+                                    <NavigateToResource resource="dashboard" />
+                                </Authenticated>
+                            }
+                        >
+                            <Route path="/login" element={<KeycloakLoginPage />} />
+                            <Route path="/login/api" element={<LoginPage />} />
+                            <Route path="/auth/callback" element={<AuthCallback />} />
+                        </Route>
+
+                        <Route
+                            element={
+                                <Authenticated key="catch-all">
+                                    <ThemedLayout Header={Header}>
+                                        <Outlet />
+                                    </ThemedLayout>
+                                </Authenticated>
+                            }
+                        >
+                            <Route path="*" element={<ErrorComponent />} />
+                        </Route>
+                    </Routes>
+                    <UnsavedChangesNotifier />
+                    <DocumentTitleHandler />
+                </Refine>
+            </AntdApp>
+        </BrowserRouter>
+    );
+};
+
+const App: React.FC = () => {
+    return (
+        <ColorModeContextProvider>
+            <InnerApp />
+        </ColorModeContextProvider>
+    );
+};
+
+export default App;

package/template/src/App.tsx

@@ -15,6 +15,7 @@ import {
     FieldTimeOutlined,
     ThunderboltOutlined,
     CopyOutlined,
+    AppstoreOutlined,
 } from "@ant-design/icons";
 import routerProvider, {
     NavigateToResource,
@@ -57,7 +58,26 @@ import {
 
 import { accessControlProvider } from "./accessControlProvider";
 
-const API_URL = import.meta.env.VITE_API_URL + "/odata";
+// Sample pages
+import { ArticleList } from "./pages/samples/article/list";
+import { ArticleCreate } from "./pages/samples/article/create";
+import { ArticleEdit } from "./pages/samples/article/edit";
+import { ProductList } from "./pages/samples/product/list";
+import { ProductCreate } from "./pages/samples/product/create";
+import { ProductEdit } from "./pages/samples/product/edit";
+import { BasicTypeTestList } from "./pages/samples/basic-type-test/list";
+import { BasicTypeTestCreate } from "./pages/samples/basic-type-test/create";
+import { BasicTypeTestEdit } from "./pages/samples/basic-type-test/edit";
+import { TiptapTestList } from "./pages/samples/tiptap-test/list";
+import { TiptapTestCreate } from "./pages/samples/tiptap-test/create";
+import { TiptapTestEdit } from "./pages/samples/tiptap-test/edit";
+import { TiptapTestShow } from "./pages/samples/tiptap-test/show";
+import { DrawioTestList } from "./pages/samples/drawio-test/list";
+import { DrawioTestCreate } from "./pages/samples/drawio-test/create";
+import { DrawioTestEdit } from "./pages/samples/drawio-test/edit";
+import { DrawioTestShow } from "./pages/samples/drawio-test/show";
+
+const API_URL = import.meta.env.VITE_API_URL + "/api/odata";
 
 const InnerApp: React.FC = () => {
     const { t, i18n } = useTranslation();
@@ -74,7 +94,7 @@ const InnerApp: React.FC = () => {
                 <Refine
                     authProvider={authProvider}
                     accessControlProvider={accessControlProvider}
-                    dataProvider={dataProvider(API_URL)}
+                    dataProvider={{ default: dataProvider(API_URL) }}
                     i18nProvider={i18nProvider}
                     routerProvider={routerProvider}
                     resources={[
@@ -86,6 +106,81 @@ const InnerApp: React.FC = () => {
                                 icon: <DashboardOutlined />,
                             },
                         },
+                        // Sample resources
+                        {
+                            name: "Samples",
+                            meta: {
+                                label: t("sider.samples"),
+                                icon: <AppstoreOutlined />,
+                            },
+                        },
+                        {
+                            name: "Model",
+                            meta: {
+                                label: t("sider.model"),
+                                parent: "Samples",
+                            },
+                        },
+                        {
+                            name: "BasicTypeTest",
+                            list: "/BasicTypeTests",
+                            create: "/BasicTypeTests/create",
+                            edit: "/BasicTypeTests/edit/:id",
+                            meta: {
+                                label: t("sider.basicTypeTest"),
+                                parent: "Model",
+                            },
+                        },
+                        {
+                            name: "TiptapTest",
+                            list: "/TiptapTests",
+                            create: "/TiptapTests/create",
+                            edit: "/TiptapTests/edit/:id",
+                            show: "/TiptapTests/show/:id",
+                            meta: {
+                                label: t("sider.tiptapTest"),
+                                parent: "Model",
+                            },
+                        },
+                        {
+                            name: "DrawioTest",
+                            list: "/DrawioTests",
+                            create: "/DrawioTests/create",
+                            edit: "/DrawioTests/edit/:id",
+                            show: "/DrawioTests/show/:id",
+                            meta: {
+                                label: t("sider.drawioTest"),
+                                parent: "Model",
+                            },
+                        },
+                        {
+                            name: "FullTextSearch",
+                            meta: {
+                                label: t("sider.fullTextSearch"),
+                                parent: "Samples",
+                            },
+                        },
+                        {
+                            name: "Article",
+                            list: "/Articles",
+                            create: "/Articles/create",
+                            edit: "/Articles/edit/:id",
+                            meta: {
+                                label: t("types.Article"),
+                                parent: "FullTextSearch",
+                            },
+                        },
+                        {
+                            name: "Product",
+                            list: "/Products",
+                            create: "/Products/create",
+                            edit: "/Products/edit/:id",
+                            meta: {
+                                label: t("types.Product"),
+                                parent: "FullTextSearch",
+                            },
+                        },
+                        // Core resources
                         {
                             name: "ApplicationUser",
                             list: "/ApplicationUsers",
@@ -94,7 +189,7 @@ const InnerApp: React.FC = () => {
                             meta: {
                                 label: t("sider.users"),
                                 icon: <UserOutlined />,
-                                parent: t("sider.settings"),
+                                parent: "Settings",
                             },
                         },
                         {
@@ -104,7 +199,7 @@ const InnerApp: React.FC = () => {
                             edit: "/PermissionPolicyRoles/edit/:id",
                             meta: {
                                 label: t("sider.roles"),
-                                parent: t("sider.settings"),
+                                parent: "Settings",
                                 icon: <TeamOutlined />,
                             },
                         },
@@ -114,7 +209,7 @@ const InnerApp: React.FC = () => {
                             meta: {
                                 label: t("sider.backgroundJobs"),
                                 icon: <FieldTimeOutlined />,
-                                parent: t("sider.settings"),
+                                parent: "Settings",
                             },
                         },
                         {
@@ -124,7 +219,7 @@ const InnerApp: React.FC = () => {
                             edit: "/TriggerRules/edit/:id",
                             meta: {
                                 label: t("sider.triggerRules"),
-                                parent: t("sider.settings"),
+                                parent: "Settings",
                                 icon: <ThunderboltOutlined />,
                             },
                         },
@@ -133,7 +228,7 @@ const InnerApp: React.FC = () => {
                             list: "/TriggerLogs",
                             meta: {
                                 label: t("sider.triggerLogs"),
-                                parent: t("sider.settings"),
+                                parent: "Settings",
                                 icon: <ThunderboltOutlined />,
                             },
                         },
@@ -144,7 +239,7 @@ const InnerApp: React.FC = () => {
                             edit: "/MirrorTypeMappingConfigs/edit/:id",
                             meta: {
                                 label: t("sider.mirrorConfigs"),
-                                parent: t("sider.settings"),
+                                parent: "Settings",
                                 icon: <CopyOutlined />,
                             },
                         },
@@ -177,6 +272,40 @@ const InnerApp: React.FC = () => {
                         >
                             <Route index element={<DashboardPage />} />
 
+                            {/* Sample routes */}
+                            <Route path="/Articles">
+                                <Route index element={<ArticleList />} />
+                                <Route path="create" element={<ArticleCreate />} />
+                                <Route path="edit/:id" element={<ArticleEdit />} />
+                            </Route>
+
+                            <Route path="/Products">
+                                <Route index element={<ProductList />} />
+                                <Route path="create" element={<ProductCreate />} />
+                                <Route path="edit/:id" element={<ProductEdit />} />
+                            </Route>
+
+                            <Route path="/BasicTypeTests">
+                                <Route index element={<BasicTypeTestList />} />
+                                <Route path="create" element={<BasicTypeTestCreate />} />
+                                <Route path="edit/:id" element={<BasicTypeTestEdit />} />
+                            </Route>
+
+                            <Route path="/TiptapTests">
+                                <Route index element={<TiptapTestList />} />
+                                <Route path="create" element={<TiptapTestCreate />} />
+                                <Route path="edit/:id" element={<TiptapTestEdit />} />
+                                <Route path="show/:id" element={<TiptapTestShow />} />
+                            </Route>
+
+                            <Route path="/DrawioTests">
+                                <Route index element={<DrawioTestList />} />
+                                <Route path="create" element={<DrawioTestCreate />} />
+                                <Route path="edit/:id" element={<DrawioTestEdit />} />
+                                <Route path="show/:id" element={<DrawioTestShow />} />
+                            </Route>
+
+                            {/* Core routes */}
                             <Route path="/ApplicationUsers">
                                 <Route index element={<ApplicationUserList />} />
                                 <Route path="create" element={<ApplicationUserCreate />} />

package/template/src/accessControlProvider.ts

@@ -11,8 +11,8 @@ const ADMIN_ONLY_RESOURCES = ["ApplicationUser", "PermissionPolicyRole", "Settin
  */
 export const accessControlProvider: AccessControlProvider = {
     can: async ({ resource, action, params }) => {
-        const isAdmin = localStorage.getItem("user_is_admin") === "true";
-        const roles = JSON.parse(localStorage.getItem("user_roles") || "[]") as string[];
+        const isAdmin = (localStorage.getItem("user_is_admin") || sessionStorage.getItem("user_is_admin")) === "true";
+        const roles = JSON.parse(localStorage.getItem("user_roles") || sessionStorage.getItem("user_roles") || "[]") as string[];
 
         // Admin-only resources check
         if (resource && ADMIN_ONLY_RESOURCES.includes(resource) && !isAdmin) {

package/template/src/i18n.no-samples.ts

@@ -0,0 +1,49 @@
+import i18n from "i18next";
+import { initReactI18next } from "react-i18next";
+import LanguageDetector from "i18next-browser-languagedetector";
+import { refineXafTranslations } from "@cundi/refine-xaf";
+
+// Use translations from the SDK
+const { en, "zh-TW": zhTW } = refineXafTranslations;
+
+const enExtended = {
+    ...en,
+    sider: {
+        ...((en as any).sider || {}),
+        triggerRules: "Trigger Rules",
+        triggerLogs: "Trigger Logs",
+        mirrorConfigs: "Mirror Configs",
+    },
+};
+
+const zhTWExtended = {
+    ...zhTW,
+    sider: {
+        ...((zhTW as any).sider || {}),
+        triggerRules: "觸發規則",
+        triggerLogs: "觸發紀錄",
+        mirrorConfigs: "鏡射設定",
+    },
+};
+
+i18n
+    .use(LanguageDetector)
+    .use(initReactI18next)
+    .init({
+        resources: {
+            en: {
+                translation: enExtended,
+            },
+            "zh-TW": {
+                translation: zhTWExtended,
+            },
+        },
+        lng: "zh-TW", // Default language
+        fallbackLng: "en",
+        debug: false,
+        interpolation: {
+            escapeValue: false,
+        },
+    });
+
+export default i18n;