@workwell-global/component-library 1.1.33 → 1.1.34

package/models/schemas/api/SCompanyDocumentAPI.ts

@@ -1,6 +1,7 @@
 import { z } from 'zod'
 import { documentBaseFields } from './bases/SDocumentBase'
 import { createEntityToolkit } from '../helpers/EntityToolkit'
+import { d365OwnershipBaseFields } from './bases/SBaseAPI'
 
 export const companyDocumentFields = {
   ...documentBaseFields,
@@ -20,7 +21,7 @@ export const companyDocumentFields = {
 
 export const CompanyDocumentToolkit = createEntityToolkit(
   companyDocumentFields,
-  'ownership',
+  d365OwnershipBaseFields,
 )
 
 // Export Types

package/models/schemas/api/SContractorDocumentAPI.ts

@@ -1,6 +1,7 @@
 import { z } from 'zod'
 import { documentBaseFields } from './bases/SDocumentBase'
 import { createEntityToolkit } from '../helpers/EntityToolkit'
+import { d365OwnershipBaseFields } from './bases/SBaseAPI'
 
 export const contractorDocumentFields = {
   ...documentBaseFields, // Merge the base
@@ -12,8 +13,8 @@ export const contractorDocumentFields = {
     pretty: 'directorApprovedValue',
     type: z.string().nullish(),
   },
-  _ww_scats_contractingcompany_value: {
-    pretty: 'scatsContractingCompanyValue',
+  _ww_scats_contractingContractor_value: {
+    pretty: 'scatsContractingContractorValue',
     type: z.string().nullish(),
   },
   ww_contractordocumentid: {
@@ -59,7 +60,7 @@ export const contractorDocumentFields = {
 
 export const ContractorDocumentToolkit = createEntityToolkit(
   contractorDocumentFields,
-  'ownership',
+  d365OwnershipBaseFields,
 )
 
 export type TContractorDocumentD365 = z.infer<

package/models/schemas/api/SCountryApi.ts

@@ -1,5 +1,6 @@
 import { z } from 'zod'
 import { createEntityToolkit } from '../helpers/EntityToolkit'
+import { d365OrganisationBaseFields } from './bases/SBaseAPI'
 
 export const countryFields = {
   ww_countryid: { pretty: 'countryId', type: z.string().nullish() },
@@ -44,7 +45,10 @@ export const countryFields = {
   },
 } as const
 
-export const CountryToolkit = createEntityToolkit(countryFields, 'organisation')
+export const CountryToolkit = createEntityToolkit(
+  countryFields,
+  d365OrganisationBaseFields,
+)
 
 // Export Types
 export type TCountryD365 = z.infer<typeof CountryToolkit.SResponseD365>

package/models/schemas/api/SCurrencyAPI.ts

@@ -1,5 +1,6 @@
 import { z } from 'zod'
 import { createEntityToolkit } from '../helpers/EntityToolkit'
+import { d365OrganisationBaseFields } from './bases/SBaseAPI'
 
 export const currencyFields = {
   transactioncurrencyid: { pretty: 'currencyId', type: z.string().nullish() },
@@ -15,7 +16,7 @@ export const currencyFields = {
 
 export const CurrencyToolkit = createEntityToolkit(
   currencyFields,
-  'organisation',
+  d365OrganisationBaseFields,
 )
 
 // Export Types

package/models/schemas/api/SEnquiryAPI.ts

@@ -1,6 +1,7 @@
 import { z } from 'zod'
 import { createEntityToolkit } from '../helpers/EntityToolkit'
 import { SimulationToolkit } from './SSimulationAPI'
+import { d365OwnershipBaseFields } from './bases/SBaseAPI'
 
 const enquiryFields = {
   ww_enquiryid: { pretty: 'enquiryId', type: z.string() }, // Required in your type
@@ -115,7 +116,10 @@ const enquiryFields = {
   },
 } as const
 
-export const EnquiryToolkit = createEntityToolkit(enquiryFields, 'ownership')
+export const EnquiryToolkit = createEntityToolkit(
+  enquiryFields,
+  d365OwnershipBaseFields,
+)
 
 export type TEnquiryD365 = z.infer<typeof EnquiryToolkit.SResponseD365>
 export type TEnquiryPayloadD365 = z.infer<typeof EnquiryToolkit.SPayloadD365>

package/models/schemas/api/SSimulationAPI.ts

@@ -4,6 +4,7 @@ import { ContractorDocumentToolkit } from './SContractorDocumentAPI'
 import { CountryToolkit } from './SCountryApi'
 import { CurrencyToolkit } from './SCurrencyAPI'
 import { SolutionToolkit } from './SSolutionAPI'
+import { d365OwnershipBaseFields } from './bases/SBaseAPI'
 
 const simulationFields = {
   _ww_enquiry_value: {
@@ -566,7 +567,7 @@ const simulationFields = {
 
 export const SimulationToolkit = createEntityToolkit(
   simulationFields,
-  'ownership',
+  d365OwnershipBaseFields,
 )
 
 export type TSimulationD365 = z.infer<typeof SimulationToolkit.SResponseD365>

package/models/schemas/api/SSolutionAPI.ts

@@ -1,5 +1,6 @@
 import { z } from 'zod'
 import { createEntityToolkit } from '../helpers/EntityToolkit'
+import { d365OrganisationBaseFields } from './bases/SBaseAPI'
 
 export const solutionKeyMap = {
   ww_scats_parent_aor: 'AOR',
@@ -111,7 +112,7 @@ export const solutionFields = {
 
 export const SolutionToolkit = createEntityToolkit(
   solutionFields,
-  'organisation',
+  d365OrganisationBaseFields,
 )
 
 export type TSolutionD365 = z.infer<typeof SolutionToolkit.SResponseD365>

package/models/schemas/api/bases/SBaseAPI.ts

@@ -43,13 +43,15 @@ export const d365BaseFields = {
 } as const
 
 export const d365OrganisationBaseFields = {
+  ...d365BaseFields,
   _organizationid_value: {
     pretty: 'organizationIdValue',
     type: z.string().nullish(),
   },
-}
+} as const
 
 export const d365OwnershipBaseFields = {
+  ...d365BaseFields,
   _ownerid_value: {
     pretty: 'ownerIdValue',
     type: z.string().nullish(),
@@ -66,29 +68,16 @@ export const d365OwnershipBaseFields = {
     pretty: 'owningUserValue',
     type: z.string().nullish(),
   },
-}
+} as const
 
-export const withD365OwnershipFields = <
-  TField extends Record<string, FieldObj>,
->(
-  fields: TField,
-) =>
-  ({
-    ...fields,
-    ...d365BaseFields,
-    ...d365OwnershipBaseFields,
-  }) as const
+export const baseD365KeysArray = Object.keys(d365OwnershipBaseFields)
+export type TBaseD365Keys = keyof typeof d365OwnershipBaseFields
 
-export const withD365OrganisationFields = <
-  TField extends Record<string, FieldObj>,
->(
-  fields: TField,
-) =>
-  ({
-    ...fields,
-    ...d365BaseFields,
-    ...d365OrganisationBaseFields,
-  }) as const
+export const basePrettyKeysArray = Object.values(d365OwnershipBaseFields).map(
+  field => field.pretty,
+)
+export type TBasePrettyKeys =
+  (typeof d365OwnershipBaseFields)[keyof typeof d365OwnershipBaseFields]['pretty']
 
 export type PatchValue = string | number | boolean | null | unknown[] | object
 export type PatchResponse = Record<string, PatchValue>

package/models/schemas/bff/enquiryDetail/SPatchSimulationBFF.ts

@@ -7,4 +7,4 @@ export const SPatchSimulationBFF = SimulationToolkit.SPayloadAPI.pick({
   rejectionDetailReasonValue: true,
 })
 
-export type TPatchEnquiryBFF = z.infer<typeof SPatchSimulationBFF>
+export type TPatchSimulationBFF = z.infer<typeof SPatchSimulationBFF>

package/models/schemas/helpers/EntityToolkit.ts

@@ -1,8 +1,4 @@
 import { z, ZodObject, ZodRawShape, ZodTypeAny } from 'zod'
-import {
-  withD365OrganisationFields,
-  withD365OwnershipFields,
-} from '../api/bases/SBaseAPI'
 
 export type FieldObj = {
   type?: ZodTypeAny
@@ -15,22 +11,15 @@ export type FieldObj = {
 
 type TBase = 'ownership' | 'organisation' | 'none'
 
-export function createEntityToolkit<TField extends Record<string, FieldObj>>(
-  uniqueFields: TField,
-  base: TBase = 'ownership',
-) {
-  const applyBase = (fields: TField) => {
-    if (base === 'ownership') return withD365OwnershipFields(fields)
-    if (base === 'organisation') return withD365OrganisationFields(fields)
-    return fields
-  }
-
-  const combinedFields = applyBase(uniqueFields)
-
+export function createEntityToolkit<
+  TUnique extends Record<string, FieldObj>,
+  TBase extends Record<string, FieldObj>,
+>(uniqueFields: TUnique, baseFields: TBase) {
   const SPayloadD365 = create365Schema(uniqueFields).partial()
-  const SResponseD365 = create365Schema(combinedFields).partial()
-
   const SPayloadAPI = createPrettySchema(uniqueFields).partial()
+
+  const combinedFields = { ...baseFields, ...uniqueFields }
+  const SResponseD365 = create365Schema(combinedFields).partial()
   const SResponseAPI = createPrettySchema(combinedFields)
 
   const mapD365ToPretty = (data: unknown) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@workwell-global/component-library",
-  "version": "1.1.33",
+  "version": "1.1.34",
   "description": "A component library for Workwell",
   "license": "MIT",
   "main": "dist/cjs",