Fixed missing images for convention figure (#487)

Removed link to topics for tagName 'wird_abgebildet_durchThemaRef'
DiPA-Projekt · Jun 25, 2024 · ee8fc57 · ee8fc57
1 parent 3f95e18
commit ee8fc57
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/client/src/components/projekthandbuch/documentation/content/Content.tsx b/client/src/components/projekthandbuch/documentation/content/Content.tsx
@@ -14,6 +14,7 @@ import {
   getJsonDataFromXml,
   getMenuItemByAttributeValue,
   getSearchStringFromHash,
+  replaceImageUrlInText,
   replaceUrlInText,
 } from '../../../../shares/utils';
 import { AnchorLinkItemProps } from 'antd/es/anchor/Anchor';
@@ -32,7 +33,7 @@ import { ProjectType } from '../../projekt/project';
 function getConceptMappingData(conceptMapping: XMLElement, tagName: string, suffix: string): DataEntry[] {
   return conceptMapping.getElementsByTagName(tagName).map((data: XMLElement) => {
     const dataEntry: DataEntry = {
-      id: data.attributes.id,
+      id: tagName !== 'wird_abgebildet_durchThemaRef' ? data.attributes.id : undefined,
       title: data.attributes?.name || data.attributes?.titel,
       suffix: suffix,
     };
@@ -1726,7 +1727,7 @@ export function Content() {
     return {
       id: jsonDataFromXml.attributes.id,
       header: jsonDataFromXml.attributes.name,
-      descriptionText: summary,
+      descriptionText: replaceImageUrlInText(summary, tailoringParameter),
       tableEntries: tableEntries,
     };
   }

diff --git a/client/src/components/projekthandbuch/documentation/content/TableEntriesList.tsx b/client/src/components/projekthandbuch/documentation/content/TableEntriesList.tsx
@@ -42,7 +42,7 @@ export function TableEntriesList(props: { inputData: DataEntry[] }) {
           } else {
             entries.push(
               <span style={{ marginRight: '20px' }} key={`table-item-entrySubItem-${innerEntryItemIndex}`}>
-                {parse(fixLinksInText(innerEntryItem.title))}
+                <span style={{ color: '#333' }}>{parse(fixLinksInText(innerEntryItem.title))}</span>
                 {innerEntryItem.suffix && <span style={{ marginLeft: '5px' }}>{innerEntryItem.suffix}</span>}
               </span>
             );
@@ -60,7 +60,7 @@ export function TableEntriesList(props: { inputData: DataEntry[] }) {
       } else {
         entries.push(
           <span style={{ marginRight: '20px' }} key={`table-item-entryItem-${entryItemIndex}`}>
-            {parse(fixLinksInText(entryItem.title))}
+            <span style={{ color: '#333' }}>{parse(fixLinksInText(entryItem.title))}</span>
             {entryItem.suffix && <span style={{ marginLeft: '5px' }}>{entryItem.suffix}</span>}
           </span>
         );

diff --git a/client/src/shares/utils.ts b/client/src/shares/utils.ts
@@ -116,6 +116,15 @@ export function replaceUrlInText(text: string, tailoringParameter: any, projectF
   );
 }
 
+export function replaceImageUrlInText(text: string, tailoringParameter: any): string {
+  return text.replace(
+    /src=['"](?:[^"'\/]*\/)*([^'"]+)['"]/g,
+    'src="https://vm-api.weit-verein.de/Tailoring/V-Modellmetamodell/mm_2021/V-Modellvariante/' +
+      tailoringParameter.modelVariantId +
+      '/Projekttyp/xxx/Projekttypvariante/xxx/Grafik/images/$1"'
+  );
+}
+
 export function removeLinksFromHtml(htmlString: string) {
   const elem = document.createElement('div');
   elem.innerHTML = htmlString;