Skip to content

Commit 6719e00

Browse files
committed
Merge remote-tracking branch 'origin/main' into ia_config_endpoint
2 parents 9536049 + ce6d93e commit 6719e00

9 files changed

Lines changed: 35 additions & 22 deletions

File tree

packages/browser-tests/cypress/integration/console/grid.spec.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,10 @@ describe("questdb grid", () => {
6666

6767
cy.getGridViewport().scrollTo("bottom");
6868
cy.wait(100);
69-
cy.getCollapsedNotifications().should("contain", "HTTP 400 (Bad request)");
69+
cy.getCollapsedNotifications().should(
70+
"contain",
71+
"simulated cairo exception"
72+
);
7073
});
7174

7275
it("copy cell into the clipboard", () => {

packages/browser-tests/cypress/integration/console/schema.spec.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -465,9 +465,15 @@ describe("materialized views", () => {
465465
(req) => {
466466
req.continue((res) => {
467467
if (res.body && res.body.dataset && res.body.dataset.length > 0) {
468-
// [view_name, refresh_type, base_table_name, last_refresh_timestamp, view_sql, view_table_dir_name, invalidation_reason, view_status, base_table_txn, applied_base_table_txn]
469-
res.body.dataset[0][6] = "this is an invalidation reason";
470-
res.body.dataset[0][7] = "invalid";
468+
const viewStatusIndex = res.body.columns.findIndex(
469+
(c) => c.name === "view_status"
470+
);
471+
const invalidationReasonIndex = res.body.columns.findIndex(
472+
(c) => c.name === "invalidation_reason"
473+
);
474+
res.body.dataset[0][viewStatusIndex] = "invalid";
475+
res.body.dataset[0][invalidationReasonIndex] =
476+
"this is an invalidation reason";
471477
}
472478
return res;
473479
});

packages/web-console/src/scenes/Editor/Monaco/query-in-notification.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ export const QueryInNotification = ({ query }: { query: string }) => {
1515

1616
return (
1717
<Box gap="1rem" align="center">
18+
<CopyButton text={query} iconOnly={true} />
1819
<StyledText color="foreground" title={query}>
1920
{query}
2021
</StyledText>
21-
<CopyButton text={query} iconOnly={true} />
2222
</Box>
2323
)
2424
}

packages/web-console/src/scenes/Editor/QueryResult/index.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ type Props = Timings &
4141
const Wrapper = styled.div`
4242
display: flex;
4343
align-items: center;
44-
margin-top: 0.2rem;
4544
overflow: hidden;
4645
${collapseTransition};
4746
@@ -99,7 +98,7 @@ const QueryResult = ({ compiler, authentication, count, execute, fetch, rowCount
9998
<Wrapper _height={95} duration={TransitionDuration.FAST}>
10099
<div>
101100
<Text color="gray2">
102-
{rowCount.toLocaleString()} row{rowCount > 1 ? "s" : ""} in&nbsp;
101+
{rowCount.toLocaleString()} row{(rowCount > 1 || rowCount === 0) ? "s" : ""} in&nbsp;
103102
{formatTiming(fetch)}
104103
</Text>
105104
</div>

packages/web-console/src/scenes/Notifications/Notification/SuccessNotification/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ const CheckmarkOutlineIcon = styled(CheckmarkOutline)`
3939

4040
const ZapIcon = styled(Zap)`
4141
color: ${color("yellow")};
42+
flex-shrink: 0;
4243
`
4344

4445
export const SuccessNotification = (props: NotificationShape) => {

packages/web-console/src/scenes/Notifications/Notification/styles.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,24 @@
2525
import styled from "styled-components"
2626
import { NotificationShape } from "types"
2727
import { bezierTransition } from "../../../components"
28-
import { color } from "../../../utils"
2928

3029
export const Wrapper = styled.div<{
3130
isMinimized: NotificationShape["isMinimized"]
3231
}>`
3332
display: flex;
3433
align-items: center;
3534
border-right: none;
36-
width: 100%;
37-
overflow: hidden;
3835
height: ${({ isMinimized }) => (isMinimized ? "auto" : "4.5rem")};
39-
${({ isMinimized }) => !isMinimized && `
40-
border-bottom: 1px ${color("backgroundDarker")} solid;
41-
`}
42-
36+
border-bottom: ${({ isMinimized, theme }) => isMinimized ? "none" : `1px solid ${theme.color.backgroundDarker}`};
4337
padding: 0 1rem;
38+
flex-shrink: 0;
39+
width: 100%;
40+
overflow-x: auto;
41+
scrollbar-width: none;
42+
-ms-overflow-style: none;
43+
&::-webkit-scrollbar {
44+
display: none;
45+
}
4446
4547
${bezierTransition};
4648
`
@@ -52,8 +54,6 @@ export const Content = styled.div`
5254
`
5355

5456
export const SideContent = styled.div`
55-
margin-left: auto;
5657
padding-left: 1rem;
57-
overflow: hidden;
5858
text-overflow: ellipsis;
5959
`

packages/web-console/src/scenes/Notifications/index.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ const Menu = styled(PaneMenu)`
7070

7171
const Content = styled(PaneContent)<{ minimized: boolean }>`
7272
overflow: ${(props) => (props.minimized ? "hidden" : "auto")};
73-
padding: ${(props) => (props.minimized ? "0" : "0 0 1rem")};
74-
flex: initial;
73+
overflow-x: hidden;
7574
height: ${(props) => (props.minimized ? "4rem" : "100%")};
7675
`
7776

@@ -97,8 +96,12 @@ const TerminalBoxIcon = styled(TerminalBox)`
9796
const ClearAllNotifications = styled.div`
9897
display: flex;
9998
width: 100%;
99+
height: 4.5rem;
100100
justify-content: center;
101+
padding: 0.5rem 1rem;
101102
margin-top: auto;
103+
align-items: center;
104+
flex-shrink: 0;
102105
`
103106

104107
const Notifications = () => {
@@ -152,7 +155,7 @@ const Notifications = () => {
152155
<Notification isMinimized={true} {...lastNotification} />
153156
)}
154157
</LatestNotification>
155-
<Button skin="transparent" onClick={toggleMinimized}>
158+
<Button skin={`${isMinimized ? "secondary" : "transparent"}`} onClick={toggleMinimized}>
156159
{isMinimized ? <ArrowUpS size="18px" /> : <Subtract size="18px" />}
157160
</Button>
158161
</Menu>

packages/web-console/src/scenes/Schema/Row/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ const Wrapper = styled.div<{ $level?: number, $selectOpen?: boolean, $focused?:
8686
user-select: none;
8787
border: 1px solid transparent;
8888
border-radius: 0.4rem;
89+
min-width: fit-content;
8990
width: 100%;
91+
flex-grow: 1;
9092
9193
cursor: ${({ $selectOpen }) => $selectOpen ? "pointer" : "default"};
9294
@@ -129,7 +131,6 @@ const TableActions = styled.span`
129131
const FlexRow = styled.div<{ $selectOpen?: boolean, $isTableKind?: boolean }>`
130132
display: flex;
131133
align-items: center;
132-
width: 100%;
133134
padding-right: 1rem;
134135
transform: translateX(${({ $selectOpen, $isTableKind }) => $selectOpen && $isTableKind ? "1rem" : "0"});
135136
transition: transform 275ms ease-in-out;

packages/web-console/src/scenes/Schema/VirtualTables/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ const VirtualTables: FC<VirtualTablesProps> = ({
319319
<Row
320320
kind="detail"
321321
index={index}
322-
name={`${item.name}:`}
322+
name={item.value ? `${item.name}:` : item.name}
323323
value={item.value}
324324
id={item.id}
325325
onExpandCollapse={() => {}}
@@ -490,7 +490,7 @@ const VirtualTables: FC<VirtualTablesProps> = ({
490490

491491
fetchColumnsForExpandedTables()
492492
}
493-
}, [state.view, regularTables, matViewTables]);
493+
}, [state.view, regularTables, matViewTables, materializedViews]);
494494

495495
if (state.view === View.loading || (state.view === View.ready && !columnsReady)) {
496496
return <Loading />

0 commit comments

Comments
 (0)