diff --git a/lang/en/back.php b/lang/en/back.php index eabadd4f..acac7169 100644 --- a/lang/en/back.php +++ b/lang/en/back.php @@ -134,6 +134,7 @@ return [ "crop" => "crop", "slugify" => "slugify", "filter" => "filter|filters", + "element" => ":count element|:count elements", "image_cropper" => [ "state_file_uploaded" => "a file is uploaded with success", "modale_title" => "Image modification", diff --git a/lang/en/validation.php b/lang/en/validation.php index e0dd5237..84368cef 100644 --- a/lang/en/validation.php +++ b/lang/en/validation.php @@ -268,6 +268,7 @@ return [ "latitude" => "latitude", "longitude" => "longitude", "color" => "color", + "value" => "value", "document" => [ "exercice" => "exercice|exercices", "tag" => "etiquette|etiquettes", diff --git a/lang/fr/back.php b/lang/fr/back.php index 51a65b3e..c4e9aa90 100644 --- a/lang/fr/back.php +++ b/lang/fr/back.php @@ -134,6 +134,7 @@ return [ "crop" => "recadrer", "slugify" => "slugifier", "filter" => "filtre|filtres", + "element" => ":count élément|:count éléments", "image_cropper" => [ "state_file_uploaded" => "un fichier à bien été chargé", "modale_title" => "Modification de l'image", diff --git a/lang/fr/validation.php b/lang/fr/validation.php index 967fdbd2..5de03029 100644 --- a/lang/fr/validation.php +++ b/lang/fr/validation.php @@ -266,6 +266,7 @@ return [ "latitude" => "latitude", "longitude" => "longitude", "color" => "couleur", + "value" => "valeur", "document" => [ "exercice" => "exercice|exercices", "tag" => "étiquette|étiquettes", diff --git a/resources/ts/back/Components/DynamicPages/DynamicPageDetails.tsx b/resources/ts/back/Components/DynamicPages/DynamicPageDetails.tsx new file mode 100644 index 00000000..d665266d --- /dev/null +++ b/resources/ts/back/Components/DynamicPages/DynamicPageDetails.tsx @@ -0,0 +1,104 @@ +// * Packages +import { ReactNode } from "react"; +// * Components shadcn +import { + Accordion, + AccordionContent, + AccordionItem, + AccordionTrigger, +} from "@/components/ui/accordion"; +// * Other +import str from "@/hooks/use-string"; +import useTrans from "@/hooks/use-translations"; +import { ConfigField } from "@/back/types/global"; +import { cn } from "@/lib/utils"; + +type DynamicPageDetailsProps = { + value: string | object; + config: ConfigField[]; +}; + +export default function DynamicPageDetails({ value, config }: DynamicPageDetailsProps) { + const transLabel = str(useTrans("validation.custom.label")).ucFirst().value(); + const transValue = str(useTrans("validation.custom.value")).ucFirst().value(); + const tableNotKnownTrans = str(useTrans("back.table_not_known")).ucFirst().value(); + + const RenderRows = (value: string | number | object, config: ConfigField[], hasBorders: boolean = false, path: string = ""): ReactNode => + config.map((field, index) => { + const hasChildren = !!field.children?.length; + const accordionKey = path ? `${path}.${field.key}-${index}` : `${field.key}-${index}`; + + const rowContent = (hasChildren: boolean = false) => { + const cellClasses = "break-words whitespace-normal"; + const placeholderClasses = "text-sm text-muted-foreground break-words whitespace-normal"; + + const fieldValue = value[field.key as keyof typeof value]; + + const cellContent = hasChildren + ? (() => { + const count = Array.isArray(fieldValue) + ? Object.values(fieldValue).length + : 0; + return ( +
+ {useTrans('back.element', { + params: { count: String(count) }, + choice: count > 1 ? 2 : 1, + })} +
+ ); + })() + : fieldValue !== null && fieldValue !== undefined + ?+ {(typeof fieldValue === 'boolean') ? useTrans(fieldValue ? 'back.yes' : 'back.no') : fieldValue} +
+ :{tableNotKnownTrans}
; + + return ( +{field.label}
+ {cellContent} + {!hasChildren && } +{getEnumDynamicFieldType(field.type)?.label}
+
+ {field.label}
+ {`(${field.key})`}
+
- ({field.key})
-
- {String(value[appEnv.locale])}
- }; + return{String(value[appEnv.locale])}
; + } return ( {tableNotKnownTrans} ); - } + }, }, { accessorKey: "status", diff --git a/resources/ts/back/Pages/NewsCategory/Show.tsx b/resources/ts/back/Pages/NewsCategory/Show.tsx index e78825d2..39c95b75 100644 --- a/resources/ts/back/Pages/NewsCategory/Show.tsx +++ b/resources/ts/back/Pages/NewsCategory/Show.tsx @@ -32,7 +32,6 @@ export default function Show({ data, modelName, news }: { data: SingleResource, }; const { viewAny } = auth.policies.newsCategories; const model = data.data as NewsCategoryModel; - console.log({news, model}) const actionModels = [ Views.EDITION, Views.DELETION, diff --git a/resources/ts/back/Pages/PageConfigs/Show.tsx b/resources/ts/back/Pages/PageConfigs/Show.tsx index 31838618..146bc8d7 100644 --- a/resources/ts/back/Pages/PageConfigs/Show.tsx +++ b/resources/ts/back/Pages/PageConfigs/Show.tsx @@ -7,7 +7,7 @@ import { Badge } from "@/components/ui/badge"; import AuthenticatedLayout from "@/back/Layouts/AuthenticatedLayout"; import DetailsTable from "@/back/Components/Table/DetailsTable"; import ModelActions from "@/back/Components/ModelActions"; -import ConfigTable from "@/back/Components/PageConfigs/ConfigTable"; +import ConfigDetails from "@/back/Components/PageConfigs/ConfigDetails"; import { Views } from "@/lib/utils"; import { useFormatedDate } from "@/hooks/use-formated-value"; import { @@ -51,7 +51,7 @@ export default function Show({ data, modelName }: { data: SingleResource, modelN accessorKey: "config", header: str(useTrans("validation.custom.config")).ucFirst().value(), cell: ({ value }: { value: TranslationField{useTrans('back.table_not_known')}
), }, { diff --git a/resources/ts/back/types/global.d.ts b/resources/ts/back/types/global.d.ts index 03b887da..2f2e5046 100644 --- a/resources/ts/back/types/global.d.ts +++ b/resources/ts/back/types/global.d.ts @@ -67,6 +67,7 @@ type DynamicPageModel = { deleted_at: Date; parent_page: DynamicPageModel | null; children_page: DynamicPageModel[]; + config: PageConfigModel; }; type DynamicFieldTypes = Record< string,