src/components/Dashboard/Management/FilamentSkus/NewFilamentSku.jsx

@@ -8,11 +8,7 @@ const NewFilamentSku = ({ onOk, reset, defaultValues }) => {
     <NewObjectForm
       type='filamentSku'
       reset={reset}
-      defaultValues={{
+      defaultValues={defaultValues}
-        overrideCost: false,
-        color: '#ff0000',
-        ...defaultValues
-      }}
     >
       {({ handleSubmit, submitLoading, objectData, formValid }) => {
         const steps = [
@@ -23,7 +19,7 @@ const NewFilamentSku = ({ onOk, reset, defaultValues }) => {
               <ObjectInfo
                 type='filamentSku'
                 column={1}
-                labelWidth={80}
+                labelWidth={70}
                 bordered={false}
                 isEditing={true}
                 required={true}
@@ -33,26 +29,27 @@ const NewFilamentSku = ({ onOk, reset, defaultValues }) => {
                   cost: false,
                   costWithTax: false,
                   costTaxRate: false,
-                  overrideCost: false,
                   vendor: false
                 }}
               />
             )
           },
           {
-            title: 'Cost',
+            title: 'Color & Cost',
-            key: 'cost',
+            key: 'colorCost',
             content: (
               <ObjectInfo
                 type='filamentSku'
                 column={1}
-                labelWidth={120}
+                labelWidth={100}
-                required={true}
                 visibleProperties={{
-                  overrideCost: true,
+                  _id: false,
-                  cost: true,
+                  createdAt: false,
-                  costTaxRate: true,
+                  updatedAt: false,
-                  costWithTax: true
+                  barcode: false,
+                  filament: false,
+                  name: false,
+                  description: false
                 }}
                 bordered={false}
                 isEditing={true}
@@ -67,7 +64,7 @@ const NewFilamentSku = ({ onOk, reset, defaultValues }) => {
               <ObjectInfo
                 type='filamentSku'
                 column={1}
-                labelWidth={110}
+                labelWidth={100}
                 visibleProperties={{
                   barcode: true,
                   description: true
@@ -91,9 +88,9 @@ const NewFilamentSku = ({ onOk, reset, defaultValues }) => {
                   _id: false,
                   _reference: false
                 }}
+                labelWidth={100}
                 bordered={false}
                 isEditing={false}
-                labelWidth={120}
                 objectData={objectData}
               />
             )

src/components/Dashboard/Management/Filaments/FilamentInfo.jsx

@@ -238,7 +238,7 @@ const FilamentInfo = () => {
                 }}
                 reset={newFilamentSkuOpen}
                 defaultValues={{
-                  filament: objectFormState?.objectData || undefined
+                  filament: filamentId ? { _id: filamentId } : undefined
                 }}
               />
             </Modal>

src/components/Dashboard/Management/Filaments/NewFilament.jsx

@@ -18,33 +18,7 @@ const NewFilament = ({ onOk }) => {
                 bordered={false}
                 isEditing={true}
                 required={true}
-                labelWidth={120}
                 objectData={objectData}
-                visibleProperties={{
-                  cost: false,
-                  costTaxRate: false,
-                  costWithTax: false
-                }}
-              />
-            )
-          },
-          {
-            title: 'Cost',
-            key: 'cost',
-            content: (
-              <ObjectInfo
-                type='filament'
-                column={1}
-                bordered={false}
-                isEditing={true}
-                required={true}
-                labelWidth={120}
-                objectData={objectData}
-                visibleProperties={{
-                  cost: true,
-                  costTaxRate: true,
-                  costWithTax: true
-                }}
               />
             )
           },
@@ -58,7 +32,6 @@ const NewFilament = ({ onOk }) => {
                 bordered={false}
                 isEditing={true}
                 required={false}
-                labelWidth={90}
                 objectData={objectData}
               />
             )
@@ -77,7 +50,6 @@ const NewFilament = ({ onOk }) => {
                   createdAt: false,
                   updatedAt: false
                 }}
-                labelWidth={120}
                 isEditing={false}
                 objectData={objectData}
               />

src/components/Dashboard/Management/Parts/NewPart.jsx

@@ -26,7 +26,6 @@ const NewPart = ({ onOk, defaultValues }) => {
                 isEditing={true}
                 required={true}
                 objectData={objectData}
-                labelWidth={70}
                 visibleProperties={{
                   file: false,
                   priceMode: false,
@@ -52,7 +51,6 @@ const NewPart = ({ onOk, defaultValues }) => {
                 isEditing={true}
                 required={true}
                 objectData={objectData}
-                labelWidth={120}
                 visibleProperties={{
                   priceMode: true,
                   margin: true,
@@ -76,7 +74,6 @@ const NewPart = ({ onOk, defaultValues }) => {
                 bordered={false}
                 isEditing={true}
                 required={false}
-                labelWidth={50}
                 objectData={objectData}
               />
             )

src/components/Dashboard/common/DashboardNavigation.jsx

@@ -225,7 +225,7 @@ const DashboardNavigation = () => {
         align='center'
         style={{ marginTop: '-2px', marginRight: '6px' }}
       >
-        <Space style={{ paddingTop: '2px', marginRight: '8px' }}>
+        <Space style={{ paddingTop: '2px' }}>
           <WebAppSwitcher />
           <KeyboardShortcut
             shortcut='alt+q'

src/database/models/Filament.js

@@ -88,14 +88,7 @@ export const Filament = {
     'updatedAt'
   ],
   filters: ['_id', 'name', 'material', 'cost', 'costWithTax'],
-  sorters: [
+  sorters: ['name', 'createdAt', 'material', 'cost', 'costWithTax', 'updatedAt'],
-    'name',
-    'createdAt',
-    'material',
-    'cost',
-    'costWithTax',
-    'updatedAt'
-  ],
   group: ['diameter', 'material'],
   properties: [
     {
@@ -175,7 +168,7 @@ export const Filament = {
     {
       name: 'cost',
       label: 'Cost',
-      required: true,
+      required: false,
       columnWidth: 100,
       type: 'number',
       prefix: '£',
@@ -185,7 +178,7 @@ export const Filament = {
     {
       name: 'costWithTax',
       label: 'Cost w/ Tax',
-      required: true,
+      required: false,
       readOnly: true,
       type: 'number',
       prefix: '£',
@@ -208,7 +201,7 @@ export const Filament = {
     {
       name: 'costTaxRate',
       label: 'Cost Tax Rate',
-      required: true,
+      required: false,
       type: 'object',
       objectType: 'taxRate',
       showHyperlink: true,

src/database/models/FilamentSku.js

@@ -170,42 +170,36 @@ export const FilamentSku = {
     {
       name: 'overrideCost',
       label: 'Override Cost',
-      required: true,
+      required: false,
       type: 'bool',
+      value: (objectData) => objectData?.overrideCost ?? false,
       columnWidth: 150
     },
     {
       name: 'cost',
       label: 'Cost',
-      required: true,
+      required: false,
       type: 'number',
       prefix: '£',
       min: 0,
       step: 0.01,
-      visible: (objectData) => {
+      disabled: (objectData) => !objectData?.overrideCost,
-        return objectData?.overrideCost
-      },
       value: (objectData) =>
-        objectData?.overrideCost
+        objectData?.overrideCost ? objectData?.cost : undefined,
-          ? objectData?.cost
-          : objectData?.filament?.cost,
       columnWidth: 100
     },
     {
       name: 'costWithTax',
       label: 'Cost w/ Tax',
-      required: true,
+      required: false,
       readOnly: true,
       type: 'number',
       prefix: '£',
       min: 0,
       step: 0.01,
-      visible: (objectData) => {
+      disabled: (objectData) => !objectData?.overrideCost,
-        return objectData?.overrideCost
-      },
       value: (objectData) => {
-        if (!objectData?.overrideCost)
+        if (!objectData?.overrideCost) return undefined
-          return objectData?.filament?.costWithTax || undefined
         const cost = objectData?.cost
         const taxRate = objectData?.costTaxRate
         if (!cost) return 0
@@ -221,17 +215,13 @@ export const FilamentSku = {
     {
       name: 'costTaxRate',
       label: 'Cost Tax Rate',
-      required: true,
+      required: false,
       type: 'object',
       objectType: 'taxRate',
       showHyperlink: true,
-      visible: (objectData) => {
+      disabled: (objectData) => !objectData?.overrideCost,
-        return objectData?.overrideCost
-      },
       value: (objectData) =>
-        objectData?.overrideCost
+        objectData?.overrideCost ? objectData?.costTaxRate : undefined,
-          ? objectData?.costTaxRate
-          : objectData?.filament?.costTaxRate,
       columnWidth: 150
     }
   ]