Merge pull request #126 from irontec/CDT-188-update-hygen-templates

Fixed hygen templates
irontec · Aug 8, 2024 · 4f6c0ac · 4f6c0ac
2 parents bcb2fe5 + 9b1b595
commit 4f6c0ac
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 17 deletions.
diff --git a/demo/bin/generate-cy-subscreen-test b/demo/bin/generate-cy-subscreen-test
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Example bin/generate-cy-subscreen-test platform client
+node_modules/hygen/dist/bin.js cy subscreen $2 --parent $1 --root demo
+node_modules/hygen/dist/bin.js cy fixtures $2 --root demo
diff --git a/demo/bin/generate-cy-test b/demo/bin/generate-cy-test
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Example bin/generate-cy-test administrator
+node_modules/hygen/dist/bin.js cy new $1 --root demo
+node_modules/hygen/dist/bin.js cy fixtures $1 --root demo
diff --git a/demo/bin/generate-entity b/demo/bin/generate-entity
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Example bin/generate-entity Administrator
+node_modules/hygen/dist/bin.js entity new $1
diff --git a/library/hygen/templates/entity/new/Entity.ejs.t b/library/hygen/templates/entity/new/Entity.ejs.t
@@ -6,7 +6,6 @@ import EntityInterface from '@irontec-voip/ivoz-ui/entities/EntityInterface';
 import _ from '@irontec-voip/ivoz-ui/services/translations/translate';
 import defaultEntityBehavior from '@irontec-voip/ivoz-ui/entities/DefaultEntityBehavior';
 import { EntityValue } from '@irontec-voip/ivoz-ui';
-import selectOptions from './SelectOptions';
 import { <%= Name %>Properties, <%= Name %>PropertyList } from './<%= Name %>Properties';
 
 const properties: <%= Name %>Properties = {
@@ -19,9 +18,13 @@ const <%= Name %>: EntityInterface = {
   iden: '<%= Name %>',
   title: _('<%= Name %>', { count: 2 }),
   path: '/<%= h.inflection.pluralize(name) %>',
-  toStr: (row: <%= Name %>PropertyList<EntityValue>) => row.id.toStr(),
+  toStr: (row: <%= Name %>PropertyList<EntityValue>) => String(row.id),
   properties,
-  selectOptions,
+  selectOptions: async () => {
+    const module = await import('./SelectOptions');
+
+    return module.default;
+  },
   foreignKeyResolver: async () => {
     const module = await import('./ForeignKeyResolver');
 
@@ -30,7 +33,7 @@ const <%= Name %>: EntityInterface = {
   foreignKeyGetter: async () => {
     const module = await import('./ForeignKeyGetter');
 
-    return module.default;
+    return module.foreignKeyGetter;
   },
   Form: async () => {
     const module = await import('./Form');

diff --git a/library/hygen/templates/entity/new/Form.ejs.t b/library/hygen/templates/entity/new/Form.ejs.t
@@ -1,22 +1,12 @@
 ---
 to: src/entities/<%= Name %>/Form.tsx
 ---
-import useFkChoices from '@irontec-voip/ivoz-ui/entities/data/useFkChoices';
-import defaultEntityBehavior, { EntityFormProps, FieldsetGroups } from '@irontec-voip/ivoz-ui/entities/DefaultEntityBehavior';
+import { EntityFormProps, FieldsetGroups } from '@irontec-voip/ivoz-ui/entities/DefaultEntityBehavior';
 import _ from '@irontec-voip/ivoz-ui/services/translations/translate';
 import { Form as DefaultEntityForm } from '@irontec-voip/ivoz-ui/entities/DefaultEntityBehavior/Form';
-import { foreignKeyGetter } from './ForeignKeyGetter';
 
 const Form = (props: EntityFormProps): JSX.Element => {
 
-  const { entityService, row, match } = props;
-  const fkChoices = useFkChoices({
-    foreignKeyGetter,
-    entityService,
-    row,
-    match,
-  });
-
   const groups: Array<FieldsetGroups | false> = [
     {
       legend: _('Main'),
@@ -27,7 +17,7 @@ const Form = (props: EntityFormProps): JSX.Element => {
   ];
 
   return (
-        <DefaultEntityForm {...props} fkChoices={fkChoices} groups={groups} />
+        <DefaultEntityForm {...props} groups={groups} />
   );
 };
 

diff --git a/library/package.json b/library/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@irontec/ivoz-ui",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "UI library used in ivozprovider",
   "license": "GPL-3.0",
   "main": "index.js",