diff --git a/libs/shared/lib/vis/common/types.ts b/libs/shared/lib/vis/common/types.ts index 118c0a933d4cc347e59b7425fdeda8afec80fdac..095a1ed5f2f66655afa494179c840196206da52a 100644 --- a/libs/shared/lib/vis/common/types.ts +++ b/libs/shared/lib/vis/common/types.ts @@ -14,8 +14,6 @@ export type VisualizationSettingsType = { }; export type VISComponentType<T> = { - displayName: keyof typeof Visualizations; - description: string; component: React.FC<VisualizationPropTypes<T>>; settingsComponent: FC<VisualizationSettingsPropTypes<T>>; settings: T; diff --git a/libs/shared/lib/vis/views/Recommender.tsx b/libs/shared/lib/vis/views/Recommender.tsx index 93682640b2da431b9ee579b9ba0e75d104cfcf53..28215cefcd9faef28da15cb1078750bc57e303aa 100644 --- a/libs/shared/lib/vis/views/Recommender.tsx +++ b/libs/shared/lib/vis/views/Recommender.tsx @@ -3,7 +3,6 @@ import Info from '../../components/info'; import { addVisualization } from '../../data-access/store/visualizationSlice'; import { useActiveSaveStateAuthorization, useAppDispatch } from '../../data-access'; import { Visualizations } from '../components/VisualizationPanel'; -import { isVisualizationReleased } from 'config'; type VisualizationDescription = { name: string; @@ -11,6 +10,32 @@ type VisualizationDescription = { description: string; }; +const displayNames: { [key: string]: string } = { + ArcPlot: 'ArcPlot', + MapVis: 'MapVis', + MatrixVis: 'MatrixVis', + NodeLinkVis: 'NodeLinkVis', + PaohVis: 'PaohVis', + TableVis: 'TableVis', + SemanticSubstratesVis: 'SemanticSubstratesVis', + RawJSONVis: 'RawJSONVis', + Vis0D: 'Vis0D', + Vis1D: 'Vis1D', +}; + +const descriptions: { [key: string]: string } = { + ArcPlot: '', + MapVis: 'Geographical Features', + MatrixVis: 'Overview & Details', + NodeLinkVis: 'General Patterns and Connections', + PaohVis: 'Paths and Connection', + TableVis: 'Node Attribute Statistics and Details', + SemanticSubstratesVis: 'Node/Edge Attribute Exploration', + RawJSONVis: '(Raw) Data Export', + Vis0D: 'KPI visualization', + Vis1D: 'Basic charts', +}; + export function Recommender() { const dispatch = useAppDispatch(); const saveStateAuthorization = useActiveSaveStateAuthorization(); @@ -18,18 +43,16 @@ export function Recommender() { useEffect(() => { const loadVisualizations = async () => { - const descriptions = await Promise.all( - Object.keys(Visualizations).map(async (key) => { - const visualizationModule = await Visualizations[key](); - const { default: visualizationComponent } = visualizationModule; + const visDescriptions = await Promise.all( + Object.keys(Visualizations).map((key) => { return { name: key, - displayName: visualizationComponent.displayName, - description: visualizationComponent.description, + displayName: displayNames[key], + description: descriptions[key], }; }), ); - setVisualizationDescriptions(descriptions); + setVisualizationDescriptions(visDescriptions); }; loadVisualizations(); diff --git a/libs/shared/lib/vis/visualizations/Vis0D/Vis0D.tsx b/libs/shared/lib/vis/visualizations/Vis0D/Vis0D.tsx index cc079a384abc81dc46850159c4af58a81f62a31c..b3c56b11d9584eff7919b3b5fd2b7f2c17293fdb 100644 --- a/libs/shared/lib/vis/visualizations/Vis0D/Vis0D.tsx +++ b/libs/shared/lib/vis/visualizations/Vis0D/Vis0D.tsx @@ -80,8 +80,6 @@ const Vis0DSettings = ({ settings, updateSettings }: VisualizationSettingsPropTy const Vis0DRef = React.createRef<Vis0DVisHandle>(); export const Vis0DComponent: VISComponentType<Vis0DProps> = { - displayName: '0Dvis', - description: 'KPI visualization', component: React.forwardRef((props: VisualizationPropTypes<Vis0DProps>, ref) => <Vis0D {...props} ref={Vis0DRef} />), settingsComponent: Vis0DSettings, settings: settings, diff --git a/libs/shared/lib/vis/visualizations/arcplotvis/arcplotvis.tsx b/libs/shared/lib/vis/visualizations/arcplotvis/arcplotvis.tsx index c7a336462e830d5cc54dd750408b8e2d72423f40..accdeb1fa2bffae6b7407153c06be46f23084099 100644 --- a/libs/shared/lib/vis/visualizations/arcplotvis/arcplotvis.tsx +++ b/libs/shared/lib/vis/visualizations/arcplotvis/arcplotvis.tsx @@ -238,8 +238,6 @@ const ArcPlotVisSettings = ({ // remove ts ignore when added to Visualization Dict, because displayname needs to be key of it // @ts-ignore export const ArcVisComponent: VISComponentType = { - displayName: 'ArcPlot', - description: '', component: ArcPlotVis, settingsComponent: ArcPlotVisSettings, settings: configuration, diff --git a/libs/shared/lib/vis/visualizations/documentation.mdx b/libs/shared/lib/vis/visualizations/documentation.mdx index 43cbe3c10d061d9f14c2177c7e9430f490bb6540..78ca28794738cac3c50995a0debfb317ed49fe35 100644 --- a/libs/shared/lib/vis/visualizations/documentation.mdx +++ b/libs/shared/lib/vis/visualizations/documentation.mdx @@ -62,7 +62,6 @@ const VisualizationSettings = ({configuration, graph, updateSettings}: { }; export const VisualizationComponent: VISComponentType = { - displayName: 'Visualization name', component: Visualization, settings: VisualizationSettings, configuration: configuration, diff --git a/libs/shared/lib/vis/visualizations/mapvis/mapvis.tsx b/libs/shared/lib/vis/visualizations/mapvis/mapvis.tsx index b53acfa01d9417cb83c10e9f67592874a5e42d9b..e06283d0ef022a2bacdeccd6ffd416ac0eb9b034 100644 --- a/libs/shared/lib/vis/visualizations/mapvis/mapvis.tsx +++ b/libs/shared/lib/vis/visualizations/mapvis/mapvis.tsx @@ -338,8 +338,6 @@ export const MapVis = forwardRef((props: VisualizationPropTypes<MapProps>, refEx const mapRef = React.createRef<{ exportImageInternal: () => void }>(); const MapComponent: VISComponentType<MapProps> = { - displayName: 'MapVis', - description: 'Geographical Features', component: React.forwardRef((props: VisualizationPropTypes<MapProps>, ref) => <MapVis {...props} ref={mapRef} />), settingsComponent: MapSettings, settings: settings, diff --git a/libs/shared/lib/vis/visualizations/matrixvis/matrixvis.tsx b/libs/shared/lib/vis/visualizations/matrixvis/matrixvis.tsx index 43b76513f74c06b57e7e3c230316fc1b58e9ae70..b3bc4d87dc0b683b0848629af4f7dd647b0fb410 100644 --- a/libs/shared/lib/vis/visualizations/matrixvis/matrixvis.tsx +++ b/libs/shared/lib/vis/visualizations/matrixvis/matrixvis.tsx @@ -79,8 +79,6 @@ const MatrixSettings = ({ settings, updateSettings }: VisualizationSettingsPropT const matrixVisRef = React.createRef<{ exportImageInternal: () => void }>(); export const MatrixVisComponent: VISComponentType<MatrixVisProps> = { - displayName: 'MatrixVis', - description: 'Overview & Details', component: React.forwardRef((props: VisualizationPropTypes<MatrixVisProps>, ref) => <MatrixVis {...props} ref={matrixVisRef} />), settingsComponent: MatrixSettings, settings: settings, diff --git a/libs/shared/lib/vis/visualizations/nodelinkvis/nodelinkvis.tsx b/libs/shared/lib/vis/visualizations/nodelinkvis/nodelinkvis.tsx index a62b3e8837af3f81287b55d1fd9222d4784bd2bb..d50ab60e511501545514c2e454046c53c0d92199 100644 --- a/libs/shared/lib/vis/visualizations/nodelinkvis/nodelinkvis.tsx +++ b/libs/shared/lib/vis/visualizations/nodelinkvis/nodelinkvis.tsx @@ -270,8 +270,6 @@ const NodelinkSettings = ({ settings, graphMetadata, updateSettings }: Visualiza const nodeLinkVisRef = React.createRef<{ exportImageInternal: () => void }>(); export const NodeLinkComponent: VISComponentType<NodelinkVisProps> = { - displayName: 'NodeLinkVis', - description: 'General Patterns and Connections', component: React.forwardRef((props: VisualizationPropTypes<NodelinkVisProps>, ref) => <NodeLinkVis {...props} ref={nodeLinkVisRef} />), settingsComponent: NodelinkSettings, settings: patchLegacySettings(settings), diff --git a/libs/shared/lib/vis/visualizations/paohvis/paohvis.tsx b/libs/shared/lib/vis/visualizations/paohvis/paohvis.tsx index 918a4c971237de93d0b362a3388eb9414089f55e..f62b8b0c9ba6f1acb83bf8c56af673b5f55b68c6 100644 --- a/libs/shared/lib/vis/visualizations/paohvis/paohvis.tsx +++ b/libs/shared/lib/vis/visualizations/paohvis/paohvis.tsx @@ -1148,8 +1148,6 @@ const PaohSettings = ({ settings, graphMetadata, updateSettings }: Visualization const paohvisRef = React.createRef<{ exportImageInternal: () => void }>(); export const PaohVisComponent: VISComponentType<PaohVisProps> = { - displayName: 'PaohVis', - description: 'Paths and Connection', component: React.forwardRef((props: VisualizationPropTypes<PaohVisProps>, ref) => <PaohVis {...props} ref={paohvisRef} />), settingsComponent: PaohSettings, settings: settings, diff --git a/libs/shared/lib/vis/visualizations/rawjsonvis/rawjsonvis.tsx b/libs/shared/lib/vis/visualizations/rawjsonvis/rawjsonvis.tsx index 9cfb89121adb6b0c12f296ad9c62a874aab22b0a..d7f7b2450617e5f44e1163f3adf34d20750b73a4 100644 --- a/libs/shared/lib/vis/visualizations/rawjsonvis/rawjsonvis.tsx +++ b/libs/shared/lib/vis/visualizations/rawjsonvis/rawjsonvis.tsx @@ -66,9 +66,7 @@ const RawJSONSettings = ({ settings, updateSettings }: VisualizationSettingsProp }; export const RawJSONComponent: VISComponentType<RawJSONVisProps> = { - displayName: 'RawJSONVis', component: RawJSONVis, - description: '(Raw) Data Export', settingsComponent: RawJSONSettings, settings: settings, exportImage: () => { diff --git a/libs/shared/lib/vis/visualizations/semanticsubstratesvis/semanticsubstratesvis.tsx b/libs/shared/lib/vis/visualizations/semanticsubstratesvis/semanticsubstratesvis.tsx index 4bad7ce70ccb339b5e0c16fa7c7841201ebb80f3..4cba54b9c0f2c519e1a97e24e04a5b1843bc41f6 100644 --- a/libs/shared/lib/vis/visualizations/semanticsubstratesvis/semanticsubstratesvis.tsx +++ b/libs/shared/lib/vis/visualizations/semanticsubstratesvis/semanticsubstratesvis.tsx @@ -41,8 +41,6 @@ const settings: SemSubstrProps = { dataPanels: [], }; -const displayName = 'SemanticSubstratesVis'; - const VisSemanticSubstrates = forwardRef<VisSemanticSubstratesHandle, VisualizationPropTypes<SemSubstrProps>>( ({ data, graphMetadata, settings, updateSettings }, refExternal) => { // for sizing the vis @@ -936,8 +934,6 @@ const SemSubstrSettings = ({ settings, updateSettings, graphMetadata }: Visualiz const SemSubstrVisRef = React.createRef<{ exportImageInternal: () => void }>(); export const SemSubstrVisComponent: VISComponentType<SemSubstrProps> = { - displayName: displayName, - description: 'Node/Edge Attribute Exploration', component: React.forwardRef((props: VisualizationPropTypes<SemSubstrProps>, ref) => ( <VisSemanticSubstrates {...props} ref={SemSubstrVisRef} /> )), diff --git a/libs/shared/lib/vis/visualizations/tablevis/tablevis.tsx b/libs/shared/lib/vis/visualizations/tablevis/tablevis.tsx index 23441c1634002a0217553db3ed9bc8e4163b2688..d4b7e802692e0d6925b0163468da71f8adabe404 100644 --- a/libs/shared/lib/vis/visualizations/tablevis/tablevis.tsx +++ b/libs/shared/lib/vis/visualizations/tablevis/tablevis.tsx @@ -242,8 +242,6 @@ const TableSettings = ({ settings, graphMetadata, updateSettings }: Visualizatio const tableRef = React.createRef<{ exportImageInternal: () => void }>(); export const TableComponent: VISComponentType<TableProps> = { - displayName: 'TableVis', - description: 'Node Attribute Statistics and Details', component: React.forwardRef((props: VisualizationPropTypes<TableProps>, ref) => <TableVis {...props} ref={tableRef} />), settingsComponent: TableSettings, settings: settings, diff --git a/libs/shared/lib/vis/visualizations/vis1D/Vis1D.tsx b/libs/shared/lib/vis/visualizations/vis1D/Vis1D.tsx index 42f8391d8de8eb9e64c86ab88042ea72fae134b5..739c992f50c1d97d51ddf030f4034b484a54dd40 100644 --- a/libs/shared/lib/vis/visualizations/vis1D/Vis1D.tsx +++ b/libs/shared/lib/vis/visualizations/vis1D/Vis1D.tsx @@ -155,8 +155,6 @@ const Vis1DSettings = ({ settings, graphMetadata, updateSettings }: Visualizatio const Vis1DRef = React.createRef<Vis1DVisHandle>(); export const Vis1DComponent: VISComponentType<Vis1DProps> = { - displayName: '1Dvis', - description: 'Basic charts', component: React.forwardRef((props: VisualizationPropTypes<Vis1DProps>, ref) => <Vis1D {...props} ref={Vis1DRef} />), settingsComponent: Vis1DSettings, settings: defaultSettings,