@postxl/generator 0.56.7 → 0.57.0

package/dist/generator.js

@@ -67,6 +67,7 @@ const selectors_generator_1 = require("./generators/indices/selectors.generator"
 const stubs_generator_1 = require("./generators/indices/stubs.generator");
 const testdata_service_generator_1 = require("./generators/indices/testdata-service.generator");
 const types_generator_2 = require("./generators/indices/types.generator");
+const admin_page_generator_1 = require("./generators/models/admin.page.generator");
 const businesslogic_update_generator_1 = require("./generators/models/businesslogic-update.generator");
 const businesslogic_view_generator_1 = require("./generators/models/businesslogic-view.generator");
 const importexport_decoder_generator_1 = require("./generators/models/importexport-decoder.generator");
@@ -98,6 +99,7 @@ const CONFIG_SCHEMA = zod_1.z
     trpcRoutesFolder: zod_1.z.string().optional(),
     reactFolderOutput: zod_1.z.string().optional(),
     prismaMigrationsFolder: zod_1.z.string().optional(),
+    pathToAdminPages: zod_1.z.string().optional(),
     randomSeed: zod_1.z
         .string()
         .optional()
@@ -123,6 +125,7 @@ const CONFIG_SCHEMA = zod_1.z
             seedDataPath: (0, types_1.toPath)(s.pathToSeedData || './backend/seed-data/src/'),
             seedLibPath: (0, types_1.toPath)(s.pathToSeedLib || './backend/libs/seed/src/'),
             trpcRoutesFolderPath: (0, types_1.toPath)(s.trpcRoutesFolder || './backend/libs/trpc/src/routes/'),
+            adminPagesFolderPath: (0, types_1.toPath)(s.pathToAdminPages || './web/src/pages/admin/'),
         },
         randomSeed: s.randomSeed,
         force: s.force,
@@ -191,6 +194,8 @@ function generate({ models, enums, config, prismaClientPath, logger, }) {
             generated.write(`/${meta.trpc.routerFilePath}.ts`, (0, route_generator_1.generateRoute)({ model, meta }));
             // React
             yield generated.copy((0, react_generator_2.generateReactComponentsForModel)({ model, meta }), meta.react.folderPath);
+            // Admin
+            generated.write(`/${meta.admin.filePath}.tsx`, (0, admin_page_generator_1.generateAdminPage)({ meta }));
             logger.log(`- ${model.name} processed`);
         }
         // Generate Enums

package/dist/generators/models/admin.page.generator.d.ts

@@ -0,0 +1,7 @@
+import { ModelMetaData } from '../../lib/meta';
+/**
+ * returns an admin page for a given model.
+ */
+export declare function generateAdminPage({ meta }: {
+    meta: ModelMetaData;
+}): string;

package/dist/generators/models/admin.page.generator.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateAdminPage = void 0;
+const imports_1 = require("../../lib/imports");
+/**
+ * returns an admin page for a given model.
+ */
+function generateAdminPage({ meta }) {
+    const { react } = meta;
+    const imports = imports_1.ImportsGenerator.from(meta.admin.filePath).addImport({
+        items: [react.components.libraryComponentName, react.components.modals.createComponentName],
+        from: meta.react.importPath,
+    });
+    return `
+import styled from 'styled-components'
+
+import { ActionWrapper, ActionsBarWrapper, Search, Spacer } from '@components/atoms/ActionsBar'
+import { Button } from '@components/atoms/Button'
+import { Headline } from '@components/atoms/Headline'
+
+${imports.generate()}
+
+import { Content, Layout } from '@components/shared/Layout'
+import { t } from '@i18n/translation'
+import { useState } from 'react'
+
+export default function Admin${meta.internalSingularNameCapitalized}Page() {
+  const [query, setQuery] = useState('')
+  const [isCreateModalOpen, setIsCreateModalOpen] = useState(false)
+
+  return (
+    <Layout>
+        <Header>
+          <Headline label="${meta.userFriendlyName}" />
+          <ActionsBarWrapper>
+            <Search
+              key="Search"
+              placeholder="Search ${meta.userFriendlyNamePlural}"
+              icon="magnifying-glass"
+              value={query}
+              onChange={(e) => setQuery(e.target.value)}
+            />
+
+            <Spacer key="Spacer" />
+
+            <ActionWrapper key="GlobalFilter">
+              <Button label={t['Create']} icon="plus" fill="fill" __cypress_selector__="indexPage-buttons-create" onClick={() => setIsCreateModalOpen(true)}/>
+            </ActionWrapper>
+          </ActionsBarWrapper>
+        </Header>
+
+        <Content>
+            <${meta.react.components.libraryComponentName} />
+        </Content>
+
+        <${meta.react.components.modals.createComponentName} 
+            show={isCreateModalOpen} 
+            onHide={() => setIsCreateModalOpen(false)} 
+        />
+      </Layout>
+    )
+}
+
+const Header = styled.header\`
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+
+  gap: var(--headline-spacing);
+\`
+`;
+}
+exports.generateAdminPage = generateAdminPage;

package/dist/generators/models/businesslogic-update.generator.js

@@ -188,7 +188,7 @@ function generateModelBusinessLogicUpdate({ model, meta }) {
      */
     export const ${zodCloneObject} = z.object({
       ${model.fields
-        .filter((f) => !f.attributes.isReadonly && f.kind !== "relation" || f.kind === 'id')
+        .filter((f) => !f.attributes.isReadonly || f.kind === "id")
         .map((f) => `${f.name}: z.${(0, zod_1.getZodDecoderDefinition)({ field: f, allowAnyOptionalField: f.kind !== 'id' })}`)
         .join(',')}
     })
@@ -333,11 +333,11 @@ function generateCloneMethod({ model, meta, m }) {
         const refModelMeta = (0, meta_1.getModelMetadata)({ model: referencingModel });
         const refFieldMeta = (0, meta_1.getFieldMetadata)({ field: referencingField });
         backReferenceNames.push(`${refModelMeta.userFriendlyNamePlural}.${referencingField.name}`);
+        const { view, update } = refModelMeta.businessLogic;
         backReferenceCloning.push(`
       // ${referencingModel.name}.${referencingField.name}
-      for (const childId of await this.viewService.${refModelMeta.businessLogic.view.serviceVariableName}.data.${refFieldMeta.getByForeignKeyIdsMethodFnName}(id)) {
-        const clonedChild = await this.updateService.${refModelMeta.businessLogic.update.serviceVariableName}.clone({ data: { id: childId }, execution})
-        await this.updateService.${refModelMeta.businessLogic.update.serviceVariableName}.update({ data: { id: clonedChild.id, ${referencingField.name}: clone.id }, execution })
+      for (const childId of await this.viewService.${view.serviceVariableName}.data.${refFieldMeta.getByForeignKeyIdsMethodFnName}(id)) {
+        await this.updateService.${update.serviceVariableName}.clone({ data: { id: childId, ${referencingField.name}: clone.id }, execution })
       }
     `);
     }
@@ -351,7 +351,7 @@ function generateCloneMethod({ model, meta, m }) {
       throw new Error(\`${meta.userFriendlyName} with id \${id} not found\`)
     }
 
-    const clone = await this.create({ data: { ...omitId(source), ...data }, execution })
+    const clone = await this.data.create({ item: { ...omitId(source), ...data }, execution })
 
     ${backReferenceCloning.join('\n')}
 

package/dist/lib/meta.d.ts

@@ -993,6 +993,10 @@ export type ModelMetaData = {
          * The path to the folder that contains React components for this model.
          */
         folderPath: Types.FilePath;
+        /**
+         * Globally accessible import path for the model's React components.
+         */
+        importPath: Types.FilePath;
         context: {
             /**
              * Name of the function that should be used as React hook (e.g. `useAggregationContext`).
@@ -1087,6 +1091,15 @@ export type ModelMetaData = {
             reactQueryMethod: Types.FunctionName;
         };
     };
+    /**
+     * Properties provided by the `admin.page` generators.
+     */
+    admin: {
+        /**
+         * The absolute file path of the admin page for this model.
+         */
+        filePath: Types.FilePath;
+    };
     /**
      * Properties provided by the `types` generators.
      */

package/dist/lib/meta.js

@@ -358,6 +358,7 @@ function getModelMetadata({ model }) {
         react: {
             folderName: Types.toFolderName(`${PascalCase}`),
             folderPath: Types.toPath(`${config.paths.reactFolderPath}models/${PascalCase}/`),
+            importPath: Types.toPath(`@components/models/${PascalCase}`),
             context: {
                 hookFnName: Types.toFunctionName(`use${PascalCase}Context`),
                 instanceGetterHookFnName: Types.toFunctionName(`use${PascalCase}`),
@@ -402,6 +403,9 @@ function getModelMetadata({ model }) {
                 reactQueryMethod: Types.toFunctionName(`${uncapitalizedPlural}.delete`),
             },
         },
+        admin: {
+            filePath: Types.toPath(`${config.paths.adminPagesFolderPath}/${uncapitalized}`),
+        },
         types: {
             importPath: Types.toBackendModulePath(`@backend/types`),
             filePath: Types.toPath(`${config.paths.modelTypeDefinitionsPath}${camelCase}.type`),

package/dist/lib/schema/schema.d.ts

@@ -87,6 +87,10 @@ export type SchemaConfig = {
          * Path to the directory containing trpc routes.
          */
         trpcRoutesFolderPath: Types.FilePath;
+        /**
+         * Path to the directory containing admin pages.
+         */
+        adminPagesFolderPath: Types.FilePath;
     };
     /**
      * Whether the generator should overwrite existing files.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/generator",
-  "version": "0.56.7",
+  "version": "0.57.0",
   "main": "./dist/generator.js",
   "typings": "./dist/generator.d.ts",
   "bin": {