@accounter/client 0.0.8-alpha-20251028120608-255010a90e4b23163e8a832606cd6b5b74442462 → 0.0.8-alpha-20251028122020-22393814f274e46c107aca0d7b3f8acafeabbb81

package/src/components/clients/modify-client-dialog.tsx

@@ -49,10 +49,9 @@ interface Props {
   businessId: string;
   client?: ClientFormValues | null;
   onDone?: () => void;
-  showTrigger?: boolean;
 }
 
-export function ModifyClientDialog({ client, businessId, onDone, showTrigger = true }: Props) {
+export function ModifyClientDialog({ client, businessId, onDone }: Props) {
   const [isDialogOpen, setIsDialogOpen] = useState(false);
   const [editingClient, setEditingClient] = useState<ClientFormValues | null>(null);
 
@@ -139,23 +138,13 @@ export function ModifyClientDialog({ client, businessId, onDone, showTrigger = t
   );
 
   return (
-    <Dialog
-      open={isDialogOpen}
-      onOpenChange={status => {
-        setIsDialogOpen(status);
-        if (!status) {
-          onDone?.();
-        }
-      }}
-    >
-      {showTrigger && (
-        <DialogTrigger asChild>
-          <Button size="sm" onClick={handleNew}>
-            <Plus className="h-4 w-4 mr-2" />
-            New Client
-          </Button>
-        </DialogTrigger>
-      )}
+    <Dialog open={isDialogOpen} onOpenChange={setIsDialogOpen}>
+      <DialogTrigger asChild>
+        <Button size="sm" onClick={handleNew}>
+          <Plus className="h-4 w-4 mr-2" />
+          New Client
+        </Button>
+      </DialogTrigger>
       <DialogContent className="max-w-2xl max-h-[90vh] overflow-y-auto">
         <DialogHeader>
           <DialogTitle>{editingClient ? 'Edit Client' : 'Create New Client'}</DialogTitle>
@@ -274,14 +263,7 @@ export function ModifyClientDialog({ client, businessId, onDone, showTrigger = t
               </div>
             </div>
             <DialogFooter>
-              <Button
-                type="button"
-                variant="outline"
-                onClick={() => {
-                  setIsDialogOpen(false);
-                  onDone?.();
-                }}
-              >
+              <Button type="button" variant="outline" onClick={() => setIsDialogOpen(false)}>
                 Cancel
               </Button>
               <Button type="submit">{editingClient ? 'Update Client' : 'Create Client'}</Button>

package/src/components/common/modals/insert-business.tsx

@@ -2,10 +2,6 @@ import { useCallback, useContext, useState } from 'react';
 import { Globe, Mail, MapPin, Phone, Plus, X } from 'lucide-react';
 import { useForm } from 'react-hook-form';
 import { z } from 'zod';
-import {
-  ModifyClientDialog,
-  type ClientFormValues,
-} from '@/components/clients/modify-client-dialog.js';
 import { Badge } from '@/components/ui/badge.js';
 import { Button } from '@/components/ui/button.js';
 import {
@@ -19,7 +15,6 @@ import {
 import {
   Form,
   FormControl,
-  FormDescription,
   FormField,
   FormItem,
   FormLabel,
@@ -33,9 +28,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from '@/components/ui/select.js';
-import { Switch } from '@/components/ui/switch.js';
 import { Textarea } from '@/components/ui/textarea.js';
-import { DocumentType } from '@/gql/graphql.js';
 import { pcn874RecordEnum } from '@/helpers/index.js';
 import { useAllCountries } from '@/hooks/use-get-countries.js';
 import { useGetSortCodes } from '@/hooks/use-get-sort-codes.js';
@@ -55,8 +48,8 @@ const businessFormSchema = z
     localName: z.string().optional(),
     govId: z.string().optional(),
     address: z.string().optional(),
-    generalContacts: z.array(z.email()),
-    website: z.url().optional().or(z.literal('')),
+    generalContacts: z.array(z.string().email()),
+    website: z.string().url().optional().or(z.literal('')),
     phone: z.string().optional(),
     taxCategory: z.string().optional(),
     sortCode: z.string().optional(),
@@ -64,9 +57,8 @@ const businessFormSchema = z
     irsCode: z.int().optional(),
     defaultDescription: z.string().optional(),
     defaultTags: z.array(z.string()),
-    isClient: z.boolean().default(false).optional(),
     transactionPhrases: z.array(z.string()),
-    emailAddresses: z.array(z.email()),
+    emailAddresses: z.array(z.string().email()),
   })
   .refine(
     data => {
@@ -125,7 +117,6 @@ export function InsertBusiness({
   onAdd?: (businessId: string) => void;
 }) {
   const [isNewBusinessOpen, setIsNewBusinessOpen] = useState(false);
-  const [client, setClient] = useState<ClientFormValues | null>(null);
 
   const { insertBusiness, fetching: addingInProcess } = useInsertBusiness();
 
@@ -137,7 +128,6 @@ export function InsertBusiness({
       defaultTags: [],
       transactionPhrases: description ? [description] : [],
       emailAddresses: [],
-      locality: 'GAB', // TODO: set default based on DB
     },
   });
 
@@ -145,69 +135,44 @@ export function InsertBusiness({
     const newBusiness = await insertBusiness({
       fields: convertFormDataToInsertNewBusinessInput(data),
     });
-    if (data.isClient && newBusiness?.id) {
-      setClient({
-        businessId: newBusiness.id,
-        generatedDocumentType: DocumentType.Proforma,
-        emails: [],
-      });
-    } else {
-      onComplete(newBusiness?.id);
-    }
-  };
-
-  const onComplete = (businessId: string = '') => {
-    setClient(null);
     setIsNewBusinessOpen(false);
     form.reset();
-    onAdd?.(businessId);
+    onAdd?.(newBusiness?.id ?? '');
   };
 
   return (
-    <>
-      <Dialog open={isNewBusinessOpen} onOpenChange={setIsNewBusinessOpen}>
-        <DialogTrigger asChild>
-          <Button>
-            <Plus className="size-4 mr-2" />
-            New Business
-          </Button>
-        </DialogTrigger>
-        <DialogContent className="max-w-3xl max-h-[90vh] overflow-y-auto">
-          <DialogHeader>
-            <DialogTitle>Create New Business</DialogTitle>
-            <DialogDescription>Add a new business to Accounter.</DialogDescription>
-          </DialogHeader>
-          <Form {...form}>
-            <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
-              <ContactInformationSection form={form} />
-
-              <DefaultsSection form={form} />
-
-              <AutoMatchingSection form={form} />
-
-              <div className="flex justify-end gap-3 pt-4 border-t">
-                <Button type="button" variant="outline" onClick={() => setIsNewBusinessOpen(false)}>
-                  Cancel
-                </Button>
-                <Button type="submit" disabled={addingInProcess}>
-                  Create Business
-                </Button>
-              </div>
-            </form>
-          </Form>
-        </DialogContent>
-      </Dialog>
-      {client?.businessId && (
-        <ModifyClientDialog
-          businessId={client.businessId}
-          client={client}
-          showTrigger={false}
-          onDone={() => {
-            onComplete(client.businessId);
-          }}
-        />
-      )}
-    </>
+    <Dialog open={isNewBusinessOpen} onOpenChange={setIsNewBusinessOpen}>
+      <DialogTrigger asChild>
+        <Button>
+          <Plus className="size-4 mr-2" />
+          New Business
+        </Button>
+      </DialogTrigger>
+      <DialogContent className="max-w-3xl max-h-[90vh] overflow-y-auto">
+        <DialogHeader>
+          <DialogTitle>Create New Business</DialogTitle>
+          <DialogDescription>Add a new business to Accounter.</DialogDescription>
+        </DialogHeader>
+        <Form {...form}>
+          <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
+            <ContactInformationSection form={form} />
+
+            <DefaultsSection form={form} />
+
+            <AutoMatchingSection form={form} />
+
+            <div className="flex justify-end gap-3 pt-4 border-t">
+              <Button type="button" variant="outline" onClick={() => setIsNewBusinessOpen(false)}>
+                Cancel
+              </Button>
+              <Button type="submit" disabled={addingInProcess}>
+                Create Business
+              </Button>
+            </div>
+          </form>
+        </Form>
+      </DialogContent>
+    </Dialog>
   );
 }
 
@@ -573,29 +538,12 @@ function DefaultsSection({ form }: SectionProps) {
                   placeholder="Select Default Tags"
                   variant="default"
                   disabled={fetchingTags}
-                  asChild
                 />
               </FormControl>
               <FormMessage />
             </FormItem>
           )}
         />
-
-        <FormField
-          control={form.control}
-          name="isClient"
-          render={({ field }) => (
-            <FormItem className="flex flex-row items-center justify-between rounded-lg border p-3 shadow-sm">
-              <div className="space-y-0.5">
-                <FormLabel>Client</FormLabel>
-                <FormDescription>Business is a client</FormDescription>
-              </div>
-              <FormControl>
-                <Switch checked={field.value} onCheckedChange={field.onChange} />
-              </FormControl>
-            </FormItem>
-          )}
-        />
       </div>
     </div>
   );

package/src/components/layout/user-nav.tsx

@@ -1,8 +1,5 @@
-import { useContext, useState, type JSX } from 'react';
-import { CircleCheckBig, FileDown, Shield, User2Icon } from 'lucide-react';
-import { Link } from 'react-router-dom';
-import { UserContext } from '@/providers/index.js';
-import { ROUTES } from '@/router/routes.js';
+import { useState, type JSX } from 'react';
+import { CircleCheckBig, FileDown, User2Icon } from 'lucide-react';
 import { Tooltip } from '@mantine/core';
 import { useDisclosure } from '@mantine/hooks';
 import { useCornJobs } from '../../hooks/use-corn-jobs.js';
@@ -20,14 +17,11 @@ import {
 } from '../ui/dropdown-menu.js';
 
 export function UserNav(): JSX.Element {
-  const { userContext } = useContext(UserContext);
   const [pullDocumentsOpened, { close: closePullDocuments, open: openPullDocuments }] =
     useDisclosure(false);
   const [balanceChargeModalOpen, setBalanceChargeModalOpen] = useState(false);
   const { executeJobs } = useCornJobs();
 
-  const userName = userContext?.username || 'User Name';
-
   return (
     <>
       <DropdownMenu>
@@ -41,24 +35,11 @@ export function UserNav(): JSX.Element {
         <DropdownMenuContent className="w-56" align="end" forceMount>
           <DropdownMenuLabel className="font-normal">
             <div className="flex flex-col space-y-1">
-              <p className="text-sm font-medium leading-none">{userName}</p>
+              <p className="text-sm font-medium leading-none">User Name</p>
               <p className="text-xs leading-none text-muted-foreground">Email</p>
             </div>
           </DropdownMenuLabel>
           <DropdownMenuSeparator />
-          {userContext?.context.adminBusinessId && (
-            <DropdownMenuItem asChild>
-              <Link
-                to={{
-                  pathname: ROUTES.BUSINESSES.DETAIL(userContext.context.adminBusinessId),
-                  search: '?tab=admin',
-                }}
-              >
-                <Shield className="size-4" />
-                <span className="hidden sm:inline">Admin Configurations</span>
-              </Link>
-            </DropdownMenuItem>
-          )}
           <DropdownMenuItem>
             <Button variant="ghost" onClick={() => setBalanceChargeModalOpen(true)}>
               Add Balance Charge

package/src/gql/gql.ts

@@ -21,7 +21,7 @@ type Documents = {
     "\n  query BusinessTripsRowValidation($id: UUID!) {\n    businessTrip(id: $id) {\n      id\n      uncategorizedTransactions {\n        transaction {\n          ... on Transaction @defer {\n            id\n          }\n        }\n      }\n      summary {\n        ... on BusinessTripSummary @defer {\n          errors\n        }\n      }\n    }\n  }\n": typeof types.BusinessTripsRowValidationDocument,
     "\n  query EditableBusinessTrip($businessTripId: UUID!) {\n    businessTrip(id: $businessTripId) {\n      id\n      ...BusinessTripReportHeaderFields\n      ...BusinessTripReportAttendeesFields\n      ...BusinessTripUncategorizedTransactionsFields\n      ...BusinessTripReportFlightsFields\n      ...BusinessTripReportAccommodationsFields\n      ...BusinessTripReportTravelAndSubsistenceFields\n      ...BusinessTripReportCarRentalFields\n      ...BusinessTripReportOtherFields\n      ...BusinessTripReportSummaryFields\n      ... on BusinessTrip {\n        uncategorizedTransactions {\n          transaction {\n            id\n          }\n        }\n      }\n    }\n  }\n": typeof types.EditableBusinessTripDocument,
     "\n  query BusinessTripsScreen {\n    allBusinessTrips {\n      id\n      name\n      dates {\n        start\n      }\n      ...BusinessTripsRowFields\n    }\n  }\n": typeof types.BusinessTripsScreenDocument,
-    "\n  fragment BusinessAdminSection on Business {\n    id\n    ... on LtdFinancialEntity {\n      adminInfo {\n        id\n        withholdingTaxBookNumber\n        withholdingTaxFileNumber\n        socialSecurityEmployerId\n        taxAdvancesRate\n        taxAdvancesId\n        registrationDate\n      }\n    }\n  }\n": typeof types.BusinessAdminSectionFragmentDoc,
+    "\n  fragment BusinessAdminSection on Business {\n    id\n    ... on LtdFinancialEntity {\n      adminInfo {\n        id\n        employerWithholdingTaxAccountNumber\n        taxPrepaymentId\n        nationalInsuranceEmployerId\n        advanceTaxRate\n        registrationDate\n      }\n    }\n  }\n": typeof types.BusinessAdminSectionFragmentDoc,
     "\n  fragment BusinessHeader on Business {\n    __typename\n    id\n    name\n    createdAt\n    isActive\n    ... on LtdFinancialEntity {\n      governmentId\n      adminInfo {\n        id\n      }\n      clientInfo {\n        id\n      }\n    }\n  }\n": typeof types.BusinessHeaderFragmentDoc,
     "\n  query BusinessChargesSection($page: Int, $limit: Int, $filters: ChargeFilter) {\n    allCharges(page: $page, limit: $limit, filters: $filters) {\n      nodes {\n        id\n        ...ChargesTableFields\n      }\n      pageInfo {\n        totalPages\n      }\n    }\n  }\n": typeof types.BusinessChargesSectionDocument,
     "\n  fragment BusinessConfigurationSection on Business {\n    __typename\n    id\n    pcn874RecordType\n    irsCode\n    isActive\n    ... on LtdFinancialEntity {\n      optionalVAT\n      exemptDealer\n      isReceiptEnough\n      isDocumentsOptional\n      sortCode {\n        id\n        key\n        defaultIrsCode\n      }\n      taxCategory {\n        id\n      }\n      suggestions {\n        phrases\n        emails\n        tags {\n          id\n        }\n        description\n        emailListener {\n          internalEmailLinks\n          emailBody\n          attachments\n        }\n      }\n      clientInfo {\n        id\n      }\n    }\n  }\n": typeof types.BusinessConfigurationSectionFragmentDoc,
@@ -273,7 +273,7 @@ const documents: Documents = {
     "\n  query BusinessTripsRowValidation($id: UUID!) {\n    businessTrip(id: $id) {\n      id\n      uncategorizedTransactions {\n        transaction {\n          ... on Transaction @defer {\n            id\n          }\n        }\n      }\n      summary {\n        ... on BusinessTripSummary @defer {\n          errors\n        }\n      }\n    }\n  }\n": types.BusinessTripsRowValidationDocument,
     "\n  query EditableBusinessTrip($businessTripId: UUID!) {\n    businessTrip(id: $businessTripId) {\n      id\n      ...BusinessTripReportHeaderFields\n      ...BusinessTripReportAttendeesFields\n      ...BusinessTripUncategorizedTransactionsFields\n      ...BusinessTripReportFlightsFields\n      ...BusinessTripReportAccommodationsFields\n      ...BusinessTripReportTravelAndSubsistenceFields\n      ...BusinessTripReportCarRentalFields\n      ...BusinessTripReportOtherFields\n      ...BusinessTripReportSummaryFields\n      ... on BusinessTrip {\n        uncategorizedTransactions {\n          transaction {\n            id\n          }\n        }\n      }\n    }\n  }\n": types.EditableBusinessTripDocument,
     "\n  query BusinessTripsScreen {\n    allBusinessTrips {\n      id\n      name\n      dates {\n        start\n      }\n      ...BusinessTripsRowFields\n    }\n  }\n": types.BusinessTripsScreenDocument,
-    "\n  fragment BusinessAdminSection on Business {\n    id\n    ... on LtdFinancialEntity {\n      adminInfo {\n        id\n        withholdingTaxBookNumber\n        withholdingTaxFileNumber\n        socialSecurityEmployerId\n        taxAdvancesRate\n        taxAdvancesId\n        registrationDate\n      }\n    }\n  }\n": types.BusinessAdminSectionFragmentDoc,
+    "\n  fragment BusinessAdminSection on Business {\n    id\n    ... on LtdFinancialEntity {\n      adminInfo {\n        id\n        employerWithholdingTaxAccountNumber\n        taxPrepaymentId\n        nationalInsuranceEmployerId\n        advanceTaxRate\n        registrationDate\n      }\n    }\n  }\n": types.BusinessAdminSectionFragmentDoc,
     "\n  fragment BusinessHeader on Business {\n    __typename\n    id\n    name\n    createdAt\n    isActive\n    ... on LtdFinancialEntity {\n      governmentId\n      adminInfo {\n        id\n      }\n      clientInfo {\n        id\n      }\n    }\n  }\n": types.BusinessHeaderFragmentDoc,
     "\n  query BusinessChargesSection($page: Int, $limit: Int, $filters: ChargeFilter) {\n    allCharges(page: $page, limit: $limit, filters: $filters) {\n      nodes {\n        id\n        ...ChargesTableFields\n      }\n      pageInfo {\n        totalPages\n      }\n    }\n  }\n": types.BusinessChargesSectionDocument,
     "\n  fragment BusinessConfigurationSection on Business {\n    __typename\n    id\n    pcn874RecordType\n    irsCode\n    isActive\n    ... on LtdFinancialEntity {\n      optionalVAT\n      exemptDealer\n      isReceiptEnough\n      isDocumentsOptional\n      sortCode {\n        id\n        key\n        defaultIrsCode\n      }\n      taxCategory {\n        id\n      }\n      suggestions {\n        phrases\n        emails\n        tags {\n          id\n        }\n        description\n        emailListener {\n          internalEmailLinks\n          emailBody\n          attachments\n        }\n      }\n      clientInfo {\n        id\n      }\n    }\n  }\n": types.BusinessConfigurationSectionFragmentDoc,
@@ -563,7 +563,7 @@ export function graphql(source: "\n  query BusinessTripsScreen {\n    allBusines
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  fragment BusinessAdminSection on Business {\n    id\n    ... on LtdFinancialEntity {\n      adminInfo {\n        id\n        withholdingTaxBookNumber\n        withholdingTaxFileNumber\n        socialSecurityEmployerId\n        taxAdvancesRate\n        taxAdvancesId\n        registrationDate\n      }\n    }\n  }\n"): (typeof documents)["\n  fragment BusinessAdminSection on Business {\n    id\n    ... on LtdFinancialEntity {\n      adminInfo {\n        id\n        withholdingTaxBookNumber\n        withholdingTaxFileNumber\n        socialSecurityEmployerId\n        taxAdvancesRate\n        taxAdvancesId\n        registrationDate\n      }\n    }\n  }\n"];
+export function graphql(source: "\n  fragment BusinessAdminSection on Business {\n    id\n    ... on LtdFinancialEntity {\n      adminInfo {\n        id\n        employerWithholdingTaxAccountNumber\n        taxPrepaymentId\n        nationalInsuranceEmployerId\n        advanceTaxRate\n        registrationDate\n      }\n    }\n  }\n"): (typeof documents)["\n  fragment BusinessAdminSection on Business {\n    id\n    ... on LtdFinancialEntity {\n      adminInfo {\n        id\n        employerWithholdingTaxAccountNumber\n        taxPrepaymentId\n        nationalInsuranceEmployerId\n        advanceTaxRate\n        registrationDate\n      }\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */