agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-11-12 21:23:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Github Sync: fix for 6.3.0

Browse Source
This commit is contained in:
yu-i-i
2026-09-27 18:11:27 +02:00
parent 404623dc25
commit ccc1c57ccd
12 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/modules/github-sync/frontend/js/components/modals/git-sync-cannot-export-modal.tsx
+2 -2
View File
@@ -1,5 +1,5 @@
import { useTranslation, Trans } from 'react-i18next'
import OLNotification from '@/shared/components/ol/ol-notification'
import Notification from '@/shared/components/notification'
import {
OLModalBody,
OLModalFooter,
@@ -17,7 +17,7 @@ const GitSyncCannotExportModal = ({ projectSyncState, handleHide }: GitSyncCanno
return (
<>
<OLModalBody>
<OLNotification
<Notification
type="warning"
content={(
<Trans
services/web/modules/github-sync/frontend/js/components/modals/git-sync-confirm-unlink-modal.tsx
+3 -3
View File
@@ -3,7 +3,7 @@ import useAsync from '@/shared/hooks/use-async'
import { deleteJSON } from '@/infrastructure/fetch-json'
import { OLModalBody, OLModalFooter } from '@/shared/components/ol/ol-modal'
import OLButton from '@/shared/components/ol/ol-button'
import OLNotification from '@/shared/components/ol/ol-notification'
import Notification from '@/shared/components/notification'
import { debugConsole } from '@/utils/debugging'
import { ProjectSyncState, GitSyncModalStatus } from '../../types/git-sync-types'
@@ -51,12 +51,12 @@ const GitSyncUnlinkModal = ({
<hr />
{!error ? (
<OLNotification
<Notification
type="warning"
content={t('unlink_the_project_from_the_current_github_repo')}
/>
) : (
<OLNotification
<Notification
type="error"
content={
error.info?.statusCode === 403 ? (
services/web/modules/github-sync/frontend/js/components/modals/git-sync-conflict-modal.tsx
+2 -2
View File
@@ -5,7 +5,7 @@ import {
OLModalFooter,
} from '@/shared/components/ol/ol-modal'
import OLButton from '@/shared/components/ol/ol-button'
import OLNotification from '@/shared/components/ol/ol-notification'
import Notification from '@/shared/components/notification'
import { ProjectSyncState, GitSyncModalStatus } from '../../types/git-sync-types'
@@ -22,7 +22,7 @@ const GitSyncConflictModal = ({ projectSyncState, handleHide, setModalStatus }:
return (
<>
<OLModalBody>
<OLNotification
<Notification
type="warning"
content={t('github_merge_failed_error', { appName })}
/>
services/web/modules/github-sync/frontend/js/components/modals/git-sync-export-modal.tsx
+3 -3
View File
@@ -10,7 +10,7 @@ import {
OLModalBody,
OLModalFooter,
} from '@/shared/components/ol/ol-modal'
import OLNotification from '@/shared/components/ol/ol-notification'
import Notification from '@/shared/components/notification'
import OLButton from '@/shared/components/ol/ol-button'
import OLForm from '@/shared/components/ol/ol-form'
import OLFormGroup from '@/shared/components/ol/ol-form-group'
@@ -89,14 +89,14 @@ const GitSyncExportModal = ({
<p>{t('project_not_linked_to_github')}</p>
{error && (
<OLNotification
<Notification
type="error"
content={error}
/>
)}
{errorUserAndOrgs && (
<OLNotification
<Notification
type="error"
content={t('something_went_wrong_server')}
/>
services/web/modules/github-sync/frontend/js/components/modals/git-sync-loading-modal.tsx
+2 -2
View File
@@ -4,7 +4,7 @@ import {
OLModalFooter,
} from '@/shared/components/ol/ol-modal'
import OLButton from '@/shared/components/ol/ol-button'
import OLNotification from '@/shared/components/ol/ol-notification'
import Notification from '@/shared/components/notification'
import { GitSyncModalStatus } from '../../types/git-sync-types'
type GitSyncLoadingModalProps = {
@@ -25,7 +25,7 @@ const GitSyncLoadingModal = ({ handleHide, setModalStatus, errorMessage }: GitSy
</OLModalBody>
{errorMessage && (
<OLNotification
<Notification
type="error"
content={errorMessage}
/>
services/web/modules/github-sync/frontend/js/components/modals/git-sync-merge-modal.tsx
+2 -2
View File
@@ -9,7 +9,7 @@ import {
OLModalFooter,
} from '@/shared/components/ol/ol-modal'
import OLButton from '@/shared/components/ol/ol-button'
import OLNotification from '@/shared/components/ol/ol-notification'
import Notification from '@/shared/components/notification'
import { GitSyncModalStatus, ProjectSyncState } from '../../types/git-sync-types'
import { useReferencesContext } from '@/features/ide-react/context/references-context'
@@ -108,7 +108,7 @@ const GitSyncMergeModal = ({
</OLModalBody>
{error && (
<OLNotification
<Notification
type="error"
content={t('generic_something_went_wrong')}
/>
services/web/modules/github-sync/frontend/js/components/modals/git-sync-merge-overview-modal.tsx
+3 -3
View File
@@ -10,7 +10,7 @@ import OLRow from '@/shared/components/ol/ol-row'
import OLCol from '@/shared/components/ol/ol-col'
import OLButton from '@/shared/components/ol/ol-button'
import OLIconButton from '@/shared/components/ol/ol-icon-button'
import OLNotification from '@/shared/components/ol/ol-notification'
import Notification from '@/shared/components/notification'
import { debugConsole } from '@/utils/debugging'
import { ProjectSyncState, GitSyncModalStatus } from '../../types/git-sync-types'
@@ -110,7 +110,7 @@ const GitSyncMergeOverviewModal = ({
<hr />
{data.diverged && (
<OLNotification
<Notification
type="warning"
content={t('github_repository_diverged')}
/>
@@ -190,7 +190,7 @@ const GitSyncMergeOverviewModal = ({
)}
{error && (
<OLNotification
<Notification
type="error"
content={t('generic_something_went_wrong')}
/>
services/web/modules/github-sync/frontend/js/components/modals/git-sync-need-permission-modal.tsx
+2 -2
View File
@@ -1,5 +1,5 @@
import { useTranslation, Trans } from 'react-i18next'
import OLNotification from '@/shared/components/ol/ol-notification'
import Notification from '@/shared/components/notification'
import {
OLModalBody,
OLModalFooter,
@@ -17,7 +17,7 @@ const GitSyncNeedPermissionModal = ({ projectSyncState, handleHide }: GitSyncCon
return (
<>
<OLModalBody>
<OLNotification
<Notification
type="warning"
content={(
<Trans
services/web/modules/github-sync/frontend/js/components/modals/git-sync-unlink-unavailable-modal.tsx
+3 -3
View File
@@ -3,7 +3,7 @@ import useAsync from '@/shared/hooks/use-async'
import { deleteJSON } from '@/infrastructure/fetch-json'
import { OLModalBody, OLModalFooter } from '@/shared/components/ol/ol-modal'
import OLButton from '@/shared/components/ol/ol-button'
import OLNotification from '@/shared/components/ol/ol-notification'
import Notification from '@/shared/components/notification'
import { debugConsole } from '@/utils/debugging'
import { GitSyncModalStatus } from '../../types/git-sync-types'
@@ -35,13 +35,13 @@ const GitSyncUnlinkUnavailableModal = ({
return (
<>
<OLModalBody>
<OLNotification
<Notification
type="error"
content={t('github_sync_repository_not_found_description')}
/>
{error && (
<OLNotification
<Notification
type="error"
content={
error.info?.statusCode === 403 ? (