Skip to content

Commit 57744d0

Browse files
David KimChitlangeSahas
David Kim
and
ChitlangeSahas
authored
feat: clockface 3.0 integration overhaul take 2 (#2957)
* chore: install clockface beta and fix e2e tests (#2502) * fix: data explorer styling changes with clockface 3.0 (#2583) Co-authored-by: Chitlange Sahas <chitlangesahas@gmail.com> * chore: Task clockface beta context menu (#2573) * chore: install clockface beta and fix e2e tests (#2502) * fix task context menu and tests associated * chore: fix tests that were broken with the new context menu behavior * fix: lint * fix: merge master * fix: typescript error with fontWeight fixed * fix: attempt at fixing broken unit tests * fix: fix broken unit test due to new context menu behavior * fix: fix explorer test that broke due to context menu change in task page * fix: fix the pinned test that broke due to new testID name in context menu in task * fix: unpinned test due to context menu change Co-authored-by: Chitlange Sahas <chitlangesahas@gmail.com> * fix: fixing styling issues on buckets page with new clockface version (#2587) * fix: fixing styling issues on buckets page with new clockface version * fix: fix demo data bucket styling as well * fix: cosmetic issues on homepage (#2617) * fix: cosmetic issues on homepage * chore: remove nav bar upgrade button * fix: cosmetic changes to context menu, fixed associated tests for Telegraf (#2576) * fix: cosmetic changes to context menu, fixed associated tests * fix: lint * fix: fix style issues that arose from the shades of grey reducing * fix: lint * fix: cosmetic issues with tokens page with clockface beta, context menu and the tests (#2619) * fix: cosmetic issues with tokens with clockface beta, context menu and the tests * fix:lint * fix:lint * fix: new icon for generate token button * fix: remove comment * fix: Notebooks cosmetic changes in clockface beta (#2630) * fix: cosmetic issues after integrating with clockface 3.0, context menu deprecation * fix: test fix * fix: pinned test * fix: pinned test for notebooks * fix: notebooks panel * fix: cosmetic brokenness from clockface 3.0 for usage, billing, about, users pages (#2652) * fix: dashboard comsmetic changes and test changes (#2657) * fix: dashboard comsmetic changes and test changes * fix:lint * fix: dashboard test fix * fix: context menu pinned changes * fix:fix pinned test * fix: fix test based on color since coplor chagned * chore: deprecate old color and space variables and icons for new ones (#2718) * chore: deprecate old color and space variables for new ones * chore: replace all icon with new icons * chore: new icons * chore: change icons to new * fix: lint * fix: Icon imported from clockface rather than legacy cf * fix: fix unit test * fix: giraffe version * fix: tests fixed baed on icon * fix: more icons changed * chore: install clockface beta and fix e2e tests (#2502) * fix: cosmetic changes to context menu, fixed associated tests for Telegraf (#2576) * fix: cosmetic changes to context menu, fixed associated tests * fix: lint * fix: fix style issues that arose from the shades of grey reducing * fix: lint * fix: Notebooks cosmetic changes in clockface beta (#2630) * fix: cosmetic issues after integrating with clockface 3.0, context menu deprecation * fix: test fix * fix: pinned test * fix: pinned test for notebooks * fix: notebooks panel * chore: deprecate old color and space variables and icons for new ones (#2718) * chore: deprecate old color and space variables for new ones * chore: replace all icon with new icons * chore: new icons * chore: change icons to new * fix: lint * fix: Icon imported from clockface rather than legacy cf * fix: fix unit test * fix: giraffe version * fix: tests fixed baed on icon * fix: more icons changed * chore: Settings page fix styling issues clockface 3 (#2735) * chore: install clockface beta and fix e2e tests (#2502) * fix: delete button in Settings/Variables page * fix: context menu variables tab * fix: variables unit test * chore: prettier * fix: templates page css * fix: variables e2e tests * fix: variables e2e tests * fix: delete package-lock.json * fix: settings/templates * fix: settings/templates * chore: prettier * fix: Notebooks cosmetic changes in clockface beta (#2630) * fix: cosmetic issues after integrating with clockface 3.0, context menu deprecation * fix: test fix * fix: pinned test * fix: pinned test for notebooks * fix: notebooks panel * test: fix variable test * fix: labels page * chore: prettier * chore: no only in tests and fix labels * chore: right align the form buttons * fix: test * chore: prettier * chore: update tests * chore: address PR comments about re-renders * fix: rebase * chore: fix styling Co-authored-by: Chitlange Sahas <chitlangesahas@gmail.com> * fix: Round up UI fix for clockface 3.0 (#2734) * fix: usage, about org pages fixed * change add data button color * fix: lint fix * chore: change color variables, fix issues around text spacing, height around the UI, re-design the organization page, the dashboard cell colors are fixed * fix: lint fix * fix: remove unused imports lint fix * fix: fix test on org name * fix: fix test * fix: remove focus on test * fix: fix telegraf test * fix: test fix * fix: test * rebase * chore: fixing all css issues around alerts page * chore: fix tests * chore: last round up css style fixes * chore: missed in rebase * chore: fix tests after rebase (#2958) Co-authored-by: Chitlange Sahas <chitlangesahas@gmail.com>
1 parent 7206419 commit 57744d0

File tree

364 files changed

+2805
-2585
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

364 files changed

+2805
-2585
lines changed

‎cypress.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@
1212
"www.google-analytics.com",
1313
"www.googletagmanager.com",
1414
"www.honeybadger.io"
15-
]
15+
],
16+
"viewportWidth": 1200,
17+
"viewportHeight": 1000
1618
}

‎cypress/e2e/cloud/pinned.test.ts‎

Lines changed: 39 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ describe('Pinned Items', () => {
4242
it('pins a dashboard to the homepage for easy access as a pinned item', () => {
4343
cy.getByTestID('dashboard-card')
4444
.first()
45-
.trigger('mouseover')
4645
.within(() => {
47-
cy.getByTestID('context-pin-menu').click({force: true})
48-
cy.getByTestID('context-pin-dashboard').click()
46+
cy.getByTestID('context-menu-dashboard').click()
4947
})
48+
cy.getByTestID('context-pin-dashboard').click()
49+
5050
cy.visit('/')
5151
cy.getByTestID('tree-nav')
5252
cy.getByTestID('pinneditems--container').within(() => {
@@ -57,11 +57,11 @@ describe('Pinned Items', () => {
5757
it('reflects an edit to the dashboard name on the dashboard card', () => {
5858
cy.getByTestID('dashboard-card')
5959
.first()
60-
.trigger('mouseover')
6160
.within(() => {
62-
cy.getByTestID('context-pin-menu').click({force: true})
63-
cy.getByTestID('context-pin-dashboard').click()
61+
cy.getByTestID('context-menu-dashboard').click()
6462
})
63+
cy.getByTestID('context-pin-dashboard').click()
64+
6565
cy.getByTestID('dashboard-card').within(() => {
6666
cy.getByTestID('dashboard-card--name')
6767
.first()
@@ -90,11 +90,11 @@ describe('Pinned Items', () => {
9090
it('unpins a card which removes it from the pinned list', () => {
9191
cy.getByTestID('dashboard-card')
9292
.first()
93-
.trigger('mouseover')
9493
.within(() => {
95-
cy.getByTestID('context-pin-menu').click({force: true})
96-
cy.getByTestID('context-pin-dashboard').click()
94+
cy.getByTestID('context-menu-dashboard').click()
9795
})
96+
cy.getByTestID('context-pin-dashboard').click()
97+
9898
cy.visit('/')
9999
cy.getByTestID('tree-nav')
100100
cy.getByTestID('pinneditems--card')
@@ -115,9 +115,9 @@ describe('Pinned Items', () => {
115115
.first()
116116
.trigger('mouseover')
117117
.within(() => {
118-
cy.getByTestID('context-delete-menu').click()
119-
cy.getByTestID('context-delete-dashboard').click()
118+
cy.getByTestID('context-delete-menu--button').click()
120119
})
120+
cy.getByTestID('context-delete-menu--confirm-button').click()
121121

122122
cy.visit('/')
123123
cy.getByTestID('tree-nav')
@@ -166,7 +166,7 @@ from(bucket: "${name}"{rightarrow}
166166
.first()
167167
.trigger('mouseover')
168168
.then(() => {
169-
cy.getByTestID('context-pin-menu').click({force: true})
169+
cy.getByTestID('context-menu-task').click()
170170
cy.getByTestID('context-pin-task').click()
171171
})
172172
})
@@ -208,10 +208,14 @@ from(bucket: "${name}"{rightarrow}
208208
it('unpins when the underlying resource is removed', () => {
209209
cy.getByTestID('task-card')
210210
.first()
211-
.trigger('mouseover')
212-
.within(() => {
213-
cy.getByTestID('context-delete-menu').click()
214-
cy.getByTestID('context-delete-task').click()
211+
.then(() => {
212+
cy.getByTestID(`context-delete-menu ${taskName}--button`)
213+
.click()
214+
.then(() => {
215+
cy.getByTestID(
216+
`context-delete-menu ${taskName}--confirm-button`
217+
).click()
218+
})
215219
})
216220

217221
cy.visit('/')
@@ -229,7 +233,7 @@ from(bucket: "${name}"{rightarrow}
229233
pinnedItems: true,
230234
}).then(() => {
231235
cy.getByTestID('nav-item-flows').should('be.visible')
232-
cy.getByTestID('nav-item-flows').click()
236+
cy.clickNavBarItem('nav-item-flows')
233237
const now = Date.now()
234238
cy.writeData(
235239
[
@@ -255,12 +259,11 @@ from(bucket: "${name}"{rightarrow}
255259
})
256260

257261
it('pins a notebook to the homepage', () => {
258-
cy.getByTestID('flow-card--Flow')
259-
.trigger('mouseover')
260-
.then(() => {
261-
cy.getByTestID('context-pin-menu').click({force: true})
262-
cy.getByTestID('context-pin-flow').click({force: true})
263-
})
262+
cy.getByTestID('flow-card--Flow').within(() => {
263+
cy.getByTestID('context-menu-flow').click()
264+
})
265+
cy.getByTestID('context-pin-flow').click()
266+
264267
cy.visit('/')
265268
cy.getByTestID('tree-nav')
266269
cy.getByTestID('pinneditems--container').within(() => {
@@ -269,12 +272,11 @@ from(bucket: "${name}"{rightarrow}
269272
})
270273

271274
it('updates the name when the notebook name is updated', () => {
272-
cy.getByTestID('flow-card--Flow')
273-
.trigger('mouseover')
274-
.then(() => {
275-
cy.getByTestID('context-pin-menu').click({force: true})
276-
cy.getByTestID('context-pin-flow').click({force: true})
277-
})
275+
cy.getByTestID('flow-card--Flow').within(() => {
276+
cy.getByTestID('context-menu-flow').click()
277+
})
278+
cy.getByTestID('context-pin-flow').click()
279+
278280
cy.getByTestID('resource-editable-name')
279281
.first()
280282
.trigger('mouseover')
@@ -314,18 +316,14 @@ from(bucket: "${name}"{rightarrow}
314316
.focus()
315317
.type('Bucks In Six')
316318
.type('{enter}')
317-
cy.getByTestID('flow-card--Bucks In Six')
318-
.trigger('mouseover')
319-
.then(() => {
320-
cy.getByTestID('context-pin-menu').click({force: true})
321-
cy.getByTestID('context-pin-flow').click({force: true})
322-
cy.getByTestID('context-delete-menu Bucks In Six').click({
323-
force: true,
324-
})
325-
cy.getByTestID('context-delete-flow Bucks In Six').click({
326-
force: true,
327-
})
328-
})
319+
cy.getByTestID('flow-card--Bucks In Six').within(() => {
320+
cy.getByTestID('context-menu-flow').click()
321+
})
322+
cy.getByTestID('context-pin-flow').click()
323+
cy.getByTestID('flow-card--Bucks In Six').within(() => {
324+
cy.getByTestID(`context-delete-menu--button`).click()
325+
})
326+
cy.getByTestID(`context-delete-menu--confirm-button`).click()
329327
cy.visit('/')
330328
cy.getByTestID('tree-nav')
331329
cy.getByTestID('pinneditems--emptystate').should(

‎cypress/e2e/oss/onboarding.test.ts‎

Lines changed: 15 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,12 @@ describe('Onboarding', () => {
7373

7474
cy.getByTestID('next').should('be.disabled')
7575

76-
cy.getByTestID('next')
77-
.children('.cf-button--label')
78-
.contains('Continue')
76+
cy.getByTestID('next').contains('CONTINUE', {matchCase: false})
7977

8078
// Input fields
8179
cy.fillInOSSLoginFormWithDefaults()
8280

83-
cy.getByTestID('next')
84-
.children('.cf-button--label')
85-
.contains('Continue')
81+
cy.getByTestID('next').contains('CONTINUE', {matchCase: false})
8682

8783
cy.getByTestID('next')
8884
.should('be.enabled')
@@ -184,17 +180,15 @@ describe('Onboarding', () => {
184180

185181
cy.getByTestID('next')
186182
.should('be.disabled')
187-
.children('.cf-button--label')
188-
.contains('Continue')
183+
.contains('CONTINUE', {matchCase: false})
189184

190185
cy.get<string>('@defaultPassword').then((defaultPassword: string) => {
191186
cy.getByTestID('input-field--password').type(defaultPassword)
192187
})
193188

194189
cy.getByTestID('next')
195190
.should('be.disabled')
196-
.children('.cf-button--label')
197-
.contains('Continue')
191+
.contains('CONTINUE', {matchCase: false})
198192

199193
cy.getByTestID('input-field--password-chk').type('drowssap')
200194

@@ -217,8 +211,7 @@ describe('Onboarding', () => {
217211

218212
cy.getByTestID('next')
219213
.should('be.disabled')
220-
.children('.cf-button--label')
221-
.contains('Continue')
214+
.contains('CONTINUE', {matchCase: false})
222215

223216
cy.get<string>('@defaultOrg').then((defaultOrg: string) => {
224217
cy.getByTestID('input-field--orgname').type(defaultOrg)
@@ -228,8 +221,7 @@ describe('Onboarding', () => {
228221

229222
cy.getByTestID('next')
230223
.should('be.disabled')
231-
.children('.cf-button--label')
232-
.contains('Continue')
224+
.contains('CONTINUE', {matchCase: false})
233225

234226
cy.get<string>('@defaultPassword').then((defaultPassword: string) => {
235227
cy.getByTestID('input-field--password')
@@ -244,25 +236,22 @@ describe('Onboarding', () => {
244236

245237
cy.getByTestID('next')
246238
.should('be.enabled')
247-
.children('.cf-button--label')
248-
.contains('Continue')
239+
.contains('CONTINUE', {matchCase: false})
249240

250241
// check cleared username
251242
cy.getByTestID('input-field--username').clear()
252243

253244
cy.getByTestID('next')
254245
.should('be.disabled')
255-
.children('.cf-button--label')
256-
.contains('Continue')
246+
.contains('CONTINUE', {matchCase: false})
257247

258248
cy.get<string>('@defaultUser').then((defaultUser: string) => {
259249
cy.getByTestID('input-field--username').type(defaultUser)
260250
})
261251

262252
cy.getByTestID('next')
263253
.should('be.enabled')
264-
.children('.cf-button--label')
265-
.contains('Continue')
254+
.contains('CONTINUE', {matchCase: false})
266255

267256
// check cleared password
268257
cy.getByTestID('input-field--password').clear()
@@ -274,8 +263,7 @@ describe('Onboarding', () => {
274263

275264
cy.getByTestID('next')
276265
.should('be.disabled')
277-
.children('.cf-button--label')
278-
.contains('Continue')
266+
.contains('CONTINUE', {matchCase: false})
279267

280268
cy.get<string>('@defaultPassword').then((defaultPassword: string) => {
281269
cy.getByTestID('input-field--password')
@@ -289,40 +277,35 @@ describe('Onboarding', () => {
289277

290278
cy.getByTestID('next')
291279
.should('be.enabled')
292-
.children('.cf-button--label')
293-
.contains('Continue')
280+
.contains('CONTINUE', {matchCase: false})
294281

295282
// check cleared org name
296283
cy.getByTestID('input-field--orgname').clear()
297284

298285
cy.getByTestID('next')
299286
.should('be.disabled')
300-
.children('.cf-button--label')
301-
.contains('Continue')
287+
.contains('CONTINUE', {matchCase: false})
302288

303289
cy.get<string>('@defaultOrg').then((defaultOrg: string) => {
304290
cy.getByTestID('input-field--orgname').type(defaultOrg)
305291
})
306292

307293
cy.getByTestID('next')
308294
.should('be.enabled')
309-
.children('.cf-button--label')
310-
.contains('Continue')
295+
.contains('CONTINUE', {matchCase: false})
311296

312297
// check cleared bucket name
313298
cy.getByTestID('input-field--bucketname').clear()
314299

315300
cy.getByTestID('next')
316301
.should('be.disabled')
317-
.children('.cf-button--label')
318-
.contains('Continue')
302+
.contains('CONTINUE', {matchCase: false})
319303

320304
cy.getByTestID('input-field--bucketname').type(defaultBucket)
321305
})
322306

323307
cy.getByTestID('next')
324308
.should('be.enabled')
325-
.children('.cf-button--label')
326-
.contains('Continue')
309+
.contains('CONTINUE', {matchCase: false})
327310
})
328311
})

‎cypress/e2e/shared/about.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ describe('About Page', () => {
5151
.contains(newOrgName)
5252

5353
cy.getByTestID('org-profile--name').contains(newOrgName)
54-
cy.getByTestID('danger-zone--org-name').contains(newOrgName)
54+
cy.getByTestID('danger-zone--org-name').should('have.value', newOrgName)
5555
})
5656
})

‎cypress/e2e/shared/buckets.test.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,11 @@ describe('Buckets', () => {
100100
})
101101
cy.reload()
102102
cy.getByTestID(`bucket-card ${bucket1}`).trigger('mouseover')
103-
cy.getByTestID(`context-delete-menu ${bucket1}`).click()
103+
cy.getByTestID(`context-delete-menu ${bucket1}--button`).click()
104104
cy.intercept('DELETE', '/api/v2/buckets/*').as('deleteBucket')
105-
cy.getByTestID(`context-delete-bucket ${bucket1}`).click({force: true})
105+
cy.getByTestID(`context-delete-menu ${bucket1}--confirm-button`).click({
106+
force: true,
107+
})
106108
cy.wait('@deleteBucket')
107109
cy.getByTestID(`bucket--card--name ${bucket1}`).should('not.exist')
108110
})

‎cypress/e2e/shared/checks.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ describe('Checks', () => {
332332
cy.getByTestID('save-cell--button').click()
333333

334334
// go to the history page
335-
cy.getByTestID('context-history-menu').click({force: true})
335+
cy.getByTestID('context-menu-task').click({force: true})
336336
cy.getByTestID('context-history-task').click({force: true})
337337

338338
// make sure table is present
@@ -388,7 +388,7 @@ describe('Checks', () => {
388388
})
389389

390390
it('after check creation confirm history page has graph', () => {
391-
cy.getByTestID('context-history-menu').click()
391+
cy.getByTestID('context-menu-task').click()
392392
cy.getByTestID('context-history-task').click()
393393
cy.getByTestID('giraffe-axes').should('be.visible')
394394

0 commit comments

Comments
 (0)