@autobusal/admin-agents 1.0.2 → 1.1.1

package/Browse.tsx

@@ -1,7 +1,7 @@
 import { TFunction } from 'i18next';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import { Meta, ContactInfo, Avatar, Table, Row } from '@autobusal/common';
-import { usePage } from '@autobusal/hooks';
+import { usePage, useBreadcrumbs } from '@autobusal/hooks';
 import { DisplayStatus, getParams, success } from '@autobusal/utilities';
 import { useGetAgents, useDeleteAgent } from './services';
 
@@ -15,6 +15,8 @@ const Browse = ({ url, t }: Props): JSX.Element => {
 
   usePage('agents');
 
+  useBreadcrumbs(t('admin_agents.browse.title', { ns: 'common' }));
+
   const { data, isLoading, isFetching, refetch } = useGetAgents(getParams(searchParams, ['page', 'sort', 'order', 'q']));
 
   const { mutate: Delete } = useDeleteAgent();

package/Manage.tsx

@@ -1,7 +1,7 @@
 import { TFunction } from 'i18next';
 import { useParams, useNavigate, useSearchParams } from 'react-router-dom';
-import { Meta, BackWithTitle, Viewer, IpLogs, ApiDetails } from '@autobusal/common';
-import { usePage, useSubscriptions, useOperators } from '@autobusal/hooks';
+import { Meta, BackWithTitle, Viewer, Box, IpLogs, ApiDetails } from '@autobusal/common';
+import { usePage, useBreadcrumbs, useSubscriptions, useCountries, useOperators } from '@autobusal/hooks';
 import { GetStatus, getAllowed, success } from '@autobusal/utilities';
 import { AgentData } from '@autobusal/providers/types/agents';
 import { useGetAgent, usePostAgent, useDeleteAgent } from './services';
@@ -22,15 +22,25 @@ const Manage = ({ url, t }: Props): JSX.Element => {
 
   const navigate = useNavigate();
 
+  const { data: CountryData, isLoading } = useCountries('all');
+
   const subscriptions = useSubscriptions('agent');
   const operators = useOperators();
 
   const { data, isFetching } = useGetAgent(id);
+  
+  const title = id > 0 ? t('admin_agents.manage.title.update', { company: data?.company, ns: 'common' }) : t('admin_agents.manage.title.new', { ns: 'common' });
+
+  useBreadcrumbs(title, [{ name: t('admin_agents.browse.title', { ns: 'common' }), url }]);
 
   const { mutate: Update, isPending: isPendingSave } = usePostAgent(id);
 
   const { mutate: Delete, isPending: isPendingDelete } = useDeleteAgent();
 
+  if (isLoading) {
+    return <Box />;
+  }
+
   const onSave = (data: AgentData): void => {
     Update(data, {
       onSuccess: () => {
@@ -50,8 +60,6 @@ const Manage = ({ url, t }: Props): JSX.Element => {
       }
     });
   };
-  
-  const title = id > 0 ? t('admin_agents.manage.title.update', { company: data?.company, ns: 'common' }) : t('admin_agents.manage.title.new', { ns: 'common' });
 
   return (
     <Meta title={ title }>
@@ -95,6 +103,13 @@ const Manage = ({ url, t }: Props): JSX.Element => {
           type: 'text',
           value: data?.city,
           rules: 'required|min_length:2|max_length:40'
+        }, {
+          label: t('admin_agents.manage.country', { ns: 'common' }),
+          name: 'country_id',
+          type: 'select',
+          values: CountryData,
+          value: data?.country_id ?? 0,
+          rules: 'required'
         }, {}, {
           label: t('admin_agents.manage.mobile', { ns: 'common' }),
           name: 'mobile',
@@ -149,7 +164,7 @@ const Manage = ({ url, t }: Props): JSX.Element => {
           label: t('admin_agents.manage.subscription', { ns: 'common' }),
           name: 'subscription_id',
           type: 'select',
-          value: data?.user.subscription?.subscription.id,
+          value: data?.user.subscription?.subscription.id ?? 0,
           values: subscriptions,
           rules: 'required',
           notice: t('admin_agents.manage.subscription_notice', { ns: 'common' })
@@ -183,31 +198,43 @@ const Manage = ({ url, t }: Props): JSX.Element => {
           label: t('admin_agents.manage.unique', { ns: 'common' }),
           name: 'unique',
           type: 'select',
-          value: data?.user.comissions?.unique,
+          value: data?.user.comissions?.unique ?? 0,
           values: getAllowed(t)
         }, {
           label: t('admin_agents.manage.api', { ns: 'common' }),
           name: 'api',
           type: 'select',
-          value: data?.user.api?.api,
+          value: data?.user.api?.api ?? 0,
           values: getAllowed(t)
         }, {
           label: t('admin_agents.manage.bkt', { ns: 'common' }),
           name: 'bkt',
           type: 'select',
-          value: data?.user.api?.bkt,
+          value: data?.user.api?.bkt ?? 0,
+          values: getAllowed(t)
+        }, {
+          label: t('admin_agents.manage.stripe', { ns: 'common' }),
+          name: 'stripe',
+          type: 'select',
+          value: data?.user.api?.stripe ?? 0,
+          values: getAllowed(t)
+        }, {
+          label: t('admin_agents.manage.mollie', { ns: 'common' }),
+          name: 'mollie',
+          type: 'select',
+          value: data?.user.api?.mollie ?? 0,
           values: getAllowed(t)
         }, {
           label: t('admin_agents.manage.devpos', { ns: 'common' }),
           name: 'devpos',
           type: 'select',
-          value: data?.user.api?.devpos,
+          value: data?.user.api?.devpos ?? 0,
           values: getAllowed(t)
         }, {
           label: t('admin_agents.manage.external', { ns: 'common' }),
           name: 'external',
           type: 'select',
-          value: data?.user.comissions?.external,
+          value: data?.user.comissions?.external ?? 0,
           values: getAllowed(t)
         }, {
           label: t('admin_agents.manage.devpos_settings', { ns: 'common' }),
@@ -220,7 +247,7 @@ const Manage = ({ url, t }: Props): JSX.Element => {
           label: t('admin_agents.manage.status', { ns: 'common' }),
           name: 'status',
           type: 'select',
-          value: data?.user.status,
+          value: data?.user.status ?? 0,
           values: GetStatus(t)
         }, {
           label: t('admin_agents.manage.display_email', { ns: 'common' }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autobusal/admin-agents",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "type": "module",
   "main": "index.ts"
 }