From 5ad0008122eb6f78397a824969d6c170ff75c0ec Mon Sep 17 00:00:00 2001 From: Tom Butcher Date: Sat, 5 Sep 2026 01:59:21 +0100 Subject: [PATCH] Refactor Database Models for Improved Readability and Consistency - Updated lazy loading syntax for component imports across multiple models to enhance code clarity. - Reformatted content return statements in various components for better readability. - Adjusted column widths for date fields from 175 to 200 to improve layout consistency across models. - Ensured consistent formatting and structure in model definitions for better maintainability. --- src/database/models/AppPassword.js | 13 +++++++--- src/database/models/Client.js | 10 +++++--- src/database/models/Courier.js | 29 ++++++++++++--------- src/database/models/CourierService.js | 4 +-- src/database/models/DocumentJob.js | 32 ++++++++++++++++++------ src/database/models/DocumentPrinter.js | 18 ++++++++----- src/database/models/DocumentSize.js | 4 +-- src/database/models/DocumentTemplate.js | 4 +-- src/database/models/Filament.js | 10 +++++--- src/database/models/FilamentProfile.js | 13 +++++++--- src/database/models/FilamentSku.js | 4 +-- src/database/models/FilamentStock.js | 4 +-- src/database/models/File.js | 4 +-- src/database/models/FulfillmentPolicy.js | 4 +-- src/database/models/Host.js | 4 +-- src/database/models/Invoice.js | 4 +-- src/database/models/Job.js | 10 +++++--- src/database/models/Listing.js | 4 +-- src/database/models/ListingVarient.js | 4 +-- src/database/models/Marketplace.js | 4 +-- src/database/models/Material.js | 19 ++++++-------- src/database/models/NoteType.js | 12 ++++++--- src/database/models/OrderItem.js | 4 +-- src/database/models/Part.js | 10 +++++--- src/database/models/PartSku.js | 4 +-- src/database/models/PartStock.js | 4 +-- src/database/models/Payment.js | 4 +-- src/database/models/PaymentPolicy.js | 4 +-- src/database/models/PermissionSetting.js | 13 +++++++--- src/database/models/Printer.js | 4 +-- src/database/models/PrinterProfile.js | 18 ++++++++----- src/database/models/Product.js | 10 +++++--- src/database/models/ProductCategory.js | 4 +-- src/database/models/ProductSku.js | 4 +-- src/database/models/ProductStock.js | 4 +-- src/database/models/PurchaseOrder.js | 4 +-- src/database/models/ReturnPolicy.js | 4 +-- src/database/models/SalesOrder.js | 24 +++++++++--------- src/database/models/Shipment.js | 10 +++++--- src/database/models/StockAudit.js | 4 +-- src/database/models/StockAuditLevel.js | 4 +-- src/database/models/StockLocation.js | 22 ++++++++++------ src/database/models/StockTransfer.js | 4 +-- src/database/models/SubJob.js | 4 +-- src/database/models/TaxRate.js | 10 +++++--- src/database/models/TaxRecord.js | 8 ++++-- src/database/models/User.js | 4 +-- src/database/models/UserGroup.js | 10 +++++--- src/database/models/Vendor.js | 10 +++++--- 49 files changed, 259 insertions(+), 164 deletions(-) diff --git a/src/database/models/AppPassword.js b/src/database/models/AppPassword.js index 3dee39eb..fd120952 100644 --- a/src/database/models/AppPassword.js +++ b/src/database/models/AppPassword.js @@ -5,7 +5,8 @@ const AppPasswordInfo = lazy( import('../../components/Dashboard/Management/AppPasswords/AppPasswordInfo') ) const NewAppPassword = lazy( - () => import('../../components/Dashboard/Management/AppPasswords/NewAppPassword') + () => + import('../../components/Dashboard/Management/AppPasswords/NewAppPassword') ) const RegenerateAppPasswordSecret = lazy( () => @@ -36,7 +37,11 @@ export const AppPassword = { label: 'New App Password', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewAppPassword, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewAppPassword, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -140,7 +145,7 @@ export const AppPassword = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -166,7 +171,7 @@ export const AppPassword = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'user', diff --git a/src/database/models/Client.js b/src/database/models/Client.js index 5acfba20..b811ffa4 100644 --- a/src/database/models/Client.js +++ b/src/database/models/Client.js @@ -34,7 +34,11 @@ export const Client = { label: 'New Client', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewClient, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewClient, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -148,7 +152,7 @@ export const Client = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -173,7 +177,7 @@ export const Client = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'active', diff --git a/src/database/models/Courier.js b/src/database/models/Courier.js index 70ced73f..44adc925 100644 --- a/src/database/models/Courier.js +++ b/src/database/models/Courier.js @@ -34,7 +34,11 @@ export const Courier = { label: 'New Courier', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewCourier, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewCourier, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -104,7 +108,15 @@ export const Courier = { content: () => createElement(CourierInfo) } ], - columns: ['_reference', 'name', 'country', 'email', 'website', 'createdAt', 'updatedAt'], + columns: [ + '_reference', + 'name', + 'country', + 'email', + 'website', + 'createdAt', + 'updatedAt' + ], filters: [ 'name', 'website', @@ -116,14 +128,7 @@ export const Courier = { 'updatedAt', '_reference' ], - sorters: [ - 'name', - 'country', - 'email', - 'createdAt', - '_id', - 'updatedAt' - ], + sorters: ['name', 'country', 'email', 'createdAt', '_id', 'updatedAt'], group: ['country'], properties: [ { @@ -140,7 +145,7 @@ export const Courier = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -175,7 +180,7 @@ export const Courier = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'contact', diff --git a/src/database/models/CourierService.js b/src/database/models/CourierService.js index 6dec0b56..19f62746 100644 --- a/src/database/models/CourierService.js +++ b/src/database/models/CourierService.js @@ -168,7 +168,7 @@ export const CourierService = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -193,7 +193,7 @@ export const CourierService = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'courier', diff --git a/src/database/models/DocumentJob.js b/src/database/models/DocumentJob.js index 9453ff59..3e904c54 100644 --- a/src/database/models/DocumentJob.js +++ b/src/database/models/DocumentJob.js @@ -1,10 +1,12 @@ import { createElement, lazy } from 'react' const DocumentJobInfo = lazy( - () => import('../../components/Dashboard/Management/DocumentJobs/DocumentJobInfo') + () => + import('../../components/Dashboard/Management/DocumentJobs/DocumentJobInfo') ) const NewDocumentJob = lazy( - () => import('../../components/Dashboard/Management/DocumentJobs/NewDocumentJob') + () => + import('../../components/Dashboard/Management/DocumentJobs/NewDocumentJob') ) import InfoCircleIcon from '../../components/Icons/InfoCircleIcon' import PlusIcon from '../../components/Icons/PlusIcon' @@ -31,7 +33,11 @@ export const DocumentJob = { label: 'New Document Job', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewDocumentJob, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewDocumentJob, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -80,7 +86,7 @@ export const DocumentJob = { visible: (objectData) => { return objectData?._isEditing && objectData?._isEditing == true } - }, + } ], pages: [ { @@ -88,7 +94,14 @@ export const DocumentJob = { content: () => createElement(DocumentJobInfo) } ], - columns: ['_reference', 'name', 'quantity', 'state', 'createdAt', 'updatedAt'], + columns: [ + '_reference', + 'name', + 'quantity', + 'state', + 'createdAt', + 'updatedAt' + ], filters: [ 'name', 'quantity', @@ -114,7 +127,7 @@ export const DocumentJob = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -131,7 +144,7 @@ export const DocumentJob = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'name', @@ -214,7 +227,10 @@ export const DocumentJob = { step: 1, columnWidth: 125, value: (objectData) => { - if (objectData?.createdAt == undefined && objectData?.quantity == null) { + if ( + objectData?.createdAt == undefined && + objectData?.quantity == null + ) { return 1 } } diff --git a/src/database/models/DocumentPrinter.js b/src/database/models/DocumentPrinter.js index 416ff45c..b0349299 100644 --- a/src/database/models/DocumentPrinter.js +++ b/src/database/models/DocumentPrinter.js @@ -1,10 +1,12 @@ import { createElement, lazy } from 'react' const DocumentPrinterInfo = lazy( - () => import('../../components/Dashboard/Management/DocumentPrinters/DocumentPrinterInfo') + () => + import('../../components/Dashboard/Management/DocumentPrinters/DocumentPrinterInfo') ) const NewDocumentPrinter = lazy( - () => import('../../components/Dashboard/Management/DocumentPrinters/NewDocumentPrinter') + () => + import('../../components/Dashboard/Management/DocumentPrinters/NewDocumentPrinter') ) import InfoCircleIcon from '../../components/Icons/InfoCircleIcon' import PlusIcon from '../../components/Icons/PlusIcon' @@ -30,7 +32,11 @@ export const DocumentPrinter = { label: 'New Document Printer', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewDocumentPrinter, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewDocumentPrinter, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -79,7 +85,7 @@ export const DocumentPrinter = { visible: (objectData) => { return objectData?._isEditing && objectData?._isEditing == true } - }, + } ], pages: [ { @@ -131,7 +137,7 @@ export const DocumentPrinter = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -148,7 +154,7 @@ export const DocumentPrinter = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'name', diff --git a/src/database/models/DocumentSize.js b/src/database/models/DocumentSize.js index 727f29a1..80cfb4bc 100644 --- a/src/database/models/DocumentSize.js +++ b/src/database/models/DocumentSize.js @@ -147,7 +147,7 @@ export const DocumentSize = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -164,7 +164,7 @@ export const DocumentSize = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'name', diff --git a/src/database/models/DocumentTemplate.js b/src/database/models/DocumentTemplate.js index fd73ebf2..a75e5392 100644 --- a/src/database/models/DocumentTemplate.js +++ b/src/database/models/DocumentTemplate.js @@ -153,7 +153,7 @@ export const DocumentTemplate = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -178,7 +178,7 @@ export const DocumentTemplate = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'objectType', diff --git a/src/database/models/Filament.js b/src/database/models/Filament.js index 4060eb75..cb264847 100644 --- a/src/database/models/Filament.js +++ b/src/database/models/Filament.js @@ -34,7 +34,11 @@ export const Filament = { label: 'New Filament', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewFilament, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewFilament, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -171,7 +175,7 @@ export const Filament = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -188,7 +192,7 @@ export const Filament = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'name', diff --git a/src/database/models/FilamentProfile.js b/src/database/models/FilamentProfile.js index 7c253c88..9899afbd 100644 --- a/src/database/models/FilamentProfile.js +++ b/src/database/models/FilamentProfile.js @@ -5,7 +5,8 @@ const FilamentProfileInfo = lazy( import('../../components/Dashboard/Production/FilamentProfiles/FilamentProfileInfo') ) const NewFilamentProfile = lazy( - () => import('../../components/Dashboard/Production/FilamentProfiles/NewFilamentProfile') + () => + import('../../components/Dashboard/Production/FilamentProfiles/NewFilamentProfile') ) const DeleteObject = lazy( () => import('../../components/Dashboard/common/DeleteObject') @@ -35,7 +36,11 @@ export const FilamentProfile = { label: 'New Filament Profile', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewFilamentProfile, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewFilamentProfile, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -131,7 +136,7 @@ export const FilamentProfile = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -148,7 +153,7 @@ export const FilamentProfile = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'name', diff --git a/src/database/models/FilamentSku.js b/src/database/models/FilamentSku.js index b0b69e1f..5ec2e3e2 100644 --- a/src/database/models/FilamentSku.js +++ b/src/database/models/FilamentSku.js @@ -162,7 +162,7 @@ export const FilamentSku = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -187,7 +187,7 @@ export const FilamentSku = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'filament', diff --git a/src/database/models/FilamentStock.js b/src/database/models/FilamentStock.js index acb05b06..f94380b5 100644 --- a/src/database/models/FilamentStock.js +++ b/src/database/models/FilamentStock.js @@ -179,7 +179,7 @@ export const FilamentStock = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -196,7 +196,7 @@ export const FilamentStock = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'state', diff --git a/src/database/models/File.js b/src/database/models/File.js index 4eff87c5..7e777db7 100644 --- a/src/database/models/File.js +++ b/src/database/models/File.js @@ -143,7 +143,7 @@ export const File = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -168,7 +168,7 @@ export const File = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'type', diff --git a/src/database/models/FulfillmentPolicy.js b/src/database/models/FulfillmentPolicy.js index 2e00ac32..eadcc22b 100644 --- a/src/database/models/FulfillmentPolicy.js +++ b/src/database/models/FulfillmentPolicy.js @@ -145,7 +145,7 @@ export const FulfillmentPolicy = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -162,7 +162,7 @@ export const FulfillmentPolicy = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'name', diff --git a/src/database/models/Host.js b/src/database/models/Host.js index 70d11813..054acd13 100644 --- a/src/database/models/Host.js +++ b/src/database/models/Host.js @@ -159,7 +159,7 @@ export const Host = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -176,7 +176,7 @@ export const Host = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'name', diff --git a/src/database/models/Invoice.js b/src/database/models/Invoice.js index c39f27eb..c7bfa130 100644 --- a/src/database/models/Invoice.js +++ b/src/database/models/Invoice.js @@ -230,7 +230,7 @@ export const Invoice = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -248,7 +248,7 @@ export const Invoice = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'state', diff --git a/src/database/models/Job.js b/src/database/models/Job.js index ef774b30..af852575 100644 --- a/src/database/models/Job.js +++ b/src/database/models/Job.js @@ -38,7 +38,11 @@ export const Job = { label: 'New Job', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewJob, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewJob, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -177,7 +181,7 @@ export const Job = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -194,7 +198,7 @@ export const Job = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'state', diff --git a/src/database/models/Listing.js b/src/database/models/Listing.js index 7385165e..272df1f8 100644 --- a/src/database/models/Listing.js +++ b/src/database/models/Listing.js @@ -220,7 +220,7 @@ export const Listing = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -237,7 +237,7 @@ export const Listing = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'title', diff --git a/src/database/models/ListingVarient.js b/src/database/models/ListingVarient.js index a5f773bc..bfbb7aee 100644 --- a/src/database/models/ListingVarient.js +++ b/src/database/models/ListingVarient.js @@ -201,7 +201,7 @@ export const ListingVarient = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -218,7 +218,7 @@ export const ListingVarient = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'listing', diff --git a/src/database/models/Marketplace.js b/src/database/models/Marketplace.js index dabe1ac9..6d07f810 100644 --- a/src/database/models/Marketplace.js +++ b/src/database/models/Marketplace.js @@ -337,7 +337,7 @@ export const Marketplace = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -354,7 +354,7 @@ export const Marketplace = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'name', diff --git a/src/database/models/Material.js b/src/database/models/Material.js index 6af2af12..cc4e069c 100644 --- a/src/database/models/Material.js +++ b/src/database/models/Material.js @@ -34,7 +34,11 @@ export const Material = { label: 'New Material', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewMaterial, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewMaterial, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -105,14 +109,7 @@ export const Material = { } ], columns: ['_reference', 'name', 'tags', 'createdAt', 'updatedAt'], - filters: [ - '_id', - 'name', - 'tags', - 'createdAt', - 'updatedAt', - '_reference' - ], + filters: ['_id', 'name', 'tags', 'createdAt', 'updatedAt', '_reference'], sorters: ['name', 'createdAt', 'updatedAt', '_id'], group: ['tags'], properties: [ @@ -130,7 +127,7 @@ export const Material = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -155,7 +152,7 @@ export const Material = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'tags', diff --git a/src/database/models/NoteType.js b/src/database/models/NoteType.js index 2d186ee2..adb52e48 100644 --- a/src/database/models/NoteType.js +++ b/src/database/models/NoteType.js @@ -30,7 +30,11 @@ export const NoteType = { label: 'New Note Type', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewNoteType, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewNoteType, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -79,7 +83,7 @@ export const NoteType = { visible: (objectData) => { return objectData?._isEditing && objectData?._isEditing == true } - }, + } ], pages: [ { @@ -112,7 +116,7 @@ export const NoteType = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -137,7 +141,7 @@ export const NoteType = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'color', diff --git a/src/database/models/OrderItem.js b/src/database/models/OrderItem.js index 5aa64345..ff5206dc 100644 --- a/src/database/models/OrderItem.js +++ b/src/database/models/OrderItem.js @@ -178,7 +178,7 @@ export const OrderItem = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -195,7 +195,7 @@ export const OrderItem = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'name', diff --git a/src/database/models/Part.js b/src/database/models/Part.js index 66c6f72a..20bf48da 100644 --- a/src/database/models/Part.js +++ b/src/database/models/Part.js @@ -30,7 +30,11 @@ export const Part = { label: 'New Part', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewPart, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewPart, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -150,7 +154,7 @@ export const Part = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -167,7 +171,7 @@ export const Part = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'name', diff --git a/src/database/models/PartSku.js b/src/database/models/PartSku.js index 63847551..7a7273e1 100644 --- a/src/database/models/PartSku.js +++ b/src/database/models/PartSku.js @@ -167,7 +167,7 @@ export const PartSku = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -184,7 +184,7 @@ export const PartSku = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'name', diff --git a/src/database/models/PartStock.js b/src/database/models/PartStock.js index af9c8fc3..7dc6278f 100644 --- a/src/database/models/PartStock.js +++ b/src/database/models/PartStock.js @@ -181,7 +181,7 @@ export const PartStock = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -198,7 +198,7 @@ export const PartStock = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'state', diff --git a/src/database/models/Payment.js b/src/database/models/Payment.js index c34528aa..572fdec7 100644 --- a/src/database/models/Payment.js +++ b/src/database/models/Payment.js @@ -231,7 +231,7 @@ export const Payment = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -249,7 +249,7 @@ export const Payment = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'state', diff --git a/src/database/models/PaymentPolicy.js b/src/database/models/PaymentPolicy.js index 7c690a1a..1c1f5510 100644 --- a/src/database/models/PaymentPolicy.js +++ b/src/database/models/PaymentPolicy.js @@ -130,7 +130,7 @@ export const PaymentPolicy = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -147,7 +147,7 @@ export const PaymentPolicy = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'name', diff --git a/src/database/models/PermissionSetting.js b/src/database/models/PermissionSetting.js index 50573879..b1a30861 100644 --- a/src/database/models/PermissionSetting.js +++ b/src/database/models/PermissionSetting.js @@ -5,7 +5,8 @@ const PermissionSettingInfo = lazy( import('../../components/Dashboard/Management/PermissionSettings/PermissionSettingInfo') ) const NewPermissionSetting = lazy( - () => import('../../components/Dashboard/Management/PermissionSettings/NewPermissionSetting') + () => + import('../../components/Dashboard/Management/PermissionSettings/NewPermissionSetting') ) const DeleteObject = lazy( () => import('../../components/Dashboard/common/DeleteObject') @@ -36,7 +37,11 @@ export const PermissionSetting = { label: 'New Permission Setting', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewPermissionSetting, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewPermissionSetting, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -124,7 +129,7 @@ export const PermissionSetting = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -141,7 +146,7 @@ export const PermissionSetting = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'name', diff --git a/src/database/models/Printer.js b/src/database/models/Printer.js index 0c1ef202..d3e3869b 100644 --- a/src/database/models/Printer.js +++ b/src/database/models/Printer.js @@ -338,7 +338,7 @@ export const Printer = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -355,7 +355,7 @@ export const Printer = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'name', diff --git a/src/database/models/PrinterProfile.js b/src/database/models/PrinterProfile.js index 0d565779..adef0ab8 100644 --- a/src/database/models/PrinterProfile.js +++ b/src/database/models/PrinterProfile.js @@ -1,10 +1,12 @@ import { createElement, lazy } from 'react' const PrinterProfileInfo = lazy( - () => import('../../components/Dashboard/Production/PrinterProfiles/PrinterProfileInfo') + () => + import('../../components/Dashboard/Production/PrinterProfiles/PrinterProfileInfo') ) const NewPrinterProfile = lazy( - () => import('../../components/Dashboard/Production/PrinterProfiles/NewPrinterProfile') + () => + import('../../components/Dashboard/Production/PrinterProfiles/NewPrinterProfile') ) const DeleteObject = lazy( () => import('../../components/Dashboard/common/DeleteObject') @@ -299,7 +301,11 @@ export const PrinterProfile = { label: 'New Printer Profile', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewPrinterProfile, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewPrinterProfile, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -385,7 +391,7 @@ export const PrinterProfile = { 'createdAt', 'updatedAt' ], - filters: ['_id','name','createdAt','updatedAt','_reference'], + filters: ['_id', 'name', 'createdAt', 'updatedAt', '_reference'], sorters: [ 'name', 'printBedWidth', @@ -410,7 +416,7 @@ export const PrinterProfile = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -427,7 +433,7 @@ export const PrinterProfile = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'name', diff --git a/src/database/models/Product.js b/src/database/models/Product.js index 471624f5..caf49d6a 100644 --- a/src/database/models/Product.js +++ b/src/database/models/Product.js @@ -30,7 +30,11 @@ export const Product = { label: 'New Product', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewProduct, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewProduct, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -155,7 +159,7 @@ export const Product = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -172,7 +176,7 @@ export const Product = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'name', diff --git a/src/database/models/ProductCategory.js b/src/database/models/ProductCategory.js index 0fde6cfa..b62b06f4 100644 --- a/src/database/models/ProductCategory.js +++ b/src/database/models/ProductCategory.js @@ -138,7 +138,7 @@ export const ProductCategory = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -156,7 +156,7 @@ export const ProductCategory = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'name', diff --git a/src/database/models/ProductSku.js b/src/database/models/ProductSku.js index c391dd9f..234376a8 100644 --- a/src/database/models/ProductSku.js +++ b/src/database/models/ProductSku.js @@ -169,7 +169,7 @@ export const ProductSku = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -195,7 +195,7 @@ export const ProductSku = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'product', diff --git a/src/database/models/ProductStock.js b/src/database/models/ProductStock.js index bcae4d4d..7d1745a6 100644 --- a/src/database/models/ProductStock.js +++ b/src/database/models/ProductStock.js @@ -187,7 +187,7 @@ export const ProductStock = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -204,7 +204,7 @@ export const ProductStock = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'state', diff --git a/src/database/models/PurchaseOrder.js b/src/database/models/PurchaseOrder.js index 69f93693..5029608b 100644 --- a/src/database/models/PurchaseOrder.js +++ b/src/database/models/PurchaseOrder.js @@ -296,7 +296,7 @@ export const PurchaseOrder = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -314,7 +314,7 @@ export const PurchaseOrder = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'state', diff --git a/src/database/models/ReturnPolicy.js b/src/database/models/ReturnPolicy.js index ac04f437..62ac568f 100644 --- a/src/database/models/ReturnPolicy.js +++ b/src/database/models/ReturnPolicy.js @@ -154,7 +154,7 @@ export const ReturnPolicy = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -171,7 +171,7 @@ export const ReturnPolicy = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'name', diff --git a/src/database/models/SalesOrder.js b/src/database/models/SalesOrder.js index 69e2279c..77d6896e 100644 --- a/src/database/models/SalesOrder.js +++ b/src/database/models/SalesOrder.js @@ -43,7 +43,11 @@ export const SalesOrder = { label: 'New Sales Order', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewSalesOrder, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewSalesOrder, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -160,7 +164,10 @@ export const SalesOrder = { ] return !allowedStates.includes(objectData?.state?.type) }, - objectData: (objectData) => ({ orderType: 'salesOrder', order: objectData }) + objectData: (objectData) => ({ + orderType: 'salesOrder', + order: objectData + }) }, { type: 'divider' }, { @@ -233,14 +240,7 @@ export const SalesOrder = { } ], group: ['client'], - filters: [ - 'client', - 'state', - 'value', - 'createdAt', - 'updatedAt', - '_reference' - ], + filters: ['client', 'state', 'value', 'createdAt', 'updatedAt', '_reference'], sorters: ['createdAt', 'state', 'updatedAt'], columns: [ '_reference', @@ -272,7 +272,7 @@ export const SalesOrder = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -290,7 +290,7 @@ export const SalesOrder = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'state', diff --git a/src/database/models/Shipment.js b/src/database/models/Shipment.js index ec3e5d3a..4b158579 100644 --- a/src/database/models/Shipment.js +++ b/src/database/models/Shipment.js @@ -43,7 +43,11 @@ export const Shipment = { label: 'New Shipment', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewShipment, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewShipment, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -225,7 +229,7 @@ export const Shipment = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -243,7 +247,7 @@ export const Shipment = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'state', diff --git a/src/database/models/StockAudit.js b/src/database/models/StockAudit.js index 084d9505..9419ddcc 100644 --- a/src/database/models/StockAudit.js +++ b/src/database/models/StockAudit.js @@ -173,7 +173,7 @@ export const StockAudit = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -190,7 +190,7 @@ export const StockAudit = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'state', diff --git a/src/database/models/StockAuditLevel.js b/src/database/models/StockAuditLevel.js index 3bb2bc63..585ea417 100644 --- a/src/database/models/StockAuditLevel.js +++ b/src/database/models/StockAuditLevel.js @@ -129,7 +129,7 @@ export const StockAuditLevel = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -146,7 +146,7 @@ export const StockAuditLevel = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'name', diff --git a/src/database/models/StockLocation.js b/src/database/models/StockLocation.js index ff6e04b1..7e2c7257 100644 --- a/src/database/models/StockLocation.js +++ b/src/database/models/StockLocation.js @@ -1,10 +1,12 @@ import { createElement, lazy } from 'react' const StockLocationInfo = lazy( - () => import('../../components/Dashboard/Inventory/StockLocations/StockLocationInfo') + () => + import('../../components/Dashboard/Inventory/StockLocations/StockLocationInfo') ) const NewStockLocation = lazy( - () => import('../../components/Dashboard/Inventory/StockLocations/NewStockLocation') + () => + import('../../components/Dashboard/Inventory/StockLocations/NewStockLocation') ) import StockLocationIcon from '../../components/Icons/StockLocationIcon' import PlusIcon from '../../components/Icons/PlusIcon' @@ -30,7 +32,11 @@ export const StockLocation = { label: 'New Stock Location', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewStockLocation, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewStockLocation, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -79,7 +85,7 @@ export const StockLocation = { visible: (objectData) => { return objectData?._isEditing && objectData?._isEditing == true } - }, + } ], pages: [ { @@ -87,8 +93,8 @@ export const StockLocation = { content: () => createElement(StockLocationInfo) } ], - filters: ['name','createdAt','updatedAt','_reference'], - sorters: ['name','createdAt','updatedAt'], + filters: ['name', 'createdAt', 'updatedAt', '_reference'], + sorters: ['name', 'createdAt', 'updatedAt'], columns: ['_reference', 'name', 'address', 'createdAt', 'updatedAt'], properties: [ { @@ -105,7 +111,7 @@ export const StockLocation = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -122,7 +128,7 @@ export const StockLocation = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'name', diff --git a/src/database/models/StockTransfer.js b/src/database/models/StockTransfer.js index 0224a2d0..c07efff2 100644 --- a/src/database/models/StockTransfer.js +++ b/src/database/models/StockTransfer.js @@ -172,7 +172,7 @@ export const StockTransfer = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -189,7 +189,7 @@ export const StockTransfer = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'state', diff --git a/src/database/models/SubJob.js b/src/database/models/SubJob.js index 0320e31d..89b36adb 100644 --- a/src/database/models/SubJob.js +++ b/src/database/models/SubJob.js @@ -97,7 +97,7 @@ export const SubJob = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -114,7 +114,7 @@ export const SubJob = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'state', diff --git a/src/database/models/TaxRate.js b/src/database/models/TaxRate.js index c0dfc779..89c71ba0 100644 --- a/src/database/models/TaxRate.js +++ b/src/database/models/TaxRate.js @@ -35,7 +35,11 @@ export const TaxRate = { label: 'New Tax Rate', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewTaxRate, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewTaxRate, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -154,7 +158,7 @@ export const TaxRate = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -179,7 +183,7 @@ export const TaxRate = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'active', diff --git a/src/database/models/TaxRecord.js b/src/database/models/TaxRecord.js index b10164e4..a632547f 100644 --- a/src/database/models/TaxRecord.js +++ b/src/database/models/TaxRecord.js @@ -34,7 +34,11 @@ export const TaxRecord = { label: 'New Tax Record', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewTaxRecord, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewTaxRecord, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -148,7 +152,7 @@ export const TaxRecord = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', diff --git a/src/database/models/User.js b/src/database/models/User.js index a8c2661e..37b7ce66 100644 --- a/src/database/models/User.js +++ b/src/database/models/User.js @@ -121,7 +121,7 @@ export const User = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -138,7 +138,7 @@ export const User = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'name', diff --git a/src/database/models/UserGroup.js b/src/database/models/UserGroup.js index 204ed2ea..44f3992a 100644 --- a/src/database/models/UserGroup.js +++ b/src/database/models/UserGroup.js @@ -35,7 +35,11 @@ export const UserGroup = { label: 'New User Group', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewUserGroup, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewUserGroup, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -135,7 +139,7 @@ export const UserGroup = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -152,7 +156,7 @@ export const UserGroup = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'name', diff --git a/src/database/models/Vendor.js b/src/database/models/Vendor.js index 0afab917..780f116b 100644 --- a/src/database/models/Vendor.js +++ b/src/database/models/Vendor.js @@ -34,7 +34,11 @@ export const Vendor = { label: 'New Vendor', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewVendor, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewVendor, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -147,7 +151,7 @@ export const Vendor = { label: 'Created At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: '_reference', @@ -172,7 +176,7 @@ export const Vendor = { label: 'Updated At', type: 'dateTime', readOnly: true, - columnWidth: 175 + columnWidth: 200 }, { name: 'contact',