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

Jump to bottom

fix: Alert get dismissed in the admin/alerts page #2569

Merged
merged 6 commits into from
Dec 5, 2022
Merged

fix: Alert get dismissed in the admin/alerts page #2569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
feaf808
fix: Disable hiding alerts
flacial Nov 21, 2022
f0270e2
test: Update snapshots
flacial Nov 21, 2022
a47d62a
Merge branch 'master' into 2269-alert-get-dismissed-in-the-adminalert…
SlyBouhafs Nov 27, 2022
3173bb8
Merge branch 'master' into 2269-alert-get-dismissed-in-the-adminalert…
flacial Dec 3, 2022
33fb6ba
Merge branch 'garageScript:master' into 2269-alert-get-dismissed-in-t…
flacial Dec 4, 2022
c861763
Merge branch 'master' into 2269-alert-get-dismissed-in-the-adminalert…
flacial Dec 5, 2022
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
2 changes: 0 additions & 2 deletions components/admin/alerts/AdminNewAlert.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import Alert from '../../Alert'
import { FormCard } from '../../../components/FormCard'
import ADD_ALERT from '../../../graphql/queries/addAlert'
import { Alert as AlertType } from '../../../graphql'
import noop from '../../../helpers/noop'
import { alertValidation } from '../../../helpers/formValidation'
import { formChange } from '../../../helpers/formChange'
import {
Expand Down Expand Up @@ -80,7 +79,6 @@ export const NewAlert: React.FC<NewAlertProps> = ({ setAlerts }) => {
id: '-1',
...makeGraphqlVariable(alertProperties).variables
}}
onDismiss={noop}
/>
</div>
<div className="text-start">
Expand Down
14 changes: 2 additions & 12 deletions components/admin/alerts/__snapshots__/AdminNewAlert.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,9 @@ exports[`AdminLewAlert component Should create new alert 1`] = `
class="mb-3"
>
<div
class="fade alert alert-primary alert-dismissible show"
class="fade alert alert-primary show"
role="alert"
>
<button
aria-label="Close alert"
class="btn-close"
type="button"
/>
<div
class="d-flex align-items-center gap-3"
>
Expand Down Expand Up @@ -173,14 +168,9 @@ exports[`AdminLewAlert component Should refuse creating new alert with incomplet
class="mb-3"
>
<div
class="fade alert alert-primary alert-dismissible show"
class="fade alert alert-primary show"
role="alert"
>
<button
aria-label="Close alert"
class="btn-close"
type="button"
/>
<div
class="d-flex align-items-center gap-3"
>
Expand Down
3 changes: 1 addition & 2 deletions pages/admin/alerts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { AdminLayout } from '../../components/admin/AdminLayout'
import { Button } from '../../components/theme/Button'
import REMOVE_ALERT from '../../graphql/queries/removeAlert'
import { withGetApp, GetAppProps, Alert as AlertType } from '../../graphql'
import noop from '../../helpers/noop'
import Card from '../../components/Card'
import { NewAlert } from '../../components/admin/alerts/AdminNewAlert'

Expand All @@ -32,7 +31,7 @@ const AlertRow: React.FC<AlertRowProps> = ({ alerts, alert, setAlerts }) => {
return (
<div className="row">
<div className="d-flex flex-column col-10">
<Alert alert={alert} onDismiss={noop} />
<Alert alert={alert} />
</div>
<div className="d-flex flex-column col-2 mt-3 justify-content-center">
<Button
Expand Down