fix(view renderer): unify detailed view rendering (#271)

unigraph-dev · Dec 21, 2021 · 84c6056 · 84c6056
1 parent e4f0477
commit 84c6056
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 21 deletions.
diff --git a/packages/unigraph-dev-explorer/src/components/ObjectView/ViewObjectView.tsx b/packages/unigraph-dev-explorer/src/components/ObjectView/ViewObjectView.tsx
@@ -0,0 +1,24 @@
+import { ListItemText } from "@material-ui/core";
+import React from "react";
+import { unpad } from "unigraph-dev-common/lib/utils/entityUtils";
+import { DynamicViewRenderer } from "../../global";
+
+export const ViewItem: DynamicViewRenderer = ({data, callbacks}) => {
+    let unpadded: any = unpad(data);
+
+    return <React.Fragment>
+        <div onClick={() => window.newTab(window.layoutModel, {
+            type: 'tab',
+            config: {
+                uid: data?.uid,
+                type: data?.type?.['unigraph.id']
+            },
+            customTitle: true,
+            name: unpadded.name,
+            component: '/pages/library/object',
+            enableFloat: 'true'
+        })} style={{display: "contents"}}>
+            <ListItemText primary={unpadded.name}></ListItemText>
+        </div>
+    </React.Fragment>
+}
diff --git a/packages/unigraph-dev-explorer/src/components/UnigraphCore/FavoriteBar.tsx b/packages/unigraph-dev-explorer/src/components/UnigraphCore/FavoriteBar.tsx
@@ -1,29 +1,9 @@
-import { ListItemText } from "@material-ui/core";
 import React from "react";
 import { useEffectOnce } from "react-use";
 import { getRandomInt } from "unigraph-dev-common/lib/api/unigraph";
 import { byElementIndex, unpad } from "unigraph-dev-common/lib/utils/entityUtils";
-import { DynamicViewRenderer } from "../../global";
-import { isJsonString } from "unigraph-dev-common/lib/utils/utils";
 import { DynamicObjectListView } from "../ObjectView/DynamicObjectListView";
 
-export const ViewItem: DynamicViewRenderer = ({data, callbacks}) => {
-    let unpadded: any = unpad(data);
-
-    return <React.Fragment>
-        <div onClick={() => window.newTab(window.layoutModel, {
-            type: 'tab',
-            config: isJsonString(unpadded?.props) ? JSON.parse(unpadded.props).config : {},
-            customTitle: true,
-            name: unpadded.name,
-            component: typeof unpadded.view === "string" ? unpadded.view : "/pages/" + data._value.view._value.uid,
-            enableFloat: 'true'
-        })} style={{display: "contents"}}>
-            <ListItemText primary={unpadded.name}></ListItemText>
-        </div>
-    </React.Fragment>
-}
-
 export const FavoriteBar = () => {
 
     const [fav, setFav] = React.useState<any[]>([]);

diff --git a/packages/unigraph-dev-explorer/src/init.ts b/packages/unigraph-dev-explorer/src/init.ts
@@ -19,7 +19,7 @@ import { pb_init } from './components/UnigraphCore/Pinboard';
 import { ListObjectQuery, ListObjectView } from "./components/UnigraphCore/ListObjectView";
 import { getRandomInt } from "unigraph-dev-common/lib/api/unigraph";
 import { SubentityView } from "./components/UnigraphCore/SubentityView";
-import { ViewItem } from "./components/UnigraphCore/FavoriteBar";
+import { ViewItem } from "./components/ObjectView/ViewObjectView";
 
 window.reloadCommands = () => {
     const commandsState = window.unigraph.getState("registory/commands");