From ac813bb967e44ae07e040f13097cf6759f43888d Mon Sep 17 00:00:00 2001 From: Kitty Jose Date: Mon, 3 Jul 2023 12:40:49 +0100 Subject: [PATCH] making subdoc collapsible only on view mode --- packages/tdb-documents-ui/src/Viewer.js | 1 + .../src/components/DescriptionComponent.js | 4 +-- .../src/widgets/subDocumentWidget.js | 34 ++++++++++++++++--- 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/packages/tdb-documents-ui/src/Viewer.js b/packages/tdb-documents-ui/src/Viewer.js index 88dcb907..8398b55f 100644 --- a/packages/tdb-documents-ui/src/Viewer.js +++ b/packages/tdb-documents-ui/src/Viewer.js @@ -15,6 +15,7 @@ const SelectedLanguage = ({ language }) => { } + export const Viewer = ({ display, message, mode, type, onSubmit, readOnly, data, setData, documentation, language }) => { return
diff --git a/packages/tdb-documents-ui/src/components/DescriptionComponent.js b/packages/tdb-documents-ui/src/components/DescriptionComponent.js index 49e6e786..d1f87eb0 100644 --- a/packages/tdb-documents-ui/src/components/DescriptionComponent.js +++ b/packages/tdb-documents-ui/src/components/DescriptionComponent.js @@ -4,11 +4,11 @@ import { AiOutlineLink } from "react-icons/ai" // description field for document links // shows to which document a property is linked -export function getLinkedDescription (linked) { +export function getLinkedDescription (linked, type) { return - {`Linked to document: `} + {`Linked to ${type ? type : "document"}: `} {linked} diff --git a/packages/tdb-documents-ui/src/widgets/subDocumentWidget.js b/packages/tdb-documents-ui/src/widgets/subDocumentWidget.js index da88bf9a..0dbfc770 100644 --- a/packages/tdb-documents-ui/src/widgets/subDocumentWidget.js +++ b/packages/tdb-documents-ui/src/widgets/subDocumentWidget.js @@ -10,6 +10,7 @@ import { DisplayDocumentation } from "../templates" import { AiOutlineUp, AiOutlineRight } from "react-icons/ai" import { displayInternalProperties } from "../helpers/documentHelpers" import { HiddenSubDocumentWidgets } from "./hiddenWidgets" +import { getLinkedDescription } from "../components/DescriptionComponent" const CollapseMessage = ({ message, name, icon }) => { return <> @@ -115,7 +116,7 @@ function getExpanded(expanded, linked_to, frame) { } export const TDBSubDocument = ({ extracted, expanded, order_by, comment, props, index, hideFieldLabel, linked_to, propertyDocumentation, id, label, reference, subDocumentData, setSubDocumentData, args }) => { - const [open, setOpen] = useState(args.mode === CONST.VIEW ? getExpanded(expanded, linked_to, args.fullFrame) : expanded); + const [open, setOpen] = useState(args.mode === CONST.VIEW ? getExpanded(expanded, linked_to, args.fullFrame) : true); //const [open, setOpen] = useState(true); let uiFrame = args.uiFrame, mode = args.mode @@ -145,7 +146,7 @@ export const TDBSubDocument = ({ extracted, expanded, order_by, comment, props, className="tdb__label__width" hideFieldLabel={hideFieldLabel}/> -
@@ -176,7 +177,30 @@ export const TDBSubDocument = ({ extracted, expanded, order_by, comment, props, linked_to={linked_to} args={args}/>}
-
+ } + {mode !== CONST.VIEW && <> + + {getLinkedDescription (linked_to, `SubDocument`)} + +
+ {subDocumentData && linked_to === subDocumentData[CONST.TYPE] && } +
+ }
} \ No newline at end of file