feat(ViewCreator): default to resolve target if it's a reference

equinor · Oct 30, 2023 · ddaf686 · ddaf686
1 parent d056deb
commit ddaf686
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/example/app/data/DemoDataSource/recipes/plugins/grid/car_grid/tyreList.recipe.json b/example/app/data/DemoDataSource/recipes/plugins/grid/car_grid/tyreList.recipe.json
@@ -12,7 +12,7 @@
   },
   "uiRecipes": [
     {
-      "name": "Form",
+      "name": "Edit",
       "type": "CORE:UiRecipe",
       "plugin": "@development-framework/dm-core-plugins/form"
     },

diff --git a/example/docker-compose.yaml b/example/docker-compose.yaml
@@ -2,7 +2,7 @@ version: '3.4'
 
 services:
   dmss:
-    image: datamodelingtool.azurecr.io/dmss:v1.6.4
+    image: datamodelingtool.azurecr.io/dmss:v1.7.1
     platform: linux/amd64
     restart: unless-stopped
     environment:

diff --git a/example/package.json b/example/package.json
@@ -19,22 +19,22 @@
     "@types/node": "^16.11.58",
     "@types/react": "^18.2.8",
     "@types/react-dom": "^18.2.7",
+    "@types/react-plotly.js": "^2.6.0",
     "@types/react-router-dom": "^5.3.3",
     "@types/styled-components": "^5.1.26",
-    "@types/react-plotly.js": "^2.6.0",
+    "@typescript-eslint/eslint-plugin": "^6.7.3",
+    "@typescript-eslint/parser": "^6.7.3",
     "@vitejs/plugin-react-swc": "^3.3.2",
     "cross-env": "7.0.3",
     "eslint": "^8.42.0",
+    "eslint-plugin-react": "^7.33.2",
     "serve": "14.2.1",
     "typescript": "^5.2.2",
     "vite": "^4.4.9",
     "vite-plugin-checker": "^0.6.1",
     "vite-plugin-svgr": "^3.2.0",
     "vite-tsconfig-paths": "^4.2.0",
-    "vitest": "^0.34.3",
-    "eslint-plugin-react": "^7.33.2",
-    "@typescript-eslint/eslint-plugin": "^6.7.3",
-    "@typescript-eslint/parser": "^6.7.3"
+    "vitest": "^0.34.3"
   },
   "scripts": {
     "start": "cross-env REACT_APP_DM_JOB_URL=http://localhost:5001 vite",

diff --git a/example/src/plugins/marmo-ui/containers/views/SignalPlot.tsx b/example/src/plugins/marmo-ui/containers/views/SignalPlot.tsx
@@ -5,6 +5,7 @@ import {
   TGenericObject,
   useDocument,
 } from '@development-framework/dm-core'
+// @ts-ignore
 import Plot from 'react-plotly.js'
 
 const ESSPlotPlugin = (props: { document: TGenericObject }) => {

diff --git a/packages/dm-core/src/components/ViewCreator/ViewCreator.tsx b/packages/dm-core/src/components/ViewCreator/ViewCreator.tsx
@@ -43,16 +43,19 @@ export const ViewCreator = (props: TViewCreator): React.ReactElement => {
   const [isLoading, setIsLoading] = useState<boolean>(true)
   const [error, setError] = useState<Error>()
   const [attribute, setAttribute] = useState<TAttribute>()
+  const [directAddress, setDirectAddress] = useState<string>(idReference)
 
   const reference = getTarget(idReference, viewConfig)
 
   useEffect(() => {
     dmssAPI
       .attributeGet({
         address: reference,
+        resolve: props.viewConfig.resolve,
       })
       .then((response: AxiosResponse) => {
-        setAttribute(response.data)
+        setAttribute(response.data.attribute)
+        setDirectAddress(response.data.address)
       })
       .catch((error) => setError(error))
       .finally(() => setIsLoading(false))
@@ -77,7 +80,7 @@ export const ViewCreator = (props: TViewCreator): React.ReactElement => {
   if (isInlineRecipeViewConfig(viewConfig)) {
     return (
       <InlineRecipeView
-        idReference={reference}
+        idReference={directAddress}
         type={attribute.attributeType}
         viewConfig={viewConfig}
         onOpen={onOpen}
@@ -89,7 +92,7 @@ export const ViewCreator = (props: TViewCreator): React.ReactElement => {
     return (
       <EntityView
         type={attribute.attributeType}
-        idReference={reference}
+        idReference={directAddress}
         recipeName={viewConfig.recipe}
         onOpen={onOpen}
         dimensions={attribute.dimensions}
@@ -98,7 +101,7 @@ export const ViewCreator = (props: TViewCreator): React.ReactElement => {
   } else if (isViewConfig(viewConfig)) {
     return (
       <EntityView
-        idReference={reference}
+        idReference={directAddress}
         type={attribute.attributeType}
         onOpen={onOpen}
         dimensions={attribute.dimensions}

diff --git a/packages/dm-core/src/types.ts b/packages/dm-core/src/types.ts
@@ -165,6 +165,7 @@ export type TUserIdMapping = { userId: string; username: string }
 export type TViewConfig = {
   type: string
   scope?: string
+  resolve?: boolean
   label?: string
   eds_icon?: string
   roles?: string[]