Skip to content
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

fix safari scroll #1663

Merged
merged 18 commits into from
Mar 30, 2023
Merged

fix safari scroll #1663

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2073f1a
fix safari scroll
Mar 30, 2023
eda4e27
enable tests on Safari
Mar 30, 2023
8f95356
update CHANGELOG
Mar 30, 2023
19ede8e
make escalation chain name inline uneditable
Mar 30, 2023
9634a61
add webkit browser dependency
joeyorlando Mar 30, 2023
b892f59
Merge branch 'dev' into maxim/fix-safari-scrolling
Mar 30, 2023
857893c
Merge branch 'dev' into maxim/fix-safari-scrolling
Mar 30, 2023
ff82b7a
update CHANGELOG
Mar 30, 2023
73265da
update CHANGELOG
Mar 30, 2023
751997a
make clickButton integration-tests util
joeyorlando Mar 30, 2023
97b0874
Merge branch 'maxim/fix-safari-scrolling' of github.com:grafana/oncal…
joeyorlando Mar 30, 2023
1f8cb85
bust playwright CI deps cache
joeyorlando Mar 30, 2023
f08cb5d
make tests a bit more robust on CI
joeyorlando Mar 30, 2023
c1695f5
Merge branch 'dev' into maxim/fix-safari-scrolling
joeyorlando Mar 30, 2023
52edcd7
wip
joeyorlando Mar 30, 2023
bc01e5e
Merge branch 'maxim/fix-safari-scrolling' of github.com:grafana/oncal…
joeyorlando Mar 30, 2023
0f651fe
dont run tests in parallel
joeyorlando Mar 30, 2023
4988a5a
revert change to # of pods
joeyorlando Mar 30, 2023
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: 1 addition & 2 deletions .github/workflows/linting-and-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,11 +377,10 @@ jobs:

- name: Install Playwright binaries/dependencies
if: steps.playwright-cache.outputs.cache-hit != 'true'
# if more browsers are added, will need to modify the "npx playwright install" command
# https://stackoverflow.com/questions/65900299/install-single-dependency-from-package-json-with-yarn
run: |
yarn add "@playwright/test@${{ env.PLAYWRIGHT_VERSION }}"
npx playwright install --with-deps chromium firefox
npx playwright install --with-deps chromium firefox webkit
joeyorlando marked this conversation as resolved.
Show resolved Hide resolved
npx playwright install-deps

- name: Await k8s pods and other resources up
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Addressed bug with iOS mobile push notifications always being set to critical by @imtoori and @joeyorlando ([#1646](https://github.com/grafana/oncall/pull/1646))
- Fixed issue where Viewer was not able to view which people were oncall in a schedule ([#999](https://github.com/grafana/oncall/issues/999))
- Fixed a bug with syncing teams from Grafana API by @vadimkerr ([#1652](https://github.com/grafana/oncall/pull/1652))
- Fixed bug when web schedules/shifts use non-UTC timezone and shift is deleted by @matiasb ([#1661](https://github.com/grafana/oncall/pull/1661))
joeyorlando marked this conversation as resolved.
Show resolved Hide resolved
- Enable tests on Safari
- Fix Safari scroll ([#415](https://github.com/grafana/oncall/issues/415))
joeyorlando marked this conversation as resolved.
Show resolved Hide resolved

## v1.2.3 (2023-03-28)

Expand Down
14 changes: 6 additions & 8 deletions grafana-plugin/playwright.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,12 @@ const config: PlaywrightTestConfig = {
...devices['Desktop Firefox'],
},
},

// TODO: enable tests on Safari once the scroll bug when creating an integration is patched
// {
// name: 'webkit',
// use: {
// ...devices['Desktop Safari'],
// },
// },
{
name: 'webkit',
use: {
...devices['Desktop Safari'],
},
},

/* Test against mobile viewports. */
// {
Expand Down
3 changes: 2 additions & 1 deletion grafana-plugin/src/img/grafanaGlobalStyles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* Navigation/Layout */

.drawer-content {
.drawer-content,
.rc-drawer-content {
overflow: auto !important; /* fix https://github.com/grafana/oncall/issues/415 */
}

Expand Down
7 changes: 1 addition & 6 deletions grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,12 +286,7 @@ class EscalationChainsPage extends React.Component<EscalationChainsPageProps, Es
return (
<>
<Block withBackground className={cx('header')}>
<Text
size="large"
editable
onTextChange={this.handleEscalationChainNameChange}
data-testid="escalation-chain-name"
>
<Text size="large" onTextChange={this.handleEscalationChainNameChange} data-testid="escalation-chain-name">
{escalationChain.name}
</Text>
<div className={cx('buttons')}>
Expand Down