Client: Rich URLs in comments

Closes #51
This commit is contained in:
Donkie
2023-08-12 20:59:37 +02:00
parent 5a8a5b185d
commit ecabc425c3
9 changed files with 81 additions and 30 deletions

View File

@@ -9,7 +9,14 @@ import { genericSorter, typeSorters } from "../../utils/sorting";
import { genericFilterer, typeFilters } from "../../utils/filtering";
import { EditOutlined, FilterOutlined } from "@ant-design/icons";
import { TableState, useInitialTableState, useStoreInitialState } from "../../utils/saveload";
import { DateColumn, FilteredColumn, NumberColumn, SortedColumn, SpoolIconColumn } from "../../components/column";
import {
DateColumn,
FilteredColumn,
NumberColumn,
RichColumn,
SortedColumn,
SpoolIconColumn,
} from "../../components/column";
dayjs.extend(utc);
@@ -246,7 +253,7 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
dataSource,
tableState,
})}
{SortedColumn({
{RichColumn({
id: "comment",
i18ncat: "filament",
dataSource,

View File

@@ -6,6 +6,7 @@ import { NumberFieldUnit } from "../../components/numberField";
import dayjs from "dayjs";
import utc from "dayjs/plugin/utc";
import { IFilament } from "./model";
import { enrichText } from "../../utils/parsing";
dayjs.extend(utc);
@@ -90,7 +91,7 @@ export const FilamentShow: React.FC<IResourceComponentsProps> = () => {
<Title level={5}>{t("filament.fields.article_number")}</Title>
<TextField value={record?.article_number} />
<Title level={5}>{t("filament.fields.comment")}</Title>
<TextField value={record?.comment} />
<TextField value={enrichText(record?.comment)} />
</Show>
);
};

View File

@@ -9,7 +9,14 @@ import { genericFilterer, typeFilters } from "../../utils/filtering";
import { ISpool } from "./model";
import { TableState, useInitialTableState, useSavedState, useStoreInitialState } from "../../utils/saveload";
import { EditOutlined, FilterOutlined, InboxOutlined, ToTopOutlined } from "@ant-design/icons";
import { DateColumn, FilteredColumn, NumberColumn, SortedColumn, SpoolIconColumn } from "../../components/column";
import {
DateColumn,
FilteredColumn,
NumberColumn,
RichColumn,
SortedColumn,
SpoolIconColumn,
} from "../../components/column";
import { setSpoolArchived } from "./functions";
import SelectAndPrint from "../../components/selectAndPrintDialog";
@@ -305,7 +312,7 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
dataSource,
tableState,
})}
{SortedColumn({
{RichColumn({
id: "comment",
i18ncat: "spool",
dataSource,

View File

@@ -6,6 +6,7 @@ import { NumberFieldUnit } from "../../components/numberField";
import dayjs from "dayjs";
import utc from "dayjs/plugin/utc";
import { ISpool } from "./model";
import { enrichText } from "../../utils/parsing";
dayjs.extend(utc);
@@ -90,7 +91,7 @@ export const SpoolShow: React.FC<IResourceComponentsProps> = () => {
<Title level={5}>{t("spool.fields.lot_nr")}</Title>
<TextField value={record?.lot_nr} />
<Title level={5}>{t("spool.fields.comment")}</Title>
<TextField value={record?.comment} />
<TextField value={enrichText(record?.comment)} />
<Title level={5}>{t("spool.fields.archived")}</Title>
<TextField value={record?.archived ? t("yes") : t("no")} />
</Show>

View File

@@ -9,7 +9,7 @@ import { genericFilterer, typeFilters } from "../../utils/filtering";
import { IVendor } from "./model";
import { TableState, useInitialTableState, useStoreInitialState } from "../../utils/saveload";
import { EditOutlined, FilterOutlined } from "@ant-design/icons";
import { DateColumn, SortedColumn } from "../../components/column";
import { DateColumn, RichColumn, SortedColumn } from "../../components/column";
dayjs.extend(utc);
@@ -141,7 +141,7 @@ export const VendorList: React.FC<IResourceComponentsProps> = () => {
dataSource,
tableState,
})}
{SortedColumn({
{RichColumn({
id: "comment",
i18ncat: "vendor",
dataSource,

View File

@@ -5,6 +5,7 @@ import { Typography } from "antd";
import dayjs from "dayjs";
import utc from "dayjs/plugin/utc";
import { IVendor } from "./model";
import { enrichText } from "../../utils/parsing";
dayjs.extend(utc);
@@ -31,7 +32,7 @@ export const VendorShow: React.FC<IResourceComponentsProps> = () => {
<Title level={5}>{t("vendor.fields.name")}</Title>
<TextField value={record?.name} />
<Title level={5}>{t("vendor.fields.comment")}</Title>
<TextField value={record?.comment} />
<TextField value={enrichText(record?.comment)} />
</Show>
);
};