feat: Move EventRepository to new folder structure (#18246)

* feat: Move ConversationRepository to new folder structure

* feat: Move GiphyRepository to new folder structure

* feat: Move EventRepository to new folder structure

* feat: Move IntegrationRepository to new folder structure (#18247)

* feat: Move IntegrationRepository to new folder structure

* feat: Move MediaRepository to new folder structure (#18248)

src/script/auth/configureEnvironment.ts

@@ -17,8 +17,8 @@
  *
  */
 
-import '../event/Client';
 import '../message/MessageCategorization';
 import '../message/MessageCategory';
+import '../repositories/event/Client';
 import '../service/BackendEnvironment';
 import '../storage/StorageSchemata';

src/script/components/Avatar/Avatar.test.tsx

@@ -19,10 +19,11 @@
 
 import {fireEvent, render} from '@testing-library/react';
 
+import {ServiceEntity} from 'Repositories/integration/ServiceEntity';
+
 import {Avatar} from './Avatar';
 
 import {User} from '../../entity/User';
-import {ServiceEntity} from '../../integration/ServiceEntity';
 
 describe('Avatar', () => {
   it('executes onClick with current participant', () => {

src/script/components/Avatar/Avatar.tsx

@@ -19,6 +19,7 @@
 
 import {HTMLProps, MouseEvent as ReactMouseEvent, KeyboardEvent as ReactKeyBoardEvent} from 'react';
 
+import {ServiceEntity} from 'Repositories/integration/ServiceEntity';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {handleKeyDown, isKeyboardEvent} from 'Util/KeyboardUtil';
 
@@ -29,7 +30,6 @@ import {UserAvatar} from './UserAvatar';
 
 import {User} from '../../entity/User';
 import {isServiceEntity} from '../../guards/Service';
-import {ServiceEntity} from '../../integration/ServiceEntity';
 
 export enum AVATAR_SIZE {
   LARGE = 'avatar-l',

src/script/components/Avatar/ServiceAvatar.test.tsx

@@ -20,11 +20,10 @@
 import {render} from '@testing-library/react';
 
 import {AVATAR_SIZE} from 'Components/Avatar';
+import {ServiceEntity} from 'Repositories/integration/ServiceEntity';
 
 import {ServiceAvatar} from './ServiceAvatar';
 
-import {ServiceEntity} from '../../integration/ServiceEntity';
-
 describe('ServiceAvatar', () => {
   it('shows a service icon', async () => {
     const service = new ServiceEntity({id: 'id'});

src/script/components/Avatar/ServiceAvatar.tsx

@@ -22,15 +22,14 @@ import React from 'react';
 import ko from 'knockout';
 
 import * as Icon from 'Components/Icon';
+import {ServiceEntity} from 'Repositories/integration/ServiceEntity';
 import {CSS_FILL_PARENT} from 'Util/CSSMixin';
 
 import {AvatarBackground} from './AvatarBackground';
 import {AvatarBorder} from './AvatarBorder';
 import {AvatarImage} from './AvatarImage';
 import {AvatarWrapper} from './AvatarWrapper';
 
-import {ServiceEntity} from '../../integration/ServiceEntity';
-
 import {AVATAR_SIZE} from '.';
 
 interface ServiceAvatarProps extends React.HTMLProps<HTMLDivElement> {

src/script/components/Conversation/Conversation.tsx

@@ -35,6 +35,7 @@ import {showWarningModal} from 'Components/Modals/utils/showWarningModal';
 import {TitleBar} from 'Components/TitleBar';
 import {CallState} from 'Repositories/calling/CallState';
 import {ConversationState} from 'Repositories/conversation/ConversationState';
+import {ServiceEntity} from 'Repositories/integration/ServiceEntity';
 import {Config} from 'src/script/Config';
 import {PROPERTIES_TYPE} from 'src/script/properties/PropertiesType';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
@@ -59,7 +60,6 @@ import {User} from '../../entity/User';
 import {UserError} from '../../error/UserError';
 import {isMouseRightClickEvent, isAuxRightClickEvent} from '../../guards/Mouse';
 import {isServiceEntity} from '../../guards/Service';
-import {ServiceEntity} from '../../integration/ServiceEntity';
 import {MotionDuration} from '../../motion/MotionDuration';
 import {RightSidebarParams} from '../../page/AppMain';
 import {PanelState} from '../../page/RightSidebar';

src/script/components/ConversationListCell/ConversationListCell.tsx

@@ -33,6 +33,7 @@ import {Avatar, AVATAR_SIZE, GroupAvatar} from 'Components/Avatar';
 import {UserBlockedBadge} from 'Components/Badge';
 import {UserInfo} from 'Components/UserInfo';
 import {generateCellState} from 'Repositories/conversation/ConversationCellState';
+import {MediaType} from 'Repositories/media/MediaType';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {isKey, isOneOfKeys, KEY} from 'Util/KeyboardUtil';
 import {t} from 'Util/LocalizerUtil';
@@ -41,7 +42,6 @@ import {noop, setContextMenuPosition} from 'Util/util';
 import {StatusIcon} from './components/StatusIcon';
 
 import type {Conversation} from '../../entity/Conversation';
-import {MediaType} from '../../media/MediaType';
 
 export interface ConversationListCellProps {
   conversation: Conversation;

src/script/components/InputBar/InputBar.test.tsx

@@ -23,6 +23,7 @@ import {InputBar} from 'Components/InputBar/index';
 import {AssetRepository} from 'Repositories/assets/AssetRepository';
 import {ConversationRepository} from 'Repositories/conversation/ConversationRepository';
 import {MessageRepository} from 'Repositories/conversation/MessageRepository';
+import {EventRepository} from 'Repositories/event/EventRepository';
 import {withTheme} from 'src/script/auth/util/test/TestUtil';
 import {Config} from 'src/script/Config';
 import {PropertiesService} from 'src/script/properties/PropertiesService';
@@ -32,7 +33,6 @@ import {createUuid} from 'Util/uuid';
 import {TestFactory} from '../../../../test/helper/TestFactory';
 import {Conversation} from '../../entity/Conversation';
 import {User} from '../../entity/User';
-import {EventRepository} from '../../event/EventRepository';
 import {PropertiesRepository} from '../../properties/PropertiesRepository';
 import {SearchRepository} from '../../search/SearchRepository';
 import {StorageRepository} from '../../storage';

src/script/components/InputBar/InputBar.tsx

@@ -37,6 +37,7 @@ import {SendMessageButton} from 'Components/RichTextEditor/components/SendMessag
 import {ConversationRepository} from 'Repositories/conversation/ConversationRepository';
 import {ConversationVerificationState} from 'Repositories/conversation/ConversationVerificationState';
 import {MessageRepository, OutgoingQuote} from 'Repositories/conversation/MessageRepository';
+import {EventRepository} from 'Repositories/event/EventRepository';
 import {useUserPropertyValue} from 'src/script/hooks/useUserProperty';
 import {PropertiesRepository} from 'src/script/properties/PropertiesRepository';
 import {PROPERTIES_TYPE} from 'src/script/properties/PropertiesType';
@@ -62,7 +63,6 @@ import {Conversation} from '../../entity/Conversation';
 import {ContentMessage} from '../../entity/message/ContentMessage';
 import {User} from '../../entity/User';
 import {ConversationError} from '../../error/ConversationError';
-import {EventRepository} from '../../event/EventRepository';
 import {MentionEntity} from '../../message/MentionEntity';
 import {MessageHasher} from '../../message/MessageHasher';
 import {QuoteEntity} from '../../message/QuoteEntity';

src/script/components/MessagesList/Message/ContentMessage/MessageHeader.tsx

@@ -23,10 +23,10 @@ import {AVATAR_SIZE, Avatar} from 'Components/Avatar';
 import {UserBlockedBadge} from 'Components/Badge';
 import * as Icon from 'Components/Icon';
 import {UserName} from 'Components/UserName';
+import {ServiceEntity} from 'Repositories/integration/ServiceEntity';
 import {ContentMessage} from 'src/script/entity/message/ContentMessage';
 import {DeleteMessage} from 'src/script/entity/message/DeleteMessage';
 import {User} from 'src/script/entity/User';
-import {ServiceEntity} from 'src/script/integration/ServiceEntity';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {t} from 'Util/LocalizerUtil';
 

src/script/components/MessagesList/Message/DeleteMessage.tsx

@@ -19,6 +19,7 @@
 
 import React from 'react';
 
+import {ServiceEntity} from 'Repositories/integration/ServiceEntity';
 import {User} from 'src/script/entity/User';
 import {t} from 'Util/LocalizerUtil';
 import {formatTimeShort, fromUnixTime, TIME_IN_MILLIS} from 'Util/TimeUtil';
@@ -27,7 +28,6 @@ import {MessageHeader} from './ContentMessage/MessageHeader';
 import {MessageTime} from './MessageTime';
 
 import {DeleteMessage as DeleteMessageEntity} from '../../../entity/message/DeleteMessage';
-import {ServiceEntity} from '../../../integration/ServiceEntity';
 
 export interface DeleteMessageProps {
   message: DeleteMessageEntity;

src/script/components/MessagesList/Message/MemberMessage/MessageContent.tsx

@@ -20,10 +20,10 @@
 import {MemberLeaveReason} from '@wireapp/api-client/lib/conversation/data/';
 import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/';
 
+import {ClientEvent} from 'Repositories/event/Client';
 import {Config} from 'src/script/Config';
 import {MemberMessage as MemberMessageEntity} from 'src/script/entity/message/MemberMessage';
 import {User} from 'src/script/entity/User';
-import {ClientEvent} from 'src/script/event/Client';
 import {SystemMessageType} from 'src/script/message/SystemMessageType';
 import {Declension, joinNames, replaceLink, t} from 'Util/LocalizerUtil';
 import {replaceReactComponents} from 'Util/LocalizerUtil/ReactLocalizerUtil';

src/script/components/MessagesList/Message/index.tsx

@@ -24,7 +24,7 @@ import cx from 'classnames';
 
 import {InViewport} from 'Components/InViewport';
 import type {MessageRepository} from 'Repositories/conversation/MessageRepository';
-import {ServiceEntity} from 'src/script/integration/ServiceEntity';
+import {ServiceEntity} from 'Repositories/integration/ServiceEntity';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {getAllFocusableElements, setElementsTabIndex} from 'Util/focusUtil';
 import {isTabKey} from 'Util/KeyboardUtil';

src/script/components/MessagesList/MessageList.tsx

@@ -27,13 +27,13 @@ import {JumpToLastMessageButton} from 'Components/MessagesList/JumpToLastMessage
 import {filterMessages} from 'Components/MessagesList/utils/messagesFilter';
 import {ConversationRepository} from 'Repositories/conversation/ConversationRepository';
 import {MessageRepository} from 'Repositories/conversation/MessageRepository';
+import {ServiceEntity} from 'Repositories/integration/ServiceEntity';
 import {ContentMessage} from 'src/script/entity/message/ContentMessage';
 import {DecryptErrorMessage} from 'src/script/entity/message/DecryptErrorMessage';
 import {MemberMessage} from 'src/script/entity/message/MemberMessage';
 import {Message as MessageEntity} from 'src/script/entity/message/Message';
 import {User} from 'src/script/entity/User';
 import {useRoveFocus} from 'src/script/hooks/useRoveFocus';
-import {ServiceEntity} from 'src/script/integration/ServiceEntity';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {isLastReceivedMessage} from 'Util/conversationMessages';
 import {onHitTopOrBottom} from 'Util/DOM/onHitTopOrBottom';

src/script/components/MessagesList/utils/messagesFilter.ts

@@ -19,11 +19,11 @@
 
 import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/';
 
+import {ClientEvent} from 'Repositories/event/Client';
 import {Message as MessageEntity} from 'src/script/entity/message/Message';
 
 import {ProtocolUpdateMessage} from '../../../entity/message/ProtocolUpdateMessage';
 import {SystemMessage} from '../../../entity/message/SystemMessage';
-import {ClientEvent} from '../../../event/Client';
 import {isMemberMessage} from '../../../guards/Message';
 
 /**

src/script/components/Modals/ServiceModal/ServiceModal.tsx

@@ -22,13 +22,13 @@ import React from 'react';
 import {Avatar, AVATAR_SIZE} from 'Components/Avatar';
 import * as Icon from 'Components/Icon';
 import {ModalComponent} from 'Components/Modals/ModalComponent';
+import {IntegrationRepository} from 'Repositories/integration/IntegrationRepository';
+import {ServiceEntity} from 'Repositories/integration/ServiceEntity';
 import {SidebarTabs, useSidebarStore} from 'src/script/page/LeftSidebar/panels/Conversations/useSidebarStore';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {t} from 'Util/LocalizerUtil';
 import {renderElement} from 'Util/renderElement';
 
-import {IntegrationRepository} from '../../../integration/IntegrationRepository';
-import {ServiceEntity} from '../../../integration/ServiceEntity';
 import {ActionsViewModel} from '../../../view_model/ActionsViewModel';
 
 interface ServiceModalProps {

src/script/components/ParticipantItemContent/ParticipantItemContent.tsx

@@ -24,8 +24,8 @@ import ko from 'knockout';
 import {UserBlockedBadge, UserVerificationBadges} from 'Components/Badge';
 import * as Icon from 'Components/Icon';
 import {UserInfo} from 'Components/UserInfo';
+import {ServiceEntity} from 'Repositories/integration/ServiceEntity';
 import {User} from 'src/script/entity/User';
-import {ServiceEntity} from 'src/script/integration/ServiceEntity';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 
 import {

src/script/components/ServiceList/ServiceList.test.tsx

@@ -19,12 +19,11 @@
 
 import {render} from '@testing-library/react';
 
+import {ServiceEntity} from 'Repositories/integration/ServiceEntity';
 import {createUuid} from 'Util/uuid';
 
 import {ServiceList} from './ServiceList';
 
-import {ServiceEntity} from '../../integration/ServiceEntity';
-
 describe('ServiceList', () => {
   it('lists the services', () => {
     const serviceEntity1 = new ServiceEntity({id: createUuid()});

src/script/components/ServiceList/ServiceList.tsx

@@ -22,10 +22,9 @@ import React from 'react';
 import cx from 'classnames';
 
 import {ServiceListItem} from 'Components/ServiceList/components/ServiceListItem';
+import type {ServiceEntity} from 'Repositories/integration/ServiceEntity';
 import {t} from 'Util/LocalizerUtil';
 
-import type {ServiceEntity} from '../../integration/ServiceEntity';
-
 export enum MODE {
   COMPACT = 'ServiceList.MODE.COMPACT',
   DEFAULT = 'ServiceList.MODE.DEFAULT',

src/script/components/ServiceList/components/ServiceListItem/ServiceListItem.tsx

@@ -22,12 +22,11 @@ import {TabIndex} from '@wireapp/react-ui-kit/lib/types/enums';
 import {Avatar, AVATAR_SIZE} from 'Components/Avatar';
 import {ParticipantItemContent} from 'Components/ParticipantItemContent';
 import {listItem, listWrapper} from 'Components/ParticipantItemContent/ParticipantItem.styles';
+import {ServiceEntity} from 'Repositories/integration/ServiceEntity';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {handleKeyDown} from 'Util/KeyboardUtil';
 import {t} from 'Util/LocalizerUtil';
 
-import {ServiceEntity} from '../../../../integration/ServiceEntity';
-
 export interface ServiceListItemProps {
   service: ServiceEntity;
   onClick: (service: ServiceEntity) => void;

src/script/components/calling/CallingCell/CallingCell.test.tsx

@@ -26,9 +26,9 @@ import {CALL_TYPE, STATE as CALL_STATE} from '@wireapp/avs';
 import {Call} from 'Repositories/calling/Call';
 import {CallingRepository} from 'Repositories/calling/CallingRepository';
 import {Participant} from 'Repositories/calling/Participant';
+import {MediaDevicesHandler} from 'Repositories/media/MediaDevicesHandler';
 import {Conversation} from 'src/script/entity/Conversation';
 import {User} from 'src/script/entity/User';
-import {MediaDevicesHandler} from 'src/script/media/MediaDevicesHandler';
 import {TeamState} from 'src/script/team/TeamState';
 import {CallActions} from 'src/script/view_model/CallingViewModel';
 import {createUuid} from 'Util/uuid';

src/script/components/calling/CallingOverlayContainer.tsx

@@ -28,12 +28,12 @@ import {CallingViewMode, CallState, DesktopScreenShareMenu, MuteState} from 'Rep
 import {LEAVE_CALL_REASON} from 'Repositories/calling/enum/LeaveCallReason';
 import {Participant} from 'Repositories/calling/Participant';
 import {useVideoGrid} from 'Repositories/calling/videoGridHandler';
+import {MediaRepository} from 'Repositories/media/MediaRepository';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 
 import {ChooseScreen} from './ChooseScreen';
 import {FullscreenVideoCall} from './FullscreenVideoCall';
 
-import {MediaRepository} from '../../media/MediaRepository';
 import {CallViewTab} from '../../view_model/CallingViewModel';
 
 export interface CallingContainerProps {

src/script/components/calling/ChooseScreen.tsx

@@ -22,7 +22,7 @@ import {Fragment, useCallback, useEffect} from 'react';
 import {container} from 'tsyringe';
 
 import {CallState} from 'Repositories/calling/CallState';
-import {ElectronDesktopCapturerSource} from 'src/script/media/MediaDevicesHandler';
+import {ElectronDesktopCapturerSource} from 'Repositories/media/MediaDevicesHandler';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {t} from 'Util/LocalizerUtil';
 

src/script/components/calling/DetachedCallingCell/DetachedCallingCell.tsx

@@ -22,7 +22,7 @@ import {container} from 'tsyringe';
 import {Call} from 'Repositories/calling/Call';
 import {CallingRepository} from 'Repositories/calling/CallingRepository';
 import {CallState, CallingViewMode, DesktopScreenShareMenu} from 'Repositories/calling/CallState';
-import {MediaRepository} from 'src/script/media/MediaRepository';
+import {MediaRepository} from 'Repositories/media/MediaRepository';
 import {UserState} from 'src/script/user/UserState';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 

src/script/components/calling/FullscreenVideoCall.tsx

@@ -44,12 +44,13 @@ import {CallingRepository} from 'Repositories/calling/CallingRepository';
 import {CallingViewMode, CallState, MuteState} from 'Repositories/calling/CallState';
 import {Participant} from 'Repositories/calling/Participant';
 import type {Grid} from 'Repositories/calling/videoGridHandler';
+import {ElectronDesktopCapturerSource, MediaDevicesHandler} from 'Repositories/media/MediaDevicesHandler';
+import {MediaDeviceType} from 'Repositories/media/MediaDeviceType';
 import {Config} from 'src/script/Config';
 import {isCallViewOption} from 'src/script/guards/CallView';
 import {isMediaDevice} from 'src/script/guards/MediaDevice';
 import {useActiveWindowMatchMedia} from 'src/script/hooks/useActiveWindowMatchMedia';
 import {useToggleState} from 'src/script/hooks/useToggleState';
-import {MediaDeviceType} from 'src/script/media/MediaDeviceType';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {isDetachedCallingFeatureEnabled} from 'Util/isDetachedCallingFeatureEnabled';
 import {handleKeyDown, isEscapeKey} from 'Util/KeyboardUtil';
@@ -72,7 +73,6 @@ import {GroupVideoGrid} from './GroupVideoGrid';
 import {Pagination} from './Pagination';
 
 import type {Conversation} from '../../entity/Conversation';
-import {ElectronDesktopCapturerSource, MediaDevicesHandler} from '../../media/MediaDevicesHandler';
 import {TeamState} from '../../team/TeamState';
 import {CallViewTab} from '../../view_model/CallingViewModel';
 

src/script/components/calling/fullscreenVideoCall.test.tsx

@@ -23,10 +23,10 @@ import ko from 'knockout';
 import {Call} from 'Repositories/calling/Call';
 import {Participant} from 'Repositories/calling/Participant';
 import {Grid} from 'Repositories/calling/videoGridHandler';
+import {MediaDevicesHandler} from 'Repositories/media/MediaDevicesHandler';
 import {withTheme} from 'src/script/auth/util/test/TestUtil';
 import {Conversation} from 'src/script/entity/Conversation';
 import {User} from 'src/script/entity/User';
-import {MediaDevicesHandler} from 'src/script/media/MediaDevicesHandler';
 
 import {FullscreenVideoCall, FullscreenVideoCallProps} from './FullscreenVideoCall';
 

src/script/components/panel/ServiceDetails.test.tsx

@@ -19,9 +19,9 @@
 
 import {render} from '@testing-library/react';
 
-import {ServiceDetails} from './ServiceDetails';
+import {ServiceEntity} from 'Repositories/integration/ServiceEntity';
 
-import {ServiceEntity} from '../../integration/ServiceEntity';
+import {ServiceDetails} from './ServiceDetails';
 
 describe('ServiceDetails', () => {
   it('renders the correct infos for the service', () => {

src/script/components/panel/ServiceDetails.tsx

@@ -20,10 +20,9 @@
 import React from 'react';
 
 import {Avatar, AVATAR_SIZE} from 'Components/Avatar';
+import type {ServiceEntity} from 'Repositories/integration/ServiceEntity';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 
-import type {ServiceEntity} from '../../integration/ServiceEntity';
-
 export interface ServiceDetailsProps {
   service: ServiceEntity;
 }

src/script/entity/message/MemberMessage.ts

@@ -22,13 +22,13 @@ import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/';
 import type {QualifiedId} from '@wireapp/api-client/lib/user/';
 import ko from 'knockout';
 
+import {ClientEvent} from 'Repositories/event/Client';
 import {Declension, getUserName, t} from 'Util/LocalizerUtil';
 import {matchQualifiedIds} from 'Util/QualifiedId';
 import {capitalizeFirstChar} from 'Util/StringUtil';
 
 import {SystemMessage} from './SystemMessage';
 
-import {ClientEvent} from '../../event/Client';
 import {SuperType} from '../../message/SuperType';
 import {SystemMessageType} from '../../message/SystemMessageType';
 import {User} from '../User';