@accounter/client 0.0.8-alpha-20251028123001-a8ce4e53bbde9f6eeded7bfeea650700f6a63130 → 0.0.8-alpha-20251028123619-bcce9ab485db2997b6b76ff0df765834d86f30e7

package/src/components/clients/contracts/modify-contract-dialog.tsx

@@ -1,9 +1,8 @@
 import { useCallback, useEffect, useState } from 'react';
 import { format } from 'date-fns';
-import { Plus, X } from 'lucide-react';
+import { Plus } from 'lucide-react';
 import { useForm } from 'react-hook-form';
 import { z } from 'zod';
-import { Badge } from '@/components/ui/badge.js';
 import { Button } from '@/components/ui/button.js';
 import {
   Dialog,
@@ -49,7 +48,7 @@ const contractFormSchema = z.object({
   // operationsLimit: z.number().optional(),
   startDate: z.iso.date('Start date is required'),
   endDate: z.iso.date('End date is required'),
-  pos: z.array(z.string()),
+  po: z.string().optional(),
   paymentAmount: z.number().min(0, 'Payment amount must be non-negative'),
   paymentCurrency: z.enum(Object.values(Currency), 'Currency is required'),
   productType: z.enum(Object.values(Product)).optional(),
@@ -59,6 +58,7 @@ const contractFormSchema = z.object({
   isActive: z.boolean(),
   defaultRemark: z.string().optional(),
   defaultDocumentType: z.enum(Object.values(DocumentType)),
+  operationsLimit: z.int().min(0, 'Operations limit must be non-negative'),
 });
 
 export type ContractFormValues = z.infer<typeof contractFormSchema>;
@@ -68,7 +68,7 @@ const newContractDefaultValues: ContractFormValues = {
   // operationsLimit: 0,
   startDate: '',
   endDate: '',
-  pos: [],
+  po: undefined,
   paymentAmount: 0,
   paymentCurrency: Currency.Usd,
   productType: Product.Hive,
@@ -78,6 +78,7 @@ const newContractDefaultValues: ContractFormValues = {
   isActive: true,
   defaultRemark: undefined,
   defaultDocumentType: DocumentType.Proforma,
+  operationsLimit: 0,
 };
 
 interface Props {
@@ -89,7 +90,6 @@ interface Props {
 export function ModifyContractDialog({ clientId, contract, onDone }: Props) {
   const [isDialogOpen, setIsDialogOpen] = useState(false);
   const [editingContract, setEditingContract] = useState<ContractFormValues | null>(null);
-  const [newPO, setNewPO] = useState('');
 
   const { updateContract, updating } = useUpdateContract();
   const { createContract, creating } = useCreateContract();
@@ -99,26 +99,6 @@ export function ModifyContractDialog({ clientId, contract, onDone }: Props) {
     defaultValues: contract || newContractDefaultValues,
   });
 
-  const addPO = () => {
-    const trimmedPO = newPO.trim();
-    if (trimmedPO) {
-      const currentLinks = form.getValues('pos');
-      if (!currentLinks.includes(trimmedPO)) {
-        form.setValue('pos', [...currentLinks, trimmedPO], { shouldDirty: true });
-      }
-      setNewPO('');
-    }
-  };
-
-  const removePO = (index: number) => {
-    const currentLinks = form.getValues('pos');
-    form.setValue(
-      'pos',
-      currentLinks.filter((_, i) => i !== index),
-      { shouldDirty: true },
-    );
-  };
-
   useEffect(() => {
     if (contract) {
       setEditingContract(contract);
@@ -127,7 +107,7 @@ export function ModifyContractDialog({ clientId, contract, onDone }: Props) {
         // operationsLimit: contract.operationsLimit,
         startDate: contract.startDate,
         endDate: contract.endDate,
-        pos: contract.pos,
+        po: contract.po,
         paymentAmount: contract.paymentAmount,
         paymentCurrency: contract.paymentCurrency,
         productType: contract.productType,
@@ -137,6 +117,7 @@ export function ModifyContractDialog({ clientId, contract, onDone }: Props) {
         isActive: contract.isActive,
         defaultRemark: contract.defaultRemark,
         defaultDocumentType: contract.defaultDocumentType,
+        operationsLimit: contract.operationsLimit,
       });
       setIsDialogOpen(true);
     }
@@ -163,9 +144,10 @@ export function ModifyContractDialog({ clientId, contract, onDone }: Props) {
             msCloud: values.msCloudLink,
             plan: values.subscriptionPlan,
             product: values.productType,
-            purchaseOrders: values.pos,
+            purchaseOrder: values.po,
             remarks: values.defaultRemark,
             startDate: format(new Date(values.startDate), 'yyyy-MM-dd') as TimelessDateString,
+            operationsLimit: values.operationsLimit,
           },
         });
       } else {
@@ -185,9 +167,10 @@ export function ModifyContractDialog({ clientId, contract, onDone }: Props) {
             msCloud: values.msCloudLink,
             plan: values.subscriptionPlan,
             product: values.productType,
-            purchaseOrders: values.pos,
+            purchaseOrder: values.po,
             remarks: values.defaultRemark,
             startDate: format(new Date(values.startDate), 'yyyy-MM-dd') as TimelessDateString,
+            operationsLimit: values.operationsLimit,
           },
         });
       }
@@ -219,8 +202,7 @@ export function ModifyContractDialog({ clientId, contract, onDone }: Props) {
           <form onSubmit={form.handleSubmit(onSubmit)}>
             <div className="grid gap-4 py-4">
               <div className="grid gap-4 md:grid-cols-2">
-                {/* TODO: activate this field later. requires additional backend support */}
-                {/* <FormField
+                <FormField
                   control={form.control}
                   name="operationsLimit"
                   render={({ field }) => (
@@ -232,47 +214,16 @@ export function ModifyContractDialog({ clientId, contract, onDone }: Props) {
                       <FormMessage />
                     </FormItem>
                   )}
-                /> */}
-
+                />
                 <FormField
                   control={form.control}
-                  name="pos"
+                  name="po"
                   render={({ field }) => (
                     <FormItem>
-                      <FormLabel>Purchase Orders</FormLabel>
-                      <div className="flex gap-2">
-                        <Input
-                          placeholder="Add PO..."
-                          value={newPO}
-                          onChange={e => setNewPO(e.target.value)}
-                          onKeyDown={e => {
-                            if (e.key === 'Enter') {
-                              e.preventDefault();
-                              addPO();
-                            }
-                          }}
-                        />
-                        <Button type="button" size="sm" onClick={addPO}>
-                          <Plus className="h-4 w-4" />
-                        </Button>
-                      </div>
-                      <div className="flex flex-wrap gap-2 mt-2">
-                        {field.value?.map((link, index) => (
-                          <Badge key={link} variant="secondary" className="gap-1 max-w-xs truncate">
-                            {link}
-                            {index === field.value.length - 1 && (
-                              <Button
-                                variant="ghost"
-                                size="icon"
-                                className="p-0 size-3"
-                                onClick={() => removePO(index)}
-                              >
-                                <X className="size-3 cursor-pointer flex-shrink-0" />
-                              </Button>
-                            )}
-                          </Badge>
-                        ))}
-                      </div>
+                      <FormLabel>PO Number</FormLabel>
+                      <FormControl>
+                        <Input placeholder="PO-2024-001" {...field} />
+                      </FormControl>
                       <FormMessage />
                     </FormItem>
                   )}

package/src/gql/gql.ts

@@ -26,7 +26,7 @@ type Documents = {
     "\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,
     "\n  fragment BusinessContactSection on Business {\n    __typename\n    id\n    ... on LtdFinancialEntity {\n      name\n      hebrewName\n      country\n      governmentId\n      address\n      email\n      # localAddress\n      phoneNumber\n      website\n      clientInfo {\n        id\n        emails\n      }\n    }\n  }\n": typeof types.BusinessContactSectionFragmentDoc,
-    "\n  query ClientContractsSection($clientId: UUID!) {\n    contractsByClient(clientId: $clientId) {\n      id\n      purchaseOrders\n      startDate\n      endDate\n      amount {\n        raw\n        currency\n      }\n      billingCycle\n      isActive\n      product\n      documentType\n      remarks\n      plan\n      msCloud\n    }\n  }\n": typeof types.ClientContractsSectionDocument,
+    "\n  query ClientContractsSection($clientId: UUID!) {\n    contractsByClient(clientId: $clientId) {\n      id\n      purchaseOrder\n      startDate\n      endDate\n      amount {\n        raw\n        currency\n      }\n      billingCycle\n      isActive\n      product\n      documentType\n      remarks\n      plan\n      msCloud\n      operationsLimit\n    }\n  }\n": typeof types.ClientContractsSectionDocument,
     "\n  fragment BusinessPage on Business {\n    id\n    ... on LtdFinancialEntity {\n      clientInfo {\n        id\n      }\n      adminInfo {\n        id\n      }\n    }\n    ...ClientIntegrationsSection\n    ...BusinessHeader\n    ...BusinessContactSection\n    ...BusinessConfigurationSection\n    ...BusinessAdminSection\n  }\n": typeof types.BusinessPageFragmentDoc,
     "\n  fragment ClientIntegrationsSection on LtdFinancialEntity {\n    id\n    clientInfo {\n      id\n      greenInvoiceId\n      hiveId\n    }\n  }\n": typeof types.ClientIntegrationsSectionFragmentDoc,
     "\n  query ClientIntegrationsSectionGreenInvoice($clientId: UUID!) {\n    greenInvoiceClient(clientId: $clientId) {\n      id\n      country\n      emails\n      name\n      phone\n      taxId\n      address\n      city\n      zip\n      fax\n      mobile\n    }\n  }\n": typeof types.ClientIntegrationsSectionGreenInvoiceDocument,
@@ -211,7 +211,7 @@ type Documents = {
     "\n  mutation DeleteTag($tagId: UUID!) {\n    deleteTag(id: $tagId)\n  }\n": typeof types.DeleteTagDocument,
     "\n  mutation FetchIncomeDocuments($ownerId: UUID!) {\n    fetchIncomeDocuments(ownerId: $ownerId) {\n      id\n      ...NewFetchedDocumentFields\n    }\n  }\n": typeof types.FetchIncomeDocumentsDocument,
     "\n  query AllClients {\n    allClients {\n      id\n      greenInvoiceId\n      emails\n      originalBusiness {\n        id\n        name\n      }\n    }\n  }\n": typeof types.AllClientsDocument,
-    "\n  query AllOpenContracts {\n    allOpenContracts {\n      id\n      client {\n        id\n        greenInvoiceId\n        emails\n        originalBusiness {\n          id\n          name\n        }\n      }\n      purchaseOrders\n      startDate\n      endDate\n      remarks\n      amount {\n        raw\n        currency\n        formatted\n      }\n      documentType\n      billingCycle\n      isActive\n      product\n      plan\n      msCloud\n    }\n  }\n": typeof types.AllOpenContractsDocument,
+    "\n  query AllOpenContracts {\n    allOpenContracts {\n      id\n      client {\n        id\n        greenInvoiceId\n        emails\n        originalBusiness {\n          id\n          name\n        }\n      }\n      purchaseOrder\n      startDate\n      endDate\n      remarks\n      amount {\n        raw\n        currency\n        formatted\n      }\n      documentType\n      billingCycle\n      isActive\n      product\n      plan\n      msCloud\n    }\n  }\n": typeof types.AllOpenContractsDocument,
     "\n  query AllBusinesses {\n    allBusinesses {\n      nodes {\n        id\n        name\n      }\n    }\n  }\n": typeof types.AllBusinessesDocument,
     "\n  query AllCountries {\n    allCountries {\n      id\n      name\n      code\n    }\n  }\n": typeof types.AllCountriesDocument,
     "\n  query AllFinancialEntities {\n    allFinancialEntities {\n      nodes {\n        id\n        name\n      }\n    }\n  }\n": typeof types.AllFinancialEntitiesDocument,
@@ -278,7 +278,7 @@ const documents: Documents = {
     "\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,
     "\n  fragment BusinessContactSection on Business {\n    __typename\n    id\n    ... on LtdFinancialEntity {\n      name\n      hebrewName\n      country\n      governmentId\n      address\n      email\n      # localAddress\n      phoneNumber\n      website\n      clientInfo {\n        id\n        emails\n      }\n    }\n  }\n": types.BusinessContactSectionFragmentDoc,
-    "\n  query ClientContractsSection($clientId: UUID!) {\n    contractsByClient(clientId: $clientId) {\n      id\n      purchaseOrders\n      startDate\n      endDate\n      amount {\n        raw\n        currency\n      }\n      billingCycle\n      isActive\n      product\n      documentType\n      remarks\n      plan\n      msCloud\n    }\n  }\n": types.ClientContractsSectionDocument,
+    "\n  query ClientContractsSection($clientId: UUID!) {\n    contractsByClient(clientId: $clientId) {\n      id\n      purchaseOrder\n      startDate\n      endDate\n      amount {\n        raw\n        currency\n      }\n      billingCycle\n      isActive\n      product\n      documentType\n      remarks\n      plan\n      msCloud\n      operationsLimit\n    }\n  }\n": types.ClientContractsSectionDocument,
     "\n  fragment BusinessPage on Business {\n    id\n    ... on LtdFinancialEntity {\n      clientInfo {\n        id\n      }\n      adminInfo {\n        id\n      }\n    }\n    ...ClientIntegrationsSection\n    ...BusinessHeader\n    ...BusinessContactSection\n    ...BusinessConfigurationSection\n    ...BusinessAdminSection\n  }\n": types.BusinessPageFragmentDoc,
     "\n  fragment ClientIntegrationsSection on LtdFinancialEntity {\n    id\n    clientInfo {\n      id\n      greenInvoiceId\n      hiveId\n    }\n  }\n": types.ClientIntegrationsSectionFragmentDoc,
     "\n  query ClientIntegrationsSectionGreenInvoice($clientId: UUID!) {\n    greenInvoiceClient(clientId: $clientId) {\n      id\n      country\n      emails\n      name\n      phone\n      taxId\n      address\n      city\n      zip\n      fax\n      mobile\n    }\n  }\n": types.ClientIntegrationsSectionGreenInvoiceDocument,
@@ -463,7 +463,7 @@ const documents: Documents = {
     "\n  mutation DeleteTag($tagId: UUID!) {\n    deleteTag(id: $tagId)\n  }\n": types.DeleteTagDocument,
     "\n  mutation FetchIncomeDocuments($ownerId: UUID!) {\n    fetchIncomeDocuments(ownerId: $ownerId) {\n      id\n      ...NewFetchedDocumentFields\n    }\n  }\n": types.FetchIncomeDocumentsDocument,
     "\n  query AllClients {\n    allClients {\n      id\n      greenInvoiceId\n      emails\n      originalBusiness {\n        id\n        name\n      }\n    }\n  }\n": types.AllClientsDocument,
-    "\n  query AllOpenContracts {\n    allOpenContracts {\n      id\n      client {\n        id\n        greenInvoiceId\n        emails\n        originalBusiness {\n          id\n          name\n        }\n      }\n      purchaseOrders\n      startDate\n      endDate\n      remarks\n      amount {\n        raw\n        currency\n        formatted\n      }\n      documentType\n      billingCycle\n      isActive\n      product\n      plan\n      msCloud\n    }\n  }\n": types.AllOpenContractsDocument,
+    "\n  query AllOpenContracts {\n    allOpenContracts {\n      id\n      client {\n        id\n        greenInvoiceId\n        emails\n        originalBusiness {\n          id\n          name\n        }\n      }\n      purchaseOrder\n      startDate\n      endDate\n      remarks\n      amount {\n        raw\n        currency\n        formatted\n      }\n      documentType\n      billingCycle\n      isActive\n      product\n      plan\n      msCloud\n    }\n  }\n": types.AllOpenContractsDocument,
     "\n  query AllBusinesses {\n    allBusinesses {\n      nodes {\n        id\n        name\n      }\n    }\n  }\n": types.AllBusinessesDocument,
     "\n  query AllCountries {\n    allCountries {\n      id\n      name\n      code\n    }\n  }\n": types.AllCountriesDocument,
     "\n  query AllFinancialEntities {\n    allFinancialEntities {\n      nodes {\n        id\n        name\n      }\n    }\n  }\n": types.AllFinancialEntitiesDocument,
@@ -583,7 +583,7 @@ export function graphql(source: "\n  fragment BusinessContactSection on Business
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query ClientContractsSection($clientId: UUID!) {\n    contractsByClient(clientId: $clientId) {\n      id\n      purchaseOrders\n      startDate\n      endDate\n      amount {\n        raw\n        currency\n      }\n      billingCycle\n      isActive\n      product\n      documentType\n      remarks\n      plan\n      msCloud\n    }\n  }\n"): (typeof documents)["\n  query ClientContractsSection($clientId: UUID!) {\n    contractsByClient(clientId: $clientId) {\n      id\n      purchaseOrders\n      startDate\n      endDate\n      amount {\n        raw\n        currency\n      }\n      billingCycle\n      isActive\n      product\n      documentType\n      remarks\n      plan\n      msCloud\n    }\n  }\n"];
+export function graphql(source: "\n  query ClientContractsSection($clientId: UUID!) {\n    contractsByClient(clientId: $clientId) {\n      id\n      purchaseOrder\n      startDate\n      endDate\n      amount {\n        raw\n        currency\n      }\n      billingCycle\n      isActive\n      product\n      documentType\n      remarks\n      plan\n      msCloud\n      operationsLimit\n    }\n  }\n"): (typeof documents)["\n  query ClientContractsSection($clientId: UUID!) {\n    contractsByClient(clientId: $clientId) {\n      id\n      purchaseOrder\n      startDate\n      endDate\n      amount {\n        raw\n        currency\n      }\n      billingCycle\n      isActive\n      product\n      documentType\n      remarks\n      plan\n      msCloud\n      operationsLimit\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
@@ -1323,7 +1323,7 @@ export function graphql(source: "\n  query AllClients {\n    allClients {\n
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query AllOpenContracts {\n    allOpenContracts {\n      id\n      client {\n        id\n        greenInvoiceId\n        emails\n        originalBusiness {\n          id\n          name\n        }\n      }\n      purchaseOrders\n      startDate\n      endDate\n      remarks\n      amount {\n        raw\n        currency\n        formatted\n      }\n      documentType\n      billingCycle\n      isActive\n      product\n      plan\n      msCloud\n    }\n  }\n"): (typeof documents)["\n  query AllOpenContracts {\n    allOpenContracts {\n      id\n      client {\n        id\n        greenInvoiceId\n        emails\n        originalBusiness {\n          id\n          name\n        }\n      }\n      purchaseOrders\n      startDate\n      endDate\n      remarks\n      amount {\n        raw\n        currency\n        formatted\n      }\n      documentType\n      billingCycle\n      isActive\n      product\n      plan\n      msCloud\n    }\n  }\n"];
+export function graphql(source: "\n  query AllOpenContracts {\n    allOpenContracts {\n      id\n      client {\n        id\n        greenInvoiceId\n        emails\n        originalBusiness {\n          id\n          name\n        }\n      }\n      purchaseOrder\n      startDate\n      endDate\n      remarks\n      amount {\n        raw\n        currency\n        formatted\n      }\n      documentType\n      billingCycle\n      isActive\n      product\n      plan\n      msCloud\n    }\n  }\n"): (typeof documents)["\n  query AllOpenContracts {\n    allOpenContracts {\n      id\n      client {\n        id\n        greenInvoiceId\n        emails\n        originalBusiness {\n          id\n          name\n        }\n      }\n      purchaseOrder\n      startDate\n      endDate\n      remarks\n      amount {\n        raw\n        currency\n        formatted\n      }\n      documentType\n      billingCycle\n      isActive\n      product\n      plan\n      msCloud\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */