WIP

example/docker-compose.yaml

@@ -10,8 +10,8 @@ services:
       ENVIRONMENT: ${ENVIRONMENT:-local}
       RESET_DATA_SOURCE: "off"
       SECRET_KEY: sg9aeUM5i1JO4gNN8fQadokJa3_gXQMLBjSGGYcfscs= # Don't reuse this in production...
-#    volumes:
-#      - ../../data-modelling-storage-service/src:/code/src
+    volumes:
+      - ../../data-modelling-storage-service/src:/code/src
     ports:
       - '5000:5000'
     depends_on:

example/src/ViewPage.tsx

@@ -36,7 +36,13 @@ function ViewPage() {
     )
   }
 
-  return <EntityView idReference={idReference} type={document.type} />
+  return (
+    <EntityView
+      idReference={idReference}
+      type={document.type}
+      entity={document}
+    />
+  )
 }
 
 export default ViewPage

example/src/index.tsx

@@ -1,5 +1,4 @@
 import '@development-framework/dm-core-plugins/dist/main.css'
-import React from 'react'
 import 'react-toastify/dist/ReactToastify.min.css'
 import './main.css'
 
@@ -26,13 +25,13 @@ const authConfig = {
 const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement)
 
 root.render(
-  <React.StrictMode>
+  <div>
     {authEnabled ? (
       <AuthProvider authConfig={authConfig}>
         <App />
       </AuthProvider>
     ) : (
       <App />
     )}
-  </React.StrictMode>
+  </div>
 )

example/src/plugins/marmo-ui/containers/views/SignalPlot.tsx

@@ -57,10 +57,12 @@ const ESSPlotPlugin = (props: { document: TGenericObject }) => {
 }
 
 const SignalPlot_Component = (props: IUIPlugin) => {
-  const { idReference } = props
+  const { idReference, entity } = props
   const { document, isLoading, error } = useDocument<TGenericObject>(
     idReference,
-    1
+    1,
+    true,
+    entity
   )
 
   if (isLoading) return <Loading />

packages/dm-core-plugins/src/form/FormPlugin.tsx

@@ -9,7 +9,9 @@ import { Form } from './components/Form'
 export const FormPlugin = (props: IUIPlugin) => {
   const { document, isLoading, updateDocument, error } = useDocument<any>(
     props.idReference,
-    0
+    0,
+    true,
+    props.entity
   )
 
   // react-hook-form is unable to rerender when the document is updated.

packages/dm-core-plugins/src/form/components/OpenObjectButton.tsx

@@ -1,6 +1,7 @@
 import {
   TInlineRecipeViewConfig,
   TReferenceViewConfig,
+  TValidEntity,
   TViewConfig,
 } from '@development-framework/dm-core'
 import { external_link } from '@equinor/eds-icons'
@@ -11,19 +12,22 @@ export const OpenObjectButton = ({
   viewId,
   viewConfig,
   idReference,
+  entity,
 }: {
   viewId: string
   viewConfig: TViewConfig | TReferenceViewConfig | TInlineRecipeViewConfig
   idReference?: string
+  entity?: TValidEntity
 }) => {
   const { onOpen } = useRegistryContext()
+  console.log(entity)
 
   return (
     <TooltipButton
       title='Open in tab'
       compact
       button-variant='ghost_icon'
-      button-onClick={() => onOpen?.(viewId, viewConfig, idReference)}
+      button-onClick={() => onOpen?.(viewId, viewConfig, entity, idReference)}
       icon={external_link}
     />
   )

packages/dm-core-plugins/src/form/fields/ArrayField/templates/ArrayComplexTemplate.tsx

@@ -43,6 +43,7 @@ export const ArrayComplexTemplate = (props: TArrayTemplate) => {
             onOpen?.(
               namePath,
               getOpenViewConfig(uiAttribute, namePath),
+              getValues(namePath),
               idReference
             )
           }
@@ -56,6 +57,7 @@ export const ArrayComplexTemplate = (props: TArrayTemplate) => {
             <OpenObjectButton
               viewId={namePath}
               viewConfig={getOpenViewConfig(uiAttribute, namePath)}
+              entity={getValues(namePath)}
             />
           )}
           {attribute.optional &&
@@ -88,6 +90,7 @@ export const ArrayComplexTemplate = (props: TArrayTemplate) => {
           idReference={`${idReference}.${namePath}`}
           onOpen={onOpen}
           viewConfig={getExpandViewConfig(uiAttribute)}
+          entity={getValues(namePath)}
         />
       </ComplexAttributeTemplate.Content>
     </ComplexAttributeTemplate>

packages/dm-core-plugins/src/form/fields/ObjectField/templates/ObjectModelContainedTemplate.tsx

@@ -49,6 +49,7 @@ export const ObjectModelContainedTemplate = (
             onOpen?.(
               namePath,
               getOpenViewConfig(uiAttribute, namePath),
+              value,
               idReference
             )
           }
@@ -61,6 +62,7 @@ export const ObjectModelContainedTemplate = (
               viewId={namePath}
               idReference={idReference}
               viewConfig={getOpenViewConfig(uiAttribute, namePath)}
+              entity={value}
             />
           )}
           {attribute.optional &&
@@ -103,6 +105,7 @@ export const ObjectModelContainedTemplate = (
           idReference={`${idReference}.${attribute.name}`}
           onOpen={onOpen}
           viewConfig={getExpandViewConfig(uiAttribute)}
+          entity={value}
           onChange={(data: Record<string, unknown>) =>
             setValue(
               namePath,

packages/dm-core-plugins/src/form/fields/ObjectField/templates/ObjectModelUncontainedTemplate.tsx

@@ -58,7 +58,7 @@ export const ObjectModelUncontainedTemplate = (
           objectIsNotEmpty={referenceExists}
           setIsExpanded={setIsExpanded}
           onOpen={() =>
-            onOpen?.(namePath, getOpenViewConfig(uiAttribute), address)
+            onOpen?.(namePath, getOpenViewConfig(uiAttribute), value, address)
           }
           icon={link}
           uiAttribute={uiAttribute}
@@ -98,6 +98,7 @@ export const ObjectModelUncontainedTemplate = (
           idReference={address ?? ''}
           onOpen={onOpen}
           viewConfig={getExpandViewConfig(uiAttribute)}
+          entity={value}
         />
       </ComplexAttributeTemplate.Content>
     </ComplexAttributeTemplate>

packages/dm-core-plugins/src/grid/GridElement.tsx

@@ -1,4 +1,4 @@
-import { ViewCreator } from '@development-framework/dm-core'
+import { TValidEntity, ViewCreator } from '@development-framework/dm-core'
 import { Typography } from '@equinor/eds-core-react'
 import React from 'react'
 import styled from 'styled-components'
@@ -32,11 +32,19 @@ type TGridItemProps = {
   showItemBorders: boolean
   onSubmit?: (data: any) => void
   onChange?: (data: any) => void
+  entity?: TValidEntity
 }
 
 export const GridElement = (props: TGridItemProps): React.ReactElement => {
-  const { idReference, item, itemBorder, showItemBorders, onSubmit, onChange } =
-    props
+  const {
+    idReference,
+    item,
+    itemBorder,
+    showItemBorders,
+    onSubmit,
+    onChange,
+    entity,
+  } = props
 
   return (
     <Element
@@ -49,6 +57,7 @@ export const GridElement = (props: TGridItemProps): React.ReactElement => {
         {item?.title && <Typography variant='h4'>{item.title}</Typography>}
         <div className='flex-layout-container'>
           <ViewCreator
+            entity={entity}
             idReference={idReference}
             viewConfig={item.viewConfig}
             onSubmit={onSubmit}

packages/dm-core-plugins/src/grid/GridItems.tsx

@@ -1,3 +1,4 @@
+import { TValidEntity } from '@development-framework/dm-core'
 import { GridElement } from './GridElement'
 import { TGridItem, TItemBorder } from './types'
 
@@ -9,6 +10,7 @@ type GridItemsProps = {
   showItemBorders: boolean
   onSubmit?: (data: any) => void
   onChange?: (data: any) => void
+  entity?: TValidEntity
 }
 
 export const GridItems = (props: GridItemsProps) => {
@@ -20,10 +22,12 @@ export const GridItems = (props: GridItemsProps) => {
     showItemBorders,
     onChange,
     onSubmit,
+    entity,
   } = props
   const elements = items.map((item: TGridItem, index) => {
     return (
       <GridElement
+        entity={entity}
         key={`${idReference}-${index}`}
         idReference={idReference}
         item={item}

packages/dm-core-plugins/src/grid/GridPlugin.tsx

@@ -42,7 +42,7 @@ const defaultConfig: TGridPluginConfig = {
 export const GridPlugin = (
   props: IUIPlugin & { config: TGridPluginConfig }
 ): React.ReactElement => {
-  const { config, idReference, type, onSubmit, onChange } = props
+  const { config, idReference, type, onSubmit, onChange, entity } = props
 
   const internalConfig: TGridPluginConfig = {
     ...defaultConfig,
@@ -54,6 +54,7 @@ export const GridPlugin = (
   return (
     <Grid className='dm-parent-plugin' {...internalConfig.size}>
       <GridItems
+        entity={entity}
         idReference={idReference}
         items={internalConfig.items}
         itemBorder={internalConfig.itemBorder}

packages/dm-core-plugins/src/header/HeaderPlugin.tsx

@@ -77,14 +77,24 @@ type TRecipeConfigAndPlugin = {
  */
 
 export default (props: IUIPlugin): React.ReactElement => {
-  const { idReference, config: passedConfig, type } = props
+  const {
+    idReference,
+    config: passedConfig,
+    type,
+    entity: passedEntity,
+  } = props
   const config: THeaderPluginConfig & { adminRole: string } = {
     ...defaultHeaderPluginConfig,
     ...passedConfig,
   }
   const [isMenuOpen, setIsMenuOpen] = useState<boolean>(false)
   const [anchorEl, setAnchorEl] = useState<HTMLButtonElement | null>(null)
-  const { document: entity, isLoading } = useDocument<TApplication>(idReference)
+  const { document: entity, isLoading } = useDocument<TApplication>(
+    idReference,
+    0,
+    true,
+    passedEntity
+  )
   const { uiRecipes, isLoading: isBlueprintLoading } = useBlueprint(type)
   const { roles, role, dmssAPI, name } = useApplication()
   const [aboutOpen, setAboutOpen] = useState(false)
@@ -216,6 +226,7 @@ export default (props: IUIPlugin): React.ReactElement => {
       />
       <div className='flex-layout-container'>
         <UIPlugin
+          entity={entity}
           key={idReference + selectedRecipe.name}
           idReference={idReference}
           type={entity.type}

packages/dm-core-plugins/src/job/JobCreate.tsx

@@ -58,10 +58,7 @@ interface TJobPluginConfig {
 }
 
 export const JobCreate = (props: IUIPlugin & { config: TJobPluginConfig }) => {
-  const {
-    config,
-    idReference,
-  }: { config: TJobPluginConfig; idReference: string } = props
+  const { config, idReference, entity } = props
   const { dmssAPI } = useApplication()
   const { tokenData } = useContext(AuthContext)
   const username = tokenData?.preferred_username ?? 'unknown user'
@@ -85,7 +82,7 @@ export const JobCreate = (props: IUIPlugin & { config: TJobPluginConfig }) => {
 
   const { document: jobDocument, updateDocument } = useDocument<
     TJob | TRecurringJob
-  >(jobTargetAddress, 0, false)
+  >(jobTargetAddress, 0, false, entity)
 
   const {
     start,

packages/dm-core-plugins/src/list/ListPlugin.tsx

@@ -76,7 +76,7 @@ const defaultConfig: TListConfig = {
 }
 
 export const ListPlugin = (props: IUIPlugin & { config?: TListConfig }) => {
-  const { idReference, config, type, onOpen } = props
+  const { idReference, config, type, onOpen, entity } = props
   const internalConfig: TListConfig = {
     ...defaultConfig,
     ...config,
@@ -96,7 +96,11 @@ export const ListPlugin = (props: IUIPlugin & { config?: TListConfig }) => {
     moveItem,
     reloadData,
     updateItem,
-  } = useList<TGenericObject>(idReference, internalConfig.resolveReferences)
+  } = useList<TGenericObject>(
+    idReference,
+    internalConfig.resolveReferences,
+    entity
+  )
 
   const {
     currentItems,
@@ -149,6 +153,7 @@ export const ListPlugin = (props: IUIPlugin & { config?: TListConfig }) => {
     onOpen(
       item.key,
       view,
+      item.data,
       item.idReference,
       false,
       config.saveExpanded

packages/dm-core-plugins/src/table/Table/Table.tsx

@@ -1,6 +1,6 @@
 import {
-  TGenericObject,
   TItem,
+  TValidEntity,
   usePagination,
 } from '@development-framework/dm-core'
 import {
@@ -54,7 +54,7 @@ export function Table(props: TableProps) {
   const [tableVariant, setTableVariant] = useState<TableVariantNameEnum>(
     config.variant[0].name
   )
-  const [sortedItems, setSortedItems] = useState<TItem<TGenericObject>[]>([])
+  const [sortedItems, setSortedItems] = useState<TItem<TValidEntity>[]>([])
   const [sortColumn, setSortColumn] = useState<string | undefined>(undefined)
   const [sortDirection, setSortDirection] =
     useState<TTableSortDirection>('ascending')
@@ -79,7 +79,7 @@ export function Table(props: TableProps) {
   }
 
   const handleRemoveItem = async (
-    itemToDelete: TItem<TGenericObject>,
+    itemToDelete: TItem<TValidEntity>,
     saveOnRemove?: boolean | undefined
   ) => {
     setDeletingRow(itemToDelete.key)
@@ -130,7 +130,7 @@ export function Table(props: TableProps) {
     setPage(0)
   }
 
-  function reorderItems(reorderedItems: TItem<TGenericObject>[]) {
+  function reorderItems(reorderedItems: TItem<TValidEntity>[]) {
     setItems(reorderedItems)
     setDirtyState(true)
   }
@@ -196,7 +196,7 @@ export function Table(props: TableProps) {
                           functionalityConfig={functionalityConfig}
                           idReference={props.idReference}
                           index={items.findIndex(
-                            (it: TItem<TGenericObject>) => it.key === item.key
+                            (it: TItem<TValidEntity>) => it.key === item.key
                           )}
                           item={item}
                           items={items}

packages/dm-core-plugins/src/table/Table/TableRow/TableCell/TableCell.tsx

@@ -26,7 +26,7 @@ export function TableCell(props: TableCellProps) {
 
   // TODO: Add more logic for creating better default values.
   //  If pointing to complex optional object, it has to be created.
-  const value = resolvePath(item.data || {}, column?.data, '')
+  const value = resolvePath(item.data || { type: 'unknown' }, column?.data, '')
 
   if (typeof value === 'object') {
     throw new Error(