tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Client: Fixed incorrect column name keys

Browse Source
This commit is contained in:
Donkie
2023-09-16 13:47:50 +02:00
parent 3b32361c6e
commit f722adec22
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/pages/filaments/list.tsx
View File

@@ -28,6 +28,11 @@ interface IFilamentCollapsed extends Omit<IFilament, "vendor"> {
"vendor.name": string | null;
}
function translateColumnI18nKey(columnName: string): string {
columnName = columnName.replace(".", "_");
return `filament.fields.${columnName}`;
}
const namespace = "filamentList-v2";
export const FilamentList: React.FC<IResourceComponentsProps> = () => {
@@ -125,7 +130,7 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
menu={{
items: allColumns.map((column_id) => ({
key: column_id,
label: t(`filament.fields.${column_id.replace(".", "_")}`),
label: t(translateColumnI18nKey(column_id)),
})),
selectedKeys: showColumns,
selectable: true,

13
client/src/pages/spools/list.tsx
View File

@@ -34,6 +34,13 @@ interface ISpoolCollapsed extends ISpool {
"filament.material"?: string;
}
function translateColumnI18nKey(columnName: string): string {
columnName = columnName.replace(".", "_");
if (columnName === "combined_name") columnName = "filament_name";
else if (columnName === "filament_material") columnName = "material";
return `spool.fields.${columnName}`;
}
const namespace = "spoolList-v2";
export const SpoolList: React.FC<IResourceComponentsProps> = () => {
@@ -179,9 +186,9 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
<Dropdown
trigger={["click"]}
menu={{
items: allColumns.map((column) => ({
key: column,
label: t(`spool.fields.${column.replace(".", "_")}`),
items: allColumns.map((column_id) => ({
key: column_id,
label: t(translateColumnI18nKey(column_id)),
})),
selectedKeys: showColumns,
selectable: true,