Skip to content

Commit dcb3568

Browse files
committed
Merge branch 'fix-card-height-issue' into 'master'
fix(ui): update card container height correctly, improve cypress test scenario, fix console warnings See merge request postgres-ai/database-lab!829
2 parents 72922c9 + 92c1496 commit dcb3568

File tree

17 files changed

+103
-59
lines changed

17 files changed

+103
-59
lines changed

assets/database-lab-dark-mode.svg

Lines changed: 4 additions & 4 deletions
Loading

assets/database-lab-light-mode.svg

Lines changed: 4 additions & 4 deletions
Loading

assets/dle-simple.svg

Lines changed: 4 additions & 4 deletions
Loading

assets/dle.svg

Lines changed: 6 additions & 6 deletions
Loading

assets/dle_button.svg

Lines changed: 6 additions & 6 deletions
Loading

ui/packages/ce/cypress/e2e/tabs.cy.js

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,44 @@
11
/* eslint-disable no-undef */
22

3-
describe('Instance page should have "Configuration" tab with content', () => {
4-
it('should have token in local storage', () => {
3+
describe('Configuration tab', () => {
4+
before(() => {
5+
// Set the token in local storage
56
cy.window().then((win) => {
67
if (!win.localStorage.getItem('token')) {
78
win.localStorage.setItem('token', 'demo-token')
89
}
910
})
1011
})
11-
it('should have "Configuration" tab with content', () => {
12+
13+
it('should have token in local storage', () => {
14+
// Check if the token exists in local storage
15+
cy.window()
16+
.should('have.property', 'localStorage')
17+
.and('have.property', 'token', 'demo-token')
18+
})
19+
20+
it('should have "Configuration" tab with form inputs', () => {
21+
// Visit the page
1222
cy.visit('/', {
1323
retryOnStatusCodeFailure: true,
1424
onLoad: () => {
15-
cy.get('.MuiTabs-flexContainer').contains('Configuration')
16-
cy.get('.MuiBox-root')
17-
.contains('p')
18-
.should('have.length.greaterThan', 0)
25+
// Click on the "Configuration" tab
26+
cy.get('.MuiTabs-flexContainer').contains('Configuration').click({
27+
force: true,
28+
})
29+
30+
// Check for elements on the "Configuration" tab
31+
cy.get('input[type="text"]').should('exist')
32+
cy.get('input[type="checkbox"]').should('exist')
33+
cy.get('button[type="button"]').should('exist')
34+
35+
// Click on the "Cancel" button within the "Configuration" tab
36+
cy.get('button').contains('Cancel').click({
37+
force: true,
38+
})
39+
40+
// Check if the URL has changed to "/instance"
41+
cy.url().should('eq', Cypress.config().baseUrl + '/instance')
1942
},
2043
})
2144
})

ui/packages/ce/src/App/Menu/Header/icons/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export const StarsIcon = ({ className }: { className?: string }) => (
8383
xmlns="http://www.w3.org/2000/svg"
8484
className={className}
8585
>
86-
<g clip-path="url(#clip0_3156:7537)">
86+
<g clipPath="url(#clip0_3156:7537)">
8787
<path
8888
d="M15.5319 4.94739C14.5807 4.94739 13.6874 5.31433 13.0162 5.98071C12.3453 6.64673 11.976 7.53381 11.976 8.47852C11.976 8.73743 11.766 8.94727 11.5072 8.94727C11.2483 8.94727 11.0385 8.73743 11.0385 8.47852C11.0385 7.53381 10.6689 6.64673 9.99805 5.98071C9.32691 5.31433 8.43359 4.94739 7.48242 4.94739C7.22351 4.94739 7.01367 4.73755 7.01367 4.47864C7.01367 4.21973 7.22351 4.00989 7.48242 4.00989C9.44312 4.00989 11.0385 2.42115 11.0385 0.468388C11.0385 0.209476 11.2483 -0.000362396 11.5072 -0.000362396C11.766 -0.000362396 11.976 0.209476 11.976 0.468388C11.976 2.42115 13.5712 4.00989 15.5319 4.00989C15.7908 4.00989 16.0006 4.21973 16.0006 4.47864C16.0006 4.73755 15.7908 4.94739 15.5319 4.94739ZM11.5072 2.45923C11.0719 3.32996 10.3604 4.04053 9.48779 4.47608C9.91565 4.68823 10.3107 4.96997 10.6586 5.31543C11.0081 5.66235 11.2928 6.05664 11.5071 6.48389C11.7214 6.05664 12.0062 5.66235 12.3556 5.31543C12.7035 4.96997 13.0986 4.68823 13.5264 4.47608C12.6539 4.04053 11.9424 3.32996 11.5072 2.45923Z"
8989
fill="currentColor"

ui/packages/ce/src/App/Menu/icons/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export const Github = () => (
125125
>
126126
<path
127127
fillRule="evenodd"
128-
clip-rule="evenodd"
128+
clipRule="evenodd"
129129
d="M12.649 0C5.664 0 0 5.664 0 12.65c0 5.59 3.624 10.33 8.651 12.004.633.116.864-.275.864-.61 0-.3-.011-1.096-.018-2.151-3.518.764-4.26-1.696-4.26-1.696-.576-1.461-1.405-1.85-1.405-1.85-1.149-.785.087-.77.087-.77 1.27.09 1.937 1.304 1.937 1.304 1.128 1.933 2.961 1.375 3.682 1.052.115-.818.441-1.376.803-1.692-2.809-.319-5.762-1.405-5.762-6.252 0-1.38.493-2.51 1.302-3.394-.13-.32-.565-1.606.123-3.348 0 0 1.063-.34 3.48 1.297 1.008-.28 2.09-.421 3.166-.426 1.074.005 2.157.145 3.167.426 2.415-1.637 3.475-1.297 3.475-1.297.69 1.742.257 3.028.126 3.348.811.884 1.301 2.013 1.301 3.394 0 4.86-2.958 5.93-5.776 6.242.454.39.859 1.163.859 2.343 0 1.69-.016 3.055-.016 3.47 0 .338.228.732.87.609 5.023-1.677 8.644-6.415 8.644-12.002C25.3 5.664 19.636 0 12.649 0Z"
130130
fill="#fff"
131131
/>

ui/packages/platform/public/images/dblab.svg

Lines changed: 6 additions & 6 deletions
Loading

ui/packages/platform/src/components/CheckupAgentForm/CheckupAgentFormWrapper.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ export const CheckupAgentFormWrapper = (props: CheckupAgentFormProps) => {
3838
},
3939
heading: {
4040
...theme.typography.h3,
41+
} as {
42+
[key: string]: string
4143
},
4244
fieldValue: {
4345
display: 'inline-block',

0 commit comments

Comments
 (0)