@irontec/ivoz-ui 1.4.0 → 1.4.2

package/hygen/templates/entity/new/Entity.ejs.t

@@ -2,11 +2,10 @@
 to: src/entities/<%= Name %>/<%= Name %>.tsx
 ---
 import AccountTreeIcon from '@mui/icons-material/AccountTree';
-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 EntityInterface from '@irontec/ivoz-ui/entities/EntityInterface';
+import _ from '@irontec/ivoz-ui/services/translations/translate';
+import defaultEntityBehavior from '@irontec/ivoz-ui/entities/DefaultEntityBehavior';
+import { EntityValue } from '@irontec/ivoz-ui';
 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');

package/hygen/templates/entity/new/EntityProperties.ejs.t

@@ -1,8 +1,8 @@
 ---
 to: src/entities/<%= Name %>/<%= Name %>Properties.ts
 ---
-import { PropertySpec } from '@irontec-voip/ivoz-ui/services/api/ParsedApiSpecInterface';
-import { EntityValue, EntityValues } from '@irontec-voip/ivoz-ui/services/entity/EntityService';
+import { PropertySpec } from '@irontec/ivoz-ui/services/api/ParsedApiSpecInterface';
+import { EntityValue, EntityValues } from '@irontec/ivoz-ui/services/entity/EntityService';
 
 export type <%= Name %>PropertyList<T> = {
 <%- h.formattedEntityProperties(h.url(), Name)%>

package/hygen/templates/entity/new/ForeignKeyGetter.ejs.t

@@ -1,8 +1,8 @@
 ---
 to: src/entities/<%= Name %>/ForeignKeyGetter.tsx
 ---
-import { ForeignKeyGetterType } from '@irontec-voip/ivoz-ui/entities/EntityInterface';
-import { autoSelectOptions } from '@irontec-voip/ivoz-ui/entities/DefaultEntityBehavior';
+import { ForeignKeyGetterType } from '@irontec/ivoz-ui/entities/EntityInterface';
+import { autoSelectOptions } from '@irontec/ivoz-ui/entities/DefaultEntityBehavior';
 import { <%= Name %>PropertyList } from './<%= Name %>Properties';
 
 /** TODO remove this file unless you need to change default behaviour **/

package/hygen/templates/entity/new/ForeignKeyResolver.ejs.t

@@ -1,8 +1,8 @@
 ---
 to: src/entities/<%= Name %>/ForeignKeyResolver.tsx
 ---
-import { autoForeignKeyResolver } from '@irontec-voip/ivoz-ui/entities/DefaultEntityBehavior';
-import { foreignKeyResolverType } from '@irontec-voip/ivoz-ui/entities/EntityInterface';
+import { autoForeignKeyResolver } from '@irontec/ivoz-ui/entities/DefaultEntityBehavior';
+import { foreignKeyResolverType } from '@irontec/ivoz-ui/entities/EntityInterface';
 import { <%= Name %>PropertiesList } from './<%= Name %>Properties';
 
 /** TODO remove this file unless you need to change default behaviour **/

package/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 _ from '@irontec-voip/ivoz-ui/services/translations/translate';
-import { Form as DefaultEntityForm } from '@irontec-voip/ivoz-ui/entities/DefaultEntityBehavior/Form';
-import { foreignKeyGetter } from './ForeignKeyGetter';
+import { EntityFormProps, FieldsetGroups } from '@irontec/ivoz-ui/entities/DefaultEntityBehavior';
+import _ from '@irontec/ivoz-ui/services/translations/translate';
+import { Form as DefaultEntityForm } from '@irontec/ivoz-ui/entities/DefaultEntityBehavior/Form';
 
 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} />
   );
 };
 

package/hygen/templates/entity/new/SelectOptions.ejs.t

@@ -1,10 +1,10 @@
 ---
 to: src/entities/<%= Name %>/SelectOptions.ts
 ---
-import defaultEntityBehavior from '@irontec-voip/ivoz-ui/entities/DefaultEntityBehavior';
-import { SelectOptionsType } from '@irontec-voip/ivoz-ui/entities/EntityInterface';
+import defaultEntityBehavior from '@irontec/ivoz-ui/entities/DefaultEntityBehavior';
+import { SelectOptionsType } from '@irontec/ivoz-ui/entities/EntityInterface';
 import { <%= Name %>PropertiesList } from './<%= Name %>Properties';
-import { DropdownChoices } from '@irontec-voip/ivoz-ui';
+import { DropdownChoices } from '@irontec/ivoz-ui';
 import store from 'store';
 
 const <%= Name %>SelectOptions: SelectOptionsType = ({ callback, cancelToken }): Promise<unknown> => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@irontec/ivoz-ui",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "UI library used in ivozprovider",
   "license": "GPL-3.0",
   "main": "index.js",