Updated demo portal

demo/src/entities/Client/Client.tsx

@@ -159,6 +159,11 @@ const client: EntityInterface = {
  Form: async () => {
  const module = await import('./Form');
 
+ return module.default;
+ },
+ View: async () => {
+ const module = await import('./View');
+
  return module.default;
  },
 };

demo/src/entities/Client/Form.tsx

@@ -1,4 +1,3 @@
-import useFkChoices from '@irontec/ivoz-ui/entities/data/useFkChoices';
 import {
  EntityFormProps,
  FieldsetGroups,
@@ -7,19 +6,12 @@ import { Form as DefaultEntityForm } from '@irontec/ivoz-ui/entities/DefaultEnti
 import { useFormHandler } from '@irontec/ivoz-ui/entities/DefaultEntityBehavior/Form/useFormHandler';
 import _ from '@irontec/ivoz-ui/services/translations/translate';
 
-import { foreignKeyGetter } from './ForeignKeyGetter';
 import useShowRemoteId from './hooks/useShowRemoteId';
 
 const Form = (props: EntityFormProps): JSX.Element => {
- const { entityService, row, match, create, filterBy } = props;
+ const { match, create, filterBy } = props;
 
  const formik = useFormHandler(props);
- const fkChoices = useFkChoices({
- foreignKeyGetter,
- entityService,
- row,
- match,
- });
 
  const showRemoteId = useShowRemoteId({
  create,
@@ -60,14 +52,7 @@ const Form = (props: EntityFormProps): JSX.Element => {
  },
  ];
 
- return (
- <DefaultEntityForm
- {...props}
- formik={formik}
- fkChoices={fkChoices}
- groups={groups}
- />
- );
+ return <DefaultEntityForm {...props} formik={formik} groups={groups} />;
 };
 
 export default Form;

demo/src/entities/Client/View.tsx

@@ -0,0 +1,40 @@
+import { ViewProps } from '@irontec/ivoz-ui/entities';
+import { FieldsetGroups } from '@irontec/ivoz-ui/entities/DefaultEntityBehavior';
+import DefaultView from '@irontec/ivoz-ui/entities/DefaultEntityBehavior/View';
+import _ from '@irontec/ivoz-ui/services/translations/translate';
+
+const View = (props: ViewProps): JSX.Element => {
+ const groups: Array<FieldsetGroups | false> = [
+ {
+ legend: _('Basic settings'),
+ fields: [
+ 'iden',
+ 'color',
+ {
+ name: 'description',
+ size: {
+ md: 12,
+ lg: 6,
+ xl: 4,
+ },
+ },
+ 'desktopLicences',
+ 'mobileLicences',
+ 'language',
+ 'cardDav',
+ ],
+ },
+ {
+ legend: _('SIP settings'),
+ fields: ['domain', 'transport', 'proxyHost', 'proxyPort'],
+ },
+ {
+ legend: _('Advanced settings'),
+ fields: ['sdes', 'authType', 'ldapServer', 'ldapQuery'],
+ },
+ ];
+
+ return <DefaultView {...props} groups={groups} />;
+};
+
+export default View;

demo/src/entities/Platform/Form.tsx

@@ -1,22 +1,11 @@
-import useFkChoices from '@irontec/ivoz-ui/entities/data/useFkChoices';
 import {
  EntityFormProps,
  FieldsetGroups,
- foreignKeyGetter,
 } from '@irontec/ivoz-ui/entities/DefaultEntityBehavior';
 import { Form as DefaultEntityForm } from '@irontec/ivoz-ui/entities/DefaultEntityBehavior/Form';
 import _ from '@irontec/ivoz-ui/services/translations/translate';
 
 const Form = (props: EntityFormProps): JSX.Element => {
- const { entityService, row, match } = props;
-
- const fkChoices = useFkChoices({
- foreignKeyGetter,
- entityService,
- row,
- match,
- });
-
  const groups: Array<FieldsetGroups | false> = [
  {
  legend: _('Basic info'),
@@ -28,7 +17,7 @@ const Form = (props: EntityFormProps): JSX.Element => {
  },
  ];
 
- return <DefaultEntityForm {...props} fkChoices={fkChoices} groups={groups} />;
+ return <DefaultEntityForm {...props} groups={groups} />;
 };
 
 export default Form;

demo/src/entities/Platform/View.tsx

@@ -1,24 +1,9 @@
 import { ViewType } from '@irontec/ivoz-ui/entities';
-import useFkChoices from '@irontec/ivoz-ui/entities/data/useFkChoices';
-import {
- FieldsetGroups,
- foreignKeyGetter,
-} from '@irontec/ivoz-ui/entities/DefaultEntityBehavior';
+import { FieldsetGroups } from '@irontec/ivoz-ui/entities/DefaultEntityBehavior';
 import DefaultView from '@irontec/ivoz-ui/entities/DefaultEntityBehavior/View';
-import useCurrentPathMatch from '@irontec/ivoz-ui/hooks/useCurrentPathMatch';
 import _ from '@irontec/ivoz-ui/services/translations/translate';
 
 const View: ViewType = (props): JSX.Element => {
- const { entityService, row } = props;
-
- const match = useCurrentPathMatch();
- const fkChoices = useFkChoices({
- foreignKeyGetter,
- entityService,
- row,
- match,
- });
-
  const groups: Array<FieldsetGroups | false> = [
  {
  legend: _('Basic info'),
@@ -30,7 +15,7 @@ const View: ViewType = (props): JSX.Element => {
  },
  ];
 
- return <DefaultView {...props} fkChoices={fkChoices} groups={groups} />;
+ return <DefaultView {...props} groups={groups} />;
 };
 
 export default View;

demo/src/entities/User/Form.tsx

@@ -1,5 +1,4 @@
 import { PropertyList } from '@irontec/ivoz-ui';
-import useFkChoices from '@irontec/ivoz-ui/entities/data/useFkChoices';
 import {
  EntityFormProps,
  FieldsetGroups,
@@ -8,7 +7,6 @@ import { Form as DefaultEntityForm } from '@irontec/ivoz-ui/entities/DefaultEnti
 import { useFormHandler } from '@irontec/ivoz-ui/entities/DefaultEntityBehavior/Form/useFormHandler';
 import _ from '@irontec/ivoz-ui/services/translations/translate';
 
-import { foreignKeyGetter } from './ForeignKeyGetter';
 import useParents from './hook/useParents';
 
 const Form = (props: EntityFormProps): JSX.Element | null => {
@@ -18,12 +16,6 @@ const Form = (props: EntityFormProps): JSX.Element | null => {
 
  const formik = useFormHandler(props);
  const values = formik.values;
- const fkChoices = useFkChoices({
- foreignKeyGetter,
- entityService,
- row,
- match,
- });
 
  if (values.remoteId) {
  readOnlyProperties.terminal = true;
@@ -88,7 +80,6 @@ const Form = (props: EntityFormProps): JSX.Element | null => {
  <DefaultEntityForm
  {...props}
  formik={formik}
- fkChoices={fkChoices}
  groups={groups}
  readOnlyProperties={readOnlyProperties}
  />

demo/src/i18n.js

@@ -26,7 +26,7 @@ i18n
  resources: {
  ...translations,
  },
- detection:  {
+ detection: {
  convertDetectedLanguage: (lng) => {
  const availableLangKeys = Object.keys(translations);
  const currentLangKey = lng.substring(0, 2).toLocaleLowerCase();
@@ -35,7 +35,7 @@ i18n
  }
 
  return lng;
- }
+ },
  },
  });
 

demo/src/router/EntityMap.ts

@@ -81,12 +81,12 @@ const getEntityMap = (): RouteMap => {
  {
  entity: {
  ...entities.Client,
- localPath: '/client_edit_only/2',
- title: 'Edit only client 2',
+ localPath: '/client_view_only/2',
+ title: 'Read only client 2',
  acl: {
  create: false,
  update: false,
- detail: false,
+ detail: true,
  read: false,
  delete: false,
  },

demo/src/router/addCustomRoutes.ts

@@ -45,6 +45,16 @@ const addCustomRoutes = (routes: Array<RouteSpec>): Array<RouteSpec> => {
  path: '/client_edit_only/:id',
  });
 
+ routes.push({
+ component: Detail,
+ entity: {
+ ...Client,
+ localPath: '/client_view_only',
+ },
+ key: 'ReadOnlyClient-view',
+ path: '/client_view_only/:id',
+ });
+
  routes.push({
  component: Create,
  entity: {