mirror of
https://github.com/yu-i-i/overleaf-cep.git
synced 2026-11-15 06:33:55 +01:00
Merge intermediate component wrappers into OL-prefixed components (#34996)
* Merge intermediate component wrappers into OL-prefixed components * Replace all intermediate wrapper consumers with OL-prefixed components directly * Fix jsx/js files still importing deleted shim components * Remove duplicate OLNotification imports left by first pass * Rename OLTagIcon to TagIcon, remove OL prefix * Rename OLDropdownMenuItem to DropdownMenuItem, remove OL prefix * Remove OLNotification, use Notification directly * Move Notification to the main shared component folder * Update tag-icon import path out of ol/ * Move TagIcon to the main shared component folder * Update dropdown-menu-item import path out of ol/ * Move DropdownMenuItem to the main shared component folder * Fix dropdown-menu-item import path to dropdown/ subfolder * Remove BS5 alias prefixes from shared components * Restore notification-list wrapper in Notification component * Add translation for loading button * Remove redundant import aliasing * Resolve conflicts * Restore notification container `notification-list` GitOrigin-RevId: 24a5af18599a3e02ac6fd61c09cf5a49ef6e0020
This commit is contained in:
+6
-2
@@ -1,6 +1,6 @@
|
||||
import { FetchError } from '@/infrastructure/fetch-json'
|
||||
import { Trans } from 'react-i18next'
|
||||
import OLNotification from '@/shared/components/ol/ol-notification'
|
||||
import Notification from '@/shared/components/notification'
|
||||
import { billingPortalUrl } from '../../data/subscription-url'
|
||||
|
||||
type Props = {
|
||||
@@ -62,5 +62,9 @@ export default function PaymentErrorNotification({ error }: Props) {
|
||||
}
|
||||
}
|
||||
|
||||
return <OLNotification type="error" aria-live="polite" content={message} />
|
||||
return (
|
||||
<div className="notification-list">
|
||||
<Notification type="error" aria-live="polite" content={message} />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
+17
-15
@@ -1,5 +1,5 @@
|
||||
import { Trans } from 'react-i18next'
|
||||
import OLNotification from '@/shared/components/ol/ol-notification'
|
||||
import Notification from '@/shared/components/notification'
|
||||
import getMeta from '@/utils/meta'
|
||||
|
||||
export default function RedirectedPaymentErrorNotification() {
|
||||
@@ -12,19 +12,21 @@ export default function RedirectedPaymentErrorNotification() {
|
||||
}
|
||||
|
||||
return (
|
||||
<OLNotification
|
||||
className="mb-4"
|
||||
aria-live="polite"
|
||||
content={
|
||||
<Trans
|
||||
i18nKey="payment_error_generic"
|
||||
components={[
|
||||
/* eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key */
|
||||
<a href="/contact" target="_blank" />,
|
||||
]}
|
||||
/>
|
||||
}
|
||||
type="error"
|
||||
/>
|
||||
<div className="notification-list">
|
||||
<Notification
|
||||
className="mb-4"
|
||||
aria-live="polite"
|
||||
content={
|
||||
<Trans
|
||||
i18nKey="payment_error_generic"
|
||||
components={[
|
||||
/* eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key */
|
||||
<a href="/contact" target="_blank" />,
|
||||
]}
|
||||
/>
|
||||
}
|
||||
type="error"
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user