From 9cd96a5261d21ab1426331671c55453fd1508c71 Mon Sep 17 00:00:00 2001
From: glasstiger <imre@questdb.io>
Date: Thu, 3 Apr 2025 18:49:41 +0100
Subject: [PATCH 1/7] feat(ui): owner setting for tables created during CSV
 import

---
 packages/browser-tests/questdb                |  2 +-
 .../Import/ImportCSVFiles/files-to-upload.tsx | 38 ++++++++++++++-
 .../scenes/Import/ImportCSVFiles/index.tsx    | 46 ++++++++++++++++++-
 .../src/scenes/Import/ImportCSVFiles/types.ts |  3 +-
 .../web-console/src/utils/questdb/client.ts   |  2 +
 .../web-console/src/utils/questdb/types.ts    |  1 +
 6 files changed, 87 insertions(+), 5 deletions(-)

diff --git a/packages/browser-tests/questdb b/packages/browser-tests/questdb
index 68b17e486..32ad5f2c7 160000
--- a/packages/browser-tests/questdb
+++ b/packages/browser-tests/questdb
@@ -1 +1 @@
-Subproject commit 68b17e4860e3ce2d1a0e55faa18a899684998114
+Subproject commit 32ad5f2c7baa34d745cfa9d8e2bedde49c0a5491
diff --git a/packages/web-console/src/scenes/Import/ImportCSVFiles/files-to-upload.tsx b/packages/web-console/src/scenes/Import/ImportCSVFiles/files-to-upload.tsx
index 759f81fbc..55b246d4c 100644
--- a/packages/web-console/src/scenes/Import/ImportCSVFiles/files-to-upload.tsx
+++ b/packages/web-console/src/scenes/Import/ImportCSVFiles/files-to-upload.tsx
@@ -78,6 +78,7 @@ type Props = {
   onFilesDropped: (files: File[]) => void
   onViewData: (result: UploadResult) => void
   dialogOpen: boolean
+  ownedByList: string[]
 }
 
 export const FilesToUpload = ({
@@ -89,6 +90,7 @@ export const FilesToUpload = ({
   onFilesDropped,
   onViewData,
   dialogOpen,
+  ownedByList,
 }: Props) => {
   const uploadInputRef = useRef<HTMLInputElement | null>(null)
   const [renameDialogOpen, setRenameDialogOpen] = React.useState<
@@ -224,7 +226,7 @@ export const FilesToUpload = ({
               {
                 header: "Table name",
                 align: "flex-end",
-                width: "200px",
+                width: "180px",
                 render: ({ data }) => {
                   return (
                     <RenameTableDialog
@@ -240,6 +242,40 @@ export const FilesToUpload = ({
                   )
                 },
               },
+              {
+                header: (
+                  <PopperHover
+                    placement="top"
+                    trigger={
+                      <Box align="center" gap="0.5rem">
+                        Table owner
+                        <Information size="16px" />
+                      </Box>
+                    }
+                  >
+                    <Tooltip>
+                      Required for external (non-database) users.
+                    </Tooltip>
+                  </PopperHover>
+                ),
+                align: "center",
+                width: "150px",
+                render: ({ data }) => (
+                  <Select
+                    name="table_owner"
+                    defaultValue={ownedByList[0] ?? ""}
+                    onChange={(e: React.ChangeEvent<HTMLSelectElement>) =>
+                      onFilePropertyChange(data.id, {
+                        table_owner: e.target.value,
+                      })
+                    }
+                    options={Object.values(ownedByList).map((entity) => ({
+                      label: entity,
+                      value: entity,
+                    }))}
+                  />
+                ),
+              },
               {
                 header: (
                   <PopperHover
diff --git a/packages/web-console/src/scenes/Import/ImportCSVFiles/index.tsx b/packages/web-console/src/scenes/Import/ImportCSVFiles/index.tsx
index 58053cfef..944990a1a 100644
--- a/packages/web-console/src/scenes/Import/ImportCSVFiles/index.tsx
+++ b/packages/web-console/src/scenes/Import/ImportCSVFiles/index.tsx
@@ -6,7 +6,7 @@ import { ProcessedFile } from "./types"
 import { SchemaColumn } from "components/TableSchemaDialog/types"
 import { useContext } from "react"
 import { QuestContext } from "../../../providers"
-import { pick, UploadResult, FileCheckStatus } from "../../../utils"
+import { pick, UploadResult, FileCheckStatus, Parameter } from "../../../utils"
 import * as QuestDB from "../../../utils/questdb"
 import { useSelector } from "react-redux"
 import { selectors } from "../../../store"
@@ -20,6 +20,8 @@ import {
   uuid,
 } from "./utils"
 import { Upload } from "./upload"
+import {getValue} from "../../../utils/localStorage";
+import {StoreKey} from "../../../utils/localStorage/types";
 
 type State = "upload" | "list"
 
@@ -40,6 +42,45 @@ export const ImportCSVFiles = ({ onViewData, onUpload }: Props) => {
   const rootRef = useRef<HTMLDivElement>(null)
   const isVisible = useIsVisible(rootRef)
   const [state, setState] = useState<State>("upload")
+  const [ownedByList, setOwnedByList] = useState<string[]>([])
+
+  const getOwnedByList = async () => {
+    let ownedByNames: string[] = []
+    try {
+      const userResult = await quest.query<Parameter>(
+        `select current_user()`,
+      )
+      if (userResult.type === "dql" && userResult.count > 0) {
+        const username = Object.values(userResult.data[0])[0] as string
+        if (username) {
+          const authPayload = getValue(StoreKey.AUTH_PAYLOAD)
+          if (!authPayload) {
+            // no OAuth2 payload in local storage
+            // non-SSO users can set themselves as owner
+            ownedByNames.push(username)
+          }
+
+          const result = await quest.query<Parameter>(
+            `show groups ${username}`,
+          )
+          if (result.type === "dql" && result.count > 0) {
+            const groups = result.data.map(row => Object.values(row)[0] as string)
+            ownedByNames = ownedByNames.concat(groups)
+          }
+        }
+      }
+
+      setOwnedByList(
+        ownedByNames,
+      )
+    } catch (ex) {
+      return
+    }
+  }
+
+  useEffect(() => {
+    getOwnedByList()
+  }, [])
 
   const setFileProperties = (id: string, file: Partial<ProcessedFile>) => {
     setFilesDropped((files) =>
@@ -122,6 +163,7 @@ export const ImportCSVFiles = ({ onViewData, onUpload }: Props) => {
           id: uuid(),
           fileObject: file,
           table_name: file.name,
+          table_owner: ownedByList[0],
           status: result.status,
           exists: result.status === FileCheckStatus.EXISTS,
           schema,
@@ -188,6 +230,7 @@ export const ImportCSVFiles = ({ onViewData, onUpload }: Props) => {
           onViewData={onViewData}
           onFilesDropped={handleDrop}
           onDialogToggle={setDialogOpen}
+          ownedByList={ownedByList}
           onFileUpload={async (id) => {
             const file = filesDropped.find((f) => f.id === id) as ProcessedFile
 
@@ -199,6 +242,7 @@ export const ImportCSVFiles = ({ onViewData, onUpload }: Props) => {
               const response = await quest.uploadCSVFile({
                 file: file.fileObject,
                 name: file.table_name,
+                owner: file.table_owner,
                 settings: file.settings,
                 schema: file.schema.map(mapColumnTypeToQuestDB),
                 partitionBy: file.partitionBy,
diff --git a/packages/web-console/src/scenes/Import/ImportCSVFiles/types.ts b/packages/web-console/src/scenes/Import/ImportCSVFiles/types.ts
index 5541a9b54..dd68e06af 100644
--- a/packages/web-console/src/scenes/Import/ImportCSVFiles/types.ts
+++ b/packages/web-console/src/scenes/Import/ImportCSVFiles/types.ts
@@ -6,6 +6,7 @@ export type ProcessedFile = {
   fileObject: File
   status: string
   table_name: string
+  table_owner: string
   settings: UploadModeSettings
   schema: SchemaColumn[]
   partitionBy: string
@@ -20,8 +21,6 @@ export type ProcessedFile = {
   exists: boolean
 }
 
-export type WriteMode = "append" | "overwrite"
-
 // TODO: Refactor @questdb/react-components/Badge to ditch enum as prop value
 export enum BadgeType {
   SUCCESS = "success",
diff --git a/packages/web-console/src/utils/questdb/client.ts b/packages/web-console/src/utils/questdb/client.ts
index b1bbc1921..99fb56e57 100644
--- a/packages/web-console/src/utils/questdb/client.ts
+++ b/packages/web-console/src/utils/questdb/client.ts
@@ -350,6 +350,7 @@ export class Client {
   async uploadCSVFile({
     file,
     name,
+    owner,
     settings,
     schema,
     partitionBy,
@@ -373,6 +374,7 @@ export class Client {
     const params = {
       fmt: "json",
       name,
+      owner,
       ...(partitionBy ? { partitionBy } : {}),
       ...(timestamp ? { timestamp } : {}),
       ...serializedSettings,
diff --git a/packages/web-console/src/utils/questdb/types.ts b/packages/web-console/src/utils/questdb/types.ts
index 8f5f9f22c..34d6222ac 100644
--- a/packages/web-console/src/utils/questdb/types.ts
+++ b/packages/web-console/src/utils/questdb/types.ts
@@ -265,6 +265,7 @@ export type InformationSchemaColumn = {
 export type UploadOptions = {
   file: File
   name: string
+  owner: string
   settings?: UploadModeSettings
   schema?: SchemaColumn[]
   partitionBy?: string

From 10ed1e13196ab51e35662f0640def4ade4c58bfe Mon Sep 17 00:00:00 2001
From: glasstiger <imre@questdb.io>
Date: Thu, 3 Apr 2025 18:56:03 +0100
Subject: [PATCH 2/7] update submodule

---
 packages/browser-tests/questdb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/browser-tests/questdb b/packages/browser-tests/questdb
index 32ad5f2c7..e9f3b021b 160000
--- a/packages/browser-tests/questdb
+++ b/packages/browser-tests/questdb
@@ -1 +1 @@
-Subproject commit 32ad5f2c7baa34d745cfa9d8e2bedde49c0a5491
+Subproject commit e9f3b021b13b3616ae5ccca618017315da540af7

From 72d8e67c68d6852927fc7a83f4aa4a4521d32819 Mon Sep 17 00:00:00 2001
From: glasstiger <imre@questdb.io>
Date: Fri, 25 Apr 2025 09:23:12 +0100
Subject: [PATCH 3/7] OSS test

---
 .../browser-tests/cypress/fixtures/test.csv   |   3 +
 .../integration/console/import.spec.js        |  11 +
 packages/browser-tests/questdb                |   2 +-
 .../Import/ImportCSVFiles/files-to-upload.tsx | 505 +++++++++---------
 .../scenes/Import/ImportCSVFiles/index.tsx    |   8 +-
 .../scenes/Import/ImportCSVFiles/upload.tsx   |   1 +
 6 files changed, 281 insertions(+), 249 deletions(-)
 create mode 100644 packages/browser-tests/cypress/fixtures/test.csv

diff --git a/packages/browser-tests/cypress/fixtures/test.csv b/packages/browser-tests/cypress/fixtures/test.csv
new file mode 100644
index 000000000..3a0887ac6
--- /dev/null
+++ b/packages/browser-tests/cypress/fixtures/test.csv
@@ -0,0 +1,3 @@
+date,underlying,name,exchange,symbol,fut_expiration_date,bid,ask,open,high,low,close,volume,open_interest,strike_multiplier,option_price_multiplier
+2005-12-01T00:00:00.000000Z,AC,Denatured Fuel Ethanol Futures,CBOT,AC/05Z.CB,1134518400000,0.000000,0.000000,1.900000,1.900000,1.900000,1.900000,2,64,1.000000,1.000000
+2005-12-01T00:00:00.000000Z,AC,Denatured Fuel Ethanol Futures,CBOT,AC/06F.CB,1137110400000,0.000000,0.000000,0.000000,1.865000,1.865000,1.865000,0,83,1.000000,1.000000
diff --git a/packages/browser-tests/cypress/integration/console/import.spec.js b/packages/browser-tests/cypress/integration/console/import.spec.js
index 4283fde60..e65af686c 100644
--- a/packages/browser-tests/cypress/integration/console/import.spec.js
+++ b/packages/browser-tests/cypress/integration/console/import.spec.js
@@ -8,5 +8,16 @@ describe("questdb import", () => {
   it("display import panel", () => {
     cy.getByDataHook("import-panel-button").click();
     cy.getByDataHook("import-dropbox").should("be.visible");
+    cy.getByDataHook("import-browse-from-disk").should("be.visible");
+
+    cy.get('input[type="file"]').selectFile("cypress/fixtures/test.csv", { force: true });
+    cy.getByDataHook("import-table-column-schema").should("be.visible");
+    cy.getByDataHook("import-table-column-owner").should("not.exist");
+
+    // cy.get('div').contains("Table name").should("be.visible");
+    // cy.get('div').contains("Table owner").should("not.exist");
+
+    // cy.contains('div', "Table name").should("be.visible");
+    // cy.contains('div', "Table owner").should("not.exist");
   });
 });
diff --git a/packages/browser-tests/questdb b/packages/browser-tests/questdb
index d6873caf2..60617999c 160000
--- a/packages/browser-tests/questdb
+++ b/packages/browser-tests/questdb
@@ -1 +1 @@
-Subproject commit d6873caf20e799b7b9865c18109bed50332e2ed7
+Subproject commit 60617999c2d16048dca06b80ab4f7441db5a532c
diff --git a/packages/web-console/src/scenes/Import/ImportCSVFiles/files-to-upload.tsx b/packages/web-console/src/scenes/Import/ImportCSVFiles/files-to-upload.tsx
index 55b246d4c..120cb1654 100644
--- a/packages/web-console/src/scenes/Import/ImportCSVFiles/files-to-upload.tsx
+++ b/packages/web-console/src/scenes/Import/ImportCSVFiles/files-to-upload.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useRef } from "react"
 import styled from "styled-components"
 import { Heading, Table, Select, Button } from "@questdb/react-components"
-import type { Props as TableProps } from "@questdb/react-components/dist/components/Table"
+import { Column, Props as TableProps } from "@questdb/react-components/dist/components/Table"
 import { PopperHover, Text, Tooltip } from "../../../components"
 import { Box } from "../../../components/Box"
 import { bytesWithSuffix } from "../../../utils/bytesWithSuffix"
@@ -107,6 +107,262 @@ export const FilesToUpload = ({
     )
   }, [renameDialogOpen, schemaDialogOpen])
 
+  const columns: Column<ProcessedFile>[] = []
+  columns.push(
+    {
+      header: "File",
+      align: "flex-start",
+      ...(files.length > 0 && { width: "400px" }),
+      render: ({ data }) => {
+        const file = (
+          <FileTextBox align="center" gap="1rem">
+            <Text color="foreground">
+              {shortenText(data.fileObject.name, 20)}
+            </Text>
+
+            <Text color="gray2" size="sm">
+              {bytesWithSuffix(data.fileObject.size)}
+            </Text>
+          </FileTextBox>
+        )
+        return (
+          <Box align="center" gap="1rem">
+            <FiletypeCsv size="46px" />
+            <Box gap="1rem" align="flex-4tart" flexDirection="column">
+              {data.fileObject.name.length > 20 && (
+                <PopperHover placement="top" trigger={file}>
+                  <Tooltip>{data.fileObject.name}</Tooltip>
+                </PopperHover>
+              )}
+              {data.fileObject.name.length <= 20 && file}
+              <Box gap="1rem" align="center">
+                <FileStatus file={data} />
+                {!data.isUploading &&
+                  data.uploadResult !== undefined && (
+                    <React.Fragment>
+                      <UploadResultDialog file={data} />
+                      <Button
+                        skin="secondary"
+                        prefixIcon={<Grid size="18px" />}
+                        onClick={() =>
+                          onViewData(
+                            data.uploadResult as UploadResult,
+                          )
+                        }
+                      >
+                        Result
+                      </Button>
+                    </React.Fragment>
+                  )}
+              </Box>
+              {(data.uploadResult &&
+                  data.uploadResult.rowsRejected > 0) ||
+                (data.error && (
+                  <FileTextBox
+                    flexDirection="column"
+                    gap="1rem"
+                    align="flex-start"
+                  >
+                    {data.uploadResult &&
+                      data.uploadResult.rowsRejected > 0 && (
+                        <Text color="orange" size="sm">
+                          {data.uploadResult.rowsRejected.toLocaleString()}{" "}
+                          row
+                          {data.uploadResult.rowsRejected > 1
+                            ? "s"
+                            : ""}{" "}
+                          rejected
+                        </Text>
+                      )}
+                    {data.error && (
+                      <Text color="red" size="sm">
+                        {data.error}
+                      </Text>
+                    )}
+                  </FileTextBox>
+                ))}
+            </Box>
+          </Box>
+        )
+      },
+    },
+    {
+      header: "Table name",
+      align: "flex-end",
+      width: "180px",
+      render: ({ data }) => {
+        return (
+          <RenameTableDialog
+            open={renameDialogOpen === data.id}
+            onOpenChange={(f) => setRenameDialogOpen(f?.id)}
+            onNameChange={(name) => {
+              onFilePropertyChange(data.id, {
+                table_name: name,
+              })
+            }}
+            file={data}
+          />
+        )
+      },
+    },
+  )
+
+  if (ownedByList && ownedByList.length > 0) {
+    columns.push(
+      {
+        header: (
+          <PopperHover
+            placement="top"
+            trigger={
+              <Box align="center" gap="0.5rem" data-hook="import-table-column-owner">
+                Table owner
+                <Information size="16px" />
+              </Box>
+            }
+          >
+            <Tooltip>
+              Required for external (non-database) users.
+            </Tooltip>
+          </PopperHover>
+        ),
+        align: "center",
+        width: "150px",
+        render: ({ data }) => (
+          <Select
+            name="table_owner"
+            defaultValue={ownedByList[0] ?? ""}
+            onChange={(e: React.ChangeEvent<HTMLSelectElement>) =>
+              onFilePropertyChange(data.id, {
+                table_owner: e.target.value,
+              })
+            }
+            options={Object.values(ownedByList).map((entity) => ({
+              label: entity,
+              value: entity,
+            }))}
+          />
+        ),
+      },
+    )
+  }
+
+  columns.push(
+    {
+      header: (
+        <PopperHover
+          placement="top"
+          trigger={
+            <Box align="center" gap="0.5rem" data-hook="import-table-column-schema">
+              Schema
+              <Information size="16px" />
+            </Box>
+          }
+        >
+          <Tooltip>
+            Optional. By default, QuestDB will infer schema from the
+            CSV file structure
+          </Tooltip>
+        </PopperHover>
+      ),
+
+      align: "center",
+      width: "150px",
+      render: ({ data }) => {
+        const name = data.table_name ?? data.fileObject.name
+        return (
+          <TableSchemaDialog
+            action="import"
+            open={schemaDialogOpen === data.id}
+            onOpenChange={(name?: string) =>
+              setSchemaDialogOpen(name ? data.id : undefined)
+            }
+            onSchemaChange={(schema) => {
+              onFilePropertyChange(data.id, {
+                schema: schema.schemaColumns,
+                partitionBy: schema.partitionBy,
+                timestamp: schema.timestamp,
+              })
+            }}
+            name={name}
+            schema={data.schema}
+            partitionBy={data.partitionBy}
+            ttlValue={data.ttlValue}
+            ttlUnit={data.ttlUnit}
+            timestamp={data.timestamp}
+            isEditLocked={
+              data.exists && data.table_name === data.fileObject.name
+            }
+            hasWalSetting={false}
+            ctaText="Save"
+          />
+        )
+      },
+    },
+    {
+      header: (
+        <PopperHover
+          placement="top"
+          trigger={
+            <Box align="center" gap="0.5rem">
+              Write mode
+              <Information size="16px" />
+            </Box>
+          }
+        >
+          <Tooltip>
+            <strong>Append</strong>: data will be appended to the set.
+            <br />
+            <strong>Overwrite</strong>: any existing data or structure
+            will be overwritten. Required for partitioning and
+            timestamp related changes.
+          </Tooltip>
+        </PopperHover>
+      ),
+      align: "center",
+      width: "150px",
+      render: ({ data }) => (
+        <Select
+          name="overwrite"
+          defaultValue={data.settings.overwrite ? "true" : "false"}
+          onChange={(e: React.ChangeEvent<HTMLSelectElement>) =>
+            onFilePropertyChange(data.id, {
+              settings: {
+                ...data.settings,
+                overwrite: e.target.value === "true",
+              },
+            })
+          }
+          options={[
+            {
+              label: "Append",
+              value: "false",
+            },
+            {
+              label: "Overwrite",
+              value: "true",
+            },
+          ]}
+        />
+      ),
+    },
+    {
+      align: "flex-end",
+      width: "300px",
+      render: ({ data }) => (
+        <UploadActions
+          file={data}
+          onUpload={onFileUpload}
+          onRemove={onFileRemove}
+          onSettingsChange={(settings) => {
+            onFilePropertyChange(data.id, {
+              settings,
+            })
+          }}
+        />
+      ),
+    },
+  )
+  
   return (
     <DropBox
       files={files}
@@ -145,252 +401,7 @@ export const FilesToUpload = ({
             </Text>
           )}
           <StyledTable<React.FunctionComponent<TableProps<ProcessedFile>>>
-            columns={[
-              {
-                header: "File",
-                align: "flex-start",
-                ...(files.length > 0 && { width: "400px" }),
-                render: ({ data }) => {
-                  const file = (
-                    <FileTextBox align="center" gap="1rem">
-                      <Text color="foreground">
-                        {shortenText(data.fileObject.name, 20)}
-                      </Text>
-
-                      <Text color="gray2" size="sm">
-                        {bytesWithSuffix(data.fileObject.size)}
-                      </Text>
-                    </FileTextBox>
-                  )
-                  return (
-                    <Box align="center" gap="1rem">
-                      <FiletypeCsv size="46px" />
-                      <Box gap="1rem" align="flex-4tart" flexDirection="column">
-                        {data.fileObject.name.length > 20 && (
-                          <PopperHover placement="top" trigger={file}>
-                            <Tooltip>{data.fileObject.name}</Tooltip>
-                          </PopperHover>
-                        )}
-                        {data.fileObject.name.length <= 20 && file}
-                        <Box gap="1rem" align="center">
-                          <FileStatus file={data} />
-                          {!data.isUploading &&
-                            data.uploadResult !== undefined && (
-                              <React.Fragment>
-                                <UploadResultDialog file={data} />
-                                <Button
-                                  skin="secondary"
-                                  prefixIcon={<Grid size="18px" />}
-                                  onClick={() =>
-                                    onViewData(
-                                      data.uploadResult as UploadResult,
-                                    )
-                                  }
-                                >
-                                  Result
-                                </Button>
-                              </React.Fragment>
-                            )}
-                        </Box>
-                        {(data.uploadResult &&
-                          data.uploadResult.rowsRejected > 0) ||
-                          (data.error && (
-                            <FileTextBox
-                              flexDirection="column"
-                              gap="1rem"
-                              align="flex-start"
-                            >
-                              {data.uploadResult &&
-                                data.uploadResult.rowsRejected > 0 && (
-                                  <Text color="orange" size="sm">
-                                    {data.uploadResult.rowsRejected.toLocaleString()}{" "}
-                                    row
-                                    {data.uploadResult.rowsRejected > 1
-                                      ? "s"
-                                      : ""}{" "}
-                                    rejected
-                                  </Text>
-                                )}
-                              {data.error && (
-                                <Text color="red" size="sm">
-                                  {data.error}
-                                </Text>
-                              )}
-                            </FileTextBox>
-                          ))}
-                      </Box>
-                    </Box>
-                  )
-                },
-              },
-              {
-                header: "Table name",
-                align: "flex-end",
-                width: "180px",
-                render: ({ data }) => {
-                  return (
-                    <RenameTableDialog
-                      open={renameDialogOpen === data.id}
-                      onOpenChange={(f) => setRenameDialogOpen(f?.id)}
-                      onNameChange={(name) => {
-                        onFilePropertyChange(data.id, {
-                          table_name: name,
-                        })
-                      }}
-                      file={data}
-                    />
-                  )
-                },
-              },
-              {
-                header: (
-                  <PopperHover
-                    placement="top"
-                    trigger={
-                      <Box align="center" gap="0.5rem">
-                        Table owner
-                        <Information size="16px" />
-                      </Box>
-                    }
-                  >
-                    <Tooltip>
-                      Required for external (non-database) users.
-                    </Tooltip>
-                  </PopperHover>
-                ),
-                align: "center",
-                width: "150px",
-                render: ({ data }) => (
-                  <Select
-                    name="table_owner"
-                    defaultValue={ownedByList[0] ?? ""}
-                    onChange={(e: React.ChangeEvent<HTMLSelectElement>) =>
-                      onFilePropertyChange(data.id, {
-                        table_owner: e.target.value,
-                      })
-                    }
-                    options={Object.values(ownedByList).map((entity) => ({
-                      label: entity,
-                      value: entity,
-                    }))}
-                  />
-                ),
-              },
-              {
-                header: (
-                  <PopperHover
-                    placement="top"
-                    trigger={
-                      <Box align="center" gap="0.5rem">
-                        Schema
-                        <Information size="16px" />
-                      </Box>
-                    }
-                  >
-                    <Tooltip>
-                      Optional. By default, QuestDB will infer schema from the
-                      CSV file structure
-                    </Tooltip>
-                  </PopperHover>
-                ),
-
-                align: "center",
-                width: "150px",
-                render: ({ data }) => {
-                  const name = data.table_name ?? data.fileObject.name
-                  return (
-                    <TableSchemaDialog
-                      action="import"
-                      open={schemaDialogOpen === data.id}
-                      onOpenChange={(name?: string) =>
-                        setSchemaDialogOpen(name ? data.id : undefined)
-                      }
-                      onSchemaChange={(schema) => {
-                        onFilePropertyChange(data.id, {
-                          schema: schema.schemaColumns,
-                          partitionBy: schema.partitionBy,
-                          timestamp: schema.timestamp,
-                        })
-                      }}
-                      name={name}
-                      schema={data.schema}
-                      partitionBy={data.partitionBy}
-                      ttlValue={data.ttlValue}
-                      ttlUnit={data.ttlUnit}
-                      timestamp={data.timestamp}
-                      isEditLocked={
-                        data.exists && data.table_name === data.fileObject.name
-                      }
-                      hasWalSetting={false}
-                      ctaText="Save"
-                    />
-                  )
-                },
-              },
-              {
-                header: (
-                  <PopperHover
-                    placement="top"
-                    trigger={
-                      <Box align="center" gap="0.5rem">
-                        Write mode
-                        <Information size="16px" />
-                      </Box>
-                    }
-                  >
-                    <Tooltip>
-                      <strong>Append</strong>: data will be appended to the set.
-                      <br />
-                      <strong>Overwrite</strong>: any existing data or structure
-                      will be overwritten. Required for partitioning and
-                      timestamp related changes.
-                    </Tooltip>
-                  </PopperHover>
-                ),
-                align: "center",
-                width: "150px",
-                render: ({ data }) => (
-                  <Select
-                    name="overwrite"
-                    defaultValue={data.settings.overwrite ? "true" : "false"}
-                    onChange={(e: React.ChangeEvent<HTMLSelectElement>) =>
-                      onFilePropertyChange(data.id, {
-                        settings: {
-                          ...data.settings,
-                          overwrite: e.target.value === "true",
-                        },
-                      })
-                    }
-                    options={[
-                      {
-                        label: "Append",
-                        value: "false",
-                      },
-                      {
-                        label: "Overwrite",
-                        value: "true",
-                      },
-                    ]}
-                  />
-                ),
-              },
-              {
-                align: "flex-end",
-                width: "300px",
-                render: ({ data }) => (
-                  <UploadActions
-                    file={data}
-                    onUpload={onFileUpload}
-                    onRemove={onFileRemove}
-                    onSettingsChange={(settings) => {
-                      onFilePropertyChange(data.id, {
-                        settings,
-                      })
-                    }}
-                  />
-                ),
-              },
-            ]}
+            columns={columns}
             rows={files}
           />
           {files.length === 0 && (
diff --git a/packages/web-console/src/scenes/Import/ImportCSVFiles/index.tsx b/packages/web-console/src/scenes/Import/ImportCSVFiles/index.tsx
index 944990a1a..4ba4f511d 100644
--- a/packages/web-console/src/scenes/Import/ImportCSVFiles/index.tsx
+++ b/packages/web-console/src/scenes/Import/ImportCSVFiles/index.tsx
@@ -45,8 +45,14 @@ export const ImportCSVFiles = ({ onViewData, onUpload }: Props) => {
   const [ownedByList, setOwnedByList] = useState<string[]>([])
 
   const getOwnedByList = async () => {
-    let ownedByNames: string[] = []
+    const isEE = getValue(StoreKey.RELEASE_TYPE) === "EE"
+    if (!isEE) {
+      // OSS does not have to set owner
+      return
+    }
+
     try {
+      let ownedByNames: string[] = []
       const userResult = await quest.query<Parameter>(
         `select current_user()`,
       )
diff --git a/packages/web-console/src/scenes/Import/ImportCSVFiles/upload.tsx b/packages/web-console/src/scenes/Import/ImportCSVFiles/upload.tsx
index bfef104aa..f11ccb1b4 100644
--- a/packages/web-console/src/scenes/Import/ImportCSVFiles/upload.tsx
+++ b/packages/web-console/src/scenes/Import/ImportCSVFiles/upload.tsx
@@ -104,6 +104,7 @@ export const Upload = ({ files, onFilesDropped, dialogOpen }: Props) => {
               }}
               prefixIcon={<Search2 size="18px" />}
               skin="secondary"
+              data-hook="import-browse-from-disk"
             >
               Browse from disk
             </Button>

From 3c1e5dea08463ef316aaf6f74802aef4726602da Mon Sep 17 00:00:00 2001
From: glasstiger <imre@questdb.io>
Date: Fri, 25 Apr 2025 10:50:56 +0100
Subject: [PATCH 4/7] OSS test

---
 .../cypress/integration/console/import.spec.js              | 6 ------
 packages/web-console/serve-dist.js                          | 5 +++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/browser-tests/cypress/integration/console/import.spec.js b/packages/browser-tests/cypress/integration/console/import.spec.js
index e65af686c..8e85d51e6 100644
--- a/packages/browser-tests/cypress/integration/console/import.spec.js
+++ b/packages/browser-tests/cypress/integration/console/import.spec.js
@@ -13,11 +13,5 @@ describe("questdb import", () => {
     cy.get('input[type="file"]').selectFile("cypress/fixtures/test.csv", { force: true });
     cy.getByDataHook("import-table-column-schema").should("be.visible");
     cy.getByDataHook("import-table-column-owner").should("not.exist");
-
-    // cy.get('div').contains("Table name").should("be.visible");
-    // cy.get('div').contains("Table owner").should("not.exist");
-
-    // cy.contains('div', "Table name").should("be.visible");
-    // cy.contains('div', "Table owner").should("not.exist");
   });
 });
diff --git a/packages/web-console/serve-dist.js b/packages/web-console/serve-dist.js
index 456e7301a..5cf46c7dc 100644
--- a/packages/web-console/serve-dist.js
+++ b/packages/web-console/serve-dist.js
@@ -10,7 +10,7 @@ const server = http.createServer((req, res) => {
         res.statusCode = 403;
         res.end();
         return;
-    }
+    }
   const { method } = req
   const baseUrl =  "http://" + req.headers.host + contextPath;
   const reqUrl = new url.URL(req.url, baseUrl);
@@ -20,7 +20,8 @@ const server = http.createServer((req, res) => {
   if (
     reqPathName.startsWith("/exec") ||
     reqPathName.startsWith("/settings") ||
-    reqPathName.startsWith("/warnings")
+    reqPathName.startsWith("/warnings") ||
+    reqPathName.startsWith("/chk")
   ) {
     // proxy /exec requests to localhost:9000
     const options = {

From beb60e27e2ae985d7f99a83f478cea362caf378b Mon Sep 17 00:00:00 2001
From: glasstiger <imre@questdb.io>
Date: Fri, 25 Apr 2025 15:01:54 +0100
Subject: [PATCH 5/7] ent tests

---
 .../integration/enterprise/import.spec.js     | 18 ++++++++++++
 .../integration/enterprise/oidc.spec.js       | 28 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 packages/browser-tests/cypress/integration/enterprise/import.spec.js

diff --git a/packages/browser-tests/cypress/integration/enterprise/import.spec.js b/packages/browser-tests/cypress/integration/enterprise/import.spec.js
new file mode 100644
index 000000000..278299bd6
--- /dev/null
+++ b/packages/browser-tests/cypress/integration/enterprise/import.spec.js
@@ -0,0 +1,18 @@
+/// <reference types="cypress" />
+
+describe("CSV import in enterprise", () => {
+  before(() => {
+    cy.loadConsoleWithAuth();
+  });
+
+  it("display import panel", () => {
+    cy.getByDataHook("import-panel-button").click();
+    cy.getByDataHook("import-dropbox").should("be.visible");
+    cy.getByDataHook("import-browse-from-disk").should("be.visible");
+
+    cy.get('input[type="file"]').selectFile("cypress/fixtures/test.csv", { force: true });
+    cy.getByDataHook("import-table-column-schema").should("be.visible");
+    cy.getByDataHook("import-table-column-owner").should("be.visible");
+    cy.contains("option", "admin").should("exist");
+  });
+});
diff --git a/packages/browser-tests/cypress/integration/enterprise/oidc.spec.js b/packages/browser-tests/cypress/integration/enterprise/oidc.spec.js
index cd23d1579..c9e3c04af 100644
--- a/packages/browser-tests/cypress/integration/enterprise/oidc.spec.js
+++ b/packages/browser-tests/cypress/integration/enterprise/oidc.spec.js
@@ -96,4 +96,32 @@ describe("OIDC authentication", () => {
     cy.getByDataHook("button-log-in").click()
     cy.getEditor().should("be.visible");
   });
+
+  it("display import panel", () => {
+    interceptAuthorizationCodeRequest(`${baseUrl}?code=abcdefgh`);
+    cy.getByDataHook("button-sso-login").click();
+    cy.wait("@authorizationCode");
+
+    interceptTokenRequest({
+      "access_token": "gslpJtzmmi6RwaPSx0dYGD4tEkom",
+      "refresh_token": "FUuAAqMp6LSTKmkUd5uZuodhiE4Kr6M7Eyv",
+      "id_token": "eyJhbGciOiJSUzI1NiIsImtpZCI6I",
+      "token_type": "Bearer",
+      "expires_in": 300
+    });
+    cy.wait("@tokens");
+    cy.getEditor().should("be.visible");
+
+    cy.getByDataHook("import-panel-button").click();
+    cy.getByDataHook("import-dropbox").should("be.visible");
+    cy.getByDataHook("import-browse-from-disk").should("be.visible");
+
+    cy.get('input[type="file"]').selectFile("cypress/fixtures/test.csv", { force: true });
+    cy.getByDataHook("import-table-column-schema").should("be.visible");
+    cy.getByDataHook("import-table-column-owner").should("be.visible");
+    cy.contains("option", "user1").should("not.exist");
+    cy.contains("option", "group1").should("exist");
+
+    cy.logout();
+  });
 });

From c7776d46320362adf482359c1954182648c24fa2 Mon Sep 17 00:00:00 2001
From: Vlad Ilyushchenko <bluestreak@gmail.com>
Date: Fri, 25 Apr 2025 17:04:51 +0100
Subject: [PATCH 6/7] sync with questdb master

---
 packages/browser-tests/questdb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/browser-tests/questdb b/packages/browser-tests/questdb
index 60617999c..7debdb1af 160000
--- a/packages/browser-tests/questdb
+++ b/packages/browser-tests/questdb
@@ -1 +1 @@
-Subproject commit 60617999c2d16048dca06b80ab4f7441db5a532c
+Subproject commit 7debdb1af31033d3a89633b8f0634d933f65e32f

From 5c849a2c053da933af28b05a24925305053bfdc5 Mon Sep 17 00:00:00 2001
From: glasstiger <imre@questdb.io>
Date: Fri, 25 Apr 2025 21:44:06 +0100
Subject: [PATCH 7/7] update submodule

---
 packages/browser-tests/questdb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/browser-tests/questdb b/packages/browser-tests/questdb
index 7debdb1af..d470b048c 160000
--- a/packages/browser-tests/questdb
+++ b/packages/browser-tests/questdb
@@ -1 +1 @@
-Subproject commit 7debdb1af31033d3a89633b8f0634d933f65e32f
+Subproject commit d470b048c34b8020d3d2cad9d427882e15989f76