VUU-31 Layout Server POC

ScottLogic · Sep 11, 2023 · a4ddbeb · a4ddbeb
1 parent 737bed8
commit a4ddbeb
Show file tree

Hide file tree

Showing 12 changed files with 1,863 additions and 6 deletions.
diff --git a/vuu-ui/packages/vuu-layout/src/layout-reducer/layoutTypes.ts b/vuu-ui/packages/vuu-layout/src/layout-reducer/layoutTypes.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { ReactElement } from "react";
+import { CSSProperties, ReactElement } from "react";
 import { DragDropRect, DragInstructions } from "../drag-drop";
 import { DropTarget } from "../drag-drop/DropTarget";
 import { ContributionLocation } from "../layout-view";
@@ -26,6 +26,7 @@ export interface LayoutJSON extends WithType {
   props?: { [key: string]: any };
   state?: any;
   type: string;
+  style?: CSSProperties
 }
 
 export interface WithActive {

diff --git a/vuu-ui/packages/vuu-shell/src/layout-config/local-config.ts b/vuu-ui/packages/vuu-shell/src/layout-config/local-config.ts
@@ -1,11 +1,12 @@
 import { LayoutJSON } from "@finos/vuu-layout/src/layout-reducer";
 import { VuuUser } from "../shell";
+import { Layout } from "../layout-management";
 
 export const loadLocalConfig = (
   saveUrl: string,
   user: VuuUser,
   id = "latest"
-): Promise<LayoutJSON> =>
+): Promise<Layout> =>
   new Promise((resolve, reject) => {
     console.log(
       `load local config at ${saveUrl} for user ${user.username}, id ${id}`

diff --git a/vuu-ui/packages/vuu-shell/src/layout-config/remote-config.ts b/vuu-ui/packages/vuu-shell/src/layout-config/remote-config.ts
@@ -1,11 +1,12 @@
 import { LayoutJSON } from "@finos/vuu-layout/src/layout-reducer";
 import { VuuUser } from "../shell";
+import { Layout } from "../layout-management";
 
 export const loadRemoteConfig = (
   saveUrl: string,
   user: VuuUser,
   id = "latest"
-): Promise<LayoutJSON> =>
+): Promise<Layout> =>
   new Promise((resolve, reject) => {
     fetch(`${saveUrl}/${user.username}/${id}`, {})
       .then((response) => {

diff --git a/vuu-ui/packages/vuu-shell/src/layout-config/use-layout-config.ts b/vuu-ui/packages/vuu-shell/src/layout-config/use-layout-config.ts
@@ -33,7 +33,7 @@ export const useLayoutConfig = ({
     async (id = "latest") => {
       try {
         const layout = await loadConfig(saveUrl, user, id);
-        _setLayout(layout);
+        _setLayout(layout.json);
       } catch {
         _setLayout(defaultLayout);
       }

diff --git a/vuu-ui/packages/vuu-shell/src/shell.tsx b/vuu-ui/packages/vuu-shell/src/shell.tsx
@@ -72,6 +72,7 @@ export const Shell = ({
   const [layout, saveLayoutConfig, loadLayoutById] = useLayoutConfig({
     defaultLayout,
     saveLocation,
+    saveUrl,
     user,
   });