remove user_id in workspace.py

arayabrain · Jul 28, 2023 · 0bec77a · 0bec77a
1 parent 6d73d31
commit 0bec77a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 38 deletions.
diff --git a/frontend/src/components/Database/DatabaseCells.tsx b/frontend/src/components/Database/DatabaseCells.tsx
@@ -63,27 +63,26 @@ const columns = (handleOpenDialog: (value: string[]) => void) => [
     width: 160,
     filterable: false,
     sortable: false,
-    renderCell: (params: { row: DatabaseType }) => (
-      <Box
-        sx={{
-          cursor: 'pointer',
-          display: 'flex',
-        }}
-        onClick={() =>
-          params.row?.cell_image_url &&
-          handleOpenDialog([params.row.cell_image_url])
-        }
-      >
-        {params.row?.cell_image_url && (
+    renderCell: (params: { row: DatabaseType }) => {
+      const { cell_image_url } = params.row
+      if (!cell_image_url) return null
+      return (
+        <Box
+          sx={{
+            cursor: 'pointer',
+            display: 'flex',
+          }}
+          onClick={() => handleOpenDialog([cell_image_url])}
+        >
           <img
             src={params.row?.cell_image_url}
             alt={''}
             width={'100%'}
             height={'100%'}
           />
-        )}
-      </Box>
-    ),
+        </Box>
+      )
+    },
   },
 ]
 
@@ -184,16 +183,14 @@ const DatabaseCells = ({ user }: CellProps) => {
   )
 
   const handleFilter = (model: GridFilterModel) => {
-    let filter: string
+    let filter = ''
     if (!!model.items[0]?.value) {
       filter = model.items
         .filter((item) => item.value)
         .map((item: any) => {
           return `${item.field}=${item?.value}`
         })
         .join('&')
-    } else {
-      filter = ''
     }
     const { sort } = dataParams
     setParams(

diff --git a/frontend/src/components/Database/DatabaseExperiments.tsx b/frontend/src/components/Database/DatabaseExperiments.tsx
@@ -305,19 +305,15 @@ const DatabaseExperiments = ({ user, cellPath }: DatabaseProps) => {
     [pagiFilter, getParamsData],
   )
 
-  const handleFilter = (
-    model: GridFilterModel,
-  ) => {
-    let filter: string
+  const handleFilter = (model: GridFilterModel) => {
+    let filter = ''
     if (!!model.items[0]?.value) {
       filter = model.items
         .filter((item) => item.value)
         .map((item: any) => {
           return `${item.field}=${item?.value}`
         })
         .join('&')
-    } else {
-      filter = ''
     }
     const { sort } = dataParams
     setParams(

diff --git a/frontend/src/pages/Workspace/index.tsx b/frontend/src/pages/Workspace/index.tsx
@@ -78,6 +78,7 @@ const columns = (
     filterable: false, // todo enable when finish api
     sortable: false, // todo enable when finish api
     renderCell: (params: GridRenderCellParams<string>) => {
+      const { row, value } = params
       return (
         <Box
           sx={{
@@ -95,14 +96,12 @@ const columns = (
               textOverflow: 'ellipsis',
             }}
           >
-            {params.row.name}
+            {value}
           </span>
-          {params.row.user_id === user?.id ? (
-            <IconButton onClick={() => onEdit?.(params.row.id)}>
+          {row.user?.id === user?.id && (
+            <IconButton onClick={() => onEdit?.(row.id)}>
               <EditIcon style={{ fontSize: 18 }} />
             </IconButton>
-          ) : (
-            ''
           )}
         </Box>
       )
@@ -149,7 +148,7 @@ const columns = (
     minWidth: 130,
     filterable: false, // todo enable when finish api
     sortable: false, // todo enable when finish api
-    renderCell: (params: GridRenderCellParams<string>) => (
+    renderCell: (_params: GridRenderCellParams<string>) => (
       <LinkCustom to={'#'}>Result</LinkCustom>
     ),
   },
@@ -172,12 +171,10 @@ const columns = (
     filterable: false, // todo enable when finish api
     sortable: false, // todo enable when finish api
     renderCell: (params: GridRenderCellParams<string>) =>
-      params.row?.user_id === user?.id ? (
+      params.row?.user?.id === user?.id && (
         <ButtonCustom onClick={handleOpenPopupShare}>
           <PeopleOutlineIcon />
         </ButtonCustom>
-      ) : (
-        ''
       ),
   },
   {
@@ -187,12 +184,10 @@ const columns = (
     filterable: false, // todo enable when finish api
     sortable: false, // todo enable when finish api
     renderCell: (params: GridRenderCellParams<string>) =>
-      params.row?.user_id === user?.id ? (
+      params.row?.user_id === user?.id && (
         <ButtonCustom onClick={() => handleOpenPopupDel(params.row.id)}>
           Del
         </ButtonCustom>
-      ) : (
-        ''
       ),
   },
 ]
@@ -444,7 +439,7 @@ const Workspaces = () => {
     (page?: number) => {
       return `limit=${data.limit}&offset=${page ? page - 1 : data.offset}`
     },
-    [data.limit, data.offset],
+    [data?.limit, data?.offset],
   )
 
   const handlePage = (e: ChangeEvent<unknown>, page: number) => {

diff --git a/studio/app/common/schemas/workspace.py b/studio/app/common/schemas/workspace.py
@@ -9,7 +9,6 @@
 class Workspace(BaseModel):
     id: Optional[int]
     name: str
-    user_id: Optional[int]
     user: Optional[UserInfo]
     created_at: Optional[datetime]
     updated_at: Optional[datetime]