feat: Move ClientRepository to new folder structure (#18242)

* feat: Move AudioRepository to new folder structure

* feat: Move Backup & Cache Repository to new folder structure

* feat: Move CallingRepository to new folder structure

* feat: Move ClientRepository to new folder structure

src/script/auth/module/action/ClientAction.ts

@@ -22,7 +22,7 @@ import {ClientInfo} from '@wireapp/core/lib/client/';
 
 import {Runtime} from '@wireapp/commons';
 
-import {getClientMLSConfig} from 'src/script/client/clientMLSConfig';
+import {getClientMLSConfig} from 'Repositories/client/clientMLSConfig';
 
 import {ClientActionCreator} from './creator/';
 

src/script/components/Badge/components/VerificationBadges/VerificationBadges.tsx

@@ -34,7 +34,7 @@ import {
   Tooltip,
 } from '@wireapp/react-ui-kit';
 
-import {ClientEntity} from 'src/script/client';
+import {ClientEntity} from 'Repositories/client';
 import {ConversationVerificationState} from 'src/script/conversation/ConversationVerificationState';
 import {checkUserHandle} from 'src/script/conversation/ConversationVerificationStateHandler';
 import {MLSStatuses, WireIdentity} from 'src/script/E2EIdentity/E2EIdentityVerification';

src/script/components/HistoryExport/HistoryExport.tsx

@@ -26,7 +26,7 @@ import {Button, ButtonVariant, FlexBox} from '@wireapp/react-ui-kit';
 import {LoadingBar} from 'Components/LoadingBar/LoadingBar';
 import {PrimaryModal} from 'Components/Modals/PrimaryModal';
 import {CancelError} from 'Repositories/backup/Error';
-import {ClientState} from 'src/script/client/ClientState';
+import {ClientState} from 'Repositories/client/ClientState';
 import {User} from 'src/script/entity/User';
 import {ContentState} from 'src/script/page/useAppState';
 import {t} from 'Util/LocalizerUtil';

src/script/components/Modals/LegalHoldModal/LegalHoldModal.test.tsx

@@ -22,11 +22,11 @@ import type {QualifiedId} from '@wireapp/api-client/lib/user/';
 
 import {useLegalHoldModalState} from 'Components/Modals/LegalHoldModal/LegalHoldModal.state';
 import {CallingRepository} from 'Repositories/calling/CallingRepository';
+import {ClientRepository} from 'Repositories/client';
 
 import {LegalHoldModal, LegalHoldModalType} from './LegalHoldModal';
 
 import {TestFactory} from '../../../../../test/helper/TestFactory';
-import {ClientRepository} from '../../../client';
 import {ConversationRepository} from '../../../conversation/ConversationRepository';
 import {MessageRepository} from '../../../conversation/MessageRepository';
 import {CryptographyRepository} from '../../../cryptography/CryptographyRepository';

src/script/components/Modals/LegalHoldModal/LegalHoldModal.tsx

@@ -29,12 +29,12 @@ import {ModalComponent} from 'Components/Modals/ModalComponent';
 import {UserDevicesState, UserDevices} from 'Components/UserDevices';
 import {UserSearchableList} from 'Components/UserSearchableList';
 import {useUserDevicesHistory} from 'Hooks/useUserDevicesHistory';
+import {ClientRepository} from 'Repositories/client';
 import {handleEnterDown} from 'Util/KeyboardUtil';
 import {t} from 'Util/LocalizerUtil';
 
 import {useLegalHoldModalState} from './LegalHoldModal.state';
 
-import {ClientRepository} from '../../../client';
 import {ConversationRepository} from '../../../conversation/ConversationRepository';
 import {MessageRepository} from '../../../conversation/MessageRepository';
 import {CryptographyRepository} from '../../../cryptography/CryptographyRepository';

src/script/components/UserDevices/UserDevices.tsx

@@ -21,6 +21,7 @@ import {useEffect, useMemo, useState} from 'react';
 
 import {ClientClassification} from '@wireapp/api-client/lib/client/';
 
+import {ClientRepository, ClientEntity} from 'Repositories/client';
 import {partition} from 'Util/ArrayUtil';
 import {t} from 'Util/LocalizerUtil';
 import {getLogger} from 'Util/Logger';
@@ -32,7 +33,6 @@ import {NoDevicesFound} from './components/NoDevicesFound';
 import {SelfFingerprint} from './components/SelfFingerprint';
 import {FIND_MODE, UserDevicesState} from './UserDevices.types';
 
-import {ClientRepository, ClientEntity} from '../../client';
 import {MessageRepository} from '../../conversation/MessageRepository';
 import {CryptographyRepository} from '../../cryptography/CryptographyRepository';
 import {User} from '../../entity/User';

src/script/components/UserDevices/components/DeviceCard/DeviceCard.test.tsx

@@ -21,9 +21,9 @@ import {render} from '@testing-library/react';
 import {ClientClassification} from '@wireapp/api-client/lib/client/';
 import ko from 'knockout';
 
-import {DeviceCard} from './DeviceCard';
+import type {ClientEntity} from 'Repositories/client/ClientEntity';
 
-import type {ClientEntity} from '../../../../client/ClientEntity';
+import {DeviceCard} from './DeviceCard';
 
 function createClientEntity(clientEntity: Partial<ClientEntity>): ClientEntity {
   const device: Partial<ClientEntity> = {

src/script/components/UserDevices/components/DeviceCard/DeviceCard.tsx

@@ -23,12 +23,12 @@ import cx from 'classnames';
 import {DeviceVerificationBadges} from 'Components/Badge';
 import {LegalHoldDot} from 'Components/LegalHoldDot';
 import {useMessageFocusedTabIndex} from 'Components/MessagesList/Message/util';
+import {type ClientEntity} from 'Repositories/client/ClientEntity';
 import {WireIdentity} from 'src/script/E2EIdentity';
 import {handleKeyDown} from 'Util/KeyboardUtil';
 import {t} from 'Util/LocalizerUtil';
 import {splitFingerprint} from 'Util/StringUtil';
 
-import {type ClientEntity} from '../../../../client/ClientEntity';
 import {FormattedId} from '../../../../page/MainContent/panels/preferences/DevicesPreferences/components/FormattedId';
 import * as Icon from '../../../Icon';
 

src/script/components/UserDevices/components/DeviceDetails/DeviceDetails.tsx

@@ -25,6 +25,7 @@ import {container} from 'tsyringe';
 
 import {Button, ButtonVariant} from '@wireapp/react-ui-kit';
 
+import type {ClientRepository, ClientEntity} from 'Repositories/client';
 import {isMLSConversation} from 'src/script/conversation/ConversationSelectors';
 import {WireIdentity} from 'src/script/E2EIdentity';
 import {MLSDeviceDetails} from 'src/script/page/MainContent/panels/preferences/DevicesPreferences/components/MLSDeviceDetails';
@@ -33,7 +34,6 @@ import {t} from 'Util/LocalizerUtil';
 import type {Logger} from 'Util/Logger';
 import {splitFingerprint} from 'Util/StringUtil';
 
-import type {ClientRepository, ClientEntity} from '../../../../client';
 import {Config} from '../../../../Config';
 import {ConversationState} from '../../../../conversation/ConversationState';
 import type {MessageRepository} from '../../../../conversation/MessageRepository';

src/script/components/UserDevices/components/DeviceList/DeviceList.tsx

@@ -19,11 +19,11 @@
 
 import cx from 'classnames';
 
+import type {ClientEntity} from 'Repositories/client/ClientEntity';
 import {WireIdentity} from 'src/script/E2EIdentity';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {t} from 'Util/LocalizerUtil';
 
-import type {ClientEntity} from '../../../../client/ClientEntity';
 import {Config} from '../../../../Config';
 import type {User} from '../../../../entity/User';
 import {DeviceCard} from '../DeviceCard';

src/script/components/UserDevices/components/SelfFingerprint/SelfFingerprint.tsx

@@ -25,10 +25,10 @@ import {container} from 'tsyringe';
 
 import {WebAppEvents} from '@wireapp/webapp-events';
 
+import {ClientState} from 'Repositories/client/ClientState';
 import {t} from 'Util/LocalizerUtil';
 import {splitFingerprint} from 'Util/StringUtil';
 
-import {ClientState} from '../../../../client/ClientState';
 import type {CryptographyRepository} from '../../../../cryptography/CryptographyRepository';
 import {FormattedId} from '../../../../page/MainContent/panels/preferences/DevicesPreferences/components/FormattedId';
 import {DeviceCard} from '../DeviceCard';

src/script/conversation/ClientMismatchUtil.test.ts

@@ -17,9 +17,10 @@
  *
  */
 
+import {ClientEntity} from 'Repositories/client/ClientEntity';
+
 import {extractClientDiff, findDeletedClients} from './ClientMismatchUtil';
 
-import {ClientEntity} from '../client/ClientEntity';
 import {User} from '../entity/User';
 
 describe('ClientMismatchUtil', () => {

src/script/conversation/ConversationRepository.test.ts

@@ -51,7 +51,7 @@ import {container} from 'tsyringe';
 import {WebAppEvents} from '@wireapp/webapp-events';
 
 import {CallingRepository} from 'Repositories/calling/CallingRepository';
-import {ClientEntity} from 'src/script/client/ClientEntity';
+import {ClientEntity} from 'Repositories/client/ClientEntity';
 import {Config} from 'src/script/Config';
 import {ConnectionEntity} from 'src/script/connection/ConnectionEntity';
 import {ConversationDatabaseData, ConversationMapper} from 'src/script/conversation/ConversationMapper';

src/script/conversation/ConversationVerificationStateHandler/Proteus/ProteusStateHandler.test.ts

@@ -17,7 +17,7 @@
  *
  */
 
-import {ClientEntity} from 'src/script/client/ClientEntity';
+import {ClientEntity} from 'Repositories/client/ClientEntity';
 import {ConversationVerificationState} from 'src/script/conversation/ConversationVerificationState';
 import {EventBuilder} from 'src/script/conversation/EventBuilder';
 import {Conversation} from 'src/script/entity/Conversation';

src/script/conversation/MessageRepository.test.ts

@@ -27,6 +27,8 @@ import {LegalHoldStatus} from '@wireapp/protocol-messaging';
 
 import {AssetRepository} from 'Repositories/assets/AssetRepository';
 import {AudioRepository} from 'Repositories/audio/AudioRepository';
+import {ClientEntity} from 'Repositories/client/ClientEntity';
+import {ClientState} from 'Repositories/client/ClientState';
 import {ConnectionEntity} from 'src/script/connection/ConnectionEntity';
 import {MessageRepository} from 'src/script/conversation/MessageRepository';
 import {Conversation} from 'src/script/entity/Conversation';
@@ -40,8 +42,6 @@ import {createUuid} from 'Util/uuid';
 import {ConversationRepository} from './ConversationRepository';
 import {ConversationState} from './ConversationState';
 
-import {ClientEntity} from '../client/ClientEntity';
-import {ClientState} from '../client/ClientState';
 import {CryptographyRepository} from '../cryptography/CryptographyRepository';
 import {ContentMessage} from '../entity/message/ContentMessage';
 import {EventRepository} from '../event/EventRepository';

src/script/conversation/MessageRepository.ts

@@ -50,11 +50,13 @@ import {partition} from 'underscore';
 import {Asset, Availability, Confirmation, GenericMessage} from '@wireapp/protocol-messaging';
 import {WebAppEvents} from '@wireapp/webapp-events';
 
+import {PrimaryModal} from 'Components/Modals/PrimaryModal';
 import {buildMetadata, ImageMetadata, isAudio, isImage, isVideo} from 'Repositories/assets/AssetMetaDataBuilder';
 import {AssetRepository} from 'Repositories/assets/AssetRepository';
 import {AssetTransferState} from 'Repositories/assets/AssetTransferState';
 import {AudioRepository} from 'Repositories/audio/AudioRepository';
 import {AudioType} from 'Repositories/audio/AudioType';
+import {ClientState} from 'Repositories/client/ClientState';
 import {
   cancelSendingLinkPreview,
   clearLinkPreviewSendingState,
@@ -79,8 +81,6 @@ import {ConversationVerificationState} from './ConversationVerificationState';
 import {EventMapper} from './EventMapper';
 import {getLinkPreviewFromString} from './linkPreviews';
 
-import {ClientState} from '../client/ClientState';
-import {PrimaryModal} from '../components/Modals/PrimaryModal';
 import {EventBuilder} from '../conversation/EventBuilder';
 import {CryptographyRepository} from '../cryptography/CryptographyRepository';
 import {PROTO_MESSAGE_TYPE} from '../cryptography/ProtoMessageType';

src/script/entity/Conversation.test.ts

@@ -22,7 +22,7 @@
 import {ConnectionStatus} from '@wireapp/api-client/lib/connection/';
 import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation/';
 
-import {ClientEntity} from 'src/script/client/ClientEntity';
+import {ClientEntity} from 'Repositories/client/ClientEntity';
 import {ConnectionMapper} from 'src/script/connection/ConnectionMapper';
 import {ConversationMapper} from 'src/script/conversation/ConversationMapper';
 import {NOTIFICATION_STATE} from 'src/script/conversation/NotificationSetting';

src/script/entity/Conversation.ts

@@ -36,6 +36,7 @@ import {LegalHoldStatus} from '@wireapp/protocol-messaging';
 import {WebAppEvents} from '@wireapp/webapp-events';
 
 import {useLegalHoldModalState} from 'Components/Modals/LegalHoldModal/LegalHoldModal.state';
+import {ClientRepository} from 'Repositories/client';
 import {t} from 'Util/LocalizerUtil';
 import {getLogger, Logger} from 'Util/Logger';
 import {matchQualifiedIds} from 'Util/QualifiedId';
@@ -47,7 +48,6 @@ import type {Message} from './message/Message';
 import {PingMessage} from './message/PingMessage';
 import type {User} from './User';
 
-import {ClientRepository} from '../client';
 import {Config} from '../Config';
 import {ConnectionEntity} from '../connection/ConnectionEntity';
 import {ACCESS_STATE} from '../conversation/AccessState';

src/script/entity/User/User.test.ts

@@ -17,7 +17,7 @@
  *
  */
 
-import {ClientEntity} from 'src/script/client/ClientEntity';
+import {ClientEntity} from 'Repositories/client/ClientEntity';
 import {ACCENT_ID} from 'src/script/Config';
 
 import {User} from './User';

src/script/entity/User/User.ts

@@ -27,12 +27,12 @@ import {Availability} from '@wireapp/protocol-messaging';
 import {WebAppEvents} from '@wireapp/webapp-events';
 
 import type {AssetRemoteData} from 'Repositories/assets/AssetRemoteData';
+import type {ClientEntity} from 'Repositories/client/ClientEntity';
 import {t} from 'Util/LocalizerUtil';
 import {clamp} from 'Util/NumberUtil';
 import {getFirstChar} from 'Util/StringUtil';
 import {TIME_IN_MILLIS} from 'Util/TimeUtil';
 
-import type {ClientEntity} from '../../client/ClientEntity';
 import {ACCENT_ID} from '../../Config';
 import {ConnectionEntity} from '../../connection/ConnectionEntity';
 import {ROLE as TEAM_ROLE} from '../../user/UserPermission';

src/script/main/app.ts

@@ -38,6 +38,8 @@ import {BackupRepository} from 'Repositories/backup/BackupRepository';
 import {BackupService} from 'Repositories/backup/BackupService';
 import {CacheRepository} from 'Repositories/cache/CacheRepository';
 import {CallingRepository} from 'Repositories/calling/CallingRepository';
+import {ClientRepository, ClientService} from 'Repositories/client';
+import {getClientMLSConfig} from 'Repositories/client/clientMLSConfig';
 import {initializeDataDog} from 'Util/DataDog';
 import {DebugUtil} from 'Util/DebugUtil';
 import {Environment} from 'Util/Environment';
@@ -51,8 +53,6 @@ import {AppInitializationStep, checkIndexedDb, InitializationEventLogger} from '
 import '../../style/default.less';
 import {SIGN_OUT_REASON} from '../auth/SignOutReason';
 import {URLParameter} from '../auth/URLParameter';
-import {ClientRepository, ClientService} from '../client';
-import {getClientMLSConfig} from '../client/clientMLSConfig';
 import {Configuration} from '../Config';
 import {ConnectionRepository} from '../connection/ConnectionRepository';
 import {ConnectionService} from '../connection/ConnectionService';

src/script/notification/PreferenceNotificationRepository.test.ts

@@ -23,11 +23,11 @@ import ko from 'knockout';
 
 import {WebAppEvents} from '@wireapp/webapp-events';
 
+import {ClientEntity} from 'Repositories/client/ClientEntity';
 import {Notification, PreferenceNotificationRepository} from 'src/script/notification/PreferenceNotificationRepository';
 import {PropertiesRepository} from 'src/script/properties/PropertiesRepository';
 import {createUuid} from 'Util/uuid';
 
-import {ClientEntity} from '../client/ClientEntity';
 import {User} from '../entity/User';
 
 describe('PreferenceNotificationRepository', () => {

src/script/notification/PreferenceNotificationRepository.ts

@@ -26,10 +26,10 @@ import {groupBy} from 'underscore';
 
 import {WebAppEvents} from '@wireapp/webapp-events';
 
+import type {ClientEntity} from 'Repositories/client/ClientEntity';
 import {matchQualifiedIds} from 'Util/QualifiedId';
 import {loadValue, resetStoreValue, storeValue} from 'Util/StorageUtil';
 
-import type {ClientEntity} from '../client/ClientEntity';
 import type {User} from '../entity/User';
 import {PropertiesRepository} from '../properties/PropertiesRepository';
 

src/script/page/AppLock/AppLock.test.tsx

@@ -24,11 +24,11 @@ import ko from 'knockout';
 
 import {WebAppEvents} from '@wireapp/webapp-events';
 
+import type {ClientRepository} from 'Repositories/client';
 import {createUuid} from 'Util/uuid';
 
 import {AppLock, APPLOCK_STATE} from './AppLock';
 
-import type {ClientRepository} from '../../client';
 import {TeamState} from '../../team/TeamState';
 import {AppLockRepository} from '../../user/AppLockRepository';
 import {AppLockState} from '../../user/AppLockState';

src/script/page/AppLock/AppLock.tsx

@@ -29,9 +29,9 @@ import {WebAppEvents} from '@wireapp/webapp-events';
 
 import * as Icon from 'Components/Icon';
 import {ModalComponent} from 'Components/Modals/ModalComponent';
+import {ClientRepository} from 'Repositories/client';
+import {ClientState} from 'Repositories/client/ClientState';
 import {SIGN_OUT_REASON} from 'src/script/auth/SignOutReason';
-import {ClientRepository} from 'src/script/client';
-import {ClientState} from 'src/script/client/ClientState';
 import {Config} from 'src/script/Config';
 import {AppLockRepository} from 'src/script/user/AppLockRepository';
 import {AppLockState} from 'src/script/user/AppLockState';

src/script/page/MainContent/MainContent.tsx

@@ -29,6 +29,7 @@ import {HistoryExport} from 'Components/HistoryExport';
 import {HistoryImport} from 'Components/HistoryImport';
 import * as Icon from 'Components/Icon';
 import {useLegalHoldModalState} from 'Components/Modals/LegalHoldModal/LegalHoldModal.state';
+import {ClientState} from 'Repositories/client/ClientState';
 import {User} from 'src/script/entity/User';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {t} from 'Util/LocalizerUtil';
@@ -41,7 +42,6 @@ import {AVPreferences} from './panels/preferences/AVPreferences';
 import {DevicesPreferences} from './panels/preferences/DevicesPreferences';
 import {OptionPreferences} from './panels/preferences/OptionPreferences';
 
-import {ClientState} from '../../client/ClientState';
 import {ConversationState} from '../../conversation/ConversationState';
 import {TeamState} from '../../team/TeamState';
 import {UserState} from '../../user/UserState';

src/script/page/MainContent/panels/preferences/AccountPreferences.tsx

@@ -26,6 +26,7 @@ import {UserVerificationBadges} from 'Components/Badge';
 import {ErrorFallback} from 'Components/ErrorFallback';
 import {PrimaryModal} from 'Components/Modals/PrimaryModal';
 import {useEnrichedFields} from 'Components/panel/EnrichedFields';
+import {ClientRepository} from 'Repositories/client';
 import {ConversationState} from 'src/script/conversation/ConversationState';
 import {ContentState} from 'src/script/page/useAppState';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
@@ -47,7 +48,6 @@ import {UsernameInput} from './accountPreferences/UsernameInput';
 import {PreferencesPage} from './components/PreferencesPage';
 import {PreferencesSection} from './components/PreferencesSection';
 
-import {ClientRepository} from '../../../../client';
 import {Config} from '../../../../Config';
 import {ConversationRepository} from '../../../../conversation/ConversationRepository';
 import {User} from '../../../../entity/User';

src/script/page/MainContent/panels/preferences/DevicesPreferences/DevicesPreference.test.tsx

@@ -22,9 +22,9 @@ import {CONVERSATION_TYPE, ConversationProtocol} from '@wireapp/api-client/lib/c
 
 import {randomUUID} from 'crypto';
 
+import {ClientEntity} from 'Repositories/client/ClientEntity';
+import {ClientState} from 'Repositories/client/ClientState';
 import {withTheme} from 'src/script/auth/util/test/TestUtil';
-import {ClientEntity} from 'src/script/client/ClientEntity';
-import {ClientState} from 'src/script/client/ClientState';
 import {ConversationState} from 'src/script/conversation/ConversationState';
 import {CryptographyRepository} from 'src/script/cryptography/CryptographyRepository';
 import {User} from 'src/script/entity/User';

src/script/page/MainContent/panels/preferences/DevicesPreferences/DevicesPreference.tsx

@@ -22,7 +22,8 @@ import React, {useEffect, useState} from 'react';
 import {QualifiedId} from '@wireapp/api-client/lib/user';
 import {container} from 'tsyringe';
 
-import {ClientEntity} from 'src/script/client/ClientEntity';
+import {ClientEntity} from 'Repositories/client/ClientEntity';
+import {ClientState} from 'Repositories/client/ClientState';
 import {CryptographyRepository} from 'src/script/cryptography/CryptographyRepository';
 import {Conversation} from 'src/script/entity/Conversation';
 import {User} from 'src/script/entity/User';
@@ -34,7 +35,6 @@ import {DetailedDevice} from './components/DetailedDevice';
 import {Device} from './components/Device';
 import {DeviceDetailsPreferences} from './components/DeviceDetailsPreferences';
 
-import {ClientState} from '../../../../../client/ClientState';
 import {ConversationState} from '../../../../../conversation/ConversationState';
 import {PreferencesPage} from '../components/PreferencesPage';
 

src/script/page/MainContent/panels/preferences/DevicesPreferences/components/DetailedDevice.tsx

@@ -20,7 +20,7 @@
 import React from 'react';
 
 import {DeviceVerificationBadges} from 'Components/Badge';
-import {ClientEntity} from 'src/script/client/ClientEntity';
+import {ClientEntity} from 'Repositories/client/ClientEntity';
 import {WireIdentity} from 'src/script/E2EIdentity';
 
 import {MLSDeviceDetails} from './MLSDeviceDetails';