Merge pull request finos#1374 from finos/fix-editable-dialog

Fix editable dialog
wendymiaoo · Jun 3, 2024 · b78c2e2 · b78c2e2
2 parents 758be09 + 78dbc7f
commit b78c2e2
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 137 deletions.
diff --git a/vuu-ui/package-lock.json b/vuu-ui/package-lock.json
diff --git a/vuu-ui/packages/vuu-popups/src/dialog/Dialog.css b/vuu-ui/packages/vuu-popups/src/dialog/Dialog.css
diff --git a/vuu-ui/packages/vuu-popups/src/dialog/Dialog.tsx b/vuu-ui/packages/vuu-popups/src/dialog/Dialog.tsx
diff --git a/vuu-ui/packages/vuu-popups/src/dialog/index.ts b/vuu-ui/packages/vuu-popups/src/dialog/index.ts
@@ -1,2 +1 @@
-export * from "./Dialog";
 export * from "./useDialog";
diff --git a/vuu-ui/packages/vuu-popups/src/dialog/useDialog.tsx b/vuu-ui/packages/vuu-popups/src/dialog/useDialog.tsx
@@ -42,7 +42,7 @@ export const useDialog = () => {
   );
 
   const dialog = dialogState ? (
-    <Dialog className="vuuDialog" open={true} onOpenChange={handleOpenChange}>
+    <Dialog open={true} onOpenChange={handleOpenChange}>
       <DialogHeader header={dialogState.title} />
       <DialogContent>{dialogState.content}</DialogContent>
       {dialogState.hideCloseButton !== true ? (

diff --git a/vuu-ui/packages/vuu-shell/src/session-editing-form/SessionEditingForm.tsx b/vuu-ui/packages/vuu-shell/src/session-editing-form/SessionEditingForm.tsx
@@ -193,11 +193,11 @@ export const SessionEditingForm = ({
   const initialDataRef = useRef<FormValues>();
   const dataStatusRef = useRef(Status.uninitialised);
 
-  const ds = getDataSource(dataSourceProp, schema);
-  const { columns } = ds;
-  const columnMap = buildColumnMap(ds.columns);
-
   const dataSource = useMemo(() => {
+    const ds = getDataSource(dataSourceProp, schema);
+    const { columns } = ds;
+    const columnMap = buildColumnMap(ds.columns);
+
     const applyServerData = (data: VuuDataRow) => {
       if (columnMap) {
         const values: { [key: string]: VuuRowDataItemType } = {};
@@ -222,16 +222,15 @@ export const SessionEditingForm = ({
       }
     });
     return ds;
-  }, [columnMap, columns, ds]);
+  }, [dataSourceProp, schema]);
 
   const id = useIdMemo(idProp);
 
   const handleChange = useCallback<ChangeEventHandler<HTMLInputElement>>(
     (evt) => {
       const [field, value] = getFieldNameAndValue(evt);
-      // const { type } = getField(fields, field);
-      // const typedValue = getTypedValue(value, type);
-      const typedValue = value;
+      const { type } = getField(fields, field);
+      const typedValue = getTypedValue(value, type);
       setValues((values = {}) => {
         const newValues = {
           ...values,
@@ -246,7 +245,7 @@ export const SessionEditingForm = ({
         return newValues;
       });
     },
-    []
+    [fields]
   );
 
   const handleBlur = useCallback<FocusEventHandler<HTMLInputElement>>(
@@ -255,9 +254,7 @@ export const SessionEditingForm = ({
       const rowKey = values?.[keyField];
       // TODO link this with client side validation if we're going to use it
       const { type } = getField(fields, field);
-      const clientTypedValue = getTypedValue(value, type, true);
-      console.log(`client typed value ${clientTypedValue}`);
-      const typedValue = value;
+      const typedValue = getTypedValue(value, type, true);
       if (typeof rowKey === "string") {
         dataSource
           .menuRpcCall({
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		export * from "./Dialog";
		export * from "./useDialog";