GitLab Synchronization: Fixed v6.3.0 rebase related errors

services/web/modules/gitlab-sync/frontend/js/components/gitlab-sync-widget.tsx

@@ -12,7 +12,7 @@ import {
   OLModalHeader,
   OLModalTitle,
 } from '@/shared/components/ol/ol-modal'
-import OLNotification from '@/shared/components/ol/ol-notification'
+import Notification from '@/shared/components/notification'
 import GitLabLogo from '@/shared/svgs/gitlab-logo'
 
 export const GitLabSyncWidget = function GitLabSyncWidget() {
@@ -89,14 +89,14 @@ export const GitLabSyncWidget = function GitLabSyncWidget() {
           </p>
 
           {isErrorConnCheck && (
-            <OLNotification
+            <Notification
               type="error"
               content={t('gitlab_sync_error')}
             />
           )}
 
           {isErrorUnlink && (
-            <OLNotification
+            <Notification
               type="error"
               content={t('generic_something_went_wrong')}
             />

services/web/modules/gitlab-sync/frontend/js/components/import-from-gitlab-menu.tsx

@@ -1,12 +1,12 @@
 import React from 'react'
 import { useTranslation } from 'react-i18next'
-import { DropdownItem } from '@/shared/components/dropdown/dropdown-menu'
+import { OLDropdownItem } from '@/shared/components/ol/ol-dropdown-menu'
 
 export default function ImportFromGitLabMenu({ onClick }: { onClick: (e: React.MouseEvent) => void }) {
   const { t } = useTranslation()
   return (
-    <DropdownItem onClick={onClick}>
+    <OLDropdownItem onClick={onClick}>
       {t('import_from_gitlab')}
-    </DropdownItem>
+    </OLDropdownItem>
   )
 }

services/web/modules/gitlab-sync/frontend/js/components/import-from-gitlab-modal-wrapper.tsx

@@ -16,7 +16,7 @@ import {
 } from '@/shared/components/ol/ol-modal'
 import OLButton from '@/shared/components/ol/ol-button'
 import OLSpinner from '@/shared/components/ol/ol-spinner'
-import OLNotification from '@/shared/components/ol/ol-notification'
+import Notification from '@/shared/components/notification'
 
 type GitSyncRepo = {
   name: string
@@ -103,7 +103,7 @@ function ImportFromGitLabModalContent({ handleHide }: { handleHide: () => void }
 
         {isError && (
           <div className="notification-list">
-            <OLNotification
+            <Notification
               type="error"
               content={t('something_went_wrong_server')}
             />
@@ -172,7 +172,7 @@ function ImportFromGitLabModalContent({ handleHide }: { handleHide: () => void }
 
         {isErrorImport && (
           <div className="notification-list">
-            <OLNotification
+            <Notification
               type="error"
               content={t('something_went_wrong_server')}
             />

services/web/modules/gitlab-sync/frontend/js/components/modals/git-sync-cannot-export-modal.tsx

@@ -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,
@@ -7,7 +7,7 @@ import {
 import OLButton from '@/shared/components/ol/ol-button'
 import { ProjectSyncState } from '../../types/git-sync-types'
 
-type GitSyncNeedPermissionModalProps = {
+type GitSyncCannotExportModalProps = {
   projectSyncState: ProjectSyncState
   handleHide: () => void
 }
@@ -17,7 +17,7 @@ const GitSyncCannotExportModal = ({ projectSyncState, handleHide }: GitSyncCanno
   return (
     <>
       <OLModalBody>
-        <OLNotification
+        <Notification
           type="warning"
           content={(
             <Trans

services/web/modules/gitlab-sync/frontend/js/components/modals/git-sync-confirm-unlink-modal.tsx

@@ -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'
 import getMeta from '@/utils/meta'
@@ -20,7 +20,7 @@ const GitSyncUnlinkModal = ({
   setModalStatus,
   projectSyncState,
   projectId,
-}: GitSyncInitModalProps) => {
+}: GitSyncUnlinkModalProps) => {
   const { t } = useTranslation()
 
   const {
@@ -55,12 +55,12 @@ const GitSyncUnlinkModal = ({
         <hr />
 
         {!error ? (
-          <OLNotification
+          <Notification
             type="warning"
             content={t('unlink_the_project_from_the_current_gitlab_repo')}
           />
         ) : (
-          <OLNotification
+          <Notification
             type="error"
             content={
               error.info?.statusCode === 403 ? (

services/web/modules/gitlab-sync/frontend/js/components/modals/git-sync-conflict-modal.tsx

@@ -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('gitlab_merge_failed_error', { appName })}
         />

services/web/modules/gitlab-sync/frontend/js/components/modals/git-sync-export-modal.tsx

@@ -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_gitlab')}</p>
 
         {error && (
-          <OLNotification
+          <Notification
             type="error"
             content={error}
           />
         )}
 
         {errorUserAndOrgs && (
-          <OLNotification
+          <Notification
             type="error"
             content={t('something_went_wrong_server')}
           />

services/web/modules/gitlab-sync/frontend/js/components/modals/git-sync-loading-modal.tsx

@@ -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/gitlab-sync/frontend/js/components/modals/git-sync-merge-modal.tsx

@@ -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/gitlab-sync/frontend/js/components/modals/git-sync-merge-overview-modal.tsx

@@ -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'
 import getMeta from '@/utils/meta'
@@ -114,7 +114,7 @@ const GitSyncMergeOverviewModal = ({
             <hr />
 
             {data.diverged && (
-              <OLNotification
+              <Notification
                 type="warning"
                 content={t('gitlab_repository_diverged')}
               />
@@ -194,7 +194,7 @@ const GitSyncMergeOverviewModal = ({
         )}
 
         {error && (
-          <OLNotification
+          <Notification
             type="error"
             content={t('generic_something_went_wrong')}
           />

services/web/modules/gitlab-sync/frontend/js/components/modals/git-sync-need-permission-modal.tsx

@@ -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,
@@ -13,14 +13,14 @@ type GitSyncNeedPermissionModalProps = {
   handleHide: () => void
 }
 
-const GitSyncNeedPermissionModal = ({ projectSyncState, handleHide }: GitSyncConflictModalProps) => {
+const GitSyncNeedPermissionModal = ({ projectSyncState, handleHide }: GitSyncNeedPermissionModalProps) => {
   const { t } = useTranslation()
   let gitlabUrl = getMeta('ol-ExposedSettings').gitlabUrl || ''
   gitlabUrl = gitlabUrl.endsWith('/') ? gitlabUrl.slice(0, -1) : gitlabUrl
   return (
     <>
       <OLModalBody>
-        <OLNotification
+        <Notification
           type="warning"
           content={(
             <Trans

services/web/modules/gitlab-sync/frontend/js/components/modals/git-sync-unlink-unavailable-modal.tsx

@@ -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'
 
@@ -17,7 +17,7 @@ const GitSyncUnlinkUnavailableModal = ({
   handleHide,
   setModalStatus,
   projectId,
-}: GitSyncInitModalProps) => {
+}: GitSyncUnlinkUnavailableModalProps) => {
   const { t } = useTranslation()
 
   const {
@@ -35,13 +35,13 @@ const GitSyncUnlinkUnavailableModal = ({
   return (
     <>
       <OLModalBody>
-        <OLNotification
+        <Notification
           type="error"
           content={t('gitlab_sync_repository_not_found_description')}
         />
 
         {error && (
-          <OLNotification
+          <Notification
             type="error"
             content={
               error.info?.statusCode === 403 ? (