Skip to content

feat(ui): owner setting for tables created during CSV import #413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emrberk merged 11 commits into from
Apr 28, 2025
Merged

feat(ui): owner setting for tables created during CSV import #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9cd96a5
feat(ui): owner setting for tables created during CSV import
glasstiger Apr 3, 2025
10ed1e1
update submodule
glasstiger Apr 3, 2025
da0fbd0
Merge remote-tracking branch 'origin/main' into csv_import_owner
glasstiger Apr 4, 2025
6ee6c8b
Merge branch 'main' into csv_import_owner
glasstiger Apr 24, 2025
72d8e67
OSS test
glasstiger Apr 25, 2025
3c1e5de
OSS test
glasstiger Apr 25, 2025
beb60e2
ent tests
glasstiger Apr 25, 2025
c7776d4
sync with questdb master
bluestreak01 Apr 25, 2025
5c849a2
update submodule
glasstiger Apr 25, 2025
488869c
Merge branch 'main' into csv_import_owner
glasstiger Apr 27, 2025
0ff8dd5
Merge branch 'main' into csv_import_owner
glasstiger Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/browser-tests/cypress/fixtures/test.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions packages/browser-tests/cypress/integration/console/import.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,10 @@ 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");
});
});
18 changes: 18 additions & 0 deletions packages/browser-tests/cypress/integration/enterprise/import.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
});
});
28 changes: 28 additions & 0 deletions packages/browser-tests/cypress/integration/enterprise/oidc.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
});
5 changes: 3 additions & 2 deletions packages/web-console/serve-dist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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 = {
Expand Down
Loading