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

equinor · Oct 27, 2023 · 8c385c0 · 8c385c0
1 parent d056deb
commit 8c385c0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 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/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[]