diff --git a/apps/meteor/.eslintignore b/apps/meteor/.eslintignore index 9f66dc806f8..f7051767d77 100644 --- a/apps/meteor/.eslintignore +++ b/apps/meteor/.eslintignore @@ -13,3 +13,4 @@ !/client/.eslintrc.js !/ee/client/.eslintrc.js /storybook-static/ +/packages/ diff --git a/apps/meteor/app/2fa/server/code/EmailCheck.ts b/apps/meteor/app/2fa/server/code/EmailCheck.ts index 5baf218a62b..8c9865c0b00 100644 --- a/apps/meteor/app/2fa/server/code/EmailCheck.ts +++ b/apps/meteor/app/2fa/server/code/EmailCheck.ts @@ -4,10 +4,10 @@ import { Random } from '@rocket.chat/random'; import bcrypt from 'bcrypt'; import { Accounts } from 'meteor/accounts-base'; +import type { ICodeCheck, IProcessInvalidCodeResult } from './ICodeCheck'; import { i18n } from '../../../../server/lib/i18n'; import * as Mailer from '../../../mailer/server/api'; import { settings } from '../../../settings/server'; -import type { ICodeCheck, IProcessInvalidCodeResult } from './ICodeCheck'; export class EmailCheck implements ICodeCheck { public readonly name = 'email'; diff --git a/apps/meteor/app/2fa/server/code/PasswordCheckFallback.ts b/apps/meteor/app/2fa/server/code/PasswordCheckFallback.ts index 6c441127f79..ba462abc1f9 100644 --- a/apps/meteor/app/2fa/server/code/PasswordCheckFallback.ts +++ b/apps/meteor/app/2fa/server/code/PasswordCheckFallback.ts @@ -1,8 +1,8 @@ import type { IUser } from '@rocket.chat/core-typings'; import { Accounts } from 'meteor/accounts-base'; -import { settings } from '../../../settings/server'; import type { ICodeCheck, IProcessInvalidCodeResult } from './ICodeCheck'; +import { settings } from '../../../settings/server'; export class PasswordCheckFallback implements ICodeCheck { public readonly name = 'password'; diff --git a/apps/meteor/app/2fa/server/code/TOTPCheck.ts b/apps/meteor/app/2fa/server/code/TOTPCheck.ts index 3aa2604c796..236016883f8 100644 --- a/apps/meteor/app/2fa/server/code/TOTPCheck.ts +++ b/apps/meteor/app/2fa/server/code/TOTPCheck.ts @@ -1,8 +1,8 @@ import type { IUser } from '@rocket.chat/core-typings'; +import type { ICodeCheck, IProcessInvalidCodeResult } from './ICodeCheck'; import { settings } from '../../../settings/server'; import { TOTP } from '../lib/totp'; -import type { ICodeCheck, IProcessInvalidCodeResult } from './ICodeCheck'; export class TOTPCheck implements ICodeCheck { public readonly name = 'totp'; diff --git a/apps/meteor/app/2fa/server/code/index.ts b/apps/meteor/app/2fa/server/code/index.ts index b05157416e3..d4be080259c 100644 --- a/apps/meteor/app/2fa/server/code/index.ts +++ b/apps/meteor/app/2fa/server/code/index.ts @@ -5,11 +5,11 @@ import { Users } from '@rocket.chat/models'; import { Accounts } from 'meteor/accounts-base'; import { Meteor } from 'meteor/meteor'; -import { settings } from '../../../settings/server'; import { EmailCheck } from './EmailCheck'; import type { ICodeCheck } from './ICodeCheck'; import { PasswordCheckFallback } from './PasswordCheckFallback'; import { TOTPCheck } from './TOTPCheck'; +import { settings } from '../../../settings/server'; export interface ITwoFactorOptions { disablePasswordFallback?: boolean; diff --git a/apps/meteor/app/2fa/server/loginHandler.ts b/apps/meteor/app/2fa/server/loginHandler.ts index a51ba72ec7f..b554330e140 100644 --- a/apps/meteor/app/2fa/server/loginHandler.ts +++ b/apps/meteor/app/2fa/server/loginHandler.ts @@ -3,8 +3,8 @@ import { check } from 'meteor/check'; import { Meteor } from 'meteor/meteor'; import { OAuth } from 'meteor/oauth'; -import { callbacks } from '../../../lib/callbacks'; import { checkCodeForUser } from './code/index'; +import { callbacks } from '../../../lib/callbacks'; const isMeteorError = (error: any): error is Meteor.Error => { return error?.meteorError !== undefined; diff --git a/apps/meteor/app/api/server/api.ts b/apps/meteor/app/api/server/api.ts index 57be4f294d9..51930f1e9e5 100644 --- a/apps/meteor/app/api/server/api.ts +++ b/apps/meteor/app/api/server/api.ts @@ -14,15 +14,6 @@ import type { Request, Response } from 'meteor/rocketchat:restivus'; import { Restivus } from 'meteor/rocketchat:restivus'; import _ from 'underscore'; -import { isObject } from '../../../lib/utils/isObject'; -import { getNestedProp } from '../../../server/lib/getNestedProp'; -import { getRestPayload } from '../../../server/lib/logger/logPayloads'; -import { checkCodeForUser } from '../../2fa/server/code'; -import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission'; -import { notifyOnUserChangeAsync } from '../../lib/server/lib/notifyListener'; -import { metrics } from '../../metrics/server'; -import { settings } from '../../settings/server'; -import { getDefaultUserFields } from '../../utils/server/functions/getDefaultUserFields'; import type { PermissionsPayload } from './api.helpers'; import { checkPermissionsForInvocation, checkPermissions, parseDeprecation } from './api.helpers'; import type { @@ -37,6 +28,15 @@ import type { } from './definition'; import { getUserInfo } from './helpers/getUserInfo'; import { parseJsonQuery } from './helpers/parseJsonQuery'; +import { isObject } from '../../../lib/utils/isObject'; +import { getNestedProp } from '../../../server/lib/getNestedProp'; +import { getRestPayload } from '../../../server/lib/logger/logPayloads'; +import { checkCodeForUser } from '../../2fa/server/code'; +import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission'; +import { notifyOnUserChangeAsync } from '../../lib/server/lib/notifyListener'; +import { metrics } from '../../metrics/server'; +import { settings } from '../../settings/server'; +import { getDefaultUserFields } from '../../utils/server/functions/getDefaultUserFields'; const logger = new Logger('API'); diff --git a/apps/meteor/app/api/server/v1/import.ts b/apps/meteor/app/api/server/v1/import.ts index 54dbce4d82d..d0557a81969 100644 --- a/apps/meteor/app/api/server/v1/import.ts +++ b/apps/meteor/app/api/server/v1/import.ts @@ -15,8 +15,6 @@ import { } from '@rocket.chat/rest-typings'; import { Meteor } from 'meteor/meteor'; -import { PendingAvatarImporter } from '../../../importer-pending-avatars/server/PendingAvatarImporter'; -import { PendingFileImporter } from '../../../importer-pending-files/server/PendingFileImporter'; import { Importers } from '../../../importer/server'; import { executeUploadImportFile, @@ -26,6 +24,8 @@ import { executeStartImport, executeGetLatestImportOperations, } from '../../../importer/server/methods'; +import { PendingAvatarImporter } from '../../../importer-pending-avatars/server/PendingAvatarImporter'; +import { PendingFileImporter } from '../../../importer-pending-files/server/PendingFileImporter'; import { API } from '../api'; API.v1.addRoute( diff --git a/apps/meteor/app/api/server/v1/invites.ts b/apps/meteor/app/api/server/v1/invites.ts index ac053f21f28..ac916befc4f 100644 --- a/apps/meteor/app/api/server/v1/invites.ts +++ b/apps/meteor/app/api/server/v1/invites.ts @@ -63,8 +63,6 @@ API.v1.addRoute( { async post() { const { token } = this.bodyParams; - // eslint-disable-next-line react-hooks/rules-of-hooks - // eslint-disable-next-line react-hooks/rules-of-hooks return API.v1.success(await useInviteToken(this.userId, token)); }, diff --git a/apps/meteor/app/api/server/v1/voip/extensions.ts b/apps/meteor/app/api/server/v1/voip/extensions.ts index 1a0fecf7cfc..91b0466626b 100644 --- a/apps/meteor/app/api/server/v1/voip/extensions.ts +++ b/apps/meteor/app/api/server/v1/voip/extensions.ts @@ -3,10 +3,10 @@ import type { IVoipExtensionBase } from '@rocket.chat/core-typings'; import { Users } from '@rocket.chat/models'; import { Match, check } from 'meteor/check'; +import { logger } from './logger'; import { settings } from '../../../../settings/server'; import { generateJWT } from '../../../../utils/server/lib/JWTHelper'; import { API } from '../../api'; -import { logger } from './logger'; // Get the connector version and type API.v1.addRoute( diff --git a/apps/meteor/app/api/server/v1/voip/omnichannel.ts b/apps/meteor/app/api/server/v1/voip/omnichannel.ts index e2128375ea4..abd92b9fa58 100644 --- a/apps/meteor/app/api/server/v1/voip/omnichannel.ts +++ b/apps/meteor/app/api/server/v1/voip/omnichannel.ts @@ -3,10 +3,10 @@ import type { IUser, IVoipExtensionWithAgentInfo } from '@rocket.chat/core-typin import { Users } from '@rocket.chat/models'; import { Match, check } from 'meteor/check'; +import { logger } from './logger'; import { notifyOnUserChange } from '../../../../lib/server/lib/notifyListener'; import { API } from '../../api'; import { getPaginationItems } from '../../helpers/getPaginationItems'; -import { logger } from './logger'; function filter( array: IVoipExtensionWithAgentInfo[], diff --git a/apps/meteor/app/apple/server/appleOauthRegisterService.ts b/apps/meteor/app/apple/server/appleOauthRegisterService.ts index b9558fa701f..7cb748c7ab9 100644 --- a/apps/meteor/app/apple/server/appleOauthRegisterService.ts +++ b/apps/meteor/app/apple/server/appleOauthRegisterService.ts @@ -1,9 +1,9 @@ import { KJUR } from 'jsrsasign'; import { ServiceConfiguration } from 'meteor/service-configuration'; +import { AppleCustomOAuth } from './AppleCustomOAuth'; import { settings } from '../../settings/server'; import { config } from '../lib/config'; -import { AppleCustomOAuth } from './AppleCustomOAuth'; new AppleCustomOAuth('apple', config); diff --git a/apps/meteor/app/apps/server/converters/threads.ts b/apps/meteor/app/apps/server/converters/threads.ts index e31ee094b4d..d6284688b98 100644 --- a/apps/meteor/app/apps/server/converters/threads.ts +++ b/apps/meteor/app/apps/server/converters/threads.ts @@ -1,8 +1,8 @@ import type { IAppRoomsConverter, IAppThreadsConverter, IAppUsersConverter, IAppsMessage, IAppsUser } from '@rocket.chat/apps'; import type { IMessage as AppsEngineMessage, IMessageAttachment } from '@rocket.chat/apps-engine/definition/messages'; import type { IRoom } from '@rocket.chat/apps-engine/definition/rooms'; -import type { IUser } from '@rocket.chat/core-typings'; -import { isEditedMessage, type IMessage } from '@rocket.chat/core-typings'; +import { isEditedMessage } from '@rocket.chat/core-typings'; +import type { IUser, IMessage } from '@rocket.chat/core-typings'; import { Messages } from '@rocket.chat/models'; import { cachedFunction } from './cachedFunction'; diff --git a/apps/meteor/app/apps/server/converters/transformMappedData.ts b/apps/meteor/app/apps/server/converters/transformMappedData.ts index 3fcd4db482a..85c54fc103b 100644 --- a/apps/meteor/app/apps/server/converters/transformMappedData.ts +++ b/apps/meteor/app/apps/server/converters/transformMappedData.ts @@ -1,5 +1,3 @@ -import cloneDeep from 'lodash.clonedeep'; - /** * Transforms a `data` source object to another object, * essentially applying a to -> from mapping provided by @@ -79,7 +77,7 @@ export const transformMappedData = async < data: DataType, map: MapType, ): Promise => { - const originalData: DataType = cloneDeep(data); + const originalData: DataType = structuredClone(data); const transformedData: Record = {}; for await (const [to, from] of Object.entries(map)) { diff --git a/apps/meteor/app/authorization/server/functions/canDeleteMessage.ts b/apps/meteor/app/authorization/server/functions/canDeleteMessage.ts index fea37fd1c2a..1651affba0d 100644 --- a/apps/meteor/app/authorization/server/functions/canDeleteMessage.ts +++ b/apps/meteor/app/authorization/server/functions/canDeleteMessage.ts @@ -1,9 +1,9 @@ import type { IUser, IRoom } from '@rocket.chat/core-typings'; import { Rooms } from '@rocket.chat/models'; -import { getValue } from '../../../settings/server/raw'; import { canAccessRoomAsync } from './canAccessRoom'; import { hasPermissionAsync } from './hasPermission'; +import { getValue } from '../../../settings/server/raw'; const elapsedTime = (ts: Date): number => { const dif = Date.now() - ts.getTime(); diff --git a/apps/meteor/app/authorization/server/functions/canSendMessage.ts b/apps/meteor/app/authorization/server/functions/canSendMessage.ts index 9cf5c5ec78d..97767ee001b 100644 --- a/apps/meteor/app/authorization/server/functions/canSendMessage.ts +++ b/apps/meteor/app/authorization/server/functions/canSendMessage.ts @@ -1,10 +1,10 @@ import type { IRoom, IUser } from '@rocket.chat/core-typings'; import { Subscriptions, Rooms } from '@rocket.chat/models'; -import { RoomMemberActions } from '../../../../definition/IRoomTypeConfig'; -import { roomCoordinator } from '../../../../server/lib/rooms/roomCoordinator'; import { canAccessRoomAsync } from './canAccessRoom'; import { hasPermissionAsync } from './hasPermission'; +import { RoomMemberActions } from '../../../../definition/IRoomTypeConfig'; +import { roomCoordinator } from '../../../../server/lib/rooms/roomCoordinator'; const subscriptionOptions = { projection: { diff --git a/apps/meteor/app/autotranslate/client/lib/actionButton.ts b/apps/meteor/app/autotranslate/client/lib/actionButton.ts index a720917ce17..3901ef2df8e 100644 --- a/apps/meteor/app/autotranslate/client/lib/actionButton.ts +++ b/apps/meteor/app/autotranslate/client/lib/actionButton.ts @@ -1,6 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; +import { AutoTranslate } from './autotranslate'; import { roomCoordinator } from '../../../../client/lib/rooms/roomCoordinator'; import { hasTranslationLanguageInAttachments, @@ -11,7 +12,6 @@ import { Messages } from '../../../models/client'; import { settings } from '../../../settings/client'; import { MessageAction } from '../../../ui-utils/client/lib/MessageAction'; import { sdk } from '../../../utils/client/lib/SDKClient'; -import { AutoTranslate } from './autotranslate'; Meteor.startup(() => { AutoTranslate.init(); diff --git a/apps/meteor/app/autotranslate/server/deeplTranslate.ts b/apps/meteor/app/autotranslate/server/deeplTranslate.ts index 349133f7fd4..caa4cf97c9a 100644 --- a/apps/meteor/app/autotranslate/server/deeplTranslate.ts +++ b/apps/meteor/app/autotranslate/server/deeplTranslate.ts @@ -13,10 +13,10 @@ import type { import { serverFetch as fetch } from '@rocket.chat/server-fetch'; import _ from 'underscore'; +import { TranslationProviderRegistry, AutoTranslate } from './autotranslate'; import { i18n } from '../../../server/lib/i18n'; import { SystemLogger } from '../../../server/lib/logger/system'; import { settings } from '../../settings/server'; -import { TranslationProviderRegistry, AutoTranslate } from './autotranslate'; const proApiEndpoint = 'https://api.deepl.com/v2/translate'; const freeApiEndpoint = 'https://api-free.deepl.com/v2/translate'; diff --git a/apps/meteor/app/autotranslate/server/googleTranslate.ts b/apps/meteor/app/autotranslate/server/googleTranslate.ts index 0e0b7a20576..da5e156458d 100644 --- a/apps/meteor/app/autotranslate/server/googleTranslate.ts +++ b/apps/meteor/app/autotranslate/server/googleTranslate.ts @@ -13,10 +13,10 @@ import type { import { serverFetch as fetch } from '@rocket.chat/server-fetch'; import _ from 'underscore'; +import { AutoTranslate, TranslationProviderRegistry } from './autotranslate'; import { i18n } from '../../../server/lib/i18n'; import { SystemLogger } from '../../../server/lib/logger/system'; import { settings } from '../../settings/server'; -import { AutoTranslate, TranslationProviderRegistry } from './autotranslate'; /** * Represents google translate class diff --git a/apps/meteor/app/autotranslate/server/msTranslate.ts b/apps/meteor/app/autotranslate/server/msTranslate.ts index f885a23b8e6..ad36ff0b8b7 100644 --- a/apps/meteor/app/autotranslate/server/msTranslate.ts +++ b/apps/meteor/app/autotranslate/server/msTranslate.ts @@ -6,10 +6,10 @@ import type { IMessage, IProviderMetadata, ISupportedLanguage, ITranslationResul import { serverFetch as fetch } from '@rocket.chat/server-fetch'; import _ from 'underscore'; -import { i18n } from '../../../server/lib/i18n'; -import { settings } from '../../settings/server'; import { TranslationProviderRegistry, AutoTranslate } from './autotranslate'; import { msLogger } from './logger'; +import { i18n } from '../../../server/lib/i18n'; +import { settings } from '../../settings/server'; /** * Microsoft translation service provider class representation. diff --git a/apps/meteor/app/cloud/server/functions/connectWorkspace.ts b/apps/meteor/app/cloud/server/functions/connectWorkspace.ts index b7dc1d8b21b..9d29fb7eb39 100644 --- a/apps/meteor/app/cloud/server/functions/connectWorkspace.ts +++ b/apps/meteor/app/cloud/server/functions/connectWorkspace.ts @@ -1,10 +1,10 @@ import { serverFetch as fetch } from '@rocket.chat/server-fetch'; +import { getRedirectUri } from './getRedirectUri'; +import { saveRegistrationData } from './saveRegistrationData'; import { CloudWorkspaceConnectionError } from '../../../../lib/errors/CloudWorkspaceConnectionError'; import { SystemLogger } from '../../../../server/lib/logger/system'; import { settings } from '../../../settings/server'; -import { getRedirectUri } from './getRedirectUri'; -import { saveRegistrationData } from './saveRegistrationData'; const fetchRegistrationDataPayload = async ({ token, diff --git a/apps/meteor/app/cloud/server/functions/getCheckoutUrl.ts b/apps/meteor/app/cloud/server/functions/getCheckoutUrl.ts index 2665f31c849..914020e9647 100644 --- a/apps/meteor/app/cloud/server/functions/getCheckoutUrl.ts +++ b/apps/meteor/app/cloud/server/functions/getCheckoutUrl.ts @@ -1,10 +1,10 @@ import { serverFetch as fetch } from '@rocket.chat/server-fetch'; +import { getWorkspaceAccessTokenOrThrow } from './getWorkspaceAccessToken'; +import { syncWorkspace } from './syncWorkspace'; import { SystemLogger } from '../../../../server/lib/logger/system'; import { settings } from '../../../settings/server'; import { getURL } from '../../../utils/server/getURL'; -import { getWorkspaceAccessTokenOrThrow } from './getWorkspaceAccessToken'; -import { syncWorkspace } from './syncWorkspace'; export const fallback = `https://go.rocket.chat/i/contact-sales`; diff --git a/apps/meteor/app/cloud/server/functions/getWorkspaceKey.ts b/apps/meteor/app/cloud/server/functions/getWorkspaceKey.ts index 639f29402fe..2a2b8e8858f 100644 --- a/apps/meteor/app/cloud/server/functions/getWorkspaceKey.ts +++ b/apps/meteor/app/cloud/server/functions/getWorkspaceKey.ts @@ -1,5 +1,5 @@ -import { settings } from '../../../settings/server'; import { retrieveRegistrationStatus } from './retrieveRegistrationStatus'; +import { settings } from '../../../settings/server'; export async function getWorkspaceKey() { const { workspaceRegistered } = await retrieveRegistrationStatus(); diff --git a/apps/meteor/app/cloud/server/functions/registerPreIntentWorkspaceWizard.ts b/apps/meteor/app/cloud/server/functions/registerPreIntentWorkspaceWizard.ts index e0865c24156..a102ed35905 100644 --- a/apps/meteor/app/cloud/server/functions/registerPreIntentWorkspaceWizard.ts +++ b/apps/meteor/app/cloud/server/functions/registerPreIntentWorkspaceWizard.ts @@ -2,9 +2,9 @@ import type { IUser } from '@rocket.chat/core-typings'; import { Users } from '@rocket.chat/models'; import { serverFetch as fetch } from '@rocket.chat/server-fetch'; +import { buildWorkspaceRegistrationData } from './buildRegistrationData'; import { SystemLogger } from '../../../../server/lib/logger/system'; import { settings } from '../../../settings/server'; -import { buildWorkspaceRegistrationData } from './buildRegistrationData'; export async function registerPreIntentWorkspaceWizard(): Promise { const firstUser = (await Users.getOldest({ projection: { name: 1, emails: 1 } })) as IUser | undefined; diff --git a/apps/meteor/app/cloud/server/functions/removeLicense.ts b/apps/meteor/app/cloud/server/functions/removeLicense.ts index b9afe2ddf09..88f1d682517 100644 --- a/apps/meteor/app/cloud/server/functions/removeLicense.ts +++ b/apps/meteor/app/cloud/server/functions/removeLicense.ts @@ -1,12 +1,12 @@ import { serverFetch as fetch } from '@rocket.chat/server-fetch'; +import { CloudWorkspaceAccessTokenEmptyError, getWorkspaceAccessToken } from './getWorkspaceAccessToken'; +import { retrieveRegistrationStatus } from './retrieveRegistrationStatus'; +import { syncWorkspace } from './syncWorkspace'; import { callbacks } from '../../../../lib/callbacks'; import { CloudWorkspaceConnectionError } from '../../../../lib/errors/CloudWorkspaceConnectionError'; import { CloudWorkspaceRegistrationError } from '../../../../lib/errors/CloudWorkspaceRegistrationError'; import { settings } from '../../../settings/server'; -import { CloudWorkspaceAccessTokenEmptyError, getWorkspaceAccessToken } from './getWorkspaceAccessToken'; -import { retrieveRegistrationStatus } from './retrieveRegistrationStatus'; -import { syncWorkspace } from './syncWorkspace'; export async function removeLicense() { try { diff --git a/apps/meteor/app/cloud/server/functions/removeWorkspaceRegistrationInfo.ts b/apps/meteor/app/cloud/server/functions/removeWorkspaceRegistrationInfo.ts index bf2b5d08594..b77a89128ef 100644 --- a/apps/meteor/app/cloud/server/functions/removeWorkspaceRegistrationInfo.ts +++ b/apps/meteor/app/cloud/server/functions/removeWorkspaceRegistrationInfo.ts @@ -1,7 +1,7 @@ import { Settings, WorkspaceCredentials } from '@rocket.chat/models'; -import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener'; import { retrieveRegistrationStatus } from './retrieveRegistrationStatus'; +import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener'; export async function removeWorkspaceRegistrationInfo() { const { workspaceRegistered } = await retrieveRegistrationStatus(); diff --git a/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts b/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts index 63633c56784..e86a34fb76a 100644 --- a/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts +++ b/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts @@ -1,9 +1,9 @@ import { applyLicense } from '@rocket.chat/license'; import { Settings } from '@rocket.chat/models'; +import { syncCloudData } from './syncWorkspace/syncCloudData'; import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener'; import { settings } from '../../../settings/server'; -import { syncCloudData } from './syncWorkspace/syncCloudData'; type SaveRegistrationDataDTO = { workspaceId: string; diff --git a/apps/meteor/app/cloud/server/functions/startRegisterWorkspace.ts b/apps/meteor/app/cloud/server/functions/startRegisterWorkspace.ts index 1fb2dcc0644..1455ed2329a 100644 --- a/apps/meteor/app/cloud/server/functions/startRegisterWorkspace.ts +++ b/apps/meteor/app/cloud/server/functions/startRegisterWorkspace.ts @@ -1,12 +1,12 @@ import { Settings } from '@rocket.chat/models'; import { serverFetch as fetch } from '@rocket.chat/server-fetch'; -import { SystemLogger } from '../../../../server/lib/logger/system'; -import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener'; -import { settings } from '../../../settings/server'; import { buildWorkspaceRegistrationData } from './buildRegistrationData'; import { retrieveRegistrationStatus } from './retrieveRegistrationStatus'; import { syncWorkspace } from './syncWorkspace'; +import { SystemLogger } from '../../../../server/lib/logger/system'; +import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener'; +import { settings } from '../../../settings/server'; export async function startRegisterWorkspace(resend = false) { const { workspaceRegistered } = await retrieveRegistrationStatus(); diff --git a/apps/meteor/app/cloud/server/functions/startRegisterWorkspaceSetupWizard.ts b/apps/meteor/app/cloud/server/functions/startRegisterWorkspaceSetupWizard.ts index 382478db61c..36b858d932c 100644 --- a/apps/meteor/app/cloud/server/functions/startRegisterWorkspaceSetupWizard.ts +++ b/apps/meteor/app/cloud/server/functions/startRegisterWorkspaceSetupWizard.ts @@ -1,9 +1,9 @@ import type { CloudRegistrationIntentData } from '@rocket.chat/core-typings'; import { serverFetch as fetch } from '@rocket.chat/server-fetch'; +import { buildWorkspaceRegistrationData } from './buildRegistrationData'; import { SystemLogger } from '../../../../server/lib/logger/system'; import { settings } from '../../../settings/server'; -import { buildWorkspaceRegistrationData } from './buildRegistrationData'; export async function startRegisterWorkspaceSetupWizard(resend = false, email: string): Promise { const regInfo = await buildWorkspaceRegistrationData(email); diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts index a410ea274c0..2ae63939e9d 100644 --- a/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts +++ b/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts @@ -1,10 +1,10 @@ import { CloudWorkspaceRegistrationError } from '../../../../../lib/errors/CloudWorkspaceRegistrationError'; import { SystemLogger } from '../../../../../server/lib/logger/system'; import { CloudWorkspaceAccessTokenEmptyError, CloudWorkspaceAccessTokenError, isAbortError } from '../getWorkspaceAccessToken'; -import { getCachedSupportedVersionsToken } from '../supportedVersionsToken/supportedVersionsToken'; import { announcementSync } from './announcementSync'; import { legacySyncWorkspace } from './legacySyncWorkspace'; import { syncCloudData } from './syncCloudData'; +import { getCachedSupportedVersionsToken } from '../supportedVersionsToken/supportedVersionsToken'; /** * Syncs the workspace with the cloud diff --git a/apps/meteor/app/cloud/server/functions/userLogout.ts b/apps/meteor/app/cloud/server/functions/userLogout.ts index 386137ced60..590a581ed4f 100644 --- a/apps/meteor/app/cloud/server/functions/userLogout.ts +++ b/apps/meteor/app/cloud/server/functions/userLogout.ts @@ -1,10 +1,10 @@ import { Users } from '@rocket.chat/models'; import { serverFetch as fetch } from '@rocket.chat/server-fetch'; -import { SystemLogger } from '../../../../server/lib/logger/system'; -import { settings } from '../../../settings/server'; import { retrieveRegistrationStatus } from './retrieveRegistrationStatus'; import { userLoggedOut } from './userLoggedOut'; +import { SystemLogger } from '../../../../server/lib/logger/system'; +import { settings } from '../../../settings/server'; export async function userLogout(userId: string): Promise { const { workspaceRegistered } = await retrieveRegistrationStatus(); diff --git a/apps/meteor/app/cloud/server/index.ts b/apps/meteor/app/cloud/server/index.ts index 6a82c16331c..95c98761035 100644 --- a/apps/meteor/app/cloud/server/index.ts +++ b/apps/meteor/app/cloud/server/index.ts @@ -1,12 +1,12 @@ import { cronJobs } from '@rocket.chat/cron'; import { Meteor } from 'meteor/meteor'; -import { SystemLogger } from '../../../server/lib/logger/system'; import { connectWorkspace } from './functions/connectWorkspace'; import { CloudWorkspaceAccessTokenEmptyError, getWorkspaceAccessToken } from './functions/getWorkspaceAccessToken'; import { getWorkspaceAccessTokenWithScope } from './functions/getWorkspaceAccessTokenWithScope'; import { retrieveRegistrationStatus } from './functions/retrieveRegistrationStatus'; import { syncWorkspace } from './functions/syncWorkspace'; +import { SystemLogger } from '../../../server/lib/logger/system'; import './methods'; const licenseCronName = 'Cloud Workspace Sync'; diff --git a/apps/meteor/app/cloud/server/methods.ts b/apps/meteor/app/cloud/server/methods.ts index 29daefe0d58..c132dbb1a48 100644 --- a/apps/meteor/app/cloud/server/methods.ts +++ b/apps/meteor/app/cloud/server/methods.ts @@ -2,7 +2,6 @@ import type { ServerMethods } from '@rocket.chat/ddp-client'; import { check } from 'meteor/check'; import { Meteor } from 'meteor/meteor'; -import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission'; import { buildWorkspaceRegistrationData } from './functions/buildRegistrationData'; import { checkUserHasCloudLogin } from './functions/checkUserHasCloudLogin'; import { connectWorkspace } from './functions/connectWorkspace'; @@ -12,6 +11,7 @@ import { retrieveRegistrationStatus } from './functions/retrieveRegistrationStat import { startRegisterWorkspace } from './functions/startRegisterWorkspace'; import { syncWorkspace } from './functions/syncWorkspace'; import { userLogout } from './functions/userLogout'; +import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission'; declare module '@rocket.chat/ddp-client' { // eslint-disable-next-line @typescript-eslint/naming-convention diff --git a/apps/meteor/app/crowd/server/crowd.ts b/apps/meteor/app/crowd/server/crowd.ts index 70f54dd7b72..3219a851c8c 100644 --- a/apps/meteor/app/crowd/server/crowd.ts +++ b/apps/meteor/app/crowd/server/crowd.ts @@ -6,13 +6,13 @@ import AtlassianCrowd from 'atlassian-crowd-patched'; import { Accounts } from 'meteor/accounts-base'; import { Meteor } from 'meteor/meteor'; +import { logger } from './logger'; import { crowdIntervalValuesToCronMap } from '../../../server/settings/crowd'; import { deleteUser } from '../../lib/server/functions/deleteUser'; import { _setRealName } from '../../lib/server/functions/setRealName'; import { setUserActiveStatus } from '../../lib/server/functions/setUserActiveStatus'; import { notifyOnUserChange, notifyOnUserChangeById, notifyOnUserChangeAsync } from '../../lib/server/lib/notifyListener'; import { settings } from '../../settings/server'; -import { logger } from './logger'; type CrowdUser = Pick & { crowd: Record; crowd_username: string }; diff --git a/apps/meteor/app/crowd/server/methods.ts b/apps/meteor/app/crowd/server/methods.ts index 48faa2fcbca..c659afc4fbf 100644 --- a/apps/meteor/app/crowd/server/methods.ts +++ b/apps/meteor/app/crowd/server/methods.ts @@ -2,10 +2,10 @@ import type { ServerMethods } from '@rocket.chat/ddp-client'; import type { TranslationKey } from '@rocket.chat/ui-contexts'; import { Meteor } from 'meteor/meteor'; -import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission'; -import { settings } from '../../settings/server'; import { CROWD } from './crowd'; import { logger } from './logger'; +import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission'; +import { settings } from '../../settings/server'; declare module '@rocket.chat/ddp-client' { // eslint-disable-next-line @typescript-eslint/naming-convention diff --git a/apps/meteor/app/custom-oauth/server/custom_oauth_server.js b/apps/meteor/app/custom-oauth/server/custom_oauth_server.js index a546a7c527e..c45f3619c8a 100644 --- a/apps/meteor/app/custom-oauth/server/custom_oauth_server.js +++ b/apps/meteor/app/custom-oauth/server/custom_oauth_server.js @@ -9,12 +9,12 @@ import { OAuth } from 'meteor/oauth'; import { ServiceConfiguration } from 'meteor/service-configuration'; import _ from 'underscore'; +import { normalizers, fromTemplate, renameInvalidProperties } from './transform_helpers'; import { callbacks } from '../../../lib/callbacks'; import { isURL } from '../../../lib/utils/isURL'; import { notifyOnUserChange } from '../../lib/server/lib/notifyListener'; import { registerAccessTokenService } from '../../lib/server/oauth/oauth'; import { settings } from '../../settings/server'; -import { normalizers, fromTemplate, renameInvalidProperties } from './transform_helpers'; const logger = new Logger('CustomOAuth'); diff --git a/apps/meteor/app/custom-sounds/server/methods/uploadCustomSound.ts b/apps/meteor/app/custom-sounds/server/methods/uploadCustomSound.ts index f955f373ed4..64286bb71d8 100644 --- a/apps/meteor/app/custom-sounds/server/methods/uploadCustomSound.ts +++ b/apps/meteor/app/custom-sounds/server/methods/uploadCustomSound.ts @@ -3,10 +3,10 @@ import type { RequiredField } from '@rocket.chat/core-typings'; import type { ServerMethods } from '@rocket.chat/ddp-client'; import { Meteor } from 'meteor/meteor'; +import type { ICustomSoundData } from './insertOrUpdateSound'; import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission'; import { RocketChatFile } from '../../../file/server'; import { RocketChatFileCustomSoundsInstance } from '../startup/custom-sounds'; -import type { ICustomSoundData } from './insertOrUpdateSound'; declare module '@rocket.chat/ddp-client' { // eslint-disable-next-line @typescript-eslint/naming-convention diff --git a/apps/meteor/app/e2e/client/rocketchat.e2e.room.ts b/apps/meteor/app/e2e/client/rocketchat.e2e.room.ts index ff1841a7ef8..cb62eb58a86 100644 --- a/apps/meteor/app/e2e/client/rocketchat.e2e.room.ts +++ b/apps/meteor/app/e2e/client/rocketchat.e2e.room.ts @@ -2,12 +2,6 @@ import { Base64 } from '@rocket.chat/base64'; import { Emitter } from '@rocket.chat/emitter'; import EJSON from 'ejson'; -import { RoomManager } from '../../../client/lib/RoomManager'; -import { roomCoordinator } from '../../../client/lib/rooms/roomCoordinator'; -import { RoomSettingsEnum } from '../../../definition/IRoomTypeConfig'; -import { ChatRoom, Subscriptions, Messages } from '../../models/client'; -import { sdk } from '../../utils/client/lib/SDKClient'; -import { t } from '../../utils/lib/i18n'; import { E2ERoomState } from './E2ERoomState'; import { toString, @@ -30,6 +24,12 @@ import { } from './helper'; import { log, logError } from './logger'; import { e2e } from './rocketchat.e2e'; +import { RoomManager } from '../../../client/lib/RoomManager'; +import { roomCoordinator } from '../../../client/lib/rooms/roomCoordinator'; +import { RoomSettingsEnum } from '../../../definition/IRoomTypeConfig'; +import { ChatRoom, Subscriptions, Messages } from '../../models/client'; +import { sdk } from '../../utils/client/lib/SDKClient'; +import { t } from '../../utils/lib/i18n'; const KEY_ID = Symbol('keyID'); const PAUSED = Symbol('PAUSED'); diff --git a/apps/meteor/app/e2e/client/rocketchat.e2e.ts b/apps/meteor/app/e2e/client/rocketchat.e2e.ts index 824afc3aa2d..801c3c95d51 100644 --- a/apps/meteor/app/e2e/client/rocketchat.e2e.ts +++ b/apps/meteor/app/e2e/client/rocketchat.e2e.ts @@ -10,22 +10,6 @@ import { Accounts } from 'meteor/accounts-base'; import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import * as banners from '../../../client/lib/banners'; -import type { LegacyBannerPayload } from '../../../client/lib/banners'; -import { imperativeModal } from '../../../client/lib/imperativeModal'; -import { dispatchToastMessage } from '../../../client/lib/toast'; -import { mapMessageFromApi } from '../../../client/lib/utils/mapMessageFromApi'; -import { waitUntilFind } from '../../../client/lib/utils/waitUntilFind'; -import EnterE2EPasswordModal from '../../../client/views/e2e/EnterE2EPasswordModal'; -import SaveE2EPasswordModal from '../../../client/views/e2e/SaveE2EPasswordModal'; -import { createQuoteAttachment } from '../../../lib/createQuoteAttachment'; -import { getMessageUrlRegex } from '../../../lib/getMessageUrlRegex'; -import { isTruthy } from '../../../lib/isTruthy'; -import { ChatRoom, Subscriptions, Messages } from '../../models/client'; -import { settings } from '../../settings/client'; -import { getUserAvatarURL } from '../../utils/client'; -import { sdk } from '../../utils/client/lib/SDKClient'; -import { t } from '../../utils/lib/i18n'; import { E2EEState } from './E2EEState'; import { toString, @@ -43,6 +27,22 @@ import { } from './helper'; import { log, logError } from './logger'; import { E2ERoom } from './rocketchat.e2e.room'; +import * as banners from '../../../client/lib/banners'; +import type { LegacyBannerPayload } from '../../../client/lib/banners'; +import { imperativeModal } from '../../../client/lib/imperativeModal'; +import { dispatchToastMessage } from '../../../client/lib/toast'; +import { mapMessageFromApi } from '../../../client/lib/utils/mapMessageFromApi'; +import { waitUntilFind } from '../../../client/lib/utils/waitUntilFind'; +import EnterE2EPasswordModal from '../../../client/views/e2e/EnterE2EPasswordModal'; +import SaveE2EPasswordModal from '../../../client/views/e2e/SaveE2EPasswordModal'; +import { createQuoteAttachment } from '../../../lib/createQuoteAttachment'; +import { getMessageUrlRegex } from '../../../lib/getMessageUrlRegex'; +import { isTruthy } from '../../../lib/isTruthy'; +import { ChatRoom, Subscriptions, Messages } from '../../models/client'; +import { settings } from '../../settings/client'; +import { getUserAvatarURL } from '../../utils/client'; +import { sdk } from '../../utils/client/lib/SDKClient'; +import { t } from '../../utils/lib/i18n'; import './events'; diff --git a/apps/meteor/app/emoji-custom/server/lib/uploadEmojiCustom.ts b/apps/meteor/app/emoji-custom/server/lib/uploadEmojiCustom.ts index 0ef5b55e9f7..cfa887c4a44 100644 --- a/apps/meteor/app/emoji-custom/server/lib/uploadEmojiCustom.ts +++ b/apps/meteor/app/emoji-custom/server/lib/uploadEmojiCustom.ts @@ -5,10 +5,10 @@ import limax from 'limax'; import { Meteor } from 'meteor/meteor'; import sharp from 'sharp'; +import type { EmojiData } from './insertOrUpdateEmoji'; import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission'; import { RocketChatFile } from '../../../file/server'; import { RocketChatFileEmojiCustomInstance } from '../startup/emoji-custom'; -import type { EmojiData } from './insertOrUpdateEmoji'; const getFile = async (file: Buffer, extension: string) => { if (extension !== 'svg+xml') { diff --git a/apps/meteor/app/emoji/client/emojiParser.ts b/apps/meteor/app/emoji/client/emojiParser.ts index 08ec99b0695..ff4a010bed5 100644 --- a/apps/meteor/app/emoji/client/emojiParser.ts +++ b/apps/meteor/app/emoji/client/emojiParser.ts @@ -1,5 +1,5 @@ -import { isIE11 } from '../../../client/lib/utils/isIE11'; import { emoji } from './lib'; +import { isIE11 } from '../../../client/lib/utils/isIE11'; /** * emojiParser is a function that will replace emojis diff --git a/apps/meteor/app/federation/server/lib/dns.js b/apps/meteor/app/federation/server/lib/dns.js index f8ef27e1dcf..83ce0cc7034 100644 --- a/apps/meteor/app/federation/server/lib/dns.js +++ b/apps/meteor/app/federation/server/lib/dns.js @@ -3,10 +3,10 @@ import util from 'util'; import mem from 'mem'; -import * as federationErrors from '../functions/errors'; import { federationRequest } from './http'; import { isFederationEnabled } from './isFederationEnabled'; import { dnsLogger } from './logger'; +import * as federationErrors from '../functions/errors'; const dnsResolveSRV = util.promisify(dnsResolver.resolveSrv); const dnsResolveTXT = util.promisify(dnsResolver.resolveTxt); diff --git a/apps/meteor/app/file-upload/server/config/AmazonS3.ts b/apps/meteor/app/file-upload/server/config/AmazonS3.ts index 0f551d3b90d..48b7a9b850a 100644 --- a/apps/meteor/app/file-upload/server/config/AmazonS3.ts +++ b/apps/meteor/app/file-upload/server/config/AmazonS3.ts @@ -3,11 +3,11 @@ import https from 'https'; import _ from 'underscore'; +import { forceDownload } from './helper'; import { settings } from '../../../settings/server'; import type { S3Options } from '../../ufs/AmazonS3/server'; import { FileUploadClass, FileUpload } from '../lib/FileUpload'; import '../../ufs/AmazonS3/server'; -import { forceDownload } from './helper'; const get: FileUploadClass['get'] = async function (this: FileUploadClass, file, req, res) { const forcedDownload = forceDownload(req); diff --git a/apps/meteor/app/file-upload/server/config/FileSystem.ts b/apps/meteor/app/file-upload/server/config/FileSystem.ts index 75fdb5afc8a..c39cf5807d6 100644 --- a/apps/meteor/app/file-upload/server/config/FileSystem.ts +++ b/apps/meteor/app/file-upload/server/config/FileSystem.ts @@ -1,10 +1,10 @@ import fsp from 'fs/promises'; +import { getContentDisposition } from './helper'; import { UploadFS } from '../../../../server/ufs'; import { settings } from '../../../settings/server'; import { FileUploadClass, FileUpload } from '../lib/FileUpload'; import { getFileRange, setRangeHeaders } from '../lib/ranges'; -import { getContentDisposition } from './helper'; const FileSystemUploads = new FileUploadClass({ name: 'FileSystem:Uploads', diff --git a/apps/meteor/app/file-upload/server/config/GoogleStorage.ts b/apps/meteor/app/file-upload/server/config/GoogleStorage.ts index 8fb901b5a12..ccd94d533b6 100644 --- a/apps/meteor/app/file-upload/server/config/GoogleStorage.ts +++ b/apps/meteor/app/file-upload/server/config/GoogleStorage.ts @@ -3,10 +3,10 @@ import https from 'https'; import _ from 'underscore'; +import { forceDownload } from './helper'; import { settings } from '../../../settings/server'; import { FileUploadClass, FileUpload } from '../lib/FileUpload'; import '../../ufs/GoogleStorage/server'; -import { forceDownload } from './helper'; const get: FileUploadClass['get'] = async function (this: FileUploadClass, file, req, res) { const forcedDownload = forceDownload(req); diff --git a/apps/meteor/app/file-upload/server/config/GridFS.ts b/apps/meteor/app/file-upload/server/config/GridFS.ts index 3bb5f806f3a..551569d4c58 100644 --- a/apps/meteor/app/file-upload/server/config/GridFS.ts +++ b/apps/meteor/app/file-upload/server/config/GridFS.ts @@ -6,10 +6,10 @@ import zlib from 'zlib'; import type { IUpload } from '@rocket.chat/core-typings'; import { Logger } from '@rocket.chat/logger'; +import { getContentDisposition } from './helper'; import { UploadFS } from '../../../../server/ufs'; import { FileUploadClass, FileUpload } from '../lib/FileUpload'; import { getFileRange, setRangeHeaders } from '../lib/ranges'; -import { getContentDisposition } from './helper'; const logger = new Logger('FileUpload'); diff --git a/apps/meteor/app/file-upload/server/lib/FileUpload.ts b/apps/meteor/app/file-upload/server/lib/FileUpload.ts index c7b82fe3e02..cffdfe6288f 100644 --- a/apps/meteor/app/file-upload/server/lib/FileUpload.ts +++ b/apps/meteor/app/file-upload/server/lib/FileUpload.ts @@ -22,6 +22,7 @@ import sharp from 'sharp'; import type { WritableStreamBuffer } from 'stream-buffers'; import streamBuffers from 'stream-buffers'; +import { streamToBuffer } from './streamToBuffer'; import { i18n } from '../../../../server/lib/i18n'; import { SystemLogger } from '../../../../server/lib/logger/system'; import { roomCoordinator } from '../../../../server/lib/rooms/roomCoordinator'; @@ -33,7 +34,6 @@ import { settings } from '../../../settings/server'; import { mime } from '../../../utils/lib/mimeTypes'; import { isValidJWT, generateJWT } from '../../../utils/server/lib/JWTHelper'; import { fileUploadIsValidContentType } from '../../../utils/server/restrictions'; -import { streamToBuffer } from './streamToBuffer'; const cookie = new Cookies(); let maxFileSize = 0; diff --git a/apps/meteor/app/importer-csv/server/index.ts b/apps/meteor/app/importer-csv/server/index.ts index 2d913f74095..f20c375ae94 100644 --- a/apps/meteor/app/importer-csv/server/index.ts +++ b/apps/meteor/app/importer-csv/server/index.ts @@ -1,5 +1,5 @@ -import { Importers } from '../../importer/server'; import { CsvImporter } from './CsvImporter'; +import { Importers } from '../../importer/server'; Importers.add({ key: 'csv', diff --git a/apps/meteor/app/importer-pending-avatars/server/index.ts b/apps/meteor/app/importer-pending-avatars/server/index.ts index b69c6de8e74..2710c06b9d1 100644 --- a/apps/meteor/app/importer-pending-avatars/server/index.ts +++ b/apps/meteor/app/importer-pending-avatars/server/index.ts @@ -1,5 +1,5 @@ -import { Importers } from '../../importer/server'; import { PendingAvatarImporter } from './PendingAvatarImporter'; +import { Importers } from '../../importer/server'; Importers.add({ key: 'pending-avatars', diff --git a/apps/meteor/app/importer-pending-files/server/index.ts b/apps/meteor/app/importer-pending-files/server/index.ts index 24961551cdb..e18b0de0a29 100644 --- a/apps/meteor/app/importer-pending-files/server/index.ts +++ b/apps/meteor/app/importer-pending-files/server/index.ts @@ -1,5 +1,5 @@ -import { Importers } from '../../importer/server'; import { PendingFileImporter } from './PendingFileImporter'; +import { Importers } from '../../importer/server'; Importers.add({ key: 'pending-files', diff --git a/apps/meteor/app/importer-slack-users/server/index.ts b/apps/meteor/app/importer-slack-users/server/index.ts index ab99ede8f91..67b2dbdb319 100644 --- a/apps/meteor/app/importer-slack-users/server/index.ts +++ b/apps/meteor/app/importer-slack-users/server/index.ts @@ -1,5 +1,5 @@ -import { Importers } from '../../importer/server'; import { SlackUsersImporter } from './SlackUsersImporter'; +import { Importers } from '../../importer/server'; Importers.add({ key: 'slack-users', diff --git a/apps/meteor/app/importer-slack/server/index.ts b/apps/meteor/app/importer-slack/server/index.ts index b8040d77538..d32edde7271 100644 --- a/apps/meteor/app/importer-slack/server/index.ts +++ b/apps/meteor/app/importer-slack/server/index.ts @@ -1,5 +1,5 @@ -import { Importers } from '../../importer/server'; import { SlackImporter } from './SlackImporter'; +import { Importers } from '../../importer/server'; Importers.add({ key: 'slack', diff --git a/apps/meteor/app/importer/server/classes/Importer.ts b/apps/meteor/app/importer/server/classes/Importer.ts index 5f40ead0e1e..0eae9fd2404 100644 --- a/apps/meteor/app/importer/server/classes/Importer.ts +++ b/apps/meteor/app/importer/server/classes/Importer.ts @@ -13,14 +13,14 @@ import AdmZip from 'adm-zip'; import type { MatchKeysAndValues, MongoServerError } from 'mongodb'; import { Selection, SelectionChannel, SelectionUser } from '..'; -import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener'; -import { t } from '../../../utils/lib/i18n'; -import { ProgressStep, ImportPreparingStartedStates } from '../../lib/ImporterProgressStep'; -import type { ImporterInfo } from '../definitions/ImporterInfo'; import { ImportDataConverter } from './ImportDataConverter'; import type { ConverterOptions } from './ImportDataConverter'; import { ImporterProgress } from './ImporterProgress'; import { ImporterWebsocket } from './ImporterWebsocket'; +import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener'; +import { t } from '../../../utils/lib/i18n'; +import { ProgressStep, ImportPreparingStartedStates } from '../../lib/ImporterProgressStep'; +import type { ImporterInfo } from '../definitions/ImporterInfo'; type OldSettings = { allowedDomainList?: string | null; diff --git a/apps/meteor/app/importer/server/classes/converters/MessageConverter.ts b/apps/meteor/app/importer/server/classes/converters/MessageConverter.ts index b4540ed6182..732e46b4398 100644 --- a/apps/meteor/app/importer/server/classes/converters/MessageConverter.ts +++ b/apps/meteor/app/importer/server/classes/converters/MessageConverter.ts @@ -2,10 +2,10 @@ import type { IImportMessageRecord, IMessage as IDBMessage, IImportMessage, IImp import { Rooms } from '@rocket.chat/models'; import limax from 'limax'; -import { insertMessage } from '../../../../lib/server/functions/insertMessage'; -import type { IConversionCallbacks } from '../../definitions/IConversionCallbacks'; import type { UserIdentification, MentionedChannel } from './ConverterCache'; import { RecordConverter } from './RecordConverter'; +import { insertMessage } from '../../../../lib/server/functions/insertMessage'; +import type { IConversionCallbacks } from '../../definitions/IConversionCallbacks'; export type MessageConversionCallbacks = IConversionCallbacks & { afterImportAllMessagesFn?: (roomIds: string[]) => Promise }; diff --git a/apps/meteor/app/importer/server/classes/converters/RecordConverter.ts b/apps/meteor/app/importer/server/classes/converters/RecordConverter.ts index d0a6d60fa72..9003fe4bd41 100644 --- a/apps/meteor/app/importer/server/classes/converters/RecordConverter.ts +++ b/apps/meteor/app/importer/server/classes/converters/RecordConverter.ts @@ -4,8 +4,8 @@ import { ImportData } from '@rocket.chat/models'; import { Random } from '@rocket.chat/random'; import { type FindCursor, ObjectId } from 'mongodb'; -import type { IConversionCallbacks } from '../../definitions/IConversionCallbacks'; import { ConverterCache } from './ConverterCache'; +import type { IConversionCallbacks } from '../../definitions/IConversionCallbacks'; export type RecordConverterOptions = { workInMemory?: boolean; diff --git a/apps/meteor/app/importer/server/classes/converters/RoomConverter.ts b/apps/meteor/app/importer/server/classes/converters/RoomConverter.ts index f57fa1a7cb8..e9a14fed6a0 100644 --- a/apps/meteor/app/importer/server/classes/converters/RoomConverter.ts +++ b/apps/meteor/app/importer/server/classes/converters/RoomConverter.ts @@ -2,13 +2,13 @@ import type { IImportChannel, IImportChannelRecord, IRoom } from '@rocket.chat/c import { Subscriptions, Rooms, Users } from '@rocket.chat/models'; import limax from 'limax'; +import { RecordConverter } from './RecordConverter'; import { createDirectMessage } from '../../../../../server/methods/createDirectMessage'; import { saveRoomSettings } from '../../../../channel-settings/server/methods/saveRoomSettings'; import { notifyOnSubscriptionChangedByRoomId } from '../../../../lib/server/lib/notifyListener'; import { createChannelMethod } from '../../../../lib/server/methods/createChannel'; import { createPrivateGroupMethod } from '../../../../lib/server/methods/createPrivateGroup'; import type { IConversionCallbacks } from '../../definitions/IConversionCallbacks'; -import { RecordConverter } from './RecordConverter'; export class RoomConverter extends RecordConverter { public startedByUserId: string; diff --git a/apps/meteor/app/importer/server/classes/converters/UserConverter.ts b/apps/meteor/app/importer/server/classes/converters/UserConverter.ts index 52716dabef5..454989a89ec 100644 --- a/apps/meteor/app/importer/server/classes/converters/UserConverter.ts +++ b/apps/meteor/app/importer/server/classes/converters/UserConverter.ts @@ -5,6 +5,7 @@ import { SHA256 } from '@rocket.chat/sha256'; import { hash as bcryptHash } from 'bcrypt'; import { Accounts } from 'meteor/accounts-base'; +import { RecordConverter, type RecordConverterOptions } from './RecordConverter'; import { callbacks as systemCallbacks } from '../../../../../lib/callbacks'; import { addUserToDefaultChannels } from '../../../../lib/server/functions/addUserToDefaultChannels'; import { generateUsernameSuggestion } from '../../../../lib/server/functions/getUsernameSuggestion'; @@ -12,7 +13,6 @@ import { saveUserIdentity } from '../../../../lib/server/functions/saveUserIdent import { setUserActiveStatus } from '../../../../lib/server/functions/setUserActiveStatus'; import { notifyOnUserChange } from '../../../../lib/server/lib/notifyListener'; import type { IConversionCallbacks } from '../../definitions/IConversionCallbacks'; -import { RecordConverter, type RecordConverterOptions } from './RecordConverter'; export type UserConverterOptions = { flagEmailsAsVerified?: boolean; diff --git a/apps/meteor/app/integrations/server/lib/validateOutgoingIntegration.ts b/apps/meteor/app/integrations/server/lib/validateOutgoingIntegration.ts index 398f8116127..e86b982d2cf 100644 --- a/apps/meteor/app/integrations/server/lib/validateOutgoingIntegration.ts +++ b/apps/meteor/app/integrations/server/lib/validateOutgoingIntegration.ts @@ -5,10 +5,10 @@ import { Babel } from 'meteor/babel-compiler'; import { Match } from 'meteor/check'; import { Meteor } from 'meteor/meteor'; +import { isScriptEngineFrozen } from './validateScriptEngine'; import { parseCSV } from '../../../../lib/utils/parseCSV'; import { hasPermissionAsync, hasAllPermissionAsync } from '../../../authorization/server/functions/hasPermission'; import { outgoingEvents } from '../../lib/outgoingEvents'; -import { isScriptEngineFrozen } from './validateScriptEngine'; const scopedChannels = ['all_public_channels', 'all_private_groups', 'all_direct_messages']; const validChannelChars = ['@', '#']; diff --git a/apps/meteor/app/integrations/server/triggers.ts b/apps/meteor/app/integrations/server/triggers.ts index 64b95827645..06fc9b0a9e1 100644 --- a/apps/meteor/app/integrations/server/triggers.ts +++ b/apps/meteor/app/integrations/server/triggers.ts @@ -1,6 +1,6 @@ +import { triggerHandler } from './lib/triggerHandler'; import { callbacks } from '../../../lib/callbacks'; import { afterLeaveRoomCallback } from '../../../lib/callbacks/afterLeaveRoomCallback'; -import { triggerHandler } from './lib/triggerHandler'; const callbackHandler = function _callbackHandler(eventType: string) { return function _wrapperFunction(...args: any[]) { diff --git a/apps/meteor/app/invites/server/functions/useInviteToken.ts b/apps/meteor/app/invites/server/functions/useInviteToken.ts index 21e89bd22fb..f514736da59 100644 --- a/apps/meteor/app/invites/server/functions/useInviteToken.ts +++ b/apps/meteor/app/invites/server/functions/useInviteToken.ts @@ -1,10 +1,10 @@ import { Invites, Subscriptions, Users } from '@rocket.chat/models'; import { Meteor } from 'meteor/meteor'; +import { validateInviteToken } from './validateInviteToken'; import { RoomMemberActions } from '../../../../definition/IRoomTypeConfig'; import { roomCoordinator } from '../../../../server/lib/rooms/roomCoordinator'; import { addUserToRoom } from '../../../lib/server/functions/addUserToRoom'; -import { validateInviteToken } from './validateInviteToken'; export const useInviteToken = async (userId: string, token: string) => { if (!userId) { diff --git a/apps/meteor/app/irc/server/irc.js b/apps/meteor/app/irc/server/irc.js index 2f6efcb99e4..7012e282913 100644 --- a/apps/meteor/app/irc/server/irc.js +++ b/apps/meteor/app/irc/server/irc.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '../../settings/server'; import Bridge from './irc-bridge'; +import { settings } from '../../settings/server'; if (!!settings.get('IRC_Enabled') === true) { // Normalize the config values diff --git a/apps/meteor/app/lib/server/functions/addUserToDefaultChannels.ts b/apps/meteor/app/lib/server/functions/addUserToDefaultChannels.ts index 3fb9c419aa5..f5317a7b0e3 100644 --- a/apps/meteor/app/lib/server/functions/addUserToDefaultChannels.ts +++ b/apps/meteor/app/lib/server/functions/addUserToDefaultChannels.ts @@ -2,11 +2,11 @@ import { Message } from '@rocket.chat/core-services'; import type { IUser } from '@rocket.chat/core-typings'; import { Subscriptions } from '@rocket.chat/models'; +import { getDefaultChannels } from './getDefaultChannels'; import { callbacks } from '../../../../lib/callbacks'; import { getSubscriptionAutotranslateDefaultConfig } from '../../../../server/lib/getSubscriptionAutotranslateDefaultConfig'; import { getDefaultSubscriptionPref } from '../../../utils/lib/getDefaultSubscriptionPref'; import { notifyOnSubscriptionChangedById } from '../lib/notifyListener'; -import { getDefaultChannels } from './getDefaultChannels'; export const addUserToDefaultChannels = async function (user: IUser, silenced?: boolean): Promise { await callbacks.run('beforeJoinDefaultChannels', user); diff --git a/apps/meteor/app/lib/server/functions/checkUsernameAvailability.ts b/apps/meteor/app/lib/server/functions/checkUsernameAvailability.ts index 316a3b8779a..498828444e4 100644 --- a/apps/meteor/app/lib/server/functions/checkUsernameAvailability.ts +++ b/apps/meteor/app/lib/server/functions/checkUsernameAvailability.ts @@ -4,8 +4,8 @@ import { escapeRegExp } from '@rocket.chat/string-helpers'; import { Meteor } from 'meteor/meteor'; import _ from 'underscore'; -import { settings } from '../../../settings/server'; import { validateName } from './validateName'; +import { settings } from '../../../settings/server'; let usernameBlackList: RegExp[] = []; diff --git a/apps/meteor/app/lib/server/functions/cleanRoomHistory.ts b/apps/meteor/app/lib/server/functions/cleanRoomHistory.ts index 765a03cad87..8fc449cdc61 100644 --- a/apps/meteor/app/lib/server/functions/cleanRoomHistory.ts +++ b/apps/meteor/app/lib/server/functions/cleanRoomHistory.ts @@ -2,10 +2,10 @@ import { api } from '@rocket.chat/core-services'; import type { IRoom } from '@rocket.chat/core-typings'; import { Messages, Rooms, Subscriptions, ReadReceipts, Users } from '@rocket.chat/models'; +import { deleteRoom } from './deleteRoom'; import { i18n } from '../../../../server/lib/i18n'; import { FileUpload } from '../../../file-upload/server'; import { notifyOnRoomChangedById, notifyOnSubscriptionChangedById } from '../lib/notifyListener'; -import { deleteRoom } from './deleteRoom'; export async function cleanRoomHistory({ rid = '', diff --git a/apps/meteor/app/lib/server/functions/createRoom.ts b/apps/meteor/app/lib/server/functions/createRoom.ts index 769155b66b6..fda2314d3f2 100644 --- a/apps/meteor/app/lib/server/functions/createRoom.ts +++ b/apps/meteor/app/lib/server/functions/createRoom.ts @@ -7,13 +7,13 @@ import type { ICreatedRoom, IUser, IRoom, RoomType } from '@rocket.chat/core-typ import { Rooms, Subscriptions, Users } from '@rocket.chat/models'; import { Meteor } from 'meteor/meteor'; +import { createDirectRoom } from './createDirectRoom'; import { callbacks } from '../../../../lib/callbacks'; import { beforeCreateRoomCallback } from '../../../../lib/callbacks/beforeCreateRoomCallback'; import { getSubscriptionAutotranslateDefaultConfig } from '../../../../server/lib/getSubscriptionAutotranslateDefaultConfig'; import { getDefaultSubscriptionPref } from '../../../utils/lib/getDefaultSubscriptionPref'; import { getValidRoomName } from '../../../utils/server/lib/getValidRoomName'; import { notifyOnRoomChanged, notifyOnSubscriptionChangedById } from '../lib/notifyListener'; -import { createDirectRoom } from './createDirectRoom'; const isValidName = (name: unknown): name is string => { return typeof name === 'string' && name.trim().length > 0; diff --git a/apps/meteor/app/lib/server/functions/deleteUser.ts b/apps/meteor/app/lib/server/functions/deleteUser.ts index 483085d4081..e0a217a0d39 100644 --- a/apps/meteor/app/lib/server/functions/deleteUser.ts +++ b/apps/meteor/app/lib/server/functions/deleteUser.ts @@ -16,6 +16,10 @@ import { } from '@rocket.chat/models'; import { Meteor } from 'meteor/meteor'; +import { getSubscribedRoomsForUserWithDetails, shouldRemoveOrChangeOwner } from './getRoomsWithSingleOwner'; +import { getUserSingleOwnedRooms } from './getUserSingleOwnedRooms'; +import { relinquishRoomOwnerships } from './relinquishRoomOwnerships'; +import { updateGroupDMsName } from './updateGroupDMsName'; import { callbacks } from '../../../../lib/callbacks'; import { i18n } from '../../../../server/lib/i18n'; import { FileUpload } from '../../../file-upload/server'; @@ -26,10 +30,6 @@ import { notifyOnLivechatDepartmentAgentChanged, notifyOnUserChange, } from '../lib/notifyListener'; -import { getSubscribedRoomsForUserWithDetails, shouldRemoveOrChangeOwner } from './getRoomsWithSingleOwner'; -import { getUserSingleOwnedRooms } from './getUserSingleOwnedRooms'; -import { relinquishRoomOwnerships } from './relinquishRoomOwnerships'; -import { updateGroupDMsName } from './updateGroupDMsName'; export async function deleteUser(userId: string, confirmRelinquish = false, deletedBy?: IUser['_id']): Promise { if (userId === 'rocket.cat') { diff --git a/apps/meteor/app/lib/server/functions/getRoomByNameOrIdWithOptionToJoin.ts b/apps/meteor/app/lib/server/functions/getRoomByNameOrIdWithOptionToJoin.ts index 113f8f59a55..1dd803f8b13 100644 --- a/apps/meteor/app/lib/server/functions/getRoomByNameOrIdWithOptionToJoin.ts +++ b/apps/meteor/app/lib/server/functions/getRoomByNameOrIdWithOptionToJoin.ts @@ -2,9 +2,9 @@ import type { IRoom, IUser, RoomType } from '@rocket.chat/core-typings'; import { Rooms, Users } from '@rocket.chat/models'; import { Meteor } from 'meteor/meteor'; +import { addUserToRoom } from './addUserToRoom'; import { isObject } from '../../../../lib/utils/isObject'; import { createDirectMessage } from '../../../../server/methods/createDirectMessage'; -import { addUserToRoom } from './addUserToRoom'; export const getRoomByNameOrIdWithOptionToJoin = async ({ user, diff --git a/apps/meteor/app/lib/server/functions/processWebhookMessage.ts b/apps/meteor/app/lib/server/functions/processWebhookMessage.ts index 2a4303a82dd..ae304b2af01 100644 --- a/apps/meteor/app/lib/server/functions/processWebhookMessage.ts +++ b/apps/meteor/app/lib/server/functions/processWebhookMessage.ts @@ -2,12 +2,12 @@ import type { IMessage, IUser, RequiredField, MessageAttachment } from '@rocket. import { Meteor } from 'meteor/meteor'; import _ from 'underscore'; +import { getRoomByNameOrIdWithOptionToJoin } from './getRoomByNameOrIdWithOptionToJoin'; +import { sendMessage } from './sendMessage'; import { ensureArray } from '../../../../lib/utils/arrayUtils'; import { trim } from '../../../../lib/utils/stringUtils'; import { SystemLogger } from '../../../../server/lib/logger/system'; import { validateRoomMessagePermissionsAsync } from '../../../authorization/server/functions/canSendMessage'; -import { getRoomByNameOrIdWithOptionToJoin } from './getRoomByNameOrIdWithOptionToJoin'; -import { sendMessage } from './sendMessage'; type Payload = { channel?: string | string[]; diff --git a/apps/meteor/app/lib/server/functions/relinquishRoomOwnerships.ts b/apps/meteor/app/lib/server/functions/relinquishRoomOwnerships.ts index 8f1981ca386..2d53b9b55c7 100644 --- a/apps/meteor/app/lib/server/functions/relinquishRoomOwnerships.ts +++ b/apps/meteor/app/lib/server/functions/relinquishRoomOwnerships.ts @@ -1,8 +1,8 @@ import { Messages, Roles, Rooms, Subscriptions, ReadReceipts } from '@rocket.chat/models'; +import type { SubscribedRoomsForUserWithDetails } from './getRoomsWithSingleOwner'; import { FileUpload } from '../../../file-upload/server'; import { notifyOnSubscriptionChanged } from '../lib/notifyListener'; -import type { SubscribedRoomsForUserWithDetails } from './getRoomsWithSingleOwner'; const bulkRoomCleanUp = async (rids: string[]): Promise => { // no bulk deletion for files diff --git a/apps/meteor/app/lib/server/functions/saveCustomFields.ts b/apps/meteor/app/lib/server/functions/saveCustomFields.ts index 0657ca4bbf2..a67304d5c5a 100644 --- a/apps/meteor/app/lib/server/functions/saveCustomFields.ts +++ b/apps/meteor/app/lib/server/functions/saveCustomFields.ts @@ -1,7 +1,7 @@ -import { trim } from '../../../../lib/utils/stringUtils'; -import { settings } from '../../../settings/server'; import { saveCustomFieldsWithoutValidation } from './saveCustomFieldsWithoutValidation'; import { validateCustomFields } from './validateCustomFields'; +import { trim } from '../../../../lib/utils/stringUtils'; +import { settings } from '../../../settings/server'; export const saveCustomFields = async function (userId: string, formData: Record): Promise { if (trim(settings.get('Accounts_CustomFields')) !== '') { diff --git a/apps/meteor/app/lib/server/functions/saveUser/saveUser.ts b/apps/meteor/app/lib/server/functions/saveUser/saveUser.ts index 047a417e94a..ce9624c6044 100644 --- a/apps/meteor/app/lib/server/functions/saveUser/saveUser.ts +++ b/apps/meteor/app/lib/server/functions/saveUser/saveUser.ts @@ -1,6 +1,6 @@ import { Apps, AppEvents } from '@rocket.chat/apps'; -import type { DeepWritable, DeepPartial } from '@rocket.chat/core-typings'; -import { isUserFederated, type IUser, type IRole, type IUserSettings, type RequiredField } from '@rocket.chat/core-typings'; +import { isUserFederated } from '@rocket.chat/core-typings'; +import type { DeepWritable, DeepPartial, IUser, IRole, IUserSettings, RequiredField } from '@rocket.chat/core-typings'; import { Users } from '@rocket.chat/models'; import { Accounts } from 'meteor/accounts-base'; import { Meteor } from 'meteor/meteor'; diff --git a/apps/meteor/app/lib/server/functions/saveUser/sendUserEmail.ts b/apps/meteor/app/lib/server/functions/saveUser/sendUserEmail.ts index babe985dbd4..cba836cdbf9 100644 --- a/apps/meteor/app/lib/server/functions/saveUser/sendUserEmail.ts +++ b/apps/meteor/app/lib/server/functions/saveUser/sendUserEmail.ts @@ -1,8 +1,8 @@ import { MeteorError } from '@rocket.chat/core-services'; +import type { SaveUserData } from './saveUser'; import * as Mailer from '../../../../mailer/server/api'; import { settings } from '../../../../settings/server'; -import type { SaveUserData } from './saveUser'; let html = ''; let passwordChangedHtml = ''; diff --git a/apps/meteor/app/lib/server/functions/saveUser/validateUserEditing.ts b/apps/meteor/app/lib/server/functions/saveUser/validateUserEditing.ts index 78b8910361c..fc151204fba 100644 --- a/apps/meteor/app/lib/server/functions/saveUser/validateUserEditing.ts +++ b/apps/meteor/app/lib/server/functions/saveUser/validateUserEditing.ts @@ -2,9 +2,9 @@ import { MeteorError } from '@rocket.chat/core-services'; import type { IUser, RequiredField } from '@rocket.chat/core-typings'; import { Users } from '@rocket.chat/models'; +import type { SaveUserData } from './saveUser'; import { hasPermissionAsync } from '../../../../authorization/server/functions/hasPermission'; import { settings } from '../../../../settings/server'; -import type { SaveUserData } from './saveUser'; const isEditingUserRoles = (previousRoles: IUser['roles'], newRoles?: IUser['roles']) => newRoles !== undefined && diff --git a/apps/meteor/app/lib/server/functions/saveUserIdentity.ts b/apps/meteor/app/lib/server/functions/saveUserIdentity.ts index 1729a1ba8ab..7a200a02972 100644 --- a/apps/meteor/app/lib/server/functions/saveUserIdentity.ts +++ b/apps/meteor/app/lib/server/functions/saveUserIdentity.ts @@ -1,6 +1,10 @@ import type { IUser } from '@rocket.chat/core-typings'; import { Messages, VideoConference, LivechatDepartmentAgents, Rooms, Subscriptions, Users } from '@rocket.chat/models'; +import { _setRealName } from './setRealName'; +import { _setUsername } from './setUsername'; +import { updateGroupDMsName } from './updateGroupDMsName'; +import { validateName } from './validateName'; import { SystemLogger } from '../../../../server/lib/logger/system'; import { FileUpload } from '../../../file-upload/server'; import { @@ -8,10 +12,6 @@ import { notifyOnSubscriptionChangedByUserId, notifyOnSubscriptionChangedByNameAndRoomType, } from '../lib/notifyListener'; -import { _setRealName } from './setRealName'; -import { _setUsername } from './setUsername'; -import { updateGroupDMsName } from './updateGroupDMsName'; -import { validateName } from './validateName'; /** * diff --git a/apps/meteor/app/lib/server/functions/sendMessage.ts b/apps/meteor/app/lib/server/functions/sendMessage.ts index aba5ddb7264..828de8451a2 100644 --- a/apps/meteor/app/lib/server/functions/sendMessage.ts +++ b/apps/meteor/app/lib/server/functions/sendMessage.ts @@ -4,6 +4,7 @@ import type { IMessage, IRoom } from '@rocket.chat/core-typings'; import { Messages } from '@rocket.chat/models'; import { Match, check } from 'meteor/check'; +import { parseUrlsInMessage } from './parseUrlsInMessage'; import { isRelativeURL } from '../../../../lib/utils/isRelativeURL'; import { isURL } from '../../../../lib/utils/isURL'; import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission'; @@ -12,7 +13,6 @@ import { settings } from '../../../settings/server'; import { afterSaveMessage } from '../lib/afterSaveMessage'; import { notifyOnRoomChangedById, notifyOnMessageChange } from '../lib/notifyListener'; import { validateCustomMessageFields } from '../lib/validateCustomMessageFields'; -import { parseUrlsInMessage } from './parseUrlsInMessage'; // TODO: most of the types here are wrong, but I don't want to change them now diff --git a/apps/meteor/app/lib/server/functions/setRoomAvatar.ts b/apps/meteor/app/lib/server/functions/setRoomAvatar.ts index 42fc615f09d..8a3467bdc4d 100644 --- a/apps/meteor/app/lib/server/functions/setRoomAvatar.ts +++ b/apps/meteor/app/lib/server/functions/setRoomAvatar.ts @@ -4,8 +4,8 @@ import { isRegisterUser } from '@rocket.chat/core-typings'; import { Avatars, Rooms } from '@rocket.chat/models'; import { Meteor } from 'meteor/meteor'; -import { FileUpload } from '../../../file-upload/server'; import { RocketChatFile } from '../../../file/server'; +import { FileUpload } from '../../../file-upload/server'; export const setRoomAvatar = async function (rid: string, dataURI: string, user: IUser): Promise { if (!isRegisterUser(user)) { diff --git a/apps/meteor/app/lib/server/functions/setUserActiveStatus.ts b/apps/meteor/app/lib/server/functions/setUserActiveStatus.ts index 929c24210d2..466a5862853 100644 --- a/apps/meteor/app/lib/server/functions/setUserActiveStatus.ts +++ b/apps/meteor/app/lib/server/functions/setUserActiveStatus.ts @@ -6,6 +6,10 @@ import { Accounts } from 'meteor/accounts-base'; import { check } from 'meteor/check'; import { Meteor } from 'meteor/meteor'; +import { closeOmnichannelConversations } from './closeOmnichannelConversations'; +import { shouldRemoveOrChangeOwner, getSubscribedRoomsForUserWithDetails } from './getRoomsWithSingleOwner'; +import { getUserSingleOwnedRooms } from './getUserSingleOwnedRooms'; +import { relinquishRoomOwnerships } from './relinquishRoomOwnerships'; import { callbacks } from '../../../../lib/callbacks'; import * as Mailer from '../../../mailer/server/api'; import { settings } from '../../../settings/server'; @@ -15,10 +19,6 @@ import { notifyOnSubscriptionChangedByNameAndRoomType, notifyOnUserChange, } from '../lib/notifyListener'; -import { closeOmnichannelConversations } from './closeOmnichannelConversations'; -import { shouldRemoveOrChangeOwner, getSubscribedRoomsForUserWithDetails } from './getRoomsWithSingleOwner'; -import { getUserSingleOwnedRooms } from './getUserSingleOwnedRooms'; -import { relinquishRoomOwnerships } from './relinquishRoomOwnerships'; async function reactivateDirectConversations(userId: string) { // since both users can be deactivated at the same time, we should just reactivate rooms if both users are active diff --git a/apps/meteor/app/lib/server/functions/setUserAvatar.ts b/apps/meteor/app/lib/server/functions/setUserAvatar.ts index 13ccd2de695..c678b8a07e2 100644 --- a/apps/meteor/app/lib/server/functions/setUserAvatar.ts +++ b/apps/meteor/app/lib/server/functions/setUserAvatar.ts @@ -5,12 +5,12 @@ import type { Response } from '@rocket.chat/server-fetch'; import { serverFetch as fetch } from '@rocket.chat/server-fetch'; import { Meteor } from 'meteor/meteor'; +import { checkUrlForSsrf } from './checkUrlForSsrf'; import { SystemLogger } from '../../../../server/lib/logger/system'; import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission'; -import { FileUpload } from '../../../file-upload/server'; import { RocketChatFile } from '../../../file/server'; +import { FileUpload } from '../../../file-upload/server'; import { settings } from '../../../settings/server'; -import { checkUrlForSsrf } from './checkUrlForSsrf'; export const setAvatarFromServiceWithValidation = async ( userId: string, diff --git a/apps/meteor/app/lib/server/functions/setUsername.ts b/apps/meteor/app/lib/server/functions/setUsername.ts index c4d2c47c6d9..57591d2ed2c 100644 --- a/apps/meteor/app/lib/server/functions/setUsername.ts +++ b/apps/meteor/app/lib/server/functions/setUsername.ts @@ -5,12 +5,9 @@ import { Accounts } from 'meteor/accounts-base'; import { Meteor } from 'meteor/meteor'; import _ from 'underscore'; -import { callbacks } from '../../../../lib/callbacks'; -import { SystemLogger } from '../../../../server/lib/logger/system'; import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission'; import { settings } from '../../../settings/server'; import { RateLimiter } from '../lib'; -import { notifyOnUserChange } from '../lib/notifyListener'; import { addUserToRoom } from './addUserToRoom'; import { checkUsernameAvailability } from './checkUsernameAvailability'; import { getAvatarSuggestionForUser } from './getAvatarSuggestionForUser'; @@ -18,6 +15,9 @@ import { joinDefaultChannels } from './joinDefaultChannels'; import { saveUserIdentity } from './saveUserIdentity'; import { setUserAvatar } from './setUserAvatar'; import { validateUsername } from './validateUsername'; +import { callbacks } from '../../../../lib/callbacks'; +import { SystemLogger } from '../../../../server/lib/logger/system'; +import { notifyOnUserChange } from '../lib/notifyListener'; export const setUsernameWithValidation = async (userId: string, username: string, joinDefaultChannelsSilenced?: boolean): Promise => { if (!username) { diff --git a/apps/meteor/app/lib/server/functions/updateMessage.ts b/apps/meteor/app/lib/server/functions/updateMessage.ts index 96683d40348..d480a21bd71 100644 --- a/apps/meteor/app/lib/server/functions/updateMessage.ts +++ b/apps/meteor/app/lib/server/functions/updateMessage.ts @@ -4,11 +4,11 @@ import type { IMessage, IUser, AtLeast } from '@rocket.chat/core-typings'; import { Messages, Rooms } from '@rocket.chat/models'; import { Meteor } from 'meteor/meteor'; +import { parseUrlsInMessage } from './parseUrlsInMessage'; import { settings } from '../../../settings/server'; import { afterSaveMessage } from '../lib/afterSaveMessage'; import { notifyOnRoomChangedById, notifyOnMessageChange } from '../lib/notifyListener'; import { validateCustomMessageFields } from '../lib/validateCustomMessageFields'; -import { parseUrlsInMessage } from './parseUrlsInMessage'; export const updateMessage = async function ( message: AtLeast, diff --git a/apps/meteor/app/lib/server/lib/interceptDirectReplyEmails.js b/apps/meteor/app/lib/server/lib/interceptDirectReplyEmails.js index 075dd055cad..77aaa03887c 100644 --- a/apps/meteor/app/lib/server/lib/interceptDirectReplyEmails.js +++ b/apps/meteor/app/lib/server/lib/interceptDirectReplyEmails.js @@ -1,9 +1,9 @@ import POP3Lib from '@rocket.chat/poplib'; import { simpleParser } from 'mailparser'; +import { processDirectEmail } from './processDirectEmail'; import { IMAPInterceptor } from '../../../../server/email/IMAPInterceptor'; import { settings } from '../../../settings/server'; -import { processDirectEmail } from './processDirectEmail'; export class DirectReplyIMAPInterceptor extends IMAPInterceptor { constructor(imapConfig, options = {}) { diff --git a/apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts b/apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts index e729b9652cb..ac8587c0717 100644 --- a/apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts +++ b/apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts @@ -4,14 +4,14 @@ import type { Updater } from '@rocket.chat/models'; import { Subscriptions, Rooms } from '@rocket.chat/models'; import moment from 'moment'; -import { callbacks } from '../../../../lib/callbacks'; -import { settings } from '../../../settings/server'; -import { messageContainsHighlight } from '../functions/notifications/messageContainsHighlight'; import { notifyOnSubscriptionChanged, notifyOnSubscriptionChangedByRoomIdAndUserId, notifyOnSubscriptionChangedByRoomIdAndUserIds, } from './notifyListener'; +import { callbacks } from '../../../../lib/callbacks'; +import { settings } from '../../../settings/server'; +import { messageContainsHighlight } from '../functions/notifications/messageContainsHighlight'; export async function getMentions(message: IMessage): Promise<{ toAll: boolean; toHere: boolean; mentionIds: string[] }> { const { diff --git a/apps/meteor/app/lib/server/lib/sendNotificationsOnMessage.ts b/apps/meteor/app/lib/server/lib/sendNotificationsOnMessage.ts index fe65ebe5a5d..25330d912aa 100644 --- a/apps/meteor/app/lib/server/lib/sendNotificationsOnMessage.ts +++ b/apps/meteor/app/lib/server/lib/sendNotificationsOnMessage.ts @@ -12,6 +12,7 @@ import emojione from 'emojione'; import moment from 'moment'; import type { RootFilterOperators } from 'mongodb'; +import { getMentions } from './notifyUsersOnMessage'; import { callbacks } from '../../../../lib/callbacks'; import { roomCoordinator } from '../../../../server/lib/rooms/roomCoordinator'; import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission'; @@ -22,7 +23,6 @@ import { notifyDesktopUser, shouldNotifyDesktop } from '../functions/notificatio import { getEmailData, shouldNotifyEmail } from '../functions/notifications/email'; import { messageContainsHighlight } from '../functions/notifications/messageContainsHighlight'; import { getPushData, shouldNotifyMobile } from '../functions/notifications/mobile'; -import { getMentions } from './notifyUsersOnMessage'; type SubscriptionAggregation = { receiver: [Pick | null]; diff --git a/apps/meteor/app/lib/server/lib/validateEmailDomain.js b/apps/meteor/app/lib/server/lib/validateEmailDomain.js index 3862dad83fe..898a3e6b894 100644 --- a/apps/meteor/app/lib/server/lib/validateEmailDomain.js +++ b/apps/meteor/app/lib/server/lib/validateEmailDomain.js @@ -3,9 +3,9 @@ import util from 'util'; import { Meteor } from 'meteor/meteor'; +import { emailDomainDefaultBlackList } from './defaultBlockedDomainsList'; import { validateEmail } from '../../../../lib/emailValidator'; import { settings } from '../../../settings/server'; -import { emailDomainDefaultBlackList } from './defaultBlockedDomainsList'; const dnsResolveMx = util.promisify(dns.resolveMx); diff --git a/apps/meteor/app/lib/server/methods/getChannelHistory.ts b/apps/meteor/app/lib/server/methods/getChannelHistory.ts index 5fcdc09e0ee..8fe5812dd62 100644 --- a/apps/meteor/app/lib/server/methods/getChannelHistory.ts +++ b/apps/meteor/app/lib/server/methods/getChannelHistory.ts @@ -3,7 +3,6 @@ import type { ServerMethods } from '@rocket.chat/ddp-client'; import { Messages, Subscriptions, Rooms } from '@rocket.chat/models'; import { check } from 'meteor/check'; import { Meteor } from 'meteor/meteor'; -import _ from 'underscore'; import { canAccessRoomAsync } from '../../../authorization/server'; import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission'; @@ -64,7 +63,8 @@ Meteor.methods({ } // Verify oldest is a date if it exists - if (oldest !== undefined && !_.isDate(oldest)) { + + if (oldest !== undefined && {}.toString.call(oldest) !== '[object Date]') { throw new Meteor.Error('error-invalid-date', 'Invalid date', { method: 'getChannelHistory' }); } diff --git a/apps/meteor/app/livechat/server/business-hour/BusinessHourManager.ts b/apps/meteor/app/livechat/server/business-hour/BusinessHourManager.ts index ec21ff2de06..0f125910b9a 100644 --- a/apps/meteor/app/livechat/server/business-hour/BusinessHourManager.ts +++ b/apps/meteor/app/livechat/server/business-hour/BusinessHourManager.ts @@ -4,12 +4,12 @@ import type { AgendaCronJobs } from '@rocket.chat/cron'; import { LivechatBusinessHours, LivechatDepartment, Users } from '@rocket.chat/models'; import moment from 'moment'; +import type { IBusinessHourBehavior, IBusinessHourType } from './AbstractBusinessHour'; +import { closeBusinessHour } from './closeBusinessHour'; import { callbacks } from '../../../../lib/callbacks'; import { notifyOnUserChange } from '../../../lib/server/lib/notifyListener'; import { settings } from '../../../settings/server'; import { businessHourLogger } from '../lib/logger'; -import type { IBusinessHourBehavior, IBusinessHourType } from './AbstractBusinessHour'; -import { closeBusinessHour } from './closeBusinessHour'; const CRON_EVERY_MIDNIGHT_EXPRESSION = '0 0 * * *'; const CRON_DAYLIGHT_JOB_NAME = 'livechat-business-hour-daylight-saving-time-verifier'; diff --git a/apps/meteor/app/livechat/server/business-hour/Helper.ts b/apps/meteor/app/livechat/server/business-hour/Helper.ts index e1930069166..2f535ad190a 100644 --- a/apps/meteor/app/livechat/server/business-hour/Helper.ts +++ b/apps/meteor/app/livechat/server/business-hour/Helper.ts @@ -3,10 +3,10 @@ import { ILivechatAgentStatus, LivechatBusinessHourTypes } from '@rocket.chat/co import { LivechatBusinessHours, Users } from '@rocket.chat/models'; import moment from 'moment'; -import { notifyOnUserChangeAsync } from '../../../lib/server/lib/notifyListener'; -import { businessHourLogger } from '../lib/logger'; import { createDefaultBusinessHourRow } from './LivechatBusinessHours'; import { filterBusinessHoursThatMustBeOpened } from './filterBusinessHoursThatMustBeOpened'; +import { notifyOnUserChangeAsync } from '../../../lib/server/lib/notifyListener'; +import { businessHourLogger } from '../lib/logger'; export { filterBusinessHoursThatMustBeOpened }; diff --git a/apps/meteor/app/livechat/server/business-hour/Single.ts b/apps/meteor/app/livechat/server/business-hour/Single.ts index ea8166c75fa..13a8673ad7f 100644 --- a/apps/meteor/app/livechat/server/business-hour/Single.ts +++ b/apps/meteor/app/livechat/server/business-hour/Single.ts @@ -1,11 +1,11 @@ import { ILivechatAgentStatus, LivechatBusinessHourTypes } from '@rocket.chat/core-typings'; import { LivechatBusinessHours, Users } from '@rocket.chat/models'; -import { notifyOnUserChange } from '../../../lib/server/lib/notifyListener'; -import { businessHourLogger } from '../lib/logger'; import type { IBusinessHourBehavior } from './AbstractBusinessHour'; import { AbstractBusinessHourBehavior } from './AbstractBusinessHour'; import { filterBusinessHoursThatMustBeOpened, makeAgentsUnavailableBasedOnBusinessHour, openBusinessHourDefault } from './Helper'; +import { notifyOnUserChange } from '../../../lib/server/lib/notifyListener'; +import { businessHourLogger } from '../lib/logger'; export class SingleBusinessHourBehavior extends AbstractBusinessHourBehavior implements IBusinessHourBehavior { async openBusinessHoursByDayAndHour(): Promise { diff --git a/apps/meteor/app/livechat/server/business-hour/closeBusinessHour.ts b/apps/meteor/app/livechat/server/business-hour/closeBusinessHour.ts index 976d8ec1705..c18784adb5e 100644 --- a/apps/meteor/app/livechat/server/business-hour/closeBusinessHour.ts +++ b/apps/meteor/app/livechat/server/business-hour/closeBusinessHour.ts @@ -2,9 +2,9 @@ import type { ILivechatBusinessHour, IUser } from '@rocket.chat/core-typings'; import { Users } from '@rocket.chat/models'; import { makeFunction } from '@rocket.chat/patch-injection'; -import { businessHourLogger } from '../lib/logger'; import { makeAgentsUnavailableBasedOnBusinessHour } from './Helper'; import { getAgentIdsForBusinessHour } from './getAgentIdsForBusinessHour'; +import { businessHourLogger } from '../lib/logger'; export const closeBusinessHourByAgentIds = async ( businessHourId: ILivechatBusinessHour['_id'], diff --git a/apps/meteor/app/livechat/server/business-hour/index.ts b/apps/meteor/app/livechat/server/business-hour/index.ts index 8b5f10b938f..8df93c5cbae 100644 --- a/apps/meteor/app/livechat/server/business-hour/index.ts +++ b/apps/meteor/app/livechat/server/business-hour/index.ts @@ -3,10 +3,10 @@ import { cronJobs } from '@rocket.chat/cron'; import { Accounts } from 'meteor/accounts-base'; import { Meteor } from 'meteor/meteor'; -import { callbacks } from '../../../../lib/callbacks'; import { BusinessHourManager } from './BusinessHourManager'; import { DefaultBusinessHour } from './Default'; import { SingleBusinessHourBehavior } from './Single'; +import { callbacks } from '../../../../lib/callbacks'; export const businessHourManager = new BusinessHourManager(cronJobs); diff --git a/apps/meteor/app/livechat/server/lib/Helper.ts b/apps/meteor/app/livechat/server/lib/Helper.ts index cf11c8d12b2..faa33a640fc 100644 --- a/apps/meteor/app/livechat/server/lib/Helper.ts +++ b/apps/meteor/app/livechat/server/lib/Helper.ts @@ -34,6 +34,10 @@ import { Match, check } from 'meteor/check'; import { Meteor } from 'meteor/meteor'; import { ObjectId } from 'mongodb'; +import { Livechat as LivechatTyped } from './LivechatTyped'; +import { queueInquiry, saveQueueInquiry } from './QueueManager'; +import { RoutingManager } from './RoutingManager'; +import { getOnlineAgents } from './getOnlineAgents'; import { callbacks } from '../../../../lib/callbacks'; import { validateEmail as validatorFunc } from '../../../../lib/emailValidator'; import { i18n } from '../../../../server/lib/i18n'; @@ -47,10 +51,6 @@ import { notifyOnSubscriptionChanged, } from '../../../lib/server/lib/notifyListener'; import { settings } from '../../../settings/server'; -import { Livechat as LivechatTyped } from './LivechatTyped'; -import { queueInquiry, saveQueueInquiry } from './QueueManager'; -import { RoutingManager } from './RoutingManager'; -import { getOnlineAgents } from './getOnlineAgents'; const logger = new Logger('LivechatHelper'); export const allowAgentSkipQueue = (agent: SelectedAgent) => { diff --git a/apps/meteor/app/livechat/server/lib/QueueManager.ts b/apps/meteor/app/livechat/server/lib/QueueManager.ts index a467b6e0b36..0a02b8b2535 100644 --- a/apps/meteor/app/livechat/server/lib/QueueManager.ts +++ b/apps/meteor/app/livechat/server/lib/QueueManager.ts @@ -1,12 +1,14 @@ import { Apps, AppEvents } from '@rocket.chat/apps'; import { Omnichannel } from '@rocket.chat/core-services'; -import type { ILivechatDepartment, IOmnichannelRoomInfo, IOmnichannelRoomExtraData } from '@rocket.chat/core-typings'; -import { - LivechatInquiryStatus, - type ILivechatInquiryRecord, - type ILivechatVisitor, - type IOmnichannelRoom, - type SelectedAgent, +import { LivechatInquiryStatus } from '@rocket.chat/core-typings'; +import type { + ILivechatDepartment, + IOmnichannelRoomInfo, + IOmnichannelRoomExtraData, + ILivechatInquiryRecord, + ILivechatVisitor, + IOmnichannelRoom, + SelectedAgent, } from '@rocket.chat/core-typings'; import { Logger } from '@rocket.chat/logger'; import { LivechatDepartment, LivechatDepartmentAgents, LivechatInquiry, LivechatRooms, Users } from '@rocket.chat/models'; @@ -14,6 +16,11 @@ import { Random } from '@rocket.chat/random'; import { Match, check } from 'meteor/check'; import { Meteor } from 'meteor/meteor'; +import { createLivechatRoom, createLivechatInquiry, allowAgentSkipQueue } from './Helper'; +import { Livechat } from './LivechatTyped'; +import { RoutingManager } from './RoutingManager'; +import { getOnlineAgents } from './getOnlineAgents'; +import { getInquirySortMechanismSetting } from './settings'; import { dispatchInquiryPosition } from '../../../../ee/app/livechat-enterprise/server/lib/Helper'; import { callbacks } from '../../../../lib/callbacks'; import { sendNotification } from '../../../lib/server'; @@ -24,11 +31,6 @@ import { } from '../../../lib/server/lib/notifyListener'; import { settings } from '../../../settings/server'; import { i18n } from '../../../utils/lib/i18n'; -import { createLivechatRoom, createLivechatInquiry, allowAgentSkipQueue } from './Helper'; -import { Livechat } from './LivechatTyped'; -import { RoutingManager } from './RoutingManager'; -import { getOnlineAgents } from './getOnlineAgents'; -import { getInquirySortMechanismSetting } from './settings'; const logger = new Logger('QueueManager'); diff --git a/apps/meteor/app/livechat/server/lib/RoutingManager.ts b/apps/meteor/app/livechat/server/lib/RoutingManager.ts index 8781f675ebf..123c56f4d31 100644 --- a/apps/meteor/app/livechat/server/lib/RoutingManager.ts +++ b/apps/meteor/app/livechat/server/lib/RoutingManager.ts @@ -17,9 +17,6 @@ import { LivechatInquiry, LivechatRooms, Subscriptions, Rooms, Users } from '@ro import { Match, check } from 'meteor/check'; import { Meteor } from 'meteor/meteor'; -import { callbacks } from '../../../../lib/callbacks'; -import { notifyOnLivechatInquiryChangedById, notifyOnLivechatInquiryChanged } from '../../../lib/server/lib/notifyListener'; -import { settings } from '../../../settings/server'; import { createLivechatSubscription, dispatchAgentDelegated, @@ -30,6 +27,9 @@ import { updateChatDepartment, allowAgentSkipQueue, } from './Helper'; +import { callbacks } from '../../../../lib/callbacks'; +import { notifyOnLivechatInquiryChangedById, notifyOnLivechatInquiryChanged } from '../../../lib/server/lib/notifyListener'; +import { settings } from '../../../settings/server'; const logger = new Logger('RoutingManager'); diff --git a/apps/meteor/app/livechat/server/lib/departmentsLib.ts b/apps/meteor/app/livechat/server/lib/departmentsLib.ts index fa66fdbfe57..76c70cba49b 100644 --- a/apps/meteor/app/livechat/server/lib/departmentsLib.ts +++ b/apps/meteor/app/livechat/server/lib/departmentsLib.ts @@ -2,14 +2,14 @@ import type { LivechatDepartmentDTO, ILivechatDepartment, ILivechatDepartmentAge import { LivechatDepartment, LivechatDepartmentAgents, LivechatVisitors, LivechatRooms } from '@rocket.chat/models'; import { Meteor } from 'meteor/meteor'; +import { updateDepartmentAgents } from './Helper'; +import { isDepartmentCreationAvailable } from './isDepartmentCreationAvailable'; +import { livechatLogger } from './logger'; import { callbacks } from '../../../../lib/callbacks'; import { notifyOnLivechatDepartmentAgentChangedByDepartmentId, notifyOnLivechatDepartmentAgentChanged, } from '../../../lib/server/lib/notifyListener'; -import { updateDepartmentAgents } from './Helper'; -import { isDepartmentCreationAvailable } from './isDepartmentCreationAvailable'; -import { livechatLogger } from './logger'; /** * @param {string|null} _id - The department id * @param {Partial} departmentData diff --git a/apps/meteor/app/livechat/server/lib/parseTranscriptRequest.ts b/apps/meteor/app/livechat/server/lib/parseTranscriptRequest.ts index 76595a7ff64..1a9b27b5015 100644 --- a/apps/meteor/app/livechat/server/lib/parseTranscriptRequest.ts +++ b/apps/meteor/app/livechat/server/lib/parseTranscriptRequest.ts @@ -1,8 +1,8 @@ import type { ILivechatVisitor, IOmnichannelRoom, IUser } from '@rocket.chat/core-typings'; import { LivechatVisitors, Users } from '@rocket.chat/models'; -import { settings } from '../../../settings/server'; import type { CloseRoomParams } from './localTypes'; +import { settings } from '../../../settings/server'; export const parseTranscriptRequest = async ( room: IOmnichannelRoom, diff --git a/apps/meteor/app/livechat/server/lib/tracking.ts b/apps/meteor/app/livechat/server/lib/tracking.ts index fb0e91a3366..bfbcf991221 100644 --- a/apps/meteor/app/livechat/server/lib/tracking.ts +++ b/apps/meteor/app/livechat/server/lib/tracking.ts @@ -1,8 +1,8 @@ import { Message } from '@rocket.chat/core-services'; import { Users } from '@rocket.chat/models'; -import { settings } from '../../../settings/server'; import { livechatLogger } from './logger'; +import { settings } from '../../../settings/server'; type PageInfo = { title: string; location: { href: string }; change: string }; diff --git a/apps/meteor/app/livechat/server/methods/sendFileLivechatMessage.ts b/apps/meteor/app/livechat/server/methods/sendFileLivechatMessage.ts index 0268207b2f6..ef12cf728c7 100644 --- a/apps/meteor/app/livechat/server/methods/sendFileLivechatMessage.ts +++ b/apps/meteor/app/livechat/server/methods/sendFileLivechatMessage.ts @@ -11,8 +11,8 @@ import { Random } from '@rocket.chat/random'; import { Match, check } from 'meteor/check'; import { Meteor } from 'meteor/meteor'; -import { FileUpload } from '../../../file-upload/server'; import { sendMessageLivechat } from './sendMessageLivechat'; +import { FileUpload } from '../../../file-upload/server'; interface ISendFileLivechatMessage { roomId: string; diff --git a/apps/meteor/app/livechat/server/roomAccessValidator.compatibility.ts b/apps/meteor/app/livechat/server/roomAccessValidator.compatibility.ts index d5ef8327255..d772b0cb7f2 100644 --- a/apps/meteor/app/livechat/server/roomAccessValidator.compatibility.ts +++ b/apps/meteor/app/livechat/server/roomAccessValidator.compatibility.ts @@ -1,9 +1,9 @@ import type { IUser, IOmnichannelRoom } from '@rocket.chat/core-typings'; import { LivechatDepartmentAgents, LivechatInquiry, LivechatRooms, LivechatDepartment } from '@rocket.chat/models'; +import { RoutingManager } from './lib/RoutingManager'; import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission'; import { hasRoleAsync } from '../../authorization/server/functions/hasRole'; -import { RoutingManager } from './lib/RoutingManager'; type OmnichannelRoomAccessValidator = ( room: IOmnichannelRoom, diff --git a/apps/meteor/app/livechat/server/sendMessageBySMS.ts b/apps/meteor/app/livechat/server/sendMessageBySMS.ts index c7f88646158..cd14bcaa885 100644 --- a/apps/meteor/app/livechat/server/sendMessageBySMS.ts +++ b/apps/meteor/app/livechat/server/sendMessageBySMS.ts @@ -2,10 +2,10 @@ import { OmnichannelIntegration } from '@rocket.chat/core-services'; import { isEditedMessage } from '@rocket.chat/core-typings'; import { LivechatVisitors } from '@rocket.chat/models'; +import { callbackLogger } from './lib/logger'; import { callbacks } from '../../../lib/callbacks'; import { settings } from '../../settings/server'; import { normalizeMessageFileUpload } from '../../utils/server/functions/normalizeMessageFileUpload'; -import { callbackLogger } from './lib/logger'; callbacks.add( 'afterOmnichannelSaveMessage', diff --git a/apps/meteor/app/livechat/server/startup.ts b/apps/meteor/app/livechat/server/startup.ts index e546e696756..5c02587f17e 100644 --- a/apps/meteor/app/livechat/server/startup.ts +++ b/apps/meteor/app/livechat/server/startup.ts @@ -5,6 +5,10 @@ import { LivechatRooms } from '@rocket.chat/models'; import { Accounts } from 'meteor/accounts-base'; import { Meteor } from 'meteor/meteor'; +import { businessHourManager } from './business-hour'; +import { createDefaultBusinessHourIfNotExists } from './business-hour/Helper'; +import { Livechat as LivechatTyped } from './lib/LivechatTyped'; +import { LivechatAgentActivityMonitor } from './statistics/LivechatAgentActivityMonitor'; import { callbacks } from '../../../lib/callbacks'; import { beforeLeaveRoomCallback } from '../../../lib/callbacks/beforeLeaveRoomCallback'; import { i18n } from '../../../server/lib/i18n'; @@ -12,10 +16,6 @@ import { roomCoordinator } from '../../../server/lib/rooms/roomCoordinator'; import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission'; import { notifyOnUserChange } from '../../lib/server/lib/notifyListener'; import { settings } from '../../settings/server'; -import { businessHourManager } from './business-hour'; -import { createDefaultBusinessHourIfNotExists } from './business-hour/Helper'; -import { Livechat as LivechatTyped } from './lib/LivechatTyped'; -import { LivechatAgentActivityMonitor } from './statistics/LivechatAgentActivityMonitor'; import './roomAccessValidator.internalService'; const logger = new Logger('LivechatStartup'); diff --git a/apps/meteor/app/mailer/server/api.ts b/apps/meteor/app/mailer/server/api.ts index a7577af5843..a32461d16a9 100644 --- a/apps/meteor/app/mailer/server/api.ts +++ b/apps/meteor/app/mailer/server/api.ts @@ -8,12 +8,12 @@ import { Meteor } from 'meteor/meteor'; import stripHtml from 'string-strip-html'; import _ from 'underscore'; +import { replaceVariables } from './replaceVariables'; import { validateEmail } from '../../../lib/emailValidator'; import { strLeft, strRightBack } from '../../../lib/utils/stringUtils'; import { i18n } from '../../../server/lib/i18n'; import { notifyOnSettingChanged } from '../../lib/server/lib/notifyListener'; import { settings } from '../../settings/server'; -import { replaceVariables } from './replaceVariables'; let contentHeader: string | undefined; let contentFooter: string | undefined; diff --git a/apps/meteor/app/markdown/lib/parser/original/code.js b/apps/meteor/app/markdown/lib/parser/original/code.js index 61059d24a06..2bb2ef603b9 100644 --- a/apps/meteor/app/markdown/lib/parser/original/code.js +++ b/apps/meteor/app/markdown/lib/parser/original/code.js @@ -4,8 +4,8 @@ */ import { unescapeHTML } from '@rocket.chat/string-helpers'; -import hljs, { register } from '../../hljs'; import { addAsToken } from './token'; +import hljs, { register } from '../../hljs'; const inlinecode = (message) => { // Support `text` diff --git a/apps/meteor/app/message-mark-as-unread/server/unreadMessages.ts b/apps/meteor/app/message-mark-as-unread/server/unreadMessages.ts index f213ae4b724..69a4444e839 100644 --- a/apps/meteor/app/message-mark-as-unread/server/unreadMessages.ts +++ b/apps/meteor/app/message-mark-as-unread/server/unreadMessages.ts @@ -3,8 +3,8 @@ import type { ServerMethods } from '@rocket.chat/ddp-client'; import { Messages, Subscriptions } from '@rocket.chat/models'; import { Meteor } from 'meteor/meteor'; -import { notifyOnSubscriptionChangedByRoomIdAndUserId } from '../../lib/server/lib/notifyListener'; import logger from './logger'; +import { notifyOnSubscriptionChangedByRoomIdAndUserId } from '../../lib/server/lib/notifyListener'; declare module '@rocket.chat/ddp-client' { // eslint-disable-next-line @typescript-eslint/naming-convention diff --git a/apps/meteor/app/meteor-accounts-saml/server/lib/SAML.ts b/apps/meteor/app/meteor-accounts-saml/server/lib/SAML.ts index 03642cab1ed..e3b12ca15aa 100644 --- a/apps/meteor/app/meteor-accounts-saml/server/lib/SAML.ts +++ b/apps/meteor/app/meteor-accounts-saml/server/lib/SAML.ts @@ -7,6 +7,8 @@ import { escapeRegExp, escapeHTML } from '@rocket.chat/string-helpers'; import { Accounts } from 'meteor/accounts-base'; import { Meteor } from 'meteor/meteor'; +import { SAMLServiceProvider } from './ServiceProvider'; +import { SAMLUtils } from './Utils'; import { ensureArray } from '../../../../lib/utils/arrayUtils'; import { SystemLogger } from '../../../../server/lib/logger/system'; import { addUserToRoom } from '../../../lib/server/functions/addUserToRoom'; @@ -18,8 +20,6 @@ import { i18n } from '../../../utils/lib/i18n'; import type { ISAMLAction } from '../definition/ISAMLAction'; import type { ISAMLUser } from '../definition/ISAMLUser'; import type { IServiceProviderOptions } from '../definition/IServiceProviderOptions'; -import { SAMLServiceProvider } from './ServiceProvider'; -import { SAMLUtils } from './Utils'; const showErrorMessage = function (res: ServerResponse, err: string): void { res.writeHead(200, { diff --git a/apps/meteor/app/meteor-accounts-saml/server/lib/ServiceProvider.ts b/apps/meteor/app/meteor-accounts-saml/server/lib/ServiceProvider.ts index bf3d2151ce0..0ffb5fe50fd 100644 --- a/apps/meteor/app/meteor-accounts-saml/server/lib/ServiceProvider.ts +++ b/apps/meteor/app/meteor-accounts-saml/server/lib/ServiceProvider.ts @@ -5,11 +5,11 @@ import zlib from 'zlib'; import { Meteor } from 'meteor/meteor'; +import { SAMLUtils } from './Utils'; import type { ILogoutResponse } from '../definition/ILogoutResponse'; import type { ISAMLRequest } from '../definition/ISAMLRequest'; import type { IServiceProviderOptions } from '../definition/IServiceProviderOptions'; import type { ILogoutRequestValidateCallback, ILogoutResponseValidateCallback, IResponseValidateCallback } from '../definition/callbacks'; -import { SAMLUtils } from './Utils'; import { AuthorizeRequest } from './generators/AuthorizeRequest'; import { LogoutRequest } from './generators/LogoutRequest'; import { LogoutResponse } from './generators/LogoutResponse'; diff --git a/apps/meteor/app/meteor-accounts-saml/server/lib/Utils.ts b/apps/meteor/app/meteor-accounts-saml/server/lib/Utils.ts index 984c7bc458a..c2e8e8b0005 100644 --- a/apps/meteor/app/meteor-accounts-saml/server/lib/Utils.ts +++ b/apps/meteor/app/meteor-accounts-saml/server/lib/Utils.ts @@ -3,12 +3,12 @@ import zlib from 'zlib'; import type { Logger } from '@rocket.chat/logger'; +import { StatusCode } from './constants'; import { ensureArray } from '../../../../lib/utils/arrayUtils'; import type { IUserDataMap, IAttributeMapping } from '../definition/IAttributeMapping'; import type { ISAMLGlobalSettings } from '../definition/ISAMLGlobalSettings'; import type { ISAMLUser } from '../definition/ISAMLUser'; import type { IServiceProviderOptions } from '../definition/IServiceProviderOptions'; -import { StatusCode } from './constants'; let providerList: Array = []; let debug = false; diff --git a/apps/meteor/app/meteor-accounts-saml/server/lib/settings.ts b/apps/meteor/app/meteor-accounts-saml/server/lib/settings.ts index 5c16716720b..f2b15c9af16 100644 --- a/apps/meteor/app/meteor-accounts-saml/server/lib/settings.ts +++ b/apps/meteor/app/meteor-accounts-saml/server/lib/settings.ts @@ -2,13 +2,6 @@ import type { SAMLConfiguration } from '@rocket.chat/core-typings'; import { LoginServiceConfiguration } from '@rocket.chat/models'; import { Meteor } from 'meteor/meteor'; -import { SystemLogger } from '../../../../server/lib/logger/system'; -import { - notifyOnLoginServiceConfigurationChanged, - notifyOnLoginServiceConfigurationChangedByService, -} from '../../../lib/server/lib/notifyListener'; -import { settings, settingsRegistry } from '../../../settings/server'; -import type { IServiceProviderOptions } from '../definition/IServiceProviderOptions'; import { SAMLUtils } from './Utils'; import { defaultAuthnContextTemplate, @@ -21,6 +14,13 @@ import { defaultMetadataTemplate, defaultMetadataCertificateTemplate, } from './constants'; +import { SystemLogger } from '../../../../server/lib/logger/system'; +import { + notifyOnLoginServiceConfigurationChanged, + notifyOnLoginServiceConfigurationChangedByService, +} from '../../../lib/server/lib/notifyListener'; +import { settings, settingsRegistry } from '../../../settings/server'; +import type { IServiceProviderOptions } from '../definition/IServiceProviderOptions'; const getSamlConfigs = function (service: string): SAMLConfiguration { const configs: SAMLConfiguration = { diff --git a/apps/meteor/app/meteor-accounts-saml/server/listener.ts b/apps/meteor/app/meteor-accounts-saml/server/listener.ts index 8dd44959768..92a0c520ab6 100644 --- a/apps/meteor/app/meteor-accounts-saml/server/listener.ts +++ b/apps/meteor/app/meteor-accounts-saml/server/listener.ts @@ -6,10 +6,10 @@ import { Meteor } from 'meteor/meteor'; import { RoutePolicy } from 'meteor/routepolicy'; import { WebApp } from 'meteor/webapp'; -import { SystemLogger } from '../../../server/lib/logger/system'; import type { ISAMLAction } from './definition/ISAMLAction'; import { SAML } from './lib/SAML'; import { SAMLUtils } from './lib/Utils'; +import { SystemLogger } from '../../../server/lib/logger/system'; RoutePolicy.declare('/_saml/', 'network'); diff --git a/apps/meteor/app/meteor-accounts-saml/server/loginHandler.ts b/apps/meteor/app/meteor-accounts-saml/server/loginHandler.ts index 4adbfc7e067..b95513fef03 100644 --- a/apps/meteor/app/meteor-accounts-saml/server/loginHandler.ts +++ b/apps/meteor/app/meteor-accounts-saml/server/loginHandler.ts @@ -1,10 +1,10 @@ import { Accounts } from 'meteor/accounts-base'; import { Meteor } from 'meteor/meteor'; -import { i18n } from '../../../server/lib/i18n'; -import { SystemLogger } from '../../../server/lib/logger/system'; import { SAML } from './lib/SAML'; import { SAMLUtils } from './lib/Utils'; +import { i18n } from '../../../server/lib/i18n'; +import { SystemLogger } from '../../../server/lib/logger/system'; const makeError = (message: string): Record => ({ type: 'saml', diff --git a/apps/meteor/app/meteor-accounts-saml/server/startup.ts b/apps/meteor/app/meteor-accounts-saml/server/startup.ts index 556ab7df13e..721edce08d4 100644 --- a/apps/meteor/app/meteor-accounts-saml/server/startup.ts +++ b/apps/meteor/app/meteor-accounts-saml/server/startup.ts @@ -2,9 +2,9 @@ import { Logger } from '@rocket.chat/logger'; import debounce from 'lodash.debounce'; import { Meteor } from 'meteor/meteor'; -import { settings } from '../../settings/server'; import { SAMLUtils } from './lib/Utils'; import { loadSamlServiceProviders, addSettings } from './lib/settings'; +import { settings } from '../../settings/server'; const logger = new Logger('steffo:meteor-accounts-saml'); SAMLUtils.setLoggerInstance(logger); diff --git a/apps/meteor/app/metrics/server/lib/collectMetrics.ts b/apps/meteor/app/metrics/server/lib/collectMetrics.ts index 8f2b256f675..a1ad41c9a95 100644 --- a/apps/meteor/app/metrics/server/lib/collectMetrics.ts +++ b/apps/meteor/app/metrics/server/lib/collectMetrics.ts @@ -10,12 +10,12 @@ import client from 'prom-client'; import gcStats from 'prometheus-gc-stats'; import _ from 'underscore'; +import { metrics } from './metrics'; import { SystemLogger } from '../../../../server/lib/logger/system'; import { getControl } from '../../../../server/lib/migrations'; import { settings } from '../../../settings/server'; import { getAppsStatistics } from '../../../statistics/server/lib/getAppsStatistics'; import { Info } from '../../../utils/rocketchat.info'; -import { metrics } from './metrics'; const { mongo } = MongoInternals.defaultRemoteCollectionDriver(); diff --git a/apps/meteor/app/models/client/models/CachedChatRoom.ts b/apps/meteor/app/models/client/models/CachedChatRoom.ts index 0ebf3e64bcd..784503a1b0a 100644 --- a/apps/meteor/app/models/client/models/CachedChatRoom.ts +++ b/apps/meteor/app/models/client/models/CachedChatRoom.ts @@ -1,8 +1,8 @@ import type { IOmnichannelRoom, IRoom, IRoomWithRetentionPolicy } from '@rocket.chat/core-typings'; import { DEFAULT_SLA_CONFIG, LivechatPriorityWeight } from '@rocket.chat/core-typings'; -import { CachedCollection } from '../../../../client/lib/cachedCollections/CachedCollection'; import { CachedChatSubscription } from './CachedChatSubscription'; +import { CachedCollection } from '../../../../client/lib/cachedCollections/CachedCollection'; class CachedChatRoom extends CachedCollection { constructor() { diff --git a/apps/meteor/app/models/client/models/CachedChatSubscription.ts b/apps/meteor/app/models/client/models/CachedChatSubscription.ts index 171d3f0edda..6ea6ea6917e 100644 --- a/apps/meteor/app/models/client/models/CachedChatSubscription.ts +++ b/apps/meteor/app/models/client/models/CachedChatSubscription.ts @@ -2,8 +2,8 @@ import type { IOmnichannelRoom, IRoomWithRetentionPolicy, ISubscription } from ' import { DEFAULT_SLA_CONFIG, LivechatPriorityWeight } from '@rocket.chat/core-typings'; import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts'; -import { CachedCollection } from '../../../../client/lib/cachedCollections/CachedCollection'; import { CachedChatRoom } from './CachedChatRoom'; +import { CachedCollection } from '../../../../client/lib/cachedCollections/CachedCollection'; declare module '@rocket.chat/core-typings' { interface ISubscription { diff --git a/apps/meteor/app/models/client/models/ChatSubscription.ts b/apps/meteor/app/models/client/models/ChatSubscription.ts index aa7892fe503..130861e7395 100644 --- a/apps/meteor/app/models/client/models/ChatSubscription.ts +++ b/apps/meteor/app/models/client/models/ChatSubscription.ts @@ -3,8 +3,8 @@ import mem from 'mem'; import { Meteor } from 'meteor/meteor'; import type { Filter } from 'mongodb'; -import { isTruthy } from '../../../../lib/isTruthy'; import { CachedChatSubscription } from './CachedChatSubscription'; +import { isTruthy } from '../../../../lib/isTruthy'; /** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */ export const ChatSubscription = Object.assign(CachedChatSubscription.collection, { diff --git a/apps/meteor/app/models/client/models/Roles.ts b/apps/meteor/app/models/client/models/Roles.ts index a048905cd2b..0c727e147a0 100644 --- a/apps/meteor/app/models/client/models/Roles.ts +++ b/apps/meteor/app/models/client/models/Roles.ts @@ -2,9 +2,9 @@ import type { IRole, IRoom, IUser } from '@rocket.chat/core-typings'; import { Mongo } from 'meteor/mongo'; import { ReactiveVar } from 'meteor/reactive-var'; -import type { MinimongoCollection } from '../../../../client/definitions/MinimongoCollection'; import { ChatSubscription } from './ChatSubscription'; import { Users } from './Users'; +import type { MinimongoCollection } from '../../../../client/definitions/MinimongoCollection'; class RolesCollection extends Mongo.Collection implements MinimongoCollection { ready = new ReactiveVar(false); diff --git a/apps/meteor/app/oauth2-server-config/server/admin/functions/addOAuthApp.ts b/apps/meteor/app/oauth2-server-config/server/admin/functions/addOAuthApp.ts index 8e828f5c11d..43bcd0ce14b 100644 --- a/apps/meteor/app/oauth2-server-config/server/admin/functions/addOAuthApp.ts +++ b/apps/meteor/app/oauth2-server-config/server/admin/functions/addOAuthApp.ts @@ -4,8 +4,8 @@ import { Random } from '@rocket.chat/random'; import type { OauthAppsAddParams } from '@rocket.chat/rest-typings'; import { Meteor } from 'meteor/meteor'; -import { hasPermissionAsync } from '../../../../authorization/server/functions/hasPermission'; import { parseUriList } from './parseUriList'; +import { hasPermissionAsync } from '../../../../authorization/server/functions/hasPermission'; export async function addOAuthApp(applicationParams: OauthAppsAddParams, uid: IUser['_id'] | undefined): Promise { if (!uid) { diff --git a/apps/meteor/app/otr/client/OTR.ts b/apps/meteor/app/otr/client/OTR.ts index 9f3eea15538..6237b73e254 100644 --- a/apps/meteor/app/otr/client/OTR.ts +++ b/apps/meteor/app/otr/client/OTR.ts @@ -1,7 +1,7 @@ import type { IRoom, IUser } from '@rocket.chat/core-typings'; -import type { IOTR } from '../lib/IOTR'; import { OTRRoom } from './OTRRoom'; +import type { IOTR } from '../lib/IOTR'; class OTR implements IOTR { private instancesByRoomId: { [rid: string]: OTRRoom }; diff --git a/apps/meteor/app/otr/lib/IOTR.ts b/apps/meteor/app/otr/lib/IOTR.ts index 9e7cd4ca6b8..c7aeb0a3777 100644 --- a/apps/meteor/app/otr/lib/IOTR.ts +++ b/apps/meteor/app/otr/lib/IOTR.ts @@ -1,7 +1,7 @@ import type { IMessage, IRoom, IUser } from '@rocket.chat/core-typings'; -import type { OTRRoom } from '../client/OTRRoom'; import type { OtrRoomState } from './OtrRoomState'; +import type { OTRRoom } from '../client/OTRRoom'; export interface IOnUserStreamData { roomId: IRoom['_id']; diff --git a/apps/meteor/app/push/server/push.ts b/apps/meteor/app/push/server/push.ts index 6c724b45282..77092051eee 100644 --- a/apps/meteor/app/push/server/push.ts +++ b/apps/meteor/app/push/server/push.ts @@ -7,12 +7,12 @@ import { JWT } from 'google-auth-library'; import { Match, check } from 'meteor/check'; import { Meteor } from 'meteor/meteor'; -import { settings } from '../../settings/server'; import { initAPN, sendAPN } from './apn'; import type { PushOptions, PendingPushNotification } from './definition'; import { sendFCM } from './fcm'; import { sendGCM } from './gcm'; import { logger } from './logger'; +import { settings } from '../../settings/server'; export const _matchToken = Match.OneOf({ apn: String }, { gcm: String }); diff --git a/apps/meteor/app/search/server/model/SearchProvider.ts b/apps/meteor/app/search/server/model/SearchProvider.ts index 89428e4a7dc..88388262b95 100644 --- a/apps/meteor/app/search/server/model/SearchProvider.ts +++ b/apps/meteor/app/search/server/model/SearchProvider.ts @@ -1,9 +1,9 @@ import type { IMessageSearchSuggestion, IRoom, IUser } from '@rocket.chat/core-typings'; import type { TranslationKey } from '@rocket.chat/ui-contexts'; -import { SearchLogger } from '../logger/logger'; import type { IRawSearchResult } from './ISearchResult'; import { Settings } from './Settings'; +import { SearchLogger } from '../logger/logger'; export abstract class SearchProvider { private _key: string; diff --git a/apps/meteor/app/search/server/search.internalService.ts b/apps/meteor/app/search/server/search.internalService.ts index 2fbaa2e1da3..bf4a0c484dd 100644 --- a/apps/meteor/app/search/server/search.internalService.ts +++ b/apps/meteor/app/search/server/search.internalService.ts @@ -1,9 +1,9 @@ import { api, ServiceClassInternal } from '@rocket.chat/core-services'; import { Users } from '@rocket.chat/models'; -import { settings } from '../../settings/server'; import { searchEventService } from './events'; import { searchProviderService } from './service'; +import { settings } from '../../settings/server'; class Search extends ServiceClassInternal { protected name = 'search'; diff --git a/apps/meteor/app/settings/server/SettingsRegistry.ts b/apps/meteor/app/settings/server/SettingsRegistry.ts index d7d2fa0a79f..ec9cf6b902f 100644 --- a/apps/meteor/app/settings/server/SettingsRegistry.ts +++ b/apps/meteor/app/settings/server/SettingsRegistry.ts @@ -4,12 +4,12 @@ import { Emitter } from '@rocket.chat/emitter'; import type { ISettingsModel } from '@rocket.chat/model-typings'; import { isEqual } from 'underscore'; -import { SystemLogger } from '../../../server/lib/logger/system'; import type { ICachedSettings } from './CachedSettings'; import { getSettingDefaults } from './functions/getSettingDefaults'; import { overrideSetting } from './functions/overrideSetting'; import { overwriteSetting } from './functions/overwriteSetting'; import { validateSetting } from './functions/validateSetting'; +import { SystemLogger } from '../../../server/lib/logger/system'; const blockedSettings = new Set(); const hiddenSettings = new Set(); diff --git a/apps/meteor/app/settings/server/applyMiddlewares.ts b/apps/meteor/app/settings/server/applyMiddlewares.ts index 93f6efc8a9b..d707757f0de 100644 --- a/apps/meteor/app/settings/server/applyMiddlewares.ts +++ b/apps/meteor/app/settings/server/applyMiddlewares.ts @@ -1,3 +1,4 @@ +/* eslint-disable react-hooks/rules-of-hooks */ import { use } from './Middleware'; import { settings } from './cached'; diff --git a/apps/meteor/app/settings/server/index.ts b/apps/meteor/app/settings/server/index.ts index c358a174d69..30a8c9fd6ba 100644 --- a/apps/meteor/app/settings/server/index.ts +++ b/apps/meteor/app/settings/server/index.ts @@ -1,3 +1,4 @@ +/* eslint-disable react-hooks/rules-of-hooks */ import { Settings } from '@rocket.chat/models'; import { use } from './Middleware'; diff --git a/apps/meteor/app/slackbridge/server/RocketAdapter.js b/apps/meteor/app/slackbridge/server/RocketAdapter.js index 8ba2a76dcbc..245e28c7220 100644 --- a/apps/meteor/app/slackbridge/server/RocketAdapter.js +++ b/apps/meteor/app/slackbridge/server/RocketAdapter.js @@ -6,13 +6,13 @@ import { Accounts } from 'meteor/accounts-base'; import { Meteor } from 'meteor/meteor'; import _ from 'underscore'; +import { rocketLogger } from './logger'; import { callbacks } from '../../../lib/callbacks'; import { sleep } from '../../../lib/utils/sleep'; import { createRoom } from '../../lib/server/functions/createRoom'; import { sendMessage } from '../../lib/server/functions/sendMessage'; import { setUserAvatar } from '../../lib/server/functions/setUserAvatar'; import { settings } from '../../settings/server'; -import { rocketLogger } from './logger'; export default class RocketAdapter { constructor(slackBridge) { diff --git a/apps/meteor/app/slackbridge/server/SlackAdapter.js b/apps/meteor/app/slackbridge/server/SlackAdapter.js index 31cbff69463..46a5ab6d35b 100644 --- a/apps/meteor/app/slackbridge/server/SlackAdapter.js +++ b/apps/meteor/app/slackbridge/server/SlackAdapter.js @@ -8,6 +8,8 @@ import { App as SlackApp } from '@slack/bolt'; import { RTMClient } from '@slack/rtm-api'; import { Meteor } from 'meteor/meteor'; +import { SlackAPI } from './SlackAPI'; +import { slackLogger } from './logger'; import { saveRoomName, saveRoomTopic } from '../../channel-settings/server'; import { FileUpload } from '../../file-upload/server'; import { addUserToRoom } from '../../lib/server/functions/addUserToRoom'; @@ -20,8 +22,6 @@ import { updateMessage } from '../../lib/server/functions/updateMessage'; import { executeSetReaction } from '../../reactions/server/setReaction'; import { settings } from '../../settings/server'; import { getUserAvatarURL } from '../../utils/server/getUserAvatarURL'; -import { SlackAPI } from './SlackAPI'; -import { slackLogger } from './logger'; export default class SlackAdapter { constructor(slackBridge) { diff --git a/apps/meteor/app/slackbridge/server/slackbridge.js b/apps/meteor/app/slackbridge/server/slackbridge.js index b5983e7fff5..89ff66a1339 100644 --- a/apps/meteor/app/slackbridge/server/slackbridge.js +++ b/apps/meteor/app/slackbridge/server/slackbridge.js @@ -1,9 +1,9 @@ import { debounce } from 'lodash'; -import { settings } from '../../settings/server'; import RocketAdapter from './RocketAdapter.js'; import SlackAdapter from './SlackAdapter.js'; import { classLogger, connLogger } from './logger'; +import { settings } from '../../settings/server'; /** * SlackBridge interfaces between this Rocket installation and a remote Slack installation. diff --git a/apps/meteor/app/slackbridge/server/slackbridge_import.server.js b/apps/meteor/app/slackbridge/server/slackbridge_import.server.js index 2cac64433cb..6e7117af976 100644 --- a/apps/meteor/app/slackbridge/server/slackbridge_import.server.js +++ b/apps/meteor/app/slackbridge/server/slackbridge_import.server.js @@ -2,10 +2,10 @@ import { Rooms, Users } from '@rocket.chat/models'; import { Random } from '@rocket.chat/random'; import { Match } from 'meteor/check'; +import { SlackBridge } from './slackbridge'; import { i18n } from '../../../server/lib/i18n'; import { msgStream } from '../../lib/server'; import { slashCommands } from '../../utils/server/slashCommand'; -import { SlackBridge } from './slackbridge'; async function SlackBridgeImport({ command, params, message, userId }) { if (command !== 'slackbridge-import' || !Match.test(params, String)) { diff --git a/apps/meteor/app/smarsh-connector/server/functions/generateEml.ts b/apps/meteor/app/smarsh-connector/server/functions/generateEml.ts index ce110cbff43..cf0b7deab5d 100644 --- a/apps/meteor/app/smarsh-connector/server/functions/generateEml.ts +++ b/apps/meteor/app/smarsh-connector/server/functions/generateEml.ts @@ -3,10 +3,10 @@ import { Meteor } from 'meteor/meteor'; import moment from 'moment'; import 'moment-timezone'; +import { sendEmail } from './sendEmail'; import { i18n } from '../../../../server/lib/i18n'; import { settings } from '../../../settings/server'; import { MessageTypes } from '../../../ui-utils/server'; -import { sendEmail } from './sendEmail'; const start = ''; diff --git a/apps/meteor/app/smarsh-connector/server/startup.ts b/apps/meteor/app/smarsh-connector/server/startup.ts index f757dea7510..edd4be45708 100644 --- a/apps/meteor/app/smarsh-connector/server/startup.ts +++ b/apps/meteor/app/smarsh-connector/server/startup.ts @@ -1,8 +1,8 @@ import { cronJobs } from '@rocket.chat/cron'; +import { generateEml } from './functions/generateEml'; import { smarshIntervalValuesToCronMap } from '../../../server/settings/smarsh'; import { settings } from '../../settings/server'; -import { generateEml } from './functions/generateEml'; const smarshJobName = 'Smarsh EML Connector'; diff --git a/apps/meteor/app/statistics/server/functions/otrStats.ts b/apps/meteor/app/statistics/server/functions/otrStats.ts index f936f8d213f..6553cae42c0 100644 --- a/apps/meteor/app/statistics/server/functions/otrStats.ts +++ b/apps/meteor/app/statistics/server/functions/otrStats.ts @@ -1,7 +1,7 @@ import { Rooms } from '@rocket.chat/models'; -import telemetryEvent from '../lib/telemetryEvents'; import { updateCounter } from './updateStatsCounter'; +import telemetryEvent from '../lib/telemetryEvents'; type otrDataType = { rid: string }; diff --git a/apps/meteor/app/statistics/server/functions/slashCommandsStats.ts b/apps/meteor/app/statistics/server/functions/slashCommandsStats.ts index 6d973a64c6b..5cb9e26d6d5 100644 --- a/apps/meteor/app/statistics/server/functions/slashCommandsStats.ts +++ b/apps/meteor/app/statistics/server/functions/slashCommandsStats.ts @@ -1,5 +1,5 @@ -import telemetryEvent from '../lib/telemetryEvents'; import { updateCounter } from './updateStatsCounter'; +import telemetryEvent from '../lib/telemetryEvents'; type slashCommandsDataType = { command: string }; diff --git a/apps/meteor/app/statistics/server/lib/SAUMonitor.ts b/apps/meteor/app/statistics/server/lib/SAUMonitor.ts index 0db63a92949..e1cdab7f077 100644 --- a/apps/meteor/app/statistics/server/lib/SAUMonitor.ts +++ b/apps/meteor/app/statistics/server/lib/SAUMonitor.ts @@ -6,11 +6,11 @@ import mem from 'mem'; import { Meteor } from 'meteor/meteor'; import UAParser from 'ua-parser-js'; +import { UAParserMobile, UAParserDesktop } from './UAParserCustom'; import { getMostImportantRole } from '../../../../lib/roles/getMostImportantRole'; import { getClientAddress } from '../../../../server/lib/getClientAddress'; import { aggregates } from '../../../../server/models/raw/Sessions'; import { sauEvents } from '../../../../server/services/sauMonitor/events'; -import { UAParserMobile, UAParserDesktop } from './UAParserCustom'; type DateObj = { day: number; month: number; year: number }; diff --git a/apps/meteor/app/statistics/server/lib/statistics.ts b/apps/meteor/app/statistics/server/lib/statistics.ts index 65b363cad12..25d93a6985c 100644 --- a/apps/meteor/app/statistics/server/lib/statistics.ts +++ b/apps/meteor/app/statistics/server/lib/statistics.ts @@ -29,6 +29,10 @@ import { import { MongoInternals } from 'meteor/mongo'; import moment from 'moment'; +import { getAppsStatistics } from './getAppsStatistics'; +import { getStatistics as getEnterpriseStatistics } from './getEEStatistics'; +import { getImporterStatistics } from './getImporterStatistics'; +import { getServicesStatistics } from './getServicesStatistics'; import { readSecondaryPreferred } from '../../../../server/database/readSecondaryPreferred'; import { isRunningMs } from '../../../../server/lib/isRunningMs'; import { getControl } from '../../../../server/lib/migrations'; @@ -38,10 +42,6 @@ import { getStatistics as federationGetStatistics } from '../../../federation/se import { settings } from '../../../settings/server'; import { Info } from '../../../utils/rocketchat.info'; import { getMongoInfo } from '../../../utils/server/functions/getMongoInfo'; -import { getAppsStatistics } from './getAppsStatistics'; -import { getStatistics as getEnterpriseStatistics } from './getEEStatistics'; -import { getImporterStatistics } from './getImporterStatistics'; -import { getServicesStatistics } from './getServicesStatistics'; const getUserLanguages = async (totalUsers: number): Promise<{ [key: string]: number }> => { const result = await Users.getUserLanguages(); diff --git a/apps/meteor/app/ui-master/server/index.ts b/apps/meteor/app/ui-master/server/index.ts index b4f15f211ab..7e095b80b5f 100644 --- a/apps/meteor/app/ui-master/server/index.ts +++ b/apps/meteor/app/ui-master/server/index.ts @@ -5,10 +5,10 @@ import { Meteor } from 'meteor/meteor'; import { Inject } from 'meteor/meteorhacks:inject-initial'; import { Tracker } from 'meteor/tracker'; +import { applyHeadInjections, headInjections, injectIntoBody, injectIntoHead } from './inject'; import { withDebouncing } from '../../../lib/utils/highOrderFunctions'; import { settings } from '../../settings/server'; import { getURL } from '../../utils/server/getURL'; -import { applyHeadInjections, headInjections, injectIntoBody, injectIntoHead } from './inject'; import './scripts'; diff --git a/apps/meteor/app/ui-master/server/scripts.ts b/apps/meteor/app/ui-master/server/scripts.ts index 3e84a6e39c9..85ebaa8ccba 100644 --- a/apps/meteor/app/ui-master/server/scripts.ts +++ b/apps/meteor/app/ui-master/server/scripts.ts @@ -1,5 +1,5 @@ -import { settings } from '../../settings/server'; import { addScript } from './inject'; +import { settings } from '../../settings/server'; const getContent = (): string => ` diff --git a/apps/meteor/app/ui-message/client/ActionManager.ts b/apps/meteor/app/ui-message/client/ActionManager.ts index 4c892d6d32f..91d635bee4d 100644 --- a/apps/meteor/app/ui-message/client/ActionManager.ts +++ b/apps/meteor/app/ui-message/client/ActionManager.ts @@ -7,12 +7,12 @@ import { t } from 'i18next'; import type { ContextType } from 'react'; import { lazy } from 'react'; +import { UiKitTriggerTimeoutError } from './UiKitTriggerTimeoutError'; import * as banners from '../../../client/lib/banners'; import { imperativeModal } from '../../../client/lib/imperativeModal'; import { dispatchToastMessage } from '../../../client/lib/toast'; import { exhaustiveCheck } from '../../../lib/utils/exhaustiveCheck'; import { sdk } from '../../utils/client/lib/SDKClient'; -import { UiKitTriggerTimeoutError } from './UiKitTriggerTimeoutError'; const UiKitModal = lazy(() => import('../../../client/views/modal/uikit/UiKitModal')); diff --git a/apps/meteor/app/ui-message/client/messageBox/createComposerAPI.ts b/apps/meteor/app/ui-message/client/messageBox/createComposerAPI.ts index 741f7959fa9..eab54850f3b 100644 --- a/apps/meteor/app/ui-message/client/messageBox/createComposerAPI.ts +++ b/apps/meteor/app/ui-message/client/messageBox/createComposerAPI.ts @@ -2,10 +2,10 @@ import type { IMessage } from '@rocket.chat/core-typings'; import { Emitter } from '@rocket.chat/emitter'; import { Accounts } from 'meteor/accounts-base'; -import type { ComposerAPI } from '../../../../client/lib/chats/ChatAPI'; -import { withDebouncing } from '../../../../lib/utils/highOrderFunctions'; import type { FormattingButton } from './messageBoxFormatting'; import { formattingButtons } from './messageBoxFormatting'; +import type { ComposerAPI } from '../../../../client/lib/chats/ChatAPI'; +import { withDebouncing } from '../../../../lib/utils/highOrderFunctions'; export const createComposerAPI = (input: HTMLTextAreaElement, storageID: string): ComposerAPI => { const triggerEvent = (input: HTMLTextAreaElement, evt: string): void => { diff --git a/apps/meteor/app/ui-message/client/messageBox/messageBoxFormatting.ts b/apps/meteor/app/ui-message/client/messageBox/messageBoxFormatting.ts index 84ca6dcc103..3c35d0fee30 100644 --- a/apps/meteor/app/ui-message/client/messageBox/messageBoxFormatting.ts +++ b/apps/meteor/app/ui-message/client/messageBox/messageBoxFormatting.ts @@ -1,10 +1,10 @@ import type { Keys as IconName } from '@rocket.chat/icons'; import type { TranslationKey } from '@rocket.chat/ui-contexts'; +import AddLinkComposerActionModal from './AddLinkComposerActionModal'; import type { ComposerAPI } from '../../../../client/lib/chats/ChatAPI'; import { imperativeModal } from '../../../../client/lib/imperativeModal'; import { settings } from '../../../settings/client'; -import AddLinkComposerActionModal from './AddLinkComposerActionModal'; type FormattingButtonDefault = { label: TranslationKey; condition?: () => boolean }; diff --git a/apps/meteor/app/ui-utils/client/lib/LegacyRoomManager.ts b/apps/meteor/app/ui-utils/client/lib/LegacyRoomManager.ts index 91b848ffefd..0a55da812dc 100644 --- a/apps/meteor/app/ui-utils/client/lib/LegacyRoomManager.ts +++ b/apps/meteor/app/ui-utils/client/lib/LegacyRoomManager.ts @@ -3,6 +3,8 @@ import type { Mongo } from 'meteor/mongo'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; +import { upsertMessage, RoomHistoryManager } from './RoomHistoryManager'; +import { mainReady } from './mainReady'; import { RoomManager } from '../../../../client/lib/RoomManager'; import { roomCoordinator } from '../../../../client/lib/rooms/roomCoordinator'; import { fireGlobalEvent } from '../../../../client/lib/utils/fireGlobalEvent'; @@ -10,8 +12,6 @@ import { getConfig } from '../../../../client/lib/utils/getConfig'; import { callbacks } from '../../../../lib/callbacks'; import { CachedChatRoom, ChatMessage, ChatSubscription, CachedChatSubscription } from '../../../models/client'; import { sdk } from '../../../utils/client/lib/SDKClient'; -import { upsertMessage, RoomHistoryManager } from './RoomHistoryManager'; -import { mainReady } from './mainReady'; const maxRoomsOpen = parseInt(getConfig('maxRoomsOpen') ?? '5') || 5; diff --git a/apps/meteor/app/ui-utils/client/lib/messageActionDefault.ts b/apps/meteor/app/ui-utils/client/lib/messageActionDefault.ts index ae2ff1cf80d..8137f4a3c0b 100644 --- a/apps/meteor/app/ui-utils/client/lib/messageActionDefault.ts +++ b/apps/meteor/app/ui-utils/client/lib/messageActionDefault.ts @@ -3,6 +3,7 @@ import { isE2EEMessage, isRoomFederated } from '@rocket.chat/core-typings'; import { Meteor } from 'meteor/meteor'; import moment from 'moment'; +import { MessageAction } from './MessageAction'; import { getPermaLink } from '../../../../client/lib/getPermaLink'; import { imperativeModal } from '../../../../client/lib/imperativeModal'; import { roomCoordinator } from '../../../../client/lib/rooms/roomCoordinator'; @@ -14,7 +15,6 @@ import ReportMessageModal from '../../../../client/views/room/modals/ReportMessa import { hasAtLeastOnePermission, hasPermission } from '../../../authorization/client'; import { ChatRoom, Subscriptions } from '../../../models/client'; import { t } from '../../../utils/lib/i18n'; -import { MessageAction } from './MessageAction'; const getMainMessageText = (message: IMessage): IMessage => { const newMessage = { ...message }; diff --git a/apps/meteor/app/ui/client/lib/ChatMessages.ts b/apps/meteor/app/ui/client/lib/ChatMessages.ts index 681d93aab82..f7fff0b2a2a 100644 --- a/apps/meteor/app/ui/client/lib/ChatMessages.ts +++ b/apps/meteor/app/ui/client/lib/ChatMessages.ts @@ -2,6 +2,7 @@ import type { IMessage, IRoom, IUser } from '@rocket.chat/core-typings'; import { isVideoConfMessage } from '@rocket.chat/core-typings'; import type { IActionManager } from '@rocket.chat/ui-contexts'; +import { UserAction } from './UserAction'; import type { ChatAPI, ComposerAPI, DataAPI, UploadsAPI } from '../../../../client/lib/chats/ChatAPI'; import { createDataAPI } from '../../../../client/lib/chats/data'; import { processMessageEditing } from '../../../../client/lib/chats/flows/processMessageEditing'; @@ -18,7 +19,6 @@ import { setHighlightMessage, clearHighlightMessage, } from '../../../../client/views/room/MessageList/providers/messageHighlightSubscription'; -import { UserAction } from './UserAction'; type DeepWritable = T extends (...args: any) => any ? T diff --git a/apps/meteor/app/ui/client/lib/recorderjs/AudioRecorder.ts b/apps/meteor/app/ui/client/lib/recorderjs/AudioRecorder.ts index 85a7853c1ec..d8bd8cbb323 100644 --- a/apps/meteor/app/ui/client/lib/recorderjs/AudioRecorder.ts +++ b/apps/meteor/app/ui/client/lib/recorderjs/AudioRecorder.ts @@ -1,5 +1,5 @@ -import { settings } from '../../../../settings/client'; import { AudioEncoder } from './AudioEncoder'; +import { settings } from '../../../../settings/client'; export class AudioRecorder { private audioContext: AudioContext | undefined; diff --git a/apps/meteor/app/utils/client/getRoomAvatarURL.ts b/apps/meteor/app/utils/client/getRoomAvatarURL.ts index 061f62107b4..8f7dd9dec53 100644 --- a/apps/meteor/app/utils/client/getRoomAvatarURL.ts +++ b/apps/meteor/app/utils/client/getRoomAvatarURL.ts @@ -1,7 +1,7 @@ import type { IRoom } from '@rocket.chat/core-typings'; -import { settings } from '../../settings/client'; import { getAvatarURL } from './getAvatarURL'; +import { settings } from '../../settings/client'; export const getRoomAvatarURL = ({ roomId, cache = '' }: { roomId: IRoom['_id']; cache: IRoom['avatarETag'] }) => { const externalSource = (settings.get('Accounts_RoomAvatarExternalProviderUrl') || '').trim().replace(/\/$/, ''); diff --git a/apps/meteor/app/utils/client/lib/RestApiClient.ts b/apps/meteor/app/utils/client/lib/RestApiClient.ts index 53c95ee3e4f..219c297406b 100644 --- a/apps/meteor/app/utils/client/lib/RestApiClient.ts +++ b/apps/meteor/app/utils/client/lib/RestApiClient.ts @@ -1,3 +1,4 @@ +/* eslint-disable react-hooks/rules-of-hooks */ import { RestClient } from '@rocket.chat/api-client'; import { Accounts } from 'meteor/accounts-base'; diff --git a/apps/meteor/app/version-check/server/index.ts b/apps/meteor/app/version-check/server/index.ts index 6736e527f3d..45e9c5197c3 100644 --- a/apps/meteor/app/version-check/server/index.ts +++ b/apps/meteor/app/version-check/server/index.ts @@ -1,8 +1,8 @@ import { cronJobs } from '@rocket.chat/cron'; import { Meteor } from 'meteor/meteor'; -import { settings } from '../../settings/server'; import { checkVersionUpdate } from './functions/checkVersionUpdate'; +import { settings } from '../../settings/server'; import './methods/banner_dismiss'; const jobName = 'version_check'; diff --git a/apps/meteor/app/webrtc/client/WebRTCClass.ts b/apps/meteor/app/webrtc/client/WebRTCClass.ts index 08bf68f5153..7cd90d05609 100644 --- a/apps/meteor/app/webrtc/client/WebRTCClass.ts +++ b/apps/meteor/app/webrtc/client/WebRTCClass.ts @@ -5,6 +5,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; +import { ChromeScreenShare } from './screenShare'; import GenericModal from '../../../client/components/GenericModal'; import { imperativeModal } from '../../../client/lib/imperativeModal'; import { goToRoomById } from '../../../client/lib/utils/goToRoomById'; @@ -13,7 +14,6 @@ import { settings } from '../../settings/client'; import { sdk } from '../../utils/client/lib/SDKClient'; import { t } from '../../utils/lib/i18n'; import { WEB_RTC_EVENTS } from '../lib/constants'; -import { ChromeScreenShare } from './screenShare'; // FIXME: there is a mix of obsolete definitions and incorrect field assignments diff --git a/apps/meteor/client/NavBarV2/NavBar.tsx b/apps/meteor/client/NavBarV2/NavBar.tsx index 7e61d53e5ef..cc2b005a929 100644 --- a/apps/meteor/client/NavBarV2/NavBar.tsx +++ b/apps/meteor/client/NavBarV2/NavBar.tsx @@ -4,10 +4,6 @@ import { usePermission, useTranslation, useUser } from '@rocket.chat/ui-contexts import { useVoipState } from '@rocket.chat/ui-voip'; import React, { useRef } from 'react'; -import { useIsCallEnabled, useIsCallReady } from '../contexts/CallContext'; -import { useOmnichannelEnabled } from '../hooks/omnichannel/useOmnichannelEnabled'; -import { useOmnichannelShowQueueLink } from '../hooks/omnichannel/useOmnichannelShowQueueLink'; -import { useHasLicenseModule } from '../hooks/useHasLicenseModule'; import { NavBarItemOmniChannelCallDialPad, NavBarItemOmnichannelContact, @@ -18,6 +14,10 @@ import { import { NavBarItemMarketPlaceMenu, NavBarItemAuditMenu, NavBarItemDirectoryPage, NavBarItemHomePage } from './NavBarPagesToolbar'; import { NavBarItemLoginPage, NavBarItemAdministrationMenu, UserMenu } from './NavBarSettingsToolbar'; import { NavBarItemVoipDialer } from './NavBarVoipToolbar'; +import { useIsCallEnabled, useIsCallReady } from '../contexts/CallContext'; +import { useOmnichannelEnabled } from '../hooks/omnichannel/useOmnichannelEnabled'; +import { useOmnichannelShowQueueLink } from '../hooks/omnichannel/useOmnichannelShowQueueLink'; +import { useHasLicenseModule } from '../hooks/useHasLicenseModule'; const NavBar = () => { const t = useTranslation(); diff --git a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggle.tsx b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggle.tsx index ce62cb51864..0df36e6e73c 100644 --- a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggle.tsx +++ b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggle.tsx @@ -1,10 +1,10 @@ import type { ComponentPropsWithoutRef } from 'react'; import React from 'react'; -import { useIsCallReady, useIsCallError } from '../../contexts/CallContext'; import NavBarItemOmnichannelCallToggleError from './NavBarItemOmnichannelCallToggleError'; import NavBarItemOmnichannelCallToggleLoading from './NavBarItemOmnichannelCallToggleLoading'; import NavBarItemOmnichannelCallToggleReady from './NavBarItemOmnichannelCallToggleReady'; +import { useIsCallReady, useIsCallError } from '../../contexts/CallContext'; type NavBarItemOmnichannelCallToggleProps = ComponentPropsWithoutRef< typeof NavBarItemOmnichannelCallToggleError | typeof NavBarItemOmnichannelCallToggleLoading | typeof NavBarItemOmnichannelCallToggleReady diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx index 1f012c520ad..910aa228902 100644 --- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx +++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx @@ -5,13 +5,13 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; import React, { useEffect } from 'react'; import { useTranslation } from 'react-i18next'; +import { useCustomStatusModalHandler } from './useCustomStatusModalHandler'; import { callbacks } from '../../../../../lib/callbacks'; import MarkdownText from '../../../../components/MarkdownText'; import { UserStatus } from '../../../../components/UserStatus'; import { userStatuses } from '../../../../lib/userStatuses'; import type { UserStatusDescriptor } from '../../../../lib/userStatuses'; import { useStatusDisabledModal } from '../../../../views/admin/customUserStatus/hooks/useStatusDisabledModal'; -import { useCustomStatusModalHandler } from './useCustomStatusModalHandler'; export const useStatusItems = (): GenericMenuItemProps[] => { // We should lift this up to somewhere else if we want to use it in other places diff --git a/apps/meteor/client/apps/gameCenter/GameCenter.tsx b/apps/meteor/client/apps/gameCenter/GameCenter.tsx index 3261d1e1c51..6eb5c6fdeb3 100644 --- a/apps/meteor/client/apps/gameCenter/GameCenter.tsx +++ b/apps/meteor/client/apps/gameCenter/GameCenter.tsx @@ -3,11 +3,11 @@ import { useMutableCallback } from '@rocket.chat/fuselage-hooks'; import React, { useState } from 'react'; import type { ReactElement } from 'react'; -import { preventSyntheticEvent } from '../../lib/utils/preventSyntheticEvent'; -import { useRoomToolbox } from '../../views/room/contexts/RoomToolboxContext'; import GameCenterContainer from './GameCenterContainer'; import GameCenterList from './GameCenterList'; import { useExternalComponentsQuery } from './hooks/useExternalComponentsQuery'; +import { preventSyntheticEvent } from '../../lib/utils/preventSyntheticEvent'; +import { useRoomToolbox } from '../../views/room/contexts/RoomToolboxContext'; export type IGame = IExternalComponent; diff --git a/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx b/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx index dbaea02ace4..69a73161ab1 100644 --- a/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx +++ b/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx @@ -3,6 +3,7 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import type { IGame } from './GameCenter'; import { ContextualbarTitle, ContextualbarHeader, @@ -10,7 +11,6 @@ import { ContextualbarContent, ContextualbarClose, } from '../../components/Contextualbar'; -import type { IGame } from './GameCenter'; interface IGameCenterContainerProps { handleClose: (e: any) => void; diff --git a/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx b/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx index 871e82f3ff5..5c20758cde3 100644 --- a/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx +++ b/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx @@ -4,12 +4,12 @@ import type { ReactElement } from 'react'; import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; +import type { IGame } from './GameCenter'; import GenericModal from '../../components/GenericModal'; import UserAutoCompleteMultipleFederated from '../../components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated'; import { useOpenedRoom } from '../../lib/RoomManager'; import { roomCoordinator } from '../../lib/rooms/roomCoordinator'; import { callWithErrorHandling } from '../../lib/utils/callWithErrorHandling'; -import type { IGame } from './GameCenter'; type Username = Exclude; diff --git a/apps/meteor/client/apps/gameCenter/GameCenterList.tsx b/apps/meteor/client/apps/gameCenter/GameCenterList.tsx index 9cee87204a1..03f57f0f1b6 100644 --- a/apps/meteor/client/apps/gameCenter/GameCenterList.tsx +++ b/apps/meteor/client/apps/gameCenter/GameCenterList.tsx @@ -4,10 +4,10 @@ import type { ReactElement } from 'react'; import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; -import { ContextualbarHeader, ContextualbarTitle, ContextualbarClose, ContextualbarContent } from '../../components/Contextualbar'; -import { FormSkeleton } from '../../components/Skeleton'; import type { IGame } from './GameCenter'; import GameCenterInvitePlayersModal from './GameCenterInvitePlayersModal'; +import { ContextualbarHeader, ContextualbarTitle, ContextualbarClose, ContextualbarContent } from '../../components/Contextualbar'; +import { FormSkeleton } from '../../components/Skeleton'; interface IGameCenterListProps { handleClose: (e: any) => void; diff --git a/apps/meteor/client/apps/orchestrator.ts b/apps/meteor/client/apps/orchestrator.ts index 86d4df829aa..aa0958b5447 100644 --- a/apps/meteor/client/apps/orchestrator.ts +++ b/apps/meteor/client/apps/orchestrator.ts @@ -4,12 +4,12 @@ import type { IPermission } from '@rocket.chat/apps-engine/definition/permission import type { ISetting } from '@rocket.chat/apps-engine/definition/settings'; import type { Serialized } from '@rocket.chat/core-typings'; +import type { IAppExternalURL, ICategory } from './@types/IOrchestrator'; +import { RealAppsEngineUIHost } from './RealAppsEngineUIHost'; import { hasAtLeastOnePermission } from '../../app/authorization/client'; import { sdk } from '../../app/utils/client/lib/SDKClient'; import { dispatchToastMessage } from '../lib/toast'; import type { App } from '../views/marketplace/types'; -import type { IAppExternalURL, ICategory } from './@types/IOrchestrator'; -import { RealAppsEngineUIHost } from './RealAppsEngineUIHost'; const isErrorObject = (e: unknown): e is { error: string } => typeof e === 'object' && e !== null && 'error' in e && typeof e.error === 'string'; diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx b/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx index 4e464027008..528b01e8854 100644 --- a/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx +++ b/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx @@ -5,9 +5,9 @@ import React, { useCallback, useRef } from 'react'; import type { AriaDialogProps } from 'react-aria'; import { FocusScope, useDialog } from 'react-aria'; -import { useRoomToolbox } from '../../views/room/contexts/RoomToolboxContext'; import Contextualbar from './Contextualbar'; import ContextualbarResizable from './ContextualbarResizable'; +import { useRoomToolbox } from '../../views/room/contexts/RoomToolboxContext'; type ContextualbarDialogProps = AriaDialogProps & ComponentProps; diff --git a/apps/meteor/client/components/GazzodownText.tsx b/apps/meteor/client/components/GazzodownText.tsx index abee977b9ba..05c6788062a 100644 --- a/apps/meteor/client/components/GazzodownText.tsx +++ b/apps/meteor/client/components/GazzodownText.tsx @@ -10,9 +10,9 @@ import React, { useCallback, memo, useMemo } from 'react'; import { detectEmoji } from '../lib/utils/detectEmoji'; import { fireGlobalEvent } from '../lib/utils/fireGlobalEvent'; +import { useMessageListHighlights } from './message/list/MessageListContext'; import { useUserCard } from '../views/room/contexts/UserCardContext'; import { useGoToRoom } from '../views/room/hooks/useGoToRoom'; -import { useMessageListHighlights } from './message/list/MessageListContext'; type GazzodownTextProps = { children: JSX.Element; diff --git a/apps/meteor/client/components/GenericModal/GenericModal.spec.tsx b/apps/meteor/client/components/GenericModal/GenericModal.spec.tsx index b47b6abf7b0..aa220edcc65 100644 --- a/apps/meteor/client/components/GenericModal/GenericModal.spec.tsx +++ b/apps/meteor/client/components/GenericModal/GenericModal.spec.tsx @@ -4,8 +4,8 @@ import userEvent from '@testing-library/user-event'; import type { ReactElement } from 'react'; import React, { Suspense } from 'react'; -import ModalProviderWithRegion from '../../providers/ModalProvider/ModalProviderWithRegion'; import GenericModal from './GenericModal'; +import ModalProviderWithRegion from '../../providers/ModalProvider/ModalProviderWithRegion'; const renderModal = (modalElement: ReactElement) => { const { diff --git a/apps/meteor/client/components/GenericTable/GenericTable.tsx b/apps/meteor/client/components/GenericTable/GenericTable.tsx index 05173fbe700..dcefd8de12d 100644 --- a/apps/meteor/client/components/GenericTable/GenericTable.tsx +++ b/apps/meteor/client/components/GenericTable/GenericTable.tsx @@ -1,6 +1,6 @@ import { Box, Table } from '@rocket.chat/fuselage'; -import type { ComponentProps } from 'react'; -import React, { type ForwardedRef, type ReactNode, forwardRef } from 'react'; +import type { ComponentProps, ForwardedRef, ReactNode } from 'react'; +import React, { forwardRef } from 'react'; import { CustomScrollbars } from '../CustomScrollbars'; diff --git a/apps/meteor/client/components/InfoPanel/InfoPanel.stories.tsx b/apps/meteor/client/components/InfoPanel/InfoPanel.stories.tsx index 5727c355cc0..d40884e60ba 100644 --- a/apps/meteor/client/components/InfoPanel/InfoPanel.stories.tsx +++ b/apps/meteor/client/components/InfoPanel/InfoPanel.stories.tsx @@ -13,8 +13,8 @@ import { InfoPanelText, InfoPanelTitle, } from '.'; -import { createFakeRoom } from '../../../tests/mocks/data'; import RetentionPolicyCallout from './RetentionPolicyCallout'; +import { createFakeRoom } from '../../../tests/mocks/data'; export default { title: 'Info Panel/InfoPanel', diff --git a/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.spec.tsx b/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.spec.tsx index a9305b5f1f1..332c70f26dd 100644 --- a/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.spec.tsx +++ b/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.spec.tsx @@ -1,9 +1,9 @@ import { render, screen } from '@testing-library/react'; import React from 'react'; +import RetentionPolicyCallout from './RetentionPolicyCallout'; import { createRenteionPolicySettingsMock as createMock } from '../../../tests/mocks/client/mockRetentionPolicySettings'; import { createFakeRoom } from '../../../tests/mocks/data'; -import RetentionPolicyCallout from './RetentionPolicyCallout'; jest.useFakeTimers(); diff --git a/apps/meteor/client/components/Omnichannel/Tags.tsx b/apps/meteor/client/components/Omnichannel/Tags.tsx index 7c9e51d220f..d96c560b9e5 100644 --- a/apps/meteor/client/components/Omnichannel/Tags.tsx +++ b/apps/meteor/client/components/Omnichannel/Tags.tsx @@ -5,9 +5,9 @@ import type { ChangeEvent, ReactElement } from 'react'; import React, { useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { CurrentChatTags } from '../../views/omnichannel/additionalForms'; import { FormSkeleton } from './Skeleton'; import { useLivechatTags } from './hooks/useLivechatTags'; +import { CurrentChatTags } from '../../views/omnichannel/additionalForms'; type TagsProps = { tags?: string[]; diff --git a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelAppSourceRoomIcon.tsx b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelAppSourceRoomIcon.tsx index 6a841c30491..b6cc9400700 100644 --- a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelAppSourceRoomIcon.tsx +++ b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelAppSourceRoomIcon.tsx @@ -3,8 +3,8 @@ import { Icon, Box } from '@rocket.chat/fuselage'; import type { ComponentProps } from 'react'; import React from 'react'; -import { AsyncStatePhase } from '../../../lib/asyncState/AsyncStatePhase'; import { useOmnichannelRoomIcon } from './context/OmnichannelRoomIconContext'; +import { AsyncStatePhase } from '../../../lib/asyncState/AsyncStatePhase'; type OmnichannelAppSourceRoomIconProps = { source: IOmnichannelSourceFromApp; diff --git a/apps/meteor/client/components/RoomIcon/RoomIcon.tsx b/apps/meteor/client/components/RoomIcon/RoomIcon.tsx index d757071fedf..12f4a13d1f3 100644 --- a/apps/meteor/client/components/RoomIcon/RoomIcon.tsx +++ b/apps/meteor/client/components/RoomIcon/RoomIcon.tsx @@ -4,8 +4,8 @@ import { Icon } from '@rocket.chat/fuselage'; import type { ComponentProps, ReactElement } from 'react'; import React, { isValidElement } from 'react'; -import { useRoomIcon } from '../../hooks/useRoomIcon'; import { OmnichannelRoomIcon } from './OmnichannelRoomIcon'; +import { useRoomIcon } from '../../hooks/useRoomIcon'; export const RoomIcon = ({ room, diff --git a/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx b/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx index b588e223d92..8507ff950dc 100644 --- a/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx +++ b/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx @@ -2,9 +2,9 @@ import { Divider } from '@rocket.chat/fuselage'; import React, { Fragment, memo } from 'react'; import { useTranslation } from 'react-i18next'; +import SidebarNavigationItem from './SidebarNavigationItem'; import type { SidebarItem } from '../../lib/createSidebarItems'; import { isSidebarItem } from '../../lib/createSidebarItems'; -import SidebarNavigationItem from './SidebarNavigationItem'; type SidebarItemsAssemblerProps = { items: SidebarItem[]; diff --git a/apps/meteor/client/components/SidebarToggler/SidebarToggler.tsx b/apps/meteor/client/components/SidebarToggler/SidebarToggler.tsx index 2102621a35d..1cdb993d433 100644 --- a/apps/meteor/client/components/SidebarToggler/SidebarToggler.tsx +++ b/apps/meteor/client/components/SidebarToggler/SidebarToggler.tsx @@ -3,8 +3,8 @@ import { useLayout, useSession } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React, { memo } from 'react'; -import { useEmbeddedLayout } from '../../hooks/useEmbeddedLayout'; import SidebarTogglerButton from './SidebarTogglerButton'; +import { useEmbeddedLayout } from '../../hooks/useEmbeddedLayout'; const SideBarToggler = (): ReactElement => { const { sidebar } = useLayout(); diff --git a/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx b/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx index 823fcabd57c..95659d762d3 100644 --- a/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx +++ b/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx @@ -7,11 +7,11 @@ import type { ReactElement, ChangeEvent } from 'react'; import React, { useState, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; -import { useSingleFileInput } from '../../../hooks/useSingleFileInput'; -import { isValidImageFormat } from '../../../lib/utils/isValidImageFormat'; import type { UserAvatarSuggestion } from './UserAvatarSuggestion'; import UserAvatarSuggestions from './UserAvatarSuggestions'; import { readFileAsDataURL } from './readFileAsDataURL'; +import { useSingleFileInput } from '../../../hooks/useSingleFileInput'; +import { isValidImageFormat } from '../../../lib/utils/isValidImageFormat'; type UserAvatarEditorProps = { currentUsername: IUser['username']; diff --git a/apps/meteor/client/components/dataView/Growth.stories.tsx b/apps/meteor/client/components/dataView/Growth.stories.tsx index 11092d52f99..28f52cd01f3 100644 --- a/apps/meteor/client/components/dataView/Growth.stories.tsx +++ b/apps/meteor/client/components/dataView/Growth.stories.tsx @@ -2,8 +2,8 @@ import { Box } from '@rocket.chat/fuselage'; import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; -import { useAutoSequence } from '../../stories/hooks/useAutoSequence'; import Growth from './Growth'; +import { useAutoSequence } from '../../stories/hooks/useAutoSequence'; export default { title: 'Components/Data/Growth', diff --git a/apps/meteor/client/components/dataView/NegativeGrowthSymbol.stories.tsx b/apps/meteor/client/components/dataView/NegativeGrowthSymbol.stories.tsx index 9c5ca3f4d44..19be0dde4af 100644 --- a/apps/meteor/client/components/dataView/NegativeGrowthSymbol.stories.tsx +++ b/apps/meteor/client/components/dataView/NegativeGrowthSymbol.stories.tsx @@ -2,8 +2,8 @@ import { Box } from '@rocket.chat/fuselage'; import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; -import { useAutoSequence } from '../../stories/hooks/useAutoSequence'; import NegativeGrowthSymbol from './NegativeGrowthSymbol'; +import { useAutoSequence } from '../../stories/hooks/useAutoSequence'; export default { title: 'Components/Data/NegativeGrowthSymbol', diff --git a/apps/meteor/client/components/dataView/PositiveGrowthSymbol.stories.tsx b/apps/meteor/client/components/dataView/PositiveGrowthSymbol.stories.tsx index 8f08dfee9c0..603c97edf78 100644 --- a/apps/meteor/client/components/dataView/PositiveGrowthSymbol.stories.tsx +++ b/apps/meteor/client/components/dataView/PositiveGrowthSymbol.stories.tsx @@ -2,8 +2,8 @@ import { Box } from '@rocket.chat/fuselage'; import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; -import { useAutoSequence } from '../../stories/hooks/useAutoSequence'; import PositiveGrowthSymbol from './PositiveGrowthSymbol'; +import { useAutoSequence } from '../../stories/hooks/useAutoSequence'; export default { title: 'Components/Data/PositiveGrowthSymbol', diff --git a/apps/meteor/client/components/message/MessageHeader.tsx b/apps/meteor/client/components/message/MessageHeader.tsx index 21a4d8484f8..e2d7fb6f266 100644 --- a/apps/meteor/client/components/message/MessageHeader.tsx +++ b/apps/meteor/client/components/message/MessageHeader.tsx @@ -11,16 +11,16 @@ import type { KeyboardEvent, ReactElement } from 'react'; import React, { memo } from 'react'; import { useTranslation } from 'react-i18next'; +import StatusIndicators from './StatusIndicators'; +import MessageRoles from './header/MessageRoles'; +import { useMessageListShowUsername, useMessageListShowRealName, useMessageListShowRoles } from './list/MessageListContext'; import { getUserDisplayName } from '../../../lib/getUserDisplayName'; import { useFormatDateAndTime } from '../../hooks/useFormatDateAndTime'; import { useFormatTime } from '../../hooks/useFormatTime'; import { useUserData } from '../../hooks/useUserData'; import type { UserPresence } from '../../lib/presence'; -import { useUserCard } from '../../views/room/contexts/UserCardContext'; -import StatusIndicators from './StatusIndicators'; -import MessageRoles from './header/MessageRoles'; import { useMessageRoles } from './header/hooks/useMessageRoles'; -import { useMessageListShowUsername, useMessageListShowRealName, useMessageListShowRoles } from './list/MessageListContext'; +import { useUserCard } from '../../views/room/contexts/UserCardContext'; type MessageHeaderProps = { message: IMessage; diff --git a/apps/meteor/client/components/message/content/MessageActions.tsx b/apps/meteor/client/components/message/content/MessageActions.tsx index d38fbb6c64d..3700067a727 100644 --- a/apps/meteor/client/components/message/content/MessageActions.tsx +++ b/apps/meteor/client/components/message/content/MessageActions.tsx @@ -6,8 +6,8 @@ import type { TranslationKey } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; -import { actionLinks } from '../../../lib/actionLinks'; import MessageAction from './actions/MessageAction'; +import { actionLinks } from '../../../lib/actionLinks'; type MessageActionOptions = { icon: IconName; diff --git a/apps/meteor/client/components/message/content/attachments/DefaultAttachment.tsx b/apps/meteor/client/components/message/content/attachments/DefaultAttachment.tsx index c3f0fdcbf26..0bb6fb37da1 100644 --- a/apps/meteor/client/components/message/content/attachments/DefaultAttachment.tsx +++ b/apps/meteor/client/components/message/content/attachments/DefaultAttachment.tsx @@ -3,8 +3,6 @@ import { isActionAttachment } from '@rocket.chat/core-typings'; import type { ReactNode, ComponentProps, ReactElement } from 'react'; import React from 'react'; -import MarkdownText from '../../../MarkdownText'; -import { useCollapse } from '../../hooks/useCollapse'; import { ActionAttachment } from './default/ActionAttachtment'; import FieldsAttachment from './default/FieldsAttachment'; import AttachmentAuthor from './structure/AttachmentAuthor'; @@ -17,6 +15,8 @@ import AttachmentRow from './structure/AttachmentRow'; import AttachmentText from './structure/AttachmentText'; import AttachmentThumb from './structure/AttachmentThumb'; import AttachmentTitle from './structure/AttachmentTitle'; +import MarkdownText from '../../../MarkdownText'; +import { useCollapse } from '../../hooks/useCollapse'; const applyMarkdownIfRequires = ( list: MessageAttachmentDefault['mrkdwn_in'] = ['text', 'pretext'], diff --git a/apps/meteor/client/components/message/content/attachments/default/ActionAttachtment.tsx b/apps/meteor/client/components/message/content/attachments/default/ActionAttachtment.tsx index 2ecd19598b3..1ca98ca3d9b 100644 --- a/apps/meteor/client/components/message/content/attachments/default/ActionAttachtment.tsx +++ b/apps/meteor/client/components/message/content/attachments/default/ActionAttachtment.tsx @@ -2,8 +2,8 @@ import type { MessageAttachmentAction } from '@rocket.chat/core-typings'; import { Box, Button, ButtonGroup } from '@rocket.chat/fuselage'; import React from 'react'; -import { useExternalLink } from '../../../../../hooks/useExternalLink'; import ActionAttachmentButton from './ActionAttachmentButton'; +import { useExternalLink } from '../../../../../hooks/useExternalLink'; type ActionAttachmentProps = MessageAttachmentAction; diff --git a/apps/meteor/client/components/message/content/attachments/default/FieldsAttachment.tsx b/apps/meteor/client/components/message/content/attachments/default/FieldsAttachment.tsx index 4e6650e5ec9..b42463131a1 100644 --- a/apps/meteor/client/components/message/content/attachments/default/FieldsAttachment.tsx +++ b/apps/meteor/client/components/message/content/attachments/default/FieldsAttachment.tsx @@ -15,7 +15,7 @@ type FieldsAttachmentProps = { const FieldsAttachment = ({ fields }: FieldsAttachmentProps) => ( - {fields.map((field, index) => (field.short ? : ))} + {fields.map((field, index) => (field.short ? : ))} ); diff --git a/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownload.tsx b/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownload.tsx index ea81f48c034..0ca7dce3c63 100644 --- a/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownload.tsx +++ b/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownload.tsx @@ -1,9 +1,9 @@ import type { ComponentPropsWithoutRef } from 'react'; import React from 'react'; -import type Action from '../../Action'; import AttachmentDownloadBase from './AttachmentDownloadBase'; import AttachmentEncryptedDownload from './AttachmentEncryptedDownload'; +import type Action from '../../Action'; type AttachmentDownloadProps = Omit, 'icon'> & { title?: string | undefined; href: string }; diff --git a/apps/meteor/client/components/message/content/attachments/structure/AttachmentEncryptedDownload.tsx b/apps/meteor/client/components/message/content/attachments/structure/AttachmentEncryptedDownload.tsx index f75b044c69a..6a2cf0f0bc7 100644 --- a/apps/meteor/client/components/message/content/attachments/structure/AttachmentEncryptedDownload.tsx +++ b/apps/meteor/client/components/message/content/attachments/structure/AttachmentEncryptedDownload.tsx @@ -1,8 +1,8 @@ import type { ComponentProps } from 'react'; import React from 'react'; -import { useDownloadFromServiceWorker } from '../../../../../hooks/useDownloadFromServiceWorker'; import AttachmentDownloadBase from './AttachmentDownloadBase'; +import { useDownloadFromServiceWorker } from '../../../../../hooks/useDownloadFromServiceWorker'; type AttachmentDownloadProps = ComponentProps; diff --git a/apps/meteor/client/components/message/content/attachments/structure/AttachmentSize.tsx b/apps/meteor/client/components/message/content/attachments/structure/AttachmentSize.tsx index 75a13e6cba3..2d05a7d4c67 100644 --- a/apps/meteor/client/components/message/content/attachments/structure/AttachmentSize.tsx +++ b/apps/meteor/client/components/message/content/attachments/structure/AttachmentSize.tsx @@ -2,8 +2,8 @@ import type { Box } from '@rocket.chat/fuselage'; import type { ComponentPropsWithoutRef } from 'react'; import React from 'react'; -import { useFormatMemorySize } from '../../../../../hooks/useFormatMemorySize'; import Title from './AttachmentTitle'; +import { useFormatMemorySize } from '../../../../../hooks/useFormatMemorySize'; type AttachmentSizeProps = ComponentPropsWithoutRef & { size: number; wrapper?: boolean }; diff --git a/apps/meteor/client/components/message/content/reactions/Reaction.tsx b/apps/meteor/client/components/message/content/reactions/Reaction.tsx index dd85cfdc787..46121e62201 100644 --- a/apps/meteor/client/components/message/content/reactions/Reaction.tsx +++ b/apps/meteor/client/components/message/content/reactions/Reaction.tsx @@ -4,9 +4,9 @@ import type { ComponentProps, ReactElement } from 'react'; import React, { useRef, useContext } from 'react'; import { useTranslation } from 'react-i18next'; +import ReactionTooltip from './ReactionTooltip'; import { getEmojiClassNameAndDataTitle } from '../../../../lib/utils/renderEmoji'; import { MessageListContext } from '../../list/MessageListContext'; -import ReactionTooltip from './ReactionTooltip'; // TODO: replace it with proper usage of i18next plurals type ReactionProps = { diff --git a/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx b/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx index 8761b60cc68..78a79cb50d4 100644 --- a/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx +++ b/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx @@ -3,9 +3,9 @@ import type { ReactElement, ReactNode } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import MessageCollapsible from '../../MessageCollapsible'; import OEmbedPreviewContent from './OEmbedPreviewContent'; import type { OEmbedPreviewMetadata } from './OEmbedPreviewMetadata'; +import MessageCollapsible from '../../MessageCollapsible'; type OEmbedCollapsibleProps = { children?: ReactNode } & OEmbedPreviewMetadata; diff --git a/apps/meteor/client/components/message/content/urlPreviews/OEmbedPreviewContent.tsx b/apps/meteor/client/components/message/content/urlPreviews/OEmbedPreviewContent.tsx index 550b325012e..68d29b6440b 100644 --- a/apps/meteor/client/components/message/content/urlPreviews/OEmbedPreviewContent.tsx +++ b/apps/meteor/client/components/message/content/urlPreviews/OEmbedPreviewContent.tsx @@ -8,8 +8,8 @@ import { import type { ReactElement, ReactNode } from 'react'; import React from 'react'; -import MarkdownText from '../../../MarkdownText'; import type { OEmbedPreviewMetadata } from './OEmbedPreviewMetadata'; +import MarkdownText from '../../../MarkdownText'; type OEmbedPreviewContentProps = { thumb?: ReactElement; children?: ReactNode } & OEmbedPreviewMetadata; diff --git a/apps/meteor/client/components/message/content/urlPreviews/UrlImagePreview.tsx b/apps/meteor/client/components/message/content/urlPreviews/UrlImagePreview.tsx index 8106a01004e..449ad1edd79 100644 --- a/apps/meteor/client/components/message/content/urlPreviews/UrlImagePreview.tsx +++ b/apps/meteor/client/components/message/content/urlPreviews/UrlImagePreview.tsx @@ -2,8 +2,8 @@ import { Box, MessageGenericPreviewImage } from '@rocket.chat/fuselage'; import type { ReactElement } from 'react'; import React from 'react'; -import { useOembedLayout } from '../../hooks/useOembedLayout'; import type { UrlPreviewMetadata } from './UrlPreviewMetadata'; +import { useOembedLayout } from '../../hooks/useOembedLayout'; const UrlImagePreview = ({ url }: Pick): ReactElement => { const { maxHeight: oembedMaxHeight } = useOembedLayout(); diff --git a/apps/meteor/client/components/message/content/urlPreviews/UrlPreview.tsx b/apps/meteor/client/components/message/content/urlPreviews/UrlPreview.tsx index f4ea4fb2d6f..a302c1c32ac 100644 --- a/apps/meteor/client/components/message/content/urlPreviews/UrlPreview.tsx +++ b/apps/meteor/client/components/message/content/urlPreviews/UrlPreview.tsx @@ -4,9 +4,9 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { useCollapse } from '../../hooks/useCollapse'; import type { UrlPreviewMetadata } from './UrlPreviewMetadata'; import UrlPreviewResolver from './UrlPreviewResolver'; +import { useCollapse } from '../../hooks/useCollapse'; const UrlPreview = (props: UrlPreviewMetadata): ReactElement => { const autoLoadMedia = useAttachmentAutoLoadEmbedMedia(); diff --git a/apps/meteor/client/components/message/hooks/useNormalizedMessage.ts b/apps/meteor/client/components/message/hooks/useNormalizedMessage.ts index a2693d704d4..2a433abc4e2 100644 --- a/apps/meteor/client/components/message/hooks/useNormalizedMessage.ts +++ b/apps/meteor/client/components/message/hooks/useNormalizedMessage.ts @@ -11,12 +11,12 @@ import type { Options } from '@rocket.chat/message-parser'; import { useSetting } from '@rocket.chat/ui-contexts'; import { useMemo } from 'react'; +import { useSubscriptionFromMessageQuery } from './useSubscriptionFromMessageQuery'; import type { MessageWithMdEnforced } from '../../../lib/parseMessageTextToAstMarkdown'; import { parseMessageTextToAstMarkdown } from '../../../lib/parseMessageTextToAstMarkdown'; import { useAutoLinkDomains } from '../../../views/room/MessageList/hooks/useAutoLinkDomains'; import { useAutoTranslate } from '../../../views/room/MessageList/hooks/useAutoTranslate'; import { useKatex } from '../../../views/room/MessageList/hooks/useKatex'; -import { useSubscriptionFromMessageQuery } from './useSubscriptionFromMessageQuery'; const normalizeAttachments = (attachments: MessageAttachment[], name?: string, type?: string): MessageAttachment[] => { if (name) { diff --git a/apps/meteor/client/components/message/toolbar/MessageToolbar.tsx b/apps/meteor/client/components/message/toolbar/MessageToolbar.tsx index 17357be8b6a..6ba7e1b434d 100644 --- a/apps/meteor/client/components/message/toolbar/MessageToolbar.tsx +++ b/apps/meteor/client/components/message/toolbar/MessageToolbar.tsx @@ -8,6 +8,9 @@ import { useQuery } from '@tanstack/react-query'; import type { ComponentProps, ReactElement } from 'react'; import React, { memo, useMemo, useRef } from 'react'; +import MessageActionMenu from './MessageActionMenu'; +import MessageToolbarStarsActionMenu from './MessageToolbarStarsActionMenu'; +import { useWebDAVMessageAction } from './useWebDAVMessageAction'; import type { MessageActionContext } from '../../../../app/ui-utils/client/lib/MessageAction'; import { MessageAction } from '../../../../app/ui-utils/client/lib/MessageAction'; import { useEmojiPickerData } from '../../../contexts/EmojiPickerContext'; @@ -18,9 +21,6 @@ import { useIsSelecting } from '../../../views/room/MessageList/contexts/Selecte import { useAutoTranslate } from '../../../views/room/MessageList/hooks/useAutoTranslate'; import { useChat } from '../../../views/room/contexts/ChatContext'; import { useRoomToolbox } from '../../../views/room/contexts/RoomToolboxContext'; -import MessageActionMenu from './MessageActionMenu'; -import MessageToolbarStarsActionMenu from './MessageToolbarStarsActionMenu'; -import { useWebDAVMessageAction } from './useWebDAVMessageAction'; const getMessageContext = (message: IMessage, room: IRoom, context?: MessageActionContext): MessageActionContext => { if (context) { diff --git a/apps/meteor/client/hooks/lists/useScrollableMessageList.ts b/apps/meteor/client/hooks/lists/useScrollableMessageList.ts index d78b13c3030..679ba23b5cd 100644 --- a/apps/meteor/client/hooks/lists/useScrollableMessageList.ts +++ b/apps/meteor/client/hooks/lists/useScrollableMessageList.ts @@ -1,10 +1,10 @@ import type { IMessage, Serialized } from '@rocket.chat/core-typings'; import { useCallback } from 'react'; +import { useScrollableRecordList } from './useScrollableRecordList'; import type { MessageList } from '../../lib/lists/MessageList'; import type { RecordListBatchChanges } from '../../lib/lists/RecordList'; import { mapMessageFromApi } from '../../lib/utils/mapMessageFromApi'; -import { useScrollableRecordList } from './useScrollableRecordList'; export const useScrollableMessageList = ( messageList: MessageList, diff --git a/apps/meteor/client/hooks/omnichannel/useIsRoomOverMacLimit.tsx b/apps/meteor/client/hooks/omnichannel/useIsRoomOverMacLimit.tsx index bf4e4b1bf95..310bea690a3 100644 --- a/apps/meteor/client/hooks/omnichannel/useIsRoomOverMacLimit.tsx +++ b/apps/meteor/client/hooks/omnichannel/useIsRoomOverMacLimit.tsx @@ -1,5 +1,5 @@ -import type { IRoom } from '@rocket.chat/core-typings'; -import { isOmnichannelRoom, type IOmnichannelGenericRoom, isVoipRoom } from '@rocket.chat/core-typings'; +import { isOmnichannelRoom, isVoipRoom } from '@rocket.chat/core-typings'; +import type { IRoom, IOmnichannelGenericRoom } from '@rocket.chat/core-typings'; import { useIsOverMacLimit } from './useIsOverMacLimit'; diff --git a/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useStartCallRoomAction.tsx b/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useStartCallRoomAction.tsx index 18d3efd0105..a275fe75556 100644 --- a/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useStartCallRoomAction.tsx +++ b/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useStartCallRoomAction.tsx @@ -1,10 +1,10 @@ import { GenericMenu } from '@rocket.chat/ui-client'; import React, { useMemo } from 'react'; -import HeaderToolbarAction from '../../../components/Header/HeaderToolbarAction'; -import type { RoomToolboxActionConfig } from '../../../views/room/contexts/RoomToolboxContext'; import useVideoConfMenuOptions from './useVideoConfMenuOptions'; import useVoipMenuOptions from './useVoipMenuOptions'; +import HeaderToolbarAction from '../../../components/Header/HeaderToolbarAction'; +import type { RoomToolboxActionConfig } from '../../../views/room/contexts/RoomToolboxContext'; export const useStartCallRoomAction = () => { const videoCall = useVideoConfMenuOptions(); diff --git a/apps/meteor/client/hooks/useAppActionButtons.ts b/apps/meteor/client/hooks/useAppActionButtons.ts index 2a074fcc3be..0dcb2d380d4 100644 --- a/apps/meteor/client/hooks/useAppActionButtons.ts +++ b/apps/meteor/client/hooks/useAppActionButtons.ts @@ -7,13 +7,13 @@ import { useQuery, useQueryClient } from '@tanstack/react-query'; import { useEffect, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import { useApplyButtonFilters, useApplyButtonAuthFilter } from './useApplyButtonFilters'; +import { useFilterActionsByContext } from './useFilterActions'; import { UiKitTriggerTimeoutError } from '../../app/ui-message/client/UiKitTriggerTimeoutError'; import type { MessageActionConfig, MessageActionContext } from '../../app/ui-utils/client/lib/MessageAction'; import type { MessageBoxAction } from '../../app/ui-utils/client/lib/messageBox'; import { Utilities } from '../../ee/lib/misc/Utilities'; import { useUiKitActionManager } from '../uikit/hooks/useUiKitActionManager'; -import { useApplyButtonFilters, useApplyButtonAuthFilter } from './useApplyButtonFilters'; -import { useFilterActionsByContext } from './useFilterActions'; const getIdForActionButton = ({ appId, actionId }: IUIActionButton): string => `${appId}/${actionId}`; diff --git a/apps/meteor/client/hooks/useDecryptedMessage.spec.ts b/apps/meteor/client/hooks/useDecryptedMessage.spec.ts index 62e77a77b09..404ee4b8573 100644 --- a/apps/meteor/client/hooks/useDecryptedMessage.spec.ts +++ b/apps/meteor/client/hooks/useDecryptedMessage.spec.ts @@ -1,8 +1,8 @@ import { isE2EEMessage } from '@rocket.chat/core-typings'; import { renderHook, waitFor } from '@testing-library/react'; -import { e2e } from '../../app/e2e/client/rocketchat.e2e'; import { useDecryptedMessage } from './useDecryptedMessage'; +import { e2e } from '../../app/e2e/client/rocketchat.e2e'; // Mock the dependencies jest.mock('@rocket.chat/core-typings', () => ({ diff --git a/apps/meteor/client/hooks/useDeviceLogout.tsx b/apps/meteor/client/hooks/useDeviceLogout.tsx index c9c089aa2ce..64cfde76b68 100644 --- a/apps/meteor/client/hooks/useDeviceLogout.tsx +++ b/apps/meteor/client/hooks/useDeviceLogout.tsx @@ -1,8 +1,8 @@ import { useSetModal, useTranslation, useToastMessageDispatch, useRoute, useRouteParameter } from '@rocket.chat/ui-contexts'; import React, { useCallback } from 'react'; -import GenericModal from '../components/GenericModal'; import { useEndpointAction } from './useEndpointAction'; +import GenericModal from '../components/GenericModal'; export const useDeviceLogout = ( sessionId: string, diff --git a/apps/meteor/client/hooks/useDevicesMenuOption.tsx b/apps/meteor/client/hooks/useDevicesMenuOption.tsx index a32b54920fe..e6395fcb936 100644 --- a/apps/meteor/client/hooks/useDevicesMenuOption.tsx +++ b/apps/meteor/client/hooks/useDevicesMenuOption.tsx @@ -4,8 +4,8 @@ import type { ReactNode } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import DeviceSettingsModal from '../voip/modals/DeviceSettingsModal'; import { useHasLicenseModule } from './useHasLicenseModule'; +import DeviceSettingsModal from '../voip/modals/DeviceSettingsModal'; type DevicesMenuOption = { type?: 'option' | 'heading' | 'divider'; diff --git a/apps/meteor/client/hooks/useEndpointData.ts b/apps/meteor/client/hooks/useEndpointData.ts index 93942946ede..0c0615d3ffd 100644 --- a/apps/meteor/client/hooks/useEndpointData.ts +++ b/apps/meteor/client/hooks/useEndpointData.ts @@ -3,9 +3,9 @@ import type { OperationParams, OperationResult, PathPattern, UrlParams } from '@ import { useToastMessageDispatch, useEndpoint } from '@rocket.chat/ui-contexts'; import { useCallback, useEffect } from 'react'; -import { getConfig } from '../lib/utils/getConfig'; import type { AsyncState } from './useAsyncState'; import { useAsyncState } from './useAsyncState'; +import { getConfig } from '../lib/utils/getConfig'; const log = (name: string): Console['log'] => process.env.NODE_ENV !== 'production' || getConfig('debug') === 'true' diff --git a/apps/meteor/client/hooks/useOTR.spec.tsx b/apps/meteor/client/hooks/useOTR.spec.tsx index 89082c07295..dbef63f3f5c 100644 --- a/apps/meteor/client/hooks/useOTR.spec.tsx +++ b/apps/meteor/client/hooks/useOTR.spec.tsx @@ -1,10 +1,10 @@ import { useUserId } from '@rocket.chat/ui-contexts'; import { renderHook } from '@testing-library/react'; +import { useOTR } from './useOTR'; import OTR from '../../app/otr/client/OTR'; import { OtrRoomState } from '../../app/otr/lib/OtrRoomState'; import { useRoom } from '../views/room/contexts/RoomContext'; -import { useOTR } from './useOTR'; jest.mock('@rocket.chat/ui-contexts', () => ({ useUserId: jest.fn(), diff --git a/apps/meteor/client/hooks/useOTR.ts b/apps/meteor/client/hooks/useOTR.ts index 65f9004cf32..3c6008b15bb 100644 --- a/apps/meteor/client/hooks/useOTR.ts +++ b/apps/meteor/client/hooks/useOTR.ts @@ -1,11 +1,11 @@ import { useUserId } from '@rocket.chat/ui-contexts'; import { useMemo, useCallback } from 'react'; +import { useReactiveValue } from './useReactiveValue'; import OTR from '../../app/otr/client/OTR'; import type { OTRRoom } from '../../app/otr/client/OTRRoom'; import { OtrRoomState } from '../../app/otr/lib/OtrRoomState'; import { useRoom } from '../views/room/contexts/RoomContext'; -import { useReactiveValue } from './useReactiveValue'; export const useOTR = (): { otr: OTRRoom | undefined; otrState: OtrRoomState } => { const uid = useUserId(); diff --git a/apps/meteor/client/hooks/usePruneWarningMessage.spec.ts b/apps/meteor/client/hooks/usePruneWarningMessage.spec.ts index 2bf4b813be1..1ca06d70308 100644 --- a/apps/meteor/client/hooks/usePruneWarningMessage.spec.ts +++ b/apps/meteor/client/hooks/usePruneWarningMessage.spec.ts @@ -1,9 +1,9 @@ import type { IRoomWithRetentionPolicy } from '@rocket.chat/core-typings'; import { renderHook } from '@testing-library/react'; +import { usePruneWarningMessage } from './usePruneWarningMessage'; import { createRenteionPolicySettingsMock as createMock } from '../../tests/mocks/client/mockRetentionPolicySettings'; import { createFakeRoom } from '../../tests/mocks/data'; -import { usePruneWarningMessage } from './usePruneWarningMessage'; jest.useFakeTimers(); diff --git a/apps/meteor/client/hooks/usePruneWarningMessage.ts b/apps/meteor/client/hooks/usePruneWarningMessage.ts index 8794115b26b..35cdb6596bc 100644 --- a/apps/meteor/client/hooks/usePruneWarningMessage.ts +++ b/apps/meteor/client/hooks/usePruneWarningMessage.ts @@ -6,9 +6,9 @@ import { sendAt } from 'cron'; import intlFormat from 'date-fns/intlFormat'; import { useEffect, useState } from 'react'; +import { useFormattedRelativeTime } from './useFormattedRelativeTime'; import { getCronAdvancedTimerFromPrecisionSetting } from '../../lib/getCronAdvancedTimerFromPrecisionSetting'; import { useRetentionPolicy } from '../views/room/hooks/useRetentionPolicy'; -import { useFormattedRelativeTime } from './useFormattedRelativeTime'; const getMessage = ({ filesOnly, excludePinned }: { filesOnly: boolean; excludePinned: boolean }): TranslationKey => { if (filesOnly) { diff --git a/apps/meteor/client/hooks/useRoomsList.ts b/apps/meteor/client/hooks/useRoomsList.ts index f09a361c921..66582d3b62f 100644 --- a/apps/meteor/client/hooks/useRoomsList.ts +++ b/apps/meteor/client/hooks/useRoomsList.ts @@ -2,9 +2,9 @@ import type { IRoom } from '@rocket.chat/core-typings'; import { useEndpoint } from '@rocket.chat/ui-contexts'; import { useCallback, useState } from 'react'; -import { RecordList } from '../lib/lists/RecordList'; import { useScrollableRecordList } from './lists/useScrollableRecordList'; import { useComponentDidUpdate } from './useComponentDidUpdate'; +import { RecordList } from '../lib/lists/RecordList'; type RoomListOptions = { text: string; diff --git a/apps/meteor/client/hooks/useTagsList.ts b/apps/meteor/client/hooks/useTagsList.ts index 3aa80b4e07b..9ca827331d4 100644 --- a/apps/meteor/client/hooks/useTagsList.ts +++ b/apps/meteor/client/hooks/useTagsList.ts @@ -1,9 +1,9 @@ import { useEndpoint } from '@rocket.chat/ui-contexts'; import { useCallback, useState } from 'react'; -import { RecordList } from '../lib/lists/RecordList'; import { useScrollableRecordList } from './lists/useScrollableRecordList'; import { useComponentDidUpdate } from './useComponentDidUpdate'; +import { RecordList } from '../lib/lists/RecordList'; type TagsListOptions = { filter: string; diff --git a/apps/meteor/client/hooks/useVoipClient.ts b/apps/meteor/client/hooks/useVoipClient.ts index eb1884576d2..995880f73c1 100644 --- a/apps/meteor/client/hooks/useVoipClient.ts +++ b/apps/meteor/client/hooks/useVoipClient.ts @@ -5,10 +5,10 @@ import { useUser, useSetting, useEndpoint, useStream } from '@rocket.chat/ui-con import { KJUR } from 'jsrsasign'; import { useEffect, useState } from 'react'; +import { useHasLicenseModule } from './useHasLicenseModule'; import { EEVoipClient } from '../lib/voip/EEVoipClient'; import { VoIPUser } from '../lib/voip/VoIPUser'; import { useWebRtcServers } from '../providers/CallProvider/hooks/useWebRtcServers'; -import { useHasLicenseModule } from './useHasLicenseModule'; type UseVoipClientResult = { voipClient?: VoIPUser; diff --git a/apps/meteor/client/lib/RoomManager.ts b/apps/meteor/client/lib/RoomManager.ts index 840493aae40..c70d2278511 100644 --- a/apps/meteor/client/lib/RoomManager.ts +++ b/apps/meteor/client/lib/RoomManager.ts @@ -2,8 +2,8 @@ import type { IRoom } from '@rocket.chat/core-typings'; import { Emitter } from '@rocket.chat/emitter'; import { useSyncExternalStore } from 'use-sync-external-store/shim'; -import { RoomHistoryManager } from '../../app/ui-utils/client/lib/RoomHistoryManager'; import { getConfig } from './utils/getConfig'; +import { RoomHistoryManager } from '../../app/ui-utils/client/lib/RoomHistoryManager'; const debug = !!(getConfig('debug') || getConfig('debug-RoomStore')); diff --git a/apps/meteor/client/lib/VideoConfManager.ts b/apps/meteor/client/lib/VideoConfManager.ts index 2ee480925d6..a47d75179d9 100644 --- a/apps/meteor/client/lib/VideoConfManager.ts +++ b/apps/meteor/client/lib/VideoConfManager.ts @@ -3,8 +3,8 @@ import { Emitter } from '@rocket.chat/emitter'; import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { sdk } from '../../app/utils/client/lib/SDKClient'; import { getConfig } from './utils/getConfig'; +import { sdk } from '../../app/utils/client/lib/SDKClient'; const debug = !!(getConfig('debug') || getConfig('debug-VideoConf')); diff --git a/apps/meteor/client/lib/cachedCollections/CachedCollection.ts b/apps/meteor/client/lib/cachedCollections/CachedCollection.ts index a435c576886..8a12e3ed677 100644 --- a/apps/meteor/client/lib/cachedCollections/CachedCollection.ts +++ b/apps/meteor/client/lib/cachedCollections/CachedCollection.ts @@ -6,14 +6,14 @@ import { Mongo } from 'meteor/mongo'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; -import { sdk } from '../../../app/utils/client/lib/SDKClient'; -import { isTruthy } from '../../../lib/isTruthy'; -import { withDebouncing } from '../../../lib/utils/highOrderFunctions'; import type { MinimongoCollection } from '../../definitions/MinimongoCollection'; import { baseURI } from '../baseURI'; import { onLoggedIn } from '../loggedIn'; -import { getConfig } from '../utils/getConfig'; import { CachedCollectionManager } from './CachedCollectionManager'; +import { sdk } from '../../../app/utils/client/lib/SDKClient'; +import { isTruthy } from '../../../lib/isTruthy'; +import { withDebouncing } from '../../../lib/utils/highOrderFunctions'; +import { getConfig } from '../utils/getConfig'; export type EventType = 'notify-logged' | 'notify-all' | 'notify-user'; diff --git a/apps/meteor/client/lib/chats/ChatAPI.ts b/apps/meteor/client/lib/chats/ChatAPI.ts index 325073d4383..6a782faafa1 100644 --- a/apps/meteor/client/lib/chats/ChatAPI.ts +++ b/apps/meteor/client/lib/chats/ChatAPI.ts @@ -1,10 +1,10 @@ import type { IMessage, IRoom, ISubscription, IE2EEMessage, IUpload } from '@rocket.chat/core-typings'; import type { IActionManager } from '@rocket.chat/ui-contexts'; -import type { FormattingButton } from '../../../app/ui-message/client/messageBox/messageBoxFormatting'; -import type { Subscribable } from '../../definitions/Subscribable'; import type { Upload } from './Upload'; import type { ReadStateManager } from './readStateManager'; +import type { FormattingButton } from '../../../app/ui-message/client/messageBox/messageBoxFormatting'; +import type { Subscribable } from '../../definitions/Subscribable'; export type ComposerAPI = { release(): void; diff --git a/apps/meteor/client/lib/chats/data.ts b/apps/meteor/client/lib/chats/data.ts index 4f6263147ba..21275e64f28 100644 --- a/apps/meteor/client/lib/chats/data.ts +++ b/apps/meteor/client/lib/chats/data.ts @@ -2,13 +2,13 @@ import type { IEditedMessage, IMessage, IRoom, ISubscription } from '@rocket.cha import { Random } from '@rocket.chat/random'; import moment from 'moment'; +import type { DataAPI } from './ChatAPI'; import { hasAtLeastOnePermission, hasPermission } from '../../../app/authorization/client'; import { Messages, ChatRoom, ChatSubscription } from '../../../app/models/client'; import { settings } from '../../../app/settings/client'; import { MessageTypes } from '../../../app/ui-utils/client'; import { sdk } from '../../../app/utils/client/lib/SDKClient'; import { prependReplies } from '../utils/prependReplies'; -import type { DataAPI } from './ChatAPI'; export const createDataAPI = ({ rid, tmid }: { rid: IRoom['_id']; tmid: IMessage['_id'] | undefined }): DataAPI => { const composeMessage = async ( diff --git a/apps/meteor/client/lib/createRouteGroup.tsx b/apps/meteor/client/lib/createRouteGroup.tsx index 70eab4782dd..7391ababd39 100644 --- a/apps/meteor/client/lib/createRouteGroup.tsx +++ b/apps/meteor/client/lib/createRouteGroup.tsx @@ -1,9 +1,9 @@ import type { IRouterPaths, RouteName, RouterPathPattern } from '@rocket.chat/ui-contexts'; import React, { type ElementType, type ReactNode } from 'react'; +import { appLayout } from './appLayout'; import { router } from '../providers/RouterProvider'; import MainLayout from '../views/root/MainLayout'; -import { appLayout } from './appLayout'; type GroupName = 'omnichannel' | 'marketplace' | 'account' | 'admin'; diff --git a/apps/meteor/client/lib/federation/Federation.spec.ts b/apps/meteor/client/lib/federation/Federation.spec.ts index 1e367cbb9c6..e4753f7e542 100644 --- a/apps/meteor/client/lib/federation/Federation.spec.ts +++ b/apps/meteor/client/lib/federation/Federation.spec.ts @@ -1,8 +1,8 @@ import type { IRoom, ISubscription, IUser, ValueOf } from '@rocket.chat/core-typings'; +import * as Federation from './Federation'; import { RoomRoles } from '../../../app/models/client'; import { RoomMemberActions, RoomSettingsEnum } from '../../../definition/IRoomTypeConfig'; -import * as Federation from './Federation'; jest.mock('../../../app/models/client', () => ({ RoomRoles: { diff --git a/apps/meteor/client/lib/fetchFeatures.ts b/apps/meteor/client/lib/fetchFeatures.ts index 3814eda0f5d..e287b6bb895 100644 --- a/apps/meteor/client/lib/fetchFeatures.ts +++ b/apps/meteor/client/lib/fetchFeatures.ts @@ -1,4 +1,4 @@ -import { sdk } from '../../app/utils/client/lib/SDKClient'; import { whenLoggedIn } from './loggedIn'; +import { sdk } from '../../app/utils/client/lib/SDKClient'; export const fetchFeatures = (): Promise => whenLoggedIn().then(() => sdk.call('license:getModules')); diff --git a/apps/meteor/client/lib/utils/goToRoomById.ts b/apps/meteor/client/lib/utils/goToRoomById.ts index 2bb5936d551..720c980d692 100644 --- a/apps/meteor/client/lib/utils/goToRoomById.ts +++ b/apps/meteor/client/lib/utils/goToRoomById.ts @@ -1,10 +1,10 @@ import type { IRoom, ISubscription } from '@rocket.chat/core-typings'; import { memoize } from '@rocket.chat/memo'; +import { callWithErrorHandling } from './callWithErrorHandling'; import { ChatSubscription } from '../../../app/models/client'; import { router } from '../../providers/RouterProvider'; import { roomCoordinator } from '../rooms/roomCoordinator'; -import { callWithErrorHandling } from './callWithErrorHandling'; const getRoomById = memoize((rid: IRoom['_id']) => callWithErrorHandling('getRoomById', rid)); diff --git a/apps/meteor/client/meteorOverrides/login/facebook.ts b/apps/meteor/client/meteorOverrides/login/facebook.ts index 72a91775818..c72b26be542 100644 --- a/apps/meteor/client/meteorOverrides/login/facebook.ts +++ b/apps/meteor/client/meteorOverrides/login/facebook.ts @@ -4,9 +4,9 @@ import { Facebook } from 'meteor/facebook-oauth'; import { Meteor } from 'meteor/meteor'; import { OAuth } from 'meteor/oauth'; +import { createOAuthTotpLoginMethod } from './oauth'; import { overrideLoginMethod } from '../../lib/2fa/overrideLoginMethod'; import { wrapRequestCredentialFn } from '../../lib/wrapRequestCredentialFn'; -import { createOAuthTotpLoginMethod } from './oauth'; const { loginWithFacebook } = Meteor; const loginWithFacebookAndTOTP = createOAuthTotpLoginMethod(Facebook); diff --git a/apps/meteor/client/meteorOverrides/login/github.ts b/apps/meteor/client/meteorOverrides/login/github.ts index 2a1aa390331..8ee2a057921 100644 --- a/apps/meteor/client/meteorOverrides/login/github.ts +++ b/apps/meteor/client/meteorOverrides/login/github.ts @@ -4,9 +4,9 @@ import { Github } from 'meteor/github-oauth'; import { Meteor } from 'meteor/meteor'; import { OAuth } from 'meteor/oauth'; +import { createOAuthTotpLoginMethod } from './oauth'; import { overrideLoginMethod } from '../../lib/2fa/overrideLoginMethod'; import { wrapRequestCredentialFn } from '../../lib/wrapRequestCredentialFn'; -import { createOAuthTotpLoginMethod } from './oauth'; const { loginWithGithub } = Meteor; const loginWithGithubAndTOTP = createOAuthTotpLoginMethod(Github); diff --git a/apps/meteor/client/meteorOverrides/login/google.ts b/apps/meteor/client/meteorOverrides/login/google.ts index 2cf56e7853d..55ca6e0c35e 100644 --- a/apps/meteor/client/meteorOverrides/login/google.ts +++ b/apps/meteor/client/meteorOverrides/login/google.ts @@ -4,9 +4,9 @@ import { Google } from 'meteor/google-oauth'; import { Meteor } from 'meteor/meteor'; import { OAuth } from 'meteor/oauth'; +import { createOAuthTotpLoginMethod } from './oauth'; import { overrideLoginMethod, type LoginCallback } from '../../lib/2fa/overrideLoginMethod'; import { wrapRequestCredentialFn } from '../../lib/wrapRequestCredentialFn'; -import { createOAuthTotpLoginMethod } from './oauth'; declare module 'meteor/meteor' { // eslint-disable-next-line @typescript-eslint/no-namespace diff --git a/apps/meteor/client/meteorOverrides/login/meteorDeveloperAccount.ts b/apps/meteor/client/meteorOverrides/login/meteorDeveloperAccount.ts index 56823fee6b6..2550630caac 100644 --- a/apps/meteor/client/meteorOverrides/login/meteorDeveloperAccount.ts +++ b/apps/meteor/client/meteorOverrides/login/meteorDeveloperAccount.ts @@ -2,9 +2,9 @@ import { Meteor } from 'meteor/meteor'; import { MeteorDeveloperAccounts } from 'meteor/meteor-developer-oauth'; import { OAuth } from 'meteor/oauth'; +import { createOAuthTotpLoginMethod } from './oauth'; import { overrideLoginMethod } from '../../lib/2fa/overrideLoginMethod'; import { wrapRequestCredentialFn } from '../../lib/wrapRequestCredentialFn'; -import { createOAuthTotpLoginMethod } from './oauth'; const { loginWithMeteorDeveloperAccount } = Meteor; const loginWithMeteorDeveloperAccountAndTOTP = createOAuthTotpLoginMethod(MeteorDeveloperAccounts); diff --git a/apps/meteor/client/meteorOverrides/login/twitter.ts b/apps/meteor/client/meteorOverrides/login/twitter.ts index e19ce234e5e..b74ffadfe12 100644 --- a/apps/meteor/client/meteorOverrides/login/twitter.ts +++ b/apps/meteor/client/meteorOverrides/login/twitter.ts @@ -4,9 +4,9 @@ import { Meteor } from 'meteor/meteor'; import { OAuth } from 'meteor/oauth'; import { Twitter } from 'meteor/twitter-oauth'; +import { createOAuthTotpLoginMethod } from './oauth'; import { overrideLoginMethod } from '../../lib/2fa/overrideLoginMethod'; import { wrapRequestCredentialFn } from '../../lib/wrapRequestCredentialFn'; -import { createOAuthTotpLoginMethod } from './oauth'; const { loginWithTwitter } = Meteor; const loginWithTwitterAndTOTP = createOAuthTotpLoginMethod(Twitter); diff --git a/apps/meteor/client/omnichannel/businessHours/BusinessHoursRow.tsx b/apps/meteor/client/omnichannel/businessHours/BusinessHoursRow.tsx index ae0183d45d2..30dfe1c9955 100644 --- a/apps/meteor/client/omnichannel/businessHours/BusinessHoursRow.tsx +++ b/apps/meteor/client/omnichannel/businessHours/BusinessHoursRow.tsx @@ -6,8 +6,8 @@ import type { KeyboardEvent } from 'react'; import React, { memo, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; -import { GenericTableRow, GenericTableCell } from '../../components/GenericTable'; import { useRemoveBusinessHour } from './useRemoveBusinessHour'; +import { GenericTableRow, GenericTableCell } from '../../components/GenericTable'; const BusinessHoursRow = ({ _id, name, timezone, workHours, active, type }: Serialized) => { const { t } = useTranslation(); diff --git a/apps/meteor/client/omnichannel/businessHours/BusinessHoursTable.tsx b/apps/meteor/client/omnichannel/businessHours/BusinessHoursTable.tsx index f561a324068..c98eb3e961e 100644 --- a/apps/meteor/client/omnichannel/businessHours/BusinessHoursTable.tsx +++ b/apps/meteor/client/omnichannel/businessHours/BusinessHoursTable.tsx @@ -4,6 +4,7 @@ import { useTranslation, useEndpoint } from '@rocket.chat/ui-contexts'; import { useQuery } from '@tanstack/react-query'; import React, { useMemo, useState } from 'react'; +import BusinessHoursRow from './BusinessHoursRow'; import FilterByText from '../../components/FilterByText'; import GenericNoResults from '../../components/GenericNoResults'; import { @@ -14,7 +15,6 @@ import { GenericTableLoadingRow, } from '../../components/GenericTable'; import { usePagination } from '../../components/GenericTable/hooks/usePagination'; -import BusinessHoursRow from './BusinessHoursRow'; const BusinessHoursTable = () => { const t = useTranslation(); diff --git a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEdit.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEdit.tsx index 28116cb26a1..f2a959a587f 100644 --- a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEdit.tsx +++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEdit.tsx @@ -6,9 +6,9 @@ import { useQueryClient } from '@tanstack/react-query'; import React, { memo, useCallback } from 'react'; import { FormProvider, useForm } from 'react-hook-form'; -import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../components/Page'; import CannedResponseForm from './components/cannedResponseForm'; import { useRemoveCannedResponse } from './useRemoveCannedResponse'; +import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../components/Page'; type CannedResponseEditProps = { cannedResponseData?: Serialized; diff --git a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithData.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithData.tsx index 4d5779f85fd..0d3504c02e5 100644 --- a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithData.tsx +++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithData.tsx @@ -5,9 +5,9 @@ import { useQuery } from '@tanstack/react-query'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { FormSkeleton } from '../../components/Skeleton'; import CannedResponseEdit from './CannedResponseEdit'; import CannedResponseEditWithDepartmentData from './CannedResponseEditWithDepartmentData'; +import { FormSkeleton } from '../../components/Skeleton'; const CannedResponseEditWithData = ({ cannedResponseId }: { cannedResponseId: IOmnichannelCannedResponse['_id'] }) => { const { t } = useTranslation(); diff --git a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx index 6f57a29e116..5d2ffa537fb 100644 --- a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx +++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx @@ -3,10 +3,10 @@ import { Callout } from '@rocket.chat/fuselage'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import CannedResponseEdit from './CannedResponseEdit'; import { FormSkeleton } from '../../components/Skeleton'; import { AsyncStatePhase } from '../../hooks/useAsyncState'; import { useEndpointData } from '../../hooks/useEndpointData'; -import CannedResponseEdit from './CannedResponseEdit'; const CannedResponseEditWithDepartmentData = ({ cannedResponseData }: { cannedResponseData: Serialized }) => { const departmentId = useMemo(() => cannedResponseData?.departmentId, [cannedResponseData]) as string; diff --git a/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesPage.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesPage.tsx index 427f80b6133..db561562636 100644 --- a/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesPage.tsx +++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesPage.tsx @@ -3,10 +3,10 @@ import { useRouteParameter, useRouter } from '@rocket.chat/ui-contexts'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { Page, PageHeader, PageContent } from '../../components/Page'; import CannedResponseEdit from './CannedResponseEdit'; import CannedResponseEditWithData from './CannedResponseEditWithData'; import CannedResponsesTable from './CannedResponsesTable'; +import { Page, PageHeader, PageContent } from '../../components/Page'; const CannedResponsesPage = () => { const { t } = useTranslation(); diff --git a/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx index dc6a489320d..5ae08ac73e0 100644 --- a/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx +++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx @@ -1,8 +1,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import React from 'react'; -import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage'; import CannedResponsesPage from './CannedResponsesPage'; +import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage'; const CannedResponsesRoute = () => { const canViewCannedResponses = usePermission('manage-livechat-canned-responses'); diff --git a/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesTable.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesTable.tsx index 8bf1d52e5ca..2b718cb539b 100644 --- a/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesTable.tsx +++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesTable.tsx @@ -5,6 +5,8 @@ import { useTranslation, usePermission, useToastMessageDispatch, useEndpoint, us import { useQuery, hashQueryKey } from '@tanstack/react-query'; import React, { useMemo, useState } from 'react'; +import CannedResponseFilter from './CannedResponseFilter'; +import { useRemoveCannedResponse } from './useRemoveCannedResponse'; import GenericNoResults from '../../components/GenericNoResults'; import { GenericTable, @@ -18,8 +20,6 @@ import { import { usePagination } from '../../components/GenericTable/hooks/usePagination'; import { useSort } from '../../components/GenericTable/hooks/useSort'; import { useFormatDateAndTime } from '../../hooks/useFormatDateAndTime'; -import CannedResponseFilter from './CannedResponseFilter'; -import { useRemoveCannedResponse } from './useRemoveCannedResponse'; type Scope = 'global' | 'department' | 'user'; diff --git a/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.tsx b/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.tsx index d66182dc096..43d2b14d062 100644 --- a/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.tsx +++ b/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.tsx @@ -12,9 +12,9 @@ import type { ComponentProps } from 'react'; import React, { memo, useCallback, useRef, useState } from 'react'; import { useTranslation } from 'react-i18next'; +import InsertPlaceholderDropdown from './InsertPlaceholderDropdown'; import { Backdrop } from '../../../../components/Backdrop'; import { useEmojiPicker } from '../../../../contexts/EmojiPickerContext'; -import InsertPlaceholderDropdown from './InsertPlaceholderDropdown'; const CannedResponsesComposer = ({ onChange, ...props }: ComponentProps) => { const { t } = useTranslation(); diff --git a/apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx b/apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx index 1be2284c872..620b58e33a1 100644 --- a/apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx +++ b/apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx @@ -6,10 +6,10 @@ import React, { useState } from 'react'; import { useFormContext, Controller } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; -import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment'; -import Tags from '../../../components/Omnichannel/Tags'; import CannedResponsesComposer from './CannedResponsesComposer/CannedResponsesComposer'; import CannedResponsesComposerPreview from './CannedResponsesComposer/CannedResponsesComposerPreview'; +import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment'; +import Tags from '../../../components/Omnichannel/Tags'; // TODO: refactor Tags field to get proper validation const CannedResponseForm = () => { diff --git a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.stories.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.stories.tsx index 27fcb651120..312a907224b 100644 --- a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.stories.tsx +++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.stories.tsx @@ -3,8 +3,8 @@ import { action } from '@storybook/addon-actions'; import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; -import { Contextualbar } from '../../../../components/Contextualbar'; import CannedResponseList from './CannedResponseList'; +import { Contextualbar } from '../../../../components/Contextualbar'; export default { title: 'Omnichannel/CannedResponseList', diff --git a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx index 5734cf2e93b..0f3d642ce19 100644 --- a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx +++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx @@ -6,6 +6,8 @@ import React, { memo } from 'react'; import { useTranslation } from 'react-i18next'; import { Virtuoso } from 'react-virtuoso'; +import Item from './Item'; +import WrapCannedResponse from './WrapCannedResponse'; import { ContextualbarHeader, ContextualbarTitle, @@ -16,8 +18,6 @@ import { } from '../../../../components/Contextualbar'; import { VirtuosoScrollbars } from '../../../../components/CustomScrollbars'; import { useRoomToolbox } from '../../../../views/room/contexts/RoomToolboxContext'; -import Item from './Item'; -import WrapCannedResponse from './WrapCannedResponse'; type CannedResponseListProps = { loadMoreItems: (start: number, end: number) => void; diff --git a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponse.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponse.tsx index eb118f50a7e..36b5b2ea5bc 100644 --- a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponse.tsx +++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponse.tsx @@ -3,8 +3,8 @@ import { useSetModal, usePermission } from '@rocket.chat/ui-contexts'; import type { MouseEvent, MouseEventHandler } from 'react'; import React, { memo } from 'react'; -import CreateCannedResponse from '../../modals/CreateCannedResponse'; import CannedResponse from './CannedResponse'; +import CreateCannedResponse from '../../modals/CreateCannedResponse'; type WrapCannedResponseProps = { allowUse: boolean; diff --git a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponseList.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponseList.tsx index 6fd0ee420db..c213cf2be46 100644 --- a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponseList.tsx +++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponseList.tsx @@ -3,6 +3,7 @@ import { useSetModal, useRouter } from '@rocket.chat/ui-contexts'; import type { MouseEvent } from 'react'; import React, { memo, useCallback, useMemo, useState } from 'react'; +import CannedResponseList from './CannedResponseList'; import { useRecordList } from '../../../../hooks/lists/useRecordList'; import { useIsRoomOverMacLimit } from '../../../../hooks/omnichannel/useIsRoomOverMacLimit'; import { AsyncStatePhase } from '../../../../lib/asyncState'; @@ -12,7 +13,6 @@ import { useRoomToolbox } from '../../../../views/room/contexts/RoomToolboxConte import { useCannedResponseFilterOptions } from '../../../hooks/useCannedResponseFilterOptions'; import { useCannedResponseList } from '../../../hooks/useCannedResponseList'; import CreateCannedResponse from '../../modals/CreateCannedResponse'; -import CannedResponseList from './CannedResponseList'; export const WrapCannedResponseList = () => { const room = useRoom(); diff --git a/apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx b/apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx index f4580a27932..01f20a799b7 100644 --- a/apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx +++ b/apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx @@ -7,9 +7,9 @@ import type { ComponentProps } from 'react'; import React, { useCallback, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import { useOmnichannelPriorities } from './useOmnichannelPriorities'; import { dispatchToastMessage } from '../../lib/toast'; import { PriorityIcon } from '../priorities/PriorityIcon'; -import { useOmnichannelPriorities } from './useOmnichannelPriorities'; export const useOmnichannelPrioritiesMenu = (rid: string): ComponentProps['options'] | Record => { const { t } = useTranslation(); diff --git a/apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx b/apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx index cbf2e6ec88f..a394b11343e 100644 --- a/apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx +++ b/apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { useTranslation } from 'react-i18next'; -import { Page, PageHeader, PageContent } from '../../components/Page'; import MonitorsTable from './MonitorsTable'; +import { Page, PageHeader, PageContent } from '../../components/Page'; const MonitorsPage = () => { const { t } = useTranslation(); diff --git a/apps/meteor/client/omnichannel/monitors/MonitorsPageContainer.tsx b/apps/meteor/client/omnichannel/monitors/MonitorsPageContainer.tsx index b86f8a1ced2..3a803555f9a 100644 --- a/apps/meteor/client/omnichannel/monitors/MonitorsPageContainer.tsx +++ b/apps/meteor/client/omnichannel/monitors/MonitorsPageContainer.tsx @@ -1,9 +1,9 @@ import React from 'react'; +import MonitorsPage from './MonitorsPage'; import PageSkeleton from '../../components/PageSkeleton'; import { useHasLicenseModule } from '../../hooks/useHasLicenseModule'; import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage'; -import MonitorsPage from './MonitorsPage'; const MonitorsPageContainer = () => { const license = useHasLicenseModule('livechat-enterprise'); diff --git a/apps/meteor/client/omnichannel/priorities/PrioritiesPage.tsx b/apps/meteor/client/omnichannel/priorities/PrioritiesPage.tsx index 9b64eb90c47..d0e064e27d3 100644 --- a/apps/meteor/client/omnichannel/priorities/PrioritiesPage.tsx +++ b/apps/meteor/client/omnichannel/priorities/PrioritiesPage.tsx @@ -6,12 +6,12 @@ import type { ReactElement } from 'react'; import React, { useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { Page, PageHeader, PageContent } from '../../components/Page'; -import { useOmnichannelPriorities } from '../hooks/useOmnichannelPriorities'; import { PrioritiesResetModal } from './PrioritiesResetModal'; import { PrioritiesTable } from './PrioritiesTable'; import type { PriorityFormData } from './PriorityEditForm'; import PriorityList from './PriorityList'; +import { Page, PageHeader, PageContent } from '../../components/Page'; +import { useOmnichannelPriorities } from '../hooks/useOmnichannelPriorities'; type PrioritiesPageProps = { priorityId: string; diff --git a/apps/meteor/client/omnichannel/priorities/PrioritiesRoute.tsx b/apps/meteor/client/omnichannel/priorities/PrioritiesRoute.tsx index fd3b73a3f4a..d845162620e 100644 --- a/apps/meteor/client/omnichannel/priorities/PrioritiesRoute.tsx +++ b/apps/meteor/client/omnichannel/priorities/PrioritiesRoute.tsx @@ -2,8 +2,8 @@ import { usePermission, useRouteParameter } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; -import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage'; import { PrioritiesPage } from './PrioritiesPage'; +import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage'; const PrioritiesRoute = (): ReactElement => { const canViewPriorities = usePermission('manage-livechat-priorities'); diff --git a/apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx b/apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx index 008147d49e1..453705bddf1 100644 --- a/apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx +++ b/apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx @@ -3,6 +3,7 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import { PriorityIcon } from './PriorityIcon'; import GenericNoResults from '../../components/GenericNoResults'; import { GenericTable, @@ -13,7 +14,6 @@ import { GenericTableBody, GenericTableLoadingTable, } from '../../components/GenericTable'; -import { PriorityIcon } from './PriorityIcon'; type PrioritiesTableProps = { priorities?: Serialized[]; diff --git a/apps/meteor/client/omnichannel/priorities/PriorityEditFormWithData.tsx b/apps/meteor/client/omnichannel/priorities/PriorityEditFormWithData.tsx index b0232c6076a..0f3eecbd0f2 100644 --- a/apps/meteor/client/omnichannel/priorities/PriorityEditFormWithData.tsx +++ b/apps/meteor/client/omnichannel/priorities/PriorityEditFormWithData.tsx @@ -3,10 +3,10 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { FormSkeleton } from '../../components/Skeleton'; -import { usePriorityInfo } from '../../views/omnichannel/directory/hooks/usePriorityInfo'; import type { PriorityEditFormProps } from './PriorityEditForm'; import PriorityEditForm from './PriorityEditForm'; +import { FormSkeleton } from '../../components/Skeleton'; +import { usePriorityInfo } from '../../views/omnichannel/directory/hooks/usePriorityInfo'; type PriorityEditFormWithDataProps = Omit & { priorityId: string; diff --git a/apps/meteor/client/omnichannel/priorities/PriorityList.tsx b/apps/meteor/client/omnichannel/priorities/PriorityList.tsx index 16091476d10..cb5e0eab576 100644 --- a/apps/meteor/client/omnichannel/priorities/PriorityList.tsx +++ b/apps/meteor/client/omnichannel/priorities/PriorityList.tsx @@ -2,6 +2,8 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import type { PriorityFormData } from './PriorityEditForm'; +import PriorityEditFormWithData from './PriorityEditFormWithData'; import { Contextualbar, ContextualbarTitle, @@ -10,8 +12,6 @@ import { ContextualbarScrollableContent, ContextualbarDialog, } from '../../components/Contextualbar'; -import type { PriorityFormData } from './PriorityEditForm'; -import PriorityEditFormWithData from './PriorityEditFormWithData'; type PriorityListProps = { context: 'edit'; diff --git a/apps/meteor/client/omnichannel/reports/ReportsPage.tsx b/apps/meteor/client/omnichannel/reports/ReportsPage.tsx index 6eac20b5751..ed8625304be 100644 --- a/apps/meteor/client/omnichannel/reports/ReportsPage.tsx +++ b/apps/meteor/client/omnichannel/reports/ReportsPage.tsx @@ -3,10 +3,10 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import { AgentsSection, ChannelsSection, DepartmentsSection, StatusSection, TagsSection } from './sections'; import { Page, PageHeader, PageScrollableContentWithShadow } from '../../components/Page'; import { useHasLicenseModule } from '../../hooks/useHasLicenseModule'; import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage'; -import { AgentsSection, ChannelsSection, DepartmentsSection, StatusSection, TagsSection } from './sections'; const BREAKPOINTS = { xs: 4, sm: 8, md: 8, lg: 12, xl: 6 } as const; diff --git a/apps/meteor/client/omnichannel/reports/components/ReportCard.tsx b/apps/meteor/client/omnichannel/reports/components/ReportCard.tsx index 76cf1758495..8be93c9e1c2 100644 --- a/apps/meteor/client/omnichannel/reports/components/ReportCard.tsx +++ b/apps/meteor/client/omnichannel/reports/components/ReportCard.tsx @@ -2,9 +2,9 @@ import { Box, Card, CardTitle, CardBody, CardCol, CardRow } from '@rocket.chat/f import type { ReactElement, ComponentProps } from 'react'; import React, { forwardRef } from 'react'; +import { ReportCardContent } from './ReportCardContent'; import DownloadDataButton from '../../../components/dashboards/DownloadDataButton'; import PeriodSelector from '../../../components/dashboards/PeriodSelector'; -import { ReportCardContent } from './ReportCardContent'; type ReportCardProps = { id: string; diff --git a/apps/meteor/client/omnichannel/reports/hooks/useAgentsSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useAgentsSection.tsx index 23a6c21d33d..bf0f5f8e80b 100644 --- a/apps/meteor/client/omnichannel/reports/hooks/useAgentsSection.tsx +++ b/apps/meteor/client/omnichannel/reports/hooks/useAgentsSection.tsx @@ -3,12 +3,12 @@ import { useQuery } from '@tanstack/react-query'; import { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import { useDefaultDownload } from './useDefaultDownload'; import { useSort } from '../../../components/GenericTable/hooks/useSort'; import { getPeriodRange } from '../../../components/dashboards/periods'; import { usePeriodSelectorStorage } from '../../../components/dashboards/usePeriodSelectorStorage'; import { COLORS, PERIOD_OPTIONS } from '../components/constants'; import { formatPeriodDescription } from '../utils/formatPeriodDescription'; -import { useDefaultDownload } from './useDefaultDownload'; const formatChartData = (data: { label: string; value: number }[] | undefined = []) => data.map((item) => ({ diff --git a/apps/meteor/client/omnichannel/reports/hooks/useChannelsSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useChannelsSection.tsx index 864181a6464..9a90fb98281 100644 --- a/apps/meteor/client/omnichannel/reports/hooks/useChannelsSection.tsx +++ b/apps/meteor/client/omnichannel/reports/hooks/useChannelsSection.tsx @@ -6,13 +6,13 @@ import type { TFunction } from 'i18next'; import { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import { useDefaultDownload } from './useDefaultDownload'; import { getPeriodRange } from '../../../components/dashboards/periods'; import { usePeriodSelectorStorage } from '../../../components/dashboards/usePeriodSelectorStorage'; import { PERIOD_OPTIONS } from '../components/constants'; import { formatPeriodDescription } from '../utils/formatPeriodDescription'; import { getTop } from '../utils/getTop'; import { round } from '../utils/round'; -import { useDefaultDownload } from './useDefaultDownload'; type DataItem = { label: string; value: number; id: string; rawLabel: string }; diff --git a/apps/meteor/client/omnichannel/reports/hooks/useDepartmentsSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useDepartmentsSection.tsx index fe4bfaf7d72..57f30d0d38d 100644 --- a/apps/meteor/client/omnichannel/reports/hooks/useDepartmentsSection.tsx +++ b/apps/meteor/client/omnichannel/reports/hooks/useDepartmentsSection.tsx @@ -3,11 +3,11 @@ import { useQuery } from '@tanstack/react-query'; import { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import { useDefaultDownload } from './useDefaultDownload'; import { getPeriodRange } from '../../../components/dashboards/periods'; import { usePeriodSelectorStorage } from '../../../components/dashboards/usePeriodSelectorStorage'; import { COLORS, PERIOD_OPTIONS } from '../components/constants'; import { formatPeriodDescription } from '../utils/formatPeriodDescription'; -import { useDefaultDownload } from './useDefaultDownload'; const formatChartData = (data: { label: string; value: number }[] | undefined = []) => data.map((item) => ({ diff --git a/apps/meteor/client/omnichannel/reports/hooks/useStatusSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useStatusSection.tsx index d8f17dd5b79..d001a8bbeb5 100644 --- a/apps/meteor/client/omnichannel/reports/hooks/useStatusSection.tsx +++ b/apps/meteor/client/omnichannel/reports/hooks/useStatusSection.tsx @@ -5,12 +5,12 @@ import type { TFunction } from 'i18next'; import { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import { useDefaultDownload } from './useDefaultDownload'; import { getPeriodRange } from '../../../components/dashboards/periods'; import { usePeriodSelectorStorage } from '../../../components/dashboards/usePeriodSelectorStorage'; import { COLORS, PERIOD_OPTIONS } from '../components/constants'; import { formatPeriodDescription } from '../utils/formatPeriodDescription'; import { round } from '../utils/round'; -import { useDefaultDownload } from './useDefaultDownload'; const STATUSES: Record = { Open: { label: 'Omnichannel_Reports_Status_Open', color: COLORS.success }, diff --git a/apps/meteor/client/omnichannel/reports/hooks/useTagsSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useTagsSection.tsx index 93fe56b96b8..5ba58a71c87 100644 --- a/apps/meteor/client/omnichannel/reports/hooks/useTagsSection.tsx +++ b/apps/meteor/client/omnichannel/reports/hooks/useTagsSection.tsx @@ -4,11 +4,11 @@ import { useQuery } from '@tanstack/react-query'; import { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import { useDefaultDownload } from './useDefaultDownload'; import { getPeriodRange } from '../../../components/dashboards/periods'; import { usePeriodSelectorStorage } from '../../../components/dashboards/usePeriodSelectorStorage'; import { PERIOD_OPTIONS } from '../components/constants'; import { formatPeriodDescription } from '../utils/formatPeriodDescription'; -import { useDefaultDownload } from './useDefaultDownload'; const colors = { warning: Palette.statusColor['status-font-on-warning'].toString(), diff --git a/apps/meteor/client/omnichannel/slaPolicies/SlaEditWithData.tsx b/apps/meteor/client/omnichannel/slaPolicies/SlaEditWithData.tsx index 1e42316a623..3136679d867 100644 --- a/apps/meteor/client/omnichannel/slaPolicies/SlaEditWithData.tsx +++ b/apps/meteor/client/omnichannel/slaPolicies/SlaEditWithData.tsx @@ -5,8 +5,8 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { FormSkeleton } from '../../components/Skeleton'; import SlaEdit from './SlaEdit'; +import { FormSkeleton } from '../../components/Skeleton'; type SlaEditProps = { slaId: string; diff --git a/apps/meteor/client/omnichannel/slaPolicies/SlaPage.tsx b/apps/meteor/client/omnichannel/slaPolicies/SlaPage.tsx index ea36f45fbf9..f6ff34f0cd6 100644 --- a/apps/meteor/client/omnichannel/slaPolicies/SlaPage.tsx +++ b/apps/meteor/client/omnichannel/slaPolicies/SlaPage.tsx @@ -4,6 +4,9 @@ import { useRouteParameter, useRoute } from '@rocket.chat/ui-contexts'; import React, { useRef, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; +import SlaEditWithData from './SlaEditWithData'; +import SlaNew from './SlaNew'; +import SlaTable from './SlaTable'; import { Contextualbar, ContextualbarTitle, @@ -12,9 +15,6 @@ import { ContextualbarDialog, } from '../../components/Contextualbar'; import { Page, PageHeader, PageContent } from '../../components/Page'; -import SlaEditWithData from './SlaEditWithData'; -import SlaNew from './SlaNew'; -import SlaTable from './SlaTable'; const SlaPage = () => { const { t } = useTranslation(); diff --git a/apps/meteor/client/omnichannel/slaPolicies/SlaRoute.tsx b/apps/meteor/client/omnichannel/slaPolicies/SlaRoute.tsx index 081c33fe326..3782763d527 100644 --- a/apps/meteor/client/omnichannel/slaPolicies/SlaRoute.tsx +++ b/apps/meteor/client/omnichannel/slaPolicies/SlaRoute.tsx @@ -1,8 +1,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import React from 'react'; -import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage'; import SlaPage from './SlaPage'; +import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage'; const SlaRoute = () => { const canViewSlas = usePermission('manage-livechat-sla'); diff --git a/apps/meteor/client/omnichannel/slaPolicies/SlaTable.tsx b/apps/meteor/client/omnichannel/slaPolicies/SlaTable.tsx index e2c88a6c49f..a53f368ec9f 100644 --- a/apps/meteor/client/omnichannel/slaPolicies/SlaTable.tsx +++ b/apps/meteor/client/omnichannel/slaPolicies/SlaTable.tsx @@ -5,6 +5,7 @@ import { useQuery, hashQueryKey } from '@tanstack/react-query'; import type { MutableRefObject } from 'react'; import React, { useMemo, useState, useEffect } from 'react'; +import RemoveSlaButton from './RemoveSlaButton'; import FilterByText from '../../components/FilterByText'; import GenericNoResults from '../../components/GenericNoResults/GenericNoResults'; import { @@ -18,7 +19,6 @@ import { } from '../../components/GenericTable'; import { usePagination } from '../../components/GenericTable/hooks/usePagination'; import { useSort } from '../../components/GenericTable/hooks/useSort'; -import RemoveSlaButton from './RemoveSlaButton'; const SlaTable = ({ reload }: { reload: MutableRefObject<() => void> }) => { const t = useTranslation(); diff --git a/apps/meteor/client/omnichannel/tags/TagEdit.tsx b/apps/meteor/client/omnichannel/tags/TagEdit.tsx index d4ddfa60216..8544a17f537 100644 --- a/apps/meteor/client/omnichannel/tags/TagEdit.tsx +++ b/apps/meteor/client/omnichannel/tags/TagEdit.tsx @@ -7,6 +7,7 @@ import React from 'react'; import { useForm, Controller } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; +import { useRemoveTag } from './useRemoveTag'; import AutoCompleteDepartmentMultiple from '../../components/AutoCompleteDepartmentMultiple'; import { ContextualbarScrollableContent, @@ -16,7 +17,6 @@ import { ContextualbarHeader, ContextualbarClose, } from '../../components/Contextualbar'; -import { useRemoveTag } from './useRemoveTag'; type TagEditPayload = { name: string; diff --git a/apps/meteor/client/omnichannel/tags/TagEditWithData.tsx b/apps/meteor/client/omnichannel/tags/TagEditWithData.tsx index b8a20733a58..df6aa7e0853 100644 --- a/apps/meteor/client/omnichannel/tags/TagEditWithData.tsx +++ b/apps/meteor/client/omnichannel/tags/TagEditWithData.tsx @@ -5,9 +5,9 @@ import { useQuery } from '@tanstack/react-query'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { ContextualbarSkeleton } from '../../components/Contextualbar'; import TagEdit from './TagEdit'; import TagEditWithDepartmentData from './TagEditWithDepartmentData'; +import { ContextualbarSkeleton } from '../../components/Contextualbar'; const TagEditWithData = ({ tagId }: { tagId: ILivechatTag['_id'] }) => { const { t } = useTranslation(); diff --git a/apps/meteor/client/omnichannel/tags/TagEditWithDepartmentData.tsx b/apps/meteor/client/omnichannel/tags/TagEditWithDepartmentData.tsx index ce4707417d1..a32fcee46fb 100644 --- a/apps/meteor/client/omnichannel/tags/TagEditWithDepartmentData.tsx +++ b/apps/meteor/client/omnichannel/tags/TagEditWithDepartmentData.tsx @@ -4,8 +4,8 @@ import { useTranslation, useEndpoint } from '@rocket.chat/ui-contexts'; import { useQuery } from '@tanstack/react-query'; import React from 'react'; -import { ContextualbarSkeleton } from '../../components/Contextualbar'; import TagEdit from './TagEdit'; +import { ContextualbarSkeleton } from '../../components/Contextualbar'; const TagEditWithDepartmentData = ({ tagData }: { tagData: ILivechatTag }) => { const t = useTranslation(); diff --git a/apps/meteor/client/omnichannel/tags/TagsPage.tsx b/apps/meteor/client/omnichannel/tags/TagsPage.tsx index add1c64531d..86c299cde24 100644 --- a/apps/meteor/client/omnichannel/tags/TagsPage.tsx +++ b/apps/meteor/client/omnichannel/tags/TagsPage.tsx @@ -2,11 +2,11 @@ import { Button, ButtonGroup } from '@rocket.chat/fuselage'; import { useRouter, useTranslation, useRouteParameter } from '@rocket.chat/ui-contexts'; import React from 'react'; -import { ContextualbarDialog } from '../../components/Contextualbar'; -import { Page, PageHeader, PageContent } from '../../components/Page'; import TagEdit from './TagEdit'; import TagEditWithData from './TagEditWithData'; import TagsTable from './TagsTable'; +import { ContextualbarDialog } from '../../components/Contextualbar'; +import { Page, PageHeader, PageContent } from '../../components/Page'; const TagsPage = () => { const t = useTranslation(); diff --git a/apps/meteor/client/omnichannel/tags/TagsRoute.tsx b/apps/meteor/client/omnichannel/tags/TagsRoute.tsx index 11f3e4348a0..61d5875929e 100644 --- a/apps/meteor/client/omnichannel/tags/TagsRoute.tsx +++ b/apps/meteor/client/omnichannel/tags/TagsRoute.tsx @@ -1,8 +1,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import React from 'react'; -import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage'; import TagsPage from './TagsPage'; +import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage'; const TagsRoute = () => { const canViewTags = usePermission('manage-livechat-tags'); diff --git a/apps/meteor/client/omnichannel/tags/TagsTable.tsx b/apps/meteor/client/omnichannel/tags/TagsTable.tsx index 6405c45f409..e95121a2270 100644 --- a/apps/meteor/client/omnichannel/tags/TagsTable.tsx +++ b/apps/meteor/client/omnichannel/tags/TagsTable.tsx @@ -4,6 +4,7 @@ import { useTranslation, useEndpoint, useRouter } from '@rocket.chat/ui-contexts import { useQuery, hashQueryKey } from '@tanstack/react-query'; import React, { useMemo, useState } from 'react'; +import { useRemoveTag } from './useRemoveTag'; import FilterByText from '../../components/FilterByText'; import GenericNoResults from '../../components/GenericNoResults'; import { @@ -17,7 +18,6 @@ import { } from '../../components/GenericTable'; import { usePagination } from '../../components/GenericTable/hooks/usePagination'; import { useSort } from '../../components/GenericTable/hooks/useSort'; -import { useRemoveTag } from './useRemoveTag'; const TagsTable = () => { const t = useTranslation(); diff --git a/apps/meteor/client/omnichannel/units/UnitEdit.tsx b/apps/meteor/client/omnichannel/units/UnitEdit.tsx index b2feb1db8a8..0db2c576301 100644 --- a/apps/meteor/client/omnichannel/units/UnitEdit.tsx +++ b/apps/meteor/client/omnichannel/units/UnitEdit.tsx @@ -20,6 +20,7 @@ import { useQueryClient } from '@tanstack/react-query'; import React, { useMemo, useState } from 'react'; import { useForm, Controller } from 'react-hook-form'; +import { useRemoveUnit } from './useRemoveUnit'; import { ContextualbarScrollableContent, ContextualbarFooter, @@ -32,7 +33,6 @@ import { useRecordList } from '../../hooks/lists/useRecordList'; import { AsyncStatePhase } from '../../hooks/useAsyncState'; import { useDepartmentsByUnitsList } from '../../views/hooks/useDepartmentsByUnitsList'; import { useMonitorsList } from '../../views/hooks/useMonitorsList'; -import { useRemoveUnit } from './useRemoveUnit'; type UnitEditProps = { unitData?: Serialized; diff --git a/apps/meteor/client/omnichannel/units/UnitEditWithData.tsx b/apps/meteor/client/omnichannel/units/UnitEditWithData.tsx index 8bd2294e52c..28d137f4b5e 100644 --- a/apps/meteor/client/omnichannel/units/UnitEditWithData.tsx +++ b/apps/meteor/client/omnichannel/units/UnitEditWithData.tsx @@ -5,8 +5,8 @@ import { useQuery } from '@tanstack/react-query'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { ContextualbarSkeleton } from '../../components/Contextualbar'; import UnitEdit from './UnitEdit'; +import { ContextualbarSkeleton } from '../../components/Contextualbar'; const UnitEditWithData = ({ unitId }: { unitId: IOmnichannelBusinessUnit['_id'] }) => { const { t } = useTranslation(); diff --git a/apps/meteor/client/omnichannel/units/UnitsPage.tsx b/apps/meteor/client/omnichannel/units/UnitsPage.tsx index 190c22991fb..db14a907e56 100644 --- a/apps/meteor/client/omnichannel/units/UnitsPage.tsx +++ b/apps/meteor/client/omnichannel/units/UnitsPage.tsx @@ -2,11 +2,11 @@ import { Button, ButtonGroup } from '@rocket.chat/fuselage'; import { useTranslation, useRouteParameter, useRouter } from '@rocket.chat/ui-contexts'; import React from 'react'; -import { ContextualbarDialog } from '../../components/Contextualbar'; -import { Page, PageHeader, PageContent } from '../../components/Page'; import UnitEdit from './UnitEdit'; import UnitEditWithData from './UnitEditWithData'; import UnitsTable from './UnitsTable'; +import { ContextualbarDialog } from '../../components/Contextualbar'; +import { Page, PageHeader, PageContent } from '../../components/Page'; const UnitsPage = () => { const t = useTranslation(); diff --git a/apps/meteor/client/omnichannel/units/UnitsRoute.tsx b/apps/meteor/client/omnichannel/units/UnitsRoute.tsx index 9490fd2d204..6017f1f0a97 100644 --- a/apps/meteor/client/omnichannel/units/UnitsRoute.tsx +++ b/apps/meteor/client/omnichannel/units/UnitsRoute.tsx @@ -1,9 +1,9 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import React from 'react'; +import UnitsPage from './UnitsPage'; import { useHasLicenseModule } from '../../hooks/useHasLicenseModule'; import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage'; -import UnitsPage from './UnitsPage'; const UnitsRoute = () => { const canViewUnits = usePermission('manage-livechat-units'); diff --git a/apps/meteor/client/omnichannel/units/UnitsTable.tsx b/apps/meteor/client/omnichannel/units/UnitsTable.tsx index f83617310fa..8cfc2cbfbd8 100644 --- a/apps/meteor/client/omnichannel/units/UnitsTable.tsx +++ b/apps/meteor/client/omnichannel/units/UnitsTable.tsx @@ -5,6 +5,7 @@ import { useQuery, hashQueryKey } from '@tanstack/react-query'; import React, { useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; +import { useRemoveUnit } from './useRemoveUnit'; import FilterByText from '../../components/FilterByText'; import GenericNoResults from '../../components/GenericNoResults/GenericNoResults'; import { @@ -18,7 +19,6 @@ import { } from '../../components/GenericTable'; import { usePagination } from '../../components/GenericTable/hooks/usePagination'; import { useSort } from '../../components/GenericTable/hooks/useSort'; -import { useRemoveUnit } from './useRemoveUnit'; const UnitsTable = () => { const { t } = useTranslation(); diff --git a/apps/meteor/client/providers/AppsProvider/AppsProvider.spec.ts b/apps/meteor/client/providers/AppsProvider/AppsProvider.spec.ts index 8210fe22eec..c05ed7f1d08 100644 --- a/apps/meteor/client/providers/AppsProvider/AppsProvider.spec.ts +++ b/apps/meteor/client/providers/AppsProvider/AppsProvider.spec.ts @@ -1,9 +1,9 @@ import type { App } from '@rocket.chat/core-typings'; import type { UseQueryResult } from '@tanstack/react-query'; +import { storeQueryFunction } from './storeQueryFunction'; import { createFakeApp } from '../../../tests/mocks/data'; import { createFakeAppInstalledMarketplace, createFakeAppPrivate } from '../../../tests/mocks/data/marketplace'; -import { storeQueryFunction } from './storeQueryFunction'; describe(`when an app installed from the Marketplace, but has since been unpublished`, () => { it(`should still be present in the installed app data provided`, () => { diff --git a/apps/meteor/client/providers/AppsProvider/AppsProvider.tsx b/apps/meteor/client/providers/AppsProvider/AppsProvider.tsx index 672a794438f..dee82ce691e 100644 --- a/apps/meteor/client/providers/AppsProvider/AppsProvider.tsx +++ b/apps/meteor/client/providers/AppsProvider/AppsProvider.tsx @@ -4,6 +4,7 @@ import { useQuery, useQueryClient } from '@tanstack/react-query'; import type { ReactNode } from 'react'; import React, { useEffect } from 'react'; +import { storeQueryFunction } from './storeQueryFunction'; import { AppClientOrchestratorInstance } from '../../apps/orchestrator'; import { AppsContext } from '../../contexts/AppsContext'; import { useInvalidateLicense, useLicense } from '../../hooks/useLicense'; @@ -11,7 +12,6 @@ import type { AsyncState } from '../../lib/asyncState'; import { AsyncStatePhase } from '../../lib/asyncState'; import { useInvalidateAppsCountQueryCallback } from '../../views/marketplace/hooks/useAppsCountQuery'; import type { App } from '../../views/marketplace/types'; -import { storeQueryFunction } from './storeQueryFunction'; const getAppState = ( loading: boolean, diff --git a/apps/meteor/client/providers/AuthenticationProvider/AuthenticationProvider.tsx b/apps/meteor/client/providers/AuthenticationProvider/AuthenticationProvider.tsx index bb135c4f22d..840d6a049ab 100644 --- a/apps/meteor/client/providers/AuthenticationProvider/AuthenticationProvider.tsx +++ b/apps/meteor/client/providers/AuthenticationProvider/AuthenticationProvider.tsx @@ -5,8 +5,8 @@ import { Meteor } from 'meteor/meteor'; import type { ContextType, ReactElement, ReactNode } from 'react'; import React, { useMemo } from 'react'; -import { loginServices } from '../../lib/loginServices'; import { useLDAPAndCrowdCollisionWarning } from './hooks/useLDAPAndCrowdCollisionWarning'; +import { loginServices } from '../../lib/loginServices'; export type LoginMethods = keyof typeof Meteor extends infer T ? (T extends `loginWith${string}` ? T : never) : never; diff --git a/apps/meteor/client/providers/CallProvider/CallProvider.tsx b/apps/meteor/client/providers/CallProvider/CallProvider.tsx index 6e728dc35eb..2415441f0c6 100644 --- a/apps/meteor/client/providers/CallProvider/CallProvider.tsx +++ b/apps/meteor/client/providers/CallProvider/CallProvider.tsx @@ -28,6 +28,7 @@ import React, { useMemo, useRef, useCallback, useEffect, useState } from 'react' import { createPortal } from 'react-dom'; import type { OutgoingByeRequest } from 'sip.js/lib/core'; +import { useVoipSounds } from './hooks/useVoipSounds'; import type { CallContextValue } from '../../contexts/CallContext'; import { CallContext, useIsVoipEnterprise } from '../../contexts/CallContext'; import { useDialModal } from '../../hooks/useDialModal'; @@ -36,7 +37,6 @@ import { roomCoordinator } from '../../lib/rooms/roomCoordinator'; import type { QueueAggregator } from '../../lib/voip/QueueAggregator'; import { parseOutboundPhoneNumber } from '../../lib/voip/parseOutboundPhoneNumber'; import { WrapUpCallModal } from '../../voip/components/modals/WrapUpCallModal'; -import { useVoipSounds } from './hooks/useVoipSounds'; type NetworkState = 'online' | 'offline'; diff --git a/apps/meteor/client/providers/EmojiPickerProvider/EmojiPickerProvider.tsx b/apps/meteor/client/providers/EmojiPickerProvider/EmojiPickerProvider.tsx index 02b406dc2a6..ffc31900b04 100644 --- a/apps/meteor/client/providers/EmojiPickerProvider/EmojiPickerProvider.tsx +++ b/apps/meteor/client/providers/EmojiPickerProvider/EmojiPickerProvider.tsx @@ -2,11 +2,11 @@ import { useDebouncedState, useLocalStorage } from '@rocket.chat/fuselage-hooks' import type { ReactNode, ReactElement, ContextType } from 'react'; import React, { useState, useCallback, useMemo, useEffect } from 'react'; +import { useUpdateCustomEmoji } from './useUpdateCustomEmoji'; import type { EmojiByCategory } from '../../../app/emoji/client'; import { emoji, getFrequentEmoji, updateRecent, createEmojiList, createPickerEmojis, CUSTOM_CATEGORY } from '../../../app/emoji/client'; import { EmojiPickerContext } from '../../contexts/EmojiPickerContext'; import EmojiPicker from '../../views/composer/EmojiPicker/EmojiPicker'; -import { useUpdateCustomEmoji } from './useUpdateCustomEmoji'; const DEFAULT_ITEMS_LIMIT = 90; diff --git a/apps/meteor/client/providers/MeteorProvider.tsx b/apps/meteor/client/providers/MeteorProvider.tsx index ad5df950383..53dbd4b9503 100644 --- a/apps/meteor/client/providers/MeteorProvider.tsx +++ b/apps/meteor/client/providers/MeteorProvider.tsx @@ -2,7 +2,6 @@ import { VoipProvider } from '@rocket.chat/ui-voip'; import type { ReactNode } from 'react'; import React from 'react'; -import { OmnichannelRoomIconProvider } from '../components/RoomIcon/OmnichannelRoomIcon/provider/OmnichannelRoomIconProvider'; import ActionManagerProvider from './ActionManagerProvider'; import AuthenticationProvider from './AuthenticationProvider/AuthenticationProvider'; import AuthorizationProvider from './AuthorizationProvider'; @@ -25,6 +24,7 @@ import TranslationProvider from './TranslationProvider'; import UserPresenceProvider from './UserPresenceProvider'; import UserProvider from './UserProvider'; import VideoConfProvider from './VideoConfProvider'; +import { OmnichannelRoomIconProvider } from '../components/RoomIcon/OmnichannelRoomIcon/provider/OmnichannelRoomIconProvider'; type MeteorProviderProps = { children?: ReactNode; diff --git a/apps/meteor/client/providers/ModalProvider/ModalProvider.spec.tsx b/apps/meteor/client/providers/ModalProvider/ModalProvider.spec.tsx index fd82af58776..414eeb1ad92 100644 --- a/apps/meteor/client/providers/ModalProvider/ModalProvider.spec.tsx +++ b/apps/meteor/client/providers/ModalProvider/ModalProvider.spec.tsx @@ -3,11 +3,11 @@ import { act, render, screen } from '@testing-library/react'; import type { ForwardedRef, ReactElement } from 'react'; import React, { Suspense, createContext, createRef, forwardRef, useContext, useImperativeHandle } from 'react'; +import ModalProvider from './ModalProvider'; +import ModalProviderWithRegion from './ModalProviderWithRegion'; import GenericModal from '../../components/GenericModal'; import { imperativeModal } from '../../lib/imperativeModal'; import ModalRegion from '../../views/modal/ModalRegion'; -import ModalProvider from './ModalProvider'; -import ModalProviderWithRegion from './ModalProviderWithRegion'; const renderWithSuspense = (ui: ReactElement) => render(ui, { diff --git a/apps/meteor/client/providers/ModalProvider/ModalProviderWithRegion.tsx b/apps/meteor/client/providers/ModalProvider/ModalProviderWithRegion.tsx index e8d1f52bbd9..64f739bdb58 100644 --- a/apps/meteor/client/providers/ModalProvider/ModalProviderWithRegion.tsx +++ b/apps/meteor/client/providers/ModalProvider/ModalProviderWithRegion.tsx @@ -1,8 +1,8 @@ import type { ReactNode } from 'react'; import React, { useState } from 'react'; -import ModalRegion from '../../views/modal/ModalRegion'; import ModalProvider from './ModalProvider'; +import ModalRegion from '../../views/modal/ModalRegion'; const ModalProviderWithRegion = ({ children }: { children?: ReactNode }) => { const [region] = useState(() => Symbol()); diff --git a/apps/meteor/client/providers/UserProvider/UserProvider.tsx b/apps/meteor/client/providers/UserProvider/UserProvider.tsx index 4483ae4c689..e323d30ff74 100644 --- a/apps/meteor/client/providers/UserProvider/UserProvider.tsx +++ b/apps/meteor/client/providers/UserProvider/UserProvider.tsx @@ -6,6 +6,10 @@ import { Meteor } from 'meteor/meteor'; import type { ContextType, ReactElement, ReactNode } from 'react'; import React, { useEffect, useMemo, useRef } from 'react'; +import { useClearRemovedRoomsHistory } from './hooks/useClearRemovedRoomsHistory'; +import { useDeleteUser } from './hooks/useDeleteUser'; +import { useEmailVerificationWarning } from './hooks/useEmailVerificationWarning'; +import { useUpdateAvatar } from './hooks/useUpdateAvatar'; import { Subscriptions, ChatRoom } from '../../../app/models/client'; import { getUserPreference } from '../../../app/utils/client'; import { sdk } from '../../../app/utils/client/lib/SDKClient'; @@ -14,10 +18,6 @@ import { useReactiveValue } from '../../hooks/useReactiveValue'; import { createReactiveSubscriptionFactory } from '../../lib/createReactiveSubscriptionFactory'; import { queryClient } from '../../lib/queryClient'; import { useCreateFontStyleElement } from '../../views/account/accessibility/hooks/useCreateFontStyleElement'; -import { useClearRemovedRoomsHistory } from './hooks/useClearRemovedRoomsHistory'; -import { useDeleteUser } from './hooks/useDeleteUser'; -import { useEmailVerificationWarning } from './hooks/useEmailVerificationWarning'; -import { useUpdateAvatar } from './hooks/useUpdateAvatar'; const getUser = (): IUser | null => Meteor.user() as IUser | null; diff --git a/apps/meteor/client/sidebar/Item/Condensed.stories.tsx b/apps/meteor/client/sidebar/Item/Condensed.stories.tsx index b0936c3171d..09c1af25ba4 100644 --- a/apps/meteor/client/sidebar/Item/Condensed.stories.tsx +++ b/apps/meteor/client/sidebar/Item/Condensed.stories.tsx @@ -4,8 +4,8 @@ import { action } from '@storybook/addon-actions'; import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; -import * as Status from '../../components/UserStatus'; import Condensed from './Condensed'; +import * as Status from '../../components/UserStatus'; export default { title: 'Sidebar/Condensed', diff --git a/apps/meteor/client/sidebar/Item/Extended.stories.tsx b/apps/meteor/client/sidebar/Item/Extended.stories.tsx index ce7705b0d7d..e076370a590 100644 --- a/apps/meteor/client/sidebar/Item/Extended.stories.tsx +++ b/apps/meteor/client/sidebar/Item/Extended.stories.tsx @@ -4,8 +4,8 @@ import { action } from '@storybook/addon-actions'; import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; -import * as Status from '../../components/UserStatus'; import Extended from './Extended'; +import * as Status from '../../components/UserStatus'; export default { title: 'Sidebar/Extended', diff --git a/apps/meteor/client/sidebar/Item/Medium.stories.tsx b/apps/meteor/client/sidebar/Item/Medium.stories.tsx index 44b570662ae..9321aa09fdd 100644 --- a/apps/meteor/client/sidebar/Item/Medium.stories.tsx +++ b/apps/meteor/client/sidebar/Item/Medium.stories.tsx @@ -4,8 +4,8 @@ import { action } from '@storybook/addon-actions'; import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; -import * as Status from '../../components/UserStatus'; import Medium from './Medium'; +import * as Status from '../../components/UserStatus'; export default { title: 'Sidebar/Medium', diff --git a/apps/meteor/client/sidebar/RoomList/RoomList.tsx b/apps/meteor/client/sidebar/RoomList/RoomList.tsx index e618663f6ed..04c1fd83400 100644 --- a/apps/meteor/client/sidebar/RoomList/RoomList.tsx +++ b/apps/meteor/client/sidebar/RoomList/RoomList.tsx @@ -8,6 +8,9 @@ import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { Virtuoso } from 'react-virtuoso'; +import RoomListRow from './RoomListRow'; +import RoomListRowWrapper from './RoomListRowWrapper'; +import RoomListWrapper from './RoomListWrapper'; import { VirtuosoScrollbars } from '../../components/CustomScrollbars'; import { useOpenedRoom } from '../../lib/RoomManager'; import { useAvatarTemplate } from '../hooks/useAvatarTemplate'; @@ -15,9 +18,6 @@ import { usePreventDefault } from '../hooks/usePreventDefault'; import { useRoomList } from '../hooks/useRoomList'; import { useShortcutOpenMenu } from '../hooks/useShortcutOpenMenu'; import { useTemplateByViewMode } from '../hooks/useTemplateByViewMode'; -import RoomListRow from './RoomListRow'; -import RoomListRowWrapper from './RoomListRowWrapper'; -import RoomListWrapper from './RoomListWrapper'; const computeItemKey = (index: number, room: IRoom): IRoom['_id'] | number => room._id || index; diff --git a/apps/meteor/client/sidebar/RoomList/RoomListRow.tsx b/apps/meteor/client/sidebar/RoomList/RoomListRow.tsx index 22ffa3bf8cf..481299acdb8 100644 --- a/apps/meteor/client/sidebar/RoomList/RoomListRow.tsx +++ b/apps/meteor/client/sidebar/RoomList/RoomListRow.tsx @@ -4,10 +4,10 @@ import type { TFunction } from 'i18next'; import type { ReactElement } from 'react'; import React, { memo, useMemo } from 'react'; +import SideBarItemTemplateWithData from './SideBarItemTemplateWithData'; import { useVideoConfAcceptCall, useVideoConfRejectIncomingCall, useVideoConfIncomingCalls } from '../../contexts/VideoConfContext'; import type { useAvatarTemplate } from '../hooks/useAvatarTemplate'; import type { useTemplateByViewMode } from '../hooks/useTemplateByViewMode'; -import SideBarItemTemplateWithData from './SideBarItemTemplateWithData'; type RoomListRowProps = { extended: boolean; diff --git a/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx b/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx index 4c8640e96de..b2129efc516 100644 --- a/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx +++ b/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx @@ -6,6 +6,7 @@ import type { TFunction } from 'i18next'; import type { AllHTMLAttributes, ComponentType, ReactElement, ReactNode } from 'react'; import React, { memo, useMemo } from 'react'; +import { normalizeSidebarMessage } from './normalizeSidebarMessage'; import { RoomIcon } from '../../components/RoomIcon'; import { roomCoordinator } from '../../lib/rooms/roomCoordinator'; import { isIOsDevice } from '../../lib/utils/isIOsDevice'; @@ -13,7 +14,6 @@ import { useOmnichannelPriorities } from '../../omnichannel/hooks/useOmnichannel import RoomMenu from '../RoomMenu'; import { OmnichannelBadges } from '../badges/OmnichannelBadges'; import type { useAvatarTemplate } from '../hooks/useAvatarTemplate'; -import { normalizeSidebarMessage } from './normalizeSidebarMessage'; const getMessage = (room: IRoom, lastMessage: IMessage | undefined, t: TFunction): string | undefined => { if (!lastMessage) { diff --git a/apps/meteor/client/sidebar/Sidebar.tsx b/apps/meteor/client/sidebar/Sidebar.tsx index 683013b3821..541afdfe0be 100644 --- a/apps/meteor/client/sidebar/Sidebar.tsx +++ b/apps/meteor/client/sidebar/Sidebar.tsx @@ -3,12 +3,12 @@ import { Box } from '@rocket.chat/fuselage'; import { useLayout, useUserPreference } from '@rocket.chat/ui-contexts'; import React, { memo } from 'react'; -import { useOmnichannelEnabled } from '../hooks/omnichannel/useOmnichannelEnabled'; import SidebarRoomList from './RoomList'; import SidebarFooter from './footer'; import SidebarHeader from './header'; import BannerSection from './sections/BannerSection'; import OmnichannelSection from './sections/OmnichannelSection'; +import { useOmnichannelEnabled } from '../hooks/omnichannel/useOmnichannelEnabled'; // TODO unit test airgappedbanner const Sidebar = () => { diff --git a/apps/meteor/client/sidebar/footer/SidebarFooter.tsx b/apps/meteor/client/sidebar/footer/SidebarFooter.tsx index f31f1a3e6b8..7b4da560413 100644 --- a/apps/meteor/client/sidebar/footer/SidebarFooter.tsx +++ b/apps/meteor/client/sidebar/footer/SidebarFooter.tsx @@ -1,9 +1,9 @@ import type { ReactElement } from 'react'; import React from 'react'; -import { useIsCallEnabled, useIsCallReady } from '../../contexts/CallContext'; import SidebarFooterDefault from './SidebarFooterDefault'; import { VoipFooter } from './voip'; +import { useIsCallEnabled, useIsCallReady } from '../../contexts/CallContext'; const SidebarFooter = (): ReactElement => { const isCallEnabled = useIsCallEnabled(); diff --git a/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx b/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx index 0185c772483..c9145a8a121 100644 --- a/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx +++ b/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx @@ -6,9 +6,9 @@ import type { ReactElement, MouseEvent, ReactNode } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import { useOmnichannelContactLabel } from './hooks/useOmnichannelContactLabel'; import type { CallActionsType } from '../../../contexts/CallContext'; import type { VoipFooterMenuOptions } from '../../../hooks/useVoipFooterMenu'; -import { useOmnichannelContactLabel } from './hooks/useOmnichannelContactLabel'; type VoipFooterPropsType = { caller: ICallerInfo; diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomList.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomList.tsx index 1b49e987faf..ff0fd748c8f 100644 --- a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomList.tsx +++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomList.tsx @@ -6,11 +6,11 @@ import React from 'react'; import { useTranslation } from 'react-i18next'; import { Virtuoso } from 'react-virtuoso'; -import { VirtuosoScrollbars } from '../../../components/CustomScrollbars'; -import { roomCoordinator } from '../../../lib/rooms/roomCoordinator'; import FederatedRoomListEmptyPlaceholder from './FederatedRoomListEmptyPlaceholder'; import FederatedRoomListItem from './FederatedRoomListItem'; import { useInfiniteFederationSearchPublicRooms } from './useInfiniteFederationSearchPublicRooms'; +import { VirtuosoScrollbars } from '../../../components/CustomScrollbars'; +import { roomCoordinator } from '../../../lib/rooms/roomCoordinator'; type FederatedRoomListProps = { serverName: string; diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomMenu.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomMenu.tsx index 872294a5a27..795944b8d81 100644 --- a/apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomMenu.tsx +++ b/apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomMenu.tsx @@ -1,9 +1,9 @@ import { useAtLeastOnePermission, useSetting } from '@rocket.chat/ui-contexts'; import { useTranslation } from 'react-i18next'; -import { useIsEnterprise } from '../../../../hooks/useIsEnterprise'; import { useCreateRoomItems } from './useCreateRoomItems'; import { useMatrixFederationItems } from './useMatrixFederationItems'; +import { useIsEnterprise } from '../../../../hooks/useIsEnterprise'; const CREATE_ROOM_PERMISSIONS = ['create-c', 'create-p', 'create-d', 'start-discussion', 'start-discussion-other-user']; diff --git a/apps/meteor/client/sidebar/header/hooks/useStatusItems.tsx b/apps/meteor/client/sidebar/header/hooks/useStatusItems.tsx index db126708f51..bd8fa009d33 100644 --- a/apps/meteor/client/sidebar/header/hooks/useStatusItems.tsx +++ b/apps/meteor/client/sidebar/header/hooks/useStatusItems.tsx @@ -5,13 +5,13 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; import React, { useEffect } from 'react'; import { useTranslation } from 'react-i18next'; +import { useCustomStatusModalHandler } from './useCustomStatusModalHandler'; import { callbacks } from '../../../../lib/callbacks'; import MarkdownText from '../../../components/MarkdownText'; import { UserStatus } from '../../../components/UserStatus'; import { userStatuses } from '../../../lib/userStatuses'; import type { UserStatusDescriptor } from '../../../lib/userStatuses'; import { useStatusDisabledModal } from '../../../views/admin/customUserStatus/hooks/useStatusDisabledModal'; -import { useCustomStatusModalHandler } from './useCustomStatusModalHandler'; export const useStatusItems = (): GenericMenuItemProps[] => { // We should lift this up to somewhere else if we want to use it in other places diff --git a/apps/meteor/client/sidebar/hooks/useRoomList.ts b/apps/meteor/client/sidebar/hooks/useRoomList.ts index afdc57086dc..1d387d90efe 100644 --- a/apps/meteor/client/sidebar/hooks/useRoomList.ts +++ b/apps/meteor/client/sidebar/hooks/useRoomList.ts @@ -3,10 +3,10 @@ import { useDebouncedState } from '@rocket.chat/fuselage-hooks'; import { useUserPreference, useUserSubscriptions, useSetting } from '@rocket.chat/ui-contexts'; import { useEffect } from 'react'; +import { useQueryOptions } from './useQueryOptions'; import { useVideoConfIncomingCalls } from '../../contexts/VideoConfContext'; import { useOmnichannelEnabled } from '../../hooks/omnichannel/useOmnichannelEnabled'; import { useQueuedInquiries } from '../../hooks/omnichannel/useQueuedInquiries'; -import { useQueryOptions } from './useQueryOptions'; const query = { open: { $ne: false } }; diff --git a/apps/meteor/client/sidebar/search/Row.tsx b/apps/meteor/client/sidebar/search/Row.tsx index 68ceecd2ad8..35255390da3 100644 --- a/apps/meteor/client/sidebar/search/Row.tsx +++ b/apps/meteor/client/sidebar/search/Row.tsx @@ -2,8 +2,8 @@ import type { IRoom, ISubscription } from '@rocket.chat/core-typings'; import type { ReactElement } from 'react'; import React, { memo } from 'react'; -import SideBarItemTemplateWithData from '../RoomList/SideBarItemTemplateWithData'; import UserItem from './UserItem'; +import SideBarItemTemplateWithData from '../RoomList/SideBarItemTemplateWithData'; type RowProps = { item: ISubscription & IRoom; diff --git a/apps/meteor/client/sidebar/search/SearchList.tsx b/apps/meteor/client/sidebar/search/SearchList.tsx index dd97678f638..86b8922500d 100644 --- a/apps/meteor/client/sidebar/search/SearchList.tsx +++ b/apps/meteor/client/sidebar/search/SearchList.tsx @@ -12,12 +12,12 @@ import type { VirtuosoHandle } from 'react-virtuoso'; import { Virtuoso } from 'react-virtuoso'; import tinykeys from 'tinykeys'; +import Row from './Row'; import { VirtuosoScrollbars } from '../../components/CustomScrollbars'; import { getConfig } from '../../lib/utils/getConfig'; import { useAvatarTemplate } from '../hooks/useAvatarTemplate'; import { usePreventDefault } from '../hooks/usePreventDefault'; import { useTemplateByViewMode } from '../hooks/useTemplateByViewMode'; -import Row from './Row'; const mobileCheck = function () { let check = false; diff --git a/apps/meteor/client/sidebar/sections/BannerSection.tsx b/apps/meteor/client/sidebar/sections/BannerSection.tsx index 73c1fdd9d5e..a69c1b951b6 100644 --- a/apps/meteor/client/sidebar/sections/BannerSection.tsx +++ b/apps/meteor/client/sidebar/sections/BannerSection.tsx @@ -2,9 +2,9 @@ import { useSessionStorage } from '@rocket.chat/fuselage-hooks'; import { useRole, useSetting } from '@rocket.chat/ui-contexts'; import React from 'react'; -import { useAirGappedRestriction } from '../../hooks/useAirGappedRestriction'; import AirGappedRestrictionBanner from './AirGappedRestrictionBanner/AirGappedRestrictionBanner'; import StatusDisabledBanner from './StatusDisabledBanner'; +import { useAirGappedRestriction } from '../../hooks/useAirGappedRestriction'; const BannerSection = () => { const [isRestricted, isWarning, remainingDays] = useAirGappedRestriction(); diff --git a/apps/meteor/client/sidebar/sections/OmnichannelSection.tsx b/apps/meteor/client/sidebar/sections/OmnichannelSection.tsx index f4c2d8df2c2..75d663ea1be 100644 --- a/apps/meteor/client/sidebar/sections/OmnichannelSection.tsx +++ b/apps/meteor/client/sidebar/sections/OmnichannelSection.tsx @@ -5,12 +5,12 @@ import { useLayout, useRoute, usePermission } from '@rocket.chat/ui-contexts'; import React, { memo } from 'react'; import { useTranslation } from 'react-i18next'; +import { OverMacLimitSection } from './OverMacLimitSection'; +import { OmniChannelCallDialPad, OmnichannelCallToggle, OmnichannelLivechatToggle } from './actions'; import { useIsCallEnabled, useIsCallReady } from '../../contexts/CallContext'; import { useIsOverMacLimit } from '../../hooks/omnichannel/useIsOverMacLimit'; import { useOmnichannelShowQueueLink } from '../../hooks/omnichannel/useOmnichannelShowQueueLink'; import SidebarHeaderToolbar from '../header/SidebarHeaderToolbar'; -import { OverMacLimitSection } from './OverMacLimitSection'; -import { OmniChannelCallDialPad, OmnichannelCallToggle, OmnichannelLivechatToggle } from './actions'; const OmnichannelSection = () => { const { t } = useTranslation(); diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggle.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggle.tsx index 701286fc966..e4e4ea3e2c4 100644 --- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggle.tsx +++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggle.tsx @@ -1,10 +1,10 @@ import type { ReactElement } from 'react'; import React from 'react'; -import { useIsCallReady, useIsCallError } from '../../../contexts/CallContext'; import { OmnichannelCallToggleError } from './OmnichannelCallToggleError'; import { OmnichannelCallToggleLoading } from './OmnichannelCallToggleLoading'; import { OmnichannelCallToggleReady } from './OmnichannelCallToggleReady'; +import { useIsCallReady, useIsCallError } from '../../../contexts/CallContext'; export const OmnichannelCallToggle = ({ ...props }): ReactElement => { const isCallReady = useIsCallReady(); diff --git a/apps/meteor/client/sidebarv2/Item/Condensed.stories.tsx b/apps/meteor/client/sidebarv2/Item/Condensed.stories.tsx index 497f5de0ee8..7b780a0ca60 100644 --- a/apps/meteor/client/sidebarv2/Item/Condensed.stories.tsx +++ b/apps/meteor/client/sidebarv2/Item/Condensed.stories.tsx @@ -4,8 +4,8 @@ import { action } from '@storybook/addon-actions'; import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; -import * as Status from '../../components/UserStatus'; import Condensed from './Condensed'; +import * as Status from '../../components/UserStatus'; export default { title: 'SidebarV2/Condensed', diff --git a/apps/meteor/client/sidebarv2/Item/Extended.stories.tsx b/apps/meteor/client/sidebarv2/Item/Extended.stories.tsx index 162bd2706fd..33632e90013 100644 --- a/apps/meteor/client/sidebarv2/Item/Extended.stories.tsx +++ b/apps/meteor/client/sidebarv2/Item/Extended.stories.tsx @@ -4,8 +4,8 @@ import { action } from '@storybook/addon-actions'; import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; -import * as Status from '../../components/UserStatus'; import Extended from './Extended'; +import * as Status from '../../components/UserStatus'; export default { title: 'SidebarV2/Extended', diff --git a/apps/meteor/client/sidebarv2/Item/Medium.stories.tsx b/apps/meteor/client/sidebarv2/Item/Medium.stories.tsx index 56f22d0db4e..939c59a631e 100644 --- a/apps/meteor/client/sidebarv2/Item/Medium.stories.tsx +++ b/apps/meteor/client/sidebarv2/Item/Medium.stories.tsx @@ -4,8 +4,8 @@ import { action } from '@storybook/addon-actions'; import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; -import * as Status from '../../components/UserStatus'; import Medium from './Medium'; +import * as Status from '../../components/UserStatus'; export default { title: 'SidebarV2/Medium', diff --git a/apps/meteor/client/sidebarv2/RoomList/RoomList.tsx b/apps/meteor/client/sidebarv2/RoomList/RoomList.tsx index 226a32b2aeb..828d47c6b7e 100644 --- a/apps/meteor/client/sidebarv2/RoomList/RoomList.tsx +++ b/apps/meteor/client/sidebarv2/RoomList/RoomList.tsx @@ -5,6 +5,10 @@ import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { GroupedVirtuoso } from 'react-virtuoso'; +import RoomListCollapser from './RoomListCollapser'; +import RoomListRow from './RoomListRow'; +import RoomListRowWrapper from './RoomListRowWrapper'; +import RoomListWrapper from './RoomListWrapper'; import { VirtuosoScrollbars } from '../../components/CustomScrollbars'; import { useOpenedRoom } from '../../lib/RoomManager'; import { useAvatarTemplate } from '../hooks/useAvatarTemplate'; @@ -13,10 +17,6 @@ import { usePreventDefault } from '../hooks/usePreventDefault'; import { useRoomList } from '../hooks/useRoomList'; import { useShortcutOpenMenu } from '../hooks/useShortcutOpenMenu'; import { useTemplateByViewMode } from '../hooks/useTemplateByViewMode'; -import RoomListCollapser from './RoomListCollapser'; -import RoomListRow from './RoomListRow'; -import RoomListRowWrapper from './RoomListRowWrapper'; -import RoomListWrapper from './RoomListWrapper'; const RoomList = () => { const { t } = useTranslation(); diff --git a/apps/meteor/client/sidebarv2/RoomList/RoomListRow.tsx b/apps/meteor/client/sidebarv2/RoomList/RoomListRow.tsx index 810368220ba..473fad9b0e4 100644 --- a/apps/meteor/client/sidebarv2/RoomList/RoomListRow.tsx +++ b/apps/meteor/client/sidebarv2/RoomList/RoomListRow.tsx @@ -2,10 +2,10 @@ import type { IRoom, ISubscription } from '@rocket.chat/core-typings'; import type { TFunction } from 'i18next'; import React, { memo, useMemo } from 'react'; +import SidebarItemTemplateWithData from './SidebarItemTemplateWithData'; import { useVideoConfAcceptCall, useVideoConfRejectIncomingCall, useVideoConfIncomingCalls } from '../../contexts/VideoConfContext'; import type { useAvatarTemplate } from '../hooks/useAvatarTemplate'; import type { useTemplateByViewMode } from '../hooks/useTemplateByViewMode'; -import SidebarItemTemplateWithData from './SidebarItemTemplateWithData'; type RoomListRowProps = { data: { diff --git a/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx b/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx index 024615153d3..5417d3075c1 100644 --- a/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx +++ b/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx @@ -6,6 +6,7 @@ import type { TFunction } from 'i18next'; import type { AllHTMLAttributes, ComponentType, ReactElement, ReactNode } from 'react'; import React, { memo, useMemo } from 'react'; +import { normalizeSidebarMessage } from './normalizeSidebarMessage'; import { RoomIcon } from '../../components/RoomIcon'; import { roomCoordinator } from '../../lib/rooms/roomCoordinator'; import { isIOsDevice } from '../../lib/utils/isIOsDevice'; @@ -14,7 +15,6 @@ import RoomMenu from '../RoomMenu'; import { OmnichannelBadges } from '../badges/OmnichannelBadges'; import type { useAvatarTemplate } from '../hooks/useAvatarTemplate'; import { useUnreadDisplay } from '../hooks/useUnreadDisplay'; -import { normalizeSidebarMessage } from './normalizeSidebarMessage'; export const getMessage = (room: IRoom, lastMessage: IMessage | undefined, t: TFunction): string | undefined => { if (!lastMessage) { diff --git a/apps/meteor/client/sidebarv2/footer/SidebarFooter.tsx b/apps/meteor/client/sidebarv2/footer/SidebarFooter.tsx index f31f1a3e6b8..7b4da560413 100644 --- a/apps/meteor/client/sidebarv2/footer/SidebarFooter.tsx +++ b/apps/meteor/client/sidebarv2/footer/SidebarFooter.tsx @@ -1,9 +1,9 @@ import type { ReactElement } from 'react'; import React from 'react'; -import { useIsCallEnabled, useIsCallReady } from '../../contexts/CallContext'; import SidebarFooterDefault from './SidebarFooterDefault'; import { VoipFooter } from './voip'; +import { useIsCallEnabled, useIsCallReady } from '../../contexts/CallContext'; const SidebarFooter = (): ReactElement => { const isCallEnabled = useIsCallEnabled(); diff --git a/apps/meteor/client/sidebarv2/footer/voip/VoipFooter.tsx b/apps/meteor/client/sidebarv2/footer/voip/VoipFooter.tsx index 75d64d4777c..80154f307dd 100644 --- a/apps/meteor/client/sidebarv2/footer/voip/VoipFooter.tsx +++ b/apps/meteor/client/sidebarv2/footer/voip/VoipFooter.tsx @@ -6,9 +6,9 @@ import type { ReactElement, MouseEvent, ReactNode } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import { useOmnichannelContactLabel } from './hooks/useOmnichannelContactLabel'; import type { CallActionsType } from '../../../contexts/CallContext'; import type { VoipFooterMenuOptions } from '../../../hooks/useVoipFooterMenu'; -import { useOmnichannelContactLabel } from './hooks/useOmnichannelContactLabel'; type VoipFooterProps = { caller: ICallerInfo; diff --git a/apps/meteor/client/sidebarv2/header/CreateChannelModal.tsx b/apps/meteor/client/sidebarv2/header/CreateChannelModal.tsx index d374d05977b..964b808cb10 100644 --- a/apps/meteor/client/sidebarv2/header/CreateChannelModal.tsx +++ b/apps/meteor/client/sidebarv2/header/CreateChannelModal.tsx @@ -29,10 +29,10 @@ import type { ComponentProps, ReactElement } from 'react'; import React, { useEffect, useMemo } from 'react'; import { useForm, Controller } from 'react-hook-form'; +import { useEncryptedRoomDescription } from './hooks/useEncryptedRoomDescription'; import UserAutoCompleteMultipleFederated from '../../components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated'; import { useHasLicenseModule } from '../../hooks/useHasLicenseModule'; import { goToRoomById } from '../../lib/utils/goToRoomById'; -import { useEncryptedRoomDescription } from './hooks/useEncryptedRoomDescription'; type CreateChannelModalProps = { teamId?: string; diff --git a/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx b/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx index 9de721d8bbc..e3bdc651d17 100644 --- a/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx +++ b/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx @@ -30,9 +30,9 @@ import type { ComponentProps, ReactElement } from 'react'; import React, { memo, useEffect, useMemo } from 'react'; import { Controller, useForm } from 'react-hook-form'; +import { useEncryptedRoomDescription } from './hooks/useEncryptedRoomDescription'; import UserAutoCompleteMultiple from '../../components/UserAutoCompleteMultiple'; import { goToRoomById } from '../../lib/utils/goToRoomById'; -import { useEncryptedRoomDescription } from './hooks/useEncryptedRoomDescription'; type CreateTeamModalInputs = { name: string; diff --git a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomList.tsx b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomList.tsx index a69cd3aec9b..0e01cacda0e 100644 --- a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomList.tsx +++ b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomList.tsx @@ -6,11 +6,11 @@ import React from 'react'; import { useTranslation } from 'react-i18next'; import { Virtuoso } from 'react-virtuoso'; -import { VirtuosoScrollbars } from '../../../components/CustomScrollbars'; -import { roomCoordinator } from '../../../lib/rooms/roomCoordinator'; import FederatedRoomListEmptyPlaceholder from './FederatedRoomListEmptyPlaceholder'; import FederatedRoomListItem from './FederatedRoomListItem'; import { useInfiniteFederationSearchPublicRooms } from './useInfiniteFederationSearchPublicRooms'; +import { VirtuosoScrollbars } from '../../../components/CustomScrollbars'; +import { roomCoordinator } from '../../../lib/rooms/roomCoordinator'; type FederatedRoomListProps = { serverName: string; diff --git a/apps/meteor/client/sidebarv2/header/actions/hooks/useCreateRoomMenu.tsx b/apps/meteor/client/sidebarv2/header/actions/hooks/useCreateRoomMenu.tsx index 872294a5a27..795944b8d81 100644 --- a/apps/meteor/client/sidebarv2/header/actions/hooks/useCreateRoomMenu.tsx +++ b/apps/meteor/client/sidebarv2/header/actions/hooks/useCreateRoomMenu.tsx @@ -1,9 +1,9 @@ import { useAtLeastOnePermission, useSetting } from '@rocket.chat/ui-contexts'; import { useTranslation } from 'react-i18next'; -import { useIsEnterprise } from '../../../../hooks/useIsEnterprise'; import { useCreateRoomItems } from './useCreateRoomItems'; import { useMatrixFederationItems } from './useMatrixFederationItems'; +import { useIsEnterprise } from '../../../../hooks/useIsEnterprise'; const CREATE_ROOM_PERMISSIONS = ['create-c', 'create-p', 'create-d', 'start-discussion', 'start-discussion-other-user']; diff --git a/apps/meteor/client/sidebarv2/hooks/useRoomList.spec.tsx b/apps/meteor/client/sidebarv2/hooks/useRoomList.spec.tsx index 27247d0cd8b..d1b5d8d3c66 100644 --- a/apps/meteor/client/sidebarv2/hooks/useRoomList.spec.tsx +++ b/apps/meteor/client/sidebarv2/hooks/useRoomList.spec.tsx @@ -3,9 +3,9 @@ import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts'; import { renderHook } from '@testing-library/react'; import React from 'react'; +import { useRoomList } from './useRoomList'; import { createFakeRoom, createFakeSubscription, createFakeUser } from '../../../tests/mocks/data'; import { VideoConfContext } from '../../contexts/VideoConfContext'; -import { useRoomList } from './useRoomList'; const user = createFakeUser({ active: true, diff --git a/apps/meteor/client/sidebarv2/hooks/useRoomList.ts b/apps/meteor/client/sidebarv2/hooks/useRoomList.ts index d80d32e1e6c..6e6bfae345a 100644 --- a/apps/meteor/client/sidebarv2/hooks/useRoomList.ts +++ b/apps/meteor/client/sidebarv2/hooks/useRoomList.ts @@ -4,10 +4,10 @@ import type { SubscriptionWithRoom, TranslationKey } from '@rocket.chat/ui-conte import { useUserPreference, useUserSubscriptions, useSetting } from '@rocket.chat/ui-contexts'; import { useMemo } from 'react'; +import { useQueryOptions } from './useQueryOptions'; import { useVideoConfIncomingCalls } from '../../contexts/VideoConfContext'; import { useOmnichannelEnabled } from '../../hooks/omnichannel/useOmnichannelEnabled'; import { useQueuedInquiries } from '../../hooks/omnichannel/useQueuedInquiries'; -import { useQueryOptions } from './useQueryOptions'; const query = { open: { $ne: false } }; diff --git a/apps/meteor/client/sidebarv2/hooks/useUnreadDisplay.spec.tsx b/apps/meteor/client/sidebarv2/hooks/useUnreadDisplay.spec.tsx index 30d92218402..0ae7f82e391 100644 --- a/apps/meteor/client/sidebarv2/hooks/useUnreadDisplay.spec.tsx +++ b/apps/meteor/client/sidebarv2/hooks/useUnreadDisplay.spec.tsx @@ -1,8 +1,8 @@ import { mockAppRoot } from '@rocket.chat/mock-providers'; import { renderHook } from '@testing-library/react'; -import { createFakeSubscription } from '../../../tests/mocks/data'; import { useUnreadDisplay } from './useUnreadDisplay'; +import { createFakeSubscription } from '../../../tests/mocks/data'; const dmUnread = createFakeSubscription({ t: 'd', diff --git a/apps/meteor/client/sidebarv2/search/Row.tsx b/apps/meteor/client/sidebarv2/search/Row.tsx index f8541546ec4..c0d332c5fa7 100644 --- a/apps/meteor/client/sidebarv2/search/Row.tsx +++ b/apps/meteor/client/sidebarv2/search/Row.tsx @@ -2,8 +2,8 @@ import type { IRoom, ISubscription } from '@rocket.chat/core-typings'; import type { ReactElement } from 'react'; import React, { memo } from 'react'; -import SidebarItemTemplateWithData from '../RoomList/SidebarItemTemplateWithData'; import UserItem from './UserItem'; +import SidebarItemTemplateWithData from '../RoomList/SidebarItemTemplateWithData'; type RowProps = { item: ISubscription & IRoom; diff --git a/apps/meteor/client/sidebarv2/sections/BannerSection.tsx b/apps/meteor/client/sidebarv2/sections/BannerSection.tsx index 73c1fdd9d5e..a69c1b951b6 100644 --- a/apps/meteor/client/sidebarv2/sections/BannerSection.tsx +++ b/apps/meteor/client/sidebarv2/sections/BannerSection.tsx @@ -2,9 +2,9 @@ import { useSessionStorage } from '@rocket.chat/fuselage-hooks'; import { useRole, useSetting } from '@rocket.chat/ui-contexts'; import React from 'react'; -import { useAirGappedRestriction } from '../../hooks/useAirGappedRestriction'; import AirGappedRestrictionBanner from './AirGappedRestrictionBanner/AirGappedRestrictionBanner'; import StatusDisabledBanner from './StatusDisabledBanner'; +import { useAirGappedRestriction } from '../../hooks/useAirGappedRestriction'; const BannerSection = () => { const [isRestricted, isWarning, remainingDays] = useAirGappedRestriction(); diff --git a/apps/meteor/client/uikit/hooks/useContextualBarContextValue.ts b/apps/meteor/client/uikit/hooks/useContextualBarContextValue.ts index 1be1affad71..10906deab70 100644 --- a/apps/meteor/client/uikit/hooks/useContextualBarContextValue.ts +++ b/apps/meteor/client/uikit/hooks/useContextualBarContextValue.ts @@ -1,8 +1,8 @@ import { useDebouncedCallback } from '@rocket.chat/fuselage-hooks'; import type { UiKitContext } from '@rocket.chat/fuselage-ui-kit'; import type * as UiKit from '@rocket.chat/ui-kit'; -import type { Dispatch } from 'react'; -import { useMemo, type ContextType } from 'react'; +import { useMemo } from 'react'; +import type { Dispatch, ContextType } from 'react'; import { useUiKitActionManager } from './useUiKitActionManager'; diff --git a/apps/meteor/client/uikit/hooks/useMessageBlockContextValue.ts b/apps/meteor/client/uikit/hooks/useMessageBlockContextValue.ts index 2f8fb493362..caf869ba39d 100644 --- a/apps/meteor/client/uikit/hooks/useMessageBlockContextValue.ts +++ b/apps/meteor/client/uikit/hooks/useMessageBlockContextValue.ts @@ -3,6 +3,7 @@ import { useMutableCallback } from '@rocket.chat/fuselage-hooks'; import type { UiKitContext } from '@rocket.chat/fuselage-ui-kit'; import type { ContextType } from 'react'; +import { useUiKitActionManager } from './useUiKitActionManager'; import { useVideoConfDispatchOutgoing, useVideoConfIsCalling, @@ -12,7 +13,6 @@ import { useVideoConfSetPreferences, } from '../../contexts/VideoConfContext'; import { useVideoConfWarning } from '../../views/room/contextualBar/VideoConference/hooks/useVideoConfWarning'; -import { useUiKitActionManager } from './useUiKitActionManager'; export const useMessageBlockContextValue = (rid: IRoom['_id'], mid: IMessage['_id']): ContextType => { const joinCall = useVideoConfJoinCall(); diff --git a/apps/meteor/client/uikit/hooks/useModalContextValue.ts b/apps/meteor/client/uikit/hooks/useModalContextValue.ts index 4a0932c8e1e..8e159805c73 100644 --- a/apps/meteor/client/uikit/hooks/useModalContextValue.ts +++ b/apps/meteor/client/uikit/hooks/useModalContextValue.ts @@ -1,8 +1,8 @@ import { useDebouncedCallback } from '@rocket.chat/fuselage-hooks'; import type { UiKitContext } from '@rocket.chat/fuselage-ui-kit'; import type * as UiKit from '@rocket.chat/ui-kit'; -import type { Dispatch } from 'react'; -import { useMemo, type ContextType } from 'react'; +import { useMemo } from 'react'; +import type { Dispatch, ContextType } from 'react'; import { useUiKitActionManager } from './useUiKitActionManager'; diff --git a/apps/meteor/client/views/account/AccountRouter.tsx b/apps/meteor/client/views/account/AccountRouter.tsx index 8196a877f98..a59babe1a08 100644 --- a/apps/meteor/client/views/account/AccountRouter.tsx +++ b/apps/meteor/client/views/account/AccountRouter.tsx @@ -2,9 +2,9 @@ import { useRouter } from '@rocket.chat/ui-contexts'; import type { ReactElement, ReactNode } from 'react'; import React, { Suspense, useEffect } from 'react'; +import AccountSidebar from './AccountSidebar'; import PageSkeleton from '../../components/PageSkeleton'; import SidebarPortal from '../../sidebar/SidebarPortal'; -import AccountSidebar from './AccountSidebar'; type AccountRouterProps = { children?: ReactNode; diff --git a/apps/meteor/client/views/account/AccountSidebar.tsx b/apps/meteor/client/views/account/AccountSidebar.tsx index 27fa374a69d..b1d87945ea5 100644 --- a/apps/meteor/client/views/account/AccountSidebar.tsx +++ b/apps/meteor/client/views/account/AccountSidebar.tsx @@ -2,9 +2,9 @@ import { useCurrentRoutePath, useTranslation, useLayout } from '@rocket.chat/ui- import React, { memo } from 'react'; import { useSyncExternalStore } from 'use-sync-external-store/shim'; +import { getAccountSidebarItems, subscribeToAccountSidebarItems } from './sidebarItems'; import Sidebar from '../../components/Sidebar'; import SettingsProvider from '../../providers/SettingsProvider'; -import { getAccountSidebarItems, subscribeToAccountSidebarItems } from './sidebarItems'; const AccountSidebar = () => { const t = useTranslation(); diff --git a/apps/meteor/client/views/account/accessibility/AccessibilityPage.tsx b/apps/meteor/client/views/account/accessibility/AccessibilityPage.tsx index 9bb4e57317c..f4f67552ddc 100644 --- a/apps/meteor/client/views/account/accessibility/AccessibilityPage.tsx +++ b/apps/meteor/client/views/account/accessibility/AccessibilityPage.tsx @@ -22,13 +22,13 @@ import { useMutation } from '@tanstack/react-query'; import React, { useMemo } from 'react'; import { Controller, useForm } from 'react-hook-form'; -import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page'; -import { getDirtyFields } from '../../../lib/getDirtyFields'; import { fontSizes } from './fontSizes'; import type { AccessibilityPreferencesData } from './hooks/useAcessibilityPreferencesValues'; import { useAccessiblityPreferencesValues } from './hooks/useAcessibilityPreferencesValues'; import { useCreateFontStyleElement } from './hooks/useCreateFontStyleElement'; import { themeItems as themes } from './themeItems'; +import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page'; +import { getDirtyFields } from '../../../lib/getDirtyFields'; const AccessibilityPage = () => { const t = useTranslation(); diff --git a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx index d1af15f5971..f98e6608a5b 100644 --- a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx +++ b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx @@ -2,8 +2,8 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { Page, PageHeader, PageContent } from '../../../components/Page'; import DeviceManagementAccountTable from './DeviceManagementAccountTable'; +import { Page, PageHeader, PageContent } from '../../../components/Page'; const DeviceManagementAccountPage = (): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx index 411f9ad02e6..351021a9ab9 100644 --- a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx +++ b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx @@ -3,12 +3,12 @@ import type { ReactElement } from 'react'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import DeviceManagementAccountRow from './DeviceManagementAccountRow'; import { GenericTableHeaderCell } from '../../../../components/GenericTable'; import { usePagination } from '../../../../components/GenericTable/hooks/usePagination'; import { useSort } from '../../../../components/GenericTable/hooks/useSort'; import DeviceManagementTable from '../../../../components/deviceManagement/DeviceManagementTable'; import { useEndpointData } from '../../../../hooks/useEndpointData'; -import DeviceManagementAccountRow from './DeviceManagementAccountRow'; const sortMapping = { client: 'device.name', diff --git a/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx b/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx index 83c97319e2c..9a13328cc6e 100644 --- a/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx +++ b/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx @@ -6,10 +6,10 @@ import React, { useMemo } from 'react'; import { useForm, Controller } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; +import { useRemoveWebDAVAccountIntegrationMutation } from './hooks/useRemoveWebDAVAccountIntegrationMutation'; import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; import { useWebDAVAccountIntegrationsQuery } from '../../../hooks/webdav/useWebDAVAccountIntegrationsQuery'; import { getWebdavServerName } from '../../../lib/getWebdavServerName'; -import { useRemoveWebDAVAccountIntegrationMutation } from './hooks/useRemoveWebDAVAccountIntegrationMutation'; const AccountIntegrationsPage = () => { const { data: webdavAccountIntegrations } = useWebDAVAccountIntegrationsQuery(); diff --git a/apps/meteor/client/views/account/integrations/AccountIntegrationsRoute.tsx b/apps/meteor/client/views/account/integrations/AccountIntegrationsRoute.tsx index b81a64ede84..fa0161b0612 100644 --- a/apps/meteor/client/views/account/integrations/AccountIntegrationsRoute.tsx +++ b/apps/meteor/client/views/account/integrations/AccountIntegrationsRoute.tsx @@ -2,8 +2,8 @@ import { useSetting } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import AccountIntegrationsPage from './AccountIntegrationsPage'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; const AccountIntegrationsRoute = (): ReactElement => { const webdavEnabled = useSetting('Webdav_Integration_Enabled', false); diff --git a/apps/meteor/client/views/account/omnichannel/OmnichannelPreferencesPage.tsx b/apps/meteor/client/views/account/omnichannel/OmnichannelPreferencesPage.tsx index a2b3f3b920c..ddf549bd98c 100644 --- a/apps/meteor/client/views/account/omnichannel/OmnichannelPreferencesPage.tsx +++ b/apps/meteor/client/views/account/omnichannel/OmnichannelPreferencesPage.tsx @@ -4,9 +4,9 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useForm, FormProvider } from 'react-hook-form'; -import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page'; import PreferencesConversationTranscript from './PreferencesConversationTranscript'; import { PreferencesGeneral } from './PreferencesGeneral'; +import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page'; type FormData = { omnichannelTranscriptPDF: boolean; diff --git a/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx b/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx index 77997422a21..335b27d7c81 100644 --- a/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx +++ b/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx @@ -6,8 +6,6 @@ import type { ReactElement } from 'react'; import React from 'react'; import { FormProvider, useForm } from 'react-hook-form'; -import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page'; -import { getDirtyFields } from '../../../lib/getDirtyFields'; import PreferencesGlobalSection from './PreferencesGlobalSection'; import PreferencesHighlightsSection from './PreferencesHighlightsSection'; import PreferencesLocalizationSection from './PreferencesLocalizationSection'; @@ -18,6 +16,8 @@ import PreferencesSoundSection from './PreferencesSoundSection'; import PreferencesUserPresenceSection from './PreferencesUserPresenceSection'; import type { AccountPreferencesData } from './useAccountPreferencesValues'; import { useAccountPreferencesValues } from './useAccountPreferencesValues'; +import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page'; +import { getDirtyFields } from '../../../lib/getDirtyFields'; const AccountPreferencesPage = (): ReactElement => { const t = useTranslation(); diff --git a/apps/meteor/client/views/account/profile/AccountProfileForm.tsx b/apps/meteor/client/views/account/profile/AccountProfileForm.tsx index 95398b35204..54875f0686c 100644 --- a/apps/meteor/client/views/account/profile/AccountProfileForm.tsx +++ b/apps/meteor/client/views/account/profile/AccountProfileForm.tsx @@ -27,14 +27,14 @@ import type { AllHTMLAttributes, ReactElement } from 'react'; import React, { useCallback } from 'react'; import { Controller, useFormContext } from 'react-hook-form'; +import type { AccountProfileFormValues } from './getProfileInitialValues'; +import { useAccountProfileSettings } from './useAccountProfileSettings'; import { validateEmail } from '../../../../lib/emailValidator'; import { getUserEmailAddress } from '../../../../lib/getUserEmailAddress'; import UserStatusMenu from '../../../components/UserStatusMenu'; import UserAvatarEditor from '../../../components/avatar/UserAvatarEditor'; import { useUpdateAvatar } from '../../../hooks/useUpdateAvatar'; import { USER_STATUS_TEXT_MAX_LENGTH, BIO_TEXT_MAX_LENGTH } from '../../../lib/constants'; -import type { AccountProfileFormValues } from './getProfileInitialValues'; -import { useAccountProfileSettings } from './useAccountProfileSettings'; const AccountProfileForm = (props: AllHTMLAttributes): ReactElement => { const t = useTranslation(); diff --git a/apps/meteor/client/views/account/profile/AccountProfilePage.tsx b/apps/meteor/client/views/account/profile/AccountProfilePage.tsx index df1710b0750..0113d40a938 100644 --- a/apps/meteor/client/views/account/profile/AccountProfilePage.tsx +++ b/apps/meteor/client/views/account/profile/AccountProfilePage.tsx @@ -15,12 +15,12 @@ import type { ReactElement } from 'react'; import React, { useState, useCallback } from 'react'; import { FormProvider, useForm } from 'react-hook-form'; -import ConfirmOwnerChangeModal from '../../../components/ConfirmOwnerChangeModal'; -import { Page, PageFooter, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; -import { useAllowPasswordChange } from '../security/useAllowPasswordChange'; import AccountProfileForm from './AccountProfileForm'; import ActionConfirmModal from './ActionConfirmModal'; import { getProfileInitialValues } from './getProfileInitialValues'; +import ConfirmOwnerChangeModal from '../../../components/ConfirmOwnerChangeModal'; +import { Page, PageFooter, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; +import { useAllowPasswordChange } from '../security/useAllowPasswordChange'; // TODO: enforce useMutation const AccountProfilePage = (): ReactElement => { diff --git a/apps/meteor/client/views/account/profile/AccountProfileRoute.tsx b/apps/meteor/client/views/account/profile/AccountProfileRoute.tsx index 52d879c3053..77e184f1873 100644 --- a/apps/meteor/client/views/account/profile/AccountProfileRoute.tsx +++ b/apps/meteor/client/views/account/profile/AccountProfileRoute.tsx @@ -2,8 +2,8 @@ import { useSetting } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import AccountProfilePage from './AccountProfilePage'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; const AccountProfileRoute = (): ReactElement => { const canViewProfile = useSetting('Accounts_AllowUserProfileChange'); diff --git a/apps/meteor/client/views/account/security/AccountSecurityPage.tsx b/apps/meteor/client/views/account/security/AccountSecurityPage.tsx index c7d4157ddbd..45b0e4c5eb3 100644 --- a/apps/meteor/client/views/account/security/AccountSecurityPage.tsx +++ b/apps/meteor/client/views/account/security/AccountSecurityPage.tsx @@ -5,11 +5,11 @@ import type { ReactElement } from 'react'; import React from 'react'; import { FormProvider, useForm } from 'react-hook-form'; -import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page'; import ChangePassword from './ChangePassword'; import EndToEnd from './EndToEnd'; import TwoFactorEmail from './TwoFactorEmail'; import TwoFactorTOTP from './TwoFactorTOTP'; +import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page'; const passwordDefaultValues = { password: '', confirmationPassword: '' }; diff --git a/apps/meteor/client/views/account/security/AccountSecurityRoute.tsx b/apps/meteor/client/views/account/security/AccountSecurityRoute.tsx index 11a0d8b6388..ed7ed031094 100644 --- a/apps/meteor/client/views/account/security/AccountSecurityRoute.tsx +++ b/apps/meteor/client/views/account/security/AccountSecurityRoute.tsx @@ -2,8 +2,8 @@ import { useSetting } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import AccountSecurityPage from './AccountSecurityPage'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; const AccountSecurityRoute = (): ReactElement => { const isTwoFactorEnabled = useSetting('Accounts_TwoFactorAuthentication_Enabled'); diff --git a/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx b/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx index dc796caccb2..bbd917a1055 100644 --- a/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx +++ b/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx @@ -7,9 +7,9 @@ import { useForm } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; import qrcode from 'yaqrcode'; +import BackupCodesModal from './BackupCodesModal'; import TextCopy from '../../../components/TextCopy'; import TwoFactorTotpModal from '../../../components/TwoFactorModal/TwoFactorTotpModal'; -import BackupCodesModal from './BackupCodesModal'; const TwoFactorTOTP = (props: ComponentProps): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx b/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx index abf45ebedcb..6850615db7a 100644 --- a/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx +++ b/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx @@ -2,8 +2,8 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { Page, PageHeader, PageContent } from '../../../components/Page'; import AccountTokensTable from './AccountTokensTable'; +import { Page, PageHeader, PageContent } from '../../../components/Page'; const AccountTokensPage = (): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/account/tokens/AccountTokensRoute.tsx b/apps/meteor/client/views/account/tokens/AccountTokensRoute.tsx index ed8964db15b..0876bd8385a 100644 --- a/apps/meteor/client/views/account/tokens/AccountTokensRoute.tsx +++ b/apps/meteor/client/views/account/tokens/AccountTokensRoute.tsx @@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import AccountTokensPage from './AccountTokensPage'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; const AccountTokensRoute = (): ReactElement => { const canCreateTokens = usePermission('create-personal-access-tokens'); diff --git a/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensTable.tsx b/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensTable.tsx index 249414486d9..78cb8414f6e 100644 --- a/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensTable.tsx +++ b/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensTable.tsx @@ -4,6 +4,8 @@ import type { ReactElement, RefObject } from 'react'; import React, { useMemo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; +import AccountTokensRow from './AccountTokensRow'; +import AddToken from './AddToken'; import GenericModal from '../../../../components/GenericModal'; import GenericNoResults from '../../../../components/GenericNoResults'; import { @@ -17,8 +19,6 @@ import { usePagination } from '../../../../components/GenericTable/hooks/usePagi import { useEndpointData } from '../../../../hooks/useEndpointData'; import { useResizeInlineBreakpoint } from '../../../../hooks/useResizeInlineBreakpoint'; import { AsyncStatePhase } from '../../../../lib/asyncState'; -import AccountTokensRow from './AccountTokensRow'; -import AddToken from './AddToken'; const AccountTokensTable = (): ReactElement => { const { t } = useTranslation(); @@ -155,11 +155,11 @@ const AccountTokensTable = (): ReactElement => { filteredTokens && filteredTokens.map((filteredToken) => ( ))} diff --git a/apps/meteor/client/views/admin/AdministrationLayout.tsx b/apps/meteor/client/views/admin/AdministrationLayout.tsx index 257028e723d..2e77f6f48d4 100644 --- a/apps/meteor/client/views/admin/AdministrationLayout.tsx +++ b/apps/meteor/client/views/admin/AdministrationLayout.tsx @@ -1,8 +1,8 @@ import type { ReactNode } from 'react'; import React from 'react'; -import SidebarPortal from '../../sidebar/SidebarPortal'; import AdminSidebar from './sidebar/AdminSidebar'; +import SidebarPortal from '../../sidebar/SidebarPortal'; type AdministrationLayoutProps = { children?: ReactNode; diff --git a/apps/meteor/client/views/admin/AdministrationRouter.tsx b/apps/meteor/client/views/admin/AdministrationRouter.tsx index b210435ae26..8ae97f46341 100644 --- a/apps/meteor/client/views/admin/AdministrationRouter.tsx +++ b/apps/meteor/client/views/admin/AdministrationRouter.tsx @@ -2,12 +2,12 @@ import { useRouter } from '@rocket.chat/ui-contexts'; import type { ReactElement, ReactNode } from 'react'; import React, { Suspense, useEffect } from 'react'; +import AdministrationLayout from './AdministrationLayout'; +import { getAdminSidebarItems } from './sidebarItems'; import PageSkeleton from '../../components/PageSkeleton'; import type { Item, SidebarDivider, SidebarItem } from '../../lib/createSidebarItems'; import { isGoRocketChatLink } from '../../lib/createSidebarItems'; import SettingsProvider from '../../providers/SettingsProvider'; -import AdministrationLayout from './AdministrationLayout'; -import { getAdminSidebarItems } from './sidebarItems'; const isSidebarDivider = (sidebarItem: SidebarItem): sidebarItem is SidebarDivider => { return (sidebarItem as SidebarDivider).divider === true; diff --git a/apps/meteor/client/views/admin/customEmoji/CustomEmojiRoute.tsx b/apps/meteor/client/views/admin/customEmoji/CustomEmojiRoute.tsx index 725edc6acf8..68daa83165d 100644 --- a/apps/meteor/client/views/admin/customEmoji/CustomEmojiRoute.tsx +++ b/apps/meteor/client/views/admin/customEmoji/CustomEmojiRoute.tsx @@ -4,6 +4,9 @@ import type { ReactElement } from 'react'; import React, { useCallback, useRef } from 'react'; import { useTranslation } from 'react-i18next'; +import AddCustomEmoji from './AddCustomEmoji'; +import CustomEmoji from './CustomEmoji'; +import EditCustomEmojiWithData from './EditCustomEmojiWithData'; import { Contextualbar, ContextualbarHeader, @@ -13,9 +16,6 @@ import { } from '../../../components/Contextualbar'; import { Page, PageHeader, PageContent } from '../../../components/Page'; import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; -import AddCustomEmoji from './AddCustomEmoji'; -import CustomEmoji from './CustomEmoji'; -import EditCustomEmojiWithData from './EditCustomEmojiWithData'; const CustomEmojiRoute = (): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/admin/customEmoji/EditCustomEmojiWithData.tsx b/apps/meteor/client/views/admin/customEmoji/EditCustomEmojiWithData.tsx index b4cf80d631b..161a0076090 100644 --- a/apps/meteor/client/views/admin/customEmoji/EditCustomEmojiWithData.tsx +++ b/apps/meteor/client/views/admin/customEmoji/EditCustomEmojiWithData.tsx @@ -4,8 +4,8 @@ import { useQuery } from '@tanstack/react-query'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; -import { FormSkeleton } from '../../../components/Skeleton'; import EditCustomEmoji from './EditCustomEmoji'; +import { FormSkeleton } from '../../../components/Skeleton'; type EditCustomEmojiWithDataProps = { _id: string; diff --git a/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx b/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx index f109e34689a..e9994d03ce6 100644 --- a/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx +++ b/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx @@ -4,9 +4,9 @@ import type { ReactElement, FormEvent } from 'react'; import React, { useState, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; +import { validate, createSoundData } from './lib'; import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../components/Contextualbar'; import { useSingleFileInput } from '../../../hooks/useSingleFileInput'; -import { validate, createSoundData } from './lib'; type AddCustomSoundProps = { goToNew: (_id: string) => () => void; diff --git a/apps/meteor/client/views/admin/customSounds/CustomSoundsPage.tsx b/apps/meteor/client/views/admin/customSounds/CustomSoundsPage.tsx index fc82038125b..cb4d9bf3e0b 100644 --- a/apps/meteor/client/views/admin/customSounds/CustomSoundsPage.tsx +++ b/apps/meteor/client/views/admin/customSounds/CustomSoundsPage.tsx @@ -3,6 +3,9 @@ import { useRoute, useRouteParameter } from '@rocket.chat/ui-contexts'; import React, { useCallback, useRef } from 'react'; import { useTranslation } from 'react-i18next'; +import AddCustomSound from './AddCustomSound'; +import CustomSoundsTable from './CustomSoundsTable'; +import EditCustomSound from './EditCustomSound'; import { ContextualbarTitle, Contextualbar, @@ -11,9 +14,6 @@ import { ContextualbarDialog, } from '../../../components/Contextualbar'; import { Page, PageHeader, PageContent } from '../../../components/Page'; -import AddCustomSound from './AddCustomSound'; -import CustomSoundsTable from './CustomSoundsTable'; -import EditCustomSound from './EditCustomSound'; const CustomSoundsPage = () => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/admin/customSounds/CustomSoundsRoute.tsx b/apps/meteor/client/views/admin/customSounds/CustomSoundsRoute.tsx index 17859317917..1b65cb9e996 100644 --- a/apps/meteor/client/views/admin/customSounds/CustomSoundsRoute.tsx +++ b/apps/meteor/client/views/admin/customSounds/CustomSoundsRoute.tsx @@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import CustomSoundsPage from './CustomSoundsPage'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; const CustomSoundsRoute = (): ReactElement => { const canManageCustomSounds = usePermission('manage-sounds'); diff --git a/apps/meteor/client/views/admin/customSounds/CustomSoundsTable/CustomSoundsTable.tsx b/apps/meteor/client/views/admin/customSounds/CustomSoundsTable/CustomSoundsTable.tsx index 4a7151845bb..021bbad844b 100644 --- a/apps/meteor/client/views/admin/customSounds/CustomSoundsTable/CustomSoundsTable.tsx +++ b/apps/meteor/client/views/admin/customSounds/CustomSoundsTable/CustomSoundsTable.tsx @@ -5,6 +5,7 @@ import { useQuery } from '@tanstack/react-query'; import type { MutableRefObject } from 'react'; import React, { useState, useMemo, useEffect } from 'react'; +import CustomSoundRow from './CustomSoundRow'; import FilterByText from '../../../../components/FilterByText'; import GenericNoResults from '../../../../components/GenericNoResults'; import { @@ -16,7 +17,6 @@ import { } from '../../../../components/GenericTable'; import { usePagination } from '../../../../components/GenericTable/hooks/usePagination'; import { useSort } from '../../../../components/GenericTable/hooks/useSort'; -import CustomSoundRow from './CustomSoundRow'; type CustomSoundsTableProps = { onClick: (soundId: string) => () => void; diff --git a/apps/meteor/client/views/admin/customSounds/EditCustomSound.tsx b/apps/meteor/client/views/admin/customSounds/EditCustomSound.tsx index 3a053c8dcb5..c69dc9e9b0f 100644 --- a/apps/meteor/client/views/admin/customSounds/EditCustomSound.tsx +++ b/apps/meteor/client/views/admin/customSounds/EditCustomSound.tsx @@ -4,8 +4,8 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { FormSkeleton } from '../../../components/Skeleton'; import EditSound from './EditSound'; +import { FormSkeleton } from '../../../components/Skeleton'; type EditCustomSoundProps = { _id: string | undefined; diff --git a/apps/meteor/client/views/admin/customSounds/EditSound.tsx b/apps/meteor/client/views/admin/customSounds/EditSound.tsx index 3c0caae4cd4..b87d8df9f19 100644 --- a/apps/meteor/client/views/admin/customSounds/EditSound.tsx +++ b/apps/meteor/client/views/admin/customSounds/EditSound.tsx @@ -4,10 +4,10 @@ import type { ReactElement, SyntheticEvent } from 'react'; import React, { useCallback, useState, useMemo, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; +import { validate, createSoundData } from './lib'; import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../components/Contextualbar'; import GenericModal from '../../../components/GenericModal'; import { useSingleFileInput } from '../../../hooks/useSingleFileInput'; -import { validate, createSoundData } from './lib'; type EditSoundProps = { close?: () => void; diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusFormWithData.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusFormWithData.tsx index 98f17177ef4..d86d4d39e8d 100644 --- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusFormWithData.tsx +++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusFormWithData.tsx @@ -6,8 +6,8 @@ import type { ReactElement } from 'react'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; -import { FormSkeleton } from '../../../components/Skeleton'; import CustomUserStatusForm from './CustomUserStatusForm'; +import { FormSkeleton } from '../../../components/Skeleton'; type CustomUserStatusFormWithDataProps = { _id?: IUserStatus['_id']; diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusRoute.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusRoute.tsx index 0734c054f86..875f3c9e020 100644 --- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusRoute.tsx +++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusRoute.tsx @@ -3,6 +3,10 @@ import { useRoute, useRouteParameter, usePermission, useTranslation, useSetting import type { ReactElement } from 'react'; import React, { useCallback, useRef, useEffect } from 'react'; +import CustomUserActiveConnections from './CustomUserActiveConnections'; +import CustomUserStatusFormWithData from './CustomUserStatusFormWithData'; +import CustomUserStatusService from './CustomUserStatusService'; +import CustomUserStatusTable from './CustomUserStatusTable'; import { Contextualbar, ContextualbarHeader, @@ -13,10 +17,6 @@ import { import { Page, PageHeader, PageContent } from '../../../components/Page'; import { useIsEnterprise } from '../../../hooks/useIsEnterprise'; import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; -import CustomUserActiveConnections from './CustomUserActiveConnections'; -import CustomUserStatusFormWithData from './CustomUserStatusFormWithData'; -import CustomUserStatusService from './CustomUserStatusService'; -import CustomUserStatusTable from './CustomUserStatusTable'; const CustomUserStatusRoute = (): ReactElement => { const t = useTranslation(); diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusTable/CustomUserStatusTable.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusTable/CustomUserStatusTable.tsx index 2aaf8528982..72551525cf3 100644 --- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusTable/CustomUserStatusTable.tsx +++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusTable/CustomUserStatusTable.tsx @@ -7,6 +7,7 @@ import type { ReactElement, MutableRefObject } from 'react'; import React, { useState, useMemo, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; +import CustomUserStatusRow from './CustomUserStatusRow'; import FilterByText from '../../../../components/FilterByText'; import GenericNoResult from '../../../../components/GenericNoResults'; import { @@ -18,7 +19,6 @@ import { } from '../../../../components/GenericTable'; import { usePagination } from '../../../../components/GenericTable/hooks/usePagination'; import { useSort } from '../../../../components/GenericTable/hooks/useSort'; -import CustomUserStatusRow from './CustomUserStatusRow'; type CustomUserStatusProps = { reload: MutableRefObject<() => void>; diff --git a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminPage.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminPage.tsx index 7a03141fc0a..5ecb0180cc2 100644 --- a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminPage.tsx +++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminPage.tsx @@ -3,10 +3,10 @@ import type { ReactElement } from 'react'; import React, { useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { ContextualbarDialog } from '../../../components/Contextualbar'; -import { Page, PageHeader, PageContent } from '../../../components/Page'; import DeviceManagementAdminTable from './DeviceManagementAdminTable'; import DeviceManagementInfo from './DeviceManagementInfo'; +import { ContextualbarDialog } from '../../../components/Contextualbar'; +import { Page, PageHeader, PageContent } from '../../../components/Page'; const DeviceManagementAdminPage = (): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx index f26741512ff..6d7216ddf1c 100644 --- a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx +++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx @@ -3,13 +3,13 @@ import type { ReactElement } from 'react'; import React, { useEffect } from 'react'; import { useTranslation } from 'react-i18next'; +import DeviceManagementAdminPage from './DeviceManagementAdminPage'; import { getURL } from '../../../../app/utils/client/getURL'; import GenericUpsellModal from '../../../components/GenericUpsellModal'; import { useUpsellActions } from '../../../components/GenericUpsellModal/hooks'; import PageSkeleton from '../../../components/PageSkeleton'; import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule'; import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; -import DeviceManagementAdminPage from './DeviceManagementAdminPage'; const DeviceManagementAdminRoute = (): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx index 028fa139453..e3ed1bc8e3a 100644 --- a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx +++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx @@ -4,13 +4,13 @@ import type { ReactElement, MutableRefObject } from 'react'; import React, { useState, useMemo, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; +import DeviceManagementAdminRow from './DeviceManagementAdminRow'; import FilterByText from '../../../../components/FilterByText'; import { GenericTableHeaderCell } from '../../../../components/GenericTable'; import { usePagination } from '../../../../components/GenericTable/hooks/usePagination'; import { useSort } from '../../../../components/GenericTable/hooks/useSort'; import DeviceManagementTable from '../../../../components/deviceManagement/DeviceManagementTable'; import { useEndpointData } from '../../../../hooks/useEndpointData'; -import DeviceManagementAdminRow from './DeviceManagementAdminRow'; const sortMapping = { client: 'device.name', diff --git a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx index f884b27e0cb..97c4f16fac6 100644 --- a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx +++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx @@ -4,6 +4,7 @@ import type { ReactElement } from 'react'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import DeviceManagementInfo from './DeviceManagementInfo'; import { Contextualbar, ContextualbarSkeleton, @@ -14,7 +15,6 @@ import { } from '../../../../components/Contextualbar'; import { useEndpointData } from '../../../../hooks/useEndpointData'; import { AsyncStatePhase } from '../../../../lib/asyncState'; -import DeviceManagementInfo from './DeviceManagementInfo'; const convertSessionFromAPI = ({ loginAt, diff --git a/apps/meteor/client/views/admin/emailInbox/EmailInboxFormWithData.tsx b/apps/meteor/client/views/admin/emailInbox/EmailInboxFormWithData.tsx index da6c601944e..2f2f81c9c4e 100644 --- a/apps/meteor/client/views/admin/emailInbox/EmailInboxFormWithData.tsx +++ b/apps/meteor/client/views/admin/emailInbox/EmailInboxFormWithData.tsx @@ -5,8 +5,8 @@ import { useQuery } from '@tanstack/react-query'; import type { ReactElement } from 'react'; import React from 'react'; -import { FormSkeleton } from '../../../components/Skeleton'; import EmailInboxForm from './EmailInboxForm'; +import { FormSkeleton } from '../../../components/Skeleton'; const EmailInboxFormWithData = ({ id }: { id: IEmailInbox['_id'] }): ReactElement => { const t = useTranslation(); diff --git a/apps/meteor/client/views/admin/emailInbox/EmailInboxPage.tsx b/apps/meteor/client/views/admin/emailInbox/EmailInboxPage.tsx index 9e341df308a..9d953cea63a 100644 --- a/apps/meteor/client/views/admin/emailInbox/EmailInboxPage.tsx +++ b/apps/meteor/client/views/admin/emailInbox/EmailInboxPage.tsx @@ -4,10 +4,10 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { Page, PageHeader, PageContent } from '../../../components/Page'; import EmailInboxForm from './EmailInboxForm'; import EmailInboxFormWithData from './EmailInboxFormWithData'; import EmailInboxTable from './EmailInboxTable'; +import { Page, PageHeader, PageContent } from '../../../components/Page'; const EmailInboxPage = (): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/admin/emailInbox/EmailInboxRoute.tsx b/apps/meteor/client/views/admin/emailInbox/EmailInboxRoute.tsx index 7361d13b10c..76aa229f355 100644 --- a/apps/meteor/client/views/admin/emailInbox/EmailInboxRoute.tsx +++ b/apps/meteor/client/views/admin/emailInbox/EmailInboxRoute.tsx @@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import EmailInboxPage from './EmailInboxPage'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; const EmailInboxRoute = (): ReactElement => { const canViewEmailInbox = usePermission('manage-email-inbox'); diff --git a/apps/meteor/client/views/admin/emailInbox/EmailInboxTable.tsx b/apps/meteor/client/views/admin/emailInbox/EmailInboxTable.tsx index 281eec89627..0990b7a30e3 100644 --- a/apps/meteor/client/views/admin/emailInbox/EmailInboxTable.tsx +++ b/apps/meteor/client/views/admin/emailInbox/EmailInboxTable.tsx @@ -4,6 +4,7 @@ import { useQuery } from '@tanstack/react-query'; import type { ReactElement } from 'react'; import React, { useMemo, useCallback } from 'react'; +import SendTestButton from './SendTestButton'; import GenericNoResults from '../../../components/GenericNoResults'; import { GenericTable, @@ -16,7 +17,6 @@ import { } from '../../../components/GenericTable'; import { usePagination } from '../../../components/GenericTable/hooks/usePagination'; import { useSort } from '../../../components/GenericTable/hooks/useSort'; -import SendTestButton from './SendTestButton'; const EmailInboxTable = (): ReactElement => { const t = useTranslation(); diff --git a/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx index 95de437462a..c6c1864446f 100644 --- a/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx +++ b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx @@ -3,10 +3,10 @@ import type { ReactElement } from 'react'; import React, { useCallback, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { Page, PageHeader, PageScrollableContent } from '../../../components/Page'; import ChannelsTab from './channels/ChannelsTab'; import MessagesTab from './messages/MessagesTab'; import UsersTab from './users/UsersTab'; +import { Page, PageHeader, PageScrollableContent } from '../../../components/Page'; type EngagementDashboardPageProps = { tab: 'users' | 'messages' | 'channels'; diff --git a/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx index 17f6713220f..ea5c20ca9e5 100644 --- a/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx +++ b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx @@ -10,13 +10,13 @@ import { import type { ReactElement } from 'react'; import React, { useEffect } from 'react'; +import EngagementDashboardPage from './EngagementDashboardPage'; import { getURL } from '../../../../app/utils/client/getURL'; import GenericUpsellModal from '../../../components/GenericUpsellModal'; import { useUpsellActions } from '../../../components/GenericUpsellModal/hooks'; import PageSkeleton from '../../../components/PageSkeleton'; import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule'; import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; -import EngagementDashboardPage from './EngagementDashboardPage'; const isValidTab = (tab: string | undefined): tab is 'users' | 'messages' | 'channels' => typeof tab === 'string' && ['users', 'messages', 'channels'].includes(tab); diff --git a/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx index 88fad25990d..86e7836b40d 100644 --- a/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx +++ b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx @@ -18,13 +18,13 @@ import type { ReactElement } from 'react'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import { useMessageOrigins } from './useMessageOrigins'; +import { useTopFivePopularChannels } from './useTopFivePopularChannels'; import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton'; import PeriodSelector from '../../../../components/dashboards/PeriodSelector'; import { usePeriodSelectorState } from '../../../../components/dashboards/usePeriodSelectorState'; import EngagementDashboardCardFilter from '../EngagementDashboardCardFilter'; import LegendSymbol from '../dataView/LegendSymbol'; -import { useMessageOrigins } from './useMessageOrigins'; -import { useTopFivePopularChannels } from './useTopFivePopularChannels'; const colors = { warning: Palette.statusColor['status-font-on-warning'].toString(), diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx index 7ac1b7c9128..02776ecb555 100644 --- a/apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx +++ b/apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx @@ -6,12 +6,12 @@ import type { ReactElement } from 'react'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import { useActiveUsers } from './useActiveUsers'; import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton'; import CounterSet from '../../../../components/dataView/CounterSet'; import { useFormatDate } from '../../../../hooks/useFormatDate'; import EngagementDashboardCardFilter from '../EngagementDashboardCardFilter'; import LegendSymbol from '../dataView/LegendSymbol'; -import { useActiveUsers } from './useActiveUsers'; type ActiveUsersSectionProps = { timezone: 'utc' | 'local'; diff --git a/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewRoute.tsx b/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewRoute.tsx index a7d6bd77d13..3222e37a91d 100644 --- a/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewRoute.tsx +++ b/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewRoute.tsx @@ -2,10 +2,10 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React, { memo } from 'react'; +import AdminFeaturePreviewPage from './AdminFeaturePreviewPage'; import SettingsProvider from '../../../providers/SettingsProvider'; import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import EditableSettingsProvider from '../settings/EditableSettingsProvider'; -import AdminFeaturePreviewPage from './AdminFeaturePreviewPage'; const AdminFeaturePreviewRoute = (): ReactElement => { const canViewFeaturesPreview = usePermission('manage-cloud'); diff --git a/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx b/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx index 14dc96283f8..1d3bbbcfbe4 100644 --- a/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx +++ b/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx @@ -3,9 +3,9 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; import OverviewSection from './OverviewSection'; import ServersSection from './ServersSection'; +import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; function FederationDashboardPage(): ReactElement { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/admin/federationDashboard/FederationDashboardRoute.tsx b/apps/meteor/client/views/admin/federationDashboard/FederationDashboardRoute.tsx index e4a9ab4d97c..8227a0343c7 100644 --- a/apps/meteor/client/views/admin/federationDashboard/FederationDashboardRoute.tsx +++ b/apps/meteor/client/views/admin/federationDashboard/FederationDashboardRoute.tsx @@ -1,8 +1,8 @@ import { useRole } from '@rocket.chat/ui-contexts'; import React from 'react'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import FederationDashboardPage from './FederationDashboardPage'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; const FederationDashboardRoute = () => { const authorized = useRole('admin'); diff --git a/apps/meteor/client/views/admin/import/ImportHistoryPage.tsx b/apps/meteor/client/views/admin/import/ImportHistoryPage.tsx index 7a34705a59a..31db37e4796 100644 --- a/apps/meteor/client/views/admin/import/ImportHistoryPage.tsx +++ b/apps/meteor/client/views/admin/import/ImportHistoryPage.tsx @@ -4,10 +4,10 @@ import { useToastMessageDispatch, useEndpoint, useTranslation, useRouter } from import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'; import React, { useMemo } from 'react'; -import { ProgressStep } from '../../../../app/importer/lib/ImporterProgressStep'; -import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; import ImportOperationSummary from './ImportOperationSummary'; import ImportOperationSummarySkeleton from './ImportOperationSummarySkeleton'; +import { ProgressStep } from '../../../../app/importer/lib/ImporterProgressStep'; +import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; // TODO: review inner logic function ImportHistoryPage() { diff --git a/apps/meteor/client/views/admin/import/ImportProgressPage.tsx b/apps/meteor/client/views/admin/import/ImportProgressPage.tsx index 3ad95a4c6b6..a5697f526aa 100644 --- a/apps/meteor/client/views/admin/import/ImportProgressPage.tsx +++ b/apps/meteor/client/views/admin/import/ImportProgressPage.tsx @@ -6,10 +6,10 @@ import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'; import React, { useEffect } from 'react'; import { useTranslation } from 'react-i18next'; +import { useErrorHandler } from './useErrorHandler'; import { ImportingStartedStates } from '../../../../app/importer/lib/ImporterProgressStep'; import { numberFormat } from '../../../../lib/utils/stringUtils'; import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; -import { useErrorHandler } from './useErrorHandler'; // TODO: review inner logic const ImportProgressPage = function ImportProgressPage() { diff --git a/apps/meteor/client/views/admin/import/ImportRoute.tsx b/apps/meteor/client/views/admin/import/ImportRoute.tsx index 96b5179b9ae..50d4cfebef3 100644 --- a/apps/meteor/client/views/admin/import/ImportRoute.tsx +++ b/apps/meteor/client/views/admin/import/ImportRoute.tsx @@ -1,11 +1,11 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import React from 'react'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import ImportHistoryPage from './ImportHistoryPage'; import ImportProgressPage from './ImportProgressPage'; import NewImportPage from './NewImportPage'; import PrepareImportPage from './PrepareImportPage'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; type ImportHistoryRouteProps = { page: 'history' | 'new' | 'prepare' | 'progress'; diff --git a/apps/meteor/client/views/admin/import/NewImportPage.tsx b/apps/meteor/client/views/admin/import/NewImportPage.tsx index 32350ee20a4..54de54e095d 100644 --- a/apps/meteor/client/views/admin/import/NewImportPage.tsx +++ b/apps/meteor/client/views/admin/import/NewImportPage.tsx @@ -7,9 +7,9 @@ import type { ChangeEvent, DragEvent, FormEvent, Key, SyntheticEvent } from 'rea import React, { useState, useMemo, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; +import { useErrorHandler } from './useErrorHandler'; import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; import { useFormatMemorySize } from '../../../hooks/useFormatMemorySize'; -import { useErrorHandler } from './useErrorHandler'; // TODO: review inner logic function NewImportPage() { diff --git a/apps/meteor/client/views/admin/import/PrepareImportPage.tsx b/apps/meteor/client/views/admin/import/PrepareImportPage.tsx index 5af842c4beb..1c27cbed7b9 100644 --- a/apps/meteor/client/views/admin/import/PrepareImportPage.tsx +++ b/apps/meteor/client/views/admin/import/PrepareImportPage.tsx @@ -5,6 +5,11 @@ import type { TranslationKey } from '@rocket.chat/ui-contexts'; import { useEndpoint, useTranslation, useStream, useRouter } from '@rocket.chat/ui-contexts'; import React, { useEffect, useState, useMemo } from 'react'; +import type { ChannelDescriptor } from './ChannelDescriptor'; +import PrepareChannels from './PrepareChannels'; +import PrepareUsers from './PrepareUsers'; +import type { UserDescriptor } from './UserDescriptor'; +import { useErrorHandler } from './useErrorHandler'; import { ProgressStep, ImportWaitingStates, @@ -15,11 +20,6 @@ import { } from '../../../../app/importer/lib/ImporterProgressStep'; import { numberFormat } from '../../../../lib/utils/stringUtils'; import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; -import type { ChannelDescriptor } from './ChannelDescriptor'; -import PrepareChannels from './PrepareChannels'; -import PrepareUsers from './PrepareUsers'; -import type { UserDescriptor } from './UserDescriptor'; -import { useErrorHandler } from './useErrorHandler'; const waitFor = (fn: () => Promise, predicate: (arg: T) => arg is U) => new Promise((resolve, reject) => { diff --git a/apps/meteor/client/views/admin/integrations/IntegrationsPage.tsx b/apps/meteor/client/views/admin/integrations/IntegrationsPage.tsx index 2035f8ed176..35c054109f9 100644 --- a/apps/meteor/client/views/admin/integrations/IntegrationsPage.tsx +++ b/apps/meteor/client/views/admin/integrations/IntegrationsPage.tsx @@ -4,10 +4,10 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { Page, PageHeader, PageContent } from '../../../components/Page'; import IntegrationsTable from './IntegrationsTable'; import NewBot from './NewBot'; import NewZapier from './NewZapier'; +import { Page, PageHeader, PageContent } from '../../../components/Page'; const IntegrationsPage = (): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/admin/integrations/IntegrationsRoute.tsx b/apps/meteor/client/views/admin/integrations/IntegrationsRoute.tsx index b8520f7063c..7af9bdd55d6 100644 --- a/apps/meteor/client/views/admin/integrations/IntegrationsRoute.tsx +++ b/apps/meteor/client/views/admin/integrations/IntegrationsRoute.tsx @@ -1,10 +1,10 @@ import { useRouteParameter, useAtLeastOnePermission } from '@rocket.chat/ui-contexts'; import React, { useMemo } from 'react'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import EditIntegrationsPage from './EditIntegrationsPage'; import EditIntegrationsPageWithData from './EditIntegrationsPageWithData'; import IntegrationsPage from './IntegrationsPage'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import OutgoingWebhookHistoryPage from './outgoing/history/OutgoingWebhookHistoryPage'; const IntegrationsRoute = () => { diff --git a/apps/meteor/client/views/admin/integrations/IntegrationsTable.tsx b/apps/meteor/client/views/admin/integrations/IntegrationsTable.tsx index 71d0de5e1cb..6a3e4121903 100644 --- a/apps/meteor/client/views/admin/integrations/IntegrationsTable.tsx +++ b/apps/meteor/client/views/admin/integrations/IntegrationsTable.tsx @@ -5,6 +5,7 @@ import { useEndpoint, useRoute, useTranslation, useLayout } from '@rocket.chat/u import { useQuery } from '@tanstack/react-query'; import React, { useMemo, useCallback, useState } from 'react'; +import IntegrationRow from './IntegrationRow'; import FilterByText from '../../../components/FilterByText'; import GenericNoResults from '../../../components/GenericNoResults'; import { @@ -16,7 +17,6 @@ import { } from '../../../components/GenericTable'; import { usePagination } from '../../../components/GenericTable/hooks/usePagination'; import { useSort } from '../../../components/GenericTable/hooks/useSort'; -import IntegrationRow from './IntegrationRow'; const IntegrationsTable = ({ type }: { type?: string }) => { const t = useTranslation(); diff --git a/apps/meteor/client/views/admin/integrations/incoming/EditIncomingWebhook.tsx b/apps/meteor/client/views/admin/integrations/incoming/EditIncomingWebhook.tsx index c14c2b19d02..40303e51c5f 100644 --- a/apps/meteor/client/views/admin/integrations/incoming/EditIncomingWebhook.tsx +++ b/apps/meteor/client/views/admin/integrations/incoming/EditIncomingWebhook.tsx @@ -5,12 +5,12 @@ import { useSetModal, useTranslation, useRouter, useRouteParameter } from '@rock import React, { useCallback } from 'react'; import { FormProvider, useForm } from 'react-hook-form'; +import IncomingWebhookForm from './IncomingWebhookForm'; import GenericModal from '../../../../components/GenericModal'; import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../../components/Page'; import { useCreateIntegration } from '../hooks/useCreateIntegration'; import { useDeleteIntegration } from '../hooks/useDeleteIntegration'; import { useUpdateIntegration } from '../hooks/useUpdateIntegration'; -import IncomingWebhookForm from './IncomingWebhookForm'; const getInitialValue = (webhookData: Serialized | undefined) => ({ enabled: webhookData?.enabled ?? true, diff --git a/apps/meteor/client/views/admin/integrations/outgoing/EditOutgoingWebhook.tsx b/apps/meteor/client/views/admin/integrations/outgoing/EditOutgoingWebhook.tsx index 1ca7d1f481c..a9330238eee 100644 --- a/apps/meteor/client/views/admin/integrations/outgoing/EditOutgoingWebhook.tsx +++ b/apps/meteor/client/views/admin/integrations/outgoing/EditOutgoingWebhook.tsx @@ -5,13 +5,13 @@ import { useSetModal, useTranslation, useRouter, useRouteParameter } from '@rock import React, { useCallback } from 'react'; import { FormProvider, useForm } from 'react-hook-form'; +import OutgoingWebhookForm from './OutgoingWebhookForm'; import GenericModal from '../../../../components/GenericModal'; import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../../components/Page'; import { triggerWordsToArray, triggerWordsToString } from '../helpers/triggerWords'; import { useCreateIntegration } from '../hooks/useCreateIntegration'; import { useDeleteIntegration } from '../hooks/useDeleteIntegration'; import { useUpdateIntegration } from '../hooks/useUpdateIntegration'; -import OutgoingWebhookForm from './OutgoingWebhookForm'; const getInitialValue = (webhookData: Serialized | undefined, defaultToken: string) => ({ enabled: webhookData?.enabled ?? true, diff --git a/apps/meteor/client/views/admin/integrations/outgoing/history/OutgoingWebhookHistoryPage.tsx b/apps/meteor/client/views/admin/integrations/outgoing/history/OutgoingWebhookHistoryPage.tsx index ac05b3bf0dd..b5d04d9fb2d 100644 --- a/apps/meteor/client/views/admin/integrations/outgoing/history/OutgoingWebhookHistoryPage.tsx +++ b/apps/meteor/client/views/admin/integrations/outgoing/history/OutgoingWebhookHistoryPage.tsx @@ -4,11 +4,11 @@ import { useQuery, useQueryClient } from '@tanstack/react-query'; import type { ComponentProps } from 'react'; import React, { useMemo, useState, useEffect } from 'react'; +import HistoryContent from './HistoryContent'; import { sdk } from '../../../../../../app/utils/client/lib/SDKClient'; import { CustomScrollbars } from '../../../../../components/CustomScrollbars'; import { usePagination } from '../../../../../components/GenericTable/hooks/usePagination'; import { Page, PageHeader, PageContent } from '../../../../../components/Page'; -import HistoryContent from './HistoryContent'; const OutgoingWebhookHistoryPage = (props: ComponentProps) => { const dispatchToastMessage = useToastMessageDispatch(); diff --git a/apps/meteor/client/views/admin/invites/InvitesPage.tsx b/apps/meteor/client/views/admin/invites/InvitesPage.tsx index d8b6444ffa8..670446c196f 100644 --- a/apps/meteor/client/views/admin/invites/InvitesPage.tsx +++ b/apps/meteor/client/views/admin/invites/InvitesPage.tsx @@ -5,6 +5,7 @@ import { useQuery } from '@tanstack/react-query'; import type { ReactElement } from 'react'; import React, { useMemo } from 'react'; +import InviteRow from './InviteRow'; import GenericModal from '../../../components/GenericModal'; import GenericNoResults from '../../../components/GenericNoResults'; import { @@ -15,7 +16,6 @@ import { GenericTableLoadingTable, } from '../../../components/GenericTable'; import { Page, PageHeader, PageContent } from '../../../components/Page'; -import InviteRow from './InviteRow'; const InvitesPage = (): ReactElement => { const t = useTranslation(); diff --git a/apps/meteor/client/views/admin/invites/InvitesRoute.tsx b/apps/meteor/client/views/admin/invites/InvitesRoute.tsx index cb05b33757e..fd04e31ec09 100644 --- a/apps/meteor/client/views/admin/invites/InvitesRoute.tsx +++ b/apps/meteor/client/views/admin/invites/InvitesRoute.tsx @@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import InvitesPage from './InvitesPage'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; const InvitesRoute = (): ReactElement => { const canCreateInviteLinks = usePermission('create-invite-links'); diff --git a/apps/meteor/client/views/admin/mailer/MailerRoute.tsx b/apps/meteor/client/views/admin/mailer/MailerRoute.tsx index ab260925875..c549fccdbe4 100644 --- a/apps/meteor/client/views/admin/mailer/MailerRoute.tsx +++ b/apps/meteor/client/views/admin/mailer/MailerRoute.tsx @@ -1,8 +1,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import React from 'react'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import MailerPage from './MailerPage'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; const MailerRoute = () => { const canAccessMailer = usePermission('access-mailer'); diff --git a/apps/meteor/client/views/admin/moderation/ModConsoleReportDetails.tsx b/apps/meteor/client/views/admin/moderation/ModConsoleReportDetails.tsx index 0f4460bff63..bde941c7719 100644 --- a/apps/meteor/client/views/admin/moderation/ModConsoleReportDetails.tsx +++ b/apps/meteor/client/views/admin/moderation/ModConsoleReportDetails.tsx @@ -3,9 +3,9 @@ import { Tabs, TabsItem, ContextualbarHeader, ContextualbarTitle } from '@rocket import { useTranslation, useRouter, useRouteParameter } from '@rocket.chat/ui-contexts'; import React, { useState } from 'react'; -import { Contextualbar, ContextualbarClose, ContextualbarDialog } from '../../../components/Contextualbar'; import UserMessages from './UserMessages'; import UserReportInfo from './UserReports/UserReportInfo'; +import { Contextualbar, ContextualbarClose, ContextualbarDialog } from '../../../components/Contextualbar'; type ModConsoleReportDetailsProps = { userId: IUser['_id']; diff --git a/apps/meteor/client/views/admin/moderation/ModerationConsolePage.tsx b/apps/meteor/client/views/admin/moderation/ModerationConsolePage.tsx index 56801bfe145..782aa97f0ff 100644 --- a/apps/meteor/client/views/admin/moderation/ModerationConsolePage.tsx +++ b/apps/meteor/client/views/admin/moderation/ModerationConsolePage.tsx @@ -2,11 +2,11 @@ import { Tabs, TabsItem } from '@rocket.chat/fuselage'; import { useTranslation, useRouteParameter, useToastMessageDispatch } from '@rocket.chat/ui-contexts'; import React, { useCallback } from 'react'; -import { Page, PageHeader, PageContent } from '../../../components/Page'; -import { getPermaLink } from '../../../lib/getPermaLink'; import ModConsoleReportDetails from './ModConsoleReportDetails'; import ModerationConsoleTable from './ModerationConsoleTable'; import ModConsoleUsersTable from './UserReports/ModConsoleUsersTable'; +import { Page, PageHeader, PageContent } from '../../../components/Page'; +import { getPermaLink } from '../../../lib/getPermaLink'; type TabType = 'users' | 'messages'; diff --git a/apps/meteor/client/views/admin/moderation/ModerationConsoleRoute.tsx b/apps/meteor/client/views/admin/moderation/ModerationConsoleRoute.tsx index d821c4cb90f..77549e5bef0 100644 --- a/apps/meteor/client/views/admin/moderation/ModerationConsoleRoute.tsx +++ b/apps/meteor/client/views/admin/moderation/ModerationConsoleRoute.tsx @@ -1,8 +1,8 @@ import { usePermission, useRouteParameter, useRouter } from '@rocket.chat/ui-contexts'; import React, { useEffect } from 'react'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import ModerationConsolePage from './ModerationConsolePage'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; const MODERATION_VALID_TABS = ['users', 'messages'] as const; diff --git a/apps/meteor/client/views/admin/moderation/ModerationConsoleTable.tsx b/apps/meteor/client/views/admin/moderation/ModerationConsoleTable.tsx index d009155bf58..050cfb3efd2 100644 --- a/apps/meteor/client/views/admin/moderation/ModerationConsoleTable.tsx +++ b/apps/meteor/client/views/admin/moderation/ModerationConsoleTable.tsx @@ -5,6 +5,8 @@ import { useQuery } from '@tanstack/react-query'; import React, { useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; +import ModerationConsoleTableRow from './ModerationConsoleTableRow'; +import ModerationFilter from './helpers/ModerationFilter'; import GenericNoResults from '../../../components/GenericNoResults'; import { GenericTable, @@ -15,8 +17,6 @@ import { } from '../../../components/GenericTable'; import { usePagination } from '../../../components/GenericTable/hooks/usePagination'; import { useSort } from '../../../components/GenericTable/hooks/useSort'; -import ModerationConsoleTableRow from './ModerationConsoleTableRow'; -import ModerationFilter from './helpers/ModerationFilter'; // TODO: Missing error state const ModerationConsoleTable = () => { diff --git a/apps/meteor/client/views/admin/moderation/ModerationConsoleTableRow.tsx b/apps/meteor/client/views/admin/moderation/ModerationConsoleTableRow.tsx index 65bf7069e07..bb661577f9d 100644 --- a/apps/meteor/client/views/admin/moderation/ModerationConsoleTableRow.tsx +++ b/apps/meteor/client/views/admin/moderation/ModerationConsoleTableRow.tsx @@ -1,10 +1,10 @@ import type { IModerationAudit, IUser } from '@rocket.chat/core-typings'; import React from 'react'; -import { GenericTableCell, GenericTableRow } from '../../../components/GenericTable'; -import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime'; import ModerationConsoleActions from './ModerationConsoleActions'; import UserColumn from './helpers/UserColumn'; +import { GenericTableCell, GenericTableRow } from '../../../components/GenericTable'; +import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime'; export type ModerationConsoleRowProps = { report: IModerationAudit; diff --git a/apps/meteor/client/views/admin/moderation/UserMessages.tsx b/apps/meteor/client/views/admin/moderation/UserMessages.tsx index 19e351cce0d..c7a44ed1122 100644 --- a/apps/meteor/client/views/admin/moderation/UserMessages.tsx +++ b/apps/meteor/client/views/admin/moderation/UserMessages.tsx @@ -5,10 +5,10 @@ import { useQuery } from '@tanstack/react-query'; import React, { Fragment } from 'react'; import { useTranslation } from 'react-i18next'; -import { ContextualbarFooter } from '../../../components/Contextualbar'; -import GenericNoResults from '../../../components/GenericNoResults'; import MessageContextFooter from './MessageContextFooter'; import ContextMessage from './helpers/ContextMessage'; +import { ContextualbarFooter } from '../../../components/Contextualbar'; +import GenericNoResults from '../../../components/GenericNoResults'; const UserMessages = ({ userId, onRedirect }: { userId: string; onRedirect: (mid: string) => void }) => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx b/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx index 21128ff72fd..b9f413e4edc 100644 --- a/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx +++ b/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx @@ -2,10 +2,10 @@ import { GenericMenu } from '@rocket.chat/ui-client'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import type { ModConsoleUserRowProps } from './ModConsoleUserTableRow'; import useDeactivateUserAction from '../hooks/useDeactivateUserAction'; import useDismissUserAction from '../hooks/useDismissUserAction'; import useResetAvatarAction from '../hooks/useResetAvatarAction'; -import type { ModConsoleUserRowProps } from './ModConsoleUserTableRow'; const ModConsoleUserActions = ({ report, onClick }: Omit) => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserTableRow.tsx b/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserTableRow.tsx index b37c5330d7e..4a8e502ba19 100644 --- a/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserTableRow.tsx +++ b/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserTableRow.tsx @@ -1,10 +1,10 @@ import type { IUser, UserReport, Serialized } from '@rocket.chat/core-typings'; import React from 'react'; +import ModConsoleUserActions from './ModConsoleUserActions'; import { GenericTableCell, GenericTableRow } from '../../../../components/GenericTable'; import { useFormatDateAndTime } from '../../../../hooks/useFormatDateAndTime'; import UserColumn from '../helpers/UserColumn'; -import ModConsoleUserActions from './ModConsoleUserActions'; export type ModConsoleUserRowProps = { report: Serialized & { count: number }>; diff --git a/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUsersTable.tsx b/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUsersTable.tsx index af3e16e56fe..82f9c8b7bbc 100644 --- a/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUsersTable.tsx +++ b/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUsersTable.tsx @@ -5,6 +5,7 @@ import { useQuery } from '@tanstack/react-query'; import React, { useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; +import ModConsoleUserTableRow from './ModConsoleUserTableRow'; import GenericNoResults from '../../../../components/GenericNoResults'; import { GenericTable, @@ -16,7 +17,6 @@ import { import { usePagination } from '../../../../components/GenericTable/hooks/usePagination'; import { useSort } from '../../../../components/GenericTable/hooks/useSort'; import ModerationFilter from '../helpers/ModerationFilter'; -import ModConsoleUserTableRow from './ModConsoleUserTableRow'; const ModConsoleUsersTable = () => { const [text, setText] = useState(''); diff --git a/apps/meteor/client/views/admin/moderation/UserReports/UserReportInfo.tsx b/apps/meteor/client/views/admin/moderation/UserReports/UserReportInfo.tsx index c20b2a215ae..625daed5035 100644 --- a/apps/meteor/client/views/admin/moderation/UserReports/UserReportInfo.tsx +++ b/apps/meteor/client/views/admin/moderation/UserReports/UserReportInfo.tsx @@ -17,13 +17,13 @@ import { useQuery } from '@tanstack/react-query'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import UserContextFooter from './UserContextFooter'; import { ContextualbarScrollableContent } from '../../../../components/Contextualbar'; import GenericNoResults from '../../../../components/GenericNoResults'; import { UserCardRole } from '../../../../components/UserCard'; import { useFormatDate } from '../../../../hooks/useFormatDate'; import ReportReason from '../helpers/ReportReason'; import UserColumn from '../helpers/UserColumn'; -import UserContextFooter from './UserContextFooter'; const UserReportInfo = ({ userId }: { userId: string }) => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx b/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx index 7e8d35a325d..3d478755ca5 100644 --- a/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx +++ b/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx @@ -6,6 +6,7 @@ import { useSetting } from '@rocket.chat/ui-contexts'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import ReportReasonCollapsible from './ReportReasonCollapsible'; import MessageContentBody from '../../../../components/message/MessageContentBody'; import Attachments from '../../../../components/message/content/Attachments'; import UiKitMessageBlock from '../../../../components/message/uikit/UiKitMessageBlock'; @@ -16,7 +17,6 @@ import { useUserDisplayName } from '../../../../hooks/useUserDisplayName'; import MessageReportInfo from '../MessageReportInfo'; import useDeleteMessage from '../hooks/useDeleteMessage'; import { useDismissMessageAction } from '../hooks/useDismissMessageAction'; -import ReportReasonCollapsible from './ReportReasonCollapsible'; const ContextMessage = ({ message, diff --git a/apps/meteor/client/views/admin/moderation/helpers/ModerationFilter.tsx b/apps/meteor/client/views/admin/moderation/helpers/ModerationFilter.tsx index 376f71d89c4..035ab6c16c1 100644 --- a/apps/meteor/client/views/admin/moderation/helpers/ModerationFilter.tsx +++ b/apps/meteor/client/views/admin/moderation/helpers/ModerationFilter.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import FilterByText from '../../../../components/FilterByText'; import DateRangePicker from './DateRangePicker'; +import FilterByText from '../../../../components/FilterByText'; type ModerationFilterProps = { text: string; diff --git a/apps/meteor/client/views/admin/oauthApps/EditOauthAppWithData.tsx b/apps/meteor/client/views/admin/oauthApps/EditOauthAppWithData.tsx index e7fe18a4ef6..6803d88c002 100644 --- a/apps/meteor/client/views/admin/oauthApps/EditOauthAppWithData.tsx +++ b/apps/meteor/client/views/admin/oauthApps/EditOauthAppWithData.tsx @@ -5,8 +5,8 @@ import type { ReactElement } from 'react'; import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; -import { FormSkeleton } from '../../../components/Skeleton'; import EditOauthApp from './EditOauthApp'; +import { FormSkeleton } from '../../../components/Skeleton'; const EditOauthAppWithData = ({ _id, ...props }: { _id: string }): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/admin/oauthApps/OAuthAppsPage.tsx b/apps/meteor/client/views/admin/oauthApps/OAuthAppsPage.tsx index cc9e174948e..ae7d00ae434 100644 --- a/apps/meteor/client/views/admin/oauthApps/OAuthAppsPage.tsx +++ b/apps/meteor/client/views/admin/oauthApps/OAuthAppsPage.tsx @@ -3,10 +3,10 @@ import { useRouteParameter, useTranslation, useRouter } from '@rocket.chat/ui-co import type { ReactElement } from 'react'; import React from 'react'; -import { Page, PageHeader, PageContent } from '../../../components/Page'; import EditOauthAppWithData from './EditOauthAppWithData'; import OAuthAddApp from './OAuthAddApp'; import OAuthAppsTable from './OAuthAppsTable'; +import { Page, PageHeader, PageContent } from '../../../components/Page'; const OAuthAppsPage = (): ReactElement => { const t = useTranslation(); diff --git a/apps/meteor/client/views/admin/oauthApps/OAuthAppsRoute.tsx b/apps/meteor/client/views/admin/oauthApps/OAuthAppsRoute.tsx index fba79bf8664..c9c419ba680 100644 --- a/apps/meteor/client/views/admin/oauthApps/OAuthAppsRoute.tsx +++ b/apps/meteor/client/views/admin/oauthApps/OAuthAppsRoute.tsx @@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import OAuthAppsPage from './OAuthAppsPage'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; const OAuthAppsRoute = (): ReactElement => { const canAccessOAuthApps = usePermission('manage-oauth-apps'); diff --git a/apps/meteor/client/views/admin/permissions/EditRolePage.tsx b/apps/meteor/client/views/admin/permissions/EditRolePage.tsx index b958f619ad9..c37ed2f2ee5 100644 --- a/apps/meteor/client/views/admin/permissions/EditRolePage.tsx +++ b/apps/meteor/client/views/admin/permissions/EditRolePage.tsx @@ -7,9 +7,9 @@ import React from 'react'; import { FormProvider, useForm } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; +import RoleForm from './RoleForm'; import { ContextualbarFooter, ContextualbarScrollableContent } from '../../../components/Contextualbar'; import GenericModal from '../../../components/GenericModal'; -import RoleForm from './RoleForm'; const EditRolePage = ({ role, isEnterprise }: { role?: IRole; isEnterprise: boolean }): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/admin/permissions/EditRolePageWithData.tsx b/apps/meteor/client/views/admin/permissions/EditRolePageWithData.tsx index d139118c550..7f96aa14899 100644 --- a/apps/meteor/client/views/admin/permissions/EditRolePageWithData.tsx +++ b/apps/meteor/client/views/admin/permissions/EditRolePageWithData.tsx @@ -5,10 +5,10 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import PageSkeleton from '../../../components/PageSkeleton'; -import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule'; import EditRolePage from './EditRolePage'; import { useRole } from './hooks/useRole'; +import PageSkeleton from '../../../components/PageSkeleton'; +import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule'; const EditRolePageWithData = ({ roleId }: { roleId?: IRole['_id'] }): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/admin/permissions/PermissionsContextBar.tsx b/apps/meteor/client/views/admin/permissions/PermissionsContextBar.tsx index 3b8bea6097e..a386fbda7fd 100644 --- a/apps/meteor/client/views/admin/permissions/PermissionsContextBar.tsx +++ b/apps/meteor/client/views/admin/permissions/PermissionsContextBar.tsx @@ -3,6 +3,8 @@ import { useRouteParameter, useRoute, useTranslation, useSetModal } from '@rocke import type { ReactElement } from 'react'; import React, { useEffect } from 'react'; +import CustomRoleUpsellModal from './CustomRoleUpsellModal'; +import EditRolePageWithData from './EditRolePageWithData'; import { Contextualbar, ContextualbarHeader, @@ -11,8 +13,6 @@ import { ContextualbarDialog, } from '../../../components/Contextualbar'; import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule'; -import CustomRoleUpsellModal from './CustomRoleUpsellModal'; -import EditRolePageWithData from './EditRolePageWithData'; const PermissionsContextBar = (): ReactElement | null => { const t = useTranslation(); diff --git a/apps/meteor/client/views/admin/permissions/PermissionsRouter.tsx b/apps/meteor/client/views/admin/permissions/PermissionsRouter.tsx index 31ab597df91..ddaff27eff5 100644 --- a/apps/meteor/client/views/admin/permissions/PermissionsRouter.tsx +++ b/apps/meteor/client/views/admin/permissions/PermissionsRouter.tsx @@ -2,11 +2,11 @@ import { useRouteParameter, usePermission } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; +import PermissionsTable from './PermissionsTable'; +import UsersInRole from './UsersInRole'; import PageSkeleton from '../../../components/PageSkeleton'; import { useIsEnterprise } from '../../../hooks/useIsEnterprise'; import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; -import PermissionsTable from './PermissionsTable'; -import UsersInRole from './UsersInRole'; const PermissionsRouter = (): ReactElement => { const canViewPermission = usePermission('access-permissions'); diff --git a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx index 7ddd6ca9ab4..72d9d2bf413 100644 --- a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx +++ b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx @@ -6,10 +6,10 @@ import type { ReactElement } from 'react'; import React, { useState, memo } from 'react'; import { useTranslation } from 'react-i18next'; +import RoleCell from './RoleCell'; import { CONSTANTS } from '../../../../../app/authorization/lib'; import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable'; import { useChangeRole } from '../hooks/useChangeRole'; -import RoleCell from './RoleCell'; const getName = (t: TFunction, permission: IPermission): string => { if (permission.level === CONSTANTS.SETTINGS_LEVEL) { diff --git a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTable.tsx b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTable.tsx index 583f9d23725..b70867e86e8 100644 --- a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTable.tsx +++ b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTable.tsx @@ -5,6 +5,9 @@ import { useRoute, usePermission, useMethod, useTranslation, useSetModal } from import type { ReactElement } from 'react'; import React, { useState } from 'react'; +import PermissionRow from './PermissionRow'; +import PermissionsTableFilter from './PermissionsTableFilter'; +import RoleHeader from './RoleHeader'; import GenericNoResults from '../../../../components/GenericNoResults'; import { GenericTable, GenericTableHeader, GenericTableHeaderCell, GenericTableBody } from '../../../../components/GenericTable'; import { usePagination } from '../../../../components/GenericTable/hooks/usePagination'; @@ -12,9 +15,6 @@ import { Page, PageHeader, PageContent } from '../../../../components/Page'; import CustomRoleUpsellModal from '../CustomRoleUpsellModal'; import PermissionsContextBar from '../PermissionsContextBar'; import { usePermissionsAndRoles } from '../hooks/usePermissionsAndRoles'; -import PermissionRow from './PermissionRow'; -import PermissionsTableFilter from './PermissionsTableFilter'; -import RoleHeader from './RoleHeader'; const PermissionsTable = ({ isEnterprise }: { isEnterprise: boolean }): ReactElement => { const t = useTranslation(); diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx index 3e3c6988e6c..5aa29e46f14 100644 --- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx +++ b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx @@ -7,10 +7,10 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useForm, Controller } from 'react-hook-form'; +import UsersInRoleTable from './UsersInRoleTable'; import { Page, PageHeader, PageContent } from '../../../../components/Page'; import RoomAutoComplete from '../../../../components/RoomAutoComplete'; import UserAutoCompleteMultiple from '../../../../components/UserAutoCompleteMultiple'; -import UsersInRoleTable from './UsersInRoleTable'; type UsersInRolePayload = { rid?: IRoom['_id']; diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePageWithData.tsx b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePageWithData.tsx index 8639c2407a6..4cf421ac19a 100644 --- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePageWithData.tsx +++ b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePageWithData.tsx @@ -2,8 +2,8 @@ import { useRouteParameter } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; -import { useRole } from '../hooks/useRole'; import UsersInRolePage from './UsersInRolePage'; +import { useRole } from '../hooks/useRole'; const UsersInRolePageWithData = (): ReactElement | null => { const _id = useRouteParameter('_id'); diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTable.tsx b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTable.tsx index b22792957d3..e5a815747f1 100644 --- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTable.tsx +++ b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTable.tsx @@ -7,6 +7,7 @@ import type { ReactElement } from 'react'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import UsersInRoleTableRow from './UsersInRoleTableRow'; import GenericError from '../../../../../components/GenericError'; import GenericModal from '../../../../../components/GenericModal'; import GenericNoResults from '../../../../../components/GenericNoResults'; @@ -18,7 +19,6 @@ import { GenericTableLoadingTable, } from '../../../../../components/GenericTable'; import { usePagination } from '../../../../../components/GenericTable/hooks/usePagination'; -import UsersInRoleTableRow from './UsersInRoleTableRow'; type UsersInRoleTableProps = { roleName: IRole['name']; diff --git a/apps/meteor/client/views/admin/rooms/EditRoom.tsx b/apps/meteor/client/views/admin/rooms/EditRoom.tsx index 4e1af52ac33..ff28f2460be 100644 --- a/apps/meteor/client/views/admin/rooms/EditRoom.tsx +++ b/apps/meteor/client/views/admin/rooms/EditRoom.tsx @@ -19,13 +19,13 @@ import React from 'react'; import { useForm, Controller } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; +import { useEditAdminRoomPermissions } from './useEditAdminRoomPermissions'; import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../components/Contextualbar'; import RoomAvatarEditor from '../../../components/avatar/RoomAvatarEditor'; import { getDirtyFields } from '../../../lib/getDirtyFields'; import { roomCoordinator } from '../../../lib/rooms/roomCoordinator'; import { useArchiveRoom } from '../../hooks/roomActions/useArchiveRoom'; import { useDeleteRoom } from '../../hooks/roomActions/useDeleteRoom'; -import { useEditAdminRoomPermissions } from './useEditAdminRoomPermissions'; type EditRoomProps = { room: IRoom; diff --git a/apps/meteor/client/views/admin/rooms/EditRoomWithData.tsx b/apps/meteor/client/views/admin/rooms/EditRoomWithData.tsx index 7e0f4ec06b6..9d3eb234c3a 100644 --- a/apps/meteor/client/views/admin/rooms/EditRoomWithData.tsx +++ b/apps/meteor/client/views/admin/rooms/EditRoomWithData.tsx @@ -4,6 +4,7 @@ import { useQuery } from '@tanstack/react-query'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import EditRoom from './EditRoom'; import { Contextualbar, ContextualbarHeader, @@ -11,7 +12,6 @@ import { ContextualbarClose, ContextualbarSkeleton, } from '../../../components/Contextualbar'; -import EditRoom from './EditRoom'; type EditRoomWithDataProps = { rid?: IRoom['_id']; onReload: () => void }; diff --git a/apps/meteor/client/views/admin/rooms/RoomsPage.tsx b/apps/meteor/client/views/admin/rooms/RoomsPage.tsx index 3fadd621b01..35ef4b651b5 100644 --- a/apps/meteor/client/views/admin/rooms/RoomsPage.tsx +++ b/apps/meteor/client/views/admin/rooms/RoomsPage.tsx @@ -3,10 +3,10 @@ import type { ReactElement } from 'react'; import React, { useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { ContextualbarDialog } from '../../../components/Contextualbar'; -import { Page, PageHeader, PageContent } from '../../../components/Page'; import EditRoomWithData from './EditRoomWithData'; import RoomsTable from './RoomsTable'; +import { ContextualbarDialog } from '../../../components/Contextualbar'; +import { Page, PageHeader, PageContent } from '../../../components/Page'; const RoomsPage = (): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/admin/rooms/RoomsRoute.tsx b/apps/meteor/client/views/admin/rooms/RoomsRoute.tsx index bda14931282..9140d816fd7 100644 --- a/apps/meteor/client/views/admin/rooms/RoomsRoute.tsx +++ b/apps/meteor/client/views/admin/rooms/RoomsRoute.tsx @@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import RoomsPage from './RoomsPage'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; const RoomsRoute = (): ReactElement => { const canViewRoomAdministration = usePermission('view-room-administration'); diff --git a/apps/meteor/client/views/admin/rooms/RoomsTable.tsx b/apps/meteor/client/views/admin/rooms/RoomsTable.tsx index 0d34198bb72..8279c454f61 100644 --- a/apps/meteor/client/views/admin/rooms/RoomsTable.tsx +++ b/apps/meteor/client/views/admin/rooms/RoomsTable.tsx @@ -7,6 +7,8 @@ import type { ReactElement, MutableRefObject } from 'react'; import React, { useRef, useState, useEffect, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import RoomRow from './RoomRow'; +import RoomsTableFilters from './RoomsTableFilters'; import GenericNoResults from '../../../components/GenericNoResults'; import { GenericTable, @@ -17,8 +19,6 @@ import { } from '../../../components/GenericTable'; import { usePagination } from '../../../components/GenericTable/hooks/usePagination'; import { useSort } from '../../../components/GenericTable/hooks/useSort'; -import RoomRow from './RoomRow'; -import RoomsTableFilters from './RoomsTableFilters'; type RoomFilters = { searchText: string; diff --git a/apps/meteor/client/views/admin/settings/Setting/Setting.tsx b/apps/meteor/client/views/admin/settings/Setting/Setting.tsx index 19f8ddfd781..9e74f2e36b7 100644 --- a/apps/meteor/client/views/admin/settings/Setting/Setting.tsx +++ b/apps/meteor/client/views/admin/settings/Setting/Setting.tsx @@ -7,9 +7,9 @@ import type { ReactElement } from 'react'; import React, { useEffect, useMemo, useState, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; +import MemoizedSetting from './MemoizedSetting'; import MarkdownText from '../../../../components/MarkdownText'; import { useEditableSetting, useEditableSettingsDispatch, useIsEnterprise } from '../../EditableSettingsContext'; -import MemoizedSetting from './MemoizedSetting'; type SettingProps = { className?: string; diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.spec.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.spec.tsx index e16bbd18a6a..508b55c0624 100644 --- a/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.spec.tsx +++ b/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.spec.tsx @@ -3,8 +3,8 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { TIMEUNIT } from '../../../../../lib/convertTimeUnit'; import { default as TimespanSettingInput, getHighestTimeUnit } from './TimespanSettingInput'; +import { TIMEUNIT } from '../../../../../lib/convertTimeUnit'; global.ResizeObserver = jest.fn().mockImplementation(() => ({ observe: jest.fn(), diff --git a/apps/meteor/client/views/admin/settings/SettingsPage.tsx b/apps/meteor/client/views/admin/settings/SettingsPage.tsx index 3b1e7a35e79..c079185e7e9 100644 --- a/apps/meteor/client/views/admin/settings/SettingsPage.tsx +++ b/apps/meteor/client/views/admin/settings/SettingsPage.tsx @@ -6,11 +6,11 @@ import type { ReactElement } from 'react'; import React, { useCallback, useState } from 'react'; import { useTranslation } from 'react-i18next'; +import SettingsGroupCard from './SettingsGroupCard'; +import { useSettingsGroups } from './hooks/useSettingsGroups'; import GenericNoResults from '../../../components/GenericNoResults'; import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; import PageBlockWithBorder from '../../../components/Page/PageBlockWithBorder'; -import SettingsGroupCard from './SettingsGroupCard'; -import { useSettingsGroups } from './hooks/useSettingsGroups'; const SettingsPage = (): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/admin/settings/SettingsRoute.tsx b/apps/meteor/client/views/admin/settings/SettingsRoute.tsx index 0db9d336a02..590276f65ba 100644 --- a/apps/meteor/client/views/admin/settings/SettingsRoute.tsx +++ b/apps/meteor/client/views/admin/settings/SettingsRoute.tsx @@ -2,10 +2,10 @@ import { useRouteParameter, useIsPrivilegedSettingsContext, useRouter } from '@r import type { ReactElement } from 'react'; import React from 'react'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import EditableSettingsProvider from './EditableSettingsProvider'; import SettingsGroupSelector from './SettingsGroupSelector'; import SettingsPage from './SettingsPage'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; const omittedSettings = ['Cloud_Workspace_AirGapped_Restrictions_Remaining_Days']; diff --git a/apps/meteor/client/views/admin/settings/groups/BaseGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/BaseGroupPage.tsx index 2b2a35b00a6..652759da7ff 100644 --- a/apps/meteor/client/views/admin/settings/groups/BaseGroupPage.tsx +++ b/apps/meteor/client/views/admin/settings/groups/BaseGroupPage.tsx @@ -1,9 +1,9 @@ import type { ReactElement } from 'react'; import React from 'react'; -import { useEditableSettingsGroupSections, useEditableSettingsGroupTabs } from '../../EditableSettingsContext'; import GenericGroupPage from './GenericGroupPage'; import TabbedGroupPage from './TabbedGroupPage'; +import { useEditableSettingsGroupSections, useEditableSettingsGroupTabs } from '../../EditableSettingsContext'; type BaseGroupPageProps = { _id: string; diff --git a/apps/meteor/client/views/admin/settings/groups/LDAPGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/LDAPGroupPage.tsx index 687047b9f61..03ab25a2c2f 100644 --- a/apps/meteor/client/views/admin/settings/groups/LDAPGroupPage.tsx +++ b/apps/meteor/client/views/admin/settings/groups/LDAPGroupPage.tsx @@ -6,10 +6,10 @@ import type { FormEvent } from 'react'; import React, { memo, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import BaseGroupPage from './BaseGroupPage'; import GenericModal from '../../../../components/GenericModal'; import { useExternalLink } from '../../../../hooks/useExternalLink'; import { useEditableSettings } from '../../EditableSettingsContext'; -import BaseGroupPage from './BaseGroupPage'; type LDAPGroupPageProps = ISetting & { onClickBack?: () => void; diff --git a/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/OAuthGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/OAuthGroupPage.tsx index a858555e46d..ce5c54d36d7 100644 --- a/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/OAuthGroupPage.tsx +++ b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/OAuthGroupPage.tsx @@ -5,12 +5,12 @@ import { useToastMessageDispatch, useAbsoluteUrl, useMethod, useTranslation, use import type { ReactElement } from 'react'; import React, { memo, useEffect, useState } from 'react'; +import CreateOAuthModal from './CreateOAuthModal'; import { strRight } from '../../../../../../lib/utils/stringUtils'; import GenericModal from '../../../../../components/GenericModal'; import { useEditableSettingsGroupSections } from '../../../EditableSettingsContext'; import SettingsGroupPage from '../../SettingsGroupPage'; import SettingsSection from '../../SettingsSection'; -import CreateOAuthModal from './CreateOAuthModal'; type OAuthGroupPageProps = ISetting & { onClickBack?: () => void; diff --git a/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx index 1a3c122502c..a4917c15881 100644 --- a/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx +++ b/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx @@ -4,8 +4,8 @@ import type { ReactElement } from 'react'; import React, { memo, useState, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; -import { useEditableSettingsGroupSections } from '../../EditableSettingsContext'; import GenericGroupPage from './GenericGroupPage'; +import { useEditableSettingsGroupSections } from '../../EditableSettingsContext'; type TabbedGroupPageProps = { headerButtons?: ReactElement; diff --git a/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/AssignAgentButton.tsx b/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/AssignAgentButton.tsx index 8b1438ade77..fe357b31cdb 100644 --- a/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/AssignAgentButton.tsx +++ b/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/AssignAgentButton.tsx @@ -4,8 +4,8 @@ import { useSetModal } from '@rocket.chat/ui-contexts'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { GenericTableCell } from '../../../../../components/GenericTable'; import AssignAgentModal from './AssignAgentModal'; +import { GenericTableCell } from '../../../../../components/GenericTable'; type AssignAgentButtonProps = { extension: string; reload: () => void }; diff --git a/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/VoipExtensionsPage.tsx b/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/VoipExtensionsPage.tsx index 7494a249818..c7b3a4cff38 100644 --- a/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/VoipExtensionsPage.tsx +++ b/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/VoipExtensionsPage.tsx @@ -4,6 +4,9 @@ import { useSetModal, useTranslation, useEndpoint } from '@rocket.chat/ui-contex import { useQuery } from '@tanstack/react-query'; import React, { useMemo } from 'react'; +import AssignAgentButton from './AssignAgentButton'; +import AssignAgentModal from './AssignAgentModal'; +import RemoveAgentButton from './RemoveAgentButton'; import GenericNoResults from '../../../../../components/GenericNoResults'; import { GenericTable, @@ -16,9 +19,6 @@ import { } from '../../../../../components/GenericTable'; import { usePagination } from '../../../../../components/GenericTable/hooks/usePagination'; import { PageContent } from '../../../../../components/Page'; -import AssignAgentButton from './AssignAgentButton'; -import AssignAgentModal from './AssignAgentModal'; -import RemoveAgentButton from './RemoveAgentButton'; const VoipExtensionsPage = () => { const t = useTranslation(); diff --git a/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/VoipGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/VoipGroupPage.tsx index a3cf978cfde..249bdab9961 100644 --- a/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/VoipGroupPage.tsx +++ b/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/VoipGroupPage.tsx @@ -5,12 +5,12 @@ import { useSetting } from '@rocket.chat/ui-contexts'; import React, { memo, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; +import VoipExtensionsPage from './VoipExtensionsPage'; import GenericNoResults from '../../../../../components/GenericNoResults'; import { PageScrollableContentWithShadow } from '../../../../../components/Page'; import { useEditableSettingsGroupSections } from '../../../EditableSettingsContext'; import SettingsGroupPage from '../../SettingsGroupPage'; import SettingsSection from '../../SettingsSection'; -import VoipExtensionsPage from './VoipExtensionsPage'; type VoipGroupPageProps = ISetting & { onClickBack?: () => void; diff --git a/apps/meteor/client/views/admin/sidebar/AdminSidebar.tsx b/apps/meteor/client/views/admin/sidebar/AdminSidebar.tsx index c0c4aa08cfb..820033c6c53 100644 --- a/apps/meteor/client/views/admin/sidebar/AdminSidebar.tsx +++ b/apps/meteor/client/views/admin/sidebar/AdminSidebar.tsx @@ -1,10 +1,10 @@ import { useTranslation, useLayout, useCurrentRoutePath } from '@rocket.chat/ui-contexts'; import React, { memo } from 'react'; +import AdminSidebarPages from './AdminSidebarPages'; import PlanTag from '../../../components/PlanTag'; import Sidebar from '../../../components/Sidebar'; import SettingsProvider from '../../../providers/SettingsProvider'; -import AdminSidebarPages from './AdminSidebarPages'; const AdminSidebar = () => { const t = useTranslation(); diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx index c5de629e558..98413c83772 100644 --- a/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx +++ b/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx @@ -4,8 +4,8 @@ import { ExternalLink } from '@rocket.chat/ui-client'; import React from 'react'; import { Trans, useTranslation } from 'react-i18next'; -import { useLicenseLimitsByBehavior } from '../../../hooks/useLicenseLimitsByBehavior'; import { useCheckoutUrl } from './hooks/useCheckoutUrl'; +import { useLicenseLimitsByBehavior } from '../../../hooks/useLicenseLimitsByBehavior'; export const SubscriptionCalloutLimits = () => { const manageSubscriptionUrl = useCheckoutUrl(); diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx index 93792b517dc..4ba6bd677ea 100644 --- a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx +++ b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx @@ -5,10 +5,6 @@ import { t } from 'i18next'; import React, { memo, useCallback, useEffect } from 'react'; import tinykeys from 'tinykeys'; -import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; -import { useIsEnterprise } from '../../../hooks/useIsEnterprise'; -import { useInvalidateLicense, useLicense } from '../../../hooks/useLicense'; -import { useRegistrationStatus } from '../../../hooks/useRegistrationStatus'; import { SubscriptionCalloutLimits } from './SubscriptionCalloutLimits'; import SubscriptionPageSkeleton from './SubscriptionPageSkeleton'; import UpgradeButton from './components/UpgradeButton'; @@ -25,6 +21,10 @@ import PlanCardCommunity from './components/cards/PlanCard/PlanCardCommunity'; import SeatsCard from './components/cards/SeatsCard'; import { useRemoveLicense } from './hooks/useRemoveLicense'; import { useWorkspaceSync } from './hooks/useWorkspaceSync'; +import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; +import { useIsEnterprise } from '../../../hooks/useIsEnterprise'; +import { useInvalidateLicense, useLicense } from '../../../hooks/useLicense'; +import { useRegistrationStatus } from '../../../hooks/useRegistrationStatus'; function useShowLicense() { const [showLicenseTab, setShowLicenseTab] = useSessionStorage('admin:showLicenseTab', false); diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionRoute.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionRoute.tsx index 99fb216c01c..acda752117a 100644 --- a/apps/meteor/client/views/admin/subscription/SubscriptionRoute.tsx +++ b/apps/meteor/client/views/admin/subscription/SubscriptionRoute.tsx @@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React, { memo } from 'react'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import SubscriptionPage from './SubscriptionPage'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; const SubscriptionRoute = (): ReactElement => { const canViewSubscription = usePermission('manage-cloud'); diff --git a/apps/meteor/client/views/admin/subscription/components/UsagePieGraph.stories.tsx b/apps/meteor/client/views/admin/subscription/components/UsagePieGraph.stories.tsx index 37985291df1..a85262ff3ee 100644 --- a/apps/meteor/client/views/admin/subscription/components/UsagePieGraph.stories.tsx +++ b/apps/meteor/client/views/admin/subscription/components/UsagePieGraph.stories.tsx @@ -3,8 +3,8 @@ import type { Meta, StoryFn } from '@storybook/react'; import type { ComponentProps } from 'react'; import React from 'react'; -import { useAutoSequence } from '../../../../stories/hooks/useAutoSequence'; import UsagePieGraph from './UsagePieGraph'; +import { useAutoSequence } from '../../../../stories/hooks/useAutoSequence'; export default { title: 'Admin/Info/UsagePieGraph', diff --git a/apps/meteor/client/views/admin/subscription/components/cards/AppsUsageCard/AppsUsageCard.spec.tsx b/apps/meteor/client/views/admin/subscription/components/cards/AppsUsageCard/AppsUsageCard.spec.tsx index 480759dc53f..b8f71b61d6a 100644 --- a/apps/meteor/client/views/admin/subscription/components/cards/AppsUsageCard/AppsUsageCard.spec.tsx +++ b/apps/meteor/client/views/admin/subscription/components/cards/AppsUsageCard/AppsUsageCard.spec.tsx @@ -3,8 +3,8 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { PRICING_LINK } from '../../../utils/links'; import AppsUsageCard from './AppsUsageCard'; +import { PRICING_LINK } from '../../../utils/links'; const appRoot = mockAppRoot().withTranslations('en', 'core', { Apps_InfoText_limited: diff --git a/apps/meteor/client/views/admin/subscription/components/cards/AppsUsageCard/AppsUsageCard.tsx b/apps/meteor/client/views/admin/subscription/components/cards/AppsUsageCard/AppsUsageCard.tsx index 8b962e093a3..a87ef914aba 100644 --- a/apps/meteor/client/views/admin/subscription/components/cards/AppsUsageCard/AppsUsageCard.tsx +++ b/apps/meteor/client/views/admin/subscription/components/cards/AppsUsageCard/AppsUsageCard.tsx @@ -4,11 +4,11 @@ import type { ReactElement } from 'react'; import React from 'react'; import { Trans, useTranslation } from 'react-i18next'; +import AppsUsageCardSection from './AppsUsageCardSection'; import { PRICING_LINK } from '../../../utils/links'; import type { CardProps } from '../../FeatureUsageCard'; import FeatureUsageCard from '../../FeatureUsageCard'; import UpgradeButton from '../../UpgradeButton'; -import AppsUsageCardSection from './AppsUsageCardSection'; // Magic numbers const marketplaceAppsMaxCountFallback = 5; diff --git a/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardPremium.tsx b/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardPremium.tsx index ea96adf32a3..8da910abe20 100644 --- a/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardPremium.tsx +++ b/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardPremium.tsx @@ -5,11 +5,11 @@ import type { ReactElement } from 'react'; import React from 'react'; import { Trans, useTranslation } from 'react-i18next'; +import PlanCardHeader from './PlanCardHeader'; import { useFormatDate } from '../../../../../../hooks/useFormatDate'; import { useIsSelfHosted } from '../../../../../../hooks/useIsSelfHosted'; import { useLicenseName } from '../../../../../../hooks/useLicense'; import { CONTACT_SALES_LINK } from '../../../utils/links'; -import PlanCardHeader from './PlanCardHeader'; type LicenseLimits = { activeUsers: { max: number; value?: number }; diff --git a/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardTrial.tsx b/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardTrial.tsx index eb6a020894e..99a52d04f5c 100644 --- a/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardTrial.tsx +++ b/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardTrial.tsx @@ -6,10 +6,10 @@ import type { ReactElement } from 'react'; import React from 'react'; import { Trans, useTranslation } from 'react-i18next'; +import PlanCardHeader from './PlanCardHeader'; import { useLicenseName } from '../../../../../../hooks/useLicense'; import { DOWNGRADE_LINK, TRIAL_LINK } from '../../../utils/links'; import UpgradeButton from '../../UpgradeButton'; -import PlanCardHeader from './PlanCardHeader'; type PlanCardProps = { licenseInformation: ILicenseV3['information']; diff --git a/apps/meteor/client/views/admin/users/AdminInviteUsers.tsx b/apps/meteor/client/views/admin/users/AdminInviteUsers.tsx index 8976864f343..f322eb6e762 100644 --- a/apps/meteor/client/views/admin/users/AdminInviteUsers.tsx +++ b/apps/meteor/client/views/admin/users/AdminInviteUsers.tsx @@ -13,11 +13,11 @@ import { useTranslation, useRoute } from '@rocket.chat/ui-contexts'; import type { ChangeEvent } from 'react'; import React, { useCallback, useState } from 'react'; +import { useSendInvitationEmailMutation } from './hooks/useSendInvitationEmailMutation'; +import { useSmtpQuery } from './hooks/useSmtpQuery'; import { validateEmail } from '../../../../lib/emailValidator'; import { ContextualbarScrollableContent, ContextualbarFooter, ContextualbarContent } from '../../../components/Contextualbar'; import { FormSkeleton } from '../../../components/Skeleton'; -import { useSendInvitationEmailMutation } from './hooks/useSendInvitationEmailMutation'; -import { useSmtpQuery } from './hooks/useSmtpQuery'; // TODO: Replace using RHF const AdminInviteUsers = () => { diff --git a/apps/meteor/client/views/admin/users/AdminUserForm.tsx b/apps/meteor/client/views/admin/users/AdminUserForm.tsx index b5be16d2f93..ca6e07110a8 100644 --- a/apps/meteor/client/views/admin/users/AdminUserForm.tsx +++ b/apps/meteor/client/views/admin/users/AdminUserForm.tsx @@ -33,6 +33,10 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import React, { useMemo, useState } from 'react'; import { Controller, useForm } from 'react-hook-form'; +import AdminUserSetRandomPasswordContent from './AdminUserSetRandomPasswordContent'; +import AdminUserSetRandomPasswordRadios from './AdminUserSetRandomPasswordRadios'; +import PasswordFieldSkeleton from './PasswordFieldSkeleton'; +import { useSmtpQuery } from './hooks/useSmtpQuery'; import { validateEmail } from '../../../../lib/emailValidator'; import { parseCSV } from '../../../../lib/utils/parseCSV'; import { ContextualbarScrollableContent } from '../../../components/Contextualbar'; @@ -40,10 +44,6 @@ import UserAvatarEditor from '../../../components/avatar/UserAvatarEditor'; import { useEndpointAction } from '../../../hooks/useEndpointAction'; import { useUpdateAvatar } from '../../../hooks/useUpdateAvatar'; import { USER_STATUS_TEXT_MAX_LENGTH, BIO_TEXT_MAX_LENGTH } from '../../../lib/constants'; -import AdminUserSetRandomPasswordContent from './AdminUserSetRandomPasswordContent'; -import AdminUserSetRandomPasswordRadios from './AdminUserSetRandomPasswordRadios'; -import PasswordFieldSkeleton from './PasswordFieldSkeleton'; -import { useSmtpQuery } from './hooks/useSmtpQuery'; type AdminUserFormProps = { userData?: Serialized; diff --git a/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx b/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx index 749b7590382..5c4998b816b 100644 --- a/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx +++ b/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx @@ -5,9 +5,9 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import AdminUserForm from './AdminUserForm'; import { FormSkeleton } from '../../../components/Skeleton'; import { useUserInfoQuery } from '../../../hooks/useUserInfoQuery'; -import AdminUserForm from './AdminUserForm'; type AdminUserFormWithDataProps = { uid: IUser['_id']; diff --git a/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx b/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx index 635706627ea..c6c594dcc8b 100644 --- a/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx +++ b/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx @@ -5,14 +5,14 @@ import type { ReactElement } from 'react'; import React, { useCallback, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; -import { UserInfoAction } from '../../../components/UserInfo'; -import { useActionSpread } from '../../hooks/useActionSpread'; import type { AdminUsersTab } from './AdminUsersPage'; import { useChangeAdminStatusAction } from './hooks/useChangeAdminStatusAction'; import { useChangeUserStatusAction } from './hooks/useChangeUserStatusAction'; import { useDeleteUserAction } from './hooks/useDeleteUserAction'; import { useResetE2EEKeyAction } from './hooks/useResetE2EEKeyAction'; import { useResetTOTPAction } from './hooks/useResetTOTPAction'; +import { UserInfoAction } from '../../../components/UserInfo'; +import { useActionSpread } from '../../hooks/useActionSpread'; type AdminUserInfoActionsProps = { username: IUser['username']; diff --git a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx index 59d91ce5ada..18c4710d421 100644 --- a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx +++ b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx @@ -6,6 +6,8 @@ import { useQuery } from '@tanstack/react-query'; import type { ReactElement } from 'react'; import React, { useMemo } from 'react'; +import AdminUserInfoActions from './AdminUserInfoActions'; +import type { AdminUsersTab } from './AdminUsersPage'; import { getUserEmailAddress } from '../../../../lib/getUserEmailAddress'; import { ContextualbarContent } from '../../../components/Contextualbar'; import { FormSkeleton } from '../../../components/Skeleton'; @@ -13,8 +15,6 @@ import { UserCardRole } from '../../../components/UserCard'; import { UserInfo } from '../../../components/UserInfo'; import { UserStatus } from '../../../components/UserStatus'; import { getUserEmailVerified } from '../../../lib/utils/getUserEmailVerified'; -import AdminUserInfoActions from './AdminUserInfoActions'; -import type { AdminUsersTab } from './AdminUsersPage'; type AdminUserInfoWithDataProps = { uid: IUser['_id']; diff --git a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx index afe881f64cc..36a1f4b8ad1 100644 --- a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx +++ b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx @@ -9,6 +9,17 @@ import type { ReactElement } from 'react'; import React, { useEffect, useMemo, useRef, useState } from 'react'; import { Trans } from 'react-i18next'; +import AdminInviteUsers from './AdminInviteUsers'; +import AdminUserCreated from './AdminUserCreated'; +import AdminUserForm from './AdminUserForm'; +import AdminUserFormWithData from './AdminUserFormWithData'; +import AdminUserInfoWithData from './AdminUserInfoWithData'; +import AdminUserUpgrade from './AdminUserUpgrade'; +import UsersPageHeaderContent from './UsersPageHeaderContent'; +import UsersTable from './UsersTable'; +import useFilteredUsers from './hooks/useFilteredUsers'; +import usePendingUsersCount from './hooks/usePendingUsersCount'; +import { useSeatsCap } from './useSeatsCap'; import { Contextualbar, ContextualbarHeader, @@ -22,17 +33,6 @@ import { Page, PageHeader, PageContent } from '../../../components/Page'; import { useLicenseLimitsByBehavior } from '../../../hooks/useLicenseLimitsByBehavior'; import { useShouldPreventAction } from '../../../hooks/useShouldPreventAction'; import { useCheckoutUrl } from '../subscription/hooks/useCheckoutUrl'; -import AdminInviteUsers from './AdminInviteUsers'; -import AdminUserCreated from './AdminUserCreated'; -import AdminUserForm from './AdminUserForm'; -import AdminUserFormWithData from './AdminUserFormWithData'; -import AdminUserInfoWithData from './AdminUserInfoWithData'; -import AdminUserUpgrade from './AdminUserUpgrade'; -import UsersPageHeaderContent from './UsersPageHeaderContent'; -import UsersTable from './UsersTable'; -import useFilteredUsers from './hooks/useFilteredUsers'; -import usePendingUsersCount from './hooks/usePendingUsersCount'; -import { useSeatsCap } from './useSeatsCap'; export type UsersFilters = { text: string; diff --git a/apps/meteor/client/views/admin/users/AdminUsersRoute.tsx b/apps/meteor/client/views/admin/users/AdminUsersRoute.tsx index 03f095d3f41..3e86ad5597b 100644 --- a/apps/meteor/client/views/admin/users/AdminUsersRoute.tsx +++ b/apps/meteor/client/views/admin/users/AdminUsersRoute.tsx @@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import AdminUsersPage from './AdminUsersPage'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; const AdminUsersRoute = (): ReactElement => { const canViewUserAdministration = usePermission('view-user-administration'); diff --git a/apps/meteor/client/views/admin/users/UsersPageHeaderContent.tsx b/apps/meteor/client/views/admin/users/UsersPageHeaderContent.tsx index 89916c3e6f2..0b6d34f2359 100644 --- a/apps/meteor/client/views/admin/users/UsersPageHeaderContent.tsx +++ b/apps/meteor/client/views/admin/users/UsersPageHeaderContent.tsx @@ -3,11 +3,11 @@ import { usePermission, useRouter } from '@rocket.chat/ui-contexts'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { useExternalLink } from '../../../hooks/useExternalLink'; -import { useCheckoutUrl } from '../subscription/hooks/useCheckoutUrl'; import SeatsCapUsage from './SeatsCapUsage'; import type { SeatCapProps } from './useSeatsCap'; import AssignExtensionButton from './voip/AssignExtensionButton'; +import { useExternalLink } from '../../../hooks/useExternalLink'; +import { useCheckoutUrl } from '../subscription/hooks/useCheckoutUrl'; import { useVoipExtensionPermission } from './voip/hooks/useVoipExtensionPermission'; type UsersPageHeaderContentProps = { diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.spec.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.spec.tsx index 6660461f4ac..7473d61654c 100644 --- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.spec.tsx +++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.spec.tsx @@ -2,8 +2,8 @@ import { mockAppRoot } from '@rocket.chat/mock-providers'; import { render, screen } from '@testing-library/react'; import React from 'react'; -import { createFakeUser } from '../../../../../tests/mocks/data'; import UsersTable from './UsersTable'; +import { createFakeUser } from '../../../../../tests/mocks/data'; const createFakeAdminUser = (freeSwitchExtension?: string) => createFakeUser({ diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx index 5a15cc58e6b..7cd36ed56a5 100644 --- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx +++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx @@ -9,6 +9,8 @@ import type { ReactElement, Dispatch, SetStateAction } from 'react'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import UsersTableFilters from './UsersTableFilters'; +import UsersTableRow from './UsersTableRow'; import GenericNoResults from '../../../../components/GenericNoResults'; import { GenericTable, @@ -21,8 +23,6 @@ import type { usePagination } from '../../../../components/GenericTable/hooks/us import type { useSort } from '../../../../components/GenericTable/hooks/useSort'; import type { AdminUsersTab, UsersFilters, UsersTableSortingOption } from '../AdminUsersPage'; import { useVoipExtensionPermission } from '../voip/hooks/useVoipExtensionPermission'; -import UsersTableFilters from './UsersTableFilters'; -import UsersTableRow from './UsersTableRow'; type UsersTableProps = { tab: AdminUsersTab; diff --git a/apps/meteor/client/views/admin/users/hooks/useChangeUserStatusAction.ts b/apps/meteor/client/views/admin/users/hooks/useChangeUserStatusAction.ts index 1fc6d354632..bd680216c12 100644 --- a/apps/meteor/client/views/admin/users/hooks/useChangeUserStatusAction.ts +++ b/apps/meteor/client/views/admin/users/hooks/useChangeUserStatusAction.ts @@ -2,8 +2,8 @@ import type { IUser } from '@rocket.chat/core-typings'; import { useToastMessageDispatch, useTranslation, useEndpoint, usePermission } from '@rocket.chat/ui-contexts'; import { useMemo } from 'react'; -import type { Action } from '../../../hooks/useActionSpread'; import { useConfirmOwnerChanges } from './useConfirmOwnerChanges'; +import type { Action } from '../../../hooks/useActionSpread'; export const useChangeUserStatusAction = (userId: IUser['_id'], isActive: boolean, onChange: () => void): Action | undefined => { const t = useTranslation(); diff --git a/apps/meteor/client/views/admin/users/hooks/useDeleteUserAction.tsx b/apps/meteor/client/views/admin/users/hooks/useDeleteUserAction.tsx index e8091242665..807a92af6e9 100644 --- a/apps/meteor/client/views/admin/users/hooks/useDeleteUserAction.tsx +++ b/apps/meteor/client/views/admin/users/hooks/useDeleteUserAction.tsx @@ -12,9 +12,9 @@ import { } from '@rocket.chat/ui-contexts'; import React, { useMemo } from 'react'; +import { useConfirmOwnerChanges } from './useConfirmOwnerChanges'; import GenericModal from '../../../../components/GenericModal'; import type { Action } from '../../../hooks/useActionSpread'; -import { useConfirmOwnerChanges } from './useConfirmOwnerChanges'; export const useDeleteUserAction = (userId: IUser['_id'], onChange: () => void, onReload: () => void): Action | undefined => { const t = useTranslation(); diff --git a/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx b/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx index 818713898b2..b6400e906ce 100644 --- a/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx +++ b/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx @@ -3,9 +3,9 @@ import type { ReactElement } from 'react'; import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { Page, PageHeader, PageContent } from '../../../components/Page'; import AnalyticsReports from './AnalyticsReports'; import ServerLogs from './ServerLogs'; +import { Page, PageHeader, PageContent } from '../../../components/Page'; const ViewLogsPage = (): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/admin/viewLogs/ViewLogsRoute.tsx b/apps/meteor/client/views/admin/viewLogs/ViewLogsRoute.tsx index 130ddf067f5..7578ed49fbc 100644 --- a/apps/meteor/client/views/admin/viewLogs/ViewLogsRoute.tsx +++ b/apps/meteor/client/views/admin/viewLogs/ViewLogsRoute.tsx @@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import ViewLogsPage from './ViewLogsPage'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; const ViewLogsRoute = (): ReactElement => { const canViewLogs = usePermission('view-logs'); diff --git a/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx b/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx index 1394d7497eb..69644eda53f 100644 --- a/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx +++ b/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx @@ -3,10 +3,10 @@ import type { IInstance } from '@rocket.chat/rest-typings'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import GenericModal from '../../../../../../components/GenericModal'; -import { useFormatDateAndTime } from '../../../../../../hooks/useFormatDateAndTime'; import DescriptionList from './DescriptionList'; import DescriptionListEntry from './DescriptionListEntry'; +import GenericModal from '../../../../../../components/GenericModal'; +import { useFormatDateAndTime } from '../../../../../../hooks/useFormatDateAndTime'; type InstancesModalProps = { instances: IInstance[]; diff --git a/apps/meteor/client/views/admin/workspace/VersionCard/VersionCard.tsx b/apps/meteor/client/views/admin/workspace/VersionCard/VersionCard.tsx index 0716d920f35..93c05ab2e9a 100644 --- a/apps/meteor/client/views/admin/workspace/VersionCard/VersionCard.tsx +++ b/apps/meteor/client/views/admin/workspace/VersionCard/VersionCard.tsx @@ -9,10 +9,6 @@ import type { ReactElement, ReactNode } from 'react'; import React, { useMemo } from 'react'; import { Trans, useTranslation } from 'react-i18next'; -import { useFormatDate } from '../../../../hooks/useFormatDate'; -import { useLicense, useLicenseName } from '../../../../hooks/useLicense'; -import { useRegistrationStatus } from '../../../../hooks/useRegistrationStatus'; -import { isOverLicenseLimits } from '../../../../lib/utils/isOverLicenseLimits'; import VersionCardActionButton from './components/VersionCardActionButton'; import type { VersionActionItem } from './components/VersionCardActionItem'; import VersionCardActionItem from './components/VersionCardActionItem'; @@ -20,6 +16,10 @@ import { VersionCardSkeleton } from './components/VersionCardSkeleton'; import { VersionTag } from './components/VersionTag'; import { getVersionStatus } from './getVersionStatus'; import RegisterWorkspaceModal from './modals/RegisterWorkspaceModal'; +import { useFormatDate } from '../../../../hooks/useFormatDate'; +import { useLicense, useLicenseName } from '../../../../hooks/useLicense'; +import { useRegistrationStatus } from '../../../../hooks/useRegistrationStatus'; +import { isOverLicenseLimits } from '../../../../lib/utils/isOverLicenseLimits'; const SUPPORT_EXTERNAL_LINK = 'https://go.rocket.chat/i/version-support'; const RELEASES_EXTERNAL_LINK = 'https://go.rocket.chat/i/update-product'; diff --git a/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceModal.tsx b/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceModal.tsx index 498de62f200..0f3891f4e42 100644 --- a/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceModal.tsx +++ b/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceModal.tsx @@ -4,9 +4,9 @@ import { useSetModal } from '@rocket.chat/ui-contexts'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import useFeatureBullets from '../hooks/useFeatureBullets'; import RegisterWorkspaceSetupModal from './RegisterWorkspaceSetupModal'; import RegisterWorkspaceTokenModal from './RegisterWorkspaceTokenModal'; +import useFeatureBullets from '../hooks/useFeatureBullets'; type RegisterWorkspaceModalProps = { onClose: () => void; diff --git a/apps/meteor/client/views/admin/workspace/WorkspacePage.tsx b/apps/meteor/client/views/admin/workspace/WorkspacePage.tsx index b3288c1b99c..1ae00a9e666 100644 --- a/apps/meteor/client/views/admin/workspace/WorkspacePage.tsx +++ b/apps/meteor/client/views/admin/workspace/WorkspacePage.tsx @@ -4,12 +4,12 @@ import type { IInstance } from '@rocket.chat/rest-typings'; import React, { memo } from 'react'; import { useTranslation } from 'react-i18next'; -import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; -import { useIsEnterprise } from '../../../hooks/useIsEnterprise'; import DeploymentCard from './DeploymentCard/DeploymentCard'; import MessagesRoomsCard from './MessagesRoomsCard/MessagesRoomsCard'; import UsersUploadsCard from './UsersUploadsCard/UsersUploadsCard'; import VersionCard from './VersionCard/VersionCard'; +import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; +import { useIsEnterprise } from '../../../hooks/useIsEnterprise'; type WorkspaceStatusPageProps = { canViewStatistics: boolean; diff --git a/apps/meteor/client/views/admin/workspace/WorkspaceRoute.tsx b/apps/meteor/client/views/admin/workspace/WorkspaceRoute.tsx index 9df91587828..31d723a24e7 100644 --- a/apps/meteor/client/views/admin/workspace/WorkspaceRoute.tsx +++ b/apps/meteor/client/views/admin/workspace/WorkspaceRoute.tsx @@ -4,12 +4,12 @@ import type { ReactElement } from 'react'; import React, { memo, useState } from 'react'; import { useTranslation } from 'react-i18next'; +import WorkspacePage from './WorkspacePage'; import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; import PageSkeleton from '../../../components/PageSkeleton'; import { useWorkspaceInfo } from '../../../hooks/useWorkspaceInfo'; import { downloadJsonAs } from '../../../lib/download'; import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; -import WorkspacePage from './WorkspacePage'; const WorkspaceRoute = (): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/audit/AuditLogPage.tsx b/apps/meteor/client/views/audit/AuditLogPage.tsx index 95fbc39abca..76b6cbd0d8f 100644 --- a/apps/meteor/client/views/audit/AuditLogPage.tsx +++ b/apps/meteor/client/views/audit/AuditLogPage.tsx @@ -2,8 +2,8 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { Page, PageHeader, PageContent } from '../../components/Page'; import AuditLogTable from './components/AuditLogTable'; +import { Page, PageHeader, PageContent } from '../../components/Page'; const AuditLogPage = (): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/audit/AuditPage.tsx b/apps/meteor/client/views/audit/AuditPage.tsx index 3dce9be56a8..90f72a6e90c 100644 --- a/apps/meteor/client/views/audit/AuditPage.tsx +++ b/apps/meteor/client/views/audit/AuditPage.tsx @@ -3,13 +3,13 @@ import { Box, Callout, Margins, States, StatesIcon, StatesSubtitle, StatesTitle, import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { Page, PageHeader, PageScrollableContentWithShadow } from '../../components/Page'; -import MessageListSkeleton from '../../components/message/list/MessageListSkeleton'; -import { getErrorMessage } from '../../lib/errorHandling'; import AuditForm from './components/AuditForm'; import AuditResult from './components/AuditResult'; import { useAuditMutation } from './hooks/useAuditMutation'; import { useAuditTab } from './hooks/useAuditTab'; +import { Page, PageHeader, PageScrollableContentWithShadow } from '../../components/Page'; +import MessageListSkeleton from '../../components/message/list/MessageListSkeleton'; +import { getErrorMessage } from '../../lib/errorHandling'; const AuditPage = () => { const [type, setType] = useAuditTab(); diff --git a/apps/meteor/client/views/audit/components/AuditLogEntry.tsx b/apps/meteor/client/views/audit/components/AuditLogEntry.tsx index c6c4e204a68..5cb1100cad3 100644 --- a/apps/meteor/client/views/audit/components/AuditLogEntry.tsx +++ b/apps/meteor/client/views/audit/components/AuditLogEntry.tsx @@ -6,9 +6,9 @@ import type { ReactElement } from 'react'; import React, { memo, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import AuditFiltersDisplay from './AuditFiltersDisplay'; import { GenericTableRow, GenericTableCell } from '../../../components/GenericTable'; import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime'; -import AuditFiltersDisplay from './AuditFiltersDisplay'; type AuditLogEntryProps = { value: IAuditLog }; diff --git a/apps/meteor/client/views/audit/components/AuditLogTable.tsx b/apps/meteor/client/views/audit/components/AuditLogTable.tsx index faf650e903d..a2bff0b3751 100644 --- a/apps/meteor/client/views/audit/components/AuditLogTable.tsx +++ b/apps/meteor/client/views/audit/components/AuditLogTable.tsx @@ -4,6 +4,7 @@ import { useQuery } from '@tanstack/react-query'; import type { ReactElement } from 'react'; import React, { useState } from 'react'; +import AuditLogEntry from './AuditLogEntry'; import GenericNoResults from '../../../components/GenericNoResults'; import { GenericTable, @@ -14,7 +15,6 @@ import { } from '../../../components/GenericTable'; import { createEndOfToday, createStartOfToday } from '../utils/dateRange'; import type { DateRange } from '../utils/dateRange'; -import AuditLogEntry from './AuditLogEntry'; import DateRangePicker from './forms/DateRangePicker'; const AuditLogTable = (): ReactElement => { diff --git a/apps/meteor/client/views/audit/components/AuditResult.tsx b/apps/meteor/client/views/audit/components/AuditResult.tsx index 79b904d38f9..8a98f63aaea 100644 --- a/apps/meteor/client/views/audit/components/AuditResult.tsx +++ b/apps/meteor/client/views/audit/components/AuditResult.tsx @@ -2,8 +2,8 @@ import type { IMessage } from '@rocket.chat/core-typings'; import type { ReactElement } from 'react'; import React, { memo } from 'react'; -import GenericNoResults from '../../../components/GenericNoResults'; import AuditMessageList from './AuditMessageList'; +import GenericNoResults from '../../../components/GenericNoResults'; type AuditResultProps = { className?: string; diff --git a/apps/meteor/client/views/banners/BannerRegion.tsx b/apps/meteor/client/views/banners/BannerRegion.tsx index e70b6c608ea..1dc79cbe43c 100644 --- a/apps/meteor/client/views/banners/BannerRegion.tsx +++ b/apps/meteor/client/views/banners/BannerRegion.tsx @@ -2,11 +2,11 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useSyncExternalStore } from 'use-sync-external-store/shim'; -import { withErrorBoundary } from '../../components/withErrorBoundary'; -import * as banners from '../../lib/banners'; import LegacyBanner from './LegacyBanner'; import UiKitBanner from './UiKitBanner'; import { useUserBanners } from './hooks/useUserBanners'; +import { withErrorBoundary } from '../../components/withErrorBoundary'; +import * as banners from '../../lib/banners'; const BannerRegion = (): ReactElement | null => { const payload = useSyncExternalStore(...banners.firstSubscription); diff --git a/apps/meteor/client/views/banners/hooks/useUserBanners.ts b/apps/meteor/client/views/banners/hooks/useUserBanners.ts index d78c9ce430a..8623173b348 100644 --- a/apps/meteor/client/views/banners/hooks/useUserBanners.ts +++ b/apps/meteor/client/views/banners/hooks/useUserBanners.ts @@ -2,8 +2,8 @@ import { useUser } from '@rocket.chat/ui-contexts'; import { useEffect } from 'react'; import { useTranslation } from 'react-i18next'; -import * as banners from '../../../lib/banners'; import { useDismissUserBannerMutation } from './useDismissUserBannerMutation'; +import * as banners from '../../../lib/banners'; export const useUserBanners = () => { const user = useUser(); diff --git a/apps/meteor/client/views/composer/EmojiPicker/CategoriesResult.tsx b/apps/meteor/client/views/composer/EmojiPicker/CategoriesResult.tsx index fe609da8640..7c61c0caa94 100644 --- a/apps/meteor/client/views/composer/EmojiPicker/CategoriesResult.tsx +++ b/apps/meteor/client/views/composer/EmojiPicker/CategoriesResult.tsx @@ -5,9 +5,9 @@ import React, { forwardRef, useRef } from 'react'; import type { VirtuosoHandle } from 'react-virtuoso'; import { Virtuoso } from 'react-virtuoso'; +import EmojiCategoryRow from './EmojiCategoryRow'; import type { EmojiCategoryPosition, EmojiByCategory } from '../../../../app/emoji/client'; import { VirtuosoScrollbars } from '../../../components/CustomScrollbars'; -import EmojiCategoryRow from './EmojiCategoryRow'; type CategoriesResultProps = { emojiListByCategory: EmojiByCategory[]; diff --git a/apps/meteor/client/views/composer/EmojiPicker/EmojiCategoryRow.tsx b/apps/meteor/client/views/composer/EmojiPicker/EmojiCategoryRow.tsx index 10f0ed56558..0238153aea5 100644 --- a/apps/meteor/client/views/composer/EmojiPicker/EmojiCategoryRow.tsx +++ b/apps/meteor/client/views/composer/EmojiPicker/EmojiCategoryRow.tsx @@ -5,9 +5,9 @@ import type { MouseEvent, MutableRefObject } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import EmojiElement from './EmojiElement'; import { CUSTOM_CATEGORY } from '../../../../app/emoji/client'; import type { EmojiByCategory, EmojiCategoryPosition } from '../../../../app/emoji/client'; -import EmojiElement from './EmojiElement'; type EmojiCategoryRowProps = EmojiByCategory & { categoryKey: EmojiByCategory['key']; diff --git a/apps/meteor/client/views/composer/EmojiPicker/EmojiPicker.tsx b/apps/meteor/client/views/composer/EmojiPicker/EmojiPicker.tsx index f2e68a60d69..9cbd5e131f9 100644 --- a/apps/meteor/client/views/composer/EmojiPicker/EmojiPicker.tsx +++ b/apps/meteor/client/views/composer/EmojiPicker/EmojiPicker.tsx @@ -14,16 +14,16 @@ import type { ChangeEvent, KeyboardEvent, MouseEvent, RefObject } from 'react'; import React, { useLayoutEffect, useState, useEffect, useRef } from 'react'; import type { VirtuosoHandle } from 'react-virtuoso'; -import type { EmojiItem, EmojiCategoryPosition } from '../../../../app/emoji/client'; -import { emoji, getCategoriesList, getEmojisBySearchTerm } from '../../../../app/emoji/client'; -import { usePreviewEmoji, useEmojiPickerData } from '../../../contexts/EmojiPickerContext'; -import { useIsVisible } from '../../room/hooks/useIsVisible'; import CategoriesResult from './CategoriesResult'; import EmojiPickerCategoryItem from './EmojiPickerCategoryItem'; import EmojiPickerDropdown from './EmojiPickerDropDown'; import SearchingResult from './SearchingResult'; import ToneSelector from './ToneSelector'; import ToneSelectorWrapper from './ToneSelector/ToneSelectorWrapper'; +import { emoji, getCategoriesList, getEmojisBySearchTerm } from '../../../../app/emoji/client'; +import type { EmojiItem, EmojiCategoryPosition } from '../../../../app/emoji/client'; +import { usePreviewEmoji, useEmojiPickerData } from '../../../contexts/EmojiPickerContext'; +import { useIsVisible } from '../../room/hooks/useIsVisible'; type EmojiPickerProps = { reference: Element; diff --git a/apps/meteor/client/views/composer/EmojiPicker/SearchingResult.tsx b/apps/meteor/client/views/composer/EmojiPicker/SearchingResult.tsx index 152d13bae5d..ee559ea47d7 100644 --- a/apps/meteor/client/views/composer/EmojiPicker/SearchingResult.tsx +++ b/apps/meteor/client/views/composer/EmojiPicker/SearchingResult.tsx @@ -5,10 +5,10 @@ import { useTranslation } from 'react-i18next'; import type { VirtuosoGridHandle } from 'react-virtuoso'; import { VirtuosoGrid } from 'react-virtuoso'; -import type { EmojiItem } from '../../../../app/emoji/client'; -import { VirtuosoScrollbars } from '../../../components/CustomScrollbars'; import EmojiElement from './EmojiElement'; import SearchingResultWrapper from './SearchingResultWrapper'; +import type { EmojiItem } from '../../../../app/emoji/client'; +import { VirtuosoScrollbars } from '../../../components/CustomScrollbars'; /** * the `SearchingResults` is missing the previous loadMore function that was implemented before on the latest version of EmojiPicker using the Blaze Template. It can't be implemented because of the issue with react-virtuoso and the custom scrollbars, since its using virtual list its not gonna be an issue rendering bigger results for search diff --git a/apps/meteor/client/views/conference/ConferencePage.tsx b/apps/meteor/client/views/conference/ConferencePage.tsx index 0b05e8b2b4d..3db9777cf07 100644 --- a/apps/meteor/client/views/conference/ConferencePage.tsx +++ b/apps/meteor/client/views/conference/ConferencePage.tsx @@ -2,10 +2,10 @@ import { useRoute, useSetModal, useUser } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React, { useEffect } from 'react'; +import ConferencePageError from './ConferencePageError'; import { useUserDisplayName } from '../../hooks/useUserDisplayName'; import { useVideoConfOpenCall } from '../room/contextualBar/VideoConference/hooks/useVideoConfOpenCall'; import PageLoading from '../root/PageLoading'; -import ConferencePageError from './ConferencePageError'; const getQueryParams = () => { const queryString = window.location.search; diff --git a/apps/meteor/client/views/conference/ConferenceRoute.tsx b/apps/meteor/client/views/conference/ConferenceRoute.tsx index 4b27917c2d3..4917058b246 100644 --- a/apps/meteor/client/views/conference/ConferenceRoute.tsx +++ b/apps/meteor/client/views/conference/ConferenceRoute.tsx @@ -1,8 +1,8 @@ import type { ReactElement } from 'react'; import React from 'react'; -import AuthenticationCheck from '../root/MainLayout/AuthenticationCheck'; import ConferencePage from './ConferencePage'; +import AuthenticationCheck from '../root/MainLayout/AuthenticationCheck'; const ConferenceRoute = (): ReactElement => { return ( diff --git a/apps/meteor/client/views/directory/tabs/channels/ChannelsTab.tsx b/apps/meteor/client/views/directory/tabs/channels/ChannelsTab.tsx index e1627e63e06..93bda21319d 100644 --- a/apps/meteor/client/views/directory/tabs/channels/ChannelsTab.tsx +++ b/apps/meteor/client/views/directory/tabs/channels/ChannelsTab.tsx @@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; -import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage'; import ChannelsTable from './ChannelsTable'; +import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage'; const ChannelsTab = (): ReactElement => { const canViewPublicRooms = usePermission('view-c-room'); diff --git a/apps/meteor/client/views/directory/tabs/channels/ChannelsTable/ChannelsTable.tsx b/apps/meteor/client/views/directory/tabs/channels/ChannelsTable/ChannelsTable.tsx index 5ccd6d0bc91..2c73e36393d 100644 --- a/apps/meteor/client/views/directory/tabs/channels/ChannelsTable/ChannelsTable.tsx +++ b/apps/meteor/client/views/directory/tabs/channels/ChannelsTable/ChannelsTable.tsx @@ -5,6 +5,7 @@ import { useRoute, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts' import { useQuery } from '@tanstack/react-query'; import React, { useMemo, useState } from 'react'; +import ChannelsTableRow from './ChannelsTableRow'; import FilterByText from '../../../../../components/FilterByText'; import GenericNoResults from '../../../../../components/GenericNoResults'; import { @@ -17,7 +18,6 @@ import { import { usePagination } from '../../../../../components/GenericTable/hooks/usePagination'; import { useSort } from '../../../../../components/GenericTable/hooks/useSort'; import { useDirectoryQuery } from '../../../hooks/useDirectoryQuery'; -import ChannelsTableRow from './ChannelsTableRow'; const ChannelsTable = () => { const t = useTranslation(); diff --git a/apps/meteor/client/views/directory/tabs/teams/TeamsTab.tsx b/apps/meteor/client/views/directory/tabs/teams/TeamsTab.tsx index 42814f42359..001d1c959ee 100644 --- a/apps/meteor/client/views/directory/tabs/teams/TeamsTab.tsx +++ b/apps/meteor/client/views/directory/tabs/teams/TeamsTab.tsx @@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; -import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage'; import TeamsTable from './TeamsTable'; +import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage'; const TeamsTab = (): ReactElement => { const canViewPublicRooms = usePermission('view-c-room'); diff --git a/apps/meteor/client/views/directory/tabs/teams/TeamsTable/TeamsTable.tsx b/apps/meteor/client/views/directory/tabs/teams/TeamsTable/TeamsTable.tsx index 92ca68d173e..ce114484caa 100644 --- a/apps/meteor/client/views/directory/tabs/teams/TeamsTable/TeamsTable.tsx +++ b/apps/meteor/client/views/directory/tabs/teams/TeamsTable/TeamsTable.tsx @@ -5,6 +5,7 @@ import { useRoute, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts' import { useQuery } from '@tanstack/react-query'; import React, { useMemo, useState } from 'react'; +import TeamsTableRow from './TeamsTableRow'; import FilterByText from '../../../../../components/FilterByText'; import GenericNoResults from '../../../../../components/GenericNoResults'; import { @@ -17,7 +18,6 @@ import { import { usePagination } from '../../../../../components/GenericTable/hooks/usePagination'; import { useSort } from '../../../../../components/GenericTable/hooks/useSort'; import { useDirectoryQuery } from '../../../hooks/useDirectoryQuery'; -import TeamsTableRow from './TeamsTableRow'; const TeamsTable = () => { const t = useTranslation(); diff --git a/apps/meteor/client/views/directory/tabs/users/UsersTab.tsx b/apps/meteor/client/views/directory/tabs/users/UsersTab.tsx index da3134ec8a7..ac1ad696509 100644 --- a/apps/meteor/client/views/directory/tabs/users/UsersTab.tsx +++ b/apps/meteor/client/views/directory/tabs/users/UsersTab.tsx @@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; -import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage'; import UsersTable from './UsersTable'; +import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage'; const UsersTab = (props: { workspace?: 'external' | 'local' }): ReactElement => { const canViewOutsideRoom = usePermission('view-outside-room'); diff --git a/apps/meteor/client/views/directory/tabs/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/directory/tabs/users/UsersTable/UsersTable.tsx index f9f94f86dd4..00ccc5ef436 100644 --- a/apps/meteor/client/views/directory/tabs/users/UsersTable/UsersTable.tsx +++ b/apps/meteor/client/views/directory/tabs/users/UsersTable/UsersTable.tsx @@ -6,6 +6,7 @@ import { useQuery } from '@tanstack/react-query'; import type { ReactElement } from 'react'; import React, { useCallback, useMemo, useState } from 'react'; +import UsersTableRow from './UsersTableRow'; import FilterByText from '../../../../../components/FilterByText'; import GenericNoResults from '../../../../../components/GenericNoResults'; import { @@ -18,7 +19,6 @@ import { import { usePagination } from '../../../../../components/GenericTable/hooks/usePagination'; import { useSort } from '../../../../../components/GenericTable/hooks/useSort'; import { useDirectoryQuery } from '../../../hooks/useDirectoryQuery'; -import UsersTableRow from './UsersTableRow'; const UsersTable = ({ workspace = 'local' }): ReactElement => { const t = useTranslation(); diff --git a/apps/meteor/client/views/home/CustomHomePage.tsx b/apps/meteor/client/views/home/CustomHomePage.tsx index 16cb3c31744..90f54e11360 100644 --- a/apps/meteor/client/views/home/CustomHomePage.tsx +++ b/apps/meteor/client/views/home/CustomHomePage.tsx @@ -1,10 +1,10 @@ import type { ReactElement } from 'react'; import React from 'react'; -import Page from '../../components/Page/Page'; -import PageScrollableContentWithShadow from '../../components/Page/PageScrollableContentWithShadow'; import HomePageHeader from './HomePageHeader'; import CustomContentCard from './cards/CustomContentCard'; +import Page from '../../components/Page/Page'; +import PageScrollableContentWithShadow from '../../components/Page/PageScrollableContentWithShadow'; const CustomHomePage = (): ReactElement => { return ( diff --git a/apps/meteor/client/views/home/DefaultHomePage.tsx b/apps/meteor/client/views/home/DefaultHomePage.tsx index 19fb03c2917..9f06d3e09d7 100644 --- a/apps/meteor/client/views/home/DefaultHomePage.tsx +++ b/apps/meteor/client/views/home/DefaultHomePage.tsx @@ -3,8 +3,6 @@ import { useAtLeastOnePermission, useSetting, useTranslation, useRole, usePermis import type { ReactElement } from 'react'; import React from 'react'; -import Page from '../../components/Page/Page'; -import PageScrollableContent from '../../components/Page/PageScrollableContent'; import HomePageHeader from './HomePageHeader'; import AddUsersCard from './cards/AddUsersCard'; import CreateChannelsCard from './cards/CreateChannelsCard'; @@ -13,6 +11,8 @@ import DesktopAppsCard from './cards/DesktopAppsCard'; import DocumentationCard from './cards/DocumentationCard'; import JoinRoomsCard from './cards/JoinRoomsCard'; import MobileAppsCard from './cards/MobileAppsCard'; +import Page from '../../components/Page/Page'; +import PageScrollableContent from '../../components/Page/PageScrollableContent'; const CREATE_CHANNEL_PERMISSIONS = ['create-c', 'create-p']; diff --git a/apps/meteor/client/views/home/HomePage.tsx b/apps/meteor/client/views/home/HomePage.tsx index 54a627d14fc..f99dae9cea2 100644 --- a/apps/meteor/client/views/home/HomePage.tsx +++ b/apps/meteor/client/views/home/HomePage.tsx @@ -2,9 +2,9 @@ import { useSetting } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React, { useEffect } from 'react'; -import { KonchatNotification } from '../../../app/ui/client/lib/KonchatNotification'; import CustomHomePage from './CustomHomePage'; import DefaultHomePage from './DefaultHomePage'; +import { KonchatNotification } from '../../../app/ui/client/lib/KonchatNotification'; const HomePage = (): ReactElement => { useEffect(() => { diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPage.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPage.tsx index f594dcfa1f2..f3b3cabf1f5 100644 --- a/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPage.tsx +++ b/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPage.tsx @@ -7,19 +7,19 @@ import type { ReactElement } from 'react'; import React, { useMemo, useCallback } from 'react'; import { FormProvider, useForm } from 'react-hook-form'; -import { AppClientOrchestratorInstance } from '../../../apps/orchestrator'; -import { Page, PageFooter, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; -import { handleAPIError } from '../helpers/handleAPIError'; -import { useAppInfo } from '../hooks/useAppInfo'; import AppDetailsPageHeader from './AppDetailsPageHeader'; import AppDetailsPageLoading from './AppDetailsPageLoading'; import AppDetailsPageTabs from './AppDetailsPageTabs'; +import { handleAPIError } from '../helpers/handleAPIError'; +import { useAppInfo } from '../hooks/useAppInfo'; import AppDetails from './tabs/AppDetails'; import AppLogs from './tabs/AppLogs'; import AppReleases from './tabs/AppReleases'; import AppRequests from './tabs/AppRequests/AppRequests'; import AppSecurity from './tabs/AppSecurity/AppSecurity'; import AppSettings from './tabs/AppSettings'; +import { AppClientOrchestratorInstance } from '../../../apps/orchestrator'; +import { Page, PageFooter, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; const AppDetailsPage = ({ id }: { id: App['id'] }): ReactElement => { const t = useTranslation(); diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx index 917b4de07bc..e55ee6dd9f1 100644 --- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx +++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx @@ -5,14 +5,14 @@ import DOMPurify from 'dompurify'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import AppDetailsAPIs from './AppDetailsAPIs'; +import { normalizeUrl } from './normalizeUrl'; import { useExternalLink } from '../../../../../hooks/useExternalLink'; import { useHasLicenseModule } from '../../../../../hooks/useHasLicenseModule'; import { GET_ADDONS_LINK } from '../../../../admin/subscription/utils/links'; import ScreenshotCarouselAnchor from '../../../components/ScreenshotCarouselAnchor'; import type { AppInfo } from '../../../definitions/AppInfo'; import { purifyOptions } from '../../../lib/purifyOptions'; -import AppDetailsAPIs from './AppDetailsAPIs'; -import { normalizeUrl } from './normalizeUrl'; type AppDetailsProps = { app: AppInfo; diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx index 278a72345dd..251960a24b7 100644 --- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx +++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx @@ -3,10 +3,10 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import AppLogsItem from './AppLogsItem'; import { useFormatDateAndTime } from '../../../../../hooks/useFormatDateAndTime'; import AccordionLoading from '../../../components/AccordionLoading'; import { useLogs } from '../../../hooks/useLogs'; -import AppLogsItem from './AppLogsItem'; const AppLogs = ({ id }: { id: string }): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleases.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleases.tsx index 2514e72fc0c..c907330f6a5 100644 --- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleases.tsx +++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleases.tsx @@ -6,8 +6,8 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import AccordionLoading from '../../../components/AccordionLoading'; import AppReleasesItem from './AppReleasesItem'; +import AccordionLoading from '../../../components/AccordionLoading'; const AppReleases = ({ id }: { id: App['id'] }): ReactElement => { const getVersions = useEndpoint('GET', '/apps/:id/versions', { id }); diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppRequests/AppRequests.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppRequests/AppRequests.tsx index c2964c9b83e..60e4819f56f 100644 --- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppRequests/AppRequests.tsx +++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppRequests/AppRequests.tsx @@ -6,11 +6,11 @@ import type { ReactElement, SetStateAction } from 'react'; import React, { useState, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; +import AppRequestItem from './AppRequestItem'; +import AppRequestsLoading from './AppRequestsLoading'; import { useAppsReload } from '../../../../../contexts/hooks/useAppsReload'; import { queryClient } from '../../../../../lib/queryClient'; import { useAppRequests } from '../../../hooks/useAppRequests'; -import AppRequestItem from './AppRequestItem'; -import AppRequestsLoading from './AppRequestsLoading'; type itemsPerPage = 25 | 50 | 100; diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSecurity/AppSecurity.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSecurity/AppSecurity.tsx index 5554bde2651..56bb42825f1 100644 --- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSecurity/AppSecurity.tsx +++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSecurity/AppSecurity.tsx @@ -4,8 +4,8 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import AppPermissionsList from '../../../components/AppPermissionsList'; import AppSecurityLabel from './AppSecurityLabel'; +import AppPermissionsList from '../../../components/AppPermissionsList'; type AppSecurityProps = { privacyPolicySummary?: string; diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSettings.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSettings.tsx index 59080c7f323..72ad8637874 100644 --- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSettings.tsx +++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSettings.tsx @@ -2,8 +2,8 @@ import { Box, FieldGroup } from '@rocket.chat/fuselage'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import type { ISettings } from '../../../../../apps/@types/IOrchestrator'; import AppSetting from './AppSetting'; +import type { ISettings } from '../../../../../apps/@types/IOrchestrator'; const AppSettings = ({ settings }: { settings: ISettings }) => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.spec.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.spec.tsx index 3d48bb398e2..ccf0c9d426e 100644 --- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.spec.tsx +++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.spec.tsx @@ -4,9 +4,9 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; +import AppStatus from './AppStatus'; import { mockedAppsContext } from '../../../../../../tests/mocks/client/marketplace'; import { createFakeApp, createFakeLicenseInfo } from '../../../../../../tests/mocks/data'; -import AppStatus from './AppStatus'; it('should look good', async () => { const app = createFakeApp(); diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.tsx index f0339e6daee..5608c786841 100644 --- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.tsx +++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.tsx @@ -8,6 +8,7 @@ import React, { useCallback, useState, memo } from 'react'; import { useTranslation } from 'react-i18next'; import semver from 'semver'; +import AppStatusPriceDisplay from './AppStatusPriceDisplay'; import { useHasLicenseModule } from '../../../../../hooks/useHasLicenseModule'; import { useIsEnterprise } from '../../../../../hooks/useIsEnterprise'; import AddonRequiredModal from '../../../AppsList/AddonRequiredModal'; @@ -16,7 +17,6 @@ import { appButtonProps, appMultiStatusProps } from '../../../helpers'; import type { AppInstallationHandlerParams } from '../../../hooks/useAppInstallationHandler'; import { useAppInstallationHandler } from '../../../hooks/useAppInstallationHandler'; import { useMarketplaceActions } from '../../../hooks/useMarketplaceActions'; -import AppStatusPriceDisplay from './AppStatusPriceDisplay'; type AppStatusProps = { app: App; diff --git a/apps/meteor/client/views/marketplace/AppInstallPage.tsx b/apps/meteor/client/views/marketplace/AppInstallPage.tsx index 68ecc313991..dfc58b5a47b 100644 --- a/apps/meteor/client/views/marketplace/AppInstallPage.tsx +++ b/apps/meteor/client/views/marketplace/AppInstallPage.tsx @@ -4,9 +4,9 @@ import { useTranslation, useRouter } from '@rocket.chat/ui-contexts'; import React, { useCallback } from 'react'; import { useForm, Controller } from 'react-hook-form'; +import { useInstallApp } from './hooks/useInstallApp'; import { Page, PageHeader, PageScrollableContent } from '../../components/Page'; import { useSingleFileInput } from '../../hooks/useSingleFileInput'; -import { useInstallApp } from './hooks/useInstallApp'; const AppInstallPage = () => { const t = useTranslation(); diff --git a/apps/meteor/client/views/marketplace/AppMenu.spec.tsx b/apps/meteor/client/views/marketplace/AppMenu.spec.tsx index 00316b19301..3f231f59a9e 100644 --- a/apps/meteor/client/views/marketplace/AppMenu.spec.tsx +++ b/apps/meteor/client/views/marketplace/AppMenu.spec.tsx @@ -3,9 +3,9 @@ import { mockAppRoot } from '@rocket.chat/mock-providers'; import { render, screen } from '@testing-library/react'; import React from 'react'; +import AppMenu from './AppMenu'; import { mockedAppsContext } from '../../../tests/mocks/client/marketplace'; import { createFakeApp } from '../../../tests/mocks/data'; -import AppMenu from './AppMenu'; describe('without app details', () => { it('should look good', async () => { diff --git a/apps/meteor/client/views/marketplace/AppPermissionsReviewModal.tsx b/apps/meteor/client/views/marketplace/AppPermissionsReviewModal.tsx index d06c6bc9f2f..721a904a43a 100644 --- a/apps/meteor/client/views/marketplace/AppPermissionsReviewModal.tsx +++ b/apps/meteor/client/views/marketplace/AppPermissionsReviewModal.tsx @@ -3,8 +3,8 @@ import { Box } from '@rocket.chat/fuselage'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import GenericModal from '../../components/GenericModal'; import AppPermissionsList from './components/AppPermissionsList'; +import GenericModal from '../../components/GenericModal'; export type AppPermissionsReviewModalProps = { appPermissions: App['permissions']; diff --git a/apps/meteor/client/views/marketplace/AppsPage/AppsPage.tsx b/apps/meteor/client/views/marketplace/AppsPage/AppsPage.tsx index af0b8f384c8..729b4ea11f4 100644 --- a/apps/meteor/client/views/marketplace/AppsPage/AppsPage.tsx +++ b/apps/meteor/client/views/marketplace/AppsPage/AppsPage.tsx @@ -1,8 +1,8 @@ import type { ReactElement } from 'react'; import React from 'react'; -import { Page } from '../../../components/Page'; import AppsPageContent from './AppsPageContent'; +import { Page } from '../../../components/Page'; const AppsPage = (): ReactElement => { return ( diff --git a/apps/meteor/client/views/marketplace/AppsPage/AppsPageContent.tsx b/apps/meteor/client/views/marketplace/AppsPage/AppsPageContent.tsx index 7bf6bf3000e..699257c7f35 100644 --- a/apps/meteor/client/views/marketplace/AppsPage/AppsPageContent.tsx +++ b/apps/meteor/client/views/marketplace/AppsPage/AppsPageContent.tsx @@ -4,15 +4,6 @@ import type { ReactElement } from 'react'; import React, { useEffect, useMemo, useState, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; -import { usePagination } from '../../../components/GenericTable/hooks/usePagination'; -import { useAppsResult } from '../../../contexts/hooks/useAppsResult'; -import { AsyncStatePhase } from '../../../lib/asyncState'; -import MarketplaceHeader from '../components/MarketplaceHeader'; -import type { RadioDropDownGroup } from '../definitions/RadioDropDownDefinitions'; -import { useCategories } from '../hooks/useCategories'; -import type { appsDataType } from '../hooks/useFilteredApps'; -import { useFilteredApps } from '../hooks/useFilteredApps'; -import { useRadioToggle } from '../hooks/useRadioToggle'; import AppsFilters from './AppsFilters'; import AppsPageConnectionError from './AppsPageConnectionError'; import AppsPageContentBody from './AppsPageContentBody'; @@ -23,6 +14,15 @@ import NoInstalledAppsEmptyState from './NoInstalledAppsEmptyState'; import NoMarketplaceOrInstalledAppMatchesEmptyState from './NoMarketplaceOrInstalledAppMatchesEmptyState'; import PrivateEmptyState from './PrivateEmptyState'; import UnsupportedEmptyState from './UnsupportedEmptyState'; +import { usePagination } from '../../../components/GenericTable/hooks/usePagination'; +import { useAppsResult } from '../../../contexts/hooks/useAppsResult'; +import { AsyncStatePhase } from '../../../lib/asyncState'; +import MarketplaceHeader from '../components/MarketplaceHeader'; +import type { RadioDropDownGroup } from '../definitions/RadioDropDownDefinitions'; +import { useCategories } from '../hooks/useCategories'; +import { useFilteredApps } from '../hooks/useFilteredApps'; +import type { appsDataType } from '../hooks/useFilteredApps'; +import { useRadioToggle } from '../hooks/useRadioToggle'; type AppsContext = 'explore' | 'installed' | 'premium' | 'private' | 'requested'; diff --git a/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.spec.tsx b/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.spec.tsx index c2d309d6102..8725d5e8f29 100644 --- a/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.spec.tsx +++ b/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.spec.tsx @@ -2,9 +2,9 @@ import { mockAppRoot } from '@rocket.chat/mock-providers'; import { render, screen } from '@testing-library/react'; import React from 'react'; +import PrivateEmptyState from './PrivateEmptyState'; import { AppsContext } from '../../../contexts/AppsContext'; import { asyncState } from '../../../lib/asyncState'; -import PrivateEmptyState from './PrivateEmptyState'; describe('with private apps enabled', () => { const appRoot = mockAppRoot() diff --git a/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.tsx b/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.tsx index aaa2be18ee3..a7c345f86a6 100644 --- a/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.tsx +++ b/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.tsx @@ -1,9 +1,9 @@ import { Box } from '@rocket.chat/fuselage'; import React from 'react'; -import { usePrivateAppsEnabled } from '../hooks/usePrivateAppsEnabled'; import PrivateEmptyStateDefault from './PrivateEmptyStateDefault'; import PrivateEmptyStateUpgrade from './PrivateEmptyStateUpgrade'; +import { usePrivateAppsEnabled } from '../hooks/usePrivateAppsEnabled'; const PrivateEmptyState = () => { const privateAppsEnabled = usePrivateAppsEnabled(); diff --git a/apps/meteor/client/views/marketplace/AppsPage/UnsupportedEmptyState.spec.tsx b/apps/meteor/client/views/marketplace/AppsPage/UnsupportedEmptyState.spec.tsx index d53da3c55f6..2d801b6e3b6 100644 --- a/apps/meteor/client/views/marketplace/AppsPage/UnsupportedEmptyState.spec.tsx +++ b/apps/meteor/client/views/marketplace/AppsPage/UnsupportedEmptyState.spec.tsx @@ -2,9 +2,9 @@ import { mockAppRoot } from '@rocket.chat/mock-providers'; import { render, screen } from '@testing-library/react'; import React from 'react'; +import UnsupportedEmptyState from './UnsupportedEmptyState'; import { AppsContext } from '../../../contexts/AppsContext'; import { asyncState } from '../../../lib/asyncState'; -import UnsupportedEmptyState from './UnsupportedEmptyState'; describe('with private apps enabled', () => { const appRoot = mockAppRoot() diff --git a/apps/meteor/client/views/marketplace/AppsRoute.tsx b/apps/meteor/client/views/marketplace/AppsRoute.tsx index d779ae459d4..908d8f8579d 100644 --- a/apps/meteor/client/views/marketplace/AppsRoute.tsx +++ b/apps/meteor/client/views/marketplace/AppsRoute.tsx @@ -2,13 +2,13 @@ import { useRouteParameter, useRoute, usePermission } from '@rocket.chat/ui-cont import type { ReactElement } from 'react'; import React, { useState, useEffect } from 'react'; -import PageSkeleton from '../../components/PageSkeleton'; -import AppsProvider from '../../providers/AppsProvider'; -import NotAuthorizedPage from '../notAuthorized/NotAuthorizedPage'; import AppDetailsPage from './AppDetailsPage'; import AppInstallPage from './AppInstallPage'; import AppsPage from './AppsPage'; import BannerEnterpriseTrialEnded from './components/BannerEnterpriseTrialEnded'; +import PageSkeleton from '../../components/PageSkeleton'; +import AppsProvider from '../../providers/AppsProvider'; +import NotAuthorizedPage from '../notAuthorized/NotAuthorizedPage'; const AppsRoute = (): ReactElement => { const [isLoading, setLoading] = useState(true); diff --git a/apps/meteor/client/views/marketplace/MarketplaceRouter.tsx b/apps/meteor/client/views/marketplace/MarketplaceRouter.tsx index f2b32182182..2dc5ff1df6c 100644 --- a/apps/meteor/client/views/marketplace/MarketplaceRouter.tsx +++ b/apps/meteor/client/views/marketplace/MarketplaceRouter.tsx @@ -2,10 +2,10 @@ import { useAtLeastOnePermission, useRoute, useRouteParameter } from '@rocket.ch import type { ReactElement, ReactNode } from 'react'; import React, { Suspense, useEffect } from 'react'; +import MarketPlaceSidebar from './MarketplaceSidebar'; import PageSkeleton from '../../components/PageSkeleton'; import SidebarPortal from '../../sidebar/SidebarPortal'; import NotFoundPage from '../notFound/NotFoundPage'; -import MarketPlaceSidebar from './MarketplaceSidebar'; const MarketplaceRouter = ({ children }: { children?: ReactNode }): ReactElement => { const currentContext = useRouteParameter('context') || 'all'; diff --git a/apps/meteor/client/views/marketplace/MarketplaceSidebar.tsx b/apps/meteor/client/views/marketplace/MarketplaceSidebar.tsx index df851c0c1d3..72e084eb135 100644 --- a/apps/meteor/client/views/marketplace/MarketplaceSidebar.tsx +++ b/apps/meteor/client/views/marketplace/MarketplaceSidebar.tsx @@ -3,10 +3,10 @@ import type { ReactElement } from 'react'; import React, { memo } from 'react'; import { useSyncExternalStore } from 'use-sync-external-store/shim'; +import { getMarketplaceSidebarItems, subscribeToMarketplaceSidebarItems } from './sidebarItems'; import Sidebar from '../../components/Sidebar'; import SidebarItemsAssembler from '../../components/Sidebar/SidebarItemsAssembler'; import SettingsProvider from '../../providers/SettingsProvider'; -import { getMarketplaceSidebarItems, subscribeToMarketplaceSidebarItems } from './sidebarItems'; const MarketplaceSidebar = (): ReactElement => { const items = useSyncExternalStore(subscribeToMarketplaceSidebarItems, getMarketplaceSidebarItems); diff --git a/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDown.stories.tsx b/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDown.stories.tsx index b4e16445bb8..3bfc89a0bce 100644 --- a/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDown.stories.tsx +++ b/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDown.stories.tsx @@ -2,13 +2,13 @@ import { Box, ButtonGroup } from '@rocket.chat/fuselage'; import type { StoryFn } from '@storybook/react'; import React, { useState } from 'react'; -import type { CategoryDropDownListProps } from '../../definitions/CategoryDropdownDefinitions'; -import { useCategories } from '../../hooks/useCategories'; -import { useCategoryToggle } from '../../hooks/useCategoryToggle'; import CategoryDropDown from './CategoryDropDown'; import CategoryDropDownAnchor from './CategoryDropDownAnchor'; import CategoryDropDownList from './CategoryDropDownList'; import TagList from './TagList'; +import type { CategoryDropDownListProps } from '../../definitions/CategoryDropdownDefinitions'; +import { useCategories } from '../../hooks/useCategories'; +import { useCategoryToggle } from '../../hooks/useCategoryToggle'; export default { title: 'Admin/Apps/CategoryDropDown', diff --git a/apps/meteor/client/views/marketplace/components/MarketplaceHeader.tsx b/apps/meteor/client/views/marketplace/components/MarketplaceHeader.tsx index fc847ee30d1..0be91b54228 100644 --- a/apps/meteor/client/views/marketplace/components/MarketplaceHeader.tsx +++ b/apps/meteor/client/views/marketplace/components/MarketplaceHeader.tsx @@ -8,9 +8,9 @@ import { GenericResourceUsageSkeleton } from '../../../components/GenericResourc import { PageHeader } from '../../../components/Page'; import UpgradeButton from '../../admin/subscription/components/UpgradeButton'; import UnlimitedAppsUpsellModal from '../UnlimitedAppsUpsellModal'; +import EnabledAppsCount from './EnabledAppsCount'; import { useAppsCountQuery } from '../hooks/useAppsCountQuery'; import { usePrivateAppsEnabled } from '../hooks/usePrivateAppsEnabled'; -import EnabledAppsCount from './EnabledAppsCount'; import PrivateAppInstallModal from './PrivateAppInstallModal/PrivateAppInstallModal'; import UpdateRocketChatButton from './UpdateRocketChatButton'; diff --git a/apps/meteor/client/views/marketplace/helpers.ts b/apps/meteor/client/views/marketplace/helpers.ts index 5307b007b1c..08bf9667ade 100644 --- a/apps/meteor/client/views/marketplace/helpers.ts +++ b/apps/meteor/client/views/marketplace/helpers.ts @@ -3,8 +3,8 @@ import type { App } from '@rocket.chat/core-typings'; import semver from 'semver'; // import { t } from '../../../app/utils/client'; -import { t } from '../../../app/utils/lib/i18n'; import { appErroredStatuses } from './helpers/appErroredStatuses'; +import { t } from '../../../app/utils/lib/i18n'; export const appEnabledStatuses = [AppStatus.AUTO_ENABLED, AppStatus.MANUALLY_ENABLED]; diff --git a/apps/meteor/client/views/marketplace/helpers/formatPricingPlan.ts b/apps/meteor/client/views/marketplace/helpers/formatPricingPlan.ts index fcd591b8df2..b65745a4973 100644 --- a/apps/meteor/client/views/marketplace/helpers/formatPricingPlan.ts +++ b/apps/meteor/client/views/marketplace/helpers/formatPricingPlan.ts @@ -1,7 +1,7 @@ import type { AppPricingPlan } from '@rocket.chat/core-typings'; -import { t } from '../../../../app/utils/lib/i18n'; import { formatPrice } from './formatPrice'; +import { t } from '../../../../app/utils/lib/i18n'; export const formatPricingPlan = ({ strategy, price, tiers = [], trialDays }: AppPricingPlan): string => { const { perUnit = false } = (Array.isArray(tiers) && tiers.find((tier) => tier.price === price)) || {}; diff --git a/apps/meteor/client/views/marketplace/helpers/installApp.ts b/apps/meteor/client/views/marketplace/helpers/installApp.ts index 1021ab16ffd..e1d1256d16e 100644 --- a/apps/meteor/client/views/marketplace/helpers/installApp.ts +++ b/apps/meteor/client/views/marketplace/helpers/installApp.ts @@ -1,8 +1,8 @@ import type { App, AppPermission } from '@rocket.chat/core-typings'; -import { AppClientOrchestratorInstance } from '../../../apps/orchestrator'; import { handleAPIError } from './handleAPIError'; import { warnAppInstall } from './warnAppInstall'; +import { AppClientOrchestratorInstance } from '../../../apps/orchestrator'; type installAppProps = App & { permissionsGranted?: AppPermission[]; diff --git a/apps/meteor/client/views/marketplace/helpers/updateApp.ts b/apps/meteor/client/views/marketplace/helpers/updateApp.ts index 076478717ad..d6d558b1573 100644 --- a/apps/meteor/client/views/marketplace/helpers/updateApp.ts +++ b/apps/meteor/client/views/marketplace/helpers/updateApp.ts @@ -1,8 +1,8 @@ import type { App, AppPermission } from '@rocket.chat/core-typings'; -import { AppClientOrchestratorInstance } from '../../../apps/orchestrator'; import { handleAPIError } from './handleAPIError'; import { warnStatusChange } from './warnStatusChange'; +import { AppClientOrchestratorInstance } from '../../../apps/orchestrator'; type updateAppProps = App & { permissionsGranted?: AppPermission[]; diff --git a/apps/meteor/client/views/marketplace/helpers/warnAppInstall.ts b/apps/meteor/client/views/marketplace/helpers/warnAppInstall.ts index 78d40829c0c..e130098a99a 100644 --- a/apps/meteor/client/views/marketplace/helpers/warnAppInstall.ts +++ b/apps/meteor/client/views/marketplace/helpers/warnAppInstall.ts @@ -1,8 +1,8 @@ import type { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus'; +import { appErroredStatuses } from './appErroredStatuses'; import { t } from '../../../../app/utils/lib/i18n'; import { dispatchToastMessage } from '../../../lib/toast'; -import { appErroredStatuses } from './appErroredStatuses'; export const warnAppInstall = (appName: string, status: AppStatus): void => { if (appErroredStatuses.includes(status)) { diff --git a/apps/meteor/client/views/marketplace/helpers/warnEnableDisableApp.ts b/apps/meteor/client/views/marketplace/helpers/warnEnableDisableApp.ts index 2ca50d67c78..79e55cea627 100644 --- a/apps/meteor/client/views/marketplace/helpers/warnEnableDisableApp.ts +++ b/apps/meteor/client/views/marketplace/helpers/warnEnableDisableApp.ts @@ -1,8 +1,8 @@ import type { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus'; +import { appErroredStatuses } from './appErroredStatuses'; import { t } from '../../../../app/utils/lib/i18n'; import { dispatchToastMessage } from '../../../lib/toast'; -import { appErroredStatuses } from './appErroredStatuses'; export const warnEnableDisableApp = (appName: string, status: AppStatus, type: string): void => { if (appErroredStatuses.includes(status)) { diff --git a/apps/meteor/client/views/marketplace/helpers/warnStatusChange.ts b/apps/meteor/client/views/marketplace/helpers/warnStatusChange.ts index 3fc01514ec7..db1979583ea 100644 --- a/apps/meteor/client/views/marketplace/helpers/warnStatusChange.ts +++ b/apps/meteor/client/views/marketplace/helpers/warnStatusChange.ts @@ -1,8 +1,8 @@ import type { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus'; +import { appErroredStatuses } from './appErroredStatuses'; import { t } from '../../../../app/utils/lib/i18n'; import { dispatchToastMessage } from '../../../lib/toast'; -import { appErroredStatuses } from './appErroredStatuses'; export const warnStatusChange = (appName: string, status: AppStatus): void => { if (appErroredStatuses.includes(status)) { diff --git a/apps/meteor/client/views/marketplace/hooks/useAppInstallationHandler.tsx b/apps/meteor/client/views/marketplace/hooks/useAppInstallationHandler.tsx index 42bf3886489..a69582a64d1 100644 --- a/apps/meteor/client/views/marketplace/hooks/useAppInstallationHandler.tsx +++ b/apps/meteor/client/views/marketplace/hooks/useAppInstallationHandler.tsx @@ -2,16 +2,16 @@ import type { App } from '@rocket.chat/core-typings'; import { useEndpoint, useRouteParameter, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts'; import React, { useCallback } from 'react'; +import { isMarketplaceRouteContext, useAppsCountQuery } from './useAppsCountQuery'; +import { useOpenAppPermissionsReviewModal } from './useOpenAppPermissionsReviewModal'; import { useExternalLink } from '../../../hooks/useExternalLink'; import { useCheckoutUrl } from '../../admin/subscription/hooks/useCheckoutUrl'; import IframeModal from '../IframeModal'; import AppInstallModal from '../components/AppInstallModal/AppInstallModal'; import type { Actions } from '../helpers'; -import { handleAPIError } from '../helpers/handleAPIError'; -import { isMarketplaceRouteContext, useAppsCountQuery } from './useAppsCountQuery'; import { useAppsOrchestration } from './useAppsOrchestration'; -import { useOpenAppPermissionsReviewModal } from './useOpenAppPermissionsReviewModal'; import { useOpenIncompatibleModal } from './useOpenIncompatibleModal'; +import { handleAPIError } from '../helpers/handleAPIError'; export type AppInstallationHandlerParams = { app: App; diff --git a/apps/meteor/client/views/marketplace/hooks/useAppMenu.tsx b/apps/meteor/client/views/marketplace/hooks/useAppMenu.tsx index b47e4829973..820c0c52965 100644 --- a/apps/meteor/client/views/marketplace/hooks/useAppMenu.tsx +++ b/apps/meteor/client/views/marketplace/hooks/useAppMenu.tsx @@ -14,6 +14,12 @@ import type { MouseEvent, ReactNode } from 'react'; import React, { useMemo, useCallback, useState } from 'react'; import semver from 'semver'; +import { useAppInstallationHandler } from './useAppInstallationHandler'; +import type { MarketplaceRouteContext } from './useAppsCountQuery'; +import { useAppsCountQuery } from './useAppsCountQuery'; +import { useMarketplaceActions } from './useMarketplaceActions'; +import { useOpenAppPermissionsReviewModal } from './useOpenAppPermissionsReviewModal'; +import { useOpenIncompatibleModal } from './useOpenIncompatibleModal'; import WarningModal from '../../../components/WarningModal'; import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule'; import { useIsEnterprise } from '../../../hooks/useIsEnterprise'; @@ -25,12 +31,6 @@ import type { Actions } from '../helpers'; import { appEnabledStatuses, appButtonProps } from '../helpers'; import { handleAPIError } from '../helpers/handleAPIError'; import { warnEnableDisableApp } from '../helpers/warnEnableDisableApp'; -import { useAppInstallationHandler } from './useAppInstallationHandler'; -import type { MarketplaceRouteContext } from './useAppsCountQuery'; -import { useAppsCountQuery } from './useAppsCountQuery'; -import { useMarketplaceActions } from './useMarketplaceActions'; -import { useOpenAppPermissionsReviewModal } from './useOpenAppPermissionsReviewModal'; -import { useOpenIncompatibleModal } from './useOpenIncompatibleModal'; export type AppMenuOption = { id: string; diff --git a/apps/meteor/client/views/marketplace/hooks/useCategories.ts b/apps/meteor/client/views/marketplace/hooks/useCategories.ts index 17a7c878e6e..4a1169ee151 100644 --- a/apps/meteor/client/views/marketplace/hooks/useCategories.ts +++ b/apps/meteor/client/views/marketplace/hooks/useCategories.ts @@ -1,6 +1,8 @@ import { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; +import { useCategoryFlatList } from './useCategoryFlatList'; +import { useCategoryToggle } from './useCategoryToggle'; import { AppClientOrchestratorInstance } from '../../../apps/orchestrator'; import type { CategoryDropDownGroups, @@ -10,8 +12,6 @@ import type { selectedCategoriesList, } from '../definitions/CategoryDropdownDefinitions'; import { handleAPIError } from '../helpers/handleAPIError'; -import { useCategoryFlatList } from './useCategoryFlatList'; -import { useCategoryToggle } from './useCategoryToggle'; export const useCategories = (): [CategoryDropDownGroups, selectedCategoriesList, selectedCategoriesList, CategoryOnSelected] => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/marketplace/hooks/useInstallApp.tsx b/apps/meteor/client/views/marketplace/hooks/useInstallApp.tsx index 16499c0b07a..bccb0ecc986 100644 --- a/apps/meteor/client/views/marketplace/hooks/useInstallApp.tsx +++ b/apps/meteor/client/views/marketplace/hooks/useInstallApp.tsx @@ -7,10 +7,10 @@ import { AppClientOrchestratorInstance } from '../../../apps/orchestrator'; import { useAppsReload } from '../../../contexts/hooks/useAppsReload'; import AppPermissionsReviewModal from '../AppPermissionsReviewModal'; import AppUpdateModal from '../AppUpdateModal'; +import { useAppsCountQuery } from './useAppsCountQuery'; import { handleAPIError } from '../helpers/handleAPIError'; import { handleInstallError } from '../helpers/handleInstallError'; import { getManifestFromZippedApp } from '../lib/getManifestFromZippedApp'; -import { useAppsCountQuery } from './useAppsCountQuery'; export const useInstallApp = (file: File): { install: () => void; isInstalling: boolean } => { const reloadAppsList = useAppsReload(); diff --git a/apps/meteor/client/views/marketplace/hooks/useMarketplaceActions.ts b/apps/meteor/client/views/marketplace/hooks/useMarketplaceActions.ts index 84882e35de8..efc614a90d9 100644 --- a/apps/meteor/client/views/marketplace/hooks/useMarketplaceActions.ts +++ b/apps/meteor/client/views/marketplace/hooks/useMarketplaceActions.ts @@ -1,10 +1,10 @@ import type { App, AppPermission } from '@rocket.chat/core-typings'; import { useMutation } from '@tanstack/react-query'; +import { useAppsOrchestration } from './useAppsOrchestration'; import { handleAPIError } from '../helpers/handleAPIError'; import { warnAppInstall } from '../helpers/warnAppInstall'; import { warnStatusChange } from '../helpers/warnStatusChange'; -import { useAppsOrchestration } from './useAppsOrchestration'; type InstallAppParams = App & { permissionsGranted?: AppPermission[]; diff --git a/apps/meteor/client/views/marketplace/hooks/useOpenIncompatibleModal.tsx b/apps/meteor/client/views/marketplace/hooks/useOpenIncompatibleModal.tsx index 1645f47f443..7409e0b608c 100644 --- a/apps/meteor/client/views/marketplace/hooks/useOpenIncompatibleModal.tsx +++ b/apps/meteor/client/views/marketplace/hooks/useOpenIncompatibleModal.tsx @@ -2,8 +2,8 @@ import { useSetModal } from '@rocket.chat/ui-contexts'; import React, { useCallback } from 'react'; import IframeModal from '../IframeModal'; -import { handleAPIError } from '../helpers/handleAPIError'; import { useAppsOrchestration } from './useAppsOrchestration'; +import { handleAPIError } from '../helpers/handleAPIError'; export const useOpenIncompatibleModal = () => { const setModal = useSetModal(); diff --git a/apps/meteor/client/views/marketplace/sidebarItems.tsx b/apps/meteor/client/views/marketplace/sidebarItems.tsx index f829cccf323..985a80151e8 100644 --- a/apps/meteor/client/views/marketplace/sidebarItems.tsx +++ b/apps/meteor/client/views/marketplace/sidebarItems.tsx @@ -1,8 +1,8 @@ import React from 'react'; +import MarketplaceRequestBadge from './components/MarketplaceRequestBadge'; import { hasAtLeastOnePermission, hasPermission } from '../../../app/authorization/client'; import { createSidebarItems } from '../../lib/createSidebarItems'; -import MarketplaceRequestBadge from './components/MarketplaceRequestBadge'; export const { registerSidebarItem: registerMarketplaceSidebarItem, diff --git a/apps/meteor/client/views/meet/CallPage.tsx b/apps/meteor/client/views/meet/CallPage.tsx index 97b5c93c3de..f3152147548 100644 --- a/apps/meteor/client/views/meet/CallPage.tsx +++ b/apps/meteor/client/views/meet/CallPage.tsx @@ -4,10 +4,10 @@ import { useTranslation, useStream } from '@rocket.chat/ui-contexts'; import moment from 'moment'; import React, { useEffect, useState } from 'react'; +import OngoingCallDuration from './OngoingCallDuration'; import { sdk } from '../../../app/utils/client/lib/SDKClient'; import { WebRTC } from '../../../app/webrtc/client'; import { WEB_RTC_EVENTS } from '../../../app/webrtc/lib/constants'; -import OngoingCallDuration from './OngoingCallDuration'; import './styles.css'; type CallPageProps = { diff --git a/apps/meteor/client/views/meet/MeetPage.tsx b/apps/meteor/client/views/meet/MeetPage.tsx index 4876c8eb947..394bea51eb7 100644 --- a/apps/meteor/client/views/meet/MeetPage.tsx +++ b/apps/meteor/client/views/meet/MeetPage.tsx @@ -5,11 +5,11 @@ import { Meteor } from 'meteor/meteor'; import React, { useEffect, useState, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; +import CallPage from './CallPage'; import { sdk } from '../../../app/utils/client/lib/SDKClient'; import { useEmbeddedLayout } from '../../hooks/useEmbeddedLayout'; import NotFoundPage from '../notFound/NotFoundPage'; import PageLoading from '../root/PageLoading'; -import CallPage from './CallPage'; import './styles.css'; const MeetPage = () => { diff --git a/apps/meteor/client/views/meet/MeetRoute.tsx b/apps/meteor/client/views/meet/MeetRoute.tsx index bbc20356a30..7e2df4e3e34 100644 --- a/apps/meteor/client/views/meet/MeetRoute.tsx +++ b/apps/meteor/client/views/meet/MeetRoute.tsx @@ -3,9 +3,9 @@ import { useQuery } from '@tanstack/react-query'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import MeetPage from './MeetPage'; import { VisitorDoesNotExistError } from '../../lib/errors/VisitorDoesNotExistError'; import PageLoading from '../root/PageLoading'; -import MeetPage from './MeetPage'; const MeetRoute = () => { const router = useRouter(); diff --git a/apps/meteor/client/views/modal/uikit/ModalBlock.tsx b/apps/meteor/client/views/modal/uikit/ModalBlock.tsx index 402ccb7e27a..57016f0df63 100644 --- a/apps/meteor/client/views/modal/uikit/ModalBlock.tsx +++ b/apps/meteor/client/views/modal/uikit/ModalBlock.tsx @@ -6,8 +6,8 @@ import type { FormEventHandler, ReactElement } from 'react'; import React, { useCallback, useEffect, useMemo, useRef } from 'react'; import { FocusScope } from 'react-aria'; -import { getURL } from '../../../../app/utils/client/getURL'; import { getButtonStyle } from './getButtonStyle'; +import { getURL } from '../../../../app/utils/client/getURL'; const focusableElementsString = ` a[href]:not([tabindex="-1"]), diff --git a/apps/meteor/client/views/modal/uikit/UiKitModal.tsx b/apps/meteor/client/views/modal/uikit/UiKitModal.tsx index 55c6c8a32d7..fcdaecfacb7 100644 --- a/apps/meteor/client/views/modal/uikit/UiKitModal.tsx +++ b/apps/meteor/client/views/modal/uikit/UiKitModal.tsx @@ -5,12 +5,12 @@ import type * as UiKit from '@rocket.chat/ui-kit'; import React from 'react'; import type { FormEvent } from 'react'; +import ModalBlock from './ModalBlock'; import { detectEmoji } from '../../../lib/utils/detectEmoji'; import { preventSyntheticEvent } from '../../../lib/utils/preventSyntheticEvent'; import { useModalContextValue } from '../../../uikit/hooks/useModalContextValue'; import { useUiKitActionManager } from '../../../uikit/hooks/useUiKitActionManager'; import { useUiKitView } from '../../../uikit/hooks/useUiKitView'; -import ModalBlock from './ModalBlock'; type UiKitModalProps = { key: UiKit.ModalView['id']; // force re-mount when viewId changes diff --git a/apps/meteor/client/views/notFound/NotFoundPage.spec.tsx b/apps/meteor/client/views/notFound/NotFoundPage.spec.tsx index 19d2238cefc..868cef2066d 100644 --- a/apps/meteor/client/views/notFound/NotFoundPage.spec.tsx +++ b/apps/meteor/client/views/notFound/NotFoundPage.spec.tsx @@ -3,8 +3,8 @@ import userEvent from '@testing-library/user-event'; import type { MutableRefObject } from 'react'; import React from 'react'; -import RouterContextMock from '../../../tests/mocks/client/RouterContextMock'; import NotFoundPage from './NotFoundPage'; +import RouterContextMock from '../../../tests/mocks/client/RouterContextMock'; it('should look good', async () => { render(, { legacyRoot: true }); diff --git a/apps/meteor/client/views/oauth/components/AuthorizationFormPage.tsx b/apps/meteor/client/views/oauth/components/AuthorizationFormPage.tsx index 62321435237..60248c3083e 100644 --- a/apps/meteor/client/views/oauth/components/AuthorizationFormPage.tsx +++ b/apps/meteor/client/views/oauth/components/AuthorizationFormPage.tsx @@ -7,9 +7,9 @@ import { Accounts } from 'meteor/accounts-base'; import React, { useEffect, useMemo, useRef } from 'react'; import { Trans, useTranslation } from 'react-i18next'; -import { queueMicrotask } from '../../../lib/utils/queueMicrotask'; import CurrentUserDisplay from './CurrentUserDisplay'; import Layout from './Layout'; +import { queueMicrotask } from '../../../lib/utils/queueMicrotask'; type AuthorizationFormPageProps = { oauthApp: IOAuthApps; diff --git a/apps/meteor/client/views/oauth/components/ErrorPage.tsx b/apps/meteor/client/views/oauth/components/ErrorPage.tsx index 812a5badf11..9c0f0a14e91 100644 --- a/apps/meteor/client/views/oauth/components/ErrorPage.tsx +++ b/apps/meteor/client/views/oauth/components/ErrorPage.tsx @@ -2,8 +2,8 @@ import { States, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fu import React from 'react'; import { useTranslation } from 'react-i18next'; -import { getErrorMessage } from '../../../lib/errorHandling'; import Layout from './Layout'; +import { getErrorMessage } from '../../../lib/errorHandling'; type ErrorPageProps = { error: unknown; diff --git a/apps/meteor/client/views/omnichannel/OmnichannelRouter.tsx b/apps/meteor/client/views/omnichannel/OmnichannelRouter.tsx index eb699cea2a8..24d187a27a5 100644 --- a/apps/meteor/client/views/omnichannel/OmnichannelRouter.tsx +++ b/apps/meteor/client/views/omnichannel/OmnichannelRouter.tsx @@ -2,9 +2,9 @@ import { useRouter } from '@rocket.chat/ui-contexts'; import type { ReactNode, ReactElement } from 'react'; import React, { Suspense, useEffect } from 'react'; +import OmnichannelSidebar from './sidebar/OmnichannelSidebar'; import PageSkeleton from '../../components/PageSkeleton'; import SidebarPortal from '../../sidebar/SidebarPortal'; -import OmnichannelSidebar from './sidebar/OmnichannelSidebar'; type OmnichannelRouterProps = { children?: ReactNode; diff --git a/apps/meteor/client/views/omnichannel/agents/AgentEditWithData.tsx b/apps/meteor/client/views/omnichannel/agents/AgentEditWithData.tsx index 72d8e0dc1d1..3e1134ad9ae 100644 --- a/apps/meteor/client/views/omnichannel/agents/AgentEditWithData.tsx +++ b/apps/meteor/client/views/omnichannel/agents/AgentEditWithData.tsx @@ -6,8 +6,8 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { FormSkeleton } from '../../../components/Skeleton'; import AgentEdit from './AgentEdit'; +import { FormSkeleton } from '../../../components/Skeleton'; const AgentEditWithData = ({ uid }: { uid: ILivechatAgent['_id'] }): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/agents/AgentsPage.tsx b/apps/meteor/client/views/omnichannel/agents/AgentsPage.tsx index 3bea4fb4fca..0dbe9f64484 100644 --- a/apps/meteor/client/views/omnichannel/agents/AgentsPage.tsx +++ b/apps/meteor/client/views/omnichannel/agents/AgentsPage.tsx @@ -3,12 +3,12 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { ContextualbarDialog } from '../../../components/Contextualbar'; -import { Page, PageHeader, PageContent } from '../../../components/Page'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import AgentEditWithData from './AgentEditWithData'; import AgentInfo from './AgentInfo'; import AgentsTable from './AgentsTable/AgentsTable'; +import { ContextualbarDialog } from '../../../components/Contextualbar'; +import { Page, PageHeader, PageContent } from '../../../components/Page'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; const AgentsPage = (): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTable.tsx b/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTable.tsx index 81a04487da4..ed50d53b5f0 100644 --- a/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTable.tsx +++ b/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTable.tsx @@ -4,6 +4,8 @@ import { hashQueryKey } from '@tanstack/react-query'; import React, { useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; +import AddAgent from './AddAgent'; +import AgentsTableRow from './AgentsTableRow'; import FilterByText from '../../../../components/FilterByText'; import GenericNoResults from '../../../../components/GenericNoResults/GenericNoResults'; import { @@ -17,8 +19,6 @@ import { usePagination } from '../../../../components/GenericTable/hooks/usePagi import { useSort } from '../../../../components/GenericTable/hooks/useSort'; import { useAgentsQuery } from '../hooks/useAgentsQuery'; import { useQuery } from '../hooks/useQuery'; -import AddAgent from './AddAgent'; -import AgentsTableRow from './AgentsTableRow'; // TODO: missing error state const AgentsTable = () => { diff --git a/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.tsx b/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.tsx index 98622184000..4fae2e621e0 100644 --- a/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.tsx +++ b/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.tsx @@ -3,12 +3,12 @@ import { Box, Select, Margins, Field, FieldLabel, FieldRow, Label, Option } from import React, { useMemo, useState, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; -import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment'; -import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; import AgentOverview from './AgentOverview'; import DateRangePicker from './DateRangePicker'; import InterchangeableChart from './InterchangeableChart'; import Overview from './Overview'; +import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment'; +import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; const useOptions = (type: string): SelectOption[] => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx b/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx index 92bcfc4c5d3..8a254fb02a1 100644 --- a/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx +++ b/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx @@ -18,9 +18,9 @@ import React from 'react'; import { Controller, useFormContext } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; +import FieldLabel from './AppearanceFieldLabel'; import MarkdownText from '../../../components/MarkdownText'; import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule'; -import FieldLabel from './AppearanceFieldLabel'; const AppearanceForm = () => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/appearance/AppearancePage.tsx b/apps/meteor/client/views/omnichannel/appearance/AppearancePage.tsx index c6f6ddd526f..7e590d190b5 100644 --- a/apps/meteor/client/views/omnichannel/appearance/AppearancePage.tsx +++ b/apps/meteor/client/views/omnichannel/appearance/AppearancePage.tsx @@ -6,8 +6,8 @@ import React from 'react'; import { useForm, FormProvider } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; -import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page'; import AppearanceForm from './AppearanceForm'; +import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page'; type LivechatAppearanceSettings = { Livechat_title: string; diff --git a/apps/meteor/client/views/omnichannel/appearance/AppearancePageContainer.tsx b/apps/meteor/client/views/omnichannel/appearance/AppearancePageContainer.tsx index 1a923e29e10..73fe2569289 100644 --- a/apps/meteor/client/views/omnichannel/appearance/AppearancePageContainer.tsx +++ b/apps/meteor/client/views/omnichannel/appearance/AppearancePageContainer.tsx @@ -3,12 +3,12 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import AppearancePage from './AppearancePage'; import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; import PageSkeleton from '../../../components/PageSkeleton'; import { AsyncStatePhase } from '../../../hooks/useAsyncState'; import { useEndpointData } from '../../../hooks/useEndpointData'; import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; -import AppearancePage from './AppearancePage'; const AppearancePageContainer = () => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/businessHours/EditBusinessHours.tsx b/apps/meteor/client/views/omnichannel/businessHours/EditBusinessHours.tsx index 7700487ad3b..effcfa65e22 100644 --- a/apps/meteor/client/views/omnichannel/businessHours/EditBusinessHours.tsx +++ b/apps/meteor/client/views/omnichannel/businessHours/EditBusinessHours.tsx @@ -5,12 +5,12 @@ import { useToastMessageDispatch, useMethod, useTranslation, useRouter } from '@ import React from 'react'; import { FormProvider, useForm } from 'react-hook-form'; -import { Page, PageFooter, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; -import { useRemoveBusinessHour } from '../../../omnichannel/businessHours/useRemoveBusinessHour'; import type { BusinessHoursFormData } from './BusinessHoursForm'; import BusinessHoursForm from './BusinessHoursForm'; import { defaultWorkHours } from './mapBusinessHoursForm'; import { useIsSingleBusinessHours } from './useIsSingleBusinessHours'; +import { Page, PageFooter, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; +import { useRemoveBusinessHour } from '../../../omnichannel/businessHours/useRemoveBusinessHour'; const getInitialData = (businessHourData: Serialized | undefined) => ({ name: businessHourData?.name || '', diff --git a/apps/meteor/client/views/omnichannel/businessHours/EditBusinessHoursWithData.tsx b/apps/meteor/client/views/omnichannel/businessHours/EditBusinessHoursWithData.tsx index 758e5b0cc38..1ade22846e2 100644 --- a/apps/meteor/client/views/omnichannel/businessHours/EditBusinessHoursWithData.tsx +++ b/apps/meteor/client/views/omnichannel/businessHours/EditBusinessHoursWithData.tsx @@ -5,9 +5,9 @@ import { useQuery } from '@tanstack/react-query'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import EditBusinessHours from './EditBusinessHours'; import { Page, PageHeader, PageContent } from '../../../components/Page'; import PageSkeleton from '../../../components/PageSkeleton'; -import EditBusinessHours from './EditBusinessHours'; const EditBusinessHoursWidthData = ({ id, type }: { id?: ILivechatBusinessHour['_id']; type: LivechatBusinessHourTypes }) => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistory.tsx b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistory.tsx index 955c1918be0..df90b9104c1 100644 --- a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistory.tsx +++ b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistory.tsx @@ -1,8 +1,8 @@ import React, { useState } from 'react'; -import { useRoomToolbox } from '../../room/contexts/RoomToolboxContext'; import ContactHistoryList from './ContactHistoryList'; import ContactHistoryMessagesList from './MessageList/ContactHistoryMessagesList'; +import { useRoomToolbox } from '../../room/contexts/RoomToolboxContext'; const ContactHistory = () => { const [chatId, setChatId] = useState(''); diff --git a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryList.tsx b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryList.tsx index 5a1cd52eab3..1d2d0fe6265 100644 --- a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryList.tsx +++ b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryList.tsx @@ -4,6 +4,8 @@ import React, { useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Virtuoso } from 'react-virtuoso'; +import ContactHistoryItem from './ContactHistoryItem'; +import { useHistoryList } from './useHistoryList'; import { ContextualbarHeader, ContextualbarContent, @@ -16,8 +18,6 @@ import { VirtuosoScrollbars } from '../../../components/CustomScrollbars'; import { useRecordList } from '../../../hooks/lists/useRecordList'; import { AsyncStatePhase } from '../../../lib/asyncState'; import { useOmnichannelRoom } from '../../room/contexts/RoomContext'; -import ContactHistoryItem from './ContactHistoryItem'; -import { useHistoryList } from './useHistoryList'; const ContactHistoryList = ({ setChatId, close }: { setChatId: Dispatch>; close: () => void }): ReactElement => { const [text, setText] = useState(''); diff --git a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessagesList.tsx b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessagesList.tsx index 1e0b7089f15..b9936d1daf6 100644 --- a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessagesList.tsx +++ b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessagesList.tsx @@ -4,6 +4,8 @@ import type { ChangeEvent, Dispatch, ReactElement, SetStateAction } from 'react' import React, { useMemo, useState } from 'react'; import { Virtuoso } from 'react-virtuoso'; +import ContactHistoryMessage from './ContactHistoryMessage'; +import { useHistoryMessageList } from './useHistoryMessageList'; import { ContextualbarHeader, ContextualbarAction, @@ -18,8 +20,6 @@ import { useRecordList } from '../../../../hooks/lists/useRecordList'; import { AsyncStatePhase } from '../../../../lib/asyncState'; import { isMessageNewDay } from '../../../room/MessageList/lib/isMessageNewDay'; import { isMessageSequential } from '../../../room/MessageList/lib/isMessageSequential'; -import ContactHistoryMessage from './ContactHistoryMessage'; -import { useHistoryMessageList } from './useHistoryMessageList'; const ContactHistoryMessagesList = ({ chatId, diff --git a/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsPage.tsx b/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsPage.tsx index 2bc55ce4c83..3d1275da8a9 100644 --- a/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsPage.tsx +++ b/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsPage.tsx @@ -8,6 +8,11 @@ import type { ComponentProps, ReactElement } from 'react'; import React, { memo, useCallback, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; +import CustomFieldsList from './CustomFieldsList'; +import FilterByText from './FilterByText'; +import RemoveChatButton from './RemoveChatButton'; +import { useAllCustomFields } from './hooks/useAllCustomFields'; +import { useCurrentChats } from './hooks/useCurrentChats'; import GenericNoResults from '../../../components/GenericNoResults'; import { GenericTable, @@ -25,11 +30,6 @@ import { useIsOverMacLimit } from '../../../hooks/omnichannel/useIsOverMacLimit' import { RoomActivityIcon } from '../../../omnichannel/components/RoomActivityIcon'; import { useOmnichannelPriorities } from '../../../omnichannel/hooks/useOmnichannelPriorities'; import { PriorityIcon } from '../../../omnichannel/priorities/PriorityIcon'; -import CustomFieldsList from './CustomFieldsList'; -import FilterByText from './FilterByText'; -import RemoveChatButton from './RemoveChatButton'; -import { useAllCustomFields } from './hooks/useAllCustomFields'; -import { useCurrentChats } from './hooks/useCurrentChats'; type DebouncedParams = { fname: string; diff --git a/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsRoute.tsx b/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsRoute.tsx index 842a1ad6227..607cca3f8f3 100644 --- a/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsRoute.tsx +++ b/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsRoute.tsx @@ -3,9 +3,9 @@ import { usePermission, useRouteParameter, useRouter } from '@rocket.chat/ui-con import React, { memo } from 'react'; import type { ReactElement } from 'react'; +import CurrentChatsPage from './CurrentChatsPage'; import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import Chat from '../directory/chats/Chat'; -import CurrentChatsPage from './CurrentChatsPage'; const CurrentChatsRoute = (): ReactElement => { const id = useRouteParameter('id'); diff --git a/apps/meteor/client/views/omnichannel/currentChats/RemoveChatButton.tsx b/apps/meteor/client/views/omnichannel/currentChats/RemoveChatButton.tsx index 7b9800f9886..624cf33528a 100644 --- a/apps/meteor/client/views/omnichannel/currentChats/RemoveChatButton.tsx +++ b/apps/meteor/client/views/omnichannel/currentChats/RemoveChatButton.tsx @@ -4,9 +4,9 @@ import { useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import { useRemoveCurrentChatMutation } from './hooks/useRemoveCurrentChatMutation'; import GenericModal from '../../../components/GenericModal'; import { GenericTableCell } from '../../../components/GenericTable'; -import { useRemoveCurrentChatMutation } from './hooks/useRemoveCurrentChatMutation'; type RemoveChatButtonProps = { _id: string }; diff --git a/apps/meteor/client/views/omnichannel/customFields/CustomFieldsPage.tsx b/apps/meteor/client/views/omnichannel/customFields/CustomFieldsPage.tsx index 3f1615f3b90..b8e5c274a17 100644 --- a/apps/meteor/client/views/omnichannel/customFields/CustomFieldsPage.tsx +++ b/apps/meteor/client/views/omnichannel/customFields/CustomFieldsPage.tsx @@ -3,11 +3,11 @@ import { useRouteParameter, useRouter } from '@rocket.chat/ui-contexts'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { ContextualbarDialog } from '../../../components/Contextualbar'; -import { Page, PageHeader, PageContent } from '../../../components/Page'; import CustomFieldsTable from './CustomFieldsTable'; import EditCustomFields from './EditCustomFields'; import EditCustomFieldsWithData from './EditCustomFieldsWithData'; +import { ContextualbarDialog } from '../../../components/Contextualbar'; +import { Page, PageHeader, PageContent } from '../../../components/Page'; const CustomFieldsPage = () => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/customFields/CustomFieldsRoute.tsx b/apps/meteor/client/views/omnichannel/customFields/CustomFieldsRoute.tsx index 2ffc7580e3f..f0727e1fc48 100644 --- a/apps/meteor/client/views/omnichannel/customFields/CustomFieldsRoute.tsx +++ b/apps/meteor/client/views/omnichannel/customFields/CustomFieldsRoute.tsx @@ -1,8 +1,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import React from 'react'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import CustomFieldsPage from './CustomFieldsPage'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; const CustomFieldsRoute = () => { const canViewCustomFields = usePermission('view-livechat-customfields'); diff --git a/apps/meteor/client/views/omnichannel/customFields/CustomFieldsTable.tsx b/apps/meteor/client/views/omnichannel/customFields/CustomFieldsTable.tsx index c291fc80ccd..b5572c34444 100644 --- a/apps/meteor/client/views/omnichannel/customFields/CustomFieldsTable.tsx +++ b/apps/meteor/client/views/omnichannel/customFields/CustomFieldsTable.tsx @@ -4,6 +4,7 @@ import { useTranslation, useEndpoint, useRouter } from '@rocket.chat/ui-contexts import { useQuery, hashQueryKey } from '@tanstack/react-query'; import React, { useMemo, useState } from 'react'; +import { useRemoveCustomField } from './useRemoveCustomField'; import FilterByText from '../../../components/FilterByText'; import GenericNoResults from '../../../components/GenericNoResults'; import { @@ -17,7 +18,6 @@ import { } from '../../../components/GenericTable'; import { usePagination } from '../../../components/GenericTable/hooks/usePagination'; import { useSort } from '../../../components/GenericTable/hooks/useSort'; -import { useRemoveCustomField } from './useRemoveCustomField'; const CustomFieldsTable = () => { const t = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/customFields/EditCustomFieldsWithData.tsx b/apps/meteor/client/views/omnichannel/customFields/EditCustomFieldsWithData.tsx index a69cd9ea743..15ad9255235 100644 --- a/apps/meteor/client/views/omnichannel/customFields/EditCustomFieldsWithData.tsx +++ b/apps/meteor/client/views/omnichannel/customFields/EditCustomFieldsWithData.tsx @@ -5,8 +5,8 @@ import { useQuery } from '@tanstack/react-query'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import PageSkeleton from '../../../components/PageSkeleton'; import EditCustomFields from './EditCustomFields'; +import PageSkeleton from '../../../components/PageSkeleton'; const EditCustomFieldsWithData = ({ customFieldId }: { customFieldId: ILivechatCustomField['_id'] }) => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/departments/DepartmentsPage.tsx b/apps/meteor/client/views/omnichannel/departments/DepartmentsPage.tsx index 0583f53a14e..50fb515d6a2 100644 --- a/apps/meteor/client/views/omnichannel/departments/DepartmentsPage.tsx +++ b/apps/meteor/client/views/omnichannel/departments/DepartmentsPage.tsx @@ -3,10 +3,10 @@ import { useMutableCallback } from '@rocket.chat/fuselage-hooks'; import { useRoute, useTranslation, useRouteParameter } from '@rocket.chat/ui-contexts'; import React from 'react'; -import { Page, PageHeader, PageContent } from '../../../components/Page'; import DepartmentsTableV2 from './DepartmentsTable'; import EditDepartmentWithData from './EditDepartmentWithData'; import NewDepartment from './NewDepartment'; +import { Page, PageHeader, PageContent } from '../../../components/Page'; const DepartmentsPage = () => { const t = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/departments/DepartmentsRoute.tsx b/apps/meteor/client/views/omnichannel/departments/DepartmentsRoute.tsx index c92134a18e6..f1e848666f7 100644 --- a/apps/meteor/client/views/omnichannel/departments/DepartmentsRoute.tsx +++ b/apps/meteor/client/views/omnichannel/departments/DepartmentsRoute.tsx @@ -1,8 +1,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import React from 'react'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import DepartmentsPage from './DepartmentsPage'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; const DepartmentsRoute = () => { const canViewDepartments = usePermission('manage-livechat-departments'); diff --git a/apps/meteor/client/views/omnichannel/departments/DepartmentsTable/DepartmentsTable.tsx b/apps/meteor/client/views/omnichannel/departments/DepartmentsTable/DepartmentsTable.tsx index 445170c8db0..a96d3b8d8fc 100644 --- a/apps/meteor/client/views/omnichannel/departments/DepartmentsTable/DepartmentsTable.tsx +++ b/apps/meteor/client/views/omnichannel/departments/DepartmentsTable/DepartmentsTable.tsx @@ -5,6 +5,7 @@ import { useTranslation, useEndpoint, useRouter } from '@rocket.chat/ui-contexts import { useQuery, hashQueryKey } from '@tanstack/react-query'; import React, { useState, useMemo } from 'react'; +import DepartmentItemMenu from './DepartmentItemMenu'; import FilterByText from '../../../../components/FilterByText'; import GenericNoResults from '../../../../components/GenericNoResults/GenericNoResults'; import { @@ -18,7 +19,6 @@ import { } from '../../../../components/GenericTable'; import { usePagination } from '../../../../components/GenericTable/hooks/usePagination'; import { useSort } from '../../../../components/GenericTable/hooks/useSort'; -import DepartmentItemMenu from './DepartmentItemMenu'; const DEPARTMENTS_ENDPOINTS = { department: '/v1/livechat/department', diff --git a/apps/meteor/client/views/omnichannel/departments/EditDepartmentWithAllowedForwardData.tsx b/apps/meteor/client/views/omnichannel/departments/EditDepartmentWithAllowedForwardData.tsx index 246a4a8b812..b929a77ea67 100644 --- a/apps/meteor/client/views/omnichannel/departments/EditDepartmentWithAllowedForwardData.tsx +++ b/apps/meteor/client/views/omnichannel/departments/EditDepartmentWithAllowedForwardData.tsx @@ -4,9 +4,9 @@ import { useQuery } from '@tanstack/react-query'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { FormSkeleton } from '../../../components/Skeleton'; import type { EditDepartmentProps } from './EditDepartment'; import EditDepartment from './EditDepartment'; +import { FormSkeleton } from '../../../components/Skeleton'; const EditDepartmentWithAllowedForwardData = ({ data, ...props }: Omit) => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/departments/EditDepartmentWithData.tsx b/apps/meteor/client/views/omnichannel/departments/EditDepartmentWithData.tsx index f6aae2e3d48..191df366e35 100644 --- a/apps/meteor/client/views/omnichannel/departments/EditDepartmentWithData.tsx +++ b/apps/meteor/client/views/omnichannel/departments/EditDepartmentWithData.tsx @@ -4,9 +4,9 @@ import { useQuery } from '@tanstack/react-query'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { FormSkeleton } from '../../../components/Skeleton'; import EditDepartment from './EditDepartment'; import EditDepartmentWithAllowedForwardData from './EditDepartmentWithAllowedForwardData'; +import { FormSkeleton } from '../../../components/Skeleton'; const params = { onlyMyDepartments: 'true' } as const; diff --git a/apps/meteor/client/views/omnichannel/departments/NewDepartment.tsx b/apps/meteor/client/views/omnichannel/departments/NewDepartment.tsx index 8ad11c2b304..55d85275a4b 100644 --- a/apps/meteor/client/views/omnichannel/departments/NewDepartment.tsx +++ b/apps/meteor/client/views/omnichannel/departments/NewDepartment.tsx @@ -4,9 +4,9 @@ import { useQuery } from '@tanstack/react-query'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import EditDepartment from './EditDepartment'; import EnterpriseDepartmentsModal from '../../../components/Omnichannel/modals/EnterpriseDepartmentsModal'; import PageSkeleton from '../../../components/PageSkeleton'; -import EditDepartment from './EditDepartment'; type NewDepartmentProps = { id?: string; diff --git a/apps/meteor/client/views/omnichannel/directory/CallsContextualBarDirectory.tsx b/apps/meteor/client/views/omnichannel/directory/CallsContextualBarDirectory.tsx index 6b1a88a8e49..715271e7d56 100644 --- a/apps/meteor/client/views/omnichannel/directory/CallsContextualBarDirectory.tsx +++ b/apps/meteor/client/views/omnichannel/directory/CallsContextualBarDirectory.tsx @@ -4,12 +4,12 @@ import { useRoute, useRouteParameter, useSearchParameter } from '@rocket.chat/ui import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; -import { Contextualbar } from '../../../components/Contextualbar'; -import { AsyncStatePhase } from '../../../hooks/useAsyncState'; -import { useEndpointData } from '../../../hooks/useEndpointData'; import Call from './calls/Call'; import { VoipInfo } from './calls/contextualBar/VoipInfo'; import { FormSkeleton } from './components/FormSkeleton'; +import { Contextualbar } from '../../../components/Contextualbar'; +import { AsyncStatePhase } from '../../../hooks/useAsyncState'; +import { useEndpointData } from '../../../hooks/useEndpointData'; const CallsContextualBarDirectory = () => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/directory/ChatsContextualBar.tsx b/apps/meteor/client/views/omnichannel/directory/ChatsContextualBar.tsx index 4c6752d4c89..7157aa9341c 100644 --- a/apps/meteor/client/views/omnichannel/directory/ChatsContextualBar.tsx +++ b/apps/meteor/client/views/omnichannel/directory/ChatsContextualBar.tsx @@ -3,6 +3,11 @@ import { useRoute, useRouteParameter } from '@rocket.chat/ui-contexts'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import Chat from './chats/Chat'; +import ChatInfoDirectory from './chats/contextualBar/ChatInfoDirectory'; +import { RoomEditWithData } from './chats/contextualBar/RoomEdit'; +import { FormSkeleton } from './components'; +import { useOmnichannelRoomInfo } from './hooks/useOmnichannelRoomInfo'; import { Contextualbar, ContextualbarHeader, @@ -11,11 +16,6 @@ import { ContextualbarAction, ContextualbarClose, } from '../../../components/Contextualbar'; -import Chat from './chats/Chat'; -import ChatInfoDirectory from './chats/contextualBar/ChatInfoDirectory'; -import { RoomEditWithData } from './chats/contextualBar/RoomEdit'; -import { FormSkeleton } from './components'; -import { useOmnichannelRoomInfo } from './hooks/useOmnichannelRoomInfo'; const ChatsContextualBar = ({ chatReload }: { chatReload?: () => void }) => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/directory/ContactContextualBar.tsx b/apps/meteor/client/views/omnichannel/directory/ContactContextualBar.tsx index 0d05d3b724f..ef8a84b992b 100644 --- a/apps/meteor/client/views/omnichannel/directory/ContactContextualBar.tsx +++ b/apps/meteor/client/views/omnichannel/directory/ContactContextualBar.tsx @@ -2,6 +2,9 @@ import { useRoute, useRouteParameter } from '@rocket.chat/ui-contexts'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import ContactInfo from './contacts/contactInfo/ContactInfo'; +import EditContactInfo from './contacts/contactInfo/EditContactInfo'; +import EditContactInfoWithData from './contacts/contactInfo/EditContactInfoWithData'; import { Contextualbar, ContextualbarHeader, @@ -9,9 +12,6 @@ import { ContextualbarTitle, ContextualbarClose, } from '../../../components/Contextualbar'; -import ContactInfo from './contacts/contactInfo/ContactInfo'; -import EditContactInfo from './contacts/contactInfo/EditContactInfo'; -import EditContactInfoWithData from './contacts/contactInfo/EditContactInfoWithData'; const HEADER_OPTIONS = { new: { icon: 'user', title: 'New_contact' }, diff --git a/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryPage.tsx b/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryPage.tsx index dff1cd467b0..e7ad4d38cfe 100644 --- a/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryPage.tsx +++ b/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryPage.tsx @@ -2,13 +2,13 @@ import { Tabs } from '@rocket.chat/fuselage'; import { useRouteParameter, useTranslation, useRouter } from '@rocket.chat/ui-contexts'; import React, { useEffect, useCallback } from 'react'; -import { ContextualbarDialog } from '../../../components/Contextualbar'; -import { Page, PageHeader, PageContent } from '../../../components/Page'; -import { queryClient } from '../../../lib/queryClient'; import ContextualBarRouter from './ContextualBarRouter'; import CallTab from './calls/CallTab'; import ChatTab from './chats/ChatTab'; import ContactTab from './contacts/ContactTab'; +import { ContextualbarDialog } from '../../../components/Contextualbar'; +import { Page, PageHeader, PageContent } from '../../../components/Page'; +import { queryClient } from '../../../lib/queryClient'; const DEFAULT_TAB = 'contacts'; diff --git a/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryRouter.tsx b/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryRouter.tsx index 3061db9f18e..2bb1d136511 100644 --- a/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryRouter.tsx +++ b/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryRouter.tsx @@ -1,8 +1,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import React from 'react'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import OmnichannelDirectoryPage from './OmnichannelDirectoryPage'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; const OmnichannelDirectoryRouter = () => { const canViewDirectory = usePermission('view-omnichannel-contact-center'); diff --git a/apps/meteor/client/views/omnichannel/directory/calls/CallTab.tsx b/apps/meteor/client/views/omnichannel/directory/calls/CallTab.tsx index 3014753c552..aef7ed7ae64 100644 --- a/apps/meteor/client/views/omnichannel/directory/calls/CallTab.tsx +++ b/apps/meteor/client/views/omnichannel/directory/calls/CallTab.tsx @@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; -import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage'; import CallTable from './CallTable'; +import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage'; // TODO Check if I need to type the setstateaction params, if I should do: // { setCallReload: Dispatch void) => void>> } diff --git a/apps/meteor/client/views/omnichannel/directory/calls/CallTable.tsx b/apps/meteor/client/views/omnichannel/directory/calls/CallTable.tsx index b315d7aa88e..b71341db8b1 100644 --- a/apps/meteor/client/views/omnichannel/directory/calls/CallTable.tsx +++ b/apps/meteor/client/views/omnichannel/directory/calls/CallTable.tsx @@ -4,6 +4,7 @@ import { useRoute, useTranslation, useEndpoint, useUserId } from '@rocket.chat/u import { useQuery, hashQueryKey } from '@tanstack/react-query'; import React, { useState, useMemo } from 'react'; +import { CallTableRow } from './CallTableRow'; import FilterByText from '../../../../components/FilterByText'; import GenericNoResults from '../../../../components/GenericNoResults/GenericNoResults'; import { @@ -15,7 +16,6 @@ import { } from '../../../../components/GenericTable'; import { usePagination } from '../../../../components/GenericTable/hooks/usePagination'; import { useSort } from '../../../../components/GenericTable/hooks/useSort'; -import { CallTableRow } from './CallTableRow'; const CallTable = () => { const t = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/CallsContextualBarRoom.tsx b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/CallsContextualBarRoom.tsx index 2e5e2cb5f69..3f7ceb355da 100644 --- a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/CallsContextualBarRoom.tsx +++ b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/CallsContextualBarRoom.tsx @@ -1,8 +1,8 @@ import React from 'react'; +import { VoipInfo } from './VoipInfo'; import { useVoipRoom } from '../../../../room/contexts/RoomContext'; import { useRoomToolbox } from '../../../../room/contexts/RoomToolboxContext'; -import { VoipInfo } from './VoipInfo'; // Contextual Bar for room view const VoipInfoWithData = () => { diff --git a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx index 75f6d1d5c3b..fa63816c4d9 100644 --- a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx +++ b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx @@ -6,6 +6,8 @@ import type { ReactElement } from 'react'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import { InfoField } from './InfoField'; +import { VoipInfoCallButton } from './VoipInfoCallButton'; import { ContextualbarIcon, ContextualbarHeader, @@ -20,8 +22,6 @@ import { useIsCallReady } from '../../../../../contexts/CallContext'; import { parseOutboundPhoneNumber } from '../../../../../lib/voip/parseOutboundPhoneNumber'; import AgentInfoDetails from '../../../components/AgentInfoDetails'; import AgentField from '../../components/AgentField'; -import { InfoField } from './InfoField'; -import { VoipInfoCallButton } from './VoipInfoCallButton'; type VoipInfoPropsType = { room: IVoipRoom; diff --git a/apps/meteor/client/views/omnichannel/directory/chats/ChatTab.tsx b/apps/meteor/client/views/omnichannel/directory/chats/ChatTab.tsx index bcc3648d486..6a66bbb4ceb 100644 --- a/apps/meteor/client/views/omnichannel/directory/chats/ChatTab.tsx +++ b/apps/meteor/client/views/omnichannel/directory/chats/ChatTab.tsx @@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; -import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage'; import ChatTable from './ChatTable'; +import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage'; const ChatTab = (): ReactElement => { const hasAccess = usePermission('view-l-room'); diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/ChatInfo.tsx b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/ChatInfo.tsx index e3f76e3adf5..887ab156174 100644 --- a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/ChatInfo.tsx +++ b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/ChatInfo.tsx @@ -7,6 +7,8 @@ import { Meteor } from 'meteor/meteor'; import moment from 'moment'; import React, { useEffect, useMemo, useState } from 'react'; +import DepartmentField from './DepartmentField'; +import VisitorClientInfo from './VisitorClientInfo'; import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../../../components/Contextualbar'; import { InfoPanelField, InfoPanelLabel, InfoPanelText } from '../../../../../components/InfoPanel'; import MarkdownText from '../../../../../components/MarkdownText'; @@ -18,8 +20,6 @@ import { AgentField, SlaField, ContactField, SourceField } from '../../component import PriorityField from '../../components/PriorityField'; import { useOmnichannelRoomInfo } from '../../hooks/useOmnichannelRoomInfo'; import { formatQueuedAt } from '../../utils/formatQueuedAt'; -import DepartmentField from './DepartmentField'; -import VisitorClientInfo from './VisitorClientInfo'; type ChatInfoProps = { id: string; diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/ChatInfoDirectory.tsx b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/ChatInfoDirectory.tsx index b2bd58bed8f..7882211cdde 100644 --- a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/ChatInfoDirectory.tsx +++ b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/ChatInfoDirectory.tsx @@ -8,6 +8,8 @@ import moment from 'moment'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; +import DepartmentField from './DepartmentField'; +import VisitorClientInfo from './VisitorClientInfo'; import { hasPermission } from '../../../../../../app/authorization/client'; import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../../../components/Contextualbar'; import { InfoPanelField, InfoPanelLabel, InfoPanelText } from '../../../../../components/InfoPanel'; @@ -19,8 +21,6 @@ import CustomField from '../../../components/CustomField'; import { AgentField, ContactField, SlaField } from '../../components'; import PriorityField from '../../components/PriorityField'; import { formatQueuedAt } from '../../utils/formatQueuedAt'; -import DepartmentField from './DepartmentField'; -import VisitorClientInfo from './VisitorClientInfo'; type ChatInfoDirectoryProps = { id: string; diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/ChatsContextualBar.tsx b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/ChatsContextualBar.tsx index 7c119982aac..66be9c6d843 100644 --- a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/ChatsContextualBar.tsx +++ b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/ChatsContextualBar.tsx @@ -2,11 +2,11 @@ import { useRoute, useRouteParameter } from '@rocket.chat/ui-contexts'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import ChatInfo from './ChatInfo'; +import { RoomEditWithData } from './RoomEdit'; import { ContextualbarHeader, ContextualbarIcon, ContextualbarTitle, ContextualbarClose } from '../../../../../components/Contextualbar'; import { useRoom } from '../../../../room/contexts/RoomContext'; import { useRoomToolbox } from '../../../../room/contexts/RoomToolboxContext'; -import ChatInfo from './ChatInfo'; -import { RoomEditWithData } from './RoomEdit'; const PATH = 'live'; diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEditWithData.tsx b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEditWithData.tsx index e2c053fe90a..0365e757498 100644 --- a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEditWithData.tsx +++ b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEditWithData.tsx @@ -2,10 +2,10 @@ import { Box } from '@rocket.chat/fuselage'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import RoomEdit from './RoomEdit'; import { FormSkeleton } from '../../../components'; import { useOmnichannelRoomInfo } from '../../../hooks/useOmnichannelRoomInfo'; import { useVisitorInfo } from '../../../hooks/useVisitorInfo'; -import RoomEdit from './RoomEdit'; type RoomEditWithDataProps = { id: string; diff --git a/apps/meteor/client/views/omnichannel/directory/components/AgentField.tsx b/apps/meteor/client/views/omnichannel/directory/components/AgentField.tsx index 51287734873..9fe9d5d84c6 100644 --- a/apps/meteor/client/views/omnichannel/directory/components/AgentField.tsx +++ b/apps/meteor/client/views/omnichannel/directory/components/AgentField.tsx @@ -5,12 +5,12 @@ import { useQuery } from '@tanstack/react-query'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import { FormSkeleton } from './FormSkeleton'; import { UserStatus } from '../../../../components/UserStatus'; import AgentInfoDetails from '../../components/AgentInfoDetails'; import Field from '../../components/Field'; import Info from '../../components/Info'; import Label from '../../components/Label'; -import { FormSkeleton } from './FormSkeleton'; type AgentFieldProps = { agent: IOmnichannelRoom['servedBy']; diff --git a/apps/meteor/client/views/omnichannel/directory/components/ContactField.tsx b/apps/meteor/client/views/omnichannel/directory/components/ContactField.tsx index 70ad5efaeaf..94e678d8c8e 100644 --- a/apps/meteor/client/views/omnichannel/directory/components/ContactField.tsx +++ b/apps/meteor/client/views/omnichannel/directory/components/ContactField.tsx @@ -5,13 +5,13 @@ import { useQuery } from '@tanstack/react-query'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import { FormSkeleton } from './FormSkeleton'; import { UserStatus } from '../../../../components/UserStatus'; import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator'; import AgentInfoDetails from '../../components/AgentInfoDetails'; import Field from '../../components/Field'; import Info from '../../components/Info'; import Label from '../../components/Label'; -import { FormSkeleton } from './FormSkeleton'; type ContactFieldProps = { contact: IVisitor; diff --git a/apps/meteor/client/views/omnichannel/directory/components/PriorityField.tsx b/apps/meteor/client/views/omnichannel/directory/components/PriorityField.tsx index 86ca44762d4..4a194565784 100644 --- a/apps/meteor/client/views/omnichannel/directory/components/PriorityField.tsx +++ b/apps/meteor/client/views/omnichannel/directory/components/PriorityField.tsx @@ -2,11 +2,11 @@ import { Box } from '@rocket.chat/fuselage'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import { FormSkeleton } from './FormSkeleton'; import Field from '../../components/Field'; import Info from '../../components/Info'; import Label from '../../components/Label'; import { usePriorityInfo } from '../hooks/usePriorityInfo'; -import { FormSkeleton } from './FormSkeleton'; type PriorityFieldProps = { id: string; diff --git a/apps/meteor/client/views/omnichannel/directory/components/SlaField.tsx b/apps/meteor/client/views/omnichannel/directory/components/SlaField.tsx index 7b029d73403..3cbb016b1e6 100644 --- a/apps/meteor/client/views/omnichannel/directory/components/SlaField.tsx +++ b/apps/meteor/client/views/omnichannel/directory/components/SlaField.tsx @@ -2,11 +2,11 @@ import { Box } from '@rocket.chat/fuselage'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import { FormSkeleton } from './FormSkeleton'; import Field from '../../components/Field'; import Info from '../../components/Info'; import Label from '../../components/Label'; import { useSlaInfo } from '../hooks/useSlaInfo'; -import { FormSkeleton } from './FormSkeleton'; type SlaFieldProps = { id: string; diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/ContactTab.tsx b/apps/meteor/client/views/omnichannel/directory/contacts/ContactTab.tsx index 6942a33afc3..0ef8f0050c1 100644 --- a/apps/meteor/client/views/omnichannel/directory/contacts/ContactTab.tsx +++ b/apps/meteor/client/views/omnichannel/directory/contacts/ContactTab.tsx @@ -1,8 +1,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import React from 'react'; -import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage'; import ContactTable from './ContactTable'; +import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage'; const ContactTab = () => { const hasAccess = usePermission('view-l-room'); diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/contactInfo/ContactInfoRouter.tsx b/apps/meteor/client/views/omnichannel/directory/contacts/contactInfo/ContactInfoRouter.tsx index 58afecea292..811179339ed 100644 --- a/apps/meteor/client/views/omnichannel/directory/contacts/contactInfo/ContactInfoRouter.tsx +++ b/apps/meteor/client/views/omnichannel/directory/contacts/contactInfo/ContactInfoRouter.tsx @@ -2,11 +2,11 @@ import { useRoute, useRouteParameter } from '@rocket.chat/ui-contexts'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import ContactInfo from './ContactInfo'; +import ContactEditWithData from './EditContactInfoWithData'; import { ContextualbarHeader, ContextualbarIcon, ContextualbarTitle, ContextualbarClose } from '../../../../../components/Contextualbar'; import { useOmnichannelRoom } from '../../../../room/contexts/RoomContext'; import { useRoomToolbox } from '../../../../room/contexts/RoomToolboxContext'; -import ContactInfo from './ContactInfo'; -import ContactEditWithData from './EditContactInfoWithData'; const PATH = 'live'; diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/contactInfo/EditContactInfoWithData.tsx b/apps/meteor/client/views/omnichannel/directory/contacts/contactInfo/EditContactInfoWithData.tsx index d65f8405590..7853e4c640c 100644 --- a/apps/meteor/client/views/omnichannel/directory/contacts/contactInfo/EditContactInfoWithData.tsx +++ b/apps/meteor/client/views/omnichannel/directory/contacts/contactInfo/EditContactInfoWithData.tsx @@ -4,8 +4,8 @@ import { useQuery } from '@tanstack/react-query'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { FormSkeleton } from '../../components/FormSkeleton'; import EditContactInfo from './EditContactInfo'; +import { FormSkeleton } from '../../components/FormSkeleton'; const EditContactInfoWithData = ({ id, onCancel }: { id: string; onCancel: () => void; onClose?: () => void }) => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/installation/Installation.tsx b/apps/meteor/client/views/omnichannel/installation/Installation.tsx index 734b3a5bb88..b8a1c658fcc 100644 --- a/apps/meteor/client/views/omnichannel/installation/Installation.tsx +++ b/apps/meteor/client/views/omnichannel/installation/Installation.tsx @@ -4,10 +4,10 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import Wrapper from './Wrapper'; import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; import RawText from '../../../components/RawText'; import TextCopy from '../../../components/TextCopy'; -import Wrapper from './Wrapper'; // TODO: use `CodeSnippet` Component const Installation = (): ReactElement => { diff --git a/apps/meteor/client/views/omnichannel/managers/ManagersRoute.tsx b/apps/meteor/client/views/omnichannel/managers/ManagersRoute.tsx index 6cf8d6554d5..8d93e2954c9 100644 --- a/apps/meteor/client/views/omnichannel/managers/ManagersRoute.tsx +++ b/apps/meteor/client/views/omnichannel/managers/ManagersRoute.tsx @@ -3,9 +3,9 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import ManagersTable from './ManagersTable'; import { Page, PageHeader, PageContent } from '../../../components/Page'; import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; -import ManagersTable from './ManagersTable'; const ManagersRoute = (): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/managers/ManagersTable.tsx b/apps/meteor/client/views/omnichannel/managers/ManagersTable.tsx index a947447d5c2..08be100fa0d 100644 --- a/apps/meteor/client/views/omnichannel/managers/ManagersTable.tsx +++ b/apps/meteor/client/views/omnichannel/managers/ManagersTable.tsx @@ -5,6 +5,8 @@ import { useTranslation, useEndpoint } from '@rocket.chat/ui-contexts'; import { hashQueryKey, useQuery } from '@tanstack/react-query'; import React, { useMemo, useState } from 'react'; +import AddManager from './AddManager'; +import RemoveManagerButton from './RemoveManagerButton'; import FilterByText from '../../../components/FilterByText'; import GenericNoResults from '../../../components/GenericNoResults/GenericNoResults'; import { @@ -18,8 +20,6 @@ import { } from '../../../components/GenericTable'; import { usePagination } from '../../../components/GenericTable/hooks/usePagination'; import { useSort } from '../../../components/GenericTable/hooks/useSort'; -import AddManager from './AddManager'; -import RemoveManagerButton from './RemoveManagerButton'; // TODO: Missing error state const ManagersTable = () => { diff --git a/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx b/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx index 63b62b85e64..3aee6f8e87a 100644 --- a/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx +++ b/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { useTranslation } from 'react-i18next'; -import { Page, PageHeader, PageContent } from '../../../components/Page'; import QueueListTable from './QueueListTable'; +import { Page, PageHeader, PageContent } from '../../../components/Page'; const QueueListPage = () => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/queueList/QueueListTable.tsx b/apps/meteor/client/views/omnichannel/queueList/QueueListTable.tsx index b6508658e52..88ff5a6f666 100644 --- a/apps/meteor/client/views/omnichannel/queueList/QueueListTable.tsx +++ b/apps/meteor/client/views/omnichannel/queueList/QueueListTable.tsx @@ -7,6 +7,7 @@ import { useQuery } from '@tanstack/react-query'; import type { ReactElement } from 'react'; import React, { useMemo, useState } from 'react'; +import { QueueListFilter } from './QueueListFilter'; import GenericNoResults from '../../../components/GenericNoResults'; import { GenericTable, @@ -19,7 +20,6 @@ import { } from '../../../components/GenericTable'; import { usePagination } from '../../../components/GenericTable/hooks/usePagination'; import { useSort } from '../../../components/GenericTable/hooks/useSort'; -import { QueueListFilter } from './QueueListFilter'; const QueueListTable = (): ReactElement => { const t = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx index 32dc4fbc5f0..fe69a36fd42 100644 --- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx +++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx @@ -7,11 +7,11 @@ import type { ComponentPropsWithoutRef, MutableRefObject } from 'react'; import React, { useRef, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; +import Chart from './Chart'; +import { useUpdateChartData } from './useUpdateChartData'; import { drawDoughnutChart } from '../../../../../app/livechat/client/lib/chartHandler'; import { AsyncStatePhase } from '../../../../hooks/useAsyncState'; import { useEndpointData } from '../../../../hooks/useEndpointData'; -import Chart from './Chart'; -import { useUpdateChartData } from './useUpdateChartData'; const labels = ['Available', 'Away', 'Busy', 'Offline']; diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatDurationChart.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatDurationChart.tsx index 02180c85761..0c96f0e5cf1 100644 --- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatDurationChart.tsx +++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatDurationChart.tsx @@ -6,14 +6,14 @@ import type { ComponentPropsWithoutRef, MutableRefObject } from 'react'; import React, { useRef, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; -import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler'; -import { secondsToHHMMSS } from '../../../../../lib/utils/secondsToHHMMSS'; -import { AsyncStatePhase } from '../../../../hooks/useAsyncState'; -import { useEndpointData } from '../../../../hooks/useEndpointData'; import Chart from './Chart'; import { getMomentChartLabelsAndData } from './getMomentChartLabelsAndData'; import { getMomentCurrentLabel } from './getMomentCurrentLabel'; import { useUpdateChartData } from './useUpdateChartData'; +import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler'; +import { secondsToHHMMSS } from '../../../../../lib/utils/secondsToHHMMSS'; +import { AsyncStatePhase } from '../../../../hooks/useAsyncState'; +import { useEndpointData } from '../../../../hooks/useEndpointData'; const [labels, initialData] = getMomentChartLabelsAndData(); const tooltipCallbacks = { diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx index 15a8eb2ddce..7ab01b247e5 100644 --- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx +++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx @@ -7,11 +7,11 @@ import type { ComponentPropsWithoutRef, MutableRefObject } from 'react'; import React, { useRef, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; +import Chart from './Chart'; +import { useUpdateChartData } from './useUpdateChartData'; import { drawDoughnutChart } from '../../../../../app/livechat/client/lib/chartHandler'; import { AsyncStatePhase } from '../../../../hooks/useAsyncState'; import { useEndpointData } from '../../../../hooks/useEndpointData'; -import Chart from './Chart'; -import { useUpdateChartData } from './useUpdateChartData'; const labels = ['Open', 'Queued', 'On_Hold_Chats', 'Closed']; diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerAgentChart.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerAgentChart.tsx index 89433d2b48b..7483291997a 100644 --- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerAgentChart.tsx +++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerAgentChart.tsx @@ -6,11 +6,11 @@ import type { ComponentPropsWithoutRef, MutableRefObject } from 'react'; import React, { useRef, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; +import Chart from './Chart'; +import { useUpdateChartData } from './useUpdateChartData'; import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler'; import { AsyncStatePhase } from '../../../../hooks/useAsyncState'; import { useEndpointData } from '../../../../hooks/useEndpointData'; -import Chart from './Chart'; -import { useUpdateChartData } from './useUpdateChartData'; const init = (canvas: HTMLCanvasElement, context: chartjs.Chart<'line'> | undefined, t: TFunction) => drawLineChart(canvas, context, [t('Open'), t('Closed'), t('On_Hold_Chats')], [], [[], []], { diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerDepartmentChart.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerDepartmentChart.tsx index c2cdbcb3290..5f978945241 100644 --- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerDepartmentChart.tsx +++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerDepartmentChart.tsx @@ -6,11 +6,11 @@ import type { MutableRefObject, ComponentPropsWithoutRef } from 'react'; import React, { useRef, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; +import Chart from './Chart'; +import { useUpdateChartData } from './useUpdateChartData'; import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler'; import { AsyncStatePhase } from '../../../../hooks/useAsyncState'; import { useEndpointData } from '../../../../hooks/useEndpointData'; -import Chart from './Chart'; -import { useUpdateChartData } from './useUpdateChartData'; const init = (canvas: HTMLCanvasElement, context: chartjs.Chart<'line'> | undefined, t: TFunction) => drawLineChart(canvas, context, [t('Open'), t('Closed')], [], [[], []], { diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ResponseTimesChart.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ResponseTimesChart.tsx index 008c0bc3a1a..717a046a83a 100644 --- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ResponseTimesChart.tsx +++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ResponseTimesChart.tsx @@ -6,14 +6,14 @@ import type { MutableRefObject, ComponentPropsWithoutRef } from 'react'; import React, { useRef, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; -import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler'; -import { secondsToHHMMSS } from '../../../../../lib/utils/secondsToHHMMSS'; -import { AsyncStatePhase } from '../../../../hooks/useAsyncState'; -import { useEndpointData } from '../../../../hooks/useEndpointData'; import Chart from './Chart'; import { getMomentChartLabelsAndData } from './getMomentChartLabelsAndData'; import { getMomentCurrentLabel } from './getMomentCurrentLabel'; import { useUpdateChartData } from './useUpdateChartData'; +import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler'; +import { secondsToHHMMSS } from '../../../../../lib/utils/secondsToHHMMSS'; +import { AsyncStatePhase } from '../../../../hooks/useAsyncState'; +import { useEndpointData } from '../../../../hooks/useEndpointData'; const [labels, initialData] = getMomentChartLabelsAndData(); const tooltipCallbacks = { diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx index fbfb7d63971..cc3b82c2548 100644 --- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx +++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx @@ -5,9 +5,9 @@ import type { ComponentPropsWithoutRef } from 'react'; import React, { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { AsyncStatePhase } from '../../../../hooks/useAsyncState'; import CounterItem from './CounterItem'; import CounterRow from './CounterRow'; +import { AsyncStatePhase } from '../../../../hooks/useAsyncState'; export type DataType = { title: string; diff --git a/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx b/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx index dc87d001f08..8710f03e340 100644 --- a/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx +++ b/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx @@ -7,6 +7,8 @@ import React, { useMemo } from 'react'; import { Controller, useFieldArray, useForm } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; +import { ConditionForm } from './ConditionForm'; +import { ActionForm } from './actions/ActionForm'; import { ContextualbarScrollableContent, ContextualbarTitle, @@ -15,8 +17,6 @@ import { ContextualbarHeader, ContextualbarClose, } from '../../../components/Contextualbar'; -import { ConditionForm } from './ConditionForm'; -import { ActionForm } from './actions/ActionForm'; export type TriggersPayload = { name: string; diff --git a/apps/meteor/client/views/omnichannel/triggers/EditTriggerWithData.tsx b/apps/meteor/client/views/omnichannel/triggers/EditTriggerWithData.tsx index bf8196fc733..5bb3d2dd713 100644 --- a/apps/meteor/client/views/omnichannel/triggers/EditTriggerWithData.tsx +++ b/apps/meteor/client/views/omnichannel/triggers/EditTriggerWithData.tsx @@ -5,8 +5,8 @@ import { useQuery } from '@tanstack/react-query'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { ContextualbarSkeleton } from '../../../components/Contextualbar'; import EditTrigger from './EditTrigger'; +import { ContextualbarSkeleton } from '../../../components/Contextualbar'; const EditTriggerWithData = ({ triggerId }: { triggerId: ILivechatTrigger['_id'] }) => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/triggers/TriggersPage.tsx b/apps/meteor/client/views/omnichannel/triggers/TriggersPage.tsx index d4df4386ae8..2ccbd28d91c 100644 --- a/apps/meteor/client/views/omnichannel/triggers/TriggersPage.tsx +++ b/apps/meteor/client/views/omnichannel/triggers/TriggersPage.tsx @@ -3,11 +3,11 @@ import { useRouteParameter, useRouter } from '@rocket.chat/ui-contexts'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { ContextualbarDialog } from '../../../components/Contextualbar'; -import { Page, PageHeader, PageContent } from '../../../components/Page'; import EditTrigger from './EditTrigger'; import EditTriggerWithData from './EditTriggerWithData'; import TriggersTable from './TriggersTable'; +import { ContextualbarDialog } from '../../../components/Contextualbar'; +import { Page, PageHeader, PageContent } from '../../../components/Page'; const TriggersPage = () => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/triggers/TriggersRoute.tsx b/apps/meteor/client/views/omnichannel/triggers/TriggersRoute.tsx index 7cf2d06bd3b..f9a00de9699 100644 --- a/apps/meteor/client/views/omnichannel/triggers/TriggersRoute.tsx +++ b/apps/meteor/client/views/omnichannel/triggers/TriggersRoute.tsx @@ -1,8 +1,8 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import React from 'react'; -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; import TriggersPage from './TriggersPage'; +import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; const TriggersRoute = () => { const canViewTriggers = usePermission('view-livechat-triggers'); diff --git a/apps/meteor/client/views/omnichannel/triggers/TriggersTable.tsx b/apps/meteor/client/views/omnichannel/triggers/TriggersTable.tsx index b4e30085429..7587bb18c7b 100644 --- a/apps/meteor/client/views/omnichannel/triggers/TriggersTable.tsx +++ b/apps/meteor/client/views/omnichannel/triggers/TriggersTable.tsx @@ -4,6 +4,7 @@ import { useTranslation, useEndpoint, useRouter } from '@rocket.chat/ui-contexts import { useQuery, hashQueryKey } from '@tanstack/react-query'; import React, { useMemo, useState } from 'react'; +import TriggersRow from './TriggersRow'; import GenericError from '../../../components/GenericError'; import GenericNoResults from '../../../components/GenericNoResults'; import { @@ -14,7 +15,6 @@ import { GenericTableLoadingRow, } from '../../../components/GenericTable'; import { usePagination } from '../../../components/GenericTable/hooks/usePagination'; -import TriggersRow from './TriggersRow'; const TriggersTable = () => { const t = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/webhooks/WebhooksPageContainer.tsx b/apps/meteor/client/views/omnichannel/webhooks/WebhooksPageContainer.tsx index 8d9d0ffd05b..c5258ef3ffe 100644 --- a/apps/meteor/client/views/omnichannel/webhooks/WebhooksPageContainer.tsx +++ b/apps/meteor/client/views/omnichannel/webhooks/WebhooksPageContainer.tsx @@ -5,10 +5,10 @@ import { useQuery } from '@tanstack/react-query'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import WebhooksPage from './WebhooksPage'; import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page'; import PageSkeleton from '../../../components/PageSkeleton'; import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; -import WebhooksPage from './WebhooksPage'; const reduceSettings = (settings: Serialized[]) => settings.reduce>((acc, { _id, value }) => { diff --git a/apps/meteor/client/views/outlookCalendar/OutlookCalendarEventModal.tsx b/apps/meteor/client/views/outlookCalendar/OutlookCalendarEventModal.tsx index 98038271760..2c11d08ab09 100644 --- a/apps/meteor/client/views/outlookCalendar/OutlookCalendarEventModal.tsx +++ b/apps/meteor/client/views/outlookCalendar/OutlookCalendarEventModal.tsx @@ -3,10 +3,10 @@ import { useQuery } from '@tanstack/react-query'; import type { ComponentProps } from 'react'; import React from 'react'; -import GenericModal from '../../components/GenericModal'; -import GenericModalSkeleton from '../../components/GenericModal/GenericModalSkeleton'; import OutlookEventItemContent from './OutlookEventsList/OutlookEventItemContent'; import { useOutlookOpenCall } from './hooks/useOutlookOpenCall'; +import GenericModal from '../../components/GenericModal'; +import GenericModalSkeleton from '../../components/GenericModal/GenericModalSkeleton'; type OutlookCalendarEventModalProps = ComponentProps & { id?: string; diff --git a/apps/meteor/client/views/outlookCalendar/OutlookEventsList/OutlookEventsList.tsx b/apps/meteor/client/views/outlookCalendar/OutlookEventsList/OutlookEventsList.tsx index dfc3f5cc8c9..8cef3107f85 100644 --- a/apps/meteor/client/views/outlookCalendar/OutlookEventsList/OutlookEventsList.tsx +++ b/apps/meteor/client/views/outlookCalendar/OutlookEventsList/OutlookEventsList.tsx @@ -5,6 +5,7 @@ import type { ReactElement } from 'react'; import React from 'react'; import { Virtuoso } from 'react-virtuoso'; +import OutlookEventItem from './OutlookEventItem'; import { ContextualbarHeader, ContextualbarIcon, @@ -19,7 +20,6 @@ import { getErrorMessage } from '../../../lib/errorHandling'; import { useOutlookAuthentication } from '../hooks/useOutlookAuthentication'; import { useMutationOutlookCalendarSync, useOutlookCalendarListForToday } from '../hooks/useOutlookCalendarList'; import { NotOnDesktopError } from '../lib/NotOnDesktopError'; -import OutlookEventItem from './OutlookEventItem'; type OutlookEventsListProps = { onClose: () => void; diff --git a/apps/meteor/client/views/outlookCalendar/OutlookEventsRoute.tsx b/apps/meteor/client/views/outlookCalendar/OutlookEventsRoute.tsx index 334c0763f92..435d857f880 100644 --- a/apps/meteor/client/views/outlookCalendar/OutlookEventsRoute.tsx +++ b/apps/meteor/client/views/outlookCalendar/OutlookEventsRoute.tsx @@ -1,8 +1,8 @@ import React, { useState } from 'react'; -import { useRoomToolbox } from '../room/contexts/RoomToolboxContext'; import OutlookEventsList from './OutlookEventsList'; import OutlookSettingsList from './OutlookSettingsList'; +import { useRoomToolbox } from '../room/contexts/RoomToolboxContext'; type OutlookCalendarRoutes = 'list' | 'settings'; diff --git a/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingsList.tsx b/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingsList.tsx index 3ceb891d7f9..bf871597257 100644 --- a/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingsList.tsx +++ b/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingsList.tsx @@ -3,6 +3,7 @@ import { useTranslation, useUserPreference, useEndpoint, useToastMessageDispatch import type { ReactElement } from 'react'; import React, { useCallback } from 'react'; +import OutlookSettingItem from './OutlookSettingItem'; import { ContextualbarHeader, ContextualbarIcon, @@ -12,7 +13,6 @@ import { ContextualbarFooter, } from '../../../components/Contextualbar'; import { useOutlookAuthentication, useOutlookAuthenticationMutationLogout } from '../hooks/useOutlookAuthentication'; -import OutlookSettingItem from './OutlookSettingItem'; type OutlookSettingsListProps = { onClose: () => void; diff --git a/apps/meteor/client/views/outlookCalendar/hooks/useOutlookCalendarList.ts b/apps/meteor/client/views/outlookCalendar/hooks/useOutlookCalendarList.ts index 35c33b24e25..980d087a237 100644 --- a/apps/meteor/client/views/outlookCalendar/hooks/useOutlookCalendarList.ts +++ b/apps/meteor/client/views/outlookCalendar/hooks/useOutlookCalendarList.ts @@ -1,8 +1,8 @@ import { useToastMessageDispatch, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts'; import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; -import { syncOutlookEvents } from '../lib/syncOutlookEvents'; import { useOutlookAuthenticationMutation } from './useOutlookAuthentication'; +import { syncOutlookEvents } from '../lib/syncOutlookEvents'; export const useOutlookCalendarListForToday = () => { return useOutlookCalendarList(new Date()); diff --git a/apps/meteor/client/views/room/Announcement/Announcement.tsx b/apps/meteor/client/views/room/Announcement/Announcement.tsx index 392ea45fff5..c583d09c022 100644 --- a/apps/meteor/client/views/room/Announcement/Announcement.tsx +++ b/apps/meteor/client/views/room/Announcement/Announcement.tsx @@ -5,9 +5,9 @@ import type { MouseEvent } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import AnnouncementComponent from './AnnouncementComponent'; import GenericModal from '../../../components/GenericModal'; import MarkdownText from '../../../components/MarkdownText'; -import AnnouncementComponent from './AnnouncementComponent'; type AnnouncementProps = { announcement: string; diff --git a/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx b/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx index 7a9ca677247..88ef05fd7e5 100644 --- a/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx +++ b/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx @@ -3,6 +3,7 @@ import { Accounts } from 'meteor/accounts-base'; import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; +import RoomE2EENotAllowed from './RoomE2EENotAllowed'; import { e2e } from '../../../../app/e2e/client'; import { E2EEState } from '../../../../app/e2e/client/E2EEState'; import { E2ERoomState } from '../../../../app/e2e/client/E2ERoomState'; @@ -11,7 +12,6 @@ import RoomBodyV2 from '../body/RoomBodyV2'; import { useRoom } from '../contexts/RoomContext'; import { useE2EERoomState } from '../hooks/useE2EERoomState'; import { useE2EEState } from '../hooks/useE2EEState'; -import RoomE2EENotAllowed from './RoomE2EENotAllowed'; const RoomE2EESetup = () => { const room = useRoom(); diff --git a/apps/meteor/client/views/room/Header/DirectRoomHeader.tsx b/apps/meteor/client/views/room/Header/DirectRoomHeader.tsx index 524eb8d2e52..6446e345534 100644 --- a/apps/meteor/client/views/room/Header/DirectRoomHeader.tsx +++ b/apps/meteor/client/views/room/Header/DirectRoomHeader.tsx @@ -3,8 +3,8 @@ import { useUserId } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; -import { usePresence } from '../../../hooks/usePresence'; import RoomHeader from './RoomHeader'; +import { usePresence } from '../../../hooks/usePresence'; type DirectRoomHeaderProps = { room: IRoom; diff --git a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx index f3b7ef7562d..d3ca9d5bd75 100644 --- a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx +++ b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx @@ -3,10 +3,10 @@ import type { ComponentProps } from 'react'; import React, { memo } from 'react'; import { useTranslation } from 'react-i18next'; -import { HeaderToolbar, HeaderToolbarAction, HeaderToolbarDivider } from '../../../../../components/Header'; -import { useOmnichannelRoom } from '../../../contexts/RoomContext'; import QuickActionOptions from './QuickActionOptions'; import { useQuickActions } from './hooks/useQuickActions'; +import { HeaderToolbar, HeaderToolbarAction, HeaderToolbarDivider } from '../../../../../components/Header'; +import { useOmnichannelRoom } from '../../../contexts/RoomContext'; type QuickActionsProps = { className?: ComponentProps['className']; @@ -33,10 +33,10 @@ const QuickActions = ({ className }: QuickActionsProps) => { }; if (options) { - return ; + return ; } - return ; + return ; })} {quickActions.length > 0 && } diff --git a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/useQuickActions.tsx b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/useQuickActions.tsx index ff98530265d..c5fd6c51d0c 100644 --- a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/useQuickActions.tsx +++ b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/useQuickActions.tsx @@ -14,8 +14,10 @@ import { } from '@rocket.chat/ui-contexts'; import React, { useCallback, useState, useEffect } from 'react'; -import PlaceChatOnHoldModal from '../../../../../../../app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal'; +import { usePutChatOnHoldMutation } from './usePutChatOnHoldMutation'; +import { useReturnChatToQueueMutation } from './useReturnChatToQueueMutation'; import { LivechatInquiry } from '../../../../../../../app/livechat/client/collections/LivechatInquiry'; +import PlaceChatOnHoldModal from '../../../../../../../app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal'; import { LegacyRoomManager } from '../../../../../../../app/ui-utils/client'; import CloseChatModal from '../../../../../../components/Omnichannel/modals/CloseChatModal'; import CloseChatModalData from '../../../../../../components/Omnichannel/modals/CloseChatModalData'; @@ -29,8 +31,6 @@ import { quickActionHooks } from '../../../../../../ui'; import { useOmnichannelRoom } from '../../../../contexts/RoomContext'; import type { QuickActionsActionConfig } from '../../../../lib/quickActions'; import { QuickActionsEnum } from '../../../../lib/quickActions'; -import { usePutChatOnHoldMutation } from './usePutChatOnHoldMutation'; -import { useReturnChatToQueueMutation } from './useReturnChatToQueueMutation'; export const useQuickActions = (): { quickActions: QuickActionsActionConfig[]; diff --git a/apps/meteor/client/views/room/Header/ParentRoomWithEndpointData.tsx b/apps/meteor/client/views/room/Header/ParentRoomWithEndpointData.tsx index 06571dd02cc..27c397d06ce 100644 --- a/apps/meteor/client/views/room/Header/ParentRoomWithEndpointData.tsx +++ b/apps/meteor/client/views/room/Header/ParentRoomWithEndpointData.tsx @@ -2,9 +2,9 @@ import type { IRoom } from '@rocket.chat/core-typings'; import type { ReactElement } from 'react'; import React from 'react'; +import ParentRoom from './ParentRoom'; import { HeaderTagSkeleton } from '../../../components/Header'; import { useRoomInfoEndpoint } from '../../../hooks/useRoomInfoEndpoint'; -import ParentRoom from './ParentRoom'; type ParentRoomWithEndpointDataProps = { rid: IRoom['_id']; diff --git a/apps/meteor/client/views/room/Header/RoomHeader.tsx b/apps/meteor/client/views/room/Header/RoomHeader.tsx index 5d98d4a33f8..1ba0ca80cd6 100644 --- a/apps/meteor/client/views/room/Header/RoomHeader.tsx +++ b/apps/meteor/client/views/room/Header/RoomHeader.tsx @@ -4,8 +4,6 @@ import { RoomAvatar } from '@rocket.chat/ui-avatar'; import React, { Suspense } from 'react'; import { useTranslation } from 'react-i18next'; -import { Header, HeaderAvatar, HeaderContent, HeaderContentRow, HeaderSubtitle, HeaderToolbar } from '../../../components/Header'; -import MarkdownText from '../../../components/MarkdownText'; import FederatedRoomOriginServer from './FederatedRoomOriginServer'; import ParentRoomWithData from './ParentRoomWithData'; import ParentTeam from './ParentTeam'; @@ -14,6 +12,8 @@ import RoomToolbox from './RoomToolbox'; import Encrypted from './icons/Encrypted'; import Favorite from './icons/Favorite'; import Translate from './icons/Translate'; +import { Header, HeaderAvatar, HeaderContent, HeaderContentRow, HeaderSubtitle, HeaderToolbar } from '../../../components/Header'; +import MarkdownText from '../../../components/MarkdownText'; export type RoomHeaderProps = { room: IRoom; diff --git a/apps/meteor/client/views/room/Header/RoomHeaderE2EESetup.tsx b/apps/meteor/client/views/room/Header/RoomHeaderE2EESetup.tsx index c9bfe325be9..a40bf902469 100644 --- a/apps/meteor/client/views/room/Header/RoomHeaderE2EESetup.tsx +++ b/apps/meteor/client/views/room/Header/RoomHeaderE2EESetup.tsx @@ -1,11 +1,11 @@ import React, { lazy } from 'react'; +import RoomHeader from './RoomHeader'; +import type { RoomHeaderProps } from './RoomHeader'; import { E2EEState } from '../../../../app/e2e/client/E2EEState'; import { E2ERoomState } from '../../../../app/e2e/client/E2ERoomState'; import { useE2EERoomState } from '../hooks/useE2EERoomState'; import { useE2EEState } from '../hooks/useE2EEState'; -import RoomHeader from './RoomHeader'; -import type { RoomHeaderProps } from './RoomHeader'; const RoomToolboxE2EESetup = lazy(() => import('./RoomToolbox/RoomToolboxE2EESetup')); diff --git a/apps/meteor/client/views/room/Header/RoomTitle.tsx b/apps/meteor/client/views/room/Header/RoomTitle.tsx index 9a3e810a46b..b481586d733 100644 --- a/apps/meteor/client/views/room/Header/RoomTitle.tsx +++ b/apps/meteor/client/views/room/Header/RoomTitle.tsx @@ -4,9 +4,9 @@ import { useDocumentTitle } from '@rocket.chat/ui-client'; import type { KeyboardEvent, ReactElement } from 'react'; import React from 'react'; +import HeaderIconWithRoom from './HeaderIconWithRoom'; import { HeaderTitle, HeaderTitleButton } from '../../../components/Header'; import { useRoomToolbox } from '../contexts/RoomToolboxContext'; -import HeaderIconWithRoom from './HeaderIconWithRoom'; const RoomTitle = ({ room }: { room: IRoom }): ReactElement => { useDocumentTitle(room.name, false); diff --git a/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActions.tsx b/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActions.tsx index f3b7ef7562d..d3ca9d5bd75 100644 --- a/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActions.tsx +++ b/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActions.tsx @@ -3,10 +3,10 @@ import type { ComponentProps } from 'react'; import React, { memo } from 'react'; import { useTranslation } from 'react-i18next'; -import { HeaderToolbar, HeaderToolbarAction, HeaderToolbarDivider } from '../../../../../components/Header'; -import { useOmnichannelRoom } from '../../../contexts/RoomContext'; import QuickActionOptions from './QuickActionOptions'; import { useQuickActions } from './hooks/useQuickActions'; +import { HeaderToolbar, HeaderToolbarAction, HeaderToolbarDivider } from '../../../../../components/Header'; +import { useOmnichannelRoom } from '../../../contexts/RoomContext'; type QuickActionsProps = { className?: ComponentProps['className']; @@ -33,10 +33,10 @@ const QuickActions = ({ className }: QuickActionsProps) => { }; if (options) { - return ; + return ; } - return ; + return ; })} {quickActions.length > 0 && } diff --git a/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/hooks/useQuickActions.tsx b/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/hooks/useQuickActions.tsx index 07db5fb238b..9fb85a581ac 100644 --- a/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/hooks/useQuickActions.tsx +++ b/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/hooks/useQuickActions.tsx @@ -13,8 +13,10 @@ import { } from '@rocket.chat/ui-contexts'; import React, { useCallback, useState, useEffect } from 'react'; -import PlaceChatOnHoldModal from '../../../../../../../app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal'; +import { usePutChatOnHoldMutation } from './usePutChatOnHoldMutation'; +import { useReturnChatToQueueMutation } from './useReturnChatToQueueMutation'; import { LivechatInquiry } from '../../../../../../../app/livechat/client/collections/LivechatInquiry'; +import PlaceChatOnHoldModal from '../../../../../../../app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal'; import { LegacyRoomManager } from '../../../../../../../app/ui-utils/client'; import CloseChatModal from '../../../../../../components/Omnichannel/modals/CloseChatModal'; import CloseChatModalData from '../../../../../../components/Omnichannel/modals/CloseChatModalData'; @@ -28,8 +30,6 @@ import { quickActionHooks } from '../../../../../../ui'; import { useOmnichannelRoom } from '../../../../contexts/RoomContext'; import type { QuickActionsActionConfig } from '../../../../lib/quickActions'; import { QuickActionsEnum } from '../../../../lib/quickActions'; -import { usePutChatOnHoldMutation } from './usePutChatOnHoldMutation'; -import { useReturnChatToQueueMutation } from './useReturnChatToQueueMutation'; export const useQuickActions = (): { quickActions: QuickActionsActionConfig[]; diff --git a/apps/meteor/client/views/room/HeaderV2/ParentRoomWithEndpointData.tsx b/apps/meteor/client/views/room/HeaderV2/ParentRoomWithEndpointData.tsx index 89d0ea1f822..08888fc243a 100644 --- a/apps/meteor/client/views/room/HeaderV2/ParentRoomWithEndpointData.tsx +++ b/apps/meteor/client/views/room/HeaderV2/ParentRoomWithEndpointData.tsx @@ -1,9 +1,9 @@ import type { IRoom } from '@rocket.chat/core-typings'; import React from 'react'; +import ParentRoom from './ParentRoom'; import { HeaderTagSkeleton } from '../../../components/Header'; import { useRoomInfoEndpoint } from '../../../hooks/useRoomInfoEndpoint'; -import ParentRoom from './ParentRoom'; type ParentRoomWithEndpointDataProps = { rid: IRoom['_id']; diff --git a/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx b/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx index a99265368de..82d63485d02 100644 --- a/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx +++ b/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx @@ -4,7 +4,6 @@ import { RoomAvatar } from '@rocket.chat/ui-avatar'; import React, { Suspense } from 'react'; import { useTranslation } from 'react-i18next'; -import { Header, HeaderAvatar, HeaderContent, HeaderContentRow, HeaderToolbar } from '../../../components/Header'; import FederatedRoomOriginServer from './FederatedRoomOriginServer'; import ParentRoomWithData from './ParentRoomWithData'; import ParentTeam from './ParentTeam'; @@ -13,6 +12,7 @@ import RoomToolbox from './RoomToolbox'; import Encrypted from './icons/Encrypted'; import Favorite from './icons/Favorite'; import Translate from './icons/Translate'; +import { Header, HeaderAvatar, HeaderContent, HeaderContentRow, HeaderToolbar } from '../../../components/Header'; export type RoomHeaderProps = { room: IRoom; diff --git a/apps/meteor/client/views/room/HeaderV2/RoomHeaderE2EESetup.tsx b/apps/meteor/client/views/room/HeaderV2/RoomHeaderE2EESetup.tsx index c9bfe325be9..a40bf902469 100644 --- a/apps/meteor/client/views/room/HeaderV2/RoomHeaderE2EESetup.tsx +++ b/apps/meteor/client/views/room/HeaderV2/RoomHeaderE2EESetup.tsx @@ -1,11 +1,11 @@ import React, { lazy } from 'react'; +import RoomHeader from './RoomHeader'; +import type { RoomHeaderProps } from './RoomHeader'; import { E2EEState } from '../../../../app/e2e/client/E2EEState'; import { E2ERoomState } from '../../../../app/e2e/client/E2ERoomState'; import { useE2EERoomState } from '../hooks/useE2EERoomState'; import { useE2EEState } from '../hooks/useE2EEState'; -import RoomHeader from './RoomHeader'; -import type { RoomHeaderProps } from './RoomHeader'; const RoomToolboxE2EESetup = lazy(() => import('./RoomToolbox/RoomToolboxE2EESetup')); diff --git a/apps/meteor/client/views/room/HeaderV2/RoomTitle.tsx b/apps/meteor/client/views/room/HeaderV2/RoomTitle.tsx index d728f8c03a3..9b801173763 100644 --- a/apps/meteor/client/views/room/HeaderV2/RoomTitle.tsx +++ b/apps/meteor/client/views/room/HeaderV2/RoomTitle.tsx @@ -4,9 +4,9 @@ import { useDocumentTitle } from '@rocket.chat/ui-client'; import type { KeyboardEvent } from 'react'; import React from 'react'; +import HeaderIconWithRoom from './HeaderIconWithRoom'; import { HeaderTitle, HeaderTitleButton } from '../../../components/Header'; import { useRoomToolbox } from '../contexts/RoomToolboxContext'; -import HeaderIconWithRoom from './HeaderIconWithRoom'; type RoomTitleProps = { room: IRoom }; diff --git a/apps/meteor/client/views/room/MessageList/MessageList.tsx b/apps/meteor/client/views/room/MessageList/MessageList.tsx index d3dcecb8ede..91bc72fe952 100644 --- a/apps/meteor/client/views/room/MessageList/MessageList.tsx +++ b/apps/meteor/client/views/room/MessageList/MessageList.tsx @@ -4,11 +4,11 @@ import { useSetting, useUserPreference } from '@rocket.chat/ui-contexts'; import type { ComponentProps } from 'react'; import React, { Fragment } from 'react'; +import { MessageListItem } from './MessageListItem'; import { MessageTypes } from '../../../../app/ui-utils/client'; import { useRoomSubscription } from '../contexts/RoomContext'; import { useFirstUnreadMessageId } from '../hooks/useFirstUnreadMessageId'; import { SelectedMessagesProvider } from '../providers/SelectedMessagesProvider'; -import { MessageListItem } from './MessageListItem'; import { useMessages } from './hooks/useMessages'; import { isMessageSequential } from './lib/isMessageSequential'; import MessageListProvider from './providers/MessageListProvider'; diff --git a/apps/meteor/client/views/room/MessageList/hooks/useMessageBody.tsx b/apps/meteor/client/views/room/MessageList/hooks/useMessageBody.tsx index a9e04aec315..2174874e532 100644 --- a/apps/meteor/client/views/room/MessageList/hooks/useMessageBody.tsx +++ b/apps/meteor/client/views/room/MessageList/hooks/useMessageBody.tsx @@ -3,9 +3,9 @@ import type { Options, Root } from '@rocket.chat/message-parser'; import { useUserSubscription } from '@rocket.chat/ui-contexts'; import { useMemo } from 'react'; -import { parseMessageTextToAstMarkdown } from '../../../../lib/parseMessageTextToAstMarkdown'; import { useAutoLinkDomains } from './useAutoLinkDomains'; import { useAutoTranslate } from './useAutoTranslate'; +import { parseMessageTextToAstMarkdown } from '../../../../lib/parseMessageTextToAstMarkdown'; export const useMessageBody = (message: IMessage | undefined, rid: string): string | Root => { const subscription = useUserSubscription(rid); diff --git a/apps/meteor/client/views/room/MessageList/lib/isMessageSequential.spec.ts b/apps/meteor/client/views/room/MessageList/lib/isMessageSequential.spec.ts index d3da6c88fd5..1d8c8bb5dd4 100644 --- a/apps/meteor/client/views/room/MessageList/lib/isMessageSequential.spec.ts +++ b/apps/meteor/client/views/room/MessageList/lib/isMessageSequential.spec.ts @@ -1,7 +1,7 @@ import type { IMessage } from '@rocket.chat/core-typings'; -import { MessageTypes } from '../../../../../app/ui-utils/lib/MessageTypes'; import { isMessageSequential } from './isMessageSequential'; +import { MessageTypes } from '../../../../../app/ui-utils/lib/MessageTypes'; const TIME_RANGE_IN_SECONDS = 300; diff --git a/apps/meteor/client/views/room/MessageList/lib/isMessageSequential.ts b/apps/meteor/client/views/room/MessageList/lib/isMessageSequential.ts index 0a736d1c8e2..e50779d832d 100644 --- a/apps/meteor/client/views/room/MessageList/lib/isMessageSequential.ts +++ b/apps/meteor/client/views/room/MessageList/lib/isMessageSequential.ts @@ -1,8 +1,8 @@ import type { IMessage } from '@rocket.chat/core-typings'; import { differenceInSeconds } from 'date-fns'; -import { MessageTypes } from '../../../../../app/ui-utils/lib/MessageTypes'; import { isMessageNewDay } from './isMessageNewDay'; +import { MessageTypes } from '../../../../../app/ui-utils/lib/MessageTypes'; export const isMessageSequential = (current: IMessage, previous: IMessage | undefined, groupingRange: number): boolean => { if (!previous) { diff --git a/apps/meteor/client/views/room/MessageList/lib/isOwnUserMessage.spec.ts b/apps/meteor/client/views/room/MessageList/lib/isOwnUserMessage.spec.ts index c819a864bd9..481490e8a46 100644 --- a/apps/meteor/client/views/room/MessageList/lib/isOwnUserMessage.spec.ts +++ b/apps/meteor/client/views/room/MessageList/lib/isOwnUserMessage.spec.ts @@ -1,7 +1,7 @@ import type { IMessage, ISubscription } from '@rocket.chat/core-typings'; -import { MessageTypes } from '../../../../../app/ui-utils/lib/MessageTypes'; import { isOwnUserMessage } from './isOwnUserMessage'; +import { MessageTypes } from '../../../../../app/ui-utils/lib/MessageTypes'; const date = new Date('2021-10-27T00:00:00.000Z'); diff --git a/apps/meteor/client/views/room/MessageList/providers/MessageHighlightProvider.tsx b/apps/meteor/client/views/room/MessageList/providers/MessageHighlightProvider.tsx index bb4177f7d97..73807b4917b 100644 --- a/apps/meteor/client/views/room/MessageList/providers/MessageHighlightProvider.tsx +++ b/apps/meteor/client/views/room/MessageList/providers/MessageHighlightProvider.tsx @@ -2,8 +2,8 @@ import type { ReactElement, ContextType, ReactNode } from 'react'; import React, { useMemo } from 'react'; import { useSyncExternalStore } from 'use-sync-external-store/shim'; -import MessageHighlightContext from '../contexts/MessageHighlightContext'; import * as messageHighlightSubscription from './messageHighlightSubscription'; +import MessageHighlightContext from '../contexts/MessageHighlightContext'; const MessageHighlightProvider = ({ children }: { children: ReactNode }): ReactElement => { const highlightMessageId = useSyncExternalStore(messageHighlightSubscription.subscribe, messageHighlightSubscription.getSnapshot); diff --git a/apps/meteor/client/views/room/Room.tsx b/apps/meteor/client/views/room/Room.tsx index 55f8b4a82be..b0001db4daa 100644 --- a/apps/meteor/client/views/room/Room.tsx +++ b/apps/meteor/client/views/room/Room.tsx @@ -5,7 +5,6 @@ import React, { createElement, lazy, memo, Suspense } from 'react'; import { FocusScope } from 'react-aria'; import { ErrorBoundary } from 'react-error-boundary'; -import { ContextualbarSkeleton } from '../../components/Contextualbar'; import RoomE2EESetup from './E2EESetup/RoomE2EESetup'; import Header from './Header'; import { HeaderV2 } from './HeaderV2'; @@ -19,6 +18,7 @@ import RoomLayout from './layout/RoomLayout'; import ChatProvider from './providers/ChatProvider'; import { DateListProvider } from './providers/DateListProvider'; import { SelectedMessagesProvider } from './providers/SelectedMessagesProvider'; +import { ContextualbarSkeleton } from '../../components/Contextualbar'; const UiKitContextualBar = lazy(() => import('./contextualBar/uikit/UiKitContextualBar')); diff --git a/apps/meteor/client/views/room/RoomAnnouncement/RoomAnnouncement.tsx b/apps/meteor/client/views/room/RoomAnnouncement/RoomAnnouncement.tsx index 101daf7e843..3e6243102ef 100644 --- a/apps/meteor/client/views/room/RoomAnnouncement/RoomAnnouncement.tsx +++ b/apps/meteor/client/views/room/RoomAnnouncement/RoomAnnouncement.tsx @@ -5,9 +5,9 @@ import type { MouseEvent } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import AnnouncementComponent from './AnnouncementComponent'; import GenericModal from '../../../components/GenericModal'; import MarkdownText from '../../../components/MarkdownText'; -import AnnouncementComponent from './AnnouncementComponent'; type RoomAnnouncementParams = { announcement: string; diff --git a/apps/meteor/client/views/room/RoomNotFound.tsx b/apps/meteor/client/views/room/RoomNotFound.tsx index fa92771a226..70cd7dda7dc 100644 --- a/apps/meteor/client/views/room/RoomNotFound.tsx +++ b/apps/meteor/client/views/room/RoomNotFound.tsx @@ -5,9 +5,9 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import RoomLayout from './layout/RoomLayout'; import NotFoundState from '../../components/NotFoundState'; import SidebarToggler from '../../components/SidebarToggler'; -import RoomLayout from './layout/RoomLayout'; const RoomNotFound = (): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/room/RoomOpener.tsx b/apps/meteor/client/views/room/RoomOpener.tsx index f87339a67a6..3006a6acd94 100644 --- a/apps/meteor/client/views/room/RoomOpener.tsx +++ b/apps/meteor/client/views/room/RoomOpener.tsx @@ -5,15 +5,15 @@ import type { ReactElement } from 'react'; import React, { lazy, Suspense } from 'react'; import { useTranslation } from 'react-i18next'; +import RoomSkeleton from './RoomSkeleton'; +import RoomSidepanel from './Sidepanel/RoomSidepanel'; +import { useOpenRoom } from './hooks/useOpenRoom'; import { FeaturePreviewSidePanelNavigation } from '../../components/FeaturePreviewSidePanelNavigation'; import { Header } from '../../components/Header'; import { getErrorMessage } from '../../lib/errorHandling'; import { NotAuthorizedError } from '../../lib/errors/NotAuthorizedError'; import { OldUrlRoomError } from '../../lib/errors/OldUrlRoomError'; import { RoomNotFoundError } from '../../lib/errors/RoomNotFoundError'; -import RoomSkeleton from './RoomSkeleton'; -import RoomSidepanel from './Sidepanel/RoomSidepanel'; -import { useOpenRoom } from './hooks/useOpenRoom'; const RoomProvider = lazy(() => import('./providers/RoomProvider')); const RoomNotFound = lazy(() => import('./RoomNotFound')); diff --git a/apps/meteor/client/views/room/RoomSkeleton.tsx b/apps/meteor/client/views/room/RoomSkeleton.tsx index 083a729c309..b6c463417a9 100644 --- a/apps/meteor/client/views/room/RoomSkeleton.tsx +++ b/apps/meteor/client/views/room/RoomSkeleton.tsx @@ -2,11 +2,11 @@ import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.cha import type { ReactElement } from 'react'; import React from 'react'; -import MessageListSkeleton from '../../components/message/list/MessageListSkeleton'; import HeaderSkeleton from './Header/HeaderSkeleton'; import HeaderSkeletonV2 from './HeaderV2/HeaderSkeleton'; import RoomComposerSkeleton from './composer/RoomComposer/RoomComposerSkeleton'; import RoomLayout from './layout/RoomLayout'; +import MessageListSkeleton from '../../components/message/list/MessageListSkeleton'; const RoomSkeleton = (): ReactElement => ( { const parentRid = useOpenedRoom(); diff --git a/apps/meteor/client/views/room/body/RetentionPolicyWarning.spec.tsx b/apps/meteor/client/views/room/body/RetentionPolicyWarning.spec.tsx index 5e4e13fa3ea..b1b1398e3b3 100644 --- a/apps/meteor/client/views/room/body/RetentionPolicyWarning.spec.tsx +++ b/apps/meteor/client/views/room/body/RetentionPolicyWarning.spec.tsx @@ -1,9 +1,9 @@ import { render, screen } from '@testing-library/react'; import React from 'react'; +import RetentionPolicyWarning from './RetentionPolicyWarning'; import { createRenteionPolicySettingsMock as createMock } from '../../../../tests/mocks/client/mockRetentionPolicySettings'; import { createFakeRoom } from '../../../../tests/mocks/data'; -import RetentionPolicyWarning from './RetentionPolicyWarning'; jest.useFakeTimers(); diff --git a/apps/meteor/client/views/room/body/RoomBody.tsx b/apps/meteor/client/views/room/body/RoomBody.tsx index b0997da3744..13c111592c3 100644 --- a/apps/meteor/client/views/room/body/RoomBody.tsx +++ b/apps/meteor/client/views/room/body/RoomBody.tsx @@ -5,6 +5,9 @@ import { usePermission, useRole, useSetting, useTranslation, useUser, useUserPre import type { MouseEventHandler, ReactElement, UIEvent } from 'react'; import React, { memo, useCallback, useMemo, useRef } from 'react'; +import DropTargetOverlay from './DropTargetOverlay'; +import JumpToRecentMessageButton from './JumpToRecentMessageButton'; +import LeaderBar from './LeaderBar'; import { RoomRoles } from '../../../../app/models/client'; import { isTruthy } from '../../../../lib/isTruthy'; import { CustomScrollbars } from '../../../components/CustomScrollbars'; @@ -13,6 +16,8 @@ import { useReactiveQuery } from '../../../hooks/useReactiveQuery'; import Announcement from '../Announcement'; import { BubbleDate } from '../BubbleDate'; import { MessageList } from '../MessageList'; +import LoadingMessagesIndicator from './LoadingMessagesIndicator'; +import RetentionPolicyWarning from './RetentionPolicyWarning'; import MessageListErrorBoundary from '../MessageList/MessageListErrorBoundary'; import ComposerContainer from '../composer/ComposerContainer'; import RoomComposer from '../composer/RoomComposer/RoomComposer'; @@ -23,11 +28,6 @@ import { useUserCard } from '../contexts/UserCardContext'; import { useDateScroll } from '../hooks/useDateScroll'; import { useMessageListNavigation } from '../hooks/useMessageListNavigation'; import { useRetentionPolicy } from '../hooks/useRetentionPolicy'; -import DropTargetOverlay from './DropTargetOverlay'; -import JumpToRecentMessageButton from './JumpToRecentMessageButton'; -import LeaderBar from './LeaderBar'; -import LoadingMessagesIndicator from './LoadingMessagesIndicator'; -import RetentionPolicyWarning from './RetentionPolicyWarning'; import RoomForeword from './RoomForeword/RoomForeword'; import UnreadMessagesIndicator from './UnreadMessagesIndicator'; import UploadProgressIndicator from './UploadProgressIndicator'; diff --git a/apps/meteor/client/views/room/body/RoomBodyV2.tsx b/apps/meteor/client/views/room/body/RoomBodyV2.tsx index 65d22951ca8..3f1ecb0fd2b 100644 --- a/apps/meteor/client/views/room/body/RoomBodyV2.tsx +++ b/apps/meteor/client/views/room/body/RoomBodyV2.tsx @@ -10,8 +10,12 @@ import { CustomScrollbars } from '../../../components/CustomScrollbars'; import { useEmbeddedLayout } from '../../../hooks/useEmbeddedLayout'; import { BubbleDate } from '../BubbleDate'; import { MessageList } from '../MessageList'; +import DropTargetOverlay from './DropTargetOverlay'; +import JumpToRecentMessageButton from './JumpToRecentMessageButton'; import MessageListErrorBoundary from '../MessageList/MessageListErrorBoundary'; import RoomAnnouncement from '../RoomAnnouncement'; +import LoadingMessagesIndicator from './LoadingMessagesIndicator'; +import RetentionPolicyWarning from './RetentionPolicyWarning'; import ComposerContainer from '../composer/ComposerContainer'; import RoomComposer from '../composer/RoomComposer/RoomComposer'; import { useChat } from '../contexts/ChatContext'; @@ -20,10 +24,6 @@ import { useRoomToolbox } from '../contexts/RoomToolboxContext'; import { useDateScroll } from '../hooks/useDateScroll'; import { useMessageListNavigation } from '../hooks/useMessageListNavigation'; import { useRetentionPolicy } from '../hooks/useRetentionPolicy'; -import DropTargetOverlay from './DropTargetOverlay'; -import JumpToRecentMessageButton from './JumpToRecentMessageButton'; -import LoadingMessagesIndicator from './LoadingMessagesIndicator'; -import RetentionPolicyWarning from './RetentionPolicyWarning'; import RoomForeword from './RoomForeword/RoomForeword'; import { RoomTopic } from './RoomTopic'; import UnreadMessagesIndicator from './UnreadMessagesIndicator'; diff --git a/apps/meteor/client/views/room/body/RoomForeword/RoomForeword.tsx b/apps/meteor/client/views/room/body/RoomForeword/RoomForeword.tsx index 7629fc14c50..9f1dfeaa34f 100644 --- a/apps/meteor/client/views/room/body/RoomForeword/RoomForeword.tsx +++ b/apps/meteor/client/views/room/body/RoomForeword/RoomForeword.tsx @@ -6,8 +6,8 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { VoipRoomForeword } from '../../../../components/voip/room/VoipRoomForeword'; import RoomForewordUsernameList from './RoomForewordUsernameList'; +import { VoipRoomForeword } from '../../../../components/voip/room/VoipRoomForeword'; type RoomForewordProps = { user: IUser | null; room: IRoom }; diff --git a/apps/meteor/client/views/room/body/RoomForeword/RoomForewordUsernameList.tsx b/apps/meteor/client/views/room/body/RoomForeword/RoomForewordUsernameList.tsx index 62bb9f84455..268c1762816 100644 --- a/apps/meteor/client/views/room/body/RoomForeword/RoomForewordUsernameList.tsx +++ b/apps/meteor/client/views/room/body/RoomForeword/RoomForewordUsernameList.tsx @@ -3,8 +3,8 @@ import { Margins } from '@rocket.chat/fuselage'; import { useSetting } from '@rocket.chat/ui-contexts'; import React from 'react'; -import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator'; import RoomForewordUsernameListItem from './RoomForewordUsernameListItem'; +import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator'; type RoomForewordUsernameListProps = { usernames: Array> }; diff --git a/apps/meteor/client/views/room/body/UploadProgressIndicator.tsx b/apps/meteor/client/views/room/body/UploadProgressIndicator.tsx index 3c9a9b0a809..2e6103dbad9 100644 --- a/apps/meteor/client/views/room/body/UploadProgressIndicator.tsx +++ b/apps/meteor/client/views/room/body/UploadProgressIndicator.tsx @@ -2,8 +2,8 @@ import type { ReactElement } from 'react'; import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; -import type { Upload } from '../../../lib/chats/Upload'; import ErroredUploadProgressIndicator from './ErroredUploadProgressIndicator'; +import type { Upload } from '../../../lib/chats/Upload'; type UploadProgressIndicatorProps = { id: Upload['id']; diff --git a/apps/meteor/client/views/room/body/hooks/useFileUpload.ts b/apps/meteor/client/views/room/body/hooks/useFileUpload.ts index 088e4b198cb..bdccc6d63fd 100644 --- a/apps/meteor/client/views/room/body/hooks/useFileUpload.ts +++ b/apps/meteor/client/views/room/body/hooks/useFileUpload.ts @@ -1,9 +1,9 @@ import { useCallback, useEffect } from 'react'; import { useSyncExternalStore } from 'use-sync-external-store/shim'; +import { useFileUploadDropTarget } from './useFileUploadDropTarget'; import type { Upload } from '../../../../lib/chats/Upload'; import { useChat } from '../../contexts/ChatContext'; -import { useFileUploadDropTarget } from './useFileUploadDropTarget'; export const useFileUpload = () => { const chat = useChat(); diff --git a/apps/meteor/client/views/room/body/hooks/useFileUploadDropTarget.ts b/apps/meteor/client/views/room/body/hooks/useFileUploadDropTarget.ts index 02130bd46ee..c3fe4301cb7 100644 --- a/apps/meteor/client/views/room/body/hooks/useFileUploadDropTarget.ts +++ b/apps/meteor/client/views/room/body/hooks/useFileUploadDropTarget.ts @@ -4,12 +4,12 @@ import type { ReactNode } from 'react'; import type React from 'react'; import { useCallback, useMemo } from 'react'; +import { useDropTarget } from './useDropTarget'; import { useIsRoomOverMacLimit } from '../../../../hooks/omnichannel/useIsRoomOverMacLimit'; import { useReactiveValue } from '../../../../hooks/useReactiveValue'; import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator'; import { useChat } from '../../contexts/ChatContext'; import { useRoom, useRoomSubscription } from '../../contexts/RoomContext'; -import { useDropTarget } from './useDropTarget'; export const useFileUploadDropTarget = (): readonly [ fileUploadTriggerProps: { diff --git a/apps/meteor/client/views/room/composer/ComposerBoxPopupPreview.tsx b/apps/meteor/client/views/room/composer/ComposerBoxPopupPreview.tsx index d75e7c93c56..ab74ff2360c 100644 --- a/apps/meteor/client/views/room/composer/ComposerBoxPopupPreview.tsx +++ b/apps/meteor/client/views/room/composer/ComposerBoxPopupPreview.tsx @@ -4,8 +4,8 @@ import { useMethod } from '@rocket.chat/ui-contexts'; import type { ForwardedRef } from 'react'; import React, { forwardRef, useEffect, useImperativeHandle } from 'react'; -import { useChat } from '../contexts/ChatContext'; import type { ComposerBoxPopupProps } from './ComposerBoxPopup'; +import { useChat } from '../contexts/ChatContext'; type ComposerBoxPopupPreviewItem = { _id: string; type: 'image' | 'video' | 'audio' | 'text' | 'other'; value: string; sort?: number }; diff --git a/apps/meteor/client/views/room/composer/ComposerContainer.tsx b/apps/meteor/client/views/room/composer/ComposerContainer.tsx index 0e870067133..e027ff1f5b8 100644 --- a/apps/meteor/client/views/room/composer/ComposerContainer.tsx +++ b/apps/meteor/client/views/room/composer/ComposerContainer.tsx @@ -3,8 +3,6 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React, { memo } from 'react'; -import { useAirGappedRestriction } from '../../../hooks/useAirGappedRestriction'; -import { useRoom } from '../contexts/RoomContext'; import ComposerAirGappedRestricted from './ComposerAirGappedRestricted'; import ComposerAnonymous from './ComposerAnonymous'; import ComposerArchived from './ComposerArchived'; @@ -16,10 +14,12 @@ import ComposerMessage from './ComposerMessage'; import ComposerOmnichannel from './ComposerOmnichannel'; import ComposerReadOnly from './ComposerReadOnly'; import ComposerVoIP from './ComposerVoIP'; +import { useRoom } from '../contexts/RoomContext'; import { useMessageComposerIsAnonymous } from './hooks/useMessageComposerIsAnonymous'; import { useMessageComposerIsArchived } from './hooks/useMessageComposerIsArchived'; import { useMessageComposerIsBlocked } from './hooks/useMessageComposerIsBlocked'; import { useMessageComposerIsReadOnly } from './hooks/useMessageComposerIsReadOnly'; +import { useAirGappedRestriction } from '../../../hooks/useAirGappedRestriction'; const ComposerContainer = ({ children, ...props }: ComposerMessageProps): ReactElement => { const room = useRoom(); diff --git a/apps/meteor/client/views/room/composer/ComposerMessage.tsx b/apps/meteor/client/views/room/composer/ComposerMessage.tsx index 3f37f7a4044..9148185da50 100644 --- a/apps/meteor/client/views/room/composer/ComposerMessage.tsx +++ b/apps/meteor/client/views/room/composer/ComposerMessage.tsx @@ -3,11 +3,11 @@ import { useToastMessageDispatch } from '@rocket.chat/ui-contexts'; import type { ReactElement, ReactNode } from 'react'; import React, { memo, useCallback, useMemo } from 'react'; +import ComposerSkeleton from './ComposerSkeleton'; import { LegacyRoomManager } from '../../../../app/ui-utils/client'; import { useReactiveValue } from '../../../hooks/useReactiveValue'; import { useChat } from '../contexts/ChatContext'; import { useRoom } from '../contexts/RoomContext'; -import ComposerSkeleton from './ComposerSkeleton'; import MessageBox from './messageBox/MessageBox'; export type ComposerMessageProps = { diff --git a/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx b/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx index 74ee27dac24..d8995a78dff 100644 --- a/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx +++ b/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx @@ -3,8 +3,8 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { useOmnichannelRoom } from '../../contexts/RoomContext'; import { useResumeChatOnHoldMutation } from './hooks/useResumeChatOnHoldMutation'; +import { useOmnichannelRoom } from '../../contexts/RoomContext'; export const ComposerOmnichannelOnHold = (): ReactElement => { const resumeChatOnHoldMutation = useResumeChatOnHoldMutation(); diff --git a/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopup.ts b/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopup.ts index c47f1a5ddab..670d944093e 100644 --- a/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopup.ts +++ b/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopup.ts @@ -3,9 +3,9 @@ import type { UseQueryResult } from '@tanstack/react-query'; import type { MutableRefObject } from 'react'; import { useEffect, useCallback, useState, useRef } from 'react'; +import { useComposerBoxPopupQueries } from './useComposerBoxPopupQueries'; import { useChat } from '../../contexts/ChatContext'; import type { ComposerPopupOption } from '../../contexts/ComposerPopupContext'; -import { useComposerBoxPopupQueries } from './useComposerBoxPopupQueries'; type ComposerBoxPopupImperativeCommands = MutableRefObject< | { diff --git a/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopupQueries.ts b/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopupQueries.ts index 492579f2738..d2ee61ffeae 100644 --- a/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopupQueries.ts +++ b/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopupQueries.ts @@ -2,9 +2,9 @@ import type { QueriesResults } from '@tanstack/react-query'; import { useQueries } from '@tanstack/react-query'; import { useEffect, useState } from 'react'; +import { useEnablePopupPreview } from './useEnablePopupPreview'; import { slashCommands } from '../../../../../app/utils/client/slashCommand'; import type { ComposerPopupOption } from '../../contexts/ComposerPopupContext'; -import { useEnablePopupPreview } from './useEnablePopupPreview'; export const useComposerBoxPopupQueries = (filter: unknown, popup?: ComposerPopupOption) => { const [counter, setCounter] = useState(0); diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx index a9c2b8e89cc..6546a6be924 100644 --- a/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx +++ b/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx @@ -17,6 +17,10 @@ import type { ReactElement, MouseEventHandler, FormEvent, ClipboardEventHandler, import React, { memo, useRef, useReducer, useCallback } from 'react'; import { useSyncExternalStore } from 'use-sync-external-store/shim'; +import MessageBoxActionsToolbar from './MessageBoxActionsToolbar'; +import MessageBoxFormattingToolbar from './MessageBoxFormattingToolbar'; +import MessageBoxHint from './MessageBoxHint'; +import MessageBoxReplies from './MessageBoxReplies'; import { createComposerAPI } from '../../../../../app/ui-message/client/messageBox/createComposerAPI'; import type { FormattingButton } from '../../../../../app/ui-message/client/messageBox/messageBoxFormatting'; import { formattingButtons } from '../../../../../app/ui-message/client/messageBox/messageBoxFormatting'; @@ -38,10 +42,6 @@ import { useAutoGrow } from '../RoomComposer/hooks/useAutoGrow'; import { useComposerBoxPopup } from '../hooks/useComposerBoxPopup'; import { useEnablePopupPreview } from '../hooks/useEnablePopupPreview'; import { useMessageComposerMergedRefs } from '../hooks/useMessageComposerMergedRefs'; -import MessageBoxActionsToolbar from './MessageBoxActionsToolbar'; -import MessageBoxFormattingToolbar from './MessageBoxFormattingToolbar'; -import MessageBoxHint from './MessageBoxHint'; -import MessageBoxReplies from './MessageBoxReplies'; import { useMessageBoxAutoFocus } from './hooks/useMessageBoxAutoFocus'; import { useMessageBoxPlaceholder } from './hooks/useMessageBoxPlaceholder'; diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx index 38396844866..b4ec012f333 100644 --- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx +++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx @@ -8,17 +8,17 @@ import { useTranslation, useLayoutHiddenActions } from '@rocket.chat/ui-contexts import type { ComponentProps, MouseEvent } from 'react'; import React, { memo } from 'react'; -import { messageBox } from '../../../../../../app/ui-utils/client'; -import { isTruthy } from '../../../../../../lib/isTruthy'; -import { useMessageboxAppsActionButtons } from '../../../../../hooks/useAppActionButtons'; -import { useChat } from '../../../contexts/ChatContext'; -import { useRoom } from '../../../contexts/RoomContext'; import { useAudioMessageAction } from './hooks/useAudioMessageAction'; import { useCreateDiscussionAction } from './hooks/useCreateDiscussionAction'; import { useFileUploadAction } from './hooks/useFileUploadAction'; import { useShareLocationAction } from './hooks/useShareLocationAction'; import { useVideoMessageAction } from './hooks/useVideoMessageAction'; import { useWebdavActions } from './hooks/useWebdavActions'; +import { messageBox } from '../../../../../../app/ui-utils/client'; +import { isTruthy } from '../../../../../../lib/isTruthy'; +import { useMessageboxAppsActionButtons } from '../../../../../hooks/useAppActionButtons'; +import { useChat } from '../../../contexts/ChatContext'; +import { useRoom } from '../../../contexts/RoomContext'; type MessageBoxActionsToolbarProps = { canSend: boolean; diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/MessageBoxFormattingToolbar.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/MessageBoxFormattingToolbar.tsx index c5b1f06dd9b..ed2e6affc07 100644 --- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/MessageBoxFormattingToolbar.tsx +++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/MessageBoxFormattingToolbar.tsx @@ -2,10 +2,10 @@ import { MessageComposerAction } from '@rocket.chat/ui-composer'; import React, { memo } from 'react'; import { useTranslation } from 'react-i18next'; +import FormattingToolbarDropdown from './FormattingToolbarDropdown'; import type { FormattingButton } from '../../../../../../app/ui-message/client/messageBox/messageBoxFormatting'; import { isPromptButton } from '../../../../../../app/ui-message/client/messageBox/messageBoxFormatting'; import type { ComposerAPI } from '../../../../../lib/chats/ChatAPI'; -import FormattingToolbarDropdown from './FormattingToolbarDropdown'; type MessageBoxFormattingToolbarProps = { composer: ComposerAPI; @@ -62,10 +62,10 @@ const MessageBoxFormattingToolbar = ({ items, variant = 'large', composer, disab /> ) : ( {formatter.text()} diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxHint.spec.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxHint.spec.tsx index 4ebe89264d4..6f4562a7fd3 100644 --- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxHint.spec.tsx +++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxHint.spec.tsx @@ -2,10 +2,10 @@ import { mockAppRoot } from '@rocket.chat/mock-providers'; import { render, screen } from '@testing-library/react'; import React from 'react'; +import MessageBoxHint from './MessageBoxHint'; import { E2ERoomState } from '../../../../../app/e2e/client/E2ERoomState'; import { useRoom } from '../../contexts/RoomContext'; import { useE2EERoomState } from '../../hooks/useE2EERoomState'; -import MessageBoxHint from './MessageBoxHint'; jest.mock('../../hooks/useE2EERoomState', () => ({ useE2EERoomState: jest.fn(), diff --git a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.stories.tsx b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.stories.tsx index c98519092fe..5217423cf34 100644 --- a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.stories.tsx @@ -1,8 +1,8 @@ import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; -import { Contextualbar } from '../../../../components/Contextualbar'; import AutoTranslate from './AutoTranslate'; +import { Contextualbar } from '../../../../components/Contextualbar'; export default { title: 'Room/Contextual Bar/AutoTranslate', diff --git a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslateWithData.tsx b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslateWithData.tsx index d31e8bde76b..302199b5646 100644 --- a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslateWithData.tsx +++ b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslateWithData.tsx @@ -4,12 +4,12 @@ import type { ReactElement } from 'react'; import React, { useMemo, useEffect, useState, memo } from 'react'; import { useTranslation } from 'react-i18next'; +import AutoTranslate from './AutoTranslate'; import { useEndpointAction } from '../../../../hooks/useEndpointAction'; import { useEndpointData } from '../../../../hooks/useEndpointData'; import { dispatchToastMessage } from '../../../../lib/toast'; import { useRoom, useRoomSubscription } from '../../contexts/RoomContext'; import { useRoomToolbox } from '../../contexts/RoomToolboxContext'; -import AutoTranslate from './AutoTranslate'; const AutoTranslateWithData = (): ReactElement => { const room = useRoom(); diff --git a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsList.tsx b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsList.tsx index 8343751b3e1..f3b87aa66ff 100644 --- a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsList.tsx +++ b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsList.tsx @@ -7,6 +7,7 @@ import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { Virtuoso } from 'react-virtuoso'; +import DiscussionsListRow from './DiscussionsListRow'; import { ContextualbarHeader, ContextualbarIcon, @@ -18,7 +19,6 @@ import { } from '../../../../components/Contextualbar'; import { VirtuosoScrollbars } from '../../../../components/CustomScrollbars'; import { goToRoomById } from '../../../../lib/utils/goToRoomById'; -import DiscussionsListRow from './DiscussionsListRow'; type DiscussionsListProps = { total: number; diff --git a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListContextBar.tsx b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListContextBar.tsx index d59267c9ab1..0830cfbe072 100644 --- a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListContextBar.tsx +++ b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListContextBar.tsx @@ -4,12 +4,12 @@ import { useUserId } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React, { useCallback, useMemo, useState } from 'react'; +import DiscussionsList from './DiscussionsList'; +import { useDiscussionsList } from './useDiscussionsList'; import { useRecordList } from '../../../../hooks/lists/useRecordList'; import { AsyncStatePhase } from '../../../../hooks/useAsyncState'; import { useRoom } from '../../contexts/RoomContext'; import { useRoomToolbox } from '../../contexts/RoomToolboxContext'; -import DiscussionsList from './DiscussionsList'; -import { useDiscussionsList } from './useDiscussionsList'; const DiscussionListContextBar = (): ReactElement | null => { const userId = useUserId(); diff --git a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListRow.tsx b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListRow.tsx index 09e5faddc5c..05edbd8cd8a 100644 --- a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListRow.tsx +++ b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListRow.tsx @@ -2,9 +2,9 @@ import type { IDiscussionMessage } from '@rocket.chat/core-typings'; import type { MouseEvent } from 'react'; import React, { memo } from 'react'; +import DiscussionsListItem from './components/DiscussionsListItem'; import { useTimeAgo } from '../../../../hooks/useTimeAgo'; import { normalizeThreadMessage } from '../../../../lib/normalizeThreadMessage'; -import DiscussionsListItem from './components/DiscussionsListItem'; type DiscussionListRowProps = { discussion: IDiscussionMessage; diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.stories.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.stories.tsx index 9fe37701a8d..3aa179d0df6 100644 --- a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.stories.tsx @@ -1,8 +1,8 @@ import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; -import { Contextualbar } from '../../../../components/Contextualbar'; import ExportMessages from './index'; +import { Contextualbar } from '../../../../components/Contextualbar'; export default { title: 'Room/Contextual Bar/ExportMessages', diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx index 99bcabfd03b..f6a62120011 100644 --- a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx +++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx @@ -4,12 +4,12 @@ import React, { useMemo } from 'react'; import { FormProvider, useForm } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; +import FileExport from './FileExport'; +import MailExportForm from './MailExportForm'; import { ContextualbarHeader, ContextualbarIcon, ContextualbarTitle, ContextualbarClose } from '../../../../components/Contextualbar'; import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator'; import { useRoom } from '../../contexts/RoomContext'; import { useRoomToolbox } from '../../contexts/RoomToolboxContext'; -import FileExport from './FileExport'; -import MailExportForm from './MailExportForm'; export type MailExportFormValues = { type: 'email' | 'file'; diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx index 7344926ec64..2d4a3bf0030 100644 --- a/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx +++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx @@ -6,9 +6,9 @@ import React, { useMemo } from 'react'; import { Controller, useFormContext } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; -import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../../components/Contextualbar'; import type { MailExportFormValues } from './ExportMessages'; import { useRoomExportMutation } from './useRoomExportMutation'; +import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../../components/Contextualbar'; type FileExportProps = { formId: string; diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx index 2cb94cd6576..c7a3276ac8e 100644 --- a/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx +++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx @@ -21,12 +21,12 @@ import React, { useEffect, useContext } from 'react'; import { Controller, useFormContext } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; +import type { MailExportFormValues } from './ExportMessages'; +import { useRoomExportMutation } from './useRoomExportMutation'; import { validateEmail } from '../../../../../lib/emailValidator'; import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../../components/Contextualbar'; import UserAutoCompleteMultiple from '../../../../components/UserAutoCompleteMultiple'; import { SelectedMessageContext, useCountSelected } from '../../MessageList/contexts/SelectedMessagesContext'; -import type { MailExportFormValues } from './ExportMessages'; -import { useRoomExportMutation } from './useRoomExportMutation'; type MailExportFormProps = { formId: string; diff --git a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx index 60041e57260..1b644a9275f 100644 --- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx +++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx @@ -32,6 +32,8 @@ import type { ChangeEvent } from 'react'; import React, { useMemo } from 'react'; import { useForm, Controller } from 'react-hook-form'; +import { useEditRoomInitialValues } from './useEditRoomInitialValues'; +import { useEditRoomPermissions } from './useEditRoomPermissions'; import { MessageTypesValues } from '../../../../../../app/lib/lib/MessageTypes'; import { ContextualbarHeader, @@ -47,8 +49,6 @@ import { msToTimeUnit, TIMEUNIT } from '../../../../../lib/convertTimeUnit'; import { getDirtyFields } from '../../../../../lib/getDirtyFields'; import { useArchiveRoom } from '../../../../hooks/roomActions/useArchiveRoom'; import { useRetentionPolicy } from '../../../hooks/useRetentionPolicy'; -import { useEditRoomInitialValues } from './useEditRoomInitialValues'; -import { useEditRoomPermissions } from './useEditRoomPermissions'; type EditRoomInfoProps = { room: IRoomWithRetentionPolicy; diff --git a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfoWithData.tsx b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfoWithData.tsx index ad758c1bc8a..f96ac853bdf 100644 --- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfoWithData.tsx +++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfoWithData.tsx @@ -1,9 +1,9 @@ import type { IRoomWithRetentionPolicy } from '@rocket.chat/core-typings'; import React from 'react'; +import EditRoomInfo from './EditRoomInfo'; import { useRoom } from '../../../contexts/RoomContext'; import { useRoomToolbox } from '../../../contexts/RoomToolboxContext'; -import EditRoomInfo from './EditRoomInfo'; const EditRoomInfoWithData = ({ onClickBack }: { onClickBack: () => void }) => { const room = useRoom() as IRoomWithRetentionPolicy; diff --git a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.stories.tsx b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.stories.tsx index 9f0200441bc..0f9dd417d6e 100644 --- a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.stories.tsx @@ -2,8 +2,8 @@ import type { RoomType } from '@rocket.chat/core-typings'; import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; -import { Contextualbar } from '../../../../../components/Contextualbar'; import RoomInfo from './RoomInfo'; +import { Contextualbar } from '../../../../../components/Contextualbar'; export default { title: 'Room/Contextual Bar/RoomInfo', diff --git a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx index cbbaad6427d..f3184709f8f 100644 --- a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx +++ b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx @@ -5,6 +5,7 @@ import { GenericMenu } from '@rocket.chat/ui-client'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import RoomInfoActions from './RoomInfoActions'; import { ContextualbarHeader, ContextualbarScrollableContent, @@ -28,7 +29,6 @@ import MarkdownText from '../../../../../components/MarkdownText'; import { useRetentionPolicy } from '../../../hooks/useRetentionPolicy'; import { useRoomActions } from '../hooks/useRoomActions'; import { useSplitRoomActions } from '../hooks/useSplitRoomActions'; -import RoomInfoActions from './RoomInfoActions'; type RoomInfoProps = { room: IRoom; diff --git a/apps/meteor/client/views/room/contextualBar/Info/RoomInfoRouter.tsx b/apps/meteor/client/views/room/contextualBar/Info/RoomInfoRouter.tsx index 0aa83bd2ec1..643638af9f3 100644 --- a/apps/meteor/client/views/room/contextualBar/Info/RoomInfoRouter.tsx +++ b/apps/meteor/client/views/room/contextualBar/Info/RoomInfoRouter.tsx @@ -2,11 +2,11 @@ import type { IRoom } from '@rocket.chat/core-typings'; import { useMutableCallback } from '@rocket.chat/fuselage-hooks'; import React, { useState } from 'react'; -import { useRoom } from '../../contexts/RoomContext'; -import { useRoomToolbox } from '../../contexts/RoomToolboxContext'; import EditRoomInfoWithData from './EditRoomInfo'; import RoomInfo from './RoomInfo'; import { useCanEditRoom } from './hooks/useCanEditRoom'; +import { useRoom } from '../../contexts/RoomContext'; +import { useRoomToolbox } from '../../contexts/RoomToolboxContext'; type RoomInfoRouterProps = { onClickBack?: () => void; diff --git a/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts b/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts index c56fca0dc2a..592093fa1ae 100644 --- a/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts +++ b/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts @@ -2,11 +2,11 @@ import type { IRoom } from '@rocket.chat/core-typings'; import { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; -import { useDeleteRoom } from '../../../../hooks/roomActions/useDeleteRoom'; import { useRoomConvertToTeam } from './actions/useRoomConvertToTeam'; import { useRoomHide } from './actions/useRoomHide'; import { useRoomLeave } from './actions/useRoomLeave'; import { useRoomMoveToTeam } from './actions/useRoomMoveToTeam'; +import { useDeleteRoom } from '../../../../hooks/roomActions/useDeleteRoom'; type UseRoomActionsOptions = { onClickEnterRoom?: () => void; diff --git a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.stories.tsx b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.stories.tsx index fe5c19b7f85..a43f12fddde 100644 --- a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.stories.tsx @@ -1,8 +1,8 @@ import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; -import { Contextualbar } from '../../../../components/Contextualbar'; import KeyboardShortcutsWithData from './KeyboardShortcutsWithData'; +import { Contextualbar } from '../../../../components/Contextualbar'; export default { title: 'Room/Contextual Bar/KeyboardShortcut', diff --git a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx index 6dab532b27c..608fce5a6b2 100644 --- a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx +++ b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx @@ -2,6 +2,7 @@ import type { ReactElement } from 'react'; import React, { memo } from 'react'; import { useTranslation } from 'react-i18next'; +import KeyboardShortcutSection from './KeyboardShortcutSection'; import { ContextualbarHeader, ContextualbarIcon, @@ -9,7 +10,6 @@ import { ContextualbarClose, ContextualbarScrollableContent, } from '../../../../components/Contextualbar'; -import KeyboardShortcutSection from './KeyboardShortcutSection'; const KeyboardShortcuts = ({ handleClose }: { handleClose: () => void }): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcutsWithData.tsx b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcutsWithData.tsx index b832e10a9e1..776719cc1cf 100644 --- a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcutsWithData.tsx +++ b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcutsWithData.tsx @@ -1,8 +1,8 @@ import type { ReactElement } from 'react'; import React from 'react'; -import { useRoomToolbox } from '../../contexts/RoomToolboxContext'; import KeyboardShortcuts from './KeyboardShortcuts'; +import { useRoomToolbox } from '../../contexts/RoomToolboxContext'; const KeyboardShortcutsWithData = (): ReactElement => { const { closeTab } = useRoomToolbox(); diff --git a/apps/meteor/client/views/room/contextualBar/MentionsTab.tsx b/apps/meteor/client/views/room/contextualBar/MentionsTab.tsx index 42a643e9971..d03277cddf8 100644 --- a/apps/meteor/client/views/room/contextualBar/MentionsTab.tsx +++ b/apps/meteor/client/views/room/contextualBar/MentionsTab.tsx @@ -5,9 +5,9 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import MessageListTab from './MessageListTab'; import { mapMessageFromApi } from '../../../lib/utils/mapMessageFromApi'; import { useRoom } from '../contexts/RoomContext'; -import MessageListTab from './MessageListTab'; const MentionsTab = (): ReactElement => { const getMentionedMessages = useEndpoint('GET', '/v1/chat.getMentionedMessages'); diff --git a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx index 6a3c74fd3fa..74d78ab1507 100644 --- a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx +++ b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx @@ -2,6 +2,9 @@ import { Callout } from '@rocket.chat/fuselage'; import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; +import MessageSearch from './components/MessageSearch'; +import MessageSearchForm from './components/MessageSearchForm'; +import { useMessageSearchProviderQuery } from './hooks/useMessageSearchProviderQuery'; import { ContextualbarClose, ContextualbarContent, @@ -11,9 +14,6 @@ import { ContextualbarSection, } from '../../../../components/Contextualbar'; import { useRoomToolbox } from '../../contexts/RoomToolboxContext'; -import MessageSearch from './components/MessageSearch'; -import MessageSearchForm from './components/MessageSearchForm'; -import { useMessageSearchProviderQuery } from './hooks/useMessageSearchProviderQuery'; const MessageSearchTab = () => { const providerQuery = useMessageSearchProviderQuery(); diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.stories.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.stories.tsx index 083359eaee7..186c41fa008 100644 --- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.stories.tsx @@ -2,8 +2,8 @@ import { action } from '@storybook/addon-actions'; import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; -import { Contextualbar } from '../../../../components/Contextualbar'; import NotificationsPreferences from './NotificationPreferences'; +import { Contextualbar } from '../../../../components/Contextualbar'; export default { title: 'Room/Contextual Bar/NotificationsPreferences', diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx index c7ccb8b6123..ad2e07c24e0 100644 --- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx +++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx @@ -5,6 +5,7 @@ import React from 'react'; import { useFormContext } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; +import NotificationPreferencesForm from './NotificationPreferencesForm'; import { ContextualbarHeader, ContextualbarIcon, @@ -13,7 +14,6 @@ import { ContextualbarScrollableContent, ContextualbarFooter, } from '../../../../components/Contextualbar'; -import NotificationPreferencesForm from './NotificationPreferencesForm'; type NotificationPreferencesProps = { handleClose: () => void; diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesWithData.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesWithData.tsx index dc34260c6e7..c893a6efc29 100644 --- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesWithData.tsx +++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesWithData.tsx @@ -4,10 +4,10 @@ import type { ReactElement } from 'react'; import React, { memo } from 'react'; import { useForm, FormProvider } from 'react-hook-form'; +import NotificationPreferences from './NotificationPreferences'; import { useEndpointAction } from '../../../../hooks/useEndpointAction'; import { useRoom, useRoomSubscription } from '../../contexts/RoomContext'; import { useRoomToolbox } from '../../contexts/RoomToolboxContext'; -import NotificationPreferences from './NotificationPreferences'; export type NotificationFormValues = { turnOn: boolean; diff --git a/apps/meteor/client/views/room/contextualBar/OTR/OTR.stories.tsx b/apps/meteor/client/views/room/contextualBar/OTR/OTR.stories.tsx index 65da453ec5f..902acab0338 100644 --- a/apps/meteor/client/views/room/contextualBar/OTR/OTR.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/OTR/OTR.stories.tsx @@ -1,9 +1,9 @@ import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; +import OTR from './OTR'; import { OtrRoomState } from '../../../../../app/otr/lib/OtrRoomState'; import { Contextualbar } from '../../../../components/Contextualbar'; -import OTR from './OTR'; export default { title: 'Room/Contextual Bar/OTR', diff --git a/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx b/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx index b6b5c39466c..ce47e10d9a2 100644 --- a/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx +++ b/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx @@ -4,6 +4,8 @@ import type { MouseEventHandler, ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import OTREstablished from './components/OTREstablished'; +import OTRStates from './components/OTRStates'; import { OtrRoomState } from '../../../../../app/otr/lib/OtrRoomState'; import { ContextualbarHeader, @@ -13,8 +15,6 @@ import { ContextualbarScrollableContent, } from '../../../../components/Contextualbar'; import { useRoom } from '../../contexts/RoomContext'; -import OTREstablished from './components/OTREstablished'; -import OTRStates from './components/OTRStates'; type OTRProps = { isOnline: boolean; diff --git a/apps/meteor/client/views/room/contextualBar/OTR/OTRWithData.tsx b/apps/meteor/client/views/room/contextualBar/OTR/OTRWithData.tsx index c64d76892cb..5f0650b05c1 100644 --- a/apps/meteor/client/views/room/contextualBar/OTR/OTRWithData.tsx +++ b/apps/meteor/client/views/room/contextualBar/OTR/OTRWithData.tsx @@ -1,11 +1,11 @@ import type { ReactElement } from 'react'; import React, { useEffect } from 'react'; +import OTRComponent from './OTR'; import { OtrRoomState } from '../../../../../app/otr/lib/OtrRoomState'; import { useOTR } from '../../../../hooks/useOTR'; import { usePresence } from '../../../../hooks/usePresence'; import { useRoomToolbox } from '../../contexts/RoomToolboxContext'; -import OTRComponent from './OTR'; const OTRWithData = (): ReactElement => { const { otr, otrState } = useOTR(); diff --git a/apps/meteor/client/views/room/contextualBar/PinnedMessagesTab.tsx b/apps/meteor/client/views/room/contextualBar/PinnedMessagesTab.tsx index 102fc46ebfa..82a002c40c9 100644 --- a/apps/meteor/client/views/room/contextualBar/PinnedMessagesTab.tsx +++ b/apps/meteor/client/views/room/contextualBar/PinnedMessagesTab.tsx @@ -5,10 +5,10 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import MessageListTab from './MessageListTab'; import { onClientMessageReceived } from '../../../lib/onClientMessageReceived'; import { mapMessageFromApi } from '../../../lib/utils/mapMessageFromApi'; import { useRoom } from '../contexts/RoomContext'; -import MessageListTab from './MessageListTab'; const PinnedMessagesTab = (): ReactElement => { const getPinnedMessages = useEndpoint('GET', '/v1/chat.getPinnedMessages'); diff --git a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.stories.tsx b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.stories.tsx index 2452a91fe9b..678d22cb4f3 100644 --- a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.stories.tsx @@ -2,8 +2,8 @@ import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; import { FormProvider, useForm } from 'react-hook-form'; -import { Contextualbar } from '../../../../components/Contextualbar'; import PruneMessages from './PruneMessages'; +import { Contextualbar } from '../../../../components/Contextualbar'; export default { title: 'Room/Contextual Bar/PruneMessages', diff --git a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx index 88b979dc8bc..6ade99ea391 100644 --- a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx +++ b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx @@ -5,6 +5,7 @@ import React from 'react'; import { useFormContext, Controller } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; +import PruneMessagesDateTimeRow from './PruneMessagesDateTimeRow'; import { ContextualbarHeader, ContextualbarIcon, @@ -14,7 +15,6 @@ import { ContextualbarClose, } from '../../../../components/Contextualbar'; import UserAutoCompleteMultiple from '../../../../components/UserAutoCompleteMultiple'; -import PruneMessagesDateTimeRow from './PruneMessagesDateTimeRow'; type PruneMessagesProps = { callOutText?: string; diff --git a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessagesWithData.tsx b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessagesWithData.tsx index 7ed26bfab0e..b3254ec3f3b 100644 --- a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessagesWithData.tsx +++ b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessagesWithData.tsx @@ -7,10 +7,10 @@ import React, { useCallback, useMemo, useState } from 'react'; import { useForm, FormProvider } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; +import PruneMessages from './PruneMessages'; import GenericModal from '../../../../components/GenericModal'; import { useRoom } from '../../contexts/RoomContext'; import { useRoomToolbox } from '../../contexts/RoomToolboxContext'; -import PruneMessages from './PruneMessages'; const getTimeZoneOffset = (): string => { const offset = new Date().getTimezoneOffset(); diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.stories.tsx index 0fb585c8d13..3208ad699ce 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.stories.tsx @@ -2,8 +2,8 @@ import { action } from '@storybook/addon-actions'; import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; -import { Contextualbar } from '../../../../components/Contextualbar'; import RoomFiles from './RoomFiles'; +import { Contextualbar } from '../../../../components/Contextualbar'; export default { title: 'Room/Contextual Bar/RoomFiles', diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx index e699ee6f6c7..81a8ed42e2c 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx @@ -6,6 +6,7 @@ import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { Virtuoso } from 'react-virtuoso'; +import FileItem from './components/FileItem'; import { ContextualbarHeader, ContextualbarIcon, @@ -15,7 +16,6 @@ import { ContextualbarEmptyContent, } from '../../../../components/Contextualbar'; import { VirtuosoScrollbars } from '../../../../components/CustomScrollbars'; -import FileItem from './components/FileItem'; type RoomFilesProps = { loading: boolean; diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFilesWithData.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFilesWithData.tsx index 1b8e0f8e650..40de6a0cf93 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFilesWithData.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFilesWithData.tsx @@ -1,13 +1,13 @@ import { useLocalStorage } from '@rocket.chat/fuselage-hooks'; import React, { useState, useCallback, useMemo } from 'react'; +import RoomFiles from './RoomFiles'; +import { useDeleteFile } from './hooks/useDeleteFile'; +import { useFilesList } from './hooks/useFilesList'; import { useRecordList } from '../../../../hooks/lists/useRecordList'; import { AsyncStatePhase } from '../../../../hooks/useAsyncState'; import { useRoom } from '../../contexts/RoomContext'; import { useRoomToolbox } from '../../contexts/RoomToolboxContext'; -import RoomFiles from './RoomFiles'; -import { useDeleteFile } from './hooks/useDeleteFile'; -import { useFilesList } from './hooks/useFilesList'; const RoomFilesWithData = () => { const room = useRoom(); diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.stories.tsx index 7740c22924b..bdce083f803 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.stories.tsx @@ -1,8 +1,8 @@ import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; -import { Contextualbar } from '../../../../../components/Contextualbar'; import FileItem from './FileItem'; +import { Contextualbar } from '../../../../../components/Contextualbar'; export default { title: 'Room/Contextual Bar/RoomFiles/FileItem', diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.tsx index a13014fb783..2d9026afa1b 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.tsx @@ -3,11 +3,11 @@ import { css } from '@rocket.chat/css-in-js'; import { Box, Palette } from '@rocket.chat/fuselage'; import React from 'react'; -import { useDownloadFromServiceWorker } from '../../../../../hooks/useDownloadFromServiceWorker'; -import { useFormatDateAndTime } from '../../../../../hooks/useFormatDateAndTime'; import FileItemIcon from './FileItemIcon'; import FileItemMenu from './FileItemMenu'; import ImageItem from './ImageItem'; +import { useDownloadFromServiceWorker } from '../../../../../hooks/useDownloadFromServiceWorker'; +import { useFormatDateAndTime } from '../../../../../hooks/useFormatDateAndTime'; const hoverClass = css` &:hover { diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.stories.tsx index 532c377aea7..528c88b852d 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.stories.tsx @@ -1,8 +1,8 @@ import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; -import { Contextualbar } from '../../../../../components/Contextualbar'; import AddUsers from './AddUsers'; +import { Contextualbar } from '../../../../../components/Contextualbar'; export default { title: 'Room/Contextual Bar/RoomMembers/AddUsers', diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx index 8612583a764..23e0db5a76b 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx @@ -8,6 +8,7 @@ import React from 'react'; import { Controller, useForm } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; +import { useAddMatrixUsers } from './AddMatrixUsers/useAddMatrixUsers'; import { ContextualbarHeader, ContextualbarBack, @@ -20,7 +21,6 @@ import UserAutoCompleteMultiple from '../../../../../components/UserAutoComplete import UserAutoCompleteMultipleFederated from '../../../../../components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated'; import { useRoom } from '../../../contexts/RoomContext'; import { useRoomToolbox } from '../../../contexts/RoomToolboxContext'; -import { useAddMatrixUsers } from './AddMatrixUsers/useAddMatrixUsers'; type AddUsersProps = { rid: IRoom['_id']; diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.stories.tsx index 31fc774dcb3..eebacbc20db 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.stories.tsx @@ -1,8 +1,8 @@ import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; -import { Contextualbar } from '../../../../../components/Contextualbar'; import InviteUsers from './InviteUsers'; +import { Contextualbar } from '../../../../../components/Contextualbar'; export default { title: 'Room/Contextual Bar/RoomMembers/InviteUsers', diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx index 1ae82e75681..f96e5925d9c 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx @@ -3,6 +3,8 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import EditInviteLink from './EditInviteLink'; +import InviteLink from './InviteLink'; import { ContextualbarHeader, ContextualbarTitle, @@ -10,8 +12,6 @@ import { ContextualbarClose, ContextualbarScrollableContent, } from '../../../../../components/Contextualbar'; -import EditInviteLink from './EditInviteLink'; -import InviteLink from './InviteLink'; type InviteUsersProps = { onClickBackMembers?: () => void; diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsersWithData.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsersWithData.tsx index 88dad1edd74..ccfa4f2a555 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsersWithData.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsersWithData.tsx @@ -4,9 +4,9 @@ import { useEndpoint, useTranslation, useToastMessageDispatch } from '@rocket.ch import type { ReactElement } from 'react'; import React, { useState, useEffect } from 'react'; +import InviteUsers from './InviteUsers'; import { useFormatDateAndTime } from '../../../../../hooks/useFormatDateAndTime'; import { useRoomToolbox } from '../../../contexts/RoomToolboxContext'; -import InviteUsers from './InviteUsers'; type InviteUsersWithDataProps = { rid: IRoom['_id']; diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.stories.tsx index 05a8987855a..379a966ba9f 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.stories.tsx @@ -3,8 +3,8 @@ import { action } from '@storybook/addon-actions'; import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; -import { Contextualbar } from '../../../../components/Contextualbar'; import RoomMembers from './RoomMembers'; +import { Contextualbar } from '../../../../components/Contextualbar'; export default { title: 'Room/Contextual Bar/RoomMembers', diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx index 1c31f31ae4f..0f182215190 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx @@ -7,6 +7,7 @@ import type { ReactElement, FormEventHandler, ComponentProps, MouseEvent } from import React, { useMemo } from 'react'; import { Virtuoso } from 'react-virtuoso'; +import RoomMembersRow from './RoomMembersRow'; import { ContextualbarHeader, ContextualbarIcon, @@ -19,7 +20,6 @@ import { } from '../../../../components/Contextualbar'; import { VirtuosoScrollbars } from '../../../../components/CustomScrollbars'; import InfiniteListAnchor from '../../../../components/InfiniteListAnchor'; -import RoomMembersRow from './RoomMembersRow'; type RoomMemberUser = Pick; diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx index 562d36536db..1c1a570d864 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx @@ -15,10 +15,10 @@ import { UserAvatar } from '@rocket.chat/ui-avatar'; import type { ReactElement, MouseEvent } from 'react'; import React, { useState } from 'react'; +import UserActions from './RoomMembersActions'; import { getUserDisplayNames } from '../../../../../lib/getUserDisplayNames'; import { ReactiveUserStatus } from '../../../../components/UserStatus'; import { usePreventPropagation } from '../../../../hooks/usePreventPropagation'; -import UserActions from './RoomMembersActions'; type RoomMembersItemProps = { onClickView: (e: MouseEvent) => void; diff --git a/apps/meteor/client/views/room/contextualBar/StarredMessagesTab.tsx b/apps/meteor/client/views/room/contextualBar/StarredMessagesTab.tsx index f835ae41698..f120db8cb40 100644 --- a/apps/meteor/client/views/room/contextualBar/StarredMessagesTab.tsx +++ b/apps/meteor/client/views/room/contextualBar/StarredMessagesTab.tsx @@ -4,10 +4,10 @@ import { useQuery } from '@tanstack/react-query'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import MessageListTab from './MessageListTab'; import { onClientMessageReceived } from '../../../lib/onClientMessageReceived'; import { mapMessageFromApi } from '../../../lib/utils/mapMessageFromApi'; import { useRoom } from '../contexts/RoomContext'; -import MessageListTab from './MessageListTab'; const StarredMessagesTab = () => { const getStarredMessages = useEndpoint('GET', '/v1/chat.getStarredMessages'); diff --git a/apps/meteor/client/views/room/contextualBar/Threads/Thread.tsx b/apps/meteor/client/views/room/contextualBar/Threads/Thread.tsx index a66d7e6fca4..d69c3958050 100644 --- a/apps/meteor/client/views/room/contextualBar/Threads/Thread.tsx +++ b/apps/meteor/client/views/room/contextualBar/Threads/Thread.tsx @@ -5,6 +5,11 @@ import { useLocalStorage } from '@rocket.chat/fuselage-hooks'; import { useLayoutContextualBarExpanded, useToastMessageDispatch, useTranslation, useUserId } from '@rocket.chat/ui-contexts'; import React from 'react'; +import ThreadChat from './components/ThreadChat'; +import ThreadSkeleton from './components/ThreadSkeleton'; +import ThreadTitle from './components/ThreadTitle'; +import { useThreadMainMessageQuery } from './hooks/useThreadMainMessageQuery'; +import { useToggleFollowingThreadMutation } from './hooks/useToggleFollowingThreadMutation'; import { Contextualbar, ContextualbarHeader, @@ -17,11 +22,6 @@ import { import { useRoomToolbox } from '../../contexts/RoomToolboxContext'; import { useGoToThreadList } from '../../hooks/useGoToThreadList'; import ChatProvider from '../../providers/ChatProvider'; -import ThreadChat from './components/ThreadChat'; -import ThreadSkeleton from './components/ThreadSkeleton'; -import ThreadTitle from './components/ThreadTitle'; -import { useThreadMainMessageQuery } from './hooks/useThreadMainMessageQuery'; -import { useToggleFollowingThreadMutation } from './hooks/useToggleFollowingThreadMutation'; type ThreadProps = { tmid: IMessage['_id']; diff --git a/apps/meteor/client/views/room/contextualBar/Threads/ThreadList.tsx b/apps/meteor/client/views/room/contextualBar/Threads/ThreadList.tsx index 18807059eb8..6f6f941f48c 100644 --- a/apps/meteor/client/views/room/contextualBar/Threads/ThreadList.tsx +++ b/apps/meteor/client/views/room/contextualBar/Threads/ThreadList.tsx @@ -6,6 +6,8 @@ import type { FormEvent, ReactElement } from 'react'; import React, { useMemo, useState, useCallback } from 'react'; import { Virtuoso } from 'react-virtuoso'; +import ThreadListItem from './components/ThreadListItem'; +import { useThreadsList } from './hooks/useThreadsList'; import { ContextualbarClose, ContextualbarContent, @@ -22,8 +24,6 @@ import type { ThreadsListOptions } from '../../../../lib/lists/ThreadsList'; import { useRoom, useRoomSubscription } from '../../contexts/RoomContext'; import { useRoomToolbox } from '../../contexts/RoomToolboxContext'; import { useGoToThread } from '../../hooks/useGoToThread'; -import ThreadListItem from './components/ThreadListItem'; -import { useThreadsList } from './hooks/useThreadsList'; type ThreadType = 'all' | 'following' | 'unread'; diff --git a/apps/meteor/client/views/room/contextualBar/Threads/Threads.tsx b/apps/meteor/client/views/room/contextualBar/Threads/Threads.tsx index 39588f2dfc7..b4a970fb39c 100644 --- a/apps/meteor/client/views/room/contextualBar/Threads/Threads.tsx +++ b/apps/meteor/client/views/room/contextualBar/Threads/Threads.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import { useRoomToolbox } from '../../contexts/RoomToolboxContext'; import Thread from './Thread'; import ThreadList from './ThreadList'; +import { useRoomToolbox } from '../../contexts/RoomToolboxContext'; const Threads = () => { const { context: tmid } = useRoomToolbox(); diff --git a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadChat.tsx b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadChat.tsx index 7afe0b442bb..1edf74a34bf 100644 --- a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadChat.tsx +++ b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadChat.tsx @@ -5,6 +5,7 @@ import { useUniqueId } from '@rocket.chat/fuselage-hooks'; import { useMethod, useTranslation, useUserPreference } from '@rocket.chat/ui-contexts'; import React, { useState, useEffect, useCallback } from 'react'; +import ThreadMessageList from './ThreadMessageList'; import { callbacks } from '../../../../../../lib/callbacks'; import { ContextualbarContent } from '../../../../../components/Contextualbar'; import MessageListErrorBoundary from '../../../MessageList/MessageListErrorBoundary'; @@ -16,7 +17,6 @@ import { useChat } from '../../../contexts/ChatContext'; import { useRoom, useRoomSubscription } from '../../../contexts/RoomContext'; import { useRoomToolbox } from '../../../contexts/RoomToolboxContext'; import { DateListProvider } from '../../../providers/DateListProvider'; -import ThreadMessageList from './ThreadMessageList'; type ThreadChatProps = { mainMessage: IThreadMainMessage; diff --git a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListItem.tsx b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListItem.tsx index 72dc402fb88..69e1b530a07 100644 --- a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListItem.tsx +++ b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListItem.tsx @@ -5,9 +5,9 @@ import { useMethod, useSetting, useToastMessageDispatch, useUserId } from '@rock import type { MouseEvent, ReactElement } from 'react'; import React, { useCallback, memo } from 'react'; +import ThreadListMessage from './ThreadListMessage'; import { useDecryptedMessage } from '../../../../../hooks/useDecryptedMessage'; import { normalizeThreadMessage } from '../../../../../lib/normalizeThreadMessage'; -import ThreadListMessage from './ThreadListMessage'; type ThreadListItemProps = { thread: IMessage; diff --git a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageList.tsx b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageList.tsx index 3b0a5c2b054..fff5d55e31c 100644 --- a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageList.tsx +++ b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageList.tsx @@ -7,6 +7,7 @@ import type { ReactElement } from 'react'; import React, { Fragment } from 'react'; import { useTranslation } from 'react-i18next'; +import { ThreadMessageItem } from './ThreadMessageItem'; import { MessageTypes } from '../../../../../../app/ui-utils/client'; import { isTruthy } from '../../../../../../lib/isTruthy'; import { CustomScrollbars } from '../../../../../components/CustomScrollbars'; @@ -20,7 +21,6 @@ import { useMessageListNavigation } from '../../../hooks/useMessageListNavigatio import { useLegacyThreadMessageJump } from '../hooks/useLegacyThreadMessageJump'; import { useLegacyThreadMessageListScrolling } from '../hooks/useLegacyThreadMessageListScrolling'; import { useLegacyThreadMessages } from '../hooks/useLegacyThreadMessages'; -import { ThreadMessageItem } from './ThreadMessageItem'; const isMessageSequential = (current: IMessage, previous: IMessage | undefined, groupingRange: number): boolean => { if (!previous) { diff --git a/apps/meteor/client/views/room/contextualBar/Threads/hooks/useThreadMainMessageQuery.ts b/apps/meteor/client/views/room/contextualBar/Threads/hooks/useThreadMainMessageQuery.ts index 76e80d774ca..1636489e7d0 100644 --- a/apps/meteor/client/views/room/contextualBar/Threads/hooks/useThreadMainMessageQuery.ts +++ b/apps/meteor/client/views/room/contextualBar/Threads/hooks/useThreadMainMessageQuery.ts @@ -4,12 +4,12 @@ import type { UseQueryResult } from '@tanstack/react-query'; import { useQueryClient, useQuery } from '@tanstack/react-query'; import { useCallback, useEffect, useRef } from 'react'; +import { useGetMessageByID } from './useGetMessageByID'; import { withDebouncing } from '../../../../../../lib/utils/highOrderFunctions'; import type { FieldExpression, Query } from '../../../../../lib/minimongo'; import { createFilterFromQuery } from '../../../../../lib/minimongo'; import { onClientMessageReceived } from '../../../../../lib/onClientMessageReceived'; import { useRoom } from '../../../contexts/RoomContext'; -import { useGetMessageByID } from './useGetMessageByID'; type RoomMessagesRidEvent = IMessage; diff --git a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx index d22f3b58512..e207f62039c 100644 --- a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx +++ b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx @@ -5,6 +5,7 @@ import type { ReactElement } from 'react'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import UserInfoActions from './UserInfoActions'; import { getUserEmailAddress } from '../../../../../lib/getUserEmailAddress'; import { ContextualbarHeader, @@ -21,7 +22,6 @@ import { ReactiveUserStatus } from '../../../../components/UserStatus'; import { AsyncStatePhase } from '../../../../hooks/useAsyncState'; import { useEndpointData } from '../../../../hooks/useEndpointData'; import { getUserEmailVerified } from '../../../../lib/utils/getUserEmailVerified'; -import UserInfoActions from './UserInfoActions'; type UserInfoWithDataProps = { uid?: IUser['_id']; diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx index fbd9734b1b7..ea3a4a4ed1a 100644 --- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx +++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx @@ -6,6 +6,7 @@ import React from 'react'; import { useTranslation } from 'react-i18next'; import { Virtuoso } from 'react-virtuoso'; +import VideoConfListItem from './VideoConfListItem'; import { ContextualbarHeader, ContextualbarIcon, @@ -16,7 +17,6 @@ import { } from '../../../../../components/Contextualbar'; import { VirtuosoScrollbars } from '../../../../../components/CustomScrollbars'; import { getErrorMessage } from '../../../../../lib/errorHandling'; -import VideoConfListItem from './VideoConfListItem'; type VideoConfListProps = { onClose: () => void; diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListWithData.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListWithData.tsx index c0bf41c5906..12ebc5dc706 100644 --- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListWithData.tsx +++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListWithData.tsx @@ -1,11 +1,11 @@ import React, { useMemo } from 'react'; +import VideoConfList from './VideoConfList'; +import { useVideoConfList } from './useVideoConfList'; import { useRecordList } from '../../../../../hooks/lists/useRecordList'; import { AsyncStatePhase } from '../../../../../hooks/useAsyncState'; import { useRoom } from '../../../contexts/RoomContext'; import { useRoomToolbox } from '../../../contexts/RoomToolboxContext'; -import VideoConfList from './VideoConfList'; -import { useVideoConfList } from './useVideoConfList'; const VideoConfListWithData = () => { const room = useRoom(); diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/useVideoConfList.ts b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/useVideoConfList.ts index c676319b26c..ce9d991dd3f 100644 --- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/useVideoConfList.ts +++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/useVideoConfList.ts @@ -2,9 +2,9 @@ import type { IRoom } from '@rocket.chat/core-typings'; import { useEndpoint } from '@rocket.chat/ui-contexts'; import { useCallback, useState } from 'react'; +import { VideoConfRecordList } from './VideoConfRecordList'; import { useScrollableRecordList } from '../../../../../hooks/lists/useScrollableRecordList'; import { useComponentDidUpdate } from '../../../../../hooks/useComponentDidUpdate'; -import { VideoConfRecordList } from './VideoConfRecordList'; export const useVideoConfList = (options: { roomId: IRoom['_id']; diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx index 09ddfb51b3a..77dca0ce0c6 100644 --- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx +++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx @@ -17,10 +17,10 @@ import type { ReactElement } from 'react'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import VideoConfPopupRoomInfo from './VideoConfPopupRoomInfo'; import { useVideoConfSetPreferences } from '../../../../../../contexts/VideoConfContext'; import { AsyncStatePhase } from '../../../../../../hooks/useAsyncState'; import { useEndpointData } from '../../../../../../hooks/useEndpointData'; -import VideoConfPopupRoomInfo from './VideoConfPopupRoomInfo'; type IncomingPopupProps = { id: string; diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx index eaf82c5a301..c375b7b544c 100644 --- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx +++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx @@ -15,8 +15,8 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { useVideoConfCapabilities, useVideoConfPreferences } from '../../../../../../contexts/VideoConfContext'; import VideoConfPopupRoomInfo from './VideoConfPopupRoomInfo'; +import { useVideoConfCapabilities, useVideoConfPreferences } from '../../../../../../contexts/VideoConfContext'; type OutgoingPopupProps = { id: string; diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx index a9fcb852776..f28f76ace5e 100644 --- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx +++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx @@ -16,9 +16,9 @@ import type { KeyboardEvent, ReactElement } from 'react'; import React, { useCallback, useRef } from 'react'; import { useTranslation } from 'react-i18next'; +import VideoConfPopupRoomInfo from './VideoConfPopupRoomInfo'; import { useVideoConfSetPreferences, useVideoConfCapabilities, useVideoConfPreferences } from '../../../../../../contexts/VideoConfContext'; import { useVideoConfRoomName } from '../../hooks/useVideoConfRoomName'; -import VideoConfPopupRoomInfo from './VideoConfPopupRoomInfo'; type StartCallPopupProps = { id: string; diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/TimedVideoConfPopup.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/TimedVideoConfPopup.tsx index b4fca03406f..9137b9b0303 100644 --- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/TimedVideoConfPopup.tsx +++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/TimedVideoConfPopup.tsx @@ -3,6 +3,9 @@ import { useUserRoom } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React, { useState } from 'react'; +import IncomingPopup from './IncomingPopup'; +import OutgoingPopup from './OutgoingPopup'; +import StartCallPopup from './StartCallPopup'; import { useVideoConfAcceptCall, useVideoConfAbortCall, @@ -11,9 +14,6 @@ import { useVideoConfStartCall, useVideoConfDismissOutgoing, } from '../../../../../../contexts/VideoConfContext'; -import IncomingPopup from './IncomingPopup'; -import OutgoingPopup from './OutgoingPopup'; -import StartCallPopup from './StartCallPopup'; type TimedVideoConfPopupProps = { id: string; diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopups.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopups.tsx index 9a4b8a21ce1..7130e878fd7 100644 --- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopups.tsx +++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopups.tsx @@ -4,10 +4,10 @@ import type { ReactElement } from 'react'; import React, { useEffect, useMemo } from 'react'; import { FocusScope } from 'react-aria'; +import VideoConfPopup from './VideoConfPopup'; import type { VideoConfPopupPayload } from '../../../../../contexts/VideoConfContext'; import { useVideoConfIsCalling, useVideoConfIsRinging, useVideoConfIncomingCalls } from '../../../../../contexts/VideoConfContext'; import VideoConfPopupPortal from '../../../../../portals/VideoConfPopupPortal'; -import VideoConfPopup from './VideoConfPopup'; const VideoConfPopups = ({ children }: { children?: VideoConfPopupPayload }): ReactElement => { const customSound = useCustomSound(); diff --git a/apps/meteor/client/views/room/hooks/useE2EEResetRoomKey.spec.ts b/apps/meteor/client/views/room/hooks/useE2EEResetRoomKey.spec.ts index 44fb054ee21..be7d3341da0 100644 --- a/apps/meteor/client/views/room/hooks/useE2EEResetRoomKey.spec.ts +++ b/apps/meteor/client/views/room/hooks/useE2EEResetRoomKey.spec.ts @@ -1,8 +1,8 @@ import { mockAppRoot } from '@rocket.chat/mock-providers'; import { renderHook, waitFor } from '@testing-library/react'; -import { e2e } from '../../../../app/e2e/client'; import { useE2EEResetRoomKey } from './useE2EEResetRoomKey'; +import { e2e } from '../../../../app/e2e/client'; jest.mock('../../../../app/e2e/client', () => ({ e2e: { diff --git a/apps/meteor/client/views/room/hooks/useE2EERoomState.ts b/apps/meteor/client/views/room/hooks/useE2EERoomState.ts index c541aad121d..b1fcc8408bc 100644 --- a/apps/meteor/client/views/room/hooks/useE2EERoomState.ts +++ b/apps/meteor/client/views/room/hooks/useE2EERoomState.ts @@ -1,8 +1,8 @@ import { useMemo } from 'react'; import { useSyncExternalStore } from 'use-sync-external-store/shim'; -import type { E2ERoomState } from '../../../../app/e2e/client/E2ERoomState'; import { useE2EERoom } from './useE2EERoom'; +import type { E2ERoomState } from '../../../../app/e2e/client/E2ERoomState'; export const useE2EERoomState = (rid: string) => { const e2eRoom = useE2EERoom(rid); diff --git a/apps/meteor/client/views/room/hooks/useRetentionPolicy.spec.ts b/apps/meteor/client/views/room/hooks/useRetentionPolicy.spec.ts index b5d9079c9ca..49ae90c0eb4 100644 --- a/apps/meteor/client/views/room/hooks/useRetentionPolicy.spec.ts +++ b/apps/meteor/client/views/room/hooks/useRetentionPolicy.spec.ts @@ -1,8 +1,8 @@ import { mockAppRoot } from '@rocket.chat/mock-providers'; import { renderHook } from '@testing-library/react'; -import { createFakeRoom } from '../../../../tests/mocks/data'; import { useRetentionPolicy } from './useRetentionPolicy'; +import { createFakeRoom } from '../../../../tests/mocks/data'; const getGlobalSettings = ({ enabled = false, diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts b/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts index 90dbfbbaba4..be78886ee39 100644 --- a/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts +++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts @@ -5,7 +5,6 @@ import { useLayoutHiddenActions } from '@rocket.chat/ui-contexts'; import type { ComponentProps } from 'react'; import { useMemo } from 'react'; -import { useEmbeddedLayout } from '../../../../hooks/useEmbeddedLayout'; import { useAddUserAction } from './actions/useAddUserAction'; import { useBlockUserAction } from './actions/useBlockUserAction'; import { useChangeLeaderAction } from './actions/useChangeLeaderAction'; @@ -19,6 +18,7 @@ import { useRemoveUserAction } from './actions/useRemoveUserAction'; import { useReportUser } from './actions/useReportUser'; import { useVideoCallAction } from './actions/useVideoCallAction'; import { useVoipCallAction } from './actions/useVoipCallAction'; +import { useEmbeddedLayout } from '../../../../hooks/useEmbeddedLayout'; export type UserInfoActionType = 'communication' | 'privileges' | 'management' | 'moderation'; diff --git a/apps/meteor/client/views/room/modals/FileUploadModal/FilePreview.tsx b/apps/meteor/client/views/room/modals/FileUploadModal/FilePreview.tsx index c898c8b0081..757efd24682 100644 --- a/apps/meteor/client/views/room/modals/FileUploadModal/FilePreview.tsx +++ b/apps/meteor/client/views/room/modals/FileUploadModal/FilePreview.tsx @@ -1,9 +1,9 @@ import type { ReactElement } from 'react'; import React from 'react'; -import { isIE11 } from '../../../../lib/utils/isIE11'; import GenericPreview from './GenericPreview'; import MediaPreview from './MediaPreview'; +import { isIE11 } from '../../../../lib/utils/isIE11'; export enum FilePreviewType { IMAGE = 'image', diff --git a/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx b/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx index ff96e220723..05be2381f32 100644 --- a/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx +++ b/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx @@ -3,10 +3,10 @@ import type { ReactElement } from 'react'; import React, { useEffect, useState, memo } from 'react'; import { useTranslation } from 'react-i18next'; -import { userAgentMIMETypeFallback } from '../../../../lib/utils/userAgentMIMETypeFallback'; import { FilePreviewType } from './FilePreview'; import ImagePreview from './ImagePreview'; import PreviewSkeleton from './PreviewSkeleton'; +import { userAgentMIMETypeFallback } from '../../../../lib/utils/userAgentMIMETypeFallback'; type ReaderOnloadCallback = (url: FileReader['result']) => void; diff --git a/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx b/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx index cd309923ffd..18e7a60d586 100644 --- a/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx +++ b/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx @@ -3,8 +3,8 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import GenericModal from '../../../../components/GenericModal'; import Reactions from './Reactions'; +import GenericModal from '../../../../components/GenericModal'; type ReactionListModalProps = { reactions: Required['reactions']; diff --git a/apps/meteor/client/views/room/modals/ReactionListModal/Reactions.tsx b/apps/meteor/client/views/room/modals/ReactionListModal/Reactions.tsx index 1e4d997bdfb..d266dce22d1 100644 --- a/apps/meteor/client/views/room/modals/ReactionListModal/Reactions.tsx +++ b/apps/meteor/client/views/room/modals/ReactionListModal/Reactions.tsx @@ -4,8 +4,8 @@ import { useSetting } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; -import Emoji from '../../../../components/Emoji'; import ReactionUserTag from './ReactionUserTag'; +import Emoji from '../../../../components/Emoji'; const Reactions = ({ reactions }: { reactions: Required['reactions'] }): ReactElement => { const useRealName = useSetting('UI_Use_Real_Name'); diff --git a/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptsModal.tsx b/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptsModal.tsx index 4f99ac5be8c..f07f98cdcd4 100644 --- a/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptsModal.tsx +++ b/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptsModal.tsx @@ -5,9 +5,9 @@ import type { ReactElement } from 'react'; import React, { useEffect } from 'react'; import { useTranslation } from 'react-i18next'; +import ReadReceiptRow from './ReadReceiptRow'; import GenericModal from '../../../../components/GenericModal'; import GenericModalSkeleton from '../../../../components/GenericModal/GenericModalSkeleton'; -import ReadReceiptRow from './ReadReceiptRow'; type ReadReceiptsModalProps = { messageId: IMessage['_id']; @@ -41,7 +41,7 @@ const ReadReceiptsModal = ({ messageId, onClose }: ReadReceiptsModalProps): Reac {readReceipts.length > 0 && (
{readReceipts.map((receipt) => ( - + ))}
)} diff --git a/apps/meteor/client/views/room/providers/RoomProvider.tsx b/apps/meteor/client/views/room/providers/RoomProvider.tsx index d67c8566e3c..7edd0591e98 100644 --- a/apps/meteor/client/views/room/providers/RoomProvider.tsx +++ b/apps/meteor/client/views/room/providers/RoomProvider.tsx @@ -3,9 +3,15 @@ import { useRouter } from '@rocket.chat/ui-contexts'; import type { ReactNode, ContextType, ReactElement } from 'react'; import React, { useMemo, memo, useEffect, useCallback } from 'react'; +import ComposerPopupProvider from './ComposerPopupProvider'; +import RoomToolboxProvider from './RoomToolboxProvider'; +import UserCardProvider from './UserCardProvider'; +import { useRedirectOnSettingsChanged } from './hooks/useRedirectOnSettingsChanged'; +import { useRoomQuery } from './hooks/useRoomQuery'; +import { useUsersNameChanged } from './hooks/useUsersNameChanged'; import { ChatSubscription } from '../../../../app/models/client'; -import { RoomHistoryManager } from '../../../../app/ui-utils/client'; import { UserAction } from '../../../../app/ui/client/lib/UserAction'; +import { RoomHistoryManager } from '../../../../app/ui-utils/client'; import { useReactiveQuery } from '../../../hooks/useReactiveQuery'; import { useReactiveValue } from '../../../hooks/useReactiveValue'; import { useRoomInfoEndpoint } from '../../../hooks/useRoomInfoEndpoint'; @@ -18,12 +24,6 @@ import RoomSkeleton from '../RoomSkeleton'; import { useRoomRolesManagement } from '../body/hooks/useRoomRolesManagement'; import type { IRoomWithFederationOriginalName } from '../contexts/RoomContext'; import { RoomContext } from '../contexts/RoomContext'; -import ComposerPopupProvider from './ComposerPopupProvider'; -import RoomToolboxProvider from './RoomToolboxProvider'; -import UserCardProvider from './UserCardProvider'; -import { useRedirectOnSettingsChanged } from './hooks/useRedirectOnSettingsChanged'; -import { useRoomQuery } from './hooks/useRoomQuery'; -import { useUsersNameChanged } from './hooks/useUsersNameChanged'; type RoomProviderProps = { children: ReactNode; diff --git a/apps/meteor/client/views/room/providers/hooks/useChatMessagesInstance.spec.ts b/apps/meteor/client/views/room/providers/hooks/useChatMessagesInstance.spec.ts index d38961b62e5..f01fe275b30 100644 --- a/apps/meteor/client/views/room/providers/hooks/useChatMessagesInstance.spec.ts +++ b/apps/meteor/client/views/room/providers/hooks/useChatMessagesInstance.spec.ts @@ -3,13 +3,13 @@ import type { IActionManager } from '@rocket.chat/ui-contexts'; import { useUserId } from '@rocket.chat/ui-contexts'; import { renderHook } from '@testing-library/react'; +import { useChatMessagesInstance } from './useChatMessagesInstance'; import { E2ERoomState } from '../../../../../app/e2e/client/E2ERoomState'; import { ChatMessages } from '../../../../../app/ui/client/lib/ChatMessages'; import { useEmojiPicker } from '../../../../contexts/EmojiPickerContext'; import { useUiKitActionManager } from '../../../../uikit/hooks/useUiKitActionManager'; import { useRoomSubscription } from '../../contexts/RoomContext'; import { useE2EERoomState } from '../../hooks/useE2EERoomState'; -import { useChatMessagesInstance } from './useChatMessagesInstance'; jest.mock('@rocket.chat/ui-contexts', () => ({ useUserId: jest.fn(), diff --git a/apps/meteor/client/views/room/providers/hooks/useChatMessagesInstance.ts b/apps/meteor/client/views/room/providers/hooks/useChatMessagesInstance.ts index 49d6070b115..fbadf90e294 100644 --- a/apps/meteor/client/views/room/providers/hooks/useChatMessagesInstance.ts +++ b/apps/meteor/client/views/room/providers/hooks/useChatMessagesInstance.ts @@ -2,13 +2,13 @@ import type { IMessage, IRoom } from '@rocket.chat/core-typings'; import { useUserId } from '@rocket.chat/ui-contexts'; import { useEffect } from 'react'; +import { useInstance } from './useInstance'; import { ChatMessages } from '../../../../../app/ui/client/lib/ChatMessages'; import { useEmojiPicker } from '../../../../contexts/EmojiPickerContext'; import type { ChatAPI } from '../../../../lib/chats/ChatAPI'; import { useUiKitActionManager } from '../../../../uikit/hooks/useUiKitActionManager'; import { useRoomSubscription } from '../../contexts/RoomContext'; import { useE2EERoomState } from '../../hooks/useE2EERoomState'; -import { useInstance } from './useInstance'; export function useChatMessagesInstance({ rid, diff --git a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerGrid/WebdavFilePickerGrid.tsx b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerGrid/WebdavFilePickerGrid.tsx index 4f2f4123c2a..c8e41caec1c 100644 --- a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerGrid/WebdavFilePickerGrid.tsx +++ b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerGrid/WebdavFilePickerGrid.tsx @@ -4,9 +4,9 @@ import { Box, Icon, Skeleton, Palette } from '@rocket.chat/fuselage'; import type { ReactElement } from 'react'; import React from 'react'; +import WebdavFilePickerGridItem from './WebdavFilePickerGridItem'; import GenericNoResults from '../../../../../components/GenericNoResults'; import { getNodeIconType } from '../lib/getNodeIconType'; -import WebdavFilePickerGridItem from './WebdavFilePickerGridItem'; type WebdavFilePickerGridProps = { webdavNodes: IWebdavNode[]; diff --git a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerModal.tsx b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerModal.tsx index b6669b3f5d7..6dcd1a3d912 100644 --- a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerModal.tsx +++ b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerModal.tsx @@ -6,14 +6,14 @@ import { useMethod, useToastMessageDispatch, useTranslation, useSetModal } from import type { ReactElement, MouseEvent } from 'react'; import React, { useState, useEffect, useCallback } from 'react'; -import { fileUploadIsValidContentType } from '../../../../../app/utils/client'; -import FilterByText from '../../../../components/FilterByText'; -import { useSort } from '../../../../components/GenericTable/hooks/useSort'; -import FileUploadModal from '../../modals/FileUploadModal'; import FilePickerBreadcrumbs from './FilePickerBreadcrumbs'; import WebdavFilePickerGrid from './WebdavFilePickerGrid'; import WebdavFilePickerTable from './WebdavFilePickerTable'; import { sortWebdavNodes } from './lib/sortWebdavNodes'; +import { fileUploadIsValidContentType } from '../../../../../app/utils/client'; +import FilterByText from '../../../../components/FilterByText'; +import { useSort } from '../../../../components/GenericTable/hooks/useSort'; +import FileUploadModal from '../../modals/FileUploadModal'; export type WebdavSortOptions = 'name' | 'size' | 'dataModified'; diff --git a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx index 32b379eca43..72140fe0073 100644 --- a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx +++ b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx @@ -4,6 +4,9 @@ import type { ReactElement } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import type { WebdavSortOptions } from './WebdavFilePickerModal'; +import { getNodeFileSize } from './lib/getNodeFileSize'; +import { getNodeIconType } from './lib/getNodeIconType'; import GenericNoResults from '../../../../components/GenericNoResults'; import { GenericTable, @@ -15,9 +18,6 @@ import { GenericTableRow, } from '../../../../components/GenericTable'; import { timeAgo } from '../../../../lib/utils/timeAgo'; -import type { WebdavSortOptions } from './WebdavFilePickerModal'; -import { getNodeFileSize } from './lib/getNodeFileSize'; -import { getNodeIconType } from './lib/getNodeIconType'; type WebdavFilePickerTableProps = { webdavNodes: IWebdavNode[]; diff --git a/apps/meteor/client/views/root/AppLayout.tsx b/apps/meteor/client/views/root/AppLayout.tsx index 68b1c0ec155..19681700f1e 100644 --- a/apps/meteor/client/views/root/AppLayout.tsx +++ b/apps/meteor/client/views/root/AppLayout.tsx @@ -1,14 +1,14 @@ import React, { useEffect, Suspense } from 'react'; import { useSyncExternalStore } from 'use-sync-external-store/shim'; -import { useAnalytics } from '../../../app/analytics/client/loadScript'; -import { useAnalyticsEventTracking } from '../../hooks/useAnalyticsEventTracking'; -import { appLayout } from '../../lib/appLayout'; import DocumentTitleWrapper from './DocumentTitleWrapper'; import PageLoading from './PageLoading'; import { useEscapeKeyStroke } from './hooks/useEscapeKeyStroke'; import { useGoogleTagManager } from './hooks/useGoogleTagManager'; import { useMessageLinkClicks } from './hooks/useMessageLinkClicks'; +import { useAnalytics } from '../../../app/analytics/client/loadScript'; +import { useAnalyticsEventTracking } from '../../hooks/useAnalyticsEventTracking'; +import { appLayout } from '../../lib/appLayout'; const AppLayout = () => { useEffect(() => { diff --git a/apps/meteor/client/views/root/AppRoot.tsx b/apps/meteor/client/views/root/AppRoot.tsx index dfb2de8d726..759b6266865 100644 --- a/apps/meteor/client/views/root/AppRoot.tsx +++ b/apps/meteor/client/views/root/AppRoot.tsx @@ -3,9 +3,9 @@ import type { ReactElement } from 'react'; import React, { lazy, Suspense } from 'react'; import { createPortal } from 'react-dom'; -import { queryClient } from '../../lib/queryClient'; import OutermostErrorBoundary from './OutermostErrorBoundary'; import PageLoading from './PageLoading'; +import { queryClient } from '../../lib/queryClient'; const MeteorProvider = lazy(() => import('../../providers/MeteorProvider')); const AppLayout = lazy(() => import('./AppLayout')); diff --git a/apps/meteor/client/views/root/MainLayout/LayoutWithSidebar.tsx b/apps/meteor/client/views/root/MainLayout/LayoutWithSidebar.tsx index 0fb26c0cbc2..d5bb04b82f5 100644 --- a/apps/meteor/client/views/root/MainLayout/LayoutWithSidebar.tsx +++ b/apps/meteor/client/views/root/MainLayout/LayoutWithSidebar.tsx @@ -3,9 +3,9 @@ import { useLayout, useSetting, useCurrentModal, useRoute, useCurrentRoutePath } import type { ReactElement, ReactNode } from 'react'; import React, { useEffect, useRef } from 'react'; -import Sidebar from '../../../sidebar'; import AccessibilityShortcut from './AccessibilityShortcut'; import { MainLayoutStyleTags } from './MainLayoutStyleTags'; +import Sidebar from '../../../sidebar'; const LayoutWithSidebar = ({ children }: { children: ReactNode }): ReactElement => { const { isEmbedded: embeddedLayout } = useLayout(); diff --git a/apps/meteor/client/views/root/MainLayout/LayoutWithSidebarV2.tsx b/apps/meteor/client/views/root/MainLayout/LayoutWithSidebarV2.tsx index 495cd469400..bad88ef02d6 100644 --- a/apps/meteor/client/views/root/MainLayout/LayoutWithSidebarV2.tsx +++ b/apps/meteor/client/views/root/MainLayout/LayoutWithSidebarV2.tsx @@ -4,10 +4,10 @@ import { useLayout, useSetting, useCurrentModal, useCurrentRoutePath, useRouter import type { ReactElement, ReactNode } from 'react'; import React, { useEffect, useRef } from 'react'; -import NavBar from '../../../NavBarV2'; -import Sidebar from '../../../sidebarv2'; import AccessibilityShortcut from './AccessibilityShortcut'; import { MainLayoutStyleTags } from './MainLayoutStyleTags'; +import NavBar from '../../../NavBarV2'; +import Sidebar from '../../../sidebarv2'; const LayoutWithSidebarV2 = ({ children }: { children: ReactNode }): ReactElement => { const { isEmbedded: embeddedLayout } = useLayout(); diff --git a/apps/meteor/client/views/root/MainLayout/LoginPage.tsx b/apps/meteor/client/views/root/MainLayout/LoginPage.tsx index 1ca928ea864..ccf8f83d297 100644 --- a/apps/meteor/client/views/root/MainLayout/LoginPage.tsx +++ b/apps/meteor/client/views/root/MainLayout/LoginPage.tsx @@ -5,8 +5,8 @@ import type { ReactElement, ReactNode } from 'react'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import LoggedOutBanner from '../../../components/deviceManagement/LoggedOutBanner'; import { useIframeLogin } from './useIframeLogin'; +import LoggedOutBanner from '../../../components/deviceManagement/LoggedOutBanner'; const LoginPage = ({ defaultRoute, children }: { defaultRoute?: LoginRoutes; children?: ReactNode }): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/root/MainLayout/TwoFactorAuthSetupCheck.tsx b/apps/meteor/client/views/root/MainLayout/TwoFactorAuthSetupCheck.tsx index d6fc7e9d14c..ed676db8dcf 100644 --- a/apps/meteor/client/views/root/MainLayout/TwoFactorAuthSetupCheck.tsx +++ b/apps/meteor/client/views/root/MainLayout/TwoFactorAuthSetupCheck.tsx @@ -3,10 +3,10 @@ import { useLayout, useUser, useSetting } from '@rocket.chat/ui-contexts'; import type { ReactElement, ReactNode } from 'react'; import React, { lazy, useCallback } from 'react'; -import { Roles } from '../../../../app/models/client'; -import { useReactiveValue } from '../../../hooks/useReactiveValue'; import LayoutWithSidebar from './LayoutWithSidebar'; import LayoutWithSidebarV2 from './LayoutWithSidebarV2'; +import { Roles } from '../../../../app/models/client'; +import { useReactiveValue } from '../../../hooks/useReactiveValue'; const AccountSecurityPage = lazy(() => import('../../account/security/AccountSecurityPage')); diff --git a/apps/meteor/client/views/root/MainLayout/UsernameCheck.tsx b/apps/meteor/client/views/root/MainLayout/UsernameCheck.tsx index 521b206e7bc..aab3c00cb45 100644 --- a/apps/meteor/client/views/root/MainLayout/UsernameCheck.tsx +++ b/apps/meteor/client/views/root/MainLayout/UsernameCheck.tsx @@ -2,10 +2,10 @@ import { useUserId, useSetting } from '@rocket.chat/ui-contexts'; import type { ReactElement, ReactNode } from 'react'; import React, { useCallback } from 'react'; -import { useReactiveValue } from '../../../hooks/useReactiveValue'; -import { useUserInfoQuery } from '../../../hooks/useUserInfoQuery'; import PasswordChangeCheck from './PasswordChangeCheck'; import RegisterUsername from './RegisterUsername'; +import { useReactiveValue } from '../../../hooks/useReactiveValue'; +import { useUserInfoQuery } from '../../../hooks/useUserInfoQuery'; const UsernameCheck = ({ children }: { children: ReactNode }): ReactElement => { const userId = useUserId(); diff --git a/apps/meteor/client/views/root/OutermostErrorBoundary.tsx b/apps/meteor/client/views/root/OutermostErrorBoundary.tsx index 90a83400420..403035540bd 100644 --- a/apps/meteor/client/views/root/OutermostErrorBoundary.tsx +++ b/apps/meteor/client/views/root/OutermostErrorBoundary.tsx @@ -5,8 +5,8 @@ import type { ReactNode } from 'react'; import React from 'react'; import { ErrorBoundary } from 'react-error-boundary'; -import { Info } from '../../../app/utils/rocketchat.info'; import AppErrorPage from './AppErrorPage'; +import { Info } from '../../../app/utils/rocketchat.info'; declare global { // eslint-disable-next-line @typescript-eslint/naming-convention diff --git a/apps/meteor/client/views/root/SAMLLoginRoute.spec.tsx b/apps/meteor/client/views/root/SAMLLoginRoute.spec.tsx index e642e785170..577243f1d7f 100644 --- a/apps/meteor/client/views/root/SAMLLoginRoute.spec.tsx +++ b/apps/meteor/client/views/root/SAMLLoginRoute.spec.tsx @@ -3,8 +3,8 @@ import { render } from '@testing-library/react'; import { Meteor } from 'meteor/meteor'; import React from 'react'; -import RouterContextMock from '../../../tests/mocks/client/RouterContextMock'; import SAMLLoginRoute from './SAMLLoginRoute'; +import RouterContextMock from '../../../tests/mocks/client/RouterContextMock'; const navigateStub = jest.fn(); diff --git a/apps/meteor/client/views/root/hooks/useEscapeKeyStroke.ts b/apps/meteor/client/views/root/hooks/useEscapeKeyStroke.ts index 61e70359569..3dc629340f4 100644 --- a/apps/meteor/client/views/root/hooks/useEscapeKeyStroke.ts +++ b/apps/meteor/client/views/root/hooks/useEscapeKeyStroke.ts @@ -2,9 +2,9 @@ import { useToastMessageDispatch } from '@rocket.chat/ui-contexts'; import { useEffect } from 'react'; import { useTranslation } from 'react-i18next'; +import { useClearUnreadAllMessagesMutation } from './useClearUnreadAllMessagesMutation'; import GenericModal from '../../../components/GenericModal'; import { imperativeModal } from '../../../lib/imperativeModal'; -import { useClearUnreadAllMessagesMutation } from './useClearUnreadAllMessagesMutation'; export const useEscapeKeyStroke = () => { const dispatchToastMessage = useToastMessageDispatch(); diff --git a/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx b/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx index c28aea38b4f..3eb9586af0d 100644 --- a/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx +++ b/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx @@ -3,8 +3,8 @@ import { DarkModeProvider } from '@rocket.chat/layout'; import type { ReactElement } from 'react'; import React from 'react'; -import ModalRegion from '../modal/ModalRegion'; import SetupWizardPage from './SetupWizardPage'; +import ModalRegion from '../modal/ModalRegion'; import { useBodyPosition } from './hooks/useBodyPosition'; import { useRouteLock } from './hooks/useRouteLock'; import SetupWizardProvider from './providers/SetupWizardProvider'; diff --git a/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx b/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx index a86399ac247..c672ce8edcd 100644 --- a/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx +++ b/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx @@ -4,9 +4,9 @@ import type { ReactElement } from 'react'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; +import ChannelDesertionTableRow from './ChannelDesertionTableRow'; import { GenericTable, GenericTableHeaderCell, GenericTableHeader, GenericTableBody } from '../../../components/GenericTable'; import { useSort } from '../../../components/GenericTable/hooks/useSort'; -import ChannelDesertionTableRow from './ChannelDesertionTableRow'; type ChannelDesertionTableProps = { lastOwnerWarning?: string; diff --git a/apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx b/apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx index 20022e21eb2..f742102cd52 100644 --- a/apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx +++ b/apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx @@ -1,10 +1,10 @@ import type { IRoom, Serialized } from '@rocket.chat/core-typings'; import React, { useMemo } from 'react'; +import BaseConvertToChannelModal from './BaseConvertToChannelModal'; import GenericModalSkeleton from '../../../components/GenericModal/GenericModalSkeleton'; import { useEndpointData } from '../../../hooks/useEndpointData'; import { AsyncStatePhase } from '../../../lib/asyncState'; -import BaseConvertToChannelModal from './BaseConvertToChannelModal'; type ConvertToChannelModalProps = { onClose: () => void; diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItem.tsx b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItem.tsx index 8c8ae852217..74eafea1e71 100644 --- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItem.tsx +++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItem.tsx @@ -17,9 +17,9 @@ import { usePermission } from '@rocket.chat/ui-contexts'; import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; +import TeamsChannelItemMenu from './TeamsChannelItemMenu'; import { usePreventPropagation } from '../../../../hooks/usePreventPropagation'; import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator'; -import TeamsChannelItemMenu from './TeamsChannelItemMenu'; type TeamsChannelItemProps = { room: IRoom; diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx index aae1d604dba..ca90a9d4fd8 100644 --- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx +++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx @@ -5,9 +5,9 @@ import type { GenericMenuItemProps } from '@rocket.chat/ui-client'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { useDeleteRoom } from '../../../hooks/roomActions/useDeleteRoom'; import { useRemoveRoomFromTeam } from './hooks/useRemoveRoomFromTeam'; import { useToggleAutoJoin } from './hooks/useToggleAutoJoin'; +import { useDeleteRoom } from '../../../hooks/roomActions/useDeleteRoom'; const TeamsChannelItemMenu = ({ room, mainRoom, reload }: { room: IRoom; mainRoom: IRoom; reload?: () => void }) => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx index 288604727ef..4d705823785 100644 --- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx +++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx @@ -7,6 +7,7 @@ import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { Virtuoso } from 'react-virtuoso'; +import TeamsChannelItem from './TeamsChannelItem'; import { ContextualbarHeader, ContextualbarIcon, @@ -19,7 +20,6 @@ import { } from '../../../../components/Contextualbar'; import { VirtuosoScrollbars } from '../../../../components/CustomScrollbars'; import InfiniteListAnchor from '../../../../components/InfiniteListAnchor'; -import TeamsChannelItem from './TeamsChannelItem'; type TeamsChannelsProps = { loading: boolean; diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelsWithData.tsx b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelsWithData.tsx index 731a4fbd1a6..11f10674aa8 100644 --- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelsWithData.tsx +++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelsWithData.tsx @@ -3,15 +3,15 @@ import { useLocalStorage, useDebouncedValue, useEffectEvent } from '@rocket.chat import { useSetModal, usePermission, useAtLeastOnePermission } from '@rocket.chat/ui-contexts'; import React, { useCallback, useMemo, useState } from 'react'; +import AddExistingModal from './AddExistingModal'; +import TeamsChannels from './TeamsChannels'; +import { useTeamsChannelList } from './hooks/useTeamsChannelList'; import { useRecordList } from '../../../../hooks/lists/useRecordList'; import { AsyncStatePhase } from '../../../../lib/asyncState'; import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator'; import CreateChannelWithData from '../../../../sidebar/header/CreateChannel'; import { useRoom } from '../../../room/contexts/RoomContext'; import { useRoomToolbox } from '../../../room/contexts/RoomToolboxContext'; -import AddExistingModal from './AddExistingModal'; -import TeamsChannels from './TeamsChannels'; -import { useTeamsChannelList } from './hooks/useTeamsChannelList'; const TeamsChannelsWithData = () => { const room = useRoom(); diff --git a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/ChannelDeletionTable/ChannelDeletionTable.tsx b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/ChannelDeletionTable/ChannelDeletionTable.tsx index 24555a1fc9e..8b4bdea31ff 100644 --- a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/ChannelDeletionTable/ChannelDeletionTable.tsx +++ b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/ChannelDeletionTable/ChannelDeletionTable.tsx @@ -3,9 +3,9 @@ import { Box, CheckBox } from '@rocket.chat/fuselage'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import ChannelDeletionTableRow from './ChannelDeletionTableRow'; import { GenericTable, GenericTableHeaderCell, GenericTableBody, GenericTableHeader } from '../../../../../../components/GenericTable'; import { useSort } from '../../../../../../components/GenericTable/hooks/useSort'; -import ChannelDeletionTableRow from './ChannelDeletionTableRow'; type ChannelDeletionTableProps = { rooms: Serialized[]; diff --git a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamChannels.tsx b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamChannels.tsx index e87eb5825af..1c4ab63b8ff 100644 --- a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamChannels.tsx +++ b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamChannels.tsx @@ -3,8 +3,8 @@ import { Box } from '@rocket.chat/fuselage'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import GenericModal from '../../../../../components/GenericModal'; import ChannelDeletionTable from './ChannelDeletionTable'; +import GenericModal from '../../../../../components/GenericModal'; type DeleteTeamChannelsProps = { rooms: Serialized[]; diff --git a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamConfirmation.tsx b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamConfirmation.tsx index 4eed097a4a3..e0365f30941 100644 --- a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamConfirmation.tsx +++ b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamConfirmation.tsx @@ -2,8 +2,8 @@ import type { IRoom, Serialized } from '@rocket.chat/core-typings'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import GenericModal from '../../../../../components/GenericModal'; import RoomLinkList from './RoomLinkList'; +import GenericModal from '../../../../../components/GenericModal'; type DeleteTeamConfirmationProps = { deletedRooms: { [key: string]: Serialized }; diff --git a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamModalWithRooms.tsx b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamModalWithRooms.tsx index 1375ec532c9..b3eb92c435e 100644 --- a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamModalWithRooms.tsx +++ b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamModalWithRooms.tsx @@ -4,8 +4,8 @@ import { useQuery } from '@tanstack/react-query'; import type { ReactElement } from 'react'; import React, { useMemo } from 'react'; -import GenericModalSkeleton from '../../../../../components/GenericModal/GenericModalSkeleton'; import DeleteTeamModal from './DeleteTeamModal'; +import GenericModalSkeleton from '../../../../../components/GenericModal/GenericModalSkeleton'; type DeleteTeamModalWithRoomsProps = { teamId: string; diff --git a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamWithData.tsx b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamWithData.tsx index 58f98705d2b..19132b61380 100644 --- a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamWithData.tsx +++ b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamWithData.tsx @@ -4,8 +4,8 @@ import { useQuery } from '@tanstack/react-query'; import type { ReactElement } from 'react'; import React from 'react'; -import GenericModalSkeleton from '../../../../../components/GenericModal/GenericModalSkeleton'; import LeaveTeamModal from './LeaveTeamModal/LeaveTeamModal'; +import GenericModalSkeleton from '../../../../../components/GenericModal/GenericModalSkeleton'; type LeaveTeamWithDataProps = { teamId: ITeam['_id']; diff --git a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.stories.tsx b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.stories.tsx index b77b30c7ba2..2292a0d9665 100644 --- a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.stories.tsx +++ b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.stories.tsx @@ -2,8 +2,8 @@ import type { IRoom } from '@rocket.chat/core-typings'; import type { Meta, StoryFn } from '@storybook/react'; import React from 'react'; -import { Contextualbar } from '../../../../components/Contextualbar'; import TeamsInfo from './TeamsInfo'; +import { Contextualbar } from '../../../../components/Contextualbar'; const room = { _id: 'awdawd', diff --git a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithData.tsx b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithData.tsx index 2d3b2f542cb..a90e5b98a3a 100644 --- a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithData.tsx +++ b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithData.tsx @@ -5,6 +5,8 @@ import { useSetModal, useToastMessageDispatch, useUserId, usePermission, useMeth import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; +import LeaveTeam from './LeaveTeam'; +import TeamsInfo from './TeamsInfo'; import { UiTextContext } from '../../../../../definition/IRoomTypeConfig'; import { GenericModalDoNotAskAgain } from '../../../../components/GenericModal'; import { useDontAskAgain } from '../../../../hooks/useDontAskAgain'; @@ -14,8 +16,6 @@ import { useDeleteRoom } from '../../../hooks/roomActions/useDeleteRoom'; import { useRoom } from '../../../room/contexts/RoomContext'; import { useRoomToolbox } from '../../../room/contexts/RoomToolboxContext'; import ConvertToChannelModal from '../../ConvertToChannelModal'; -import LeaveTeam from './LeaveTeam'; -import TeamsInfo from './TeamsInfo'; type TeamsInfoWithLogicProps = { openEditing: () => void; diff --git a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithRooms.tsx b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithRooms.tsx index 6461e03d48e..6f7b83eb395 100644 --- a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithRooms.tsx +++ b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithRooms.tsx @@ -1,8 +1,8 @@ import { useMutableCallback } from '@rocket.chat/fuselage-hooks'; import React, { useState } from 'react'; -import EditChannelWithData from '../../../room/contextualBar/Info/EditRoomInfo'; import TeamsInfoWithData from './TeamsInfoWithData'; +import EditChannelWithData from '../../../room/contextualBar/Info/EditRoomInfo'; const TeamsInfoWithRooms = () => { const [editing, setEditing] = useState(false); diff --git a/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersModal.tsx b/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersModal.tsx index e5d97dcb7bd..e4c61002941 100644 --- a/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersModal.tsx +++ b/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersModal.tsx @@ -1,10 +1,10 @@ import type { Serialized, IRoom } from '@rocket.chat/core-typings'; import React, { useMemo } from 'react'; +import BaseRemoveUsersModal from './BaseRemoveUsersModal'; import GenericModalSkeleton from '../../../../../components/GenericModal/GenericModalSkeleton'; import { useEndpointData } from '../../../../../hooks/useEndpointData'; import { AsyncStatePhase } from '../../../../../lib/asyncState'; -import BaseRemoveUsersModal from './BaseRemoveUsersModal'; type RemoveUsersModalProps = { onClose: () => void; diff --git a/apps/meteor/ee/app/api-enterprise/server/canned-responses.ts b/apps/meteor/ee/app/api-enterprise/server/canned-responses.ts index 4d41e20ea0f..089b26d7991 100644 --- a/apps/meteor/ee/app/api-enterprise/server/canned-responses.ts +++ b/apps/meteor/ee/app/api-enterprise/server/canned-responses.ts @@ -3,9 +3,9 @@ import { isPOSTCannedResponsesProps, isDELETECannedResponsesProps, isCannedRespo import type { PaginatedResult, PaginatedRequest } from '@rocket.chat/rest-typings'; import { Meteor } from 'meteor/meteor'; +import { findAllCannedResponses, findAllCannedResponsesFilter, findOneCannedResponse } from './lib/canned-responses'; import { API } from '../../../../app/api/server'; import { getPaginationItems } from '../../../../app/api/server/helpers/getPaginationItems'; -import { findAllCannedResponses, findAllCannedResponsesFilter, findOneCannedResponse } from './lib/canned-responses'; declare module '@rocket.chat/rest-typings' { // eslint-disable-next-line @typescript-eslint/naming-convention diff --git a/apps/meteor/ee/app/authorization/lib/addRoleRestrictions.ts b/apps/meteor/ee/app/authorization/lib/addRoleRestrictions.ts index 453dd535461..15f8525394c 100644 --- a/apps/meteor/ee/app/authorization/lib/addRoleRestrictions.ts +++ b/apps/meteor/ee/app/authorization/lib/addRoleRestrictions.ts @@ -1,5 +1,5 @@ -import { AuthorizationUtils } from '../../../../app/authorization/lib/AuthorizationUtils'; import { guestPermissions } from './guestPermissions'; +import { AuthorizationUtils } from '../../../../app/authorization/lib/AuthorizationUtils'; export const addRoleRestrictions = function () { AuthorizationUtils.addRolePermissionWhiteList('guest', guestPermissions); diff --git a/apps/meteor/ee/app/authorization/server/callback.ts b/apps/meteor/ee/app/authorization/server/callback.ts index 707d45d96e0..d86df56c2ec 100644 --- a/apps/meteor/ee/app/authorization/server/callback.ts +++ b/apps/meteor/ee/app/authorization/server/callback.ts @@ -1,9 +1,9 @@ import { MeteorError } from '@rocket.chat/core-services'; import { License } from '@rocket.chat/license'; +import { validateUserRoles } from './validateUserRoles'; import { callbacks } from '../../../../lib/callbacks'; import { i18n } from '../../../../server/lib/i18n'; -import { validateUserRoles } from './validateUserRoles'; License.onInstall(() => { callbacks.add( diff --git a/apps/meteor/ee/app/license/server/startup.ts b/apps/meteor/ee/app/license/server/startup.ts index eb80fcaf771..ba83e3a3c96 100644 --- a/apps/meteor/ee/app/license/server/startup.ts +++ b/apps/meteor/ee/app/license/server/startup.ts @@ -5,11 +5,11 @@ import { Subscriptions, Users, Settings, LivechatVisitors } from '@rocket.chat/m import { wrapExceptions } from '@rocket.chat/tools'; import moment from 'moment'; +import { getAppCount } from './lib/getAppCount'; import { syncWorkspace } from '../../../../app/cloud/server/functions/syncWorkspace'; import { notifyOnSettingChangedById } from '../../../../app/lib/server/lib/notifyListener'; import { settings } from '../../../../app/settings/server'; import { callbacks } from '../../../../lib/callbacks'; -import { getAppCount } from './lib/getAppCount'; export const startLicense = async () => { settings.watch('Site_Url', (value) => { diff --git a/apps/meteor/ee/app/livechat-enterprise/server/api/inquiries.ts b/apps/meteor/ee/app/livechat-enterprise/server/api/inquiries.ts index cd5b0b1c4c3..667529bb10e 100644 --- a/apps/meteor/ee/app/livechat-enterprise/server/api/inquiries.ts +++ b/apps/meteor/ee/app/livechat-enterprise/server/api/inquiries.ts @@ -1,5 +1,5 @@ -import { API } from '../../../../../app/api/server'; import { setSLAToInquiry } from './lib/inquiries'; +import { API } from '../../../../../app/api/server'; API.v1.addRoute( 'livechat/inquiry.setSLA', diff --git a/apps/meteor/ee/app/livechat-enterprise/server/api/lib/tags.ts b/apps/meteor/ee/app/livechat-enterprise/server/api/lib/tags.ts index 8ce12521a48..aff93e474bb 100644 --- a/apps/meteor/ee/app/livechat-enterprise/server/api/lib/tags.ts +++ b/apps/meteor/ee/app/livechat-enterprise/server/api/lib/tags.ts @@ -3,9 +3,9 @@ import { LivechatTag } from '@rocket.chat/models'; import { escapeRegExp } from '@rocket.chat/string-helpers'; import type { Filter, FindOptions } from 'mongodb'; +import { getDepartmentsWhichUserCanAccess } from './departments'; import { hasPermissionAsync } from '../../../../../../app/authorization/server/functions/hasPermission'; import { helperLogger } from '../../lib/logger'; -import { getDepartmentsWhichUserCanAccess } from './departments'; type FindTagsParams = { userId: string; diff --git a/apps/meteor/ee/app/livechat-enterprise/server/api/monitors.ts b/apps/meteor/ee/app/livechat-enterprise/server/api/monitors.ts index 63d848f8544..62293a87ea6 100644 --- a/apps/meteor/ee/app/livechat-enterprise/server/api/monitors.ts +++ b/apps/meteor/ee/app/livechat-enterprise/server/api/monitors.ts @@ -1,8 +1,8 @@ import type { ILivechatMonitor } from '@rocket.chat/core-typings'; +import { findMonitors, findMonitorByUsername } from './lib/monitors'; import { API } from '../../../../../app/api/server'; import { getPaginationItems } from '../../../../../app/api/server/helpers/getPaginationItems'; -import { findMonitors, findMonitorByUsername } from './lib/monitors'; API.v1.addRoute( 'livechat/monitors', diff --git a/apps/meteor/ee/app/livechat-enterprise/server/api/priorities.ts b/apps/meteor/ee/app/livechat-enterprise/server/api/priorities.ts index 11100367d4a..c3e2e84bb83 100644 --- a/apps/meteor/ee/app/livechat-enterprise/server/api/priorities.ts +++ b/apps/meteor/ee/app/livechat-enterprise/server/api/priorities.ts @@ -1,10 +1,10 @@ import { LivechatPriority } from '@rocket.chat/models'; import { isGETLivechatPrioritiesParams, isPUTLivechatPriority } from '@rocket.chat/rest-typings'; +import { findPriority, updatePriority } from './lib/priorities'; import { API } from '../../../../../app/api/server'; import { getPaginationItems } from '../../../../../app/api/server/helpers/getPaginationItems'; import { notifyOnLivechatPriorityChanged } from '../../../../../app/lib/server/lib/notifyListener'; -import { findPriority, updatePriority } from './lib/priorities'; API.v1.addRoute( 'livechat/priorities', diff --git a/apps/meteor/ee/app/livechat-enterprise/server/api/rooms.ts b/apps/meteor/ee/app/livechat-enterprise/server/api/rooms.ts index 02887980ec5..41c4d4b500f 100644 --- a/apps/meteor/ee/app/livechat-enterprise/server/api/rooms.ts +++ b/apps/meteor/ee/app/livechat-enterprise/server/api/rooms.ts @@ -3,10 +3,10 @@ import type { IOmnichannelRoom } from '@rocket.chat/core-typings'; import { LivechatRooms, Subscriptions } from '@rocket.chat/models'; import { isLivechatRoomOnHoldProps, isLivechatRoomResumeOnHoldProps, isPOSTLivechatRoomPriorityParams } from '@rocket.chat/rest-typings'; +import { removePriorityFromRoom, updateRoomPriority } from './lib/priorities'; import { API } from '../../../../../app/api/server'; import { hasPermissionAsync } from '../../../../../app/authorization/server/functions/hasPermission'; import { i18n } from '../../../../../server/lib/i18n'; -import { removePriorityFromRoom, updateRoomPriority } from './lib/priorities'; API.v1.addRoute( 'livechat/room.onHold', diff --git a/apps/meteor/ee/app/livechat-enterprise/server/api/tags.ts b/apps/meteor/ee/app/livechat-enterprise/server/api/tags.ts index 4c84a42bd9e..eb1d190977b 100644 --- a/apps/meteor/ee/app/livechat-enterprise/server/api/tags.ts +++ b/apps/meteor/ee/app/livechat-enterprise/server/api/tags.ts @@ -1,6 +1,6 @@ +import { findTags, findTagById } from './lib/tags'; import { API } from '../../../../../app/api/server'; import { getPaginationItems } from '../../../../../app/api/server/helpers/getPaginationItems'; -import { findTags, findTagById } from './lib/tags'; API.v1.addRoute( 'livechat/tags', diff --git a/apps/meteor/ee/app/livechat-enterprise/server/api/triggers.ts b/apps/meteor/ee/app/livechat-enterprise/server/api/triggers.ts index 1b066da0fa5..094c02d729c 100644 --- a/apps/meteor/ee/app/livechat-enterprise/server/api/triggers.ts +++ b/apps/meteor/ee/app/livechat-enterprise/server/api/triggers.ts @@ -3,9 +3,9 @@ import { LivechatTrigger } from '@rocket.chat/models'; import { isLivechatTriggerWebhookCallParams } from '@rocket.chat/rest-typings'; import { isLivechatTriggerWebhookTestParams } from '@rocket.chat/rest-typings/src/v1/omnichannel'; +import { callTriggerExternalService } from './lib/triggers'; import { API } from '../../../../../app/api/server'; import { settings } from '../../../../../app/settings/server'; -import { callTriggerExternalService } from './lib/triggers'; API.v1.addRoute( 'livechat/triggers/external-service/test', diff --git a/apps/meteor/ee/app/livechat-enterprise/server/business-hour/Multiple.ts b/apps/meteor/ee/app/livechat-enterprise/server/business-hour/Multiple.ts index f0a11d4de7f..00f67d0d8fd 100644 --- a/apps/meteor/ee/app/livechat-enterprise/server/business-hour/Multiple.ts +++ b/apps/meteor/ee/app/livechat-enterprise/server/business-hour/Multiple.ts @@ -1,8 +1,9 @@ -import type { AtLeast } from '@rocket.chat/core-typings'; -import { type ILivechatDepartment, type ILivechatBusinessHour, LivechatBusinessHourTypes } from '@rocket.chat/core-typings'; +import { LivechatBusinessHourTypes } from '@rocket.chat/core-typings'; +import type { AtLeast, ILivechatDepartment, ILivechatBusinessHour } from '@rocket.chat/core-typings'; import { LivechatDepartment, LivechatDepartmentAgents, Users } from '@rocket.chat/models'; import moment from 'moment'; +import { openBusinessHour, removeBusinessHourByAgentIds } from './Helper'; import { businessHourManager } from '../../../../../app/livechat/server/business-hour'; import type { IBusinessHourBehavior } from '../../../../../app/livechat/server/business-hour/AbstractBusinessHour'; import { AbstractBusinessHourBehavior } from '../../../../../app/livechat/server/business-hour/AbstractBusinessHour'; @@ -16,7 +17,6 @@ import { closeBusinessHour } from '../../../../../app/livechat/server/business-h import { settings } from '../../../../../app/settings/server'; import { isTruthy } from '../../../../../lib/isTruthy'; import { bhLogger } from '../lib/logger'; -import { openBusinessHour, removeBusinessHourByAgentIds } from './Helper'; interface IBusinessHoursExtraProperties extends ILivechatBusinessHour { timezoneName: string; diff --git a/apps/meteor/ee/app/livechat-enterprise/server/lib/AutoCloseOnHoldScheduler.ts b/apps/meteor/ee/app/livechat-enterprise/server/lib/AutoCloseOnHoldScheduler.ts index e8402534e40..eb7d1003ff1 100644 --- a/apps/meteor/ee/app/livechat-enterprise/server/lib/AutoCloseOnHoldScheduler.ts +++ b/apps/meteor/ee/app/livechat-enterprise/server/lib/AutoCloseOnHoldScheduler.ts @@ -6,8 +6,8 @@ import { Meteor } from 'meteor/meteor'; import { MongoInternals } from 'meteor/mongo'; import moment from 'moment'; -import { Livechat } from '../../../../../app/livechat/server/lib/LivechatTyped'; import { schedulerLogger } from './logger'; +import { Livechat } from '../../../../../app/livechat/server/lib/LivechatTyped'; const SCHEDULER_NAME = 'omnichannel_auto_close_on_hold_scheduler'; diff --git a/apps/meteor/ee/app/livechat-enterprise/server/lib/AutoTransferChatScheduler.ts b/apps/meteor/ee/app/livechat-enterprise/server/lib/AutoTransferChatScheduler.ts index b3df0c32254..45b6a64ad1b 100644 --- a/apps/meteor/ee/app/livechat-enterprise/server/lib/AutoTransferChatScheduler.ts +++ b/apps/meteor/ee/app/livechat-enterprise/server/lib/AutoTransferChatScheduler.ts @@ -5,11 +5,11 @@ import { LivechatRooms, Users } from '@rocket.chat/models'; import { Meteor } from 'meteor/meteor'; import { MongoInternals } from 'meteor/mongo'; +import { schedulerLogger } from './logger'; import { forwardRoomToAgent } from '../../../../../app/livechat/server/lib/Helper'; import { Livechat as LivechatTyped } from '../../../../../app/livechat/server/lib/LivechatTyped'; import { RoutingManager } from '../../../../../app/livechat/server/lib/RoutingManager'; import { settings } from '../../../../../app/settings/server'; -import { schedulerLogger } from './logger'; const SCHEDULER_NAME = 'omnichannel_scheduler'; diff --git a/apps/meteor/ee/app/livechat-enterprise/server/lib/Helper.ts b/apps/meteor/ee/app/livechat-enterprise/server/lib/Helper.ts index 3206fe9f94c..da78d351250 100644 --- a/apps/meteor/ee/app/livechat-enterprise/server/lib/Helper.ts +++ b/apps/meteor/ee/app/livechat-enterprise/server/lib/Helper.ts @@ -12,13 +12,13 @@ import { import moment from 'moment'; import type { Document } from 'mongodb'; -import { getInquirySortMechanismSetting } from '../../../../../app/livechat/server/lib/settings'; -import { settings } from '../../../../../app/settings/server'; -import { callbacks } from '../../../../../lib/callbacks'; import { OmnichannelQueueInactivityMonitor } from './QueueInactivityMonitor'; import { updateInquiryQueueSla } from './SlaHelper'; import { memoizeDebounce } from './debounceByParams'; import { logger } from './logger'; +import { getInquirySortMechanismSetting } from '../../../../../app/livechat/server/lib/settings'; +import { settings } from '../../../../../app/settings/server'; +import { callbacks } from '../../../../../lib/callbacks'; type QueueInfo = { message: { diff --git a/apps/meteor/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.ts b/apps/meteor/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.ts index 4cdd11c2e0c..821d42b9db7 100644 --- a/apps/meteor/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.ts +++ b/apps/meteor/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.ts @@ -3,11 +3,11 @@ import { Users, OmnichannelServiceLevelAgreements, LivechatTag, LivechatUnitMoni import { Match, check } from 'meteor/check'; import { Meteor } from 'meteor/meteor'; +import { updateSLAInquiries } from './Helper'; +import { removeSLAFromRooms } from './SlaHelper'; import { callbacks } from '../../../../../lib/callbacks'; import { addUserRolesAsync } from '../../../../../server/lib/roles/addUserRoles'; import { removeUserFromRolesAsync } from '../../../../../server/lib/roles/removeUserFromRoles'; -import { updateSLAInquiries } from './Helper'; -import { removeSLAFromRooms } from './SlaHelper'; export const LivechatEnterprise = { async addMonitor(username: string) { diff --git a/apps/meteor/ee/app/livechat-enterprise/server/lib/QueueInactivityMonitor.ts b/apps/meteor/ee/app/livechat-enterprise/server/lib/QueueInactivityMonitor.ts index a8ffabc1f9f..31ac11f0c2b 100644 --- a/apps/meteor/ee/app/livechat-enterprise/server/lib/QueueInactivityMonitor.ts +++ b/apps/meteor/ee/app/livechat-enterprise/server/lib/QueueInactivityMonitor.ts @@ -6,10 +6,10 @@ import { Meteor } from 'meteor/meteor'; import { MongoInternals } from 'meteor/mongo'; import type { Db } from 'mongodb'; +import { schedulerLogger } from './logger'; import { Livechat } from '../../../../../app/livechat/server/lib/LivechatTyped'; import { settings } from '../../../../../app/settings/server'; import { i18n } from '../../../../../server/lib/i18n'; -import { schedulerLogger } from './logger'; const SCHEDULER_NAME = 'omnichannel_queue_inactivity_monitor'; diff --git a/apps/meteor/ee/app/livechat-enterprise/server/lib/VisitorInactivityMonitor.ts b/apps/meteor/ee/app/livechat-enterprise/server/lib/VisitorInactivityMonitor.ts index 57b77abd930..7bfefe5db6e 100644 --- a/apps/meteor/ee/app/livechat-enterprise/server/lib/VisitorInactivityMonitor.ts +++ b/apps/meteor/ee/app/livechat-enterprise/server/lib/VisitorInactivityMonitor.ts @@ -4,12 +4,12 @@ import { cronJobs } from '@rocket.chat/cron'; import type { MainLogger } from '@rocket.chat/logger'; import { LivechatVisitors, LivechatRooms, LivechatDepartment, Users } from '@rocket.chat/models'; +import { schedulerLogger } from './logger'; import { notifyOnRoomChangedById } from '../../../../../app/lib/server/lib/notifyListener'; import { Livechat } from '../../../../../app/livechat/server/lib/LivechatTyped'; import { settings } from '../../../../../app/settings/server'; import { callbacks } from '../../../../../lib/callbacks'; import { i18n } from '../../../../../server/lib/i18n'; -import { schedulerLogger } from './logger'; const isPromiseRejectedResult = (result: any): result is PromiseRejectedResult => result && result.status === 'rejected'; diff --git a/apps/meteor/ee/app/livechat-enterprise/server/startup.ts b/apps/meteor/ee/app/livechat-enterprise/server/startup.ts index 1b277d6fba5..1a0a5120002 100644 --- a/apps/meteor/ee/app/livechat-enterprise/server/startup.ts +++ b/apps/meteor/ee/app/livechat-enterprise/server/startup.ts @@ -1,12 +1,12 @@ import { Meteor } from 'meteor/meteor'; -import { businessHourManager } from '../../../../app/livechat/server/business-hour'; -import { SingleBusinessHourBehavior } from '../../../../app/livechat/server/business-hour/Single'; -import { settings } from '../../../../app/settings/server'; import { MultipleBusinessHoursBehavior } from './business-hour/Multiple'; import { updatePredictedVisitorAbandonment, updateQueueInactivityTimeout } from './lib/Helper'; import { VisitorInactivityMonitor } from './lib/VisitorInactivityMonitor'; import { logger } from './lib/logger'; +import { businessHourManager } from '../../../../app/livechat/server/business-hour'; +import { SingleBusinessHourBehavior } from '../../../../app/livechat/server/business-hour/Single'; +import { settings } from '../../../../app/settings/server'; import './lib/query.helper'; const visitorActivityMonitor = new VisitorInactivityMonitor(); diff --git a/apps/meteor/ee/app/settings/server/settings.ts b/apps/meteor/ee/app/settings/server/settings.ts index 60c37e54291..451f22937d3 100644 --- a/apps/meteor/ee/app/settings/server/settings.ts +++ b/apps/meteor/ee/app/settings/server/settings.ts @@ -1,3 +1,4 @@ +/* eslint-disable react-hooks/rules-of-hooks */ import type { ISetting, SettingValue, LicenseModule } from '@rocket.chat/core-typings'; import { License } from '@rocket.chat/license'; import { Settings } from '@rocket.chat/models'; diff --git a/apps/meteor/ee/server/api/api.ts b/apps/meteor/ee/server/api/api.ts index ee2049bb70a..c4aa8b64030 100644 --- a/apps/meteor/ee/server/api/api.ts +++ b/apps/meteor/ee/server/api/api.ts @@ -1,3 +1,4 @@ +/* eslint-disable react-hooks/rules-of-hooks */ import { License } from '@rocket.chat/license'; import { API } from '../../../app/api/server/api'; diff --git a/apps/meteor/ee/server/apps/appRequestsCron.ts b/apps/meteor/ee/server/apps/appRequestsCron.ts index 4fcd48d6f08..5e23186baca 100644 --- a/apps/meteor/ee/server/apps/appRequestsCron.ts +++ b/apps/meteor/ee/server/apps/appRequestsCron.ts @@ -1,10 +1,10 @@ import { cronJobs } from '@rocket.chat/cron'; import { serverFetch as fetch } from '@rocket.chat/server-fetch'; -import { getWorkspaceAccessToken } from '../../../app/cloud/server'; -import { settings } from '../../../app/settings/server'; import { appRequestNotififyForUsers } from './marketplace/appRequestNotifyUsers'; import { Apps } from './orchestrator'; +import { getWorkspaceAccessToken } from '../../../app/cloud/server'; +import { settings } from '../../../app/settings/server'; const appsNotifyAppRequests = async function _appsNotifyAppRequests() { try { diff --git a/apps/meteor/ee/server/apps/cron.ts b/apps/meteor/ee/server/apps/cron.ts index f904486bf61..7800d7077c2 100644 --- a/apps/meteor/ee/server/apps/cron.ts +++ b/apps/meteor/ee/server/apps/cron.ts @@ -4,10 +4,10 @@ import { cronJobs } from '@rocket.chat/cron'; import { Settings, Users } from '@rocket.chat/models'; import { serverFetch as fetch } from '@rocket.chat/server-fetch'; +import { Apps } from './orchestrator'; import { getWorkspaceAccessToken } from '../../../app/cloud/server'; import { i18n } from '../../../server/lib/i18n'; import { sendMessagesToAdmins } from '../../../server/lib/sendMessagesToAdmins'; -import { Apps } from './orchestrator'; const notifyAdminsAboutInvalidApps = async function _notifyAdminsAboutInvalidApps(apps?: ProxiedApp[]) { if (!apps) { diff --git a/apps/meteor/ee/server/apps/orchestrator.js b/apps/meteor/ee/server/apps/orchestrator.js index 9c1ea6397a7..57ed422ab94 100644 --- a/apps/meteor/ee/server/apps/orchestrator.js +++ b/apps/meteor/ee/server/apps/orchestrator.js @@ -5,6 +5,8 @@ import { Logger } from '@rocket.chat/logger'; import { AppLogs, Apps as AppsModel, AppsPersistence } from '@rocket.chat/models'; import { Meteor } from 'meteor/meteor'; +import { AppServerNotifier, AppsRestApi, AppUIKitInteractionApi } from './communication'; +import { AppRealLogStorage, AppRealStorage, ConfigurableAppSourceStorage } from './storage'; import { RealAppBridges } from '../../../app/apps/server/bridges'; import { AppMessagesConverter, @@ -20,8 +22,6 @@ import { import { AppThreadsConverter } from '../../../app/apps/server/converters/threads'; import { settings } from '../../../app/settings/server'; import { canEnableApp } from '../../app/license/server/canEnableApp'; -import { AppServerNotifier, AppsRestApi, AppUIKitInteractionApi } from './communication'; -import { AppRealLogStorage, AppRealStorage, ConfigurableAppSourceStorage } from './storage'; function isTesting() { return process.env.TEST_MODE === 'true'; diff --git a/apps/meteor/ee/server/apps/startup.ts b/apps/meteor/ee/server/apps/startup.ts index a8bc78a184f..323fcd00795 100644 --- a/apps/meteor/ee/server/apps/startup.ts +++ b/apps/meteor/ee/server/apps/startup.ts @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { settings, settingsRegistry } from '../../../app/settings/server'; import { Apps } from './orchestrator'; +import { settings, settingsRegistry } from '../../../app/settings/server'; Meteor.startup(async function _appServerOrchestrator() { await settingsRegistry.addGroup('General', async function () { diff --git a/apps/meteor/ee/server/lib/engagementDashboard/channels.ts b/apps/meteor/ee/server/lib/engagementDashboard/channels.ts index 7d08086ee1e..b302f4c586a 100644 --- a/apps/meteor/ee/server/lib/engagementDashboard/channels.ts +++ b/apps/meteor/ee/server/lib/engagementDashboard/channels.ts @@ -2,8 +2,8 @@ import type { IDirectMessageRoom, IRoom } from '@rocket.chat/core-typings'; import { Analytics, Rooms } from '@rocket.chat/models'; import moment from 'moment'; -import { roomCoordinator } from '../../../../server/lib/rooms/roomCoordinator'; import { convertDateToInt, diffBetweenDaysInclusive } from './date'; +import { roomCoordinator } from '../../../../server/lib/rooms/roomCoordinator'; export const findChannelsWithNumberOfMessages = async ({ start, diff --git a/apps/meteor/ee/server/lib/engagementDashboard/messages.ts b/apps/meteor/ee/server/lib/engagementDashboard/messages.ts index 2a4bf67c12c..e3d99ac3039 100644 --- a/apps/meteor/ee/server/lib/engagementDashboard/messages.ts +++ b/apps/meteor/ee/server/lib/engagementDashboard/messages.ts @@ -2,8 +2,8 @@ import type { IDirectMessageRoom, IRoom, IMessage } from '@rocket.chat/core-typi import { Messages, Analytics } from '@rocket.chat/models'; import moment from 'moment'; -import { roomCoordinator } from '../../../../server/lib/rooms/roomCoordinator'; import { convertDateToInt, diffBetweenDaysInclusive, convertIntToDate, getTotalOfWeekItems } from './date'; +import { roomCoordinator } from '../../../../server/lib/rooms/roomCoordinator'; export const handleMessagesSent = async (message: IMessage, { room }: { room?: IRoom }): Promise => { const roomTypesToShow = roomCoordinator.getTypesToShowOnDashboard(); diff --git a/apps/meteor/ee/server/lib/engagementDashboard/startup.ts b/apps/meteor/ee/server/lib/engagementDashboard/startup.ts index 415e0323d52..264e19d907b 100644 --- a/apps/meteor/ee/server/lib/engagementDashboard/startup.ts +++ b/apps/meteor/ee/server/lib/engagementDashboard/startup.ts @@ -1,6 +1,6 @@ -import { callbacks } from '../../../../lib/callbacks'; import { fillFirstDaysOfMessagesIfNeeded, handleMessagesDeleted, handleMessagesSent } from './messages'; import { fillFirstDaysOfUsersIfNeeded, handleUserCreated } from './users'; +import { callbacks } from '../../../../lib/callbacks'; export const attachCallbacks = (): void => { callbacks.add( diff --git a/apps/meteor/ee/server/lib/ldap/copyCustomFieldsLDAP.ts b/apps/meteor/ee/server/lib/ldap/copyCustomFieldsLDAP.ts index 5d8bf044bc2..3be64c25bff 100644 --- a/apps/meteor/ee/server/lib/ldap/copyCustomFieldsLDAP.ts +++ b/apps/meteor/ee/server/lib/ldap/copyCustomFieldsLDAP.ts @@ -1,9 +1,9 @@ import type { IImportUser, ILDAPEntry } from '@rocket.chat/core-typings'; import type { Logger } from '@rocket.chat/logger'; +import { replacesNestedValues } from './replacesNestedValues'; import { templateVarHandler } from '../../../../app/utils/lib/templateVarHandler'; import { getNestedProp } from '../../../../server/lib/getNestedProp'; -import { replacesNestedValues } from './replacesNestedValues'; export const copyCustomFieldsLDAP = ( { diff --git a/apps/meteor/ee/server/local-services/federation/application/UserService.ts b/apps/meteor/ee/server/local-services/federation/application/UserService.ts index 52e448f723c..d2f3bbab382 100644 --- a/apps/meteor/ee/server/local-services/federation/application/UserService.ts +++ b/apps/meteor/ee/server/local-services/federation/application/UserService.ts @@ -1,8 +1,8 @@ +import { AbstractFederationApplicationServiceEE } from './AbstractFederationApplicationServiceEE'; import type { RocketChatFileAdapter } from '../../../../../server/services/federation/infrastructure/rocket-chat/adapters/File'; import type { RocketChatSettingsAdapter } from '../../../../../server/services/federation/infrastructure/rocket-chat/adapters/Settings'; import type { IFederationBridgeEE } from '../domain/IFederationBridge'; import type { RocketChatUserAdapterEE } from '../infrastructure/rocket-chat/adapters/User'; -import { AbstractFederationApplicationServiceEE } from './AbstractFederationApplicationServiceEE'; const DEFAULT_SERVERS = [ { diff --git a/apps/meteor/ee/server/local-services/federation/infrastructure/rocket-chat/slash-commands/index.ts b/apps/meteor/ee/server/local-services/federation/infrastructure/rocket-chat/slash-commands/index.ts index 7e2bcd0ecf4..43fdba34cca 100644 --- a/apps/meteor/ee/server/local-services/federation/infrastructure/rocket-chat/slash-commands/index.ts +++ b/apps/meteor/ee/server/local-services/federation/infrastructure/rocket-chat/slash-commands/index.ts @@ -1,8 +1,8 @@ import { FederationEE } from '@rocket.chat/core-services'; import type { SlashCommandCallbackParams } from '@rocket.chat/core-typings'; -import { slashCommands } from '../../../../../../../app/utils/server/slashCommand'; import { executeSlashCommand } from './action'; +import { slashCommands } from '../../../../../../../app/utils/server/slashCommand'; const EE_FEDERATION_COMMANDS = { dm: async (currentUserId: string, _: string, invitees: string[]): Promise => diff --git a/apps/meteor/ee/server/local-services/federation/service.ts b/apps/meteor/ee/server/local-services/federation/service.ts index 5c6e210aefb..5e813caf928 100644 --- a/apps/meteor/ee/server/local-services/federation/service.ts +++ b/apps/meteor/ee/server/local-services/federation/service.ts @@ -6,7 +6,6 @@ import type { import type { IRoom } from '@rocket.chat/core-typings'; import type { FederationPaginatedResult, IFederationPublicRooms } from '@rocket.chat/rest-typings'; -import { AbstractFederationService } from '../../../../server/services/federation/service'; import type { FederationUserServiceEE } from './application/UserService'; import type { FederationDirectMessageRoomServiceSender } from './application/room/sender/DirectMessageRoomServiceSender'; import type { FederationRoomServiceSender } from './application/room/sender/RoomServiceSender'; @@ -16,6 +15,7 @@ import { FederationFactoryEE } from './infrastructure/Factory'; import type { RocketChatRoomAdapterEE } from './infrastructure/rocket-chat/adapters/Room'; import type { RocketChatUserAdapterEE } from './infrastructure/rocket-chat/adapters/User'; import { FederationRoomSenderConverterEE } from './infrastructure/rocket-chat/converters/RoomSender'; +import { AbstractFederationService } from '../../../../server/services/federation/service'; abstract class AbstractBaseFederationServiceEE extends AbstractFederationService { protected internalUserServiceEE: FederationUserServiceEE; diff --git a/apps/meteor/ee/server/local-services/instance/service.ts b/apps/meteor/ee/server/local-services/instance/service.ts index 5da11ede98d..a7e921511a6 100644 --- a/apps/meteor/ee/server/local-services/instance/service.ts +++ b/apps/meteor/ee/server/local-services/instance/service.ts @@ -7,10 +7,10 @@ import EJSON from 'ejson'; import type { BrokerNode } from 'moleculer'; import { ServiceBroker, Transporters, Serializers } from 'moleculer'; -import { StreamerCentral } from '../../../../server/modules/streamer/streamer.module'; -import type { IInstanceService } from '../../sdk/types/IInstanceService'; import { getLogger } from './getLogger'; import { getTransporter } from './getTransporter'; +import { StreamerCentral } from '../../../../server/modules/streamer/streamer.module'; +import type { IInstanceService } from '../../sdk/types/IInstanceService'; const hostIP = process.env.INSTANCE_IP ? String(process.env.INSTANCE_IP).trim() : 'localhost'; diff --git a/apps/meteor/ee/server/models/AuditLog.ts b/apps/meteor/ee/server/models/AuditLog.ts index c03fa19a4e9..1091b5ee16d 100644 --- a/apps/meteor/ee/server/models/AuditLog.ts +++ b/apps/meteor/ee/server/models/AuditLog.ts @@ -1,7 +1,7 @@ import { registerModel } from '@rocket.chat/models'; +import { AuditLogRaw } from './raw/AuditLog'; import { trashCollection } from '../../../server/database/trash'; import { db } from '../../../server/database/utils'; -import { AuditLogRaw } from './raw/AuditLog'; registerModel('IAuditLogModel', new AuditLogRaw(db, trashCollection)); diff --git a/apps/meteor/ee/server/models/CannedResponse.ts b/apps/meteor/ee/server/models/CannedResponse.ts index 7d4fa2052d3..9c89c51aa8e 100644 --- a/apps/meteor/ee/server/models/CannedResponse.ts +++ b/apps/meteor/ee/server/models/CannedResponse.ts @@ -1,6 +1,6 @@ import { registerModel } from '@rocket.chat/models'; -import { db } from '../../../server/database/utils'; import { CannedResponseRaw } from './raw/CannedResponse'; +import { db } from '../../../server/database/utils'; registerModel('ICannedResponseModel', new CannedResponseRaw(db)); diff --git a/apps/meteor/ee/server/models/LivechatDepartment.ts b/apps/meteor/ee/server/models/LivechatDepartment.ts index 19cc931644b..ea1f5fe5f9c 100644 --- a/apps/meteor/ee/server/models/LivechatDepartment.ts +++ b/apps/meteor/ee/server/models/LivechatDepartment.ts @@ -1,7 +1,7 @@ import { registerModel } from '@rocket.chat/models'; +import { LivechatDepartmentEE } from './raw/LivechatDepartment'; import { trashCollection } from '../../../server/database/trash'; import { db } from '../../../server/database/utils'; -import { LivechatDepartmentEE } from './raw/LivechatDepartment'; registerModel('ILivechatDepartmentModel', new LivechatDepartmentEE(db, trashCollection)); diff --git a/apps/meteor/ee/server/models/LivechatDepartmentAgents.ts b/apps/meteor/ee/server/models/LivechatDepartmentAgents.ts index 0b521209a3a..4365a750b01 100644 --- a/apps/meteor/ee/server/models/LivechatDepartmentAgents.ts +++ b/apps/meteor/ee/server/models/LivechatDepartmentAgents.ts @@ -1,7 +1,7 @@ import { registerModel } from '@rocket.chat/models'; +import { LivechatDepartmentAgents } from './raw/LivechatDepartmentAgents'; import { trashCollection } from '../../../server/database/trash'; import { db } from '../../../server/database/utils'; -import { LivechatDepartmentAgents } from './raw/LivechatDepartmentAgents'; registerModel('ILivechatDepartmentAgentsModel', new LivechatDepartmentAgents(db, trashCollection)); diff --git a/apps/meteor/ee/server/models/LivechatInquiry.ts b/apps/meteor/ee/server/models/LivechatInquiry.ts index 73392b70379..9a5eef09355 100644 --- a/apps/meteor/ee/server/models/LivechatInquiry.ts +++ b/apps/meteor/ee/server/models/LivechatInquiry.ts @@ -1,7 +1,7 @@ import { registerModel } from '@rocket.chat/models'; +import { LivechatInquiryRawEE } from './raw/LivechatInquiry'; import { trashCollection } from '../../../server/database/trash'; import { db } from '../../../server/database/utils'; -import { LivechatInquiryRawEE } from './raw/LivechatInquiry'; registerModel('ILivechatInquiryModel', new LivechatInquiryRawEE(db, trashCollection)); diff --git a/apps/meteor/ee/server/models/LivechatPriority.ts b/apps/meteor/ee/server/models/LivechatPriority.ts index 54ccce4886c..c6d3b0ecf96 100644 --- a/apps/meteor/ee/server/models/LivechatPriority.ts +++ b/apps/meteor/ee/server/models/LivechatPriority.ts @@ -1,6 +1,6 @@ import { registerModel } from '@rocket.chat/models'; -import { db } from '../../../server/database/utils'; import { LivechatPriorityRaw } from './raw/LivechatPriority'; +import { db } from '../../../server/database/utils'; registerModel('ILivechatPriorityModel', new LivechatPriorityRaw(db)); diff --git a/apps/meteor/ee/server/models/LivechatRooms.ts b/apps/meteor/ee/server/models/LivechatRooms.ts index 16395b7c8af..1fbfca5ee90 100644 --- a/apps/meteor/ee/server/models/LivechatRooms.ts +++ b/apps/meteor/ee/server/models/LivechatRooms.ts @@ -1,7 +1,7 @@ import { registerModel } from '@rocket.chat/models'; +import { LivechatRoomsRawEE } from './raw/LivechatRooms'; import { trashCollection } from '../../../server/database/trash'; import { db } from '../../../server/database/utils'; -import { LivechatRoomsRawEE } from './raw/LivechatRooms'; registerModel('ILivechatRoomsModel', new LivechatRoomsRawEE(db, trashCollection)); diff --git a/apps/meteor/ee/server/models/LivechatTag.ts b/apps/meteor/ee/server/models/LivechatTag.ts index 28203b151a6..d443b53cb88 100644 --- a/apps/meteor/ee/server/models/LivechatTag.ts +++ b/apps/meteor/ee/server/models/LivechatTag.ts @@ -1,6 +1,6 @@ import { registerModel } from '@rocket.chat/models'; -import { db } from '../../../server/database/utils'; import { LivechatTagRaw } from './raw/LivechatTag'; +import { db } from '../../../server/database/utils'; registerModel('ILivechatTagModel', new LivechatTagRaw(db)); diff --git a/apps/meteor/ee/server/models/LivechatUnit.ts b/apps/meteor/ee/server/models/LivechatUnit.ts index 223e77a24d1..a80893d622c 100644 --- a/apps/meteor/ee/server/models/LivechatUnit.ts +++ b/apps/meteor/ee/server/models/LivechatUnit.ts @@ -1,7 +1,7 @@ import { registerModel } from '@rocket.chat/models'; -import { db } from '../../../server/database/utils'; import { LivechatUnitRaw } from './raw/LivechatUnit'; +import { db } from '../../../server/database/utils'; // @ts-expect-error - Overriding base types :) registerModel('ILivechatUnitModel', new LivechatUnitRaw(db)); diff --git a/apps/meteor/ee/server/models/LivechatUnitMonitors.ts b/apps/meteor/ee/server/models/LivechatUnitMonitors.ts index 2c241048da7..aa0eeabe202 100644 --- a/apps/meteor/ee/server/models/LivechatUnitMonitors.ts +++ b/apps/meteor/ee/server/models/LivechatUnitMonitors.ts @@ -1,6 +1,6 @@ import { registerModel } from '@rocket.chat/models'; -import { db } from '../../../server/database/utils'; import { LivechatUnitMonitorsRaw } from './raw/LivechatUnitMonitors'; +import { db } from '../../../server/database/utils'; registerModel('ILivechatUnitMonitorsModel', new LivechatUnitMonitorsRaw(db)); diff --git a/apps/meteor/ee/server/models/OmnichannelServiceLevelAgreements.ts b/apps/meteor/ee/server/models/OmnichannelServiceLevelAgreements.ts index 6960829c32e..717415ed743 100644 --- a/apps/meteor/ee/server/models/OmnichannelServiceLevelAgreements.ts +++ b/apps/meteor/ee/server/models/OmnichannelServiceLevelAgreements.ts @@ -1,6 +1,6 @@ import { registerModel } from '@rocket.chat/models'; -import { db } from '../../../server/database/utils'; import { ServiceLevelAgreements } from './raw/ServiceLevelAgreements'; +import { db } from '../../../server/database/utils'; registerModel('IOmnichannelServiceLevelAgreementsModel', new ServiceLevelAgreements(db)); diff --git a/apps/meteor/ee/server/models/ReadReceipts.ts b/apps/meteor/ee/server/models/ReadReceipts.ts index 079c7c34a6a..63460131c3b 100644 --- a/apps/meteor/ee/server/models/ReadReceipts.ts +++ b/apps/meteor/ee/server/models/ReadReceipts.ts @@ -1,6 +1,6 @@ import { registerModel } from '@rocket.chat/models'; -import { db } from '../../../server/database/utils'; import { ReadReceiptsRaw } from './raw/ReadReceipts'; +import { db } from '../../../server/database/utils'; registerModel('IReadReceiptsModel', new ReadReceiptsRaw(db)); diff --git a/apps/meteor/ee/server/models/Users.ts b/apps/meteor/ee/server/models/Users.ts index c1862d03591..3e0b558ec40 100644 --- a/apps/meteor/ee/server/models/Users.ts +++ b/apps/meteor/ee/server/models/Users.ts @@ -1,7 +1,7 @@ import { registerModel } from '@rocket.chat/models'; +import { UsersEE } from './raw/Users'; import { trashCollection } from '../../../server/database/trash'; import { db } from '../../../server/database/utils'; -import { UsersEE } from './raw/Users'; registerModel('IUsersModel', new UsersEE(db, trashCollection)); diff --git a/apps/meteor/lib/callbacks.ts b/apps/meteor/lib/callbacks.ts index 28a926dba99..ca82683a04e 100644 --- a/apps/meteor/lib/callbacks.ts +++ b/apps/meteor/lib/callbacks.ts @@ -28,10 +28,10 @@ import type { import type { Updater } from '@rocket.chat/models'; import type { FilterOperators } from 'mongodb'; +import { Callbacks } from './callbacks/callbacksBase'; import type { ILoginAttempt } from '../app/authentication/server/ILoginAttempt'; import type { IBusinessHourBehavior } from '../app/livechat/server/business-hour/AbstractBusinessHour'; import type { CloseRoomParams } from '../app/livechat/server/lib/localTypes'; -import { Callbacks } from './callbacks/callbacksBase'; /** * Callbacks returning void, like event listeners. diff --git a/apps/meteor/package.json b/apps/meteor/package.json index a31d2b4f600..39c6158dfca 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -75,13 +75,13 @@ "@rocket.chat/jest-presets": "workspace:~", "@rocket.chat/livechat": "workspace:^", "@rocket.chat/mock-providers": "workspace:^", - "@storybook/addon-a11y": "^8.4.1", - "@storybook/addon-essentials": "^8.4.1", - "@storybook/addon-interactions": "^8.4.1", + "@storybook/addon-a11y": "^8.4.2", + "@storybook/addon-essentials": "^8.4.2", + "@storybook/addon-interactions": "^8.4.2", "@storybook/addon-styling-webpack": "^1.0.1", "@storybook/addon-webpack5-compiler-babel": "^3.0.3", - "@storybook/react": "^8.4.1", - "@storybook/react-webpack5": "^8.4.1", + "@storybook/react": "^8.4.2", + "@storybook/react-webpack5": "^8.4.2", "@testing-library/react": "~16.0.1", "@testing-library/user-event": "~14.5.2", "@types/adm-zip": "^0.5.6", @@ -114,7 +114,7 @@ "@types/jsdom": "^16.2.15", "@types/jsdom-global": "^3.0.7", "@types/jsrsasign": "^10.5.14", - "@types/katex": "^0.14.0", + "@types/katex": "^0.16.7", "@types/later": "^1.2.9", "@types/ldapjs": "^2.2.5", "@types/less": "~3.0.6", @@ -133,8 +133,8 @@ "@types/node": "~20.16.15", "@types/node-gcm": "^1.0.5", "@types/node-rsa": "^1.1.4", - "@types/nodemailer": "^6.4.15", - "@types/oauth2-server": "^3.0.17", + "@types/nodemailer": "^6.4.16", + "@types/oauth2-server": "^3.0.18", "@types/object-path": "^0.11.4", "@types/parseurl": "^1.3.3", "@types/prometheus-gc-stats": "^0.6.4", @@ -173,16 +173,16 @@ "docker-compose": "^0.24.8", "emojione-assets": "^4.5.0", "eslint": "~8.45.0", - "eslint-config-prettier": "~8.8.0", + "eslint-config-prettier": "~9.1.0", "eslint-plugin-anti-trojan-source": "~1.1.1", - "eslint-plugin-import": "~2.26.0", - "eslint-plugin-no-floating-promise": "~1.0.2", - "eslint-plugin-playwright": "~0.15.3", + "eslint-plugin-import": "~2.31.0", + "eslint-plugin-no-floating-promise": "~2.0.0", + "eslint-plugin-playwright": "~2.0.0", "eslint-plugin-prettier": "~5.2.1", - "eslint-plugin-react": "~7.32.2", - "eslint-plugin-react-hooks": "~4.6.2", - "eslint-plugin-testing-library": "~6.2.2", - "eslint-plugin-you-dont-need-lodash-underscore": "~6.12.0", + "eslint-plugin-react": "~7.37.2", + "eslint-plugin-react-hooks": "~5.0.0", + "eslint-plugin-testing-library": "~6.4.0", + "eslint-plugin-you-dont-need-lodash-underscore": "~6.14.0", "fast-glob": "^3.3.2", "i18next": "~23.4.9", "jest": "~29.7.0", @@ -193,11 +193,11 @@ "pino-pretty": "^7.6.1", "playwright-qase-reporter": "^1.2.2", "postcss": "~8.4.47", - "postcss-custom-properties": "^11.0.0", + "postcss-custom-properties": "^14.0.4", "postcss-easy-import": "^4.0.0", - "postcss-load-config": "^3.1.4", + "postcss-load-config": "^6.0.1", "postcss-media-minmax": "^5.0.0", - "postcss-nested": "^5.0.6", + "postcss-nested": "^7.0.2", "postcss-url": "^10.1.3", "prettier": "~3.3.3", "proxyquire": "^2.1.3", @@ -205,7 +205,7 @@ "react-docgen-typescript-plugin": "^1.0.8", "sinon": "^19.0.2", "source-map": "^0.7.4", - "storybook": "^8.4.1", + "storybook": "^8.4.2", "stylelint": "^14.16.1", "stylelint-order": "^5.0.0", "supertest": "^7.0.0", @@ -218,13 +218,13 @@ "@babel/runtime": "~7.26.0", "@bugsnag/js": "~7.20.2", "@bugsnag/plugin-react": "~7.19.0", - "@google-cloud/storage": "^6.11.0", + "@google-cloud/storage": "^6.12.0", "@kaciras/deasync": "^1.1.0", - "@nivo/bar": "0.84.0", - "@nivo/core": "0.84.0", - "@nivo/heatmap": "0.84.0", - "@nivo/line": "0.84.0", - "@nivo/pie": "0.84.0", + "@nivo/bar": "0.87.0", + "@nivo/core": "0.87.0", + "@nivo/heatmap": "0.87.0", + "@nivo/line": "0.87.0", + "@nivo/pie": "0.87.0", "@opentelemetry/api": "^1.9.0", "@opentelemetry/exporter-trace-otlp-grpc": "^0.54.0", "@opentelemetry/sdk-node": "^0.54.0", @@ -291,8 +291,8 @@ "@rocket.chat/ui-video-conf": "workspace:^", "@rocket.chat/ui-voip": "workspace:^", "@rocket.chat/web-ui-registration": "workspace:^", - "@slack/bolt": "^3.22.0", - "@slack/rtm-api": "^6.2.1", + "@slack/bolt": "^4.1.0", + "@slack/rtm-api": "^7.0.1", "@tanstack/react-query": "^4.36.1", "@vector-im/matrix-bot-sdk": "0.7.1-element.6", "@xmldom/xmldom": "^0.8.10", @@ -326,7 +326,7 @@ "csv-parse": "^5.5.6", "date-fns": "^2.30.0", "date.js": "~0.3.3", - "debug": "~4.1.1", + "debug": "~4.3.7", "dompurify": "^3.1.7", "ejson": "^2.2.3", "emailreplyparser": "^0.0.5", @@ -339,7 +339,7 @@ "express": "^4.21.1", "express-rate-limit": "^5.5.1", "fastq": "^1.17.1", - "fflate": "^0.7.4", + "fflate": "^0.8.2", "file-type": "^16.5.4", "filenamify": "^4.3.0", "filesize": "9.0.11", @@ -418,7 +418,7 @@ "sanitize-html": "^2.13.1", "semver": "^7.6.3", "sharp": "^0.33.5", - "sip.js": "^0.20.1", + "sip.js": "^0.21.2", "sodium-native": "^3.4.1", "sodium-plus": "^0.9.0", "speakeasy": "^2.0.0", diff --git a/apps/meteor/server/database/trash.ts b/apps/meteor/server/database/trash.ts index d08ac2ae667..18c7161a3dc 100644 --- a/apps/meteor/server/database/trash.ts +++ b/apps/meteor/server/database/trash.ts @@ -1,5 +1,5 @@ -import { TrashRaw } from '../models/raw/Trash'; import { db } from './utils'; +import { TrashRaw } from '../models/raw/Trash'; const Trash = new TrashRaw(db); export const trashCollection = Trash.col; diff --git a/apps/meteor/server/features/EmailInbox/EmailInbox.ts b/apps/meteor/server/features/EmailInbox/EmailInbox.ts index 5d5db36c3c3..d02397558ca 100644 --- a/apps/meteor/server/features/EmailInbox/EmailInbox.ts +++ b/apps/meteor/server/features/EmailInbox/EmailInbox.ts @@ -4,10 +4,10 @@ import { Meteor } from 'meteor/meteor'; import nodemailer from 'nodemailer'; import type Mail from 'nodemailer/lib/mailer'; -import { settings } from '../../../app/settings/server'; -import { IMAPInterceptor } from '../../email/IMAPInterceptor'; import { onEmailReceived } from './EmailInbox_Incoming'; import { logger } from './logger'; +import { settings } from '../../../app/settings/server'; +import { IMAPInterceptor } from '../../email/IMAPInterceptor'; export type Inbox = { imap: IMAPInterceptor; diff --git a/apps/meteor/server/features/EmailInbox/EmailInbox_Incoming.ts b/apps/meteor/server/features/EmailInbox/EmailInbox_Incoming.ts index 27b5c7abd36..6acd23dd67f 100644 --- a/apps/meteor/server/features/EmailInbox/EmailInbox_Incoming.ts +++ b/apps/meteor/server/features/EmailInbox/EmailInbox_Incoming.ts @@ -11,6 +11,7 @@ import { Random } from '@rocket.chat/random'; import type { ParsedMail, Attachment } from 'mailparser'; import stripHtml from 'string-strip-html'; +import { logger } from './logger'; import { FileUpload } from '../../../app/file-upload/server'; import { notifyOnMessageChange } from '../../../app/lib/server/lib/notifyListener'; import { Livechat as LivechatTyped } from '../../../app/livechat/server/lib/LivechatTyped'; @@ -18,7 +19,6 @@ import { QueueManager } from '../../../app/livechat/server/lib/QueueManager'; import { setDepartmentForGuest } from '../../../app/livechat/server/lib/departmentsLib'; import { settings } from '../../../app/settings/server'; import { i18n } from '../../lib/i18n'; -import { logger } from './logger'; type FileAttachment = VideoAttachmentProps & ImageAttachmentProps & AudioAttachmentProps; diff --git a/apps/meteor/server/features/EmailInbox/EmailInbox_Outgoing.ts b/apps/meteor/server/features/EmailInbox/EmailInbox_Outgoing.ts index 8f4d5e63d6a..79ebda20b38 100644 --- a/apps/meteor/server/features/EmailInbox/EmailInbox_Outgoing.ts +++ b/apps/meteor/server/features/EmailInbox/EmailInbox_Outgoing.ts @@ -4,6 +4,9 @@ import { Messages, Uploads, LivechatRooms, Rooms, Users } from '@rocket.chat/mod import { Match } from 'meteor/check'; import type Mail from 'nodemailer/lib/mailer'; +import { inboxes } from './EmailInbox'; +import type { Inbox } from './EmailInbox'; +import { logger } from './logger'; import { FileUpload } from '../../../app/file-upload/server'; import { sendMessage } from '../../../app/lib/server/functions/sendMessage'; import { notifyOnMessageChange } from '../../../app/lib/server/lib/notifyListener'; @@ -11,9 +14,6 @@ import { settings } from '../../../app/settings/server'; import { slashCommands } from '../../../app/utils/server/slashCommand'; import { callbacks } from '../../../lib/callbacks'; import { i18n } from '../../lib/i18n'; -import { inboxes } from './EmailInbox'; -import type { Inbox } from './EmailInbox'; -import { logger } from './logger'; const livechatQuoteRegExp = /^\[\s\]\(https?:\/\/.+\/live\/.+\?msg=(?.+?)\)\s(?.+)/s; diff --git a/apps/meteor/server/lib/cas/createNewUser.ts b/apps/meteor/server/lib/cas/createNewUser.ts index ebb4143b53b..62c50a28334 100644 --- a/apps/meteor/server/lib/cas/createNewUser.ts +++ b/apps/meteor/server/lib/cas/createNewUser.ts @@ -3,8 +3,8 @@ import { Rooms, Users } from '@rocket.chat/models'; import { pick } from '@rocket.chat/tools'; import { Accounts } from 'meteor/accounts-base'; -import { createRoom } from '../../../app/lib/server/functions/createRoom'; import { logger } from './logger'; +import { createRoom } from '../../../app/lib/server/functions/createRoom'; type CASUserOptions = { attributes: Record; diff --git a/apps/meteor/server/lib/cas/loginHandler.ts b/apps/meteor/server/lib/cas/loginHandler.ts index 80ce91350de..239c9f8e644 100644 --- a/apps/meteor/server/lib/cas/loginHandler.ts +++ b/apps/meteor/server/lib/cas/loginHandler.ts @@ -2,11 +2,11 @@ import { CredentialTokens, Users } from '@rocket.chat/models'; import { getObjectKeys, wrapExceptions } from '@rocket.chat/tools'; import { Accounts } from 'meteor/accounts-base'; -import { _setRealName } from '../../../app/lib/server/functions/setRealName'; -import { settings } from '../../../app/settings/server'; import { createNewUser } from './createNewUser'; import { findExistingCASUser } from './findExistingCASUser'; import { logger } from './logger'; +import { _setRealName } from '../../../app/lib/server/functions/setRealName'; +import { settings } from '../../../app/settings/server'; export const loginHandlerCAS = async (options: any): Promise => { if (!options.cas) { diff --git a/apps/meteor/server/lib/cas/middleware.ts b/apps/meteor/server/lib/cas/middleware.ts index 074177838f9..f8c0de6945d 100644 --- a/apps/meteor/server/lib/cas/middleware.ts +++ b/apps/meteor/server/lib/cas/middleware.ts @@ -6,8 +6,8 @@ import type { ICredentialToken } from '@rocket.chat/core-typings'; import { CredentialTokens } from '@rocket.chat/models'; import _ from 'underscore'; -import { settings } from '../../../app/settings/server'; import { logger } from './logger'; +import { settings } from '../../../app/settings/server'; const closePopup = function (res: ServerResponse): void { res.writeHead(200, { 'Content-Type': 'text/html' }); diff --git a/apps/meteor/server/lib/cas/updateCasService.ts b/apps/meteor/server/lib/cas/updateCasService.ts index 5583eda22f8..cd7b7025772 100644 --- a/apps/meteor/server/lib/cas/updateCasService.ts +++ b/apps/meteor/server/lib/cas/updateCasService.ts @@ -1,8 +1,8 @@ import type { LoginServiceConfiguration } from '@rocket.chat/core-typings'; import { ServiceConfiguration } from 'meteor/service-configuration'; -import { settings } from '../../../app/settings/server/cached'; import { logger } from './logger'; +import { settings } from '../../../app/settings/server/cached'; export async function updateCasServices(): Promise { const data: Partial = { diff --git a/apps/meteor/server/lib/eraseRoom.ts b/apps/meteor/server/lib/eraseRoom.ts index 143c0a31977..9852daaf3c5 100644 --- a/apps/meteor/server/lib/eraseRoom.ts +++ b/apps/meteor/server/lib/eraseRoom.ts @@ -3,9 +3,9 @@ import { Message, Team } from '@rocket.chat/core-services'; import { Rooms } from '@rocket.chat/models'; import { Meteor } from 'meteor/meteor'; +import { roomCoordinator } from './rooms/roomCoordinator'; import { hasPermissionAsync } from '../../app/authorization/server/functions/hasPermission'; import { deleteRoom } from '../../app/lib/server/functions/deleteRoom'; -import { roomCoordinator } from './rooms/roomCoordinator'; export async function eraseRoom(rid: string, uid: string): Promise { const room = await Rooms.findOneById(rid); diff --git a/apps/meteor/server/lib/ldap/Connection.ts b/apps/meteor/server/lib/ldap/Connection.ts index b753a2baa9d..94c43a0d662 100644 --- a/apps/meteor/server/lib/ldap/Connection.ts +++ b/apps/meteor/server/lib/ldap/Connection.ts @@ -8,10 +8,10 @@ import type { } from '@rocket.chat/core-typings'; import ldapjs from 'ldapjs'; -import { settings } from '../../../app/settings/server'; -import { ensureArray } from '../../../lib/utils/arrayUtils'; import { logger, connLogger, searchLogger, authLogger, bindLogger, mapLogger } from './Logger'; import { getLDAPConditionalSetting } from './getLDAPConditionalSetting'; +import { settings } from '../../../app/settings/server'; +import { ensureArray } from '../../../lib/utils/arrayUtils'; interface ILDAPEntryCallback { (entry: ldapjs.SearchEntry): T | undefined; diff --git a/apps/meteor/server/lib/ldap/Manager.ts b/apps/meteor/server/lib/ldap/Manager.ts index 8d2c6e9639b..a0f474cfe5d 100644 --- a/apps/meteor/server/lib/ldap/Manager.ts +++ b/apps/meteor/server/lib/ldap/Manager.ts @@ -8,15 +8,15 @@ import { Accounts } from 'meteor/accounts-base'; import { Meteor } from 'meteor/meteor'; import _ from 'underscore'; +import { LDAPConnection } from './Connection'; +import { logger, authLogger, connLogger } from './Logger'; +import { LDAPUserConverter } from './UserConverter'; +import { getLDAPConditionalSetting } from './getLDAPConditionalSetting'; import type { UserConverterOptions } from '../../../app/importer/server/classes/converters/UserConverter'; import { setUserAvatar } from '../../../app/lib/server/functions/setUserAvatar'; import { settings } from '../../../app/settings/server'; import { callbacks } from '../../../lib/callbacks'; import { omit } from '../../../lib/utils/omit'; -import { LDAPConnection } from './Connection'; -import { logger, authLogger, connLogger } from './Logger'; -import { LDAPUserConverter } from './UserConverter'; -import { getLDAPConditionalSetting } from './getLDAPConditionalSetting'; export class LDAPManager { public static async login(username: string, password: string): Promise { diff --git a/apps/meteor/server/lib/migrations.ts b/apps/meteor/server/lib/migrations.ts index f70b5bcca9f..8bb608ca05f 100644 --- a/apps/meteor/server/lib/migrations.ts +++ b/apps/meteor/server/lib/migrations.ts @@ -2,9 +2,9 @@ import type { IControl } from '@rocket.chat/core-typings'; import { Logger } from '@rocket.chat/logger'; import { Migrations } from '@rocket.chat/models'; +import { showErrorBox } from './logger/showBox'; import { Info } from '../../app/utils/rocketchat.info'; import { sleep } from '../../lib/utils/sleep'; -import { showErrorBox } from './logger/showBox'; type IMigration = { name?: string; diff --git a/apps/meteor/server/lib/oauth/updateOAuthServices.ts b/apps/meteor/server/lib/oauth/updateOAuthServices.ts index f1df9fbb7aa..784628cae44 100644 --- a/apps/meteor/server/lib/oauth/updateOAuthServices.ts +++ b/apps/meteor/server/lib/oauth/updateOAuthServices.ts @@ -7,13 +7,13 @@ import type { } from '@rocket.chat/core-typings'; import { LoginServiceConfiguration } from '@rocket.chat/models'; +import { logger } from './logger'; import { CustomOAuth } from '../../../app/custom-oauth/server/custom_oauth_server'; import { notifyOnLoginServiceConfigurationChanged, notifyOnLoginServiceConfigurationChangedByService, } from '../../../app/lib/server/lib/notifyListener'; import { settings } from '../../../app/settings/server/cached'; -import { logger } from './logger'; export async function updateOAuthServices(): Promise { const services = settings.getByRegexp(/^(Accounts_OAuth_|Accounts_OAuth_Custom-)[a-z0-9_]+$/i); diff --git a/apps/meteor/server/lib/pushConfig.ts b/apps/meteor/server/lib/pushConfig.ts index fb2f91c4b86..14f8c6b38ef 100644 --- a/apps/meteor/server/lib/pushConfig.ts +++ b/apps/meteor/server/lib/pushConfig.ts @@ -3,12 +3,12 @@ import type { ServerMethods } from '@rocket.chat/ddp-client'; import { AppsTokens } from '@rocket.chat/models'; import { Meteor } from 'meteor/meteor'; +import { i18n } from './i18n'; import { hasPermissionAsync } from '../../app/authorization/server/functions/hasPermission'; import { getWorkspaceAccessToken } from '../../app/cloud/server'; import { RateLimiter } from '../../app/lib/server/lib'; import { Push } from '../../app/push/server'; import { settings } from '../../app/settings/server'; -import { i18n } from './i18n'; export const executePushTest = async (userId: IUser['_id'], username: IUser['username']): Promise => { const tokens = await AppsTokens.countTokensByUserId(userId); diff --git a/apps/meteor/server/lib/refreshLoginServices.ts b/apps/meteor/server/lib/refreshLoginServices.ts index 41f3b647f05..41c5691a6de 100644 --- a/apps/meteor/server/lib/refreshLoginServices.ts +++ b/apps/meteor/server/lib/refreshLoginServices.ts @@ -1,8 +1,8 @@ import { ServiceConfiguration } from 'meteor/service-configuration'; -import { loadSamlServiceProviders } from '../../app/meteor-accounts-saml/server/lib/settings'; import { updateCasServices } from './cas/updateCasService'; import { updateOAuthServices } from './oauth/updateOAuthServices'; +import { loadSamlServiceProviders } from '../../app/meteor-accounts-saml/server/lib/settings'; export async function refreshLoginServices(): Promise { await ServiceConfiguration.configurations.removeAsync({}); diff --git a/apps/meteor/server/lib/resetUserE2EKey.ts b/apps/meteor/server/lib/resetUserE2EKey.ts index 26ac78f30ad..151916b9bab 100644 --- a/apps/meteor/server/lib/resetUserE2EKey.ts +++ b/apps/meteor/server/lib/resetUserE2EKey.ts @@ -2,11 +2,11 @@ import { api } from '@rocket.chat/core-services'; import { Subscriptions, Users, Rooms } from '@rocket.chat/models'; import { Meteor } from 'meteor/meteor'; +import { i18n } from './i18n'; +import { isUserIdFederated } from './isUserIdFederated'; import { notifyOnUserChange, notifyOnSubscriptionChangedByUserId } from '../../app/lib/server/lib/notifyListener'; import * as Mailer from '../../app/mailer/server/api'; import { settings } from '../../app/settings/server'; -import { i18n } from './i18n'; -import { isUserIdFederated } from './isUserIdFederated'; const sendResetNotification = async function (uid: string): Promise { const user = await Users.findOneById(uid, {}); diff --git a/apps/meteor/server/main.ts b/apps/meteor/server/main.ts index b5f34876c0b..647f476587b 100644 --- a/apps/meteor/server/main.ts +++ b/apps/meteor/server/main.ts @@ -7,13 +7,13 @@ import './models/startup'; import './settings'; import '../app/settings/server'; -import { startLicense } from '../ee/app/license/server/startup'; -import { registerEEBroker } from '../ee/server'; -import { startFederationService } from '../ee/server/startup/services'; import { configureLoginServices } from './configuration'; import { configureLogLevel } from './configureLogLevel'; import { registerServices } from './services/startup'; import { startup } from './startup'; +import { startLicense } from '../ee/app/license/server/startup'; +import { registerEEBroker } from '../ee/server'; +import { startFederationService } from '../ee/server/startup/services'; import './routes'; import '../app/lib/server/startup'; diff --git a/apps/meteor/server/models/raw/Analytics.ts b/apps/meteor/server/models/raw/Analytics.ts index de470083416..e7f5a57ec9f 100644 --- a/apps/meteor/server/models/raw/Analytics.ts +++ b/apps/meteor/server/models/raw/Analytics.ts @@ -3,8 +3,8 @@ import type { IAnalyticsModel, IChannelsWithNumberOfMessagesBetweenDate } from ' import { Random } from '@rocket.chat/random'; import type { AggregationCursor, FindCursor, Db, IndexDescription, FindOptions, UpdateResult, Document, Collection } from 'mongodb'; -import { readSecondaryPreferred } from '../../database/readSecondaryPreferred'; import { BaseRaw } from './BaseRaw'; +import { readSecondaryPreferred } from '../../database/readSecondaryPreferred'; export class AnalyticsRaw extends BaseRaw implements IAnalyticsModel { constructor(db: Db) { diff --git a/apps/meteor/server/models/raw/FederationRoomEvents.ts b/apps/meteor/server/models/raw/FederationRoomEvents.ts index 6c780a45ccb..161d4eb8fc2 100644 --- a/apps/meteor/server/models/raw/FederationRoomEvents.ts +++ b/apps/meteor/server/models/raw/FederationRoomEvents.ts @@ -3,8 +3,8 @@ import type { IRoom, ISubscription, IUser, IFederationEvent } from '@rocket.chat import type { IFederationRoomEventsModel } from '@rocket.chat/model-typings'; import type { Db, DeleteResult, IndexDescription } from 'mongodb'; -import { contextDefinitions } from '../../../app/federation/server/lib/context'; import { FederationEventsModel } from './FederationEvents'; +import { contextDefinitions } from '../../../app/federation/server/lib/context'; const { type, contextQuery } = contextDefinitions.ROOM; diff --git a/apps/meteor/server/models/raw/Imports.ts b/apps/meteor/server/models/raw/Imports.ts index b708c42e811..2b0ce6c97a7 100644 --- a/apps/meteor/server/models/raw/Imports.ts +++ b/apps/meteor/server/models/raw/Imports.ts @@ -2,8 +2,8 @@ import type { IImport } from '@rocket.chat/core-typings'; import type { IImportsModel } from '@rocket.chat/model-typings'; import type { Db, Document, FindCursor, FindOptions, UpdateResult, IndexDescription } from 'mongodb'; -import { ensureArray } from '../../../lib/utils/arrayUtils'; import { BaseRaw } from './BaseRaw'; +import { ensureArray } from '../../../lib/utils/arrayUtils'; export class ImportsModel extends BaseRaw implements IImportsModel { constructor(db: Db) { diff --git a/apps/meteor/server/models/raw/LivechatAgentActivity.ts b/apps/meteor/server/models/raw/LivechatAgentActivity.ts index acf84bc3935..ec9215adf85 100644 --- a/apps/meteor/server/models/raw/LivechatAgentActivity.ts +++ b/apps/meteor/server/models/raw/LivechatAgentActivity.ts @@ -3,8 +3,8 @@ import type { ILivechatAgentActivityModel } from '@rocket.chat/model-typings'; import moment from 'moment'; import type { AggregationCursor, Collection, Document, FindCursor, Db, ModifyResult, IndexDescription, UpdateResult } from 'mongodb'; -import { readSecondaryPreferred } from '../../database/readSecondaryPreferred'; import { BaseRaw } from './BaseRaw'; +import { readSecondaryPreferred } from '../../database/readSecondaryPreferred'; export class LivechatAgentActivityRaw extends BaseRaw implements ILivechatAgentActivityModel { constructor(db: Db, trash?: Collection>) { diff --git a/apps/meteor/server/models/raw/LivechatDepartment.ts b/apps/meteor/server/models/raw/LivechatDepartment.ts index 9ecee34df5e..5ab3ab52be0 100644 --- a/apps/meteor/server/models/raw/LivechatDepartment.ts +++ b/apps/meteor/server/models/raw/LivechatDepartment.ts @@ -16,8 +16,8 @@ import type { AggregationCursor, } from 'mongodb'; -import { notifyOnLivechatDepartmentAgentChangedByDepartmentId } from '../../../app/lib/server/lib/notifyListener'; import { BaseRaw } from './BaseRaw'; +import { notifyOnLivechatDepartmentAgentChangedByDepartmentId } from '../../../app/lib/server/lib/notifyListener'; export class LivechatDepartmentRaw extends BaseRaw implements ILivechatDepartmentModel { constructor(db: Db, trash?: Collection>) { diff --git a/apps/meteor/server/models/raw/LivechatInquiry.ts b/apps/meteor/server/models/raw/LivechatInquiry.ts index 6746d6f8792..1b90f931fcd 100644 --- a/apps/meteor/server/models/raw/LivechatInquiry.ts +++ b/apps/meteor/server/models/raw/LivechatInquiry.ts @@ -23,9 +23,9 @@ import type { DeleteOptions, } from 'mongodb'; +import { BaseRaw } from './BaseRaw'; import { getOmniChatSortQuery } from '../../../app/livechat/lib/inquiries'; import { readSecondaryPreferred } from '../../database/readSecondaryPreferred'; -import { BaseRaw } from './BaseRaw'; export class LivechatInquiryRaw extends BaseRaw implements ILivechatInquiryModel { constructor(db: Db, trash?: Collection>) { diff --git a/apps/meteor/server/models/raw/LivechatRooms.ts b/apps/meteor/server/models/raw/LivechatRooms.ts index 303ee16a8dd..1a296b82f40 100644 --- a/apps/meteor/server/models/raw/LivechatRooms.ts +++ b/apps/meteor/server/models/raw/LivechatRooms.ts @@ -29,9 +29,9 @@ import type { UpdateOptions, } from 'mongodb'; +import { BaseRaw } from './BaseRaw'; import { getValue } from '../../../app/settings/server/raw'; import { readSecondaryPreferred } from '../../database/readSecondaryPreferred'; -import { BaseRaw } from './BaseRaw'; /** * @extends BaseRaw diff --git a/apps/meteor/server/models/raw/LivechatVisitors.ts b/apps/meteor/server/models/raw/LivechatVisitors.ts index 5e1880caced..d5576b7fc8d 100644 --- a/apps/meteor/server/models/raw/LivechatVisitors.ts +++ b/apps/meteor/server/models/raw/LivechatVisitors.ts @@ -19,8 +19,8 @@ import type { } from 'mongodb'; import { ObjectId } from 'mongodb'; -import { notifyOnSettingChanged } from '../../../app/lib/server/lib/notifyListener'; import { BaseRaw } from './BaseRaw'; +import { notifyOnSettingChanged } from '../../../app/lib/server/lib/notifyListener'; export class LivechatVisitorsRaw extends BaseRaw implements ILivechatVisitorsModel { constructor(db: Db, trash?: Collection>) { diff --git a/apps/meteor/server/models/raw/Messages.ts b/apps/meteor/server/models/raw/Messages.ts index 52e087c8b2c..252d07af754 100644 --- a/apps/meteor/server/models/raw/Messages.ts +++ b/apps/meteor/server/models/raw/Messages.ts @@ -29,9 +29,9 @@ import type { ModifyResult, } from 'mongodb'; +import { BaseRaw } from './BaseRaw'; import { otrSystemMessages } from '../../../app/otr/lib/constants'; import { readSecondaryPreferred } from '../../database/readSecondaryPreferred'; -import { BaseRaw } from './BaseRaw'; type DeepWritable = T extends (...args: any) => any ? T diff --git a/apps/meteor/server/models/raw/ModerationReports.ts b/apps/meteor/server/models/raw/ModerationReports.ts index e5fa2834085..b50057a389f 100644 --- a/apps/meteor/server/models/raw/ModerationReports.ts +++ b/apps/meteor/server/models/raw/ModerationReports.ts @@ -9,8 +9,8 @@ import type { import type { FindPaginated, IModerationReportsModel, PaginationParams } from '@rocket.chat/model-typings'; import type { AggregationCursor, Collection, Db, Document, FindCursor, FindOptions, IndexDescription, UpdateResult } from 'mongodb'; -import { readSecondaryPreferred } from '../../database/readSecondaryPreferred'; import { BaseRaw } from './BaseRaw'; +import { readSecondaryPreferred } from '../../database/readSecondaryPreferred'; export class ModerationReportsRaw extends BaseRaw implements IModerationReportsModel { constructor(db: Db, trash?: Collection>) { diff --git a/apps/meteor/server/models/raw/Roles.ts b/apps/meteor/server/models/raw/Roles.ts index d223e8249ca..36fc7674416 100644 --- a/apps/meteor/server/models/raw/Roles.ts +++ b/apps/meteor/server/models/raw/Roles.ts @@ -3,8 +3,8 @@ import type { IRolesModel } from '@rocket.chat/model-typings'; import { Subscriptions, Users } from '@rocket.chat/models'; import type { Collection, FindCursor, Db, Filter, FindOptions, Document, CountDocumentsOptions } from 'mongodb'; -import { notifyOnSubscriptionChangedByRoomIdAndUserId } from '../../../app/lib/server/lib/notifyListener'; import { BaseRaw } from './BaseRaw'; +import { notifyOnSubscriptionChangedByRoomIdAndUserId } from '../../../app/lib/server/lib/notifyListener'; export class RolesRaw extends BaseRaw implements IRolesModel { constructor(db: Db, trash?: Collection>) { diff --git a/apps/meteor/server/models/raw/Rooms.ts b/apps/meteor/server/models/raw/Rooms.ts index d49c6bcadc7..d35033ad90f 100644 --- a/apps/meteor/server/models/raw/Rooms.ts +++ b/apps/meteor/server/models/raw/Rooms.ts @@ -29,8 +29,8 @@ import type { CountDocumentsOptions, } from 'mongodb'; -import { readSecondaryPreferred } from '../../database/readSecondaryPreferred'; import { BaseRaw } from './BaseRaw'; +import { readSecondaryPreferred } from '../../database/readSecondaryPreferred'; export class RoomsRaw extends BaseRaw implements IRoomsModel { constructor(db: Db, trash?: Collection>) { diff --git a/apps/meteor/server/models/raw/Sessions.ts b/apps/meteor/server/models/raw/Sessions.ts index 96f6a596ddb..4a0b72646c7 100644 --- a/apps/meteor/server/models/raw/Sessions.ts +++ b/apps/meteor/server/models/raw/Sessions.ts @@ -28,8 +28,8 @@ import type { OptionalId, } from 'mongodb'; -import { readSecondaryPreferred } from '../../database/readSecondaryPreferred'; import { BaseRaw } from './BaseRaw'; +import { readSecondaryPreferred } from '../../database/readSecondaryPreferred'; type DestructuredDate = { year: number; month: number; day: number }; type DestructuredDateWithType = { diff --git a/apps/meteor/server/models/raw/Subscriptions.ts b/apps/meteor/server/models/raw/Subscriptions.ts index d1e2ba6e945..10f96778dc6 100644 --- a/apps/meteor/server/models/raw/Subscriptions.ts +++ b/apps/meteor/server/models/raw/Subscriptions.ts @@ -33,8 +33,8 @@ import type { ModifyResult, } from 'mongodb'; -import { getDefaultSubscriptionPref } from '../../../app/utils/lib/getDefaultSubscriptionPref'; import { BaseRaw } from './BaseRaw'; +import { getDefaultSubscriptionPref } from '../../../app/utils/lib/getDefaultSubscriptionPref'; export class SubscriptionsRaw extends BaseRaw implements ISubscriptionsModel { constructor(db: Db, trash?: Collection>) { diff --git a/apps/meteor/server/routes/avatar/room.ts b/apps/meteor/server/routes/avatar/room.ts index 58f030c387d..4737d607d1b 100644 --- a/apps/meteor/server/routes/avatar/room.ts +++ b/apps/meteor/server/routes/avatar/room.ts @@ -5,8 +5,8 @@ import { Avatars, Rooms } from '@rocket.chat/models'; import type { NextFunction } from 'connect'; import { Cookies } from 'meteor/ostrio:cookies'; -import { roomCoordinator } from '../../lib/rooms/roomCoordinator'; import { serveSvgAvatarInRequestedFormat, wasFallbackModified, setCacheAndDispositionHeaders, serveAvatarFile } from './utils'; +import { roomCoordinator } from '../../lib/rooms/roomCoordinator'; const cookie = new Cookies(); const getRoomAndAvatarFile = async (roomId: IRoom['_id']): Promise<{ room: IRoom; file: IUpload | null } | void> => { diff --git a/apps/meteor/server/routes/avatar/user.ts b/apps/meteor/server/routes/avatar/user.ts index 961a9aad397..4930ad04424 100644 --- a/apps/meteor/server/routes/avatar/user.ts +++ b/apps/meteor/server/routes/avatar/user.ts @@ -5,8 +5,8 @@ import { Avatars, Users } from '@rocket.chat/models'; import { serverFetch as fetch } from '@rocket.chat/server-fetch'; import type { NextFunction } from 'connect'; -import { settings } from '../../../app/settings/server'; import { serveSvgAvatarInRequestedFormat, wasFallbackModified, setCacheAndDispositionHeaders, serveAvatarFile } from './utils'; +import { settings } from '../../../app/settings/server'; const handleExternalProvider = async (externalProviderUrl: string, username: string, res: ServerResponse): Promise => { const response = await fetch(externalProviderUrl.replace('{username}', username)); diff --git a/apps/meteor/server/services/authorization/service.ts b/apps/meteor/server/services/authorization/service.ts index 075fe569bff..5e67cf87b37 100644 --- a/apps/meteor/server/services/authorization/service.ts +++ b/apps/meteor/server/services/authorization/service.ts @@ -4,8 +4,8 @@ import type { IUser, IRole, IRoom, ISubscription, IRocketChatRecord } from '@roc import { Subscriptions, Rooms, Users, Roles, Permissions } from '@rocket.chat/models'; import mem from 'mem'; -import { AuthorizationUtils } from '../../../app/authorization/lib/AuthorizationUtils'; import { canAccessRoom } from './canAccessRoom'; +import { AuthorizationUtils } from '../../../app/authorization/lib/AuthorizationUtils'; import './canAccessRoomLivechat'; diff --git a/apps/meteor/server/services/federation/infrastructure/matrix/converters/room/MessageReceiver.ts b/apps/meteor/server/services/federation/infrastructure/matrix/converters/room/MessageReceiver.ts index f67870834b4..033acb67fdf 100644 --- a/apps/meteor/server/services/federation/infrastructure/matrix/converters/room/MessageReceiver.ts +++ b/apps/meteor/server/services/federation/infrastructure/matrix/converters/room/MessageReceiver.ts @@ -1,8 +1,8 @@ import emojione from 'emojione'; +import { convertExternalRoomIdToInternalRoomIdFormat } from './RoomReceiver'; import { FederationMessageReactionEventDto } from '../../../../application/room/input/MessageReceiverDto'; import type { MatrixEventMessageReact } from '../../definitions/events/MessageReacted'; -import { convertExternalRoomIdToInternalRoomIdFormat } from './RoomReceiver'; const convertEmojisMatrixFormatToRCFormat = (emoji: string): string => emojione.toShort(emoji); export const convertEmojisFromRCFormatToMatrixFormat = (emoji: string): string => emojione.shortnameToUnicode(emoji); diff --git a/apps/meteor/server/services/federation/infrastructure/matrix/handlers/Message.ts b/apps/meteor/server/services/federation/infrastructure/matrix/handlers/Message.ts index ff3c6932395..7249c336891 100644 --- a/apps/meteor/server/services/federation/infrastructure/matrix/handlers/Message.ts +++ b/apps/meteor/server/services/federation/infrastructure/matrix/handlers/Message.ts @@ -1,8 +1,8 @@ +import { MatrixBaseEventHandler } from './BaseEvent'; import type { FederationMessageServiceReceiver } from '../../../application/room/message/receiver/MessageServiceReceiver'; import { MatrixMessageReceiverConverter } from '../converters/room/MessageReceiver'; import { MatrixEventType } from '../definitions/MatrixEventType'; import type { MatrixEventMessageReact } from '../definitions/events/MessageReacted'; -import { MatrixBaseEventHandler } from './BaseEvent'; export class MatrixMessageReactedHandler extends MatrixBaseEventHandler { public eventType: string = MatrixEventType.MESSAGE_REACTED; diff --git a/apps/meteor/server/services/federation/infrastructure/matrix/handlers/Room.ts b/apps/meteor/server/services/federation/infrastructure/matrix/handlers/Room.ts index 2f2c06c096b..325488af971 100644 --- a/apps/meteor/server/services/federation/infrastructure/matrix/handlers/Room.ts +++ b/apps/meteor/server/services/federation/infrastructure/matrix/handlers/Room.ts @@ -1,3 +1,4 @@ +import { MatrixBaseEventHandler } from './BaseEvent'; import type { FederationRoomServiceReceiver } from '../../../application/room/receiver/RoomServiceReceiver'; import type { RocketChatSettingsAdapter } from '../../rocket-chat/adapters/Settings'; import { MatrixRoomReceiverConverter } from '../converters/room/RoomReceiver'; @@ -11,7 +12,6 @@ import { MatrixEnumRelatesToRelType, MatrixEnumSendMessageType } from '../defini import type { MatrixEventRoomNameChanged } from '../definitions/events/RoomNameChanged'; import type { MatrixEventRoomRoomPowerLevelsChanged } from '../definitions/events/RoomPowerLevelsChanged'; import type { MatrixEventRoomTopicChanged } from '../definitions/events/RoomTopicChanged'; -import { MatrixBaseEventHandler } from './BaseEvent'; export class MatrixRoomCreatedHandler extends MatrixBaseEventHandler { public eventType: string = MatrixEventType.ROOM_CREATED; diff --git a/apps/meteor/server/services/federation/infrastructure/matrix/handlers/User.ts b/apps/meteor/server/services/federation/infrastructure/matrix/handlers/User.ts index 3d2aa82414e..19e955b6f02 100644 --- a/apps/meteor/server/services/federation/infrastructure/matrix/handlers/User.ts +++ b/apps/meteor/server/services/federation/infrastructure/matrix/handlers/User.ts @@ -1,8 +1,8 @@ +import { MatrixBaseEventHandler } from './BaseEvent'; import type { FederationUserServiceReceiver } from '../../../application/user/receiver/UserServiceReceiver'; import { MatrixUserReceiverConverter } from '../converters/user/UserReceiver'; import { MatrixEventType } from '../definitions/MatrixEventType'; import type { MatrixEventUserTypingStatusChanged } from '../definitions/events/UserTypingStatusChanged'; -import { MatrixBaseEventHandler } from './BaseEvent'; export class MatrixUserTypingStatusChangedHandler extends MatrixBaseEventHandler { public eventType: string = MatrixEventType.USER_TYPING_STATUS_CHANGED; diff --git a/apps/meteor/server/services/federation/infrastructure/matrix/handlers/index.ts b/apps/meteor/server/services/federation/infrastructure/matrix/handlers/index.ts index 47469b74320..2da830c7e86 100644 --- a/apps/meteor/server/services/federation/infrastructure/matrix/handlers/index.ts +++ b/apps/meteor/server/services/federation/infrastructure/matrix/handlers/index.ts @@ -1,5 +1,5 @@ -import type { AbstractMatrixEvent } from '../definitions/AbstractMatrixEvent'; import type { MatrixBaseEventHandler } from './BaseEvent'; +import type { AbstractMatrixEvent } from '../definitions/AbstractMatrixEvent'; export class MatrixEventsHandler { // eslint-disable-next-line no-empty-function diff --git a/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Message.ts b/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Message.ts index 461aaae379f..35a5320810c 100644 --- a/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Message.ts +++ b/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Message.ts @@ -2,6 +2,7 @@ import type { IMessage } from '@rocket.chat/core-typings'; import { isQuoteAttachment } from '@rocket.chat/core-typings'; import { Messages } from '@rocket.chat/models'; +import { escapeExternalFederationEventId } from './federation-id-escape-helper'; import { deleteMessage } from '../../../../../../app/lib/server/functions/deleteMessage'; import { sendMessage } from '../../../../../../app/lib/server/functions/sendMessage'; import { updateMessage } from '../../../../../../app/lib/server/functions/updateMessage'; @@ -11,7 +12,6 @@ import { roomCoordinator } from '../../../../../lib/rooms/roomCoordinator'; import type { FederatedRoom } from '../../../domain/FederatedRoom'; import type { FederatedUser } from '../../../domain/FederatedUser'; import { toInternalMessageFormat, toInternalQuoteMessageFormat } from '../converters/to-external-parser-formatter'; -import { escapeExternalFederationEventId } from './federation-id-escape-helper'; const DEFAULT_EMOJI_TO_REACT_WHEN_RECEIVED_EMOJI_DOES_NOT_EXIST = ':grey_question:'; diff --git a/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Room.ts b/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Room.ts index 9deabb53006..7a4d3c406db 100644 --- a/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Room.ts +++ b/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Room.ts @@ -3,6 +3,7 @@ import type { IDirectMessageRoom, IRoom, IUser } from '@rocket.chat/core-typings import { isDirectMessageRoom } from '@rocket.chat/core-typings'; import { Rooms, Subscriptions, MatrixBridgedRoom, Users } from '@rocket.chat/models'; +import { getFederatedUserByInternalUsername } from './User'; import { saveRoomTopic } from '../../../../../../app/channel-settings/server'; import { addUserToRoom } from '../../../../../../app/lib/server/functions/addUserToRoom'; import { createRoom } from '../../../../../../app/lib/server/functions/createRoom'; @@ -20,7 +21,6 @@ import { DirectMessageFederatedRoom, FederatedRoom } from '../../../domain/Feder import type { FederatedUser } from '../../../domain/FederatedUser'; import { extractServerNameFromExternalIdentifier } from '../../matrix/converters/room/RoomReceiver'; import type { ROCKET_CHAT_FEDERATION_ROLES } from '../definitions/FederatedRoomInternalRoles'; -import { getFederatedUserByInternalUsername } from './User'; type WithRequiredProperty = Type & { [Property in Key]-?: Type[Property]; diff --git a/apps/meteor/server/services/federation/infrastructure/rocket-chat/slash-commands/index.ts b/apps/meteor/server/services/federation/infrastructure/rocket-chat/slash-commands/index.ts index 5389cf3cf4d..102f3dce342 100644 --- a/apps/meteor/server/services/federation/infrastructure/rocket-chat/slash-commands/index.ts +++ b/apps/meteor/server/services/federation/infrastructure/rocket-chat/slash-commands/index.ts @@ -1,8 +1,8 @@ import { Federation } from '@rocket.chat/core-services'; import type { SlashCommandCallbackParams } from '@rocket.chat/core-typings'; -import { slashCommands } from '../../../../../../app/utils/server/slashCommand'; import { executeSlashCommand } from './action'; +import { slashCommands } from '../../../../../../app/utils/server/slashCommand'; const FEDERATION_COMMANDS: Record Promise> = { dm: async (currentUserId: string, roomId: string, invitee: string) => diff --git a/apps/meteor/server/services/messages/hooks/BeforeFederationActions.ts b/apps/meteor/server/services/messages/hooks/BeforeFederationActions.ts index 19f42626c21..b2848588953 100644 --- a/apps/meteor/server/services/messages/hooks/BeforeFederationActions.ts +++ b/apps/meteor/server/services/messages/hooks/BeforeFederationActions.ts @@ -1,5 +1,5 @@ -import type { AtLeast } from '@rocket.chat/core-typings'; -import { type IMessage, type IRoom, isMessageFromMatrixFederation, isRoomFederated } from '@rocket.chat/core-typings'; +import { isMessageFromMatrixFederation, isRoomFederated } from '@rocket.chat/core-typings'; +import type { AtLeast, IMessage, IRoom } from '@rocket.chat/core-typings'; import { isFederationEnabled, isFederationReady } from '../../federation/utils'; diff --git a/apps/meteor/server/services/messages/hooks/BeforeSaveCheckMAC.ts b/apps/meteor/server/services/messages/hooks/BeforeSaveCheckMAC.ts index 6ba276971e6..bf97252b1b9 100644 --- a/apps/meteor/server/services/messages/hooks/BeforeSaveCheckMAC.ts +++ b/apps/meteor/server/services/messages/hooks/BeforeSaveCheckMAC.ts @@ -1,6 +1,6 @@ import { MeteorError, Omnichannel } from '@rocket.chat/core-services'; -import type { IRoom } from '@rocket.chat/core-typings'; -import { isOmnichannelRoom, type IMessage } from '@rocket.chat/core-typings'; +import { isOmnichannelRoom } from '@rocket.chat/core-typings'; +import type { IRoom, IMessage } from '@rocket.chat/core-typings'; export class BeforeSaveCheckMAC { async isWithinLimits({ message, room }: { message: IMessage; room: IRoom }): Promise { diff --git a/apps/meteor/server/services/meteor/service.ts b/apps/meteor/server/services/meteor/service.ts index 075807ac31d..9cdb01169f7 100644 --- a/apps/meteor/server/services/meteor/service.ts +++ b/apps/meteor/server/services/meteor/service.ts @@ -1,3 +1,4 @@ +/* eslint-disable react-hooks/rules-of-hooks */ import { api, ServiceClassInternal } from '@rocket.chat/core-services'; import type { AutoUpdateRecord, IMeteor } from '@rocket.chat/core-services'; import type { ILivechatAgent, LoginServiceConfiguration, UserStatus } from '@rocket.chat/core-typings'; diff --git a/apps/meteor/server/services/nps/service.ts b/apps/meteor/server/services/nps/service.ts index d1c5023fca8..68d94a82199 100644 --- a/apps/meteor/server/services/nps/service.ts +++ b/apps/meteor/server/services/nps/service.ts @@ -6,9 +6,9 @@ import type { INpsVote, INps } from '@rocket.chat/core-typings'; import { NPSStatus, INpsVoteStatus } from '@rocket.chat/core-typings'; import { Nps, NpsVote, Settings } from '@rocket.chat/models'; -import { SystemLogger } from '../../lib/logger/system'; import { getBannerForAdmins, notifyAdmins } from './notification'; import { sendNpsResults } from './sendNpsResults'; +import { SystemLogger } from '../../lib/logger/system'; export class NPSService extends ServiceClassInternal implements INPSService { protected name = 'nps'; diff --git a/apps/meteor/server/services/omnichannel-analytics/service.ts b/apps/meteor/server/services/omnichannel-analytics/service.ts index 8b27ed4b9f5..2739dee4ea6 100644 --- a/apps/meteor/server/services/omnichannel-analytics/service.ts +++ b/apps/meteor/server/services/omnichannel-analytics/service.ts @@ -9,14 +9,14 @@ import type { import { LivechatRooms } from '@rocket.chat/models'; import moment from 'moment-timezone'; -import { getTimezone } from '../../../app/utils/server/lib/getTimezone'; -import { callbacks } from '../../../lib/callbacks'; -import { i18n } from '../../lib/i18n'; import { AgentOverviewData } from './AgentData'; import { ChartData } from './ChartData'; import { OverviewData } from './OverviewData'; import { serviceLogger } from './logger'; import { dayIterator } from './utils'; +import { getTimezone } from '../../../app/utils/server/lib/getTimezone'; +import { callbacks } from '../../../lib/callbacks'; +import { i18n } from '../../lib/i18n'; const HOURS_IN_DAY = 24; diff --git a/apps/meteor/server/services/omnichannel-voip/service.ts b/apps/meteor/server/services/omnichannel-voip/service.ts index 6d9f7004464..9c30202045c 100644 --- a/apps/meteor/server/services/omnichannel-voip/service.ts +++ b/apps/meteor/server/services/omnichannel-voip/service.ts @@ -18,8 +18,8 @@ import type { PaginatedResult } from '@rocket.chat/rest-typings'; import type { FindOptions } from 'mongodb'; import _ from 'underscore'; -import { sendMessage } from '../../../app/lib/server/functions/sendMessage'; import type { IOmniRoomClosingMessage } from './internalTypes'; +import { sendMessage } from '../../../app/lib/server/functions/sendMessage'; export class OmnichannelVoipService extends ServiceClassInternal implements IOmnichannelVoipService { protected name = 'omnichannel-voip'; diff --git a/apps/meteor/server/services/omnichannel/queue.ts b/apps/meteor/server/services/omnichannel/queue.ts index 0fae14ce4a2..8db6eedd386 100644 --- a/apps/meteor/server/services/omnichannel/queue.ts +++ b/apps/meteor/server/services/omnichannel/queue.ts @@ -2,11 +2,11 @@ import { type InquiryWithAgentInfo, type IOmnichannelQueue } from '@rocket.chat/ import { License } from '@rocket.chat/license'; import { LivechatInquiry, LivechatRooms } from '@rocket.chat/models'; +import { queueLogger } from './logger'; import { dispatchAgentDelegated } from '../../../app/livechat/server/lib/Helper'; import { RoutingManager } from '../../../app/livechat/server/lib/RoutingManager'; import { getInquirySortMechanismSetting } from '../../../app/livechat/server/lib/settings'; import { settings } from '../../../app/settings/server'; -import { queueLogger } from './logger'; const DEFAULT_RACE_TIMEOUT = 5000; diff --git a/apps/meteor/server/services/omnichannel/service.ts b/apps/meteor/server/services/omnichannel/service.ts index 437baa2f63e..ccfe2026b2b 100644 --- a/apps/meteor/server/services/omnichannel/service.ts +++ b/apps/meteor/server/services/omnichannel/service.ts @@ -4,10 +4,10 @@ import type { AtLeast, IOmnichannelQueue, IOmnichannelRoom } from '@rocket.chat/ import { License } from '@rocket.chat/license'; import moment from 'moment'; +import { OmnichannelQueue } from './queue'; import { Livechat } from '../../../app/livechat/server/lib/LivechatTyped'; import { RoutingManager } from '../../../app/livechat/server/lib/RoutingManager'; import { settings } from '../../../app/settings/server'; -import { OmnichannelQueue } from './queue'; export class OmnichannelService extends ServiceClassInternal implements IOmnichannelService { protected name = 'omnichannel'; diff --git a/apps/meteor/server/services/room/service.ts b/apps/meteor/server/services/room/service.ts index 5bbde4a2814..8afc133f1cc 100644 --- a/apps/meteor/server/services/room/service.ts +++ b/apps/meteor/server/services/room/service.ts @@ -3,6 +3,7 @@ import type { ICreateRoomParams, IRoomService } from '@rocket.chat/core-services import { type AtLeast, type IRoom, type IUser, isRoomWithJoinCode } from '@rocket.chat/core-typings'; import { Rooms, Users } from '@rocket.chat/models'; +import { FederationActions } from './hooks/BeforeFederationActions'; import { saveRoomTopic } from '../../../app/channel-settings/server/functions/saveRoomTopic'; import { addUserToRoom } from '../../../app/lib/server/functions/addUserToRoom'; import { createRoom } from '../../../app/lib/server/functions/createRoom'; // TODO remove this import @@ -11,7 +12,6 @@ import { getValidRoomName } from '../../../app/utils/server/lib/getValidRoomName import { RoomMemberActions } from '../../../definition/IRoomTypeConfig'; import { roomCoordinator } from '../../lib/rooms/roomCoordinator'; import { createDirectMessage } from '../../methods/createDirectMessage'; -import { FederationActions } from './hooks/BeforeFederationActions'; export class RoomService extends ServiceClassInternal implements IRoomService { protected name = 'room'; diff --git a/apps/meteor/server/services/startup.ts b/apps/meteor/server/services/startup.ts index 05a09527985..643f755e861 100644 --- a/apps/meteor/server/services/startup.ts +++ b/apps/meteor/server/services/startup.ts @@ -16,10 +16,10 @@ import { LDAPService } from './ldap/service'; import { MessageService } from './messages/service'; import { MeteorService } from './meteor/service'; import { NPSService } from './nps/service'; +import { OmnichannelService } from './omnichannel/service'; import { OmnichannelAnalyticsService } from './omnichannel-analytics/service'; import { OmnichannelIntegrationService } from './omnichannel-integrations/service'; import { OmnichannelVoipService } from './omnichannel-voip/service'; -import { OmnichannelService } from './omnichannel/service'; import { PushService } from './push/service'; import { RoomService } from './room/service'; import { SAUMonitorService } from './sauMonitor/service'; diff --git a/apps/meteor/server/services/video-conference/service.ts b/apps/meteor/server/services/video-conference/service.ts index a26e947b6b8..0979a55c520 100644 --- a/apps/meteor/server/services/video-conference/service.ts +++ b/apps/meteor/server/services/video-conference/service.ts @@ -42,8 +42,8 @@ import { createRoom } from '../../../app/lib/server/functions/createRoom'; import { sendMessage } from '../../../app/lib/server/functions/sendMessage'; import { notifyOnMessageChange } from '../../../app/lib/server/lib/notifyListener'; import { metrics } from '../../../app/metrics/server/lib/metrics'; -import PushNotification from '../../../app/push-notifications/server/lib/PushNotification'; import { Push } from '../../../app/push/server/push'; +import PushNotification from '../../../app/push-notifications/server/lib/PushNotification'; import { settings } from '../../../app/settings/server'; import { updateCounter } from '../../../app/statistics/server/functions/updateStatsCounter'; import { getUserAvatarURL } from '../../../app/utils/server/getUserAvatarURL'; diff --git a/apps/meteor/server/services/voip-asterisk/connector/asterisk/CommandHandler.ts b/apps/meteor/server/services/voip-asterisk/connector/asterisk/CommandHandler.ts index 93448da657d..fc04eb47862 100644 --- a/apps/meteor/server/services/voip-asterisk/connector/asterisk/CommandHandler.ts +++ b/apps/meteor/server/services/voip-asterisk/connector/asterisk/CommandHandler.ts @@ -17,12 +17,12 @@ import type { IVoipConnectorResult, IManagementServerConnectionStatus, IManageme import { Logger } from '@rocket.chat/logger'; import type { Db } from 'mongodb'; -import { getManagementServerConfig } from '../../lib/Helper'; -import { WebsocketConnection } from '../websocket/WebsocketConnection'; import type { Command } from './Command'; import { CommandType } from './Command'; import { Commands } from './Commands'; import type { IConnection } from './IConnection'; +import { getManagementServerConfig } from '../../lib/Helper'; +import { WebsocketConnection } from '../websocket/WebsocketConnection'; import { AMIConnection } from './ami/AMIConnection'; import { CommandFactory } from './ami/CommandFactory'; diff --git a/apps/meteor/server/startup/index.ts b/apps/meteor/server/startup/index.ts index ccbd621025c..001af2c12be 100644 --- a/apps/meteor/server/startup/index.ts +++ b/apps/meteor/server/startup/index.ts @@ -8,8 +8,8 @@ import './presenceTroubleshoot'; import '../hooks'; import '../lib/rooms/roomTypes'; import '../lib/settingsRegenerator'; -import { isRunningMs } from '../lib/isRunningMs'; import { performMigrationProcedure } from './migrations'; +import { isRunningMs } from '../lib/isRunningMs'; export const startup = async () => { await performMigrationProcedure(); diff --git a/apps/meteor/server/startup/initialData.js b/apps/meteor/server/startup/initialData.js index db8ebeddc8c..30415e8b202 100644 --- a/apps/meteor/server/startup/initialData.js +++ b/apps/meteor/server/startup/initialData.js @@ -3,8 +3,8 @@ import colors from 'colors/safe'; import { Accounts } from 'meteor/accounts-base'; import { Meteor } from 'meteor/meteor'; -import { FileUpload } from '../../app/file-upload/server'; import { RocketChatFile } from '../../app/file/server'; +import { FileUpload } from '../../app/file-upload/server'; import { addUserToDefaultChannels } from '../../app/lib/server/functions/addUserToDefaultChannels'; import { checkUsernameAvailability } from '../../app/lib/server/functions/checkUsernameAvailability'; import { notifyOnSettingChangedById } from '../../app/lib/server/lib/notifyListener'; diff --git a/apps/meteor/tests/data/permissions.helper.ts b/apps/meteor/tests/data/permissions.helper.ts index 7893c0f1162..8069b44fea1 100644 --- a/apps/meteor/tests/data/permissions.helper.ts +++ b/apps/meteor/tests/data/permissions.helper.ts @@ -1,9 +1,9 @@ import type { ISetting } from '@rocket.chat/core-typings'; +import { api, credentials, request } from './api-data'; import { permissions } from '../../app/authorization/server/constant/permissions'; import { omnichannelEEPermissions } from '../../ee/app/livechat-enterprise/server/permissions'; import { IS_EE } from '../e2e/config/constants'; -import { api, credentials, request } from './api-data'; export const updatePermission = (permission: string, roles: string[]): Promise => new Promise((resolve, reject) => { diff --git a/apps/meteor/tests/e2e/federation/utils/channel.ts b/apps/meteor/tests/e2e/federation/utils/channel.ts index b5a81d2686f..c3dbd21acfc 100644 --- a/apps/meteor/tests/e2e/federation/utils/channel.ts +++ b/apps/meteor/tests/e2e/federation/utils/channel.ts @@ -1,9 +1,9 @@ import { faker } from '@faker-js/faker'; import type { Page } from '@playwright/test'; -import type { FederationChannel } from '../page-objects/channel'; import { doLogin } from './auth'; import type { API } from './test'; +import type { FederationChannel } from '../page-objects/channel'; const doLoginAndGoToHome = async ( page: Page, diff --git a/apps/meteor/tests/e2e/federation/utils/register-user.ts b/apps/meteor/tests/e2e/federation/utils/register-user.ts index 765d017e2ed..aac75a58924 100644 --- a/apps/meteor/tests/e2e/federation/utils/register-user.ts +++ b/apps/meteor/tests/e2e/federation/utils/register-user.ts @@ -1,7 +1,7 @@ import { faker } from '@faker-js/faker'; -import * as constants from '../config/constants'; import type { API } from './test'; +import * as constants from '../config/constants'; export async function registerUser(api: API): Promise { const username = faker.string.uuid(); diff --git a/apps/meteor/tests/e2e/federation/utils/test.ts b/apps/meteor/tests/e2e/federation/utils/test.ts index e5ca5c0e71e..01b237610b5 100644 --- a/apps/meteor/tests/e2e/federation/utils/test.ts +++ b/apps/meteor/tests/e2e/federation/utils/test.ts @@ -1,3 +1,4 @@ +/* eslint-disable react-hooks/rules-of-hooks */ import type { APIResponse } from '@playwright/test'; import { test as baseTest } from '@playwright/test'; diff --git a/apps/meteor/tests/e2e/fixtures/addCustomOAuth.ts b/apps/meteor/tests/e2e/fixtures/addCustomOAuth.ts index 10a80a7710a..462a8c7c467 100644 --- a/apps/meteor/tests/e2e/fixtures/addCustomOAuth.ts +++ b/apps/meteor/tests/e2e/fixtures/addCustomOAuth.ts @@ -1,7 +1,7 @@ import { request } from '@playwright/test'; -import { BASE_API_URL } from '../config/constants'; import { Users } from './userStates'; +import { BASE_API_URL } from '../config/constants'; export default async function addCustomOAuth(): Promise { const api = await request.newContext(); diff --git a/apps/meteor/tests/e2e/fixtures/insert-apps.ts b/apps/meteor/tests/e2e/fixtures/insert-apps.ts index fd88714daa3..80214074049 100644 --- a/apps/meteor/tests/e2e/fixtures/insert-apps.ts +++ b/apps/meteor/tests/e2e/fixtures/insert-apps.ts @@ -1,7 +1,7 @@ import { request } from '@playwright/test'; -import { BASE_API_URL, BASE_URL } from '../config/constants'; import { Users } from './userStates'; +import { BASE_API_URL, BASE_URL } from '../config/constants'; const APP_URL = 'https://github.com/RocketChat/Apps.RocketChat.Tester/blob/master/dist/appsrocketchattester_0.1.0.zip?raw=true'; diff --git a/apps/meteor/tests/e2e/retention-policy.spec.ts b/apps/meteor/tests/e2e/retention-policy.spec.ts index 066f1166abe..25962d2aae1 100644 --- a/apps/meteor/tests/e2e/retention-policy.spec.ts +++ b/apps/meteor/tests/e2e/retention-policy.spec.ts @@ -1,12 +1,12 @@ import { faker } from '@faker-js/faker'; import type { Page } from '@playwright/test'; -import { timeUnitToMs, TIMEUNIT } from '../../client/lib/convertTimeUnit'; import { createAuxContext } from './fixtures/createAuxContext'; import { Users } from './fixtures/userStates'; import { HomeChannel } from './page-objects'; import { createTargetTeam, createTargetPrivateChannel, getSettingValueById, setSettingValueById } from './utils'; import { test, expect } from './utils/test'; +import { timeUnitToMs, TIMEUNIT } from '../../client/lib/convertTimeUnit'; test.use({ storageState: Users.admin.state }); diff --git a/apps/meteor/tests/e2e/utils/test.ts b/apps/meteor/tests/e2e/utils/test.ts index 798b224e438..716c91d25aa 100644 --- a/apps/meteor/tests/e2e/utils/test.ts +++ b/apps/meteor/tests/e2e/utils/test.ts @@ -1,3 +1,4 @@ +/* eslint-disable react-hooks/rules-of-hooks */ import * as fs from 'fs'; import * as path from 'path'; diff --git a/apps/meteor/tests/mocks/data.ts b/apps/meteor/tests/mocks/data.ts index 777fe196783..26dbdca2517 100644 --- a/apps/meteor/tests/mocks/data.ts +++ b/apps/meteor/tests/mocks/data.ts @@ -1,7 +1,7 @@ import { faker } from '@faker-js/faker'; import type { IExternalComponentRoomInfo, IExternalComponentUserInfo } from '@rocket.chat/apps-engine/client/definition'; -import type { LicenseInfo } from '@rocket.chat/core-typings'; -import { AppSubscriptionStatus, type App, type IMessage, type IRoom, type ISubscription, type IUser } from '@rocket.chat/core-typings'; +import { AppSubscriptionStatus } from '@rocket.chat/core-typings'; +import type { LicenseInfo, App, IMessage, IRoom, ISubscription, IUser } from '@rocket.chat/core-typings'; import { parse } from '@rocket.chat/message-parser'; import type { MessageWithMdEnforced } from '../../client/lib/parseMessageTextToAstMarkdown'; diff --git a/apps/meteor/tests/unit/app/meteor-accounts-saml/server.tests.ts b/apps/meteor/tests/unit/app/meteor-accounts-saml/server.tests.ts index 1aee98bd744..2b79daca1f1 100644 --- a/apps/meteor/tests/unit/app/meteor-accounts-saml/server.tests.ts +++ b/apps/meteor/tests/unit/app/meteor-accounts-saml/server.tests.ts @@ -1,14 +1,6 @@ import { expect } from 'chai'; import proxyquire from 'proxyquire'; -import { SAMLUtils } from '../../../../app/meteor-accounts-saml/server/lib/Utils'; -import { AuthorizeRequest } from '../../../../app/meteor-accounts-saml/server/lib/generators/AuthorizeRequest'; -import { LogoutRequest } from '../../../../app/meteor-accounts-saml/server/lib/generators/LogoutRequest'; -import { LogoutResponse } from '../../../../app/meteor-accounts-saml/server/lib/generators/LogoutResponse'; -import { LogoutRequestParser } from '../../../../app/meteor-accounts-saml/server/lib/parsers/LogoutRequest'; -import { LogoutResponseParser } from '../../../../app/meteor-accounts-saml/server/lib/parsers/LogoutResponse'; -import { ResponseParser } from '../../../../app/meteor-accounts-saml/server/lib/parsers/Response'; -import { isTruthy } from '../../../../lib/isTruthy'; import { serviceProviderOptions, simpleMetadata, @@ -35,6 +27,14 @@ import { privateKeyCert, privateKey, } from './data'; +import { SAMLUtils } from '../../../../app/meteor-accounts-saml/server/lib/Utils'; +import { AuthorizeRequest } from '../../../../app/meteor-accounts-saml/server/lib/generators/AuthorizeRequest'; +import { LogoutRequest } from '../../../../app/meteor-accounts-saml/server/lib/generators/LogoutRequest'; +import { LogoutResponse } from '../../../../app/meteor-accounts-saml/server/lib/generators/LogoutResponse'; +import { LogoutRequestParser } from '../../../../app/meteor-accounts-saml/server/lib/parsers/LogoutRequest'; +import { LogoutResponseParser } from '../../../../app/meteor-accounts-saml/server/lib/parsers/LogoutResponse'; +import { ResponseParser } from '../../../../app/meteor-accounts-saml/server/lib/parsers/Response'; +import { isTruthy } from '../../../../lib/isTruthy'; const { ServiceProviderMetadata } = proxyquire .noCallThru() diff --git a/apps/meteor/tests/unit/server/services/omnichannel-analytics/OverviewData.tests.ts b/apps/meteor/tests/unit/server/services/omnichannel-analytics/OverviewData.tests.ts index d5ca07ec83d..08fd3053069 100644 --- a/apps/meteor/tests/unit/server/services/omnichannel-analytics/OverviewData.tests.ts +++ b/apps/meteor/tests/unit/server/services/omnichannel-analytics/OverviewData.tests.ts @@ -3,8 +3,8 @@ import { expect } from 'chai'; import moment from 'moment'; import sinon from 'sinon'; -import { OverviewData } from '../../../../../server/services/omnichannel-analytics/OverviewData'; import { conversations } from './mockData'; +import { OverviewData } from '../../../../../server/services/omnichannel-analytics/OverviewData'; const analytics = (date: { gte: Date; lte: Date }) => { // filter the mockData array with the date param with moment diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json index c0c82580df8..fb7ba45eaa6 100644 --- a/apps/uikit-playground/package.json +++ b/apps/uikit-playground/package.json @@ -49,7 +49,7 @@ "@typescript-eslint/parser": "~5.60.1", "@vitejs/plugin-react": "^4.3.3", "eslint": "~8.45.0", - "eslint-plugin-react-hooks": "^4.6.2", + "eslint-plugin-react-hooks": "^5.0.0", "eslint-plugin-react-refresh": "^0.4.14", "typescript": "~5.6.3", "vite": "^5.4.10" diff --git a/ee/apps/ddp-streamer/src/DDPStreamer.ts b/ee/apps/ddp-streamer/src/DDPStreamer.ts index 2ba89ced713..1c880929650 100644 --- a/ee/apps/ddp-streamer/src/DDPStreamer.ts +++ b/ee/apps/ddp-streamer/src/DDPStreamer.ts @@ -7,14 +7,14 @@ import polka from 'polka'; import { throttle } from 'underscore'; import WebSocket from 'ws'; -import { ListenersModule } from '../../../../apps/meteor/server/modules/listeners/listeners.module'; -import type { NotificationsModule } from '../../../../apps/meteor/server/modules/notifications/notifications.module'; -import { StreamerCentral } from '../../../../apps/meteor/server/modules/streamer/streamer.module'; import { Client, clientMap } from './Client'; import { events, server } from './configureServer'; import { DDP_EVENTS } from './constants'; import { Autoupdate } from './lib/Autoupdate'; import { proxy } from './proxy'; +import { ListenersModule } from '../../../../apps/meteor/server/modules/listeners/listeners.module'; +import type { NotificationsModule } from '../../../../apps/meteor/server/modules/notifications/notifications.module'; +import { StreamerCentral } from '../../../../apps/meteor/server/modules/streamer/streamer.module'; const { PORT = 4000 } = process.env; diff --git a/ee/apps/ddp-streamer/src/Streamer.ts b/ee/apps/ddp-streamer/src/Streamer.ts index 686e3224d7e..aa689dfb1f8 100644 --- a/ee/apps/ddp-streamer/src/Streamer.ts +++ b/ee/apps/ddp-streamer/src/Streamer.ts @@ -3,10 +3,10 @@ import type { StreamNames } from '@rocket.chat/ddp-client'; import type { DDPSubscription, Connection, TransformMessage } from 'meteor/rocketchat:streamer'; import WebSocket from 'ws'; -import { Streamer, StreamerCentral } from '../../../../apps/meteor/server/modules/streamer/streamer.module'; import { server } from './configureServer'; import { DDP_EVENTS } from './constants'; import { isEmpty } from './lib/utils'; +import { Streamer, StreamerCentral } from '../../../../apps/meteor/server/modules/streamer/streamer.module'; StreamerCentral.on('broadcast', (name, eventName, args) => { void api.broadcast('stream', [name, eventName, args]); diff --git a/ee/apps/stream-hub-service/src/service.ts b/ee/apps/stream-hub-service/src/service.ts index 84567026733..07baf5923f0 100755 --- a/ee/apps/stream-hub-service/src/service.ts +++ b/ee/apps/stream-hub-service/src/service.ts @@ -4,9 +4,9 @@ import { broker } from '@rocket.chat/network-broker'; import { startTracing } from '@rocket.chat/tracing'; import polka from 'polka'; +import { StreamHub } from './StreamHub'; import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels'; import { DatabaseWatcher } from '../../../../apps/meteor/server/database/DatabaseWatcher'; -import { StreamHub } from './StreamHub'; const PORT = process.env.PORT || 3035; diff --git a/ee/packages/license/__tests__/setLicense.spec.ts b/ee/packages/license/__tests__/setLicense.spec.ts index 41785c756cc..b2bb5d0e254 100644 --- a/ee/packages/license/__tests__/setLicense.spec.ts +++ b/ee/packages/license/__tests__/setLicense.spec.ts @@ -3,10 +3,10 @@ */ import { LicenseImp } from '../src'; +import { MockedLicenseBuilder, getReadyLicenseManager } from './MockedLicenseBuilder'; import { DuplicatedLicenseError } from '../src/errors/DuplicatedLicenseError'; import { InvalidLicenseError } from '../src/errors/InvalidLicenseError'; import { NotReadyForValidation } from '../src/errors/NotReadyForValidation'; -import { MockedLicenseBuilder, getReadyLicenseManager } from './MockedLicenseBuilder'; // Same license used on ci tasks so no I didnt leak it const VALID_LICENSE = diff --git a/ee/packages/license/src/MockedLicenseBuilder.ts b/ee/packages/license/src/MockedLicenseBuilder.ts index a0ae1a37f9a..d61c41f3045 100644 --- a/ee/packages/license/src/MockedLicenseBuilder.ts +++ b/ee/packages/license/src/MockedLicenseBuilder.ts @@ -1,13 +1,13 @@ -import type { InternalModuleName } from '@rocket.chat/core-typings'; -import { - CoreModules, - type GrantedModules, - type ILicenseTag, - type ILicenseV3, - type LicenseLimit, - type LicenseModule, - type LicensePeriod, - type Timestamp, +import { CoreModules } from '@rocket.chat/core-typings'; +import type { + InternalModuleName, + GrantedModules, + ILicenseTag, + ILicenseV3, + LicenseLimit, + LicenseModule, + LicensePeriod, + Timestamp, } from '@rocket.chat/core-typings'; import { encrypt, encryptStatsToken } from './token'; diff --git a/ee/packages/license/src/getLicenseLimit.spec.ts b/ee/packages/license/src/getLicenseLimit.spec.ts index 84e9590861e..2879371e551 100644 --- a/ee/packages/license/src/getLicenseLimit.spec.ts +++ b/ee/packages/license/src/getLicenseLimit.spec.ts @@ -1,6 +1,6 @@ import { LicenseImp } from '.'; -import { MockedLicenseBuilder, getReadyLicenseManager } from '../__tests__/MockedLicenseBuilder'; import { getAppsConfig } from './deprecated'; +import { MockedLicenseBuilder, getReadyLicenseManager } from '../__tests__/MockedLicenseBuilder'; describe('Marketplace Restrictions', () => { it('should respect the default if there is no license applied', async () => { diff --git a/ee/packages/license/src/validation/runValidation.spec.ts b/ee/packages/license/src/validation/runValidation.spec.ts index 523090acd63..73250b6af37 100644 --- a/ee/packages/license/src/validation/runValidation.spec.ts +++ b/ee/packages/license/src/validation/runValidation.spec.ts @@ -2,8 +2,8 @@ * @jest-environment node */ -import { MockedLicenseBuilder, getReadyLicenseManager } from '../../__tests__/MockedLicenseBuilder'; import { runValidation } from './runValidation'; +import { MockedLicenseBuilder, getReadyLicenseManager } from '../../__tests__/MockedLicenseBuilder'; describe('Validation behaviors', () => { it('should return a behavior if the license period is invalid', async () => { diff --git a/ee/packages/license/src/validation/validateLicenseUrl.spec.ts b/ee/packages/license/src/validation/validateLicenseUrl.spec.ts index 9047876f8fb..4b305c59590 100644 --- a/ee/packages/license/src/validation/validateLicenseUrl.spec.ts +++ b/ee/packages/license/src/validation/validateLicenseUrl.spec.ts @@ -4,8 +4,8 @@ import crypto from 'crypto'; -import { MockedLicenseBuilder, getReadyLicenseManager } from '../../__tests__/MockedLicenseBuilder'; import { validateLicenseUrl } from './validateLicenseUrl'; +import { MockedLicenseBuilder, getReadyLicenseManager } from '../../__tests__/MockedLicenseBuilder'; describe('Url Validation', () => { describe('url method', () => { diff --git a/ee/packages/network-broker/src/NetworkBroker.test.ts b/ee/packages/network-broker/src/NetworkBroker.test.ts index c79fb12e704..afb9bfc444e 100644 --- a/ee/packages/network-broker/src/NetworkBroker.test.ts +++ b/ee/packages/network-broker/src/NetworkBroker.test.ts @@ -2,8 +2,8 @@ import { ServiceClass } from '@rocket.chat/core-services'; import { expect } from 'chai'; import sinon from 'sinon'; -import { BrokerMocked } from '../../../../apps/meteor/tests/mocks/server/BrokerMocked'; import { NetworkBroker } from './NetworkBroker'; +import { BrokerMocked } from '../../../../apps/meteor/tests/mocks/server/BrokerMocked'; class DelayedStopBroker extends BrokerMocked { async destroyService(name: string) { diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index 079706382c8..8e891a7cfa6 100644 --- a/ee/packages/pdf-worker/package.json +++ b/ee/packages/pdf-worker/package.json @@ -29,10 +29,10 @@ }, "devDependencies": { "@rocket.chat/jest-presets": "workspace:~", - "@storybook/addon-essentials": "^8.4.1", + "@storybook/addon-essentials": "^8.4.2", "@storybook/addon-webpack5-compiler-babel": "^3.0.3", - "@storybook/react": "^8.4.1", - "@storybook/react-webpack5": "^8.4.1", + "@storybook/react": "^8.4.2", + "@storybook/react-webpack5": "^8.4.2", "@testing-library/react": "~16.0.1", "@types/emojione": "^2.2.9", "@types/jest": "~29.5.14", @@ -42,7 +42,7 @@ "eslint": "~8.45.0", "jest": "~29.7.0", "react-dom": "~18.3.1", - "storybook": "^8.4.1", + "storybook": "^8.4.2", "typescript": "~5.6.3" }, "volta": { diff --git a/ee/packages/pdf-worker/src/strategies/ChatTranscript.spec.ts b/ee/packages/pdf-worker/src/strategies/ChatTranscript.spec.ts index 8e425c014ec..03e132e3dde 100644 --- a/ee/packages/pdf-worker/src/strategies/ChatTranscript.spec.ts +++ b/ee/packages/pdf-worker/src/strategies/ChatTranscript.spec.ts @@ -1,7 +1,7 @@ import moment from 'moment-timezone'; -import { invalidData, validData, newDayData, sameDayData, translationsData } from '../templates/ChatTranscript/ChatTranscript.fixtures'; import { ChatTranscript } from './ChatTranscript'; +import { invalidData, validData, newDayData, sameDayData, translationsData } from '../templates/ChatTranscript/ChatTranscript.fixtures'; jest.mock('../templates/ChatTranscript', () => { return { diff --git a/ee/packages/pdf-worker/src/templates/ChatTranscript/ChatTranscript.stories.tsx b/ee/packages/pdf-worker/src/templates/ChatTranscript/ChatTranscript.stories.tsx index 1f26aae0897..99dab0ef2c7 100644 --- a/ee/packages/pdf-worker/src/templates/ChatTranscript/ChatTranscript.stories.tsx +++ b/ee/packages/pdf-worker/src/templates/ChatTranscript/ChatTranscript.stories.tsx @@ -3,8 +3,8 @@ import type { Meta, StoryFn } from '@storybook/react'; import type { ChatTranscriptData } from '.'; import { ChatTranscriptPDF } from '.'; -import { ChatTranscript } from '../../strategies/ChatTranscript'; import { exampleData } from './ChatTranscript.fixtures'; +import { ChatTranscript } from '../../strategies/ChatTranscript'; Font.register({ family: 'Inter', diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json index 2f7c461fa3f..5076015e678 100644 --- a/ee/packages/ui-theming/package.json +++ b/ee/packages/ui-theming/package.json @@ -11,9 +11,9 @@ "@types/react": "~17.0.80", "eslint": "~8.45.0", "eslint-plugin-anti-trojan-source": "~1.1.1", - "eslint-plugin-react": "~7.32.2", - "eslint-plugin-react-hooks": "~4.6.2", - "eslint-plugin-testing-library": "^5.11.1", + "eslint-plugin-react": "~7.37.2", + "eslint-plugin-react-hooks": "~5.0.0", + "eslint-plugin-testing-library": "^6.4.0", "react": "~17.0.2", "react-docgen-typescript-plugin": "~1.0.8", "typescript": "~5.6.3" diff --git a/packages/agenda/package.json b/packages/agenda/package.json index 1bcaef3dd5e..7fdd8f29889 100644 --- a/packages/agenda/package.json +++ b/packages/agenda/package.json @@ -6,7 +6,7 @@ "dependencies": { "cron": "~1.8.2", "date.js": "~0.3.3", - "debug": "~4.1.1", + "debug": "~4.3.7", "human-interval": "^2.0.1", "moment-timezone": "~0.5.46", "mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch" diff --git a/packages/apps-engine/package.json b/packages/apps-engine/package.json index 36922f39fed..06e7b9c0174 100644 --- a/packages/apps-engine/package.json +++ b/packages/apps-engine/package.json @@ -9,7 +9,6 @@ "testunit": "run-p .:test:node .:test:deno", ".:test:node": "NODE_ENV=test ts-node ./tests/runner.ts", ".:test:deno": "cd deno-runtime && deno task test", - "lint": "run-p .:lint:eslint .:lint:deno", ".:lint:eslint": "eslint .", ".:lint:deno": "deno lint --ignore=deno-runtime/.deno deno-runtime/", "fix-lint": "eslint . --fix", @@ -75,7 +74,7 @@ "@types/nedb": "^1.8.16", "@types/node": "~20.16.15", "@types/semver": "^7.5.8", - "@types/stack-trace": "0.0.29", + "@types/stack-trace": "0.0.33", "@types/uuid": "~10.0.0", "@typescript-eslint/eslint-plugin": "~5.60.1", "@typescript-eslint/parser": "~5.60.1", @@ -96,7 +95,7 @@ "@msgpack/msgpack": "3.0.0-beta2", "adm-zip": "^0.5.16", "debug": "^4.3.7", - "esbuild": "^0.20.2", + "esbuild": "^0.24.0", "jose": "^4.15.9", "jsonrpc-lite": "^2.2.0", "lodash.clonedeep": "^4.5.0", diff --git a/packages/apps-engine/src/client/AppClientManager.ts b/packages/apps-engine/src/client/AppClientManager.ts index 7cb2ed3d520..1bd89cfde8a 100644 --- a/packages/apps-engine/src/client/AppClientManager.ts +++ b/packages/apps-engine/src/client/AppClientManager.ts @@ -1,6 +1,6 @@ -import type { IAppInfo } from '../definition/metadata'; import { AppServerCommunicator } from './AppServerCommunicator'; import { AppsEngineUIHost } from './AppsEngineUIHost'; +import type { IAppInfo } from '../definition/metadata'; export class AppClientManager { private apps: Array; diff --git a/packages/apps-engine/src/client/definition/IExternalComponentRoomInfo.ts b/packages/apps-engine/src/client/definition/IExternalComponentRoomInfo.ts index 32ca449e965..6f08b425c37 100644 --- a/packages/apps-engine/src/client/definition/IExternalComponentRoomInfo.ts +++ b/packages/apps-engine/src/client/definition/IExternalComponentRoomInfo.ts @@ -1,5 +1,5 @@ -import type { IRoom } from '../../definition/rooms'; import type { IExternalComponentUserInfo } from './IExternalComponentUserInfo'; +import type { IRoom } from '../../definition/rooms'; type ClientRoomInfo = Pick; diff --git a/packages/apps-engine/src/definition/accessors/ILogger.ts b/packages/apps-engine/src/definition/accessors/ILogger.ts index eac6e531802..227cb617fa7 100644 --- a/packages/apps-engine/src/definition/accessors/ILogger.ts +++ b/packages/apps-engine/src/definition/accessors/ILogger.ts @@ -1,5 +1,5 @@ -import type { AppMethod } from '../metadata/AppMethod'; import type { ILogEntry } from './ILogEntry'; +import type { AppMethod } from '../metadata/AppMethod'; /** * This logger provides a way to log various levels to the entire system. diff --git a/packages/apps-engine/src/definition/livechat/ILivechatMessage.ts b/packages/apps-engine/src/definition/livechat/ILivechatMessage.ts index d7cc5497d70..af5a4423eb9 100644 --- a/packages/apps-engine/src/definition/livechat/ILivechatMessage.ts +++ b/packages/apps-engine/src/definition/livechat/ILivechatMessage.ts @@ -1,5 +1,5 @@ -import type { IMessage } from '../messages/IMessage'; import type { IVisitor } from './IVisitor'; +import type { IMessage } from '../messages/IMessage'; export interface ILivechatMessage extends IMessage { visitor?: IVisitor; diff --git a/packages/apps-engine/src/definition/metadata/IAppInfo.ts b/packages/apps-engine/src/definition/metadata/IAppInfo.ts index 6cb7515ea6d..ffa2d8ffc47 100644 --- a/packages/apps-engine/src/definition/metadata/IAppInfo.ts +++ b/packages/apps-engine/src/definition/metadata/IAppInfo.ts @@ -1,6 +1,6 @@ -import type { IPermission } from '../permissions/IPermission'; import type { AppInterface } from './AppInterface'; import type { IAppAuthorInfo } from './IAppAuthorInfo'; +import type { IPermission } from '../permissions/IPermission'; export interface IAppInfo { id: string; diff --git a/packages/apps-engine/src/definition/uikit/UIKitInteractionPayloadFormatter.ts b/packages/apps-engine/src/definition/uikit/UIKitInteractionPayloadFormatter.ts index 983228f7025..b836b802469 100644 --- a/packages/apps-engine/src/definition/uikit/UIKitInteractionPayloadFormatter.ts +++ b/packages/apps-engine/src/definition/uikit/UIKitInteractionPayloadFormatter.ts @@ -1,11 +1,11 @@ import { v1 as uuid } from 'uuid'; -import type { IUIKitErrorInteractionParam } from '../accessors/IUIController'; import type { IUIKitContextualBarInteraction, IUIKitErrorInteraction, IUIKitInteraction, IUIKitModalInteraction } from './IUIKitInteractionType'; import { UIKitInteractionType } from './IUIKitInteractionType'; import type { IUIKitSurface } from './IUIKitSurface'; import { UIKitSurfaceType } from './IUIKitSurface'; import type { IUIKitContextualBarViewParam, IUIKitModalViewParam } from './UIKitInteractionResponder'; +import type { IUIKitErrorInteractionParam } from '../accessors/IUIController'; function isModalInteraction(type: IUIKitInteraction['type']): type is IUIKitModalInteraction['type'] { return [UIKitInteractionType.MODAL_OPEN, UIKitInteractionType.MODAL_UPDATE, UIKitInteractionType.MODAL_CLOSE].includes(type); diff --git a/packages/apps-engine/src/definition/uikit/UIKitInteractionResponder.ts b/packages/apps-engine/src/definition/uikit/UIKitInteractionResponder.ts index dca9782dbd4..2e0e6c4961d 100644 --- a/packages/apps-engine/src/definition/uikit/UIKitInteractionResponder.ts +++ b/packages/apps-engine/src/definition/uikit/UIKitInteractionResponder.ts @@ -1,10 +1,10 @@ -import type { Omit } from '../../lib/utils'; -import type { IUIKitErrorInteractionParam } from '../accessors/IUIController'; import type { IUIKitContextualBarResponse, IUIKitErrorResponse, IUIKitModalResponse, IUIKitResponse } from './IUIKitInteractionType'; import { UIKitInteractionType } from './IUIKitInteractionType'; import type { IUIKitSurface } from './IUIKitSurface'; import type { IUIKitBaseIncomingInteraction } from './UIKitIncomingInteractionTypes'; import { formatContextualBarInteraction, formatModalInteraction } from './UIKitInteractionPayloadFormatter'; +import type { Omit } from '../../lib/utils'; +import type { IUIKitErrorInteractionParam } from '../accessors/IUIController'; export type IUIKitModalViewParam = Omit & Partial>; export type IUIKitContextualBarViewParam = Omit & Partial>; diff --git a/packages/apps-engine/src/definition/uikit/blocks/BlockBuilder.ts b/packages/apps-engine/src/definition/uikit/blocks/BlockBuilder.ts index 4bee521518d..61520a7820b 100644 --- a/packages/apps-engine/src/definition/uikit/blocks/BlockBuilder.ts +++ b/packages/apps-engine/src/definition/uikit/blocks/BlockBuilder.ts @@ -1,6 +1,5 @@ import { v1 as uuid } from 'uuid'; -import type { Omit } from '../../../lib/utils'; import type { IActionsBlock, IBlock, IConditionalBlock, IConditionalBlockFilters, IContextBlock, IImageBlock, IInputBlock, ISectionBlock } from './Blocks'; import { BlockType } from './Blocks'; import type { @@ -18,6 +17,7 @@ import type { import { BlockElementType } from './Elements'; import type { ITextObject } from './Objects'; import { TextObjectType } from './Objects'; +import type { Omit } from '../../../lib/utils'; type BlockFunctionParameter = Omit; type ElementFunctionParameter = T extends IInteractiveElement diff --git a/packages/apps-engine/src/definition/videoConfProviders/IVideoConfProvider.ts b/packages/apps-engine/src/definition/videoConfProviders/IVideoConfProvider.ts index 00ca57de896..c3f66d51c14 100644 --- a/packages/apps-engine/src/definition/videoConfProviders/IVideoConfProvider.ts +++ b/packages/apps-engine/src/definition/videoConfProviders/IVideoConfProvider.ts @@ -1,9 +1,9 @@ import type { IHttp, IModify, IPersistence, IRead } from '../accessors'; import type { IBlock } from '../uikit'; -import type { VideoConference } from '../videoConferences/IVideoConference'; -import type { IVideoConferenceUser } from '../videoConferences/IVideoConferenceUser'; import type { IVideoConferenceOptions } from './IVideoConferenceOptions'; import type { VideoConfData, VideoConfDataExtended } from './VideoConfData'; +import type { VideoConference } from '../videoConferences/IVideoConference'; +import type { IVideoConferenceUser } from '../videoConferences/IVideoConferenceUser'; /** * Represents a video conference provider diff --git a/packages/apps-engine/src/server/AppManager.ts b/packages/apps-engine/src/server/AppManager.ts index aac30d86501..95eaa645cc4 100644 --- a/packages/apps-engine/src/server/AppManager.ts +++ b/packages/apps-engine/src/server/AppManager.ts @@ -1,15 +1,15 @@ import { Buffer } from 'buffer'; +import type { IGetAppsFilter } from './IGetAppsFilter'; +import { ProxiedApp } from './ProxiedApp'; +import type { PersistenceBridge, UserBridge } from './bridges'; +import { AppBridges } from './bridges'; import { AppStatus, AppStatusUtils } from '../definition/AppStatus'; import type { IAppInfo } from '../definition/metadata'; import { AppMethod } from '../definition/metadata'; import type { IPermission } from '../definition/permissions/IPermission'; import type { IUser } from '../definition/users'; import { UserType } from '../definition/users'; -import type { IGetAppsFilter } from './IGetAppsFilter'; -import { ProxiedApp } from './ProxiedApp'; -import type { PersistenceBridge, UserBridge } from './bridges'; -import { AppBridges } from './bridges'; import type { IInternalPersistenceBridge } from './bridges/IInternalPersistenceBridge'; import type { IInternalUserBridge } from './bridges/IInternalUserBridge'; import { AppCompiler, AppFabricationFulfillment, AppPackageParser } from './compiler'; diff --git a/packages/apps-engine/src/server/ProxiedApp.ts b/packages/apps-engine/src/server/ProxiedApp.ts index a0aa4594f03..4307f9c9fc9 100644 --- a/packages/apps-engine/src/server/ProxiedApp.ts +++ b/packages/apps-engine/src/server/ProxiedApp.ts @@ -1,8 +1,8 @@ +import type { AppManager } from './AppManager'; import type { AppStatus } from '../definition/AppStatus'; import { AppsEngineException } from '../definition/exceptions'; import type { IAppAuthorInfo, IAppInfo } from '../definition/metadata'; import { AppMethod } from '../definition/metadata'; -import type { AppManager } from './AppManager'; import { InvalidInstallationError } from './errors/InvalidInstallationError'; import { AppConsole } from './logging'; import { AppLicenseValidationResult } from './marketplace/license'; diff --git a/packages/apps-engine/src/server/accessors/DiscussionBuilder.ts b/packages/apps-engine/src/server/accessors/DiscussionBuilder.ts index fa616ce3ca1..2be31580020 100644 --- a/packages/apps-engine/src/server/accessors/DiscussionBuilder.ts +++ b/packages/apps-engine/src/server/accessors/DiscussionBuilder.ts @@ -1,9 +1,9 @@ +import { RoomBuilder } from './RoomBuilder'; import type { IDiscussionBuilder } from '../../definition/accessors'; import type { IMessage } from '../../definition/messages'; import { RocketChatAssociationModel } from '../../definition/metadata'; import { RoomType } from '../../definition/rooms'; import type { IRoom } from '../../definition/rooms/IRoom'; -import { RoomBuilder } from './RoomBuilder'; export class DiscussionBuilder extends RoomBuilder implements IDiscussionBuilder { public kind: RocketChatAssociationModel.DISCUSSION; diff --git a/packages/apps-engine/src/server/accessors/LivechatMessageBuilder.ts b/packages/apps-engine/src/server/accessors/LivechatMessageBuilder.ts index a271da344ba..f42e7222c3b 100644 --- a/packages/apps-engine/src/server/accessors/LivechatMessageBuilder.ts +++ b/packages/apps-engine/src/server/accessors/LivechatMessageBuilder.ts @@ -1,3 +1,4 @@ +import { MessageBuilder } from './MessageBuilder'; import type { ILivechatMessageBuilder, IMessageBuilder } from '../../definition/accessors'; import type { ILivechatMessage } from '../../definition/livechat/ILivechatMessage'; import type { IVisitor } from '../../definition/livechat/IVisitor'; @@ -6,7 +7,6 @@ import { RocketChatAssociationModel } from '../../definition/metadata'; import type { IRoom } from '../../definition/rooms'; import { RoomType } from '../../definition/rooms'; import type { IUser } from '../../definition/users'; -import { MessageBuilder } from './MessageBuilder'; export class LivechatMessageBuilder implements ILivechatMessageBuilder { public kind: RocketChatAssociationModel.LIVECHAT_MESSAGE; diff --git a/packages/apps-engine/src/server/accessors/ModifyCreator.ts b/packages/apps-engine/src/server/accessors/ModifyCreator.ts index 29cd3d223f8..ed67e3d4199 100644 --- a/packages/apps-engine/src/server/accessors/ModifyCreator.ts +++ b/packages/apps-engine/src/server/accessors/ModifyCreator.ts @@ -1,3 +1,12 @@ +import { DiscussionBuilder } from './DiscussionBuilder'; +import { EmailCreator } from './EmailCreator'; +import { LivechatCreator } from './LivechatCreator'; +import { LivechatMessageBuilder } from './LivechatMessageBuilder'; +import { MessageBuilder } from './MessageBuilder'; +import { RoomBuilder } from './RoomBuilder'; +import { UploadCreator } from './UploadCreator'; +import { UserBuilder } from './UserBuilder'; +import { VideoConferenceBuilder } from './VideoConferenceBuilder'; import type { IDiscussionBuilder, ILivechatCreator, @@ -21,15 +30,6 @@ import { UserType } from '../../definition/users/UserType'; import type { AppVideoConference } from '../../definition/videoConferences'; import type { AppBridges } from '../bridges'; import { UIHelper } from '../misc/UIHelper'; -import { DiscussionBuilder } from './DiscussionBuilder'; -import { EmailCreator } from './EmailCreator'; -import { LivechatCreator } from './LivechatCreator'; -import { LivechatMessageBuilder } from './LivechatMessageBuilder'; -import { MessageBuilder } from './MessageBuilder'; -import { RoomBuilder } from './RoomBuilder'; -import { UploadCreator } from './UploadCreator'; -import { UserBuilder } from './UserBuilder'; -import { VideoConferenceBuilder } from './VideoConferenceBuilder'; export class ModifyCreator implements IModifyCreator { private livechatCreator: LivechatCreator; diff --git a/packages/apps-engine/src/server/accessors/ModifyExtender.ts b/packages/apps-engine/src/server/accessors/ModifyExtender.ts index 9876f983ad5..d5bf4ef51f0 100644 --- a/packages/apps-engine/src/server/accessors/ModifyExtender.ts +++ b/packages/apps-engine/src/server/accessors/ModifyExtender.ts @@ -1,10 +1,10 @@ +import { MessageExtender } from './MessageExtender'; +import { RoomExtender } from './RoomExtender'; +import { VideoConferenceExtender } from './VideoConferenceExtend'; import type { IMessageExtender, IModifyExtender, IRoomExtender, IVideoConferenceExtender } from '../../definition/accessors'; import { RocketChatAssociationModel } from '../../definition/metadata'; import type { IUser } from '../../definition/users'; import type { AppBridges } from '../bridges/AppBridges'; -import { MessageExtender } from './MessageExtender'; -import { RoomExtender } from './RoomExtender'; -import { VideoConferenceExtender } from './VideoConferenceExtend'; export class ModifyExtender implements IModifyExtender { constructor( diff --git a/packages/apps-engine/src/server/accessors/ModifyUpdater.ts b/packages/apps-engine/src/server/accessors/ModifyUpdater.ts index 74454febd0a..2f8cc43c190 100644 --- a/packages/apps-engine/src/server/accessors/ModifyUpdater.ts +++ b/packages/apps-engine/src/server/accessors/ModifyUpdater.ts @@ -1,3 +1,7 @@ +import { LivechatUpdater } from './LivechatUpdater'; +import { MessageBuilder } from './MessageBuilder'; +import { RoomBuilder } from './RoomBuilder'; +import { UserUpdater } from './UserUpdater'; import type { ILivechatUpdater, IMessageBuilder, IMessageUpdater, IModifyUpdater, IRoomBuilder } from '../../definition/accessors'; import type { IUserUpdater } from '../../definition/accessors/IUserUpdater'; import { RocketChatAssociationModel } from '../../definition/metadata'; @@ -5,10 +9,6 @@ import { RoomType } from '../../definition/rooms'; import type { IUser } from '../../definition/users'; import type { AppBridges } from '../bridges'; import { UIHelper } from '../misc/UIHelper'; -import { LivechatUpdater } from './LivechatUpdater'; -import { MessageBuilder } from './MessageBuilder'; -import { RoomBuilder } from './RoomBuilder'; -import { UserUpdater } from './UserUpdater'; export class ModifyUpdater implements IModifyUpdater { private livechatUpdater: ILivechatUpdater; diff --git a/packages/apps-engine/src/server/bridges/ApiBridge.ts b/packages/apps-engine/src/server/bridges/ApiBridge.ts index 32f5316d3ce..9b444f7a67d 100644 --- a/packages/apps-engine/src/server/bridges/ApiBridge.ts +++ b/packages/apps-engine/src/server/bridges/ApiBridge.ts @@ -1,8 +1,8 @@ +import { BaseBridge } from './BaseBridge'; import { PermissionDeniedError } from '../errors/PermissionDeniedError'; import type { AppApi } from '../managers/AppApi'; import { AppPermissionManager } from '../managers/AppPermissionManager'; import { AppPermissions } from '../permissions/AppPermissions'; -import { BaseBridge } from './BaseBridge'; export abstract class ApiBridge extends BaseBridge { public async doRegisterApi(api: AppApi, appId: string): Promise { diff --git a/packages/apps-engine/src/server/bridges/AppDetailChangesBridge.ts b/packages/apps-engine/src/server/bridges/AppDetailChangesBridge.ts index 357419c9aa9..66b0719739e 100644 --- a/packages/apps-engine/src/server/bridges/AppDetailChangesBridge.ts +++ b/packages/apps-engine/src/server/bridges/AppDetailChangesBridge.ts @@ -1,5 +1,5 @@ -import type { ISetting } from '../../definition/settings'; import { BaseBridge } from './BaseBridge'; +import type { ISetting } from '../../definition/settings'; /** * An abstract class which will contain various methods related to Apps diff --git a/packages/apps-engine/src/server/bridges/CloudWorkspaceBridge.ts b/packages/apps-engine/src/server/bridges/CloudWorkspaceBridge.ts index bb1caf3a151..7bc897f78c2 100644 --- a/packages/apps-engine/src/server/bridges/CloudWorkspaceBridge.ts +++ b/packages/apps-engine/src/server/bridges/CloudWorkspaceBridge.ts @@ -1,8 +1,8 @@ +import { BaseBridge } from './BaseBridge'; import type { IWorkspaceToken } from '../../definition/cloud/IWorkspaceToken'; import { PermissionDeniedError } from '../errors/PermissionDeniedError'; import { AppPermissionManager } from '../managers/AppPermissionManager'; import { AppPermissions } from '../permissions/AppPermissions'; -import { BaseBridge } from './BaseBridge'; export abstract class CloudWorkspaceBridge extends BaseBridge { public doGetWorkspaceToken(scope: string, appId: string): Promise { diff --git a/packages/apps-engine/src/server/bridges/CommandBridge.ts b/packages/apps-engine/src/server/bridges/CommandBridge.ts index 71b0a971c2e..20c1c2369bd 100644 --- a/packages/apps-engine/src/server/bridges/CommandBridge.ts +++ b/packages/apps-engine/src/server/bridges/CommandBridge.ts @@ -1,8 +1,8 @@ +import { BaseBridge } from './BaseBridge'; import type { ISlashCommand } from '../../definition/slashcommands'; import { PermissionDeniedError } from '../errors/PermissionDeniedError'; import { AppPermissionManager } from '../managers/AppPermissionManager'; import { AppPermissions } from '../permissions/AppPermissions'; -import { BaseBridge } from './BaseBridge'; export abstract class CommandBridge extends BaseBridge { public async doDoesCommandExist(command: string, appId: string): Promise { diff --git a/packages/apps-engine/src/server/bridges/EmailBridge.ts b/packages/apps-engine/src/server/bridges/EmailBridge.ts index c8a5b22e9c8..71bf9adc522 100644 --- a/packages/apps-engine/src/server/bridges/EmailBridge.ts +++ b/packages/apps-engine/src/server/bridges/EmailBridge.ts @@ -1,8 +1,8 @@ +import { BaseBridge } from './BaseBridge'; import type { IEmail } from '../../definition/email'; import { PermissionDeniedError } from '../errors/PermissionDeniedError'; import { AppPermissionManager } from '../managers/AppPermissionManager'; import { AppPermissions } from '../permissions/AppPermissions'; -import { BaseBridge } from './BaseBridge'; export abstract class EmailBridge extends BaseBridge { public async doSendEmail(email: IEmail, appId: string): Promise { diff --git a/packages/apps-engine/src/server/bridges/EnvironmentalVariableBridge.ts b/packages/apps-engine/src/server/bridges/EnvironmentalVariableBridge.ts index 5377dcef616..52fc7ca7f22 100644 --- a/packages/apps-engine/src/server/bridges/EnvironmentalVariableBridge.ts +++ b/packages/apps-engine/src/server/bridges/EnvironmentalVariableBridge.ts @@ -1,7 +1,7 @@ +import { BaseBridge } from './BaseBridge'; import { PermissionDeniedError } from '../errors/PermissionDeniedError'; import { AppPermissionManager } from '../managers/AppPermissionManager'; import { AppPermissions } from '../permissions/AppPermissions'; -import { BaseBridge } from './BaseBridge'; export abstract class EnvironmentalVariableBridge extends BaseBridge { public async doGetValueByName(envVarName: string, appId: string): Promise { diff --git a/packages/apps-engine/src/server/bridges/HttpBridge.ts b/packages/apps-engine/src/server/bridges/HttpBridge.ts index 6d02fb15262..5d6297bb868 100644 --- a/packages/apps-engine/src/server/bridges/HttpBridge.ts +++ b/packages/apps-engine/src/server/bridges/HttpBridge.ts @@ -1,8 +1,8 @@ +import { BaseBridge } from './BaseBridge'; import type { IHttpRequest, IHttpResponse, RequestMethod } from '../../definition/accessors'; import { PermissionDeniedError } from '../errors/PermissionDeniedError'; import { AppPermissionManager } from '../managers/AppPermissionManager'; import { AppPermissions } from '../permissions/AppPermissions'; -import { BaseBridge } from './BaseBridge'; export interface IHttpBridgeRequestInfo { appId: string; diff --git a/packages/apps-engine/src/server/bridges/InternalBridge.ts b/packages/apps-engine/src/server/bridges/InternalBridge.ts index 3d9e3b21f18..e8851ecd5d8 100644 --- a/packages/apps-engine/src/server/bridges/InternalBridge.ts +++ b/packages/apps-engine/src/server/bridges/InternalBridge.ts @@ -1,5 +1,5 @@ -import type { ISetting } from '../../definition/settings'; import { BaseBridge } from './BaseBridge'; +import type { ISetting } from '../../definition/settings'; export abstract class InternalBridge extends BaseBridge { public doGetUsernamesOfRoomById(roomId: string): Promise> { diff --git a/packages/apps-engine/src/server/bridges/ListenerBridge.ts b/packages/apps-engine/src/server/bridges/ListenerBridge.ts index 1357e75ce99..7907e2afab1 100644 --- a/packages/apps-engine/src/server/bridges/ListenerBridge.ts +++ b/packages/apps-engine/src/server/bridges/ListenerBridge.ts @@ -1,7 +1,7 @@ +import { BaseBridge } from './BaseBridge'; import type { IMessage } from '../../definition/messages'; import type { AppInterface } from '../../definition/metadata'; import type { IRoom } from '../../definition/rooms'; -import { BaseBridge } from './BaseBridge'; export abstract class ListenerBridge extends BaseBridge { public async doMessageEvent(int: AppInterface, message: IMessage): Promise { diff --git a/packages/apps-engine/src/server/bridges/LivechatBridge.ts b/packages/apps-engine/src/server/bridges/LivechatBridge.ts index 9fc83076754..d90db78c91a 100644 --- a/packages/apps-engine/src/server/bridges/LivechatBridge.ts +++ b/packages/apps-engine/src/server/bridges/LivechatBridge.ts @@ -1,3 +1,4 @@ +import { BaseBridge } from './BaseBridge'; import type { IExtraRoomParams } from '../../definition/accessors/ILivechatCreator'; import type { IDepartment, ILivechatMessage, ILivechatRoom, ILivechatTransferData, IVisitor } from '../../definition/livechat'; import type { IMessage } from '../../definition/messages'; @@ -5,7 +6,6 @@ import type { IUser } from '../../definition/users'; import { PermissionDeniedError } from '../errors/PermissionDeniedError'; import { AppPermissionManager } from '../managers/AppPermissionManager'; import { AppPermissions } from '../permissions/AppPermissions'; -import { BaseBridge } from './BaseBridge'; type LivechatReadPermissions = keyof Pick< typeof AppPermissions, diff --git a/packages/apps-engine/src/server/bridges/MessageBridge.ts b/packages/apps-engine/src/server/bridges/MessageBridge.ts index d37fb13cc16..9d0a18db52f 100644 --- a/packages/apps-engine/src/server/bridges/MessageBridge.ts +++ b/packages/apps-engine/src/server/bridges/MessageBridge.ts @@ -1,3 +1,4 @@ +import { BaseBridge } from './BaseBridge'; import type { ITypingOptions } from '../../definition/accessors/INotifier'; import type { IMessage, Reaction } from '../../definition/messages'; import type { IRoom } from '../../definition/rooms'; @@ -5,7 +6,6 @@ import type { IUser } from '../../definition/users'; import { PermissionDeniedError } from '../errors/PermissionDeniedError'; import { AppPermissionManager } from '../managers/AppPermissionManager'; import { AppPermissions } from '../permissions/AppPermissions'; -import { BaseBridge } from './BaseBridge'; export interface ITypingDescriptor extends ITypingOptions { isTyping: boolean; diff --git a/packages/apps-engine/src/server/bridges/ModerationBridge.ts b/packages/apps-engine/src/server/bridges/ModerationBridge.ts index ad17e4d6ebe..c214529580e 100644 --- a/packages/apps-engine/src/server/bridges/ModerationBridge.ts +++ b/packages/apps-engine/src/server/bridges/ModerationBridge.ts @@ -1,9 +1,9 @@ +import { BaseBridge } from './BaseBridge'; import type { IMessage } from '../../definition/messages'; import type { IUser } from '../../definition/users'; import { PermissionDeniedError } from '../errors/PermissionDeniedError'; import { AppPermissionManager } from '../managers/AppPermissionManager'; import { AppPermissions } from '../permissions/AppPermissions'; -import { BaseBridge } from './BaseBridge'; export abstract class ModerationBridge extends BaseBridge { public async doReport(messageId: IMessage['id'], description: string, userId: string, appId: string): Promise { diff --git a/packages/apps-engine/src/server/bridges/OAuthAppsBridge.ts b/packages/apps-engine/src/server/bridges/OAuthAppsBridge.ts index dec6366e3af..2dfe71bdbf3 100644 --- a/packages/apps-engine/src/server/bridges/OAuthAppsBridge.ts +++ b/packages/apps-engine/src/server/bridges/OAuthAppsBridge.ts @@ -1,8 +1,8 @@ +import { BaseBridge } from './BaseBridge'; import type { IOAuthApp, IOAuthAppParams } from '../../definition/accessors/IOAuthApp'; import { PermissionDeniedError } from '../errors/PermissionDeniedError'; import { AppPermissionManager } from '../managers/AppPermissionManager'; import { AppPermissions } from '../permissions/AppPermissions'; -import { BaseBridge } from './BaseBridge'; export abstract class OAuthAppsBridge extends BaseBridge { public async doCreate(oAuthApp: IOAuthAppParams, appId: string) { diff --git a/packages/apps-engine/src/server/bridges/PersistenceBridge.ts b/packages/apps-engine/src/server/bridges/PersistenceBridge.ts index 2ab48dd8599..0ed0e274bff 100644 --- a/packages/apps-engine/src/server/bridges/PersistenceBridge.ts +++ b/packages/apps-engine/src/server/bridges/PersistenceBridge.ts @@ -1,8 +1,8 @@ +import { BaseBridge } from './BaseBridge'; import type { RocketChatAssociationRecord } from '../../definition/metadata'; import { PermissionDeniedError } from '../errors/PermissionDeniedError'; import { AppPermissionManager } from '../managers/AppPermissionManager'; import { AppPermissions } from '../permissions/AppPermissions'; -import { BaseBridge } from './BaseBridge'; export abstract class PersistenceBridge extends BaseBridge { public async doPurge(appId: string): Promise { diff --git a/packages/apps-engine/src/server/bridges/RoleBridge.ts b/packages/apps-engine/src/server/bridges/RoleBridge.ts index 2fea98f3281..137dca4a960 100644 --- a/packages/apps-engine/src/server/bridges/RoleBridge.ts +++ b/packages/apps-engine/src/server/bridges/RoleBridge.ts @@ -1,8 +1,8 @@ +import { BaseBridge } from './BaseBridge'; import type { IRole } from '../../definition/roles'; import { PermissionDeniedError } from '../errors/PermissionDeniedError'; import { AppPermissionManager } from '../managers/AppPermissionManager'; import { AppPermissions } from '../permissions/AppPermissions'; -import { BaseBridge } from './BaseBridge'; export abstract class RoleBridge extends BaseBridge { public async doGetOneByIdOrName(idOrName: IRole['id'] | IRole['name'], appId: string): Promise { diff --git a/packages/apps-engine/src/server/bridges/RoomBridge.ts b/packages/apps-engine/src/server/bridges/RoomBridge.ts index deb6f81667d..155c85ba468 100644 --- a/packages/apps-engine/src/server/bridges/RoomBridge.ts +++ b/packages/apps-engine/src/server/bridges/RoomBridge.ts @@ -1,10 +1,10 @@ +import { BaseBridge } from './BaseBridge'; import type { IMessage, IMessageRaw } from '../../definition/messages'; import type { IRoom } from '../../definition/rooms'; import type { IUser } from '../../definition/users'; import { PermissionDeniedError } from '../errors/PermissionDeniedError'; import { AppPermissionManager } from '../managers/AppPermissionManager'; import { AppPermissions } from '../permissions/AppPermissions'; -import { BaseBridge } from './BaseBridge'; export const GetMessagesSortableFields = ['createdAt'] as const; diff --git a/packages/apps-engine/src/server/bridges/SchedulerBridge.ts b/packages/apps-engine/src/server/bridges/SchedulerBridge.ts index e275ca59943..d93660ef75c 100644 --- a/packages/apps-engine/src/server/bridges/SchedulerBridge.ts +++ b/packages/apps-engine/src/server/bridges/SchedulerBridge.ts @@ -1,8 +1,8 @@ +import { BaseBridge } from './BaseBridge'; import type { IOnetimeSchedule, IProcessor, IRecurringSchedule } from '../../definition/scheduler'; import { PermissionDeniedError } from '../errors/PermissionDeniedError'; import { AppPermissionManager } from '../managers/AppPermissionManager'; import { AppPermissions } from '../permissions/AppPermissions'; -import { BaseBridge } from './BaseBridge'; export abstract class SchedulerBridge extends BaseBridge { public async doRegisterProcessors(processors: Array = [], appId: string): Promise> { diff --git a/packages/apps-engine/src/server/bridges/ServerSettingBridge.ts b/packages/apps-engine/src/server/bridges/ServerSettingBridge.ts index b5590bd7033..82eed11b392 100644 --- a/packages/apps-engine/src/server/bridges/ServerSettingBridge.ts +++ b/packages/apps-engine/src/server/bridges/ServerSettingBridge.ts @@ -1,8 +1,8 @@ +import { BaseBridge } from './BaseBridge'; import type { ISetting } from '../../definition/settings'; import { PermissionDeniedError } from '../errors/PermissionDeniedError'; import { AppPermissionManager } from '../managers/AppPermissionManager'; import { AppPermissions } from '../permissions/AppPermissions'; -import { BaseBridge } from './BaseBridge'; export abstract class ServerSettingBridge extends BaseBridge { public async doGetAll(appId: string): Promise> { diff --git a/packages/apps-engine/src/server/bridges/ThreadBridge.ts b/packages/apps-engine/src/server/bridges/ThreadBridge.ts index ccf1f4b1d33..a9bca002044 100644 --- a/packages/apps-engine/src/server/bridges/ThreadBridge.ts +++ b/packages/apps-engine/src/server/bridges/ThreadBridge.ts @@ -1,9 +1,9 @@ +import { BaseBridge } from './BaseBridge'; import type { ITypingOptions } from '../../definition/accessors/INotifier'; import type { IMessage } from '../../definition/messages'; import { PermissionDeniedError } from '../errors/PermissionDeniedError'; import { AppPermissionManager } from '../managers/AppPermissionManager'; import { AppPermissions } from '../permissions/AppPermissions'; -import { BaseBridge } from './BaseBridge'; export interface ITypingDescriptor extends ITypingOptions { isTyping: boolean; diff --git a/packages/apps-engine/src/server/bridges/UiInteractionBridge.ts b/packages/apps-engine/src/server/bridges/UiInteractionBridge.ts index 2d0b6202fc8..287c876d5b6 100644 --- a/packages/apps-engine/src/server/bridges/UiInteractionBridge.ts +++ b/packages/apps-engine/src/server/bridges/UiInteractionBridge.ts @@ -1,9 +1,9 @@ +import { BaseBridge } from './BaseBridge'; import type { IUIKitInteraction } from '../../definition/uikit'; import type { IUser } from '../../definition/users'; import { PermissionDeniedError } from '../errors/PermissionDeniedError'; import { AppPermissionManager } from '../managers/AppPermissionManager'; import { AppPermissions } from '../permissions/AppPermissions'; -import { BaseBridge } from './BaseBridge'; export abstract class UiInteractionBridge extends BaseBridge { public async doNotifyUser(user: IUser, interaction: IUIKitInteraction, appId: string): Promise { diff --git a/packages/apps-engine/src/server/bridges/UploadBridge.ts b/packages/apps-engine/src/server/bridges/UploadBridge.ts index 14ae85ca41d..eb6ee63c2ee 100644 --- a/packages/apps-engine/src/server/bridges/UploadBridge.ts +++ b/packages/apps-engine/src/server/bridges/UploadBridge.ts @@ -1,9 +1,9 @@ +import { BaseBridge } from './BaseBridge'; import type { IUpload } from '../../definition/uploads'; import type { IUploadDetails } from '../../definition/uploads/IUploadDetails'; import { PermissionDeniedError } from '../errors/PermissionDeniedError'; import { AppPermissionManager } from '../managers/AppPermissionManager'; import { AppPermissions } from '../permissions/AppPermissions'; -import { BaseBridge } from './BaseBridge'; export abstract class UploadBridge extends BaseBridge { public async doGetById(id: string, appId: string): Promise { diff --git a/packages/apps-engine/src/server/bridges/UserBridge.ts b/packages/apps-engine/src/server/bridges/UserBridge.ts index d67f2a091dd..8d3167f40e2 100644 --- a/packages/apps-engine/src/server/bridges/UserBridge.ts +++ b/packages/apps-engine/src/server/bridges/UserBridge.ts @@ -1,8 +1,8 @@ +import { BaseBridge } from './BaseBridge'; import type { IUser, IUserCreationOptions, UserType } from '../../definition/users'; import { PermissionDeniedError } from '../errors/PermissionDeniedError'; import { AppPermissionManager } from '../managers/AppPermissionManager'; import { AppPermissions } from '../permissions/AppPermissions'; -import { BaseBridge } from './BaseBridge'; export abstract class UserBridge extends BaseBridge { public async doGetById(id: string, appId: string): Promise { diff --git a/packages/apps-engine/src/server/bridges/VideoConferenceBridge.ts b/packages/apps-engine/src/server/bridges/VideoConferenceBridge.ts index 1a980e437fb..0fdaa2a4256 100644 --- a/packages/apps-engine/src/server/bridges/VideoConferenceBridge.ts +++ b/packages/apps-engine/src/server/bridges/VideoConferenceBridge.ts @@ -1,10 +1,10 @@ +import { BaseBridge } from './BaseBridge'; import type { IVideoConfProvider } from '../../definition/videoConfProviders'; import type { AppVideoConference } from '../../definition/videoConferences/AppVideoConference'; import type { VideoConference } from '../../definition/videoConferences/IVideoConference'; import { PermissionDeniedError } from '../errors/PermissionDeniedError'; import { AppPermissionManager } from '../managers/AppPermissionManager'; import { AppPermissions } from '../permissions/AppPermissions'; -import { BaseBridge } from './BaseBridge'; export abstract class VideoConferenceBridge extends BaseBridge { public async doGetById(callId: string, appId: string): Promise { diff --git a/packages/apps-engine/src/server/compiler/IParseAppPackageResult.ts b/packages/apps-engine/src/server/compiler/IParseAppPackageResult.ts index 62444988d7c..89019e1ccc5 100644 --- a/packages/apps-engine/src/server/compiler/IParseAppPackageResult.ts +++ b/packages/apps-engine/src/server/compiler/IParseAppPackageResult.ts @@ -1,5 +1,5 @@ -import type { IAppInfo } from '../../definition/metadata'; import type { AppImplements } from './AppImplements'; +import type { IAppInfo } from '../../definition/metadata'; export interface IParseAppPackageResult { info: IAppInfo; diff --git a/packages/apps-engine/src/server/logging/AppConsole.ts b/packages/apps-engine/src/server/logging/AppConsole.ts index becf90ede45..46dd2bd46a8 100644 --- a/packages/apps-engine/src/server/logging/AppConsole.ts +++ b/packages/apps-engine/src/server/logging/AppConsole.ts @@ -1,9 +1,9 @@ import * as stackTrace from 'stack-trace'; +import type { ILoggerStorageEntry } from './ILoggerStorageEntry'; import type { ILogEntry, ILogger } from '../../definition/accessors'; import { LogMessageSeverity } from '../../definition/accessors'; import type { AppMethod } from '../../definition/metadata'; -import type { ILoggerStorageEntry } from './ILoggerStorageEntry'; export class AppConsole implements ILogger { public static toStorageEntry(appId: string, logger: AppConsole): ILoggerStorageEntry { diff --git a/packages/apps-engine/src/server/managers/AppListenerManager.ts b/packages/apps-engine/src/server/managers/AppListenerManager.ts index dc145408a79..f51adca31a9 100644 --- a/packages/apps-engine/src/server/managers/AppListenerManager.ts +++ b/packages/apps-engine/src/server/managers/AppListenerManager.ts @@ -1,3 +1,4 @@ +import type { AppAccessorManager } from './AppAccessorManager'; import type { IEmailDescriptor, IPreEmailSentContext } from '../../definition/email'; import { EssentialAppDisabledException } from '../../definition/exceptions'; import type { IExternalComponent } from '../../definition/externalComponent'; @@ -29,7 +30,6 @@ import type { AppManager } from '../AppManager'; import type { ProxiedApp } from '../ProxiedApp'; import { Utilities } from '../misc/Utilities'; import { JSONRPC_METHOD_NOT_FOUND } from '../runtime/deno/AppsEngineDenoRuntime'; -import type { AppAccessorManager } from './AppAccessorManager'; interface IListenerExecutor { [AppInterface.IPreMessageSentPrevent]: { diff --git a/packages/apps-engine/src/server/managers/AppSlashCommandManager.ts b/packages/apps-engine/src/server/managers/AppSlashCommandManager.ts index 05a93816d35..75f15d7679f 100644 --- a/packages/apps-engine/src/server/managers/AppSlashCommandManager.ts +++ b/packages/apps-engine/src/server/managers/AppSlashCommandManager.ts @@ -5,9 +5,9 @@ import { SlashCommandContext } from '../../definition/slashcommands'; import type { AppManager } from '../AppManager'; import type { CommandBridge } from '../bridges'; import { CommandAlreadyExistsError, CommandHasAlreadyBeenTouchedError } from '../errors'; -import { Room } from '../rooms/Room'; import type { AppAccessorManager } from './AppAccessorManager'; import { AppSlashCommand } from './AppSlashCommand'; +import { Room } from '../rooms/Room'; /** * The command manager for the Apps. diff --git a/packages/apps-engine/src/server/managers/AppVideoConfProviderManager.ts b/packages/apps-engine/src/server/managers/AppVideoConfProviderManager.ts index 861a5bc5f36..bd30403ff46 100644 --- a/packages/apps-engine/src/server/managers/AppVideoConfProviderManager.ts +++ b/packages/apps-engine/src/server/managers/AppVideoConfProviderManager.ts @@ -5,11 +5,11 @@ import type { IVideoConferenceUser } from '../../definition/videoConferences/IVi import type { AppManager } from '../AppManager'; import type { VideoConferenceBridge } from '../bridges'; import { VideoConfProviderAlreadyExistsError, VideoConfProviderNotRegisteredError } from '../errors'; -import { PermissionDeniedError } from '../errors/PermissionDeniedError'; -import { AppPermissions } from '../permissions/AppPermissions'; import type { AppAccessorManager } from './AppAccessorManager'; import { AppPermissionManager } from './AppPermissionManager'; import { AppVideoConfProvider } from './AppVideoConfProvider'; +import { PermissionDeniedError } from '../errors/PermissionDeniedError'; +import { AppPermissions } from '../permissions/AppPermissions'; export class AppVideoConfProviderManager { private readonly accessors: AppAccessorManager; diff --git a/packages/apps-engine/src/server/managers/UIActionButtonManager.ts b/packages/apps-engine/src/server/managers/UIActionButtonManager.ts index fac613fbef9..4d4123330af 100644 --- a/packages/apps-engine/src/server/managers/UIActionButtonManager.ts +++ b/packages/apps-engine/src/server/managers/UIActionButtonManager.ts @@ -1,9 +1,9 @@ import type { IUIActionButton, IUIActionButtonDescriptor } from '../../definition/ui'; import type { AppManager } from '../AppManager'; import type { AppActivationBridge } from '../bridges'; +import { AppPermissionManager } from './AppPermissionManager'; import { PermissionDeniedError } from '../errors/PermissionDeniedError'; import { AppPermissions } from '../permissions/AppPermissions'; -import { AppPermissionManager } from './AppPermissionManager'; export class UIActionButtonManager { private readonly activationBridge: AppActivationBridge; diff --git a/packages/apps-engine/src/server/marketplace/IMarketplaceInfo.ts b/packages/apps-engine/src/server/marketplace/IMarketplaceInfo.ts index 3740f5e06f6..07b9852b16e 100644 --- a/packages/apps-engine/src/server/marketplace/IMarketplaceInfo.ts +++ b/packages/apps-engine/src/server/marketplace/IMarketplaceInfo.ts @@ -1,8 +1,8 @@ -import type { IAppInfo } from '../../definition/metadata'; import type { IMarketplacePricingPlan } from './IMarketplacePricingPlan'; import type { IMarketplaceSimpleBundleInfo } from './IMarketplaceSimpleBundleInfo'; import type { IMarketplaceSubscriptionInfo } from './IMarketplaceSubscriptionInfo'; import type { MarketplacePurchaseType } from './MarketplacePurchaseType'; +import type { IAppInfo } from '../../definition/metadata'; export interface IMarketplaceInfo extends IAppInfo { categories: Array; diff --git a/packages/apps-engine/src/server/runtime/AppsEngineEmptyRuntime.ts b/packages/apps-engine/src/server/runtime/AppsEngineEmptyRuntime.ts index 72ddc6d7617..6b400eebcb4 100644 --- a/packages/apps-engine/src/server/runtime/AppsEngineEmptyRuntime.ts +++ b/packages/apps-engine/src/server/runtime/AppsEngineEmptyRuntime.ts @@ -1,6 +1,6 @@ -import type { App } from '../../definition/App'; import type { IAppsEngineRuntimeOptions } from './AppsEngineRuntime'; import { AppsEngineRuntime } from './AppsEngineRuntime'; +import type { App } from '../../definition/App'; export class AppsEngineEmptyRuntime extends AppsEngineRuntime { public static async runCode(code: string, sandbox?: Record, options?: IAppsEngineRuntimeOptions): Promise { diff --git a/packages/apps-engine/src/server/runtime/AppsEngineNodeRuntime.ts b/packages/apps-engine/src/server/runtime/AppsEngineNodeRuntime.ts index 14d8e9d202a..4561ab66ebc 100644 --- a/packages/apps-engine/src/server/runtime/AppsEngineNodeRuntime.ts +++ b/packages/apps-engine/src/server/runtime/AppsEngineNodeRuntime.ts @@ -1,9 +1,9 @@ import * as timers from 'timers'; import * as vm from 'vm'; -import type { App } from '../../definition/App'; import type { IAppsEngineRuntimeOptions } from './AppsEngineRuntime'; import { APPS_ENGINE_RUNTIME_DEFAULT_TIMEOUT, AppsEngineRuntime, getFilenameForApp } from './AppsEngineRuntime'; +import type { App } from '../../definition/App'; export class AppsEngineNodeRuntime extends AppsEngineRuntime { public static defaultRuntimeOptions = { diff --git a/packages/apps-engine/src/server/runtime/deno/AppsEngineDenoRuntime.ts b/packages/apps-engine/src/server/runtime/deno/AppsEngineDenoRuntime.ts index 8e5fc34daa0..63c132b3eb7 100644 --- a/packages/apps-engine/src/server/runtime/deno/AppsEngineDenoRuntime.ts +++ b/packages/apps-engine/src/server/runtime/deno/AppsEngineDenoRuntime.ts @@ -5,6 +5,10 @@ import { type Readable, EventEmitter } from 'stream'; import debugFactory from 'debug'; import * as jsonrpc from 'jsonrpc-lite'; +import { LivenessManager } from './LivenessManager'; +import { ProcessMessenger } from './ProcessMessenger'; +import { bundleLegacyApp } from './bundler'; +import { decoder } from './codec'; import { AppStatus } from '../../../definition/AppStatus'; import type { AppManager } from '../../AppManager'; import type { AppBridges } from '../../bridges'; @@ -12,10 +16,6 @@ import type { IParseAppPackageResult } from '../../compiler'; import { AppConsole, type ILoggerStorageEntry } from '../../logging'; import type { AppAccessorManager, AppApiManager } from '../../managers'; import type { AppLogStorage, IAppStorageItem } from '../../storage'; -import { LivenessManager } from './LivenessManager'; -import { ProcessMessenger } from './ProcessMessenger'; -import { bundleLegacyApp } from './bundler'; -import { decoder } from './codec'; const baseDebug = debugFactory('appsEngine:runtime:deno'); diff --git a/packages/apps-engine/tests/test-data/bridges/appBridges.ts b/packages/apps-engine/tests/test-data/bridges/appBridges.ts index e8e89f86410..82ba6b2b35c 100644 --- a/packages/apps-engine/tests/test-data/bridges/appBridges.ts +++ b/packages/apps-engine/tests/test-data/bridges/appBridges.ts @@ -1,3 +1,28 @@ +import { TestOAuthAppsBridge } from './OAuthAppsBridge'; +import { TestsActivationBridge } from './activationBridge'; +import { TestsApiBridge } from './apiBridge'; +import { TestsAppDetailChangesBridge } from './appDetailChanges'; +import { TestAppCloudWorkspaceBridge } from './cloudBridge'; +import { TestsCommandBridge } from './commandBridge'; +import { TestsEmailBridge } from './emailBridge'; +import { TestsEnvironmentalVariableBridge } from './environmentalVariableBridge'; +import { TestsHttpBridge } from './httpBridge'; +import { TestsInternalBridge } from './internalBridge'; +import { TestsInternalFederationBridge } from './internalFederationBridge'; +import { TestLivechatBridge } from './livechatBridge'; +import { TestsMessageBridge } from './messageBridge'; +import { TestsModerationBridge } from './moderationBridge'; +import { TestsPersisBridge } from './persisBridge'; +import { TestsRoleBridge } from './roleBridge'; +import { TestsRoomBridge } from './roomBridge'; +import { TestSchedulerBridge } from './schedulerBridge'; +import { TestsServerSettingBridge } from './serverSettingBridge'; +import { TestsThreadBridge } from './threadBridge'; +import { TestsUiIntegrationBridge } from './uiIntegrationBridge'; +import { TestUploadBridge } from './uploadBridge'; +import { TestsUserBridge } from './userBridge'; +import { TestsVideoConferenceBridge } from './videoConferenceBridge'; +import { AppBridges } from '../../../src/server/bridges'; import type { AppActivationBridge, AppDetailChangesBridge, @@ -18,36 +43,11 @@ import type { UserBridge, VideoConferenceBridge, } from '../../../src/server/bridges'; -import { AppBridges } from '../../../src/server/bridges'; import type { CloudWorkspaceBridge } from '../../../src/server/bridges/CloudWorkspaceBridge'; import type { EmailBridge } from '../../../src/server/bridges/EmailBridge'; import type { IInternalFederationBridge } from '../../../src/server/bridges/IInternalFederationBridge'; import type { OAuthAppsBridge } from '../../../src/server/bridges/OAuthAppsBridge'; import type { ThreadBridge } from '../../../src/server/bridges/ThreadBridge'; -import { TestOAuthAppsBridge } from './OAuthAppsBridge'; -import { TestsActivationBridge } from './activationBridge'; -import { TestsApiBridge } from './apiBridge'; -import { TestsAppDetailChangesBridge } from './appDetailChanges'; -import { TestAppCloudWorkspaceBridge } from './cloudBridge'; -import { TestsCommandBridge } from './commandBridge'; -import { TestsEmailBridge } from './emailBridge'; -import { TestsEnvironmentalVariableBridge } from './environmentalVariableBridge'; -import { TestsHttpBridge } from './httpBridge'; -import { TestsInternalBridge } from './internalBridge'; -import { TestsInternalFederationBridge } from './internalFederationBridge'; -import { TestLivechatBridge } from './livechatBridge'; -import { TestsMessageBridge } from './messageBridge'; -import { TestsModerationBridge } from './moderationBridge'; -import { TestsPersisBridge } from './persisBridge'; -import { TestsRoleBridge } from './roleBridge'; -import { TestsRoomBridge } from './roomBridge'; -import { TestSchedulerBridge } from './schedulerBridge'; -import { TestsServerSettingBridge } from './serverSettingBridge'; -import { TestsThreadBridge } from './threadBridge'; -import { TestsUiIntegrationBridge } from './uiIntegrationBridge'; -import { TestUploadBridge } from './uploadBridge'; -import { TestsUserBridge } from './userBridge'; -import { TestsVideoConferenceBridge } from './videoConferenceBridge'; export class TestsAppBridges extends AppBridges { private readonly appDetails: TestsAppDetailChangesBridge; diff --git a/packages/apps-engine/tests/test-data/utilities.ts b/packages/apps-engine/tests/test-data/utilities.ts index a565702bebe..4468c03f90b 100644 --- a/packages/apps-engine/tests/test-data/utilities.ts +++ b/packages/apps-engine/tests/test-data/utilities.ts @@ -1,3 +1,7 @@ +import { TestsAppBridges } from './bridges/appBridges'; +import { TestSourceStorage } from './storage/TestSourceStorage'; +import { TestsAppLogStorage } from './storage/logStorage'; +import { TestsAppStorage } from './storage/storage'; import { AppStatus } from '../../src/definition/AppStatus'; import type { IHttp, IModify, IPersistence, IRead } from '../../src/definition/accessors'; import { HttpStatusCode } from '../../src/definition/accessors'; @@ -32,10 +36,6 @@ import type { AppRuntimeManager } from '../../src/server/managers/AppRuntimeMana import type { UIActionButtonManager } from '../../src/server/managers/UIActionButtonManager'; import type { DenoRuntimeSubprocessController } from '../../src/server/runtime/deno/AppsEngineDenoRuntime'; import type { AppLogStorage, AppMetadataStorage, AppSourceStorage, IAppStorageItem } from '../../src/server/storage'; -import { TestsAppBridges } from './bridges/appBridges'; -import { TestSourceStorage } from './storage/TestSourceStorage'; -import { TestsAppLogStorage } from './storage/logStorage'; -import { TestsAppStorage } from './storage/storage'; export class TestInfastructureSetup { private appStorage: TestsAppStorage; diff --git a/packages/core-services/src/lib/asyncLocalStorage.ts b/packages/core-services/src/lib/asyncLocalStorage.ts index cec53d979e9..a2e07fabada 100644 --- a/packages/core-services/src/lib/asyncLocalStorage.ts +++ b/packages/core-services/src/lib/asyncLocalStorage.ts @@ -1,4 +1,4 @@ -import type { IServiceContext } from '../types/ServiceClass'; import { AsyncContextStore } from './ContextStore'; +import type { IServiceContext } from '../types/ServiceClass'; export const asyncLocalStorage = new AsyncContextStore(); diff --git a/packages/core-services/src/types/IApiService.ts b/packages/core-services/src/types/IApiService.ts index 0914c6ec3e3..bff4bc3a2d8 100644 --- a/packages/core-services/src/types/IApiService.ts +++ b/packages/core-services/src/types/IApiService.ts @@ -1,6 +1,6 @@ -import type { EventSignatures } from '../events/Events'; import type { IBroker, IBrokerNode } from './IBroker'; import type { IServiceClass } from './ServiceClass'; +import type { EventSignatures } from '../events/Events'; export interface IApiService { setBroker(broker: IBroker): void; diff --git a/packages/core-services/src/types/IBroker.ts b/packages/core-services/src/types/IBroker.ts index aee25d096f8..d72221a09ca 100644 --- a/packages/core-services/src/types/IBroker.ts +++ b/packages/core-services/src/types/IBroker.ts @@ -1,5 +1,5 @@ -import type { EventSignatures } from '../events/Events'; import type { IServiceClass } from './ServiceClass'; +import type { EventSignatures } from '../events/Events'; export interface IBrokerNode { id: string; diff --git a/packages/core-services/src/types/ServiceClass.ts b/packages/core-services/src/types/ServiceClass.ts index 5e6b202a103..b6554919045 100644 --- a/packages/core-services/src/types/ServiceClass.ts +++ b/packages/core-services/src/types/ServiceClass.ts @@ -1,9 +1,9 @@ import { EventEmitter } from 'events'; -import type { EventSignatures } from '../events/Events'; -import { asyncLocalStorage } from '../lib/asyncLocalStorage'; import type { IApiService } from './IApiService'; import type { IBroker, IBrokerNode } from './IBroker'; +import type { EventSignatures } from '../events/Events'; +import { asyncLocalStorage } from '../lib/asyncLocalStorage'; export interface IServiceContext { id: string; // Context ID diff --git a/packages/ddp-client/__tests__/Account.spec.ts b/packages/ddp-client/__tests__/Account.spec.ts index 948d041ebf2..f18d8100c8b 100644 --- a/packages/ddp-client/__tests__/Account.spec.ts +++ b/packages/ddp-client/__tests__/Account.spec.ts @@ -1,7 +1,7 @@ import WS from 'jest-websocket-mock'; -import { DDPSDK } from '../src/DDPSDK'; import { handleConnection, handleMethod } from './helpers'; +import { DDPSDK } from '../src/DDPSDK'; let server: WS; diff --git a/packages/ddp-client/__tests__/Connection.spec.ts b/packages/ddp-client/__tests__/Connection.spec.ts index c535a6c58cc..4aea1294484 100644 --- a/packages/ddp-client/__tests__/Connection.spec.ts +++ b/packages/ddp-client/__tests__/Connection.spec.ts @@ -1,8 +1,8 @@ import WS from 'jest-websocket-mock'; +import { handleConnection, handleConnectionAndRejects, handleMethod } from './helpers'; import { ConnectionImpl } from '../src/Connection'; import { MinimalDDPClient } from '../src/MinimalDDPClient'; -import { handleConnection, handleConnectionAndRejects, handleMethod } from './helpers'; let server: WS; beforeEach(() => { diff --git a/packages/ddp-client/__tests__/DDPSDK.spec.ts b/packages/ddp-client/__tests__/DDPSDK.spec.ts index cd5b30113de..8077b5b5b87 100644 --- a/packages/ddp-client/__tests__/DDPSDK.spec.ts +++ b/packages/ddp-client/__tests__/DDPSDK.spec.ts @@ -4,8 +4,8 @@ import util from 'util'; import WS from 'jest-websocket-mock'; import { WebSocket } from 'ws'; -import { DDPSDK } from '../src/DDPSDK'; import { fireStreamChange, fireStreamAdded, fireStreamRemove, handleConnection, handleSubscription, handleMethod } from './helpers'; +import { DDPSDK } from '../src/DDPSDK'; (global as any).WebSocket = (global as any).WebSocket || WebSocket; diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index a1817499ab7..a7aa7698cab 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -10,11 +10,11 @@ "@typescript-eslint/eslint-plugin": "~5.60.1", "@typescript-eslint/parser": "~5.60.1", "eslint": "~8.45.0", - "eslint-config-prettier": "~8.8.0", + "eslint-config-prettier": "~9.1.0", "eslint-plugin-anti-trojan-source": "~1.1.1", - "eslint-plugin-import": "~2.26.0", - "eslint-plugin-jest": "~27.2.3", - "eslint-plugin-jsx-a11y": "^6.8.0", + "eslint-plugin-import": "~2.31.0", + "eslint-plugin-jest": "~28.8.3", + "eslint-plugin-jsx-a11y": "^6.10.2", "eslint-plugin-prettier": "~5.2.1", "prettier": "~3.3.3" }, diff --git a/packages/freeswitch/tests/parseUserList.test.ts b/packages/freeswitch/tests/parseUserList.test.ts index e1db317f24f..0d4aa7bd034 100644 --- a/packages/freeswitch/tests/parseUserList.test.ts +++ b/packages/freeswitch/tests/parseUserList.test.ts @@ -1,5 +1,5 @@ -import { parseUserList } from '../src/utils/parseUserList'; import { makeFreeSwitchResponse } from './utils/makeFreeSwitchResponse'; +import { parseUserList } from '../src/utils/parseUserList'; test.each(['', undefined, 200 as unknown as any, '\nsomething'])('Invalid FreeSwitch responses', (input) => { expect(() => parseUserList({ _body: input })).toThrow('Invalid response from FreeSwitch server.'); diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index bca893f2cdb..5d6d1e885c3 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -64,13 +64,13 @@ "@rocket.chat/ui-contexts": "workspace:^", "@rocket.chat/ui-kit": "workspace:~", "@rocket.chat/ui-video-conf": "workspace:^", - "@storybook/addon-essentials": "^8.4.1", + "@storybook/addon-essentials": "^8.4.2", "@storybook/addon-styling-webpack": "^1.0.1", "@storybook/addon-webpack5-compiler-babel": "^3.0.3", - "@storybook/blocks": "^8.4.1", - "@storybook/react": "^8.4.1", - "@storybook/react-webpack5": "^8.4.1", - "@storybook/theming": "^8.4.1", + "@storybook/blocks": "^8.4.2", + "@storybook/react": "^8.4.2", + "@storybook/react-webpack5": "^8.4.2", + "@storybook/theming": "^8.4.2", "@tanstack/react-query": "^4.36.1", "@testing-library/react": "~16.0.1", "@testing-library/user-event": "~14.5.2", @@ -88,7 +88,7 @@ "react-dom": "^17.0.2", "react-i18next": "~13.2.2", "rimraf": "^6.0.1", - "storybook": "^8.4.1", + "storybook": "^8.4.2", "storybook-dark-mode": "^4.0.2", "typescript": "~5.6.3" }, diff --git a/packages/fuselage-ui-kit/src/blocks/ActionsBlock.tsx b/packages/fuselage-ui-kit/src/blocks/ActionsBlock.tsx index 548636d1973..5254e4751cb 100644 --- a/packages/fuselage-ui-kit/src/blocks/ActionsBlock.tsx +++ b/packages/fuselage-ui-kit/src/blocks/ActionsBlock.tsx @@ -3,9 +3,9 @@ import * as UiKit from '@rocket.chat/ui-kit'; import type { ReactElement } from 'react'; import { memo, useCallback, useMemo, useState } from 'react'; +import Action from './ActionsBlock.Action'; import { useSurfaceType } from '../hooks/useSurfaceType'; import type { BlockProps } from '../utils/BlockProps'; -import Action from './ActionsBlock.Action'; type ActionsBlockProps = BlockProps; diff --git a/packages/fuselage-ui-kit/src/blocks/ContextBlock.tsx b/packages/fuselage-ui-kit/src/blocks/ContextBlock.tsx index c8dceed816e..db40de7e3f6 100644 --- a/packages/fuselage-ui-kit/src/blocks/ContextBlock.tsx +++ b/packages/fuselage-ui-kit/src/blocks/ContextBlock.tsx @@ -3,8 +3,8 @@ import type * as UiKit from '@rocket.chat/ui-kit'; import type { ReactElement } from 'react'; import { memo, useMemo } from 'react'; -import type { BlockProps } from '../utils/BlockProps'; import Item from './ContextBlock.Item'; +import type { BlockProps } from '../utils/BlockProps'; type ContextBlockProps = BlockProps; diff --git a/packages/fuselage-ui-kit/src/blocks/ImageBlock.tsx b/packages/fuselage-ui-kit/src/blocks/ImageBlock.tsx index 96baeccbbee..10ee2502ff0 100644 --- a/packages/fuselage-ui-kit/src/blocks/ImageBlock.tsx +++ b/packages/fuselage-ui-kit/src/blocks/ImageBlock.tsx @@ -3,9 +3,9 @@ import * as UiKit from '@rocket.chat/ui-kit'; import type { ReactElement } from 'react'; import { memo, useEffect, useState } from 'react'; +import { Image } from './ImageBlock.styles'; import { useSurfaceType } from '../hooks/useSurfaceType'; import type { BlockProps } from '../utils/BlockProps'; -import { Image } from './ImageBlock.styles'; const maxSize = 360; diff --git a/packages/fuselage-ui-kit/src/blocks/PreviewBlock.tsx b/packages/fuselage-ui-kit/src/blocks/PreviewBlock.tsx index 363b5e71d9b..23b4b0cacb3 100644 --- a/packages/fuselage-ui-kit/src/blocks/PreviewBlock.tsx +++ b/packages/fuselage-ui-kit/src/blocks/PreviewBlock.tsx @@ -16,8 +16,8 @@ import { import type { ReactElement } from 'react'; import { memo } from 'react'; -import type { BlockProps } from '../utils/BlockProps'; import ContextBlock from './ContextBlock'; +import type { BlockProps } from '../utils/BlockProps'; type PreviewBlockProps = BlockProps; diff --git a/packages/fuselage-ui-kit/src/blocks/SectionBlock.Fields.tsx b/packages/fuselage-ui-kit/src/blocks/SectionBlock.Fields.tsx index b1161d55905..a92ad87ad0e 100644 --- a/packages/fuselage-ui-kit/src/blocks/SectionBlock.Fields.tsx +++ b/packages/fuselage-ui-kit/src/blocks/SectionBlock.Fields.tsx @@ -18,7 +18,7 @@ type FieldsProps = { const Fields = ({ fields, surfaceRenderer }: FieldsProps): ReactElement => ( {fields.map((field, i) => ( - + {surfaceRenderer.renderTextObject(field, 0, UiKit.BlockContext.NONE)} ))} diff --git a/packages/fuselage-ui-kit/src/blocks/SectionBlock.tsx b/packages/fuselage-ui-kit/src/blocks/SectionBlock.tsx index c9612d136ba..dab4662ea0e 100644 --- a/packages/fuselage-ui-kit/src/blocks/SectionBlock.tsx +++ b/packages/fuselage-ui-kit/src/blocks/SectionBlock.tsx @@ -3,8 +3,8 @@ import type * as UiKit from '@rocket.chat/ui-kit'; import type { ReactElement } from 'react'; import { memo, useMemo } from 'react'; -import type { BlockProps } from '../utils/BlockProps'; import Fields from './SectionBlock.Fields'; +import type { BlockProps } from '../utils/BlockProps'; type SectionBlockProps = BlockProps; diff --git a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx index f5e749bf2fb..c5612158531 100644 --- a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx +++ b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx @@ -23,9 +23,9 @@ import type { MouseEventHandler, ReactElement } from 'react'; import { useContext, memo } from 'react'; import { UiKitContext } from '../..'; +import { useVideoConfDataStream } from './hooks/useVideoConfDataStream'; import { useSurfaceType } from '../../hooks/useSurfaceType'; import type { BlockProps } from '../../utils/BlockProps'; -import { useVideoConfDataStream } from './hooks/useVideoConfDataStream'; type VideoConferenceBlockProps = BlockProps; diff --git a/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/ChannelsSelectElement.spec.tsx b/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/ChannelsSelectElement.spec.tsx index f249a2cd360..a9ba6cd7267 100644 --- a/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/ChannelsSelectElement.spec.tsx +++ b/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/ChannelsSelectElement.spec.tsx @@ -5,8 +5,8 @@ import { BlockContext } from '@rocket.chat/ui-kit'; import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { contextualBarParser } from '../../surfaces'; import ChannelsSelectElement from './ChannelsSelectElement'; +import { contextualBarParser } from '../../surfaces'; import { useChannelsData } from './hooks/useChannelsData'; const channelsBlock: ChannelsSelectElementType = { diff --git a/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/ChannelsSelectElement.tsx b/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/ChannelsSelectElement.tsx index af1cceab095..96d055253ac 100644 --- a/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/ChannelsSelectElement.tsx +++ b/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/ChannelsSelectElement.tsx @@ -4,9 +4,9 @@ import { RoomAvatar } from '@rocket.chat/ui-avatar'; import type * as UiKit from '@rocket.chat/ui-kit'; import { memo, useCallback, useState } from 'react'; +import { useChannelsData } from './hooks/useChannelsData'; import { useUiKitState } from '../../hooks/useUiKitState'; import type { BlockProps } from '../../utils/BlockProps'; -import { useChannelsData } from './hooks/useChannelsData'; type ChannelsSelectElementProps = BlockProps; diff --git a/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/MultiChannelsSelectElement.spec.tsx b/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/MultiChannelsSelectElement.spec.tsx index b99cbcbbcb4..c3c65c3dbe7 100644 --- a/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/MultiChannelsSelectElement.spec.tsx +++ b/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/MultiChannelsSelectElement.spec.tsx @@ -4,8 +4,8 @@ import { BlockContext } from '@rocket.chat/ui-kit'; import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { contextualBarParser } from '../../surfaces'; import MultiChannelsSelectElement from './MultiChannelsSelectElement'; +import { contextualBarParser } from '../../surfaces'; import { useChannelsData } from './hooks/useChannelsData'; const channelsBlock: MultiChannelsSelectElementType = { diff --git a/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/MultiChannelsSelectElement.tsx b/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/MultiChannelsSelectElement.tsx index a263049041c..526822e14b3 100644 --- a/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/MultiChannelsSelectElement.tsx +++ b/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/MultiChannelsSelectElement.tsx @@ -4,9 +4,9 @@ import { RoomAvatar } from '@rocket.chat/ui-avatar'; import type * as UiKit from '@rocket.chat/ui-kit'; import { memo, useCallback, useState } from 'react'; +import { useChannelsData } from './hooks/useChannelsData'; import { useUiKitState } from '../../hooks/useUiKitState'; import type { BlockProps } from '../../utils/BlockProps'; -import { useChannelsData } from './hooks/useChannelsData'; type MultiChannelsSelectProps = BlockProps; diff --git a/packages/fuselage-ui-kit/src/elements/ContextElement/ContextElement.tsx b/packages/fuselage-ui-kit/src/elements/ContextElement/ContextElement.tsx index a1bcc93c583..fc580bc0bd9 100644 --- a/packages/fuselage-ui-kit/src/elements/ContextElement/ContextElement.tsx +++ b/packages/fuselage-ui-kit/src/elements/ContextElement/ContextElement.tsx @@ -1,8 +1,8 @@ import { Box } from '@rocket.chat/fuselage'; import type * as UiKit from '@rocket.chat/ui-kit'; -import type { BlockProps } from '../../utils/BlockProps'; import { ContextElementItem } from './ContextElementItem'; +import type { BlockProps } from '../../utils/BlockProps'; type ContextElementProps = BlockProps; diff --git a/packages/fuselage-ui-kit/src/elements/ImageElement.tsx b/packages/fuselage-ui-kit/src/elements/ImageElement.tsx index d790b6bf28c..89a495c9ebc 100644 --- a/packages/fuselage-ui-kit/src/elements/ImageElement.tsx +++ b/packages/fuselage-ui-kit/src/elements/ImageElement.tsx @@ -1,8 +1,8 @@ import * as UiKit from '@rocket.chat/ui-kit'; import type { ReactElement } from 'react'; -import type { BlockProps } from '../utils/BlockProps'; import { Element } from './ImageElement.styles'; +import type { BlockProps } from '../utils/BlockProps'; type ImageElementProps = BlockProps; diff --git a/packages/fuselage-ui-kit/src/elements/UsersSelectElement/MultiUsersSelectElement.spec.tsx b/packages/fuselage-ui-kit/src/elements/UsersSelectElement/MultiUsersSelectElement.spec.tsx index d038c8ac986..3f42c1908fd 100644 --- a/packages/fuselage-ui-kit/src/elements/UsersSelectElement/MultiUsersSelectElement.spec.tsx +++ b/packages/fuselage-ui-kit/src/elements/UsersSelectElement/MultiUsersSelectElement.spec.tsx @@ -4,8 +4,8 @@ import { BlockContext } from '@rocket.chat/ui-kit'; import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { contextualBarParser } from '../../surfaces'; import MultiUsersSelectElement from './MultiUsersSelectElement'; +import { contextualBarParser } from '../../surfaces'; import { useUsersData } from './hooks/useUsersData'; const usersBlock: MultiUsersSelectElementType = { diff --git a/packages/fuselage-ui-kit/src/elements/UsersSelectElement/MultiUsersSelectElement.tsx b/packages/fuselage-ui-kit/src/elements/UsersSelectElement/MultiUsersSelectElement.tsx index 375d1b0accc..3b5dced9092 100644 --- a/packages/fuselage-ui-kit/src/elements/UsersSelectElement/MultiUsersSelectElement.tsx +++ b/packages/fuselage-ui-kit/src/elements/UsersSelectElement/MultiUsersSelectElement.tsx @@ -13,9 +13,9 @@ import type * as UiKit from '@rocket.chat/ui-kit'; import type { ReactElement } from 'react'; import { memo, useCallback, useState } from 'react'; +import { useUsersData } from './hooks/useUsersData'; import { useUiKitState } from '../../hooks/useUiKitState'; import type { BlockProps } from '../../utils/BlockProps'; -import { useUsersData } from './hooks/useUsersData'; type MultiUsersSelectElementProps = BlockProps; diff --git a/packages/fuselage-ui-kit/src/elements/UsersSelectElement/UserSelectElement.spec.tsx b/packages/fuselage-ui-kit/src/elements/UsersSelectElement/UserSelectElement.spec.tsx index 92c47df451f..cd7a2cc07eb 100644 --- a/packages/fuselage-ui-kit/src/elements/UsersSelectElement/UserSelectElement.spec.tsx +++ b/packages/fuselage-ui-kit/src/elements/UsersSelectElement/UserSelectElement.spec.tsx @@ -4,8 +4,8 @@ import { BlockContext } from '@rocket.chat/ui-kit'; import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { contextualBarParser } from '../../surfaces'; import UsersSelectElement from './UsersSelectElement'; +import { contextualBarParser } from '../../surfaces'; import { useUsersData } from './hooks/useUsersData'; const userBlock: UsersSelectElementType = { diff --git a/packages/fuselage-ui-kit/src/elements/UsersSelectElement/UsersSelectElement.tsx b/packages/fuselage-ui-kit/src/elements/UsersSelectElement/UsersSelectElement.tsx index 9f163156608..1f8f0047558 100644 --- a/packages/fuselage-ui-kit/src/elements/UsersSelectElement/UsersSelectElement.tsx +++ b/packages/fuselage-ui-kit/src/elements/UsersSelectElement/UsersSelectElement.tsx @@ -4,9 +4,9 @@ import { UserAvatar } from '@rocket.chat/ui-avatar'; import type * as UiKit from '@rocket.chat/ui-kit'; import { useCallback, useState } from 'react'; +import { useUsersData } from './hooks/useUsersData'; import { useUiKitState } from '../../hooks/useUiKitState'; import type { BlockProps } from '../../utils/BlockProps'; -import { useUsersData } from './hooks/useUsersData'; type UsersSelectElementProps = BlockProps; diff --git a/packages/fuselage-ui-kit/src/hooks/useAppTranslation.spec.tsx b/packages/fuselage-ui-kit/src/hooks/useAppTranslation.spec.tsx index 71782494af7..50bf1d77b1a 100644 --- a/packages/fuselage-ui-kit/src/hooks/useAppTranslation.spec.tsx +++ b/packages/fuselage-ui-kit/src/hooks/useAppTranslation.spec.tsx @@ -3,8 +3,8 @@ import * as i18next from 'i18next'; import { Suspense } from 'react'; import { I18nextProvider, initReactI18next } from 'react-i18next'; -import { AppIdProvider } from '../contexts/AppIdContext'; import { useAppTranslation } from './useAppTranslation'; +import { AppIdProvider } from '../contexts/AppIdContext'; let i18n: i18next.i18n; diff --git a/packages/fuselage-ui-kit/src/surfaces/ContextualBarSurfaceRenderer.tsx b/packages/fuselage-ui-kit/src/surfaces/ContextualBarSurfaceRenderer.tsx index 2f8618377af..a973f5478b7 100644 --- a/packages/fuselage-ui-kit/src/surfaces/ContextualBarSurfaceRenderer.tsx +++ b/packages/fuselage-ui-kit/src/surfaces/ContextualBarSurfaceRenderer.tsx @@ -1,12 +1,12 @@ import * as UiKit from '@rocket.chat/ui-kit'; import type { ReactElement } from 'react'; -import TabNavigationBlock from '../blocks/TabNavigationBlock'; -import { AppIdProvider } from '../contexts/AppIdContext'; import { FuselageSurfaceRenderer, renderTextObject, } from './FuselageSurfaceRenderer'; +import TabNavigationBlock from '../blocks/TabNavigationBlock'; +import { AppIdProvider } from '../contexts/AppIdContext'; export class ContextualBarSurfaceRenderer extends FuselageSurfaceRenderer { public constructor() { diff --git a/packages/fuselage-ui-kit/src/surfaces/FuselageMessageSurfaceRenderer.tsx b/packages/fuselage-ui-kit/src/surfaces/FuselageMessageSurfaceRenderer.tsx index b937eab9c50..b1c8d4da58f 100644 --- a/packages/fuselage-ui-kit/src/surfaces/FuselageMessageSurfaceRenderer.tsx +++ b/packages/fuselage-ui-kit/src/surfaces/FuselageMessageSurfaceRenderer.tsx @@ -1,12 +1,12 @@ import * as UiKit from '@rocket.chat/ui-kit'; import type { ReactElement } from 'react'; -import VideoConferenceBlock from '../blocks/VideoConferenceBlock/VideoConferenceBlock'; -import { AppIdProvider } from '../contexts/AppIdContext'; import { FuselageSurfaceRenderer, renderTextObject, } from './FuselageSurfaceRenderer'; +import VideoConferenceBlock from '../blocks/VideoConferenceBlock/VideoConferenceBlock'; +import { AppIdProvider } from '../contexts/AppIdContext'; export class FuselageMessageSurfaceRenderer extends FuselageSurfaceRenderer { public constructor() { diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index 7871166d60f..0063501662c 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -36,15 +36,15 @@ "@rocket.chat/styled": "~0.31.25", "@rocket.chat/ui-client": "workspace:^", "@rocket.chat/ui-contexts": "workspace:^", - "@storybook/addon-actions": "^8.4.1", - "@storybook/addon-docs": "^8.4.1", - "@storybook/addon-essentials": "^8.4.1", - "@storybook/addon-interactions": "^8.4.1", - "@storybook/addon-links": "^8.4.1", + "@storybook/addon-actions": "^8.4.2", + "@storybook/addon-docs": "^8.4.2", + "@storybook/addon-essentials": "^8.4.2", + "@storybook/addon-interactions": "^8.4.2", + "@storybook/addon-links": "^8.4.2", "@storybook/addon-styling-webpack": "^1.0.1", "@storybook/addon-webpack5-compiler-babel": "^3.0.3", - "@storybook/react": "^8.4.1", - "@storybook/react-webpack5": "^8.4.1", + "@storybook/react": "^8.4.2", + "@storybook/react-webpack5": "^8.4.2", "@testing-library/react": "~16.0.1", "@types/dompurify": "^3.0.5", "@types/jest": "~29.5.14", @@ -56,15 +56,15 @@ "babel-loader": "^9.2.1", "eslint": "~8.45.0", "eslint-plugin-anti-trojan-source": "~1.1.1", - "eslint-plugin-react": "~7.32.2", - "eslint-plugin-react-hooks": "~4.6.2", - "eslint-plugin-storybook": "^0.10.2", + "eslint-plugin-react": "~7.37.2", + "eslint-plugin-react-hooks": "~5.0.0", + "eslint-plugin-storybook": "^0.11.0", "identity-obj-proxy": "^3.0.0", "jest": "~29.7.0", "katex": "~0.16.11", "outdent": "^0.8.0", "react-dom": "~17.0.2", - "storybook": "^8.4.1", + "storybook": "^8.4.2", "typescript": "~5.6.3" }, "peerDependencies": { diff --git a/packages/gazzodown/src/elements/BoldSpan.tsx b/packages/gazzodown/src/elements/BoldSpan.tsx index c00cd0c1d95..81fcc91f66c 100644 --- a/packages/gazzodown/src/elements/BoldSpan.tsx +++ b/packages/gazzodown/src/elements/BoldSpan.tsx @@ -1,14 +1,14 @@ import type * as MessageParser from '@rocket.chat/message-parser'; import type { ReactElement } from 'react'; -import CodeElement from '../code/CodeElement'; -import EmojiElement from '../emoji/EmojiElement'; -import ChannelMentionElement from '../mentions/ChannelMentionElement'; -import UserMentionElement from '../mentions/UserMentionElement'; import ItalicSpan from './ItalicSpan'; import LinkSpan from './LinkSpan'; import PlainSpan from './PlainSpan'; import StrikeSpan from './StrikeSpan'; +import CodeElement from '../code/CodeElement'; +import EmojiElement from '../emoji/EmojiElement'; +import ChannelMentionElement from '../mentions/ChannelMentionElement'; +import UserMentionElement from '../mentions/UserMentionElement'; type MessageBlock = | MessageParser.Emoji diff --git a/packages/gazzodown/src/elements/InlineElements.tsx b/packages/gazzodown/src/elements/InlineElements.tsx index 39fcd7938cf..aa6f749d023 100644 --- a/packages/gazzodown/src/elements/InlineElements.tsx +++ b/packages/gazzodown/src/elements/InlineElements.tsx @@ -1,12 +1,6 @@ import type * as MessageParser from '@rocket.chat/message-parser'; import { lazy, ReactElement } from 'react'; -import CodeElement from '../code/CodeElement'; -import ColorElement from '../colors/ColorElement'; -import EmojiElement from '../emoji/EmojiElement'; -import KatexErrorBoundary from '../katex/KatexErrorBoundary'; -import ChannelMentionElement from '../mentions/ChannelMentionElement'; -import UserMentionElement from '../mentions/UserMentionElement'; import BoldSpan from './BoldSpan'; import ImageElement from './ImageElement'; import ItalicSpan from './ItalicSpan'; @@ -14,6 +8,12 @@ import LinkSpan from './LinkSpan'; import PlainSpan from './PlainSpan'; import StrikeSpan from './StrikeSpan'; import Timestamp from './Timestamp'; +import CodeElement from '../code/CodeElement'; +import ColorElement from '../colors/ColorElement'; +import EmojiElement from '../emoji/EmojiElement'; +import KatexErrorBoundary from '../katex/KatexErrorBoundary'; +import ChannelMentionElement from '../mentions/ChannelMentionElement'; +import UserMentionElement from '../mentions/UserMentionElement'; const KatexElement = lazy(() => import('../katex/KatexElement')); diff --git a/packages/gazzodown/src/elements/ItalicSpan.tsx b/packages/gazzodown/src/elements/ItalicSpan.tsx index 4893d3b7e3b..946a28bdac3 100644 --- a/packages/gazzodown/src/elements/ItalicSpan.tsx +++ b/packages/gazzodown/src/elements/ItalicSpan.tsx @@ -1,14 +1,14 @@ import type * as MessageParser from '@rocket.chat/message-parser'; import type { ReactElement } from 'react'; -import CodeElement from '../code/CodeElement'; -import EmojiElement from '../emoji/EmojiElement'; -import ChannelMentionElement from '../mentions/ChannelMentionElement'; -import UserMentionElement from '../mentions/UserMentionElement'; import BoldSpan from './BoldSpan'; import LinkSpan from './LinkSpan'; import PlainSpan from './PlainSpan'; import StrikeSpan from './StrikeSpan'; +import CodeElement from '../code/CodeElement'; +import EmojiElement from '../emoji/EmojiElement'; +import ChannelMentionElement from '../mentions/ChannelMentionElement'; +import UserMentionElement from '../mentions/UserMentionElement'; type MessageBlock = | MessageParser.Emoji diff --git a/packages/gazzodown/src/elements/PreviewInlineElements.tsx b/packages/gazzodown/src/elements/PreviewInlineElements.tsx index 77c0b17bc99..bdd5b58cfe4 100644 --- a/packages/gazzodown/src/elements/PreviewInlineElements.tsx +++ b/packages/gazzodown/src/elements/PreviewInlineElements.tsx @@ -1,6 +1,9 @@ import type * as MessageParser from '@rocket.chat/message-parser'; import { Fragment, ReactElement } from 'react'; +import BoldSpan from './BoldSpan'; +import ItalicSpan from './ItalicSpan'; +import StrikeSpan from './StrikeSpan'; import PreviewCodeElement from '../code/PreviewCodeElement'; import PreviewColorElement from '../colors/PreviewColorElement'; import PreviewEmojiElement from '../emoji/PreviewEmojiElement'; @@ -8,9 +11,6 @@ import KatexErrorBoundary from '../katex/KatexErrorBoundary'; import PreviewKatexElement from '../katex/PreviewKatexElement'; import PreviewChannelMentionElement from '../mentions/PreviewChannelMentionElement'; import PreviewUserMentionElement from '../mentions/PreviewUserMentionElement'; -import BoldSpan from './BoldSpan'; -import ItalicSpan from './ItalicSpan'; -import StrikeSpan from './StrikeSpan'; type PreviewInlineElementsProps = { children: MessageParser.Inlines[]; diff --git a/packages/gazzodown/src/elements/StrikeSpan.tsx b/packages/gazzodown/src/elements/StrikeSpan.tsx index 34417f45d78..138a9c359dd 100644 --- a/packages/gazzodown/src/elements/StrikeSpan.tsx +++ b/packages/gazzodown/src/elements/StrikeSpan.tsx @@ -1,14 +1,14 @@ import type * as MessageParser from '@rocket.chat/message-parser'; import type { ReactElement } from 'react'; -import CodeElement from '../code/CodeElement'; -import EmojiElement from '../emoji/EmojiElement'; -import ChannelMentionElement from '../mentions/ChannelMentionElement'; -import UserMentionElement from '../mentions/UserMentionElement'; import BoldSpan from './BoldSpan'; import ItalicSpan from './ItalicSpan'; import LinkSpan from './LinkSpan'; import PlainSpan from './PlainSpan'; +import CodeElement from '../code/CodeElement'; +import EmojiElement from '../emoji/EmojiElement'; +import ChannelMentionElement from '../mentions/ChannelMentionElement'; +import UserMentionElement from '../mentions/UserMentionElement'; type MessageBlock = | MessageParser.Timestamp diff --git a/packages/gazzodown/src/elements/Timestamp/index.tsx b/packages/gazzodown/src/elements/Timestamp/index.tsx index efc691843a1..3346c684ffe 100644 --- a/packages/gazzodown/src/elements/Timestamp/index.tsx +++ b/packages/gazzodown/src/elements/Timestamp/index.tsx @@ -5,8 +5,8 @@ import { format } from 'date-fns'; import { useContext, useEffect, useState, type ReactElement } from 'react'; import { ErrorBoundary } from 'react-error-boundary'; -import { MarkupInteractionContext } from '../../MarkupInteractionContext'; import { timeAgo } from './timeago'; +import { MarkupInteractionContext } from '../../MarkupInteractionContext'; type BoldSpanProps = { children: MessageParser.Timestamp; diff --git a/packages/gazzodown/src/emoji/Emoji.tsx b/packages/gazzodown/src/emoji/Emoji.tsx index 33b6a7ed639..896a7d6d954 100644 --- a/packages/gazzodown/src/emoji/Emoji.tsx +++ b/packages/gazzodown/src/emoji/Emoji.tsx @@ -2,8 +2,8 @@ import type * as MessageParser from '@rocket.chat/message-parser'; import { ReactElement, useMemo, useContext, memo } from 'react'; import { MarkupInteractionContext } from '../MarkupInteractionContext'; -import PlainSpan from '../elements/PlainSpan'; import EmojiRenderer from './EmojiRenderer'; +import PlainSpan from '../elements/PlainSpan'; type EmojiProps = MessageParser.Emoji & { big?: boolean; diff --git a/packages/jest-presets/package.json b/packages/jest-presets/package.json index ef692b758a1..b5865ed7624 100644 --- a/packages/jest-presets/package.json +++ b/packages/jest-presets/package.json @@ -13,9 +13,9 @@ "/server" ], "dependencies": { - "@swc/core": "~1.7.42", + "@swc/core": "~1.8.0", "@swc/jest": "~0.2.37", - "@testing-library/jest-dom": "~6.4.8", + "@testing-library/jest-dom": "~6.6.3", "@types/jest-axe": "~3.5.9", "identity-obj-proxy": "~3.0.0", "jest-axe": "~9.0.0", diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 717b3c66d02..8b4b9c4039e 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -17,7 +17,6 @@ "build": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack-cli --mode production", "dev": "yarn build", "start": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack-dev-server --mode development", - "lint": "run-s eslint stylelint", "eslint": "eslint --ext .js,.jsx,.ts,.tsx .", "stylelint": "stylelint 'src/**/*.scss'", "storybook": "storybook dev -p 9001 -c .storybook", @@ -35,13 +34,13 @@ "@rocket.chat/fuselage-tokens": "^0.33.2", "@rocket.chat/logo": "^0.31.30", "@rocket.chat/ui-contexts": "workspace:^", - "@storybook/addon-essentials": "^8.4.1", + "@storybook/addon-essentials": "^8.4.2", "@storybook/addon-styling-webpack": "~1.0.1", "@storybook/addon-webpack5-compiler-babel": "^3.0.3", - "@storybook/preact": "^8.4.1", - "@storybook/preact-webpack5": "^8.4.1", - "@storybook/theming": "^8.4.1", - "@types/crypto-js": "~4.1.3", + "@storybook/preact": "^8.4.2", + "@storybook/preact-webpack5": "^8.4.2", + "@storybook/theming": "^8.4.2", + "@types/crypto-js": "~4.2.2", "@types/markdown-it": "^14.1.2", "@types/mini-css-extract-plugin": "~1.4.3", "@types/webpack-env": "~1.18.5", @@ -55,9 +54,9 @@ "cssnano": "^4.1.11", "desvg-loader": "^0.1.0", "eslint": "~8.45.0", - "eslint-plugin-import": "~2.26.0", - "eslint-plugin-react": "~7.32.2", - "eslint-plugin-react-hooks": "~4.6.2", + "eslint-plugin-import": "~2.31.0", + "eslint-plugin-react": "~7.37.2", + "eslint-plugin-react-hooks": "~5.0.0", "file-loader": "^6.2.0", "html-webpack-plugin": "^5.6.3", "if-env": "^1.0.4", @@ -65,20 +64,20 @@ "lorem-ipsum": "^2.0.8", "mini-css-extract-plugin": "~1.6.2", "npm-run-all": "^4.1.5", - "postcss-css-variables": "^0.17.0", - "postcss-dir-pseudo-class": "^5.0.0", - "postcss-flexbugs-fixes": "^4.2.1", + "postcss-css-variables": "^0.19.0", + "postcss-dir-pseudo-class": "^9.0.1", + "postcss-flexbugs-fixes": "^5.0.2", "postcss-ie11-supports": "^0.1.3", "postcss-loader": "^8.1.1", - "postcss-logical": "^4.0.2", + "postcss-logical": "^8.0.0", "postcss-scss": "^4.0.9", - "postcss-selector-not": "^4.0.1", + "postcss-selector-not": "^8.0.1", "react-dom": "~17.0.2", "resolve-url-loader": "~5.0.0", "rimraf": "^6.0.1", "sass": "~1.80.6", "sass-loader": "~16.0.3", - "storybook": "^8.4.1", + "storybook": "^8.4.2", "style-loader": "^1.3.0", "stylelint": "^14.16.1", "stylelint-order": "^5.0.0", @@ -109,7 +108,7 @@ "mem": "^8.1.1", "path-to-regexp": "^6.3.0", "preact": "~10.24.3", - "preact-router": "^3.2.1", + "preact-router": "^4.1.2", "query-string": "^7.1.3", "react-hook-form": "~7.45.4", "react-i18next": "~13.2.2", diff --git a/packages/message-parser/package.json b/packages/message-parser/package.json index 478bbde4ce4..49fbdec708e 100644 --- a/packages/message-parser/package.json +++ b/packages/message-parser/package.json @@ -66,7 +66,7 @@ "prettier": "~3.3.3", "prettier-plugin-pegjs": "~0.5.4", "rimraf": "^6.0.1", - "ts-loader": "~9.4.4", + "ts-loader": "~9.5.1", "typedoc": "~0.24.8", "typescript": "~5.6.3", "webpack": "~5.95.0", diff --git a/packages/mock-providers/package.json b/packages/mock-providers/package.json index a2a9cab7c7b..df3584b3ad8 100644 --- a/packages/mock-providers/package.json +++ b/packages/mock-providers/package.json @@ -5,7 +5,7 @@ "dependencies": { "@rocket.chat/emitter": "~0.31.25", "@rocket.chat/i18n": "workspace:~", - "@storybook/react": "^8.4.1", + "@storybook/react": "^8.4.2", "i18next": "~23.4.9", "react-i18next": "~13.2.2", "use-sync-external-store": "~1.2.2" diff --git a/packages/rest-typings/src/v1/channels/channels.ts b/packages/rest-typings/src/v1/channels/channels.ts index c3138db1743..51611dfa783 100644 --- a/packages/rest-typings/src/v1/channels/channels.ts +++ b/packages/rest-typings/src/v1/channels/channels.ts @@ -1,7 +1,5 @@ import type { IUploadWithUser, IMessage, IRoom, ITeam, IGetRoomRoles, IUser, IIntegration } from '@rocket.chat/core-typings'; -import type { PaginatedRequest } from '../../helpers/PaginatedRequest'; -import type { PaginatedResult } from '../../helpers/PaginatedResult'; import type { ChannelsAddAllProps } from './ChannelsAddAllProps'; import type { ChannelsArchiveProps } from './ChannelsArchiveProps'; import type { ChannelsConvertToTeamProps } from './ChannelsConvertToTeamProps'; @@ -32,6 +30,8 @@ import type { ChannelsSetReadOnlyProps } from './ChannelsSetReadOnlyProps'; import type { ChannelsSetTopicProps } from './ChannelsSetTopicProps'; import type { ChannelsSetTypeProps } from './ChannelsSetTypeProps'; import type { ChannelsUnarchiveProps } from './ChannelsUnarchiveProps'; +import type { PaginatedRequest } from '../../helpers/PaginatedRequest'; +import type { PaginatedResult } from '../../helpers/PaginatedResult'; export * from './ChannelsFilesListProps'; export * from './ChannelsListProps'; diff --git a/packages/rest-typings/src/v1/dm/im.ts b/packages/rest-typings/src/v1/dm/im.ts index 60d08abc56b..4f1414fd6b0 100644 --- a/packages/rest-typings/src/v1/dm/im.ts +++ b/packages/rest-typings/src/v1/dm/im.ts @@ -1,7 +1,5 @@ import type { IMessage, IRoom, IUser, IUploadWithUser } from '@rocket.chat/core-typings'; -import type { PaginatedRequest } from '../../helpers/PaginatedRequest'; -import type { PaginatedResult } from '../../helpers/PaginatedResult'; import type { DmCloseProps } from './DmCloseProps'; import type { DmCreateProps } from './DmCreateProps'; import type { DmDeleteProps } from './DmDeleteProps'; @@ -10,6 +8,8 @@ import type { DmHistoryProps } from './DmHistoryProps'; import type { DmLeaveProps } from './DmLeaveProps'; import type { DmMemberProps } from './DmMembersProps'; import type { DmMessagesProps } from './DmMessagesProps'; +import type { PaginatedRequest } from '../../helpers/PaginatedRequest'; +import type { PaginatedResult } from '../../helpers/PaginatedResult'; export type ImEndpoints = { '/v1/im.create': { diff --git a/packages/rest-typings/src/v1/groups/GroupsFilesProps.ts b/packages/rest-typings/src/v1/groups/GroupsFilesProps.ts index 5cf796119c7..fc5ba3b73e6 100644 --- a/packages/rest-typings/src/v1/groups/GroupsFilesProps.ts +++ b/packages/rest-typings/src/v1/groups/GroupsFilesProps.ts @@ -1,8 +1,8 @@ import Ajv from 'ajv'; -import type { PaginatedRequest } from '../../helpers/PaginatedRequest'; import type { GroupsBaseProps } from './BaseProps'; import { withGroupBaseProperties } from './BaseProps'; +import type { PaginatedRequest } from '../../helpers/PaginatedRequest'; const ajv = new Ajv({ coerceTypes: true, diff --git a/packages/rest-typings/src/v1/groups/GroupsHistoryProps.ts b/packages/rest-typings/src/v1/groups/GroupsHistoryProps.ts index 7293ab3a881..f92b75b97af 100644 --- a/packages/rest-typings/src/v1/groups/GroupsHistoryProps.ts +++ b/packages/rest-typings/src/v1/groups/GroupsHistoryProps.ts @@ -1,8 +1,8 @@ import Ajv from 'ajv'; -import type { PaginatedRequest } from '../../helpers/PaginatedRequest'; import type { GroupsBaseProps } from './BaseProps'; import { withGroupBaseProperties } from './BaseProps'; +import type { PaginatedRequest } from '../../helpers/PaginatedRequest'; const ajv = new Ajv({ coerceTypes: true, diff --git a/packages/rest-typings/src/v1/groups/GroupsMembersProps.ts b/packages/rest-typings/src/v1/groups/GroupsMembersProps.ts index b3484bf82f8..e26a88a3d45 100644 --- a/packages/rest-typings/src/v1/groups/GroupsMembersProps.ts +++ b/packages/rest-typings/src/v1/groups/GroupsMembersProps.ts @@ -1,8 +1,8 @@ import Ajv from 'ajv'; -import type { PaginatedRequest } from '../../helpers/PaginatedRequest'; import type { GroupsBaseProps } from './BaseProps'; import { withGroupBaseProperties } from './BaseProps'; +import type { PaginatedRequest } from '../../helpers/PaginatedRequest'; const ajv = new Ajv({ coerceTypes: true, diff --git a/packages/rest-typings/src/v1/groups/GroupsMessagesProps.ts b/packages/rest-typings/src/v1/groups/GroupsMessagesProps.ts index 834aeea88e4..d02644be633 100644 --- a/packages/rest-typings/src/v1/groups/GroupsMessagesProps.ts +++ b/packages/rest-typings/src/v1/groups/GroupsMessagesProps.ts @@ -1,8 +1,8 @@ import type { IRoom } from '@rocket.chat/core-typings'; import Ajv from 'ajv'; -import type { PaginatedRequest } from '../../helpers/PaginatedRequest'; import { withGroupBaseProperties } from './BaseProps'; +import type { PaginatedRequest } from '../../helpers/PaginatedRequest'; const ajv = new Ajv({ coerceTypes: true, diff --git a/packages/rest-typings/src/v1/groups/groups.ts b/packages/rest-typings/src/v1/groups/groups.ts index 687418e7d4e..973f5d98a35 100644 --- a/packages/rest-typings/src/v1/groups/groups.ts +++ b/packages/rest-typings/src/v1/groups/groups.ts @@ -1,6 +1,5 @@ import type { IMessage, IRoom, ITeam, IGetRoomRoles, IUser, IUploadWithUser, IIntegration, ISubscription } from '@rocket.chat/core-typings'; -import type { PaginatedResult } from '../../helpers/PaginatedResult'; import type { GroupsAddAllProps } from './GroupsAddAllProps'; import type { GroupsAddLeaderProps } from './GroupsAddLeaderProps'; import type { GroupsAddModeratorProps } from './GroupsAddModeratorProps'; @@ -38,6 +37,7 @@ import type { GroupsSetReadOnlyProps } from './GroupsSetReadOnlyProps'; import type { GroupsSetTopicProps } from './GroupsSetTopicProps'; import type { GroupsSetTypeProps } from './GroupsSetTypeProps'; import type { GroupsUnarchiveProps } from './GroupsUnarchiveProps'; +import type { PaginatedResult } from '../../helpers/PaginatedResult'; export type GroupsEndpoints = { '/v1/groups.files': { diff --git a/packages/rest-typings/src/v1/integrations/integrations.ts b/packages/rest-typings/src/v1/integrations/integrations.ts index 4557937b5b7..c2833f20bdb 100644 --- a/packages/rest-typings/src/v1/integrations/integrations.ts +++ b/packages/rest-typings/src/v1/integrations/integrations.ts @@ -1,12 +1,12 @@ import type { IIntegration, IIntegrationHistory } from '@rocket.chat/core-typings'; -import type { PaginatedResult } from '../../helpers/PaginatedResult'; import type { IntegrationsCreateProps } from './IntegrationsCreateProps'; import type { IntegrationsGetProps } from './IntegrationsGetProps'; import type { IntegrationsHistoryProps } from './IntegrationsHistoryProps'; import type { IntegrationsListProps } from './IntegrationsListProps'; import type { IntegrationsRemoveProps } from './IntegrationsRemoveProps'; import type { IntegrationsUpdateProps } from './IntegrationsUpdateProps'; +import type { PaginatedResult } from '../../helpers/PaginatedResult'; export type IntegrationsEndpoints = { '/v1/integrations.create': { diff --git a/packages/rest-typings/src/v1/moderation/moderation.ts b/packages/rest-typings/src/v1/moderation/moderation.ts index 7ce7f4276a3..41562d37dd5 100644 --- a/packages/rest-typings/src/v1/moderation/moderation.ts +++ b/packages/rest-typings/src/v1/moderation/moderation.ts @@ -1,6 +1,5 @@ import type { IModerationAudit, IModerationReport, IUser, MessageReport, UserReport } from '@rocket.chat/core-typings'; -import type { PaginatedResult } from '../../helpers/PaginatedResult'; import type { ArchiveReportPropsPOST } from './ArchiveReportProps'; import type { GetUserReportsParamsGET } from './GetUserReportsParams'; import type { ModerationDeleteMsgHistoryParamsPOST } from './ModerationDeleteMsgHistoryParams'; @@ -8,6 +7,7 @@ import type { ModerationReportUserPOST } from './ModerationReportUserPOST'; import type { ReportHistoryPropsGET } from './ReportHistoryProps'; import type { ReportInfoParams } from './ReportInfoParams'; import type { ReportsByMsgIdParamsGET } from './ReportsByMsgIdParams'; +import type { PaginatedResult } from '../../helpers/PaginatedResult'; export type ModerationEndpoints = { // API endpoint to fetch the reported messages diff --git a/packages/rest-typings/src/v1/rooms.ts b/packages/rest-typings/src/v1/rooms.ts index 16debe87e44..0f420b486a3 100644 --- a/packages/rest-typings/src/v1/rooms.ts +++ b/packages/rest-typings/src/v1/rooms.ts @@ -1,8 +1,8 @@ import type { IMessage, IRoom, IUser, RoomAdminFieldsType, IUpload, IE2EEMessage, ITeam } from '@rocket.chat/core-typings'; +import { ajv } from './Ajv'; import type { PaginatedRequest } from '../helpers/PaginatedRequest'; import type { PaginatedResult } from '../helpers/PaginatedResult'; -import { ajv } from './Ajv'; type RoomsAutoCompleteChannelAndPrivateProps = { selector: string }; diff --git a/packages/rest-typings/src/v1/settings.ts b/packages/rest-typings/src/v1/settings.ts index c512a554762..7aec62fdfce 100644 --- a/packages/rest-typings/src/v1/settings.ts +++ b/packages/rest-typings/src/v1/settings.ts @@ -1,8 +1,8 @@ import type { ISetting, ISettingColor, LoginServiceConfiguration } from '@rocket.chat/core-typings'; +import { ajv } from './Ajv'; import type { PaginatedRequest } from '../helpers/PaginatedRequest'; import type { PaginatedResult } from '../helpers/PaginatedResult'; -import { ajv } from './Ajv'; type SettingsUpdateProps = SettingsUpdatePropDefault | SettingsUpdatePropsActions | SettingsUpdatePropsColor; diff --git a/packages/rest-typings/src/v1/teams/index.ts b/packages/rest-typings/src/v1/teams/index.ts index a4ae6c7bca0..31c4e588fb7 100644 --- a/packages/rest-typings/src/v1/teams/index.ts +++ b/packages/rest-typings/src/v1/teams/index.ts @@ -1,7 +1,5 @@ import type { IRole, IRoom, ITeam, IUser } from '@rocket.chat/core-typings'; -import type { PaginatedRequest } from '../../helpers/PaginatedRequest'; -import type { PaginatedResult } from '../../helpers/PaginatedResult'; import type { TeamsAddMembersProps } from './TeamsAddMembersProps'; import type { TeamsConvertToChannelProps } from './TeamsConvertToChannelProps'; import type { TeamsDeleteProps } from './TeamsDeleteProps'; @@ -11,6 +9,8 @@ import type { TeamsRemoveMemberProps } from './TeamsRemoveMemberProps'; import type { TeamsRemoveRoomProps } from './TeamsRemoveRoomProps'; import type { TeamsUpdateMemberProps } from './TeamsUpdateMemberProps'; import type { TeamsUpdateProps } from './TeamsUpdateProps'; +import type { PaginatedRequest } from '../../helpers/PaginatedRequest'; +import type { PaginatedResult } from '../../helpers/PaginatedResult'; export * from './TeamsAddMembersProps'; export * from './TeamsConvertToChannelProps'; diff --git a/packages/rest-typings/src/v1/videoConference/index.ts b/packages/rest-typings/src/v1/videoConference/index.ts index 374352c4566..02dcc67cc71 100644 --- a/packages/rest-typings/src/v1/videoConference/index.ts +++ b/packages/rest-typings/src/v1/videoConference/index.ts @@ -1,11 +1,11 @@ import type { VideoConferenceInstructions, VideoConference, VideoConferenceCapabilities } from '@rocket.chat/core-typings'; -import type { PaginatedResult } from '../../helpers/PaginatedResult'; import type { VideoConfCancelProps } from './VideoConfCancelProps'; import type { VideoConfInfoProps } from './VideoConfInfoProps'; import type { VideoConfJoinProps } from './VideoConfJoinProps'; import type { VideoConfListProps } from './VideoConfListProps'; import type { VideoConfStartProps } from './VideoConfStartProps'; +import type { PaginatedResult } from '../../helpers/PaginatedResult'; export * from './VideoConfInfoProps'; export * from './VideoConfListProps'; diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json index d1c13c85f56..91b8b08e7fd 100644 --- a/packages/ui-avatar/package.json +++ b/packages/ui-avatar/package.json @@ -9,10 +9,10 @@ "@types/react": "~17.0.80", "@types/react-dom": "~17.0.25", "eslint": "~8.45.0", - "eslint-plugin-react": "~7.32.2", - "eslint-plugin-react-hooks": "~4.6.2", - "eslint-plugin-storybook": "~0.10.2", - "eslint-plugin-testing-library": "~5.11.1", + "eslint-plugin-react": "~7.37.2", + "eslint-plugin-react-hooks": "~5.0.0", + "eslint-plugin-storybook": "~0.11.0", + "eslint-plugin-testing-library": "~6.4.0", "react": "^17.0.2", "typescript": "~5.6.3" }, diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index c36933c9f2e..b2b07895431 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -28,30 +28,30 @@ "@rocket.chat/mock-providers": "workspace:^", "@rocket.chat/ui-avatar": "workspace:~", "@rocket.chat/ui-contexts": "workspace:~", - "@storybook/addon-actions": "^8.4.1", - "@storybook/addon-docs": "^8.4.1", - "@storybook/addon-essentials": "^8.4.1", - "@storybook/addon-interactions": "^8.4.1", - "@storybook/addon-links": "^8.4.1", + "@storybook/addon-actions": "^8.4.2", + "@storybook/addon-docs": "^8.4.2", + "@storybook/addon-essentials": "^8.4.2", + "@storybook/addon-interactions": "^8.4.2", + "@storybook/addon-links": "^8.4.2", "@storybook/addon-styling-webpack": "^1.0.1", "@storybook/addon-webpack5-compiler-babel": "^3.0.3", - "@storybook/react": "^8.4.1", - "@storybook/react-webpack5": "^8.4.1", + "@storybook/react": "^8.4.2", + "@storybook/react-webpack5": "^8.4.2", "@testing-library/react": "~16.0.1", "@types/jest": "~29.5.14", "@types/react": "~17.0.80", "@types/react-dom": "~17.0.25", "eslint": "~8.45.0", "eslint-plugin-anti-trojan-source": "~1.1.1", - "eslint-plugin-react": "~7.32.2", - "eslint-plugin-react-hooks": "~4.6.2", - "eslint-plugin-storybook": "~0.10.2", - "eslint-plugin-testing-library": "~5.11.1", + "eslint-plugin-react": "~7.37.2", + "eslint-plugin-react-hooks": "~5.0.0", + "eslint-plugin-storybook": "~0.11.0", + "eslint-plugin-testing-library": "~6.4.0", "jest": "~29.7.0", "react": "^17.0.2", "react-dom": "^17.0.2", "react-hook-form": "~7.45.4", - "storybook": "^8.4.1", + "storybook": "^8.4.2", "typescript": "~5.6.3" }, "peerDependencies": { diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json index 70f84f4cad7..39ae8ed8844 100644 --- a/packages/ui-composer/package.json +++ b/packages/ui-composer/package.json @@ -23,22 +23,22 @@ "@rocket.chat/eslint-config": "workspace:^", "@rocket.chat/fuselage": "^0.59.4", "@rocket.chat/icons": "~0.39.0", - "@storybook/addon-actions": "^8.4.1", - "@storybook/addon-docs": "^8.4.1", - "@storybook/addon-essentials": "^8.4.1", + "@storybook/addon-actions": "^8.4.2", + "@storybook/addon-docs": "^8.4.2", + "@storybook/addon-essentials": "^8.4.2", "@storybook/addon-styling-webpack": "^1.0.1", "@storybook/addon-webpack5-compiler-babel": "^3.0.3", - "@storybook/react": "^8.4.1", - "@storybook/react-webpack5": "^8.4.1", + "@storybook/react": "^8.4.2", + "@storybook/react-webpack5": "^8.4.2", "@types/react": "~17.0.80", "@types/react-dom": "~17.0.25", "eslint": "~8.45.0", - "eslint-plugin-react": "~7.32.2", - "eslint-plugin-react-hooks": "~4.6.2", - "eslint-plugin-storybook": "^0.10.2", + "eslint-plugin-react": "~7.37.2", + "eslint-plugin-react-hooks": "~5.0.0", + "eslint-plugin-storybook": "^0.11.0", "react": "~17.0.2", "react-dom": "~17.0.2", - "storybook": "^8.4.1", + "storybook": "^8.4.2", "typescript": "~5.6.3" }, "peerDependencies": { diff --git a/packages/ui-composer/src/MessageFooterCallout/MessageFooterCallout.stories.tsx b/packages/ui-composer/src/MessageFooterCallout/MessageFooterCallout.stories.tsx index 82e5e410ea3..4e55cea3761 100644 --- a/packages/ui-composer/src/MessageFooterCallout/MessageFooterCallout.stories.tsx +++ b/packages/ui-composer/src/MessageFooterCallout/MessageFooterCallout.stories.tsx @@ -1,10 +1,11 @@ import type { Meta, StoryFn } from '@storybook/react'; import { MessageFooterCallout, MessageFooterCalloutAction } from '.'; -import MessageComposer from '../MessageComposer/MessageComposer'; -import MessageComposerIcon from '../MessageComposer/MessageComposerIcon'; import MessageFooterCalloutContent from './MessageFooterCalloutContent'; import MessageFooterCalloutDivider from './MessageFooterCalloutDivider'; +import MessageComposer from '../MessageComposer/MessageComposer'; +import MessageComposerIcon from '../MessageComposer/MessageComposerIcon'; + import '@rocket.chat/icons/dist/rocketchat.css'; export default { diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index 0d1365f0bc3..4ace632a430 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -13,7 +13,7 @@ "@types/react-dom": "~17.0.25", "@types/use-sync-external-store": "^0.0.6", "eslint": "~8.45.0", - "eslint-plugin-react-hooks": "^4.6.2", + "eslint-plugin-react-hooks": "^5.0.0", "mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch", "react": "~17.0.2", "typescript": "~5.6.3", diff --git a/packages/ui-kit/package.json b/packages/ui-kit/package.json index e17e0c0102f..53b206da52c 100644 --- a/packages/ui-kit/package.json +++ b/packages/ui-kit/package.json @@ -50,7 +50,7 @@ "prettier": "~3.3.3", "rimraf": "~6.0.1", "ts-jest": "~29.2.5", - "ts-loader": "~9.4.4", + "ts-loader": "~9.5.1", "ts-node": "~10.9.2", "ts-patch": "~3.2.1", "typescript": "~5.6.3" diff --git a/packages/ui-kit/src/rendering/BlockRenderers.ts b/packages/ui-kit/src/rendering/BlockRenderers.ts index 4a8bf3a2905..9a379bfceb0 100644 --- a/packages/ui-kit/src/rendering/BlockRenderers.ts +++ b/packages/ui-kit/src/rendering/BlockRenderers.ts @@ -1,3 +1,6 @@ +import type { BlockElementRenderer } from './BlockElementRenderer'; +import type { LayoutBlockRenderer } from './LayoutBlockRenderer'; +import type { TextObjectRenderer } from './TextObjectRenderer'; import type { BlockElement } from '../blocks/BlockElement'; import type { RenderableLayoutBlock } from '../blocks/RenderableLayoutBlock'; import type { TextObject } from '../blocks/TextObject'; @@ -7,9 +10,6 @@ import type { MultiStaticSelectElement } from '../blocks/elements/MultiStaticSel import type { PlainTextInputElement } from '../blocks/elements/PlainTextInputElement'; import type { StaticSelectElement } from '../blocks/elements/StaticSelectElement'; import type { PlainText } from '../blocks/text/PlainText'; -import type { BlockElementRenderer } from './BlockElementRenderer'; -import type { LayoutBlockRenderer } from './LayoutBlockRenderer'; -import type { TextObjectRenderer } from './TextObjectRenderer'; export type BlockRenderers = { [B in RenderableLayoutBlock as B['type']]?: LayoutBlockRenderer; diff --git a/packages/ui-kit/src/rendering/LayoutBlockRenderer.ts b/packages/ui-kit/src/rendering/LayoutBlockRenderer.ts index 030912415d3..96a889e9d8a 100644 --- a/packages/ui-kit/src/rendering/LayoutBlockRenderer.ts +++ b/packages/ui-kit/src/rendering/LayoutBlockRenderer.ts @@ -1,5 +1,5 @@ -import type { RenderableLayoutBlock } from '../blocks/RenderableLayoutBlock'; import type { BlockContext } from './BlockContext'; +import type { RenderableLayoutBlock } from '../blocks/RenderableLayoutBlock'; export type LayoutBlockRenderer = ( layoutBlock: B, diff --git a/packages/ui-kit/src/rendering/TextObjectRenderer.ts b/packages/ui-kit/src/rendering/TextObjectRenderer.ts index 2e61cb2f825..1307ada005b 100644 --- a/packages/ui-kit/src/rendering/TextObjectRenderer.ts +++ b/packages/ui-kit/src/rendering/TextObjectRenderer.ts @@ -1,5 +1,5 @@ -import type { TextObject } from '../blocks/TextObject'; import type { BlockContext } from './BlockContext'; +import type { TextObject } from '../blocks/TextObject'; export type TextObjectRenderer = ( textObject: Block, diff --git a/packages/ui-kit/src/rendering/createSurfaceRenderer.ts b/packages/ui-kit/src/rendering/createSurfaceRenderer.ts index dcd91e73d85..bdab9866004 100644 --- a/packages/ui-kit/src/rendering/createSurfaceRenderer.ts +++ b/packages/ui-kit/src/rendering/createSurfaceRenderer.ts @@ -1,7 +1,7 @@ -import type { Block } from '../blocks/Block'; -import type { RenderableLayoutBlock } from '../blocks/RenderableLayoutBlock'; import type { Conditions } from './Conditions'; import type { SurfaceRenderer } from './SurfaceRenderer'; +import type { Block } from '../blocks/Block'; +import type { RenderableLayoutBlock } from '../blocks/RenderableLayoutBlock'; export const createSurfaceRenderer = () => diff --git a/packages/ui-kit/src/rendering/renderBlockElement.ts b/packages/ui-kit/src/rendering/renderBlockElement.ts index 8e6794ae9bd..a18ae6656cc 100644 --- a/packages/ui-kit/src/rendering/renderBlockElement.ts +++ b/packages/ui-kit/src/rendering/renderBlockElement.ts @@ -1,7 +1,7 @@ -import type { BlockElement } from '../blocks/BlockElement'; import type { BlockContext } from './BlockContext'; import type { BlockElementRenderer } from './BlockElementRenderer'; import type { BlockRenderers } from './BlockRenderers'; +import type { BlockElement } from '../blocks/BlockElement'; const getBlockElementRenderer = (renderers: BlockRenderers, type: BlockElement['type']): BlockElementRenderer | undefined => { const renderer = renderers[type] as BlockElementRenderer | undefined; diff --git a/packages/ui-kit/src/rendering/renderLayoutBlock.ts b/packages/ui-kit/src/rendering/renderLayoutBlock.ts index 3e4a8b65ee8..235fd9ccd71 100644 --- a/packages/ui-kit/src/rendering/renderLayoutBlock.ts +++ b/packages/ui-kit/src/rendering/renderLayoutBlock.ts @@ -1,8 +1,8 @@ -import type { LayoutBlock } from '../blocks/LayoutBlock'; -import type { ConditionalBlock } from '../blocks/layout/ConditionalBlock'; import { BlockContext } from './BlockContext'; import type { BlockRenderers } from './BlockRenderers'; import type { LayoutBlockRenderer } from './LayoutBlockRenderer'; +import type { LayoutBlock } from '../blocks/LayoutBlock'; +import type { ConditionalBlock } from '../blocks/layout/ConditionalBlock'; const getLayoutBlockRenderer = ( renderers: BlockRenderers, diff --git a/packages/ui-kit/src/rendering/renderTextObject.ts b/packages/ui-kit/src/rendering/renderTextObject.ts index cd99a192f9e..90dc92bb484 100644 --- a/packages/ui-kit/src/rendering/renderTextObject.ts +++ b/packages/ui-kit/src/rendering/renderTextObject.ts @@ -1,7 +1,7 @@ -import type { TextObject } from '../blocks/TextObject'; import type { BlockContext } from './BlockContext'; import type { BlockRenderers } from './BlockRenderers'; import type { TextObjectRenderer } from './TextObjectRenderer'; +import type { TextObject } from '../blocks/TextObject'; const getTextObjectRenderer = (renderers: BlockRenderers, type: TextObject['type']): TextObjectRenderer | undefined => { const renderer = renderers[type] as TextObjectRenderer | undefined; diff --git a/packages/ui-kit/src/rendering/resolveConditionalBlocks.ts b/packages/ui-kit/src/rendering/resolveConditionalBlocks.ts index 0b600086875..c4c0e9e2780 100644 --- a/packages/ui-kit/src/rendering/resolveConditionalBlocks.ts +++ b/packages/ui-kit/src/rendering/resolveConditionalBlocks.ts @@ -1,7 +1,7 @@ +import type { Conditions } from './Conditions'; import type { Block } from '../blocks/Block'; import { LayoutBlockType } from '../blocks/LayoutBlockType'; import type { ConditionalBlock } from '../blocks/layout/ConditionalBlock'; -import type { Conditions } from './Conditions'; const conditionsMatch = (conditions: Conditions | undefined = undefined, filters: ConditionalBlock['when'] = {}): boolean => { if (!conditions) { diff --git a/packages/ui-kit/src/surfaces/attachment/UiKitParserAttachment.spec.ts b/packages/ui-kit/src/surfaces/attachment/UiKitParserAttachment.spec.ts index dd4937d8919..b413dd9ad90 100644 --- a/packages/ui-kit/src/surfaces/attachment/UiKitParserAttachment.spec.ts +++ b/packages/ui-kit/src/surfaces/attachment/UiKitParserAttachment.spec.ts @@ -1,6 +1,6 @@ -import { BlockContext } from '../../rendering/BlockContext'; import { UiKitParserAttachment } from './UiKitParserAttachment'; import { uiKitAttachment } from './uiKitAttachment'; +import { BlockContext } from '../../rendering/BlockContext'; class TestParser extends UiKitParserAttachment { plain_text = (element: any, context: any, index: any): any => ({ diff --git a/packages/ui-kit/src/surfaces/attachment/uiKitAttachment.ts b/packages/ui-kit/src/surfaces/attachment/uiKitAttachment.ts index 8bb68b0b54c..fcc3481ae1e 100644 --- a/packages/ui-kit/src/surfaces/attachment/uiKitAttachment.ts +++ b/packages/ui-kit/src/surfaces/attachment/uiKitAttachment.ts @@ -1,4 +1,4 @@ -import { createSurfaceRenderer } from '../../rendering/createSurfaceRenderer'; import type { AttachmentSurfaceLayout } from './UiKitParserAttachment'; +import { createSurfaceRenderer } from '../../rendering/createSurfaceRenderer'; export const uiKitAttachment = createSurfaceRenderer(); diff --git a/packages/ui-kit/src/surfaces/banner/UiKitParserBanner.spec.ts b/packages/ui-kit/src/surfaces/banner/UiKitParserBanner.spec.ts index f9439c06ae2..1c12c359c7e 100644 --- a/packages/ui-kit/src/surfaces/banner/UiKitParserBanner.spec.ts +++ b/packages/ui-kit/src/surfaces/banner/UiKitParserBanner.spec.ts @@ -1,7 +1,7 @@ -import type { PlainText } from '../../blocks/text/PlainText'; -import { BlockContext } from '../../rendering/BlockContext'; import { UiKitParserBanner } from './UiKitParserBanner'; import { uiKitBanner } from './uiKitBanner'; +import type { PlainText } from '../../blocks/text/PlainText'; +import { BlockContext } from '../../rendering/BlockContext'; class TestParser extends UiKitParserBanner { plain_text = (element: any, context: any, index: any): any => ({ diff --git a/packages/ui-kit/src/surfaces/banner/uiKitBanner.ts b/packages/ui-kit/src/surfaces/banner/uiKitBanner.ts index 10ec0d59b27..24cf431a9b7 100644 --- a/packages/ui-kit/src/surfaces/banner/uiKitBanner.ts +++ b/packages/ui-kit/src/surfaces/banner/uiKitBanner.ts @@ -1,4 +1,4 @@ -import { createSurfaceRenderer } from '../../rendering/createSurfaceRenderer'; import type { BannerSurfaceLayout } from './UiKitParserBanner'; +import { createSurfaceRenderer } from '../../rendering/createSurfaceRenderer'; export const uiKitBanner = createSurfaceRenderer(); diff --git a/packages/ui-kit/src/surfaces/contextualBar/UiKitParserContextualBar.spec.ts b/packages/ui-kit/src/surfaces/contextualBar/UiKitParserContextualBar.spec.ts index e6284de0d11..89de1bb8ad6 100644 --- a/packages/ui-kit/src/surfaces/contextualBar/UiKitParserContextualBar.spec.ts +++ b/packages/ui-kit/src/surfaces/contextualBar/UiKitParserContextualBar.spec.ts @@ -1,8 +1,8 @@ +import { UiKitParserContextualBar } from './UiKitParserContextualBar'; +import { uiKitContextualBar } from './uiKitContextualBar'; import type { OverflowElement } from '../../blocks/elements/OverflowElement'; import type { PlainText } from '../../blocks/text/PlainText'; import { BlockContext } from '../../rendering/BlockContext'; -import { UiKitParserContextualBar } from './UiKitParserContextualBar'; -import { uiKitContextualBar } from './uiKitContextualBar'; class TestParser extends UiKitParserContextualBar { plain_text = (element: any, context: any, index: any): any => ({ diff --git a/packages/ui-kit/src/surfaces/contextualBar/uiKitContextualBar.ts b/packages/ui-kit/src/surfaces/contextualBar/uiKitContextualBar.ts index b5de38b8016..d3bc1efc209 100644 --- a/packages/ui-kit/src/surfaces/contextualBar/uiKitContextualBar.ts +++ b/packages/ui-kit/src/surfaces/contextualBar/uiKitContextualBar.ts @@ -1,4 +1,4 @@ -import { createSurfaceRenderer } from '../../rendering/createSurfaceRenderer'; import type { ContextualBarSurfaceLayout } from './UiKitParserContextualBar'; +import { createSurfaceRenderer } from '../../rendering/createSurfaceRenderer'; export const uiKitContextualBar = createSurfaceRenderer(); diff --git a/packages/ui-kit/src/surfaces/message/UiKitParserMessage.spec.ts b/packages/ui-kit/src/surfaces/message/UiKitParserMessage.spec.ts index d68a02b0206..38e57b34f9c 100644 --- a/packages/ui-kit/src/surfaces/message/UiKitParserMessage.spec.ts +++ b/packages/ui-kit/src/surfaces/message/UiKitParserMessage.spec.ts @@ -1,6 +1,6 @@ -import { BlockContext } from '../../rendering/BlockContext'; import { UiKitParserMessage } from './UiKitParserMessage'; import { uiKitMessage } from './uiKitMessage'; +import { BlockContext } from '../../rendering/BlockContext'; class TestParser extends UiKitParserMessage { plain_text = (element: any, context: any, index: any): any => ({ diff --git a/packages/ui-kit/src/surfaces/message/uiKitMessage.ts b/packages/ui-kit/src/surfaces/message/uiKitMessage.ts index 4a59b7e83e5..d6eca2005e3 100644 --- a/packages/ui-kit/src/surfaces/message/uiKitMessage.ts +++ b/packages/ui-kit/src/surfaces/message/uiKitMessage.ts @@ -1,4 +1,4 @@ -import { createSurfaceRenderer } from '../../rendering/createSurfaceRenderer'; import type { MessageSurfaceLayout } from './UiKitParserMessage'; +import { createSurfaceRenderer } from '../../rendering/createSurfaceRenderer'; export const uiKitMessage = createSurfaceRenderer(); diff --git a/packages/ui-kit/src/surfaces/modal/UiKitParserModal.spec.ts b/packages/ui-kit/src/surfaces/modal/UiKitParserModal.spec.ts index 33691a21bfd..22e552e1d68 100644 --- a/packages/ui-kit/src/surfaces/modal/UiKitParserModal.spec.ts +++ b/packages/ui-kit/src/surfaces/modal/UiKitParserModal.spec.ts @@ -1,8 +1,8 @@ +import { UiKitParserModal } from './UiKitParserModal'; +import { uiKitModal } from './uiKitModal'; import type { OverflowElement } from '../../blocks/elements/OverflowElement'; import type { PlainText } from '../../blocks/text/PlainText'; import { BlockContext } from '../../rendering/BlockContext'; -import { UiKitParserModal } from './UiKitParserModal'; -import { uiKitModal } from './uiKitModal'; class TestParser extends UiKitParserModal { plain_text = (element: any, context: any, index: any): any => ({ diff --git a/packages/ui-kit/src/surfaces/modal/uiKitModal.ts b/packages/ui-kit/src/surfaces/modal/uiKitModal.ts index a100994a5d5..f5b7f9dc749 100644 --- a/packages/ui-kit/src/surfaces/modal/uiKitModal.ts +++ b/packages/ui-kit/src/surfaces/modal/uiKitModal.ts @@ -1,4 +1,4 @@ -import { createSurfaceRenderer } from '../../rendering/createSurfaceRenderer'; import type { ModalSurfaceLayout } from './UiKitParserModal'; +import { createSurfaceRenderer } from '../../rendering/createSurfaceRenderer'; export const uiKitModal = createSurfaceRenderer(); diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index 01075ff0599..f431639db06 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -31,25 +31,25 @@ "@rocket.chat/styled": "~0.31.25", "@rocket.chat/ui-avatar": "workspace:^", "@rocket.chat/ui-contexts": "workspace:^", - "@storybook/addon-a11y": "^8.4.1", - "@storybook/addon-actions": "^8.4.1", - "@storybook/addon-docs": "^8.4.1", - "@storybook/addon-essentials": "^8.4.1", + "@storybook/addon-a11y": "^8.4.2", + "@storybook/addon-actions": "^8.4.2", + "@storybook/addon-docs": "^8.4.2", + "@storybook/addon-essentials": "^8.4.2", "@storybook/addon-styling-webpack": "^1.0.1", "@storybook/addon-webpack5-compiler-babel": "^3.0.3", - "@storybook/react": "^8.4.1", - "@storybook/react-webpack5": "^8.4.1", + "@storybook/react": "^8.4.2", + "@storybook/react-webpack5": "^8.4.2", "@types/jest": "~29.5.14", "@types/jest-axe": "~3.5.9", "@types/react": "~17.0.80", "eslint": "~8.45.0", - "eslint-plugin-react": "~7.32.2", - "eslint-plugin-react-hooks": "~4.6.2", - "eslint-plugin-storybook": "~0.10.2", + "eslint-plugin-react": "~7.37.2", + "eslint-plugin-react-hooks": "~5.0.0", + "eslint-plugin-storybook": "~0.11.0", "jest": "~29.7.0", "jest-axe": "~9.0.0", "react": "~17.0.2", - "storybook": "^8.4.1", + "storybook": "^8.4.2", "typescript": "~5.6.3" }, "peerDependencies": { diff --git a/packages/ui-voip/package.json b/packages/ui-voip/package.json index 3a32416bd4e..3e8c4d75f0c 100644 --- a/packages/ui-voip/package.json +++ b/packages/ui-voip/package.json @@ -21,7 +21,7 @@ "@rocket.chat/emitter": "~0.31.25", "@tanstack/react-query": "^4.36.1", "react-i18next": "~13.2.2", - "sip.js": "^0.20.1" + "sip.js": "^0.21.2" }, "devDependencies": { "@babel/core": "~7.26.0", @@ -38,13 +38,13 @@ "@rocket.chat/ui-avatar": "workspace:^", "@rocket.chat/ui-client": "workspace:^", "@rocket.chat/ui-contexts": "workspace:^", - "@storybook/addon-a11y": "^8.4.1", - "@storybook/addon-actions": "^8.4.1", - "@storybook/addon-docs": "^8.4.1", - "@storybook/addon-essentials": "^8.4.1", + "@storybook/addon-a11y": "^8.4.2", + "@storybook/addon-actions": "^8.4.2", + "@storybook/addon-docs": "^8.4.2", + "@storybook/addon-essentials": "^8.4.2", "@storybook/addon-webpack5-compiler-babel": "^3.0.3", - "@storybook/react": "^8.4.1", - "@storybook/react-webpack5": "^8.4.1", + "@storybook/react": "^8.4.2", + "@storybook/react-webpack5": "^8.4.2", "@testing-library/react": "~16.0.1", "@testing-library/user-event": "~14.5.2", "@types/jest": "~29.5.14", @@ -52,13 +52,13 @@ "@types/react": "~17.0.80", "@types/react-dom": "~17.0.25", "eslint": "~8.45.0", - "eslint-plugin-react": "~7.32.2", - "eslint-plugin-react-hooks": "~4.6.2", - "eslint-plugin-storybook": "^0.10.2", + "eslint-plugin-react": "~7.37.2", + "eslint-plugin-react-hooks": "~5.0.0", + "eslint-plugin-storybook": "^0.11.0", "jest": "~29.7.0", "jest-axe": "~9.0.0", "react": "~17.0.2", - "storybook": "^8.4.1", + "storybook": "^8.4.2", "typescript": "~5.6.3" }, "peerDependencies": { diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index f1dc6a28e0d..c1488e58166 100644 --- a/packages/web-ui-registration/package.json +++ b/packages/web-ui-registration/package.json @@ -27,13 +27,13 @@ "@rocket.chat/tools": "workspace:~", "@rocket.chat/ui-client": "workspace:^", "@rocket.chat/ui-contexts": "workspace:^", - "@storybook/addon-actions": "^8.4.1", - "@storybook/addon-docs": "^8.4.1", - "@storybook/addon-essentials": "^8.4.1", + "@storybook/addon-actions": "^8.4.2", + "@storybook/addon-docs": "^8.4.2", + "@storybook/addon-essentials": "^8.4.2", "@storybook/addon-webpack5-compiler-babel": "^3.0.3", - "@storybook/react": "^8.4.1", - "@storybook/react-webpack5": "^8.4.1", - "@storybook/theming": "^8.4.1", + "@storybook/react": "^8.4.2", + "@storybook/react-webpack5": "^8.4.2", + "@storybook/theming": "^8.4.2", "@tanstack/react-query": "^4.36.1", "@testing-library/react": "~16.0.1", "@types/react": "~17.0.80", @@ -42,7 +42,7 @@ "react": "~17.0.2", "react-hook-form": "~7.45.4", "react-i18next": "~13.2.2", - "storybook": "^8.4.1", + "storybook": "^8.4.2", "storybook-dark-mode": "^4.0.2", "typescript": "~5.6.3" }, diff --git a/yarn.lock b/yarn.lock index 59e64f3cf71..df738c02b6d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3394,6 +3394,32 @@ __metadata: languageName: node linkType: hard +"@csstools/cascade-layer-name-parser@npm:^2.0.4": + version: 2.0.4 + resolution: "@csstools/cascade-layer-name-parser@npm:2.0.4" + peerDependencies: + "@csstools/css-parser-algorithms": ^3.0.4 + "@csstools/css-tokenizer": ^3.0.3 + checksum: 10/8c1d92f7840ecb402bce9b5770c9eb8ae000f42cb317a069cb10172a4e63d4dcbe1961f8bcf35f5106f8d162066f2bac3923e151d7cb5380b10fc265a62db5ea + languageName: node + linkType: hard + +"@csstools/css-parser-algorithms@npm:^3.0.4": + version: 3.0.4 + resolution: "@csstools/css-parser-algorithms@npm:3.0.4" + peerDependencies: + "@csstools/css-tokenizer": ^3.0.3 + checksum: 10/dfb6926218d9f8ba25d8b43ea46c03863c819481f8c55e4de4925780eaab9e6bcd6bead1d56b4ef82d09fcd9d69a7db2750fa9db08eece9470fd499dc76d0edb + languageName: node + linkType: hard + +"@csstools/css-tokenizer@npm:^3.0.3": + version: 3.0.3 + resolution: "@csstools/css-tokenizer@npm:3.0.3" + checksum: 10/6baa3160e426e1f177b8f10d54ec7a4a596090f65a05f16d7e9e4da049962a404eabc5f885f4867093702c259cd4080ac92a438326e22dea015201b3e71f5bbb + languageName: node + linkType: hard + "@csstools/selector-specificity@npm:^2.0.2": version: 2.2.0 resolution: "@csstools/selector-specificity@npm:2.2.0" @@ -3403,6 +3429,15 @@ __metadata: languageName: node linkType: hard +"@csstools/utilities@npm:^2.0.0": + version: 2.0.0 + resolution: "@csstools/utilities@npm:2.0.0" + peerDependencies: + postcss: ^8.4 + checksum: 10/c9c8d82063ec5156d56b056c9124fed95714f05d7c1a64043174b0559aa099989f17a826579f22045384defe152e32d6355b7a9660cfed96819f43fccf277941 + languageName: node + linkType: hard + "@dabh/diagnostics@npm:^2.0.2": version: 2.0.3 resolution: "@dabh/diagnostics@npm:2.0.3" @@ -3437,13 +3472,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/aix-ppc64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/aix-ppc64@npm:0.20.2" - conditions: os=aix & cpu=ppc64 - languageName: node - linkType: hard - "@esbuild/aix-ppc64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/aix-ppc64@npm:0.21.5" @@ -3458,13 +3486,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/android-arm64@npm:0.20.2" - conditions: os=android & cpu=arm64 - languageName: node - linkType: hard - "@esbuild/android-arm64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/android-arm64@npm:0.21.5" @@ -3479,13 +3500,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/android-arm@npm:0.20.2" - conditions: os=android & cpu=arm - languageName: node - linkType: hard - "@esbuild/android-arm@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/android-arm@npm:0.21.5" @@ -3500,13 +3514,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-x64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/android-x64@npm:0.20.2" - conditions: os=android & cpu=x64 - languageName: node - linkType: hard - "@esbuild/android-x64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/android-x64@npm:0.21.5" @@ -3521,13 +3528,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-arm64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/darwin-arm64@npm:0.20.2" - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - "@esbuild/darwin-arm64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/darwin-arm64@npm:0.21.5" @@ -3542,13 +3542,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-x64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/darwin-x64@npm:0.20.2" - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - "@esbuild/darwin-x64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/darwin-x64@npm:0.21.5" @@ -3563,13 +3556,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-arm64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/freebsd-arm64@npm:0.20.2" - conditions: os=freebsd & cpu=arm64 - languageName: node - linkType: hard - "@esbuild/freebsd-arm64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/freebsd-arm64@npm:0.21.5" @@ -3584,13 +3570,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-x64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/freebsd-x64@npm:0.20.2" - conditions: os=freebsd & cpu=x64 - languageName: node - linkType: hard - "@esbuild/freebsd-x64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/freebsd-x64@npm:0.21.5" @@ -3605,13 +3584,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/linux-arm64@npm:0.20.2" - conditions: os=linux & cpu=arm64 - languageName: node - linkType: hard - "@esbuild/linux-arm64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/linux-arm64@npm:0.21.5" @@ -3626,13 +3598,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/linux-arm@npm:0.20.2" - conditions: os=linux & cpu=arm - languageName: node - linkType: hard - "@esbuild/linux-arm@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/linux-arm@npm:0.21.5" @@ -3647,13 +3612,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ia32@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/linux-ia32@npm:0.20.2" - conditions: os=linux & cpu=ia32 - languageName: node - linkType: hard - "@esbuild/linux-ia32@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/linux-ia32@npm:0.21.5" @@ -3668,13 +3626,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/linux-loong64@npm:0.20.2" - conditions: os=linux & cpu=loong64 - languageName: node - linkType: hard - "@esbuild/linux-loong64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/linux-loong64@npm:0.21.5" @@ -3689,13 +3640,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-mips64el@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/linux-mips64el@npm:0.20.2" - conditions: os=linux & cpu=mips64el - languageName: node - linkType: hard - "@esbuild/linux-mips64el@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/linux-mips64el@npm:0.21.5" @@ -3710,13 +3654,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ppc64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/linux-ppc64@npm:0.20.2" - conditions: os=linux & cpu=ppc64 - languageName: node - linkType: hard - "@esbuild/linux-ppc64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/linux-ppc64@npm:0.21.5" @@ -3731,13 +3668,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-riscv64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/linux-riscv64@npm:0.20.2" - conditions: os=linux & cpu=riscv64 - languageName: node - linkType: hard - "@esbuild/linux-riscv64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/linux-riscv64@npm:0.21.5" @@ -3752,13 +3682,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-s390x@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/linux-s390x@npm:0.20.2" - conditions: os=linux & cpu=s390x - languageName: node - linkType: hard - "@esbuild/linux-s390x@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/linux-s390x@npm:0.21.5" @@ -3773,13 +3696,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-x64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/linux-x64@npm:0.20.2" - conditions: os=linux & cpu=x64 - languageName: node - linkType: hard - "@esbuild/linux-x64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/linux-x64@npm:0.21.5" @@ -3794,13 +3710,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/netbsd-x64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/netbsd-x64@npm:0.20.2" - conditions: os=netbsd & cpu=x64 - languageName: node - linkType: hard - "@esbuild/netbsd-x64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/netbsd-x64@npm:0.21.5" @@ -3822,13 +3731,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/openbsd-x64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/openbsd-x64@npm:0.20.2" - conditions: os=openbsd & cpu=x64 - languageName: node - linkType: hard - "@esbuild/openbsd-x64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/openbsd-x64@npm:0.21.5" @@ -3843,13 +3745,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/sunos-x64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/sunos-x64@npm:0.20.2" - conditions: os=sunos & cpu=x64 - languageName: node - linkType: hard - "@esbuild/sunos-x64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/sunos-x64@npm:0.21.5" @@ -3864,13 +3759,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-arm64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/win32-arm64@npm:0.20.2" - conditions: os=win32 & cpu=arm64 - languageName: node - linkType: hard - "@esbuild/win32-arm64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/win32-arm64@npm:0.21.5" @@ -3885,13 +3773,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-ia32@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/win32-ia32@npm:0.20.2" - conditions: os=win32 & cpu=ia32 - languageName: node - linkType: hard - "@esbuild/win32-ia32@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/win32-ia32@npm:0.21.5" @@ -3906,13 +3787,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-x64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/win32-x64@npm:0.20.2" - conditions: os=win32 & cpu=x64 - languageName: node - linkType: hard - "@esbuild/win32-x64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/win32-x64@npm:0.21.5" @@ -4063,9 +3937,9 @@ __metadata: languageName: node linkType: hard -"@google-cloud/storage@npm:^6.11.0": - version: 6.11.0 - resolution: "@google-cloud/storage@npm:6.11.0" +"@google-cloud/storage@npm:^6.12.0": + version: 6.12.0 + resolution: "@google-cloud/storage@npm:6.12.0" dependencies: "@google-cloud/paginator": "npm:^3.0.7" "@google-cloud/projectify": "npm:^3.0.0" @@ -4076,6 +3950,7 @@ __metadata: duplexify: "npm:^4.0.0" ent: "npm:^2.2.0" extend: "npm:^3.0.2" + fast-xml-parser: "npm:^4.2.2" gaxios: "npm:^5.0.0" google-auth-library: "npm:^8.0.1" mime: "npm:^3.0.0" @@ -4084,7 +3959,7 @@ __metadata: retry-request: "npm:^5.0.0" teeny-request: "npm:^8.0.0" uuid: "npm:^8.0.0" - checksum: 10/e6f9f07114557e4f7dc58693911940ff862e8036740188b8bae2259b9e8b85fd3b2e30e590cc4610b3d2500d672b3b19356234a6c90caefff5c0be70ce7a2dfc + checksum: 10/b19bebb1c1c51a6ad1d5d056bcc22d2f671ad28ce5d6faf35bc08b35eac800987ae39a1da70ccd20b8e3271dbbcf79df474ae3f9265f27e0f5ef6bc993b9f312 languageName: node linkType: hard @@ -5151,247 +5026,228 @@ __metadata: languageName: node linkType: hard -"@nivo/annotations@npm:0.84.0": - version: 0.84.0 - resolution: "@nivo/annotations@npm:0.84.0" +"@nivo/annotations@npm:0.87.0": + version: 0.87.0 + resolution: "@nivo/annotations@npm:0.87.0" dependencies: - "@nivo/colors": "npm:0.84.0" - "@nivo/core": "npm:0.84.0" + "@nivo/colors": "npm:0.87.0" + "@nivo/core": "npm:0.87.0" "@react-spring/web": "npm:9.4.5 || ^9.7.2" - "@types/prop-types": "npm:^15.7.2" lodash: "npm:^4.17.21" - prop-types: "npm:^15.7.2" peerDependencies: react: ">= 16.14.0 < 19.0.0" - checksum: 10/22e01ebea550237943fd81da78d75a243787dc3ee2af9de5e6053d5b11fb9a4db5d829a36a704a79781c1fa7e4689762008aa09b2faa18ba25d2ca6612151917 + checksum: 10/f6384ee3ed76d2c38483ce479fbbc5b9e940083b1c3fa42fe1518931323009c31929ef8d714bd39055922b168279aa74a07b8c3599c5ae8e4aa9d7f4b60bf156 languageName: node linkType: hard -"@nivo/arcs@npm:0.84.0": - version: 0.84.0 - resolution: "@nivo/arcs@npm:0.84.0" +"@nivo/arcs@npm:0.87.0": + version: 0.87.0 + resolution: "@nivo/arcs@npm:0.87.0" dependencies: - "@nivo/colors": "npm:0.84.0" - "@nivo/core": "npm:0.84.0" + "@nivo/colors": "npm:0.87.0" + "@nivo/core": "npm:0.87.0" "@react-spring/web": "npm:9.4.5 || ^9.7.2" - "@types/d3-shape": "npm:^2.0.0" - d3-shape: "npm:^1.3.5" + "@types/d3-shape": "npm:^3.1.6" + d3-shape: "npm:^3.2.0" peerDependencies: react: ">= 16.14.0 < 19.0.0" - checksum: 10/aed01882b79d73edcf5f849ad8fff57f0afc42bebe21c0c462390ef5e6d70ed277ff998b9b0f486ab93fc2a2ea1dd1fbf27da6ea6103da76ae14f5f1f9d9df74 + checksum: 10/65bba0d40a7da7c2cd9e4c872cd75d54e1b9e7ae4b47550cb9044c023672d3d539df5a2423e2f5096f627ca9f4804623479746bd4a019d937327ac9658cb443d languageName: node linkType: hard -"@nivo/axes@npm:0.84.0": - version: 0.84.0 - resolution: "@nivo/axes@npm:0.84.0" +"@nivo/axes@npm:0.87.0": + version: 0.87.0 + resolution: "@nivo/axes@npm:0.87.0" dependencies: - "@nivo/core": "npm:0.84.0" - "@nivo/scales": "npm:0.84.0" + "@nivo/core": "npm:0.87.0" + "@nivo/scales": "npm:0.87.0" "@react-spring/web": "npm:9.4.5 || ^9.7.2" "@types/d3-format": "npm:^1.4.1" "@types/d3-time-format": "npm:^2.3.1" - "@types/prop-types": "npm:^15.7.2" d3-format: "npm:^1.4.4" d3-time-format: "npm:^3.0.0" - prop-types: "npm:^15.7.2" peerDependencies: react: ">= 16.14.0 < 19.0.0" - checksum: 10/59e1db46674a409d8b510d61d752aa2446c21d54de5c300b359d55a587b82c5284119a1876e86f7ce260811a54fec1af8eddcd146a57fe333669dea1828b58d6 + checksum: 10/9192d70e2b56aaab2e3cd62144241912eba51c2183e0cb987833af57ca88361a933dd7a900a91aea7a631099e7012f500b282a42808de0605025d67e860610c5 languageName: node linkType: hard -"@nivo/bar@npm:0.84.0": - version: 0.84.0 - resolution: "@nivo/bar@npm:0.84.0" +"@nivo/bar@npm:0.87.0": + version: 0.87.0 + resolution: "@nivo/bar@npm:0.87.0" dependencies: - "@nivo/annotations": "npm:0.84.0" - "@nivo/axes": "npm:0.84.0" - "@nivo/colors": "npm:0.84.0" - "@nivo/core": "npm:0.84.0" - "@nivo/legends": "npm:0.84.0" - "@nivo/scales": "npm:0.84.0" - "@nivo/tooltip": "npm:0.84.0" + "@nivo/annotations": "npm:0.87.0" + "@nivo/axes": "npm:0.87.0" + "@nivo/colors": "npm:0.87.0" + "@nivo/core": "npm:0.87.0" + "@nivo/legends": "npm:0.87.0" + "@nivo/scales": "npm:0.87.0" + "@nivo/tooltip": "npm:0.87.0" "@react-spring/web": "npm:9.4.5 || ^9.7.2" - "@types/d3-scale": "npm:^3.2.3" - "@types/d3-shape": "npm:^2.0.0" - d3-scale: "npm:^3.2.3" - d3-shape: "npm:^1.3.5" + "@types/d3-scale": "npm:^4.0.8" + "@types/d3-shape": "npm:^3.1.6" + d3-scale: "npm:^4.0.2" + d3-shape: "npm:^3.2.0" lodash: "npm:^4.17.21" peerDependencies: react: ">= 16.14.0 < 19.0.0" - checksum: 10/6ac13abc7b93c1e1c6e5597be8937fdf26ebe3e8efb9472dd95967796c0753c8be151faace249271ac1662920a8bc2407560e29f06d7a781675d22576381eecf + checksum: 10/4be9779c8caad1ccc5aa7c3f8a0612418ff7934ac9222dece1cba2cbde7859a5182f692b34ed82eb9756d6113cca268c53f49ba250f1b56e2b89382fbd446845 languageName: node linkType: hard -"@nivo/colors@npm:0.84.0": - version: 0.84.0 - resolution: "@nivo/colors@npm:0.84.0" +"@nivo/colors@npm:0.87.0": + version: 0.87.0 + resolution: "@nivo/colors@npm:0.87.0" dependencies: - "@nivo/core": "npm:0.84.0" - "@types/d3-color": "npm:^2.0.0" - "@types/d3-scale": "npm:^3.2.3" - "@types/d3-scale-chromatic": "npm:^2.0.0" + "@nivo/core": "npm:0.87.0" + "@types/d3-color": "npm:^3.0.0" + "@types/d3-scale": "npm:^4.0.8" + "@types/d3-scale-chromatic": "npm:^3.0.0" "@types/prop-types": "npm:^15.7.2" d3-color: "npm:^3.1.0" - d3-scale: "npm:^3.2.3" - d3-scale-chromatic: "npm:^2.0.0" + d3-scale: "npm:^4.0.2" + d3-scale-chromatic: "npm:^3.0.0" lodash: "npm:^4.17.21" prop-types: "npm:^15.7.2" peerDependencies: react: ">= 16.14.0 < 19.0.0" - checksum: 10/1b1aa3d8fc4573446a03d19b423ac8529c66f4eacbb3fe9d371fe019674c40953e65e5db5f8e8fe188c99717109bd40911e0cb1623e2c53b1f22f84990da0d9c + checksum: 10/03c6d6b1eb3f0c2280a03c8fe4ef6e9f3971d44c6586868597b501a173eb128c10533e54100fed80b7c17b0681ece6155c33dd0801f1b62bf84bda635bff0b89 languageName: node linkType: hard -"@nivo/core@npm:0.84.0": - version: 0.84.0 - resolution: "@nivo/core@npm:0.84.0" +"@nivo/core@npm:0.87.0": + version: 0.87.0 + resolution: "@nivo/core@npm:0.87.0" dependencies: - "@nivo/recompose": "npm:0.84.0" - "@nivo/tooltip": "npm:0.84.0" + "@nivo/tooltip": "npm:0.87.0" "@react-spring/web": "npm:9.4.5 || ^9.7.2" - "@types/d3-shape": "npm:^2.0.0" + "@types/d3-shape": "npm:^3.1.6" d3-color: "npm:^3.1.0" d3-format: "npm:^1.4.4" d3-interpolate: "npm:^3.0.1" - d3-scale: "npm:^3.2.3" + d3-scale: "npm:^4.0.2" d3-scale-chromatic: "npm:^3.0.0" - d3-shape: "npm:^1.3.5" + d3-shape: "npm:^3.2.0" d3-time-format: "npm:^3.0.0" lodash: "npm:^4.17.21" + prop-types: "npm:^15.7.2" peerDependencies: - prop-types: ">= 15.5.10 < 16.0.0" react: ">= 16.14.0 < 19.0.0" - checksum: 10/2367b6fab4f091818fa5b2743a98002f6b13acb2b7388ad5a7f047683009a229fa7252669a14055625542105ab4c8553d96a5acea4236d919bdeb3d8f64d7e12 + checksum: 10/e8c1c30f91e8cd51d529e87f94df06f94693678a768d45b1989b8ff9d99f935f703cf2a03dac6cc71bd759a308adf2a1599c013298c0d9791fb7c944943c9eb7 languageName: node linkType: hard -"@nivo/heatmap@npm:0.84.0": - version: 0.84.0 - resolution: "@nivo/heatmap@npm:0.84.0" +"@nivo/heatmap@npm:0.87.0": + version: 0.87.0 + resolution: "@nivo/heatmap@npm:0.87.0" dependencies: - "@nivo/annotations": "npm:0.84.0" - "@nivo/axes": "npm:0.84.0" - "@nivo/colors": "npm:0.84.0" - "@nivo/core": "npm:0.84.0" - "@nivo/legends": "npm:0.84.0" - "@nivo/scales": "npm:0.84.0" - "@nivo/tooltip": "npm:0.84.0" + "@nivo/annotations": "npm:0.87.0" + "@nivo/axes": "npm:0.87.0" + "@nivo/colors": "npm:0.87.0" + "@nivo/core": "npm:0.87.0" + "@nivo/legends": "npm:0.87.0" + "@nivo/scales": "npm:0.87.0" + "@nivo/tooltip": "npm:0.87.0" "@react-spring/web": "npm:9.4.5 || ^9.7.2" - "@types/d3-scale": "npm:^3.2.3" - d3-scale: "npm:^3.2.3" + "@types/d3-scale": "npm:^4.0.8" + d3-scale: "npm:^4.0.2" peerDependencies: react: ">= 16.14.0 < 19.0.0" - checksum: 10/331eb282313db87c55ac39b18200b05834c354a41ac80907318d7ac562fe438cbdf4891f1d7bef14d758e31662fc21deba7fd55ba75bfd54b9d179567a297356 + checksum: 10/c8b7fbee9bba35fb1e26870345bc34b4baefa8aafc37b53462fd9f90adafea6cbcbe8c684a6cc7614bc54106e7fe6c24f0f0a6e8584764bb2b4853d8b0e9b1fb languageName: node linkType: hard -"@nivo/legends@npm:0.84.0": - version: 0.84.0 - resolution: "@nivo/legends@npm:0.84.0" +"@nivo/legends@npm:0.87.0": + version: 0.87.0 + resolution: "@nivo/legends@npm:0.87.0" dependencies: - "@nivo/colors": "npm:0.84.0" - "@nivo/core": "npm:0.84.0" - "@types/d3-scale": "npm:^3.2.3" - "@types/prop-types": "npm:^15.7.2" - d3-scale: "npm:^3.2.3" - prop-types: "npm:^15.7.2" + "@nivo/colors": "npm:0.87.0" + "@nivo/core": "npm:0.87.0" + "@types/d3-scale": "npm:^4.0.8" + d3-scale: "npm:^4.0.2" peerDependencies: react: ">= 16.14.0 < 19.0.0" - checksum: 10/99968f773ddda72a2792c3b2a576f54af08050a8533907f1ab61d32865bd7dfa2680639965b5102392ac6223f6e272c117e517c381f0f2f008562e1cc267d15b + checksum: 10/197e149eb0291fad50d0a31c059cde686b857091394436143b151e8406e9a19a00fcd82131e33e034f6f1d0231fe6b6f95e99171fd3b1fa73bbd45112286118b languageName: node linkType: hard -"@nivo/line@npm:0.84.0": - version: 0.84.0 - resolution: "@nivo/line@npm:0.84.0" +"@nivo/line@npm:0.87.0": + version: 0.87.0 + resolution: "@nivo/line@npm:0.87.0" dependencies: - "@nivo/annotations": "npm:0.84.0" - "@nivo/axes": "npm:0.84.0" - "@nivo/colors": "npm:0.84.0" - "@nivo/core": "npm:0.84.0" - "@nivo/legends": "npm:0.84.0" - "@nivo/scales": "npm:0.84.0" - "@nivo/tooltip": "npm:0.84.0" - "@nivo/voronoi": "npm:0.84.0" + "@nivo/annotations": "npm:0.87.0" + "@nivo/axes": "npm:0.87.0" + "@nivo/colors": "npm:0.87.0" + "@nivo/core": "npm:0.87.0" + "@nivo/legends": "npm:0.87.0" + "@nivo/scales": "npm:0.87.0" + "@nivo/tooltip": "npm:0.87.0" + "@nivo/voronoi": "npm:0.87.0" "@react-spring/web": "npm:9.4.5 || ^9.7.2" - d3-shape: "npm:^1.3.5" - prop-types: "npm:^15.7.2" + d3-shape: "npm:^3.2.0" peerDependencies: react: ">= 16.14.0 < 19.0.0" - checksum: 10/f85f9b932f6d8009bdef0fc18d3a516ef2117bf296b415e55738f2993e7ab49aeb4173b464e688c0299401f8c1152638d31d814a56277d3321f675abb63f418d + checksum: 10/c174dabb090aba5c050bda2ce17a08c4301796fecf39dfe7fac5d924fa4caa1126d7af8d5c39769e696a4d0b56d3ff98986982bde97a049f2f19a9f24b802f54 languageName: node linkType: hard -"@nivo/pie@npm:0.84.0": - version: 0.84.0 - resolution: "@nivo/pie@npm:0.84.0" +"@nivo/pie@npm:0.87.0": + version: 0.87.0 + resolution: "@nivo/pie@npm:0.87.0" dependencies: - "@nivo/arcs": "npm:0.84.0" - "@nivo/colors": "npm:0.84.0" - "@nivo/core": "npm:0.84.0" - "@nivo/legends": "npm:0.84.0" - "@nivo/tooltip": "npm:0.84.0" - "@types/d3-shape": "npm:^2.0.0" - d3-shape: "npm:^1.3.5" + "@nivo/arcs": "npm:0.87.0" + "@nivo/colors": "npm:0.87.0" + "@nivo/core": "npm:0.87.0" + "@nivo/legends": "npm:0.87.0" + "@nivo/tooltip": "npm:0.87.0" + "@types/d3-shape": "npm:^3.1.6" + d3-shape: "npm:^3.2.0" peerDependencies: react: ">= 16.14.0 < 19.0.0" - checksum: 10/c848726949eb720511686addafa6411d63aee6c26b8ab9aedbd3745be3634e404fd4bf2b752be7c6ab03eb3933ad37e2ffc3cdc91ce85e2fe3894c091d08bf4a + checksum: 10/a5884846378cfc9eb1008c6638244e15f440aa769a306f8428665f7c61070b8b5a805b8fcec2dd848aee4a9c252e6b55fd01e37bec151620b866c09e959a3d3b languageName: node linkType: hard -"@nivo/recompose@npm:0.84.0": - version: 0.84.0 - resolution: "@nivo/recompose@npm:0.84.0" +"@nivo/scales@npm:0.87.0": + version: 0.87.0 + resolution: "@nivo/scales@npm:0.87.0" dependencies: - "@types/prop-types": "npm:^15.7.2" - "@types/react-lifecycles-compat": "npm:^3.0.1" - prop-types: "npm:^15.7.2" - react-lifecycles-compat: "npm:^3.0.4" - peerDependencies: - react: ">= 16.14.0 < 19.0.0" - checksum: 10/d3543d2c6049678c5d9cd77557f7fe6b77ac52f4220879f6b93777d4eb221e164326cd688b2a499204e287dbfcd888319fa867abc0f11c4bcc802ea4b5d33d4b - languageName: node - linkType: hard - -"@nivo/scales@npm:0.84.0": - version: 0.84.0 - resolution: "@nivo/scales@npm:0.84.0" - dependencies: - "@types/d3-scale": "npm:^3.2.3" + "@types/d3-scale": "npm:^4.0.8" "@types/d3-time": "npm:^1.1.1" "@types/d3-time-format": "npm:^3.0.0" - d3-scale: "npm:^3.2.3" + d3-scale: "npm:^4.0.2" d3-time: "npm:^1.0.11" d3-time-format: "npm:^3.0.0" lodash: "npm:^4.17.21" - checksum: 10/56174000fe17fdaba54136a249e0bb99e1f50e92d199ae22f1aec1b1bcd05e92e13c45428f02fd08eac23b5d6ac09a674b58aa9b5b0b381c1cbbff55a157ca16 + checksum: 10/687ceda0c0be1ab6c241d5bdd6ea10aaff1b0d478cce834de13377a70f1d5471f1c0e7512ab76ed3cc8893e099b572a388bd6d41a0e7b735130bd6aa3c3e6a80 languageName: node linkType: hard -"@nivo/tooltip@npm:0.84.0": - version: 0.84.0 - resolution: "@nivo/tooltip@npm:0.84.0" +"@nivo/tooltip@npm:0.87.0": + version: 0.87.0 + resolution: "@nivo/tooltip@npm:0.87.0" dependencies: - "@nivo/core": "npm:0.84.0" + "@nivo/core": "npm:0.87.0" "@react-spring/web": "npm:9.4.5 || ^9.7.2" - checksum: 10/91fac6167cf0c2252fe478c6ce193ee4d20dac5704051211a404721e104576fb4b9acee4f26b9ef7187ba2712c3c60778cb12685fb41951de8fb319512fffdd4 + peerDependencies: + react: ">= 16.14.0 < 19.0.0" + checksum: 10/61c416a716b2bd17411b7b950a1e89664d9354957808f3d2c91c683af844af6216311330fb5630a77a30d950c6f86e0e85468c5356498d39c0cb499a1f42e9b7 languageName: node linkType: hard -"@nivo/voronoi@npm:0.84.0": - version: 0.84.0 - resolution: "@nivo/voronoi@npm:0.84.0" +"@nivo/voronoi@npm:0.87.0": + version: 0.87.0 + resolution: "@nivo/voronoi@npm:0.87.0" dependencies: - "@nivo/core": "npm:0.84.0" - "@types/d3-delaunay": "npm:^5.3.0" - "@types/d3-scale": "npm:^3.2.3" - d3-delaunay: "npm:^5.3.0" - d3-scale: "npm:^3.2.3" + "@nivo/core": "npm:0.87.0" + "@nivo/tooltip": "npm:0.87.0" + "@types/d3-delaunay": "npm:^6.0.4" + "@types/d3-scale": "npm:^4.0.8" + d3-delaunay: "npm:^6.0.4" + d3-scale: "npm:^4.0.2" peerDependencies: react: ">= 16.14.0 < 19.0.0" - checksum: 10/417fd9f23ddea95cd3afd22bb5000eec6fb942864612e694ef908ba8dc46a06480951e7768815b6a8d2073e55a66f3310d9fa9ace60b723d5ee73b1a6cc723dc + checksum: 10/bfe1c515ac47f1206323c1189fad61f01305a4836d8cb59e9ff22b326be383a294af2062a48d76fd7c21aeecdba8b016905165eb96b5cef1eea39af9fa883e0e languageName: node linkType: hard @@ -8400,7 +8256,7 @@ __metadata: "@types/debug": "npm:^4.1.12" cron: "npm:~1.8.2" date.js: "npm:~0.3.3" - debug: "npm:~4.1.1" + debug: "npm:~4.3.7" eslint: "npm:~8.45.0" human-interval: "npm:^2.0.1" moment-timezone: "npm:~0.5.46" @@ -8442,7 +8298,7 @@ __metadata: "@types/nedb": "npm:^1.8.16" "@types/node": "npm:~20.16.15" "@types/semver": "npm:^7.5.8" - "@types/stack-trace": "npm:0.0.29" + "@types/stack-trace": "npm:0.0.33" "@types/uuid": "npm:~10.0.0" "@typescript-eslint/eslint-plugin": "npm:~5.60.1" "@typescript-eslint/parser": "npm:~5.60.1" @@ -8450,7 +8306,7 @@ __metadata: alsatian: "npm:^2.4.0" browserify: "npm:^16.5.2" debug: "npm:^4.3.7" - esbuild: "npm:^0.20.2" + esbuild: "npm:^0.24.0" eslint: "npm:~8.45.0" jose: "npm:^4.15.9" jsonrpc-lite: "npm:^2.2.0" @@ -8707,11 +8563,11 @@ __metadata: "@typescript-eslint/eslint-plugin": "npm:~5.60.1" "@typescript-eslint/parser": "npm:~5.60.1" eslint: "npm:~8.45.0" - eslint-config-prettier: "npm:~8.8.0" + eslint-config-prettier: "npm:~9.1.0" eslint-plugin-anti-trojan-source: "npm:~1.1.1" - eslint-plugin-import: "npm:~2.26.0" - eslint-plugin-jest: "npm:~27.2.3" - eslint-plugin-jsx-a11y: "npm:^6.8.0" + eslint-plugin-import: "npm:~2.31.0" + eslint-plugin-jest: "npm:~28.8.3" + eslint-plugin-jsx-a11y: "npm:^6.10.2" eslint-plugin-prettier: "npm:~5.2.1" prettier: "npm:~3.3.3" languageName: unknown @@ -8815,13 +8671,13 @@ __metadata: "@rocket.chat/ui-contexts": "workspace:^" "@rocket.chat/ui-kit": "workspace:~" "@rocket.chat/ui-video-conf": "workspace:^" - "@storybook/addon-essentials": "npm:^8.4.1" + "@storybook/addon-essentials": "npm:^8.4.2" "@storybook/addon-styling-webpack": "npm:^1.0.1" "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3" - "@storybook/blocks": "npm:^8.4.1" - "@storybook/react": "npm:^8.4.1" - "@storybook/react-webpack5": "npm:^8.4.1" - "@storybook/theming": "npm:^8.4.1" + "@storybook/blocks": "npm:^8.4.2" + "@storybook/react": "npm:^8.4.2" + "@storybook/react-webpack5": "npm:^8.4.2" + "@storybook/theming": "npm:^8.4.2" "@tanstack/react-query": "npm:^4.36.1" "@testing-library/react": "npm:~16.0.1" "@testing-library/user-event": "npm:~14.5.2" @@ -8839,7 +8695,7 @@ __metadata: react-dom: "npm:^17.0.2" react-i18next: "npm:~13.2.2" rimraf: "npm:^6.0.1" - storybook: "npm:^8.4.1" + storybook: "npm:^8.4.2" storybook-dark-mode: "npm:^4.0.2" typescript: "npm:~5.6.3" peerDependencies: @@ -8899,15 +8755,15 @@ __metadata: "@rocket.chat/styled": "npm:~0.31.25" "@rocket.chat/ui-client": "workspace:^" "@rocket.chat/ui-contexts": "workspace:^" - "@storybook/addon-actions": "npm:^8.4.1" - "@storybook/addon-docs": "npm:^8.4.1" - "@storybook/addon-essentials": "npm:^8.4.1" - "@storybook/addon-interactions": "npm:^8.4.1" - "@storybook/addon-links": "npm:^8.4.1" + "@storybook/addon-actions": "npm:^8.4.2" + "@storybook/addon-docs": "npm:^8.4.2" + "@storybook/addon-essentials": "npm:^8.4.2" + "@storybook/addon-interactions": "npm:^8.4.2" + "@storybook/addon-links": "npm:^8.4.2" "@storybook/addon-styling-webpack": "npm:^1.0.1" "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3" - "@storybook/react": "npm:^8.4.1" - "@storybook/react-webpack5": "npm:^8.4.1" + "@storybook/react": "npm:^8.4.2" + "@storybook/react-webpack5": "npm:^8.4.2" "@testing-library/react": "npm:~16.0.1" "@types/dompurify": "npm:^3.0.5" "@types/jest": "npm:~29.5.14" @@ -8920,9 +8776,9 @@ __metadata: dompurify: "npm:^3.1.7" eslint: "npm:~8.45.0" eslint-plugin-anti-trojan-source: "npm:~1.1.1" - eslint-plugin-react: "npm:~7.32.2" - eslint-plugin-react-hooks: "npm:~4.6.2" - eslint-plugin-storybook: "npm:^0.10.2" + eslint-plugin-react: "npm:~7.37.2" + eslint-plugin-react-hooks: "npm:~5.0.0" + eslint-plugin-storybook: "npm:^0.11.0" highlight.js: "npm:^11.10.0" identity-obj-proxy: "npm:^3.0.0" jest: "npm:~29.7.0" @@ -8930,7 +8786,7 @@ __metadata: outdent: "npm:^0.8.0" react-dom: "npm:~17.0.2" react-error-boundary: "npm:^3.1.4" - storybook: "npm:^8.4.1" + storybook: "npm:^8.4.2" typescript: "npm:~5.6.3" peerDependencies: "@rocket.chat/core-typings": "workspace:^" @@ -8983,9 +8839,9 @@ __metadata: resolution: "@rocket.chat/jest-presets@workspace:packages/jest-presets" dependencies: "@rocket.chat/eslint-config": "workspace:~" - "@swc/core": "npm:~1.7.42" + "@swc/core": "npm:~1.8.0" "@swc/jest": "npm:~0.2.37" - "@testing-library/jest-dom": "npm:~6.4.8" + "@testing-library/jest-dom": "npm:~6.6.3" "@types/identity-obj-proxy": "npm:^3.0.2" "@types/jest": "npm:~29.5.14" "@types/jest-axe": "npm:~3.5.9" @@ -9064,13 +8920,13 @@ __metadata: "@rocket.chat/random": "workspace:~" "@rocket.chat/ui-contexts": "workspace:^" "@rocket.chat/ui-kit": "workspace:~" - "@storybook/addon-essentials": "npm:^8.4.1" + "@storybook/addon-essentials": "npm:^8.4.2" "@storybook/addon-styling-webpack": "npm:~1.0.1" "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3" - "@storybook/preact": "npm:^8.4.1" - "@storybook/preact-webpack5": "npm:^8.4.1" - "@storybook/theming": "npm:^8.4.1" - "@types/crypto-js": "npm:~4.1.3" + "@storybook/preact": "npm:^8.4.2" + "@storybook/preact-webpack5": "npm:^8.4.2" + "@storybook/theming": "npm:^8.4.2" + "@types/crypto-js": "npm:~4.2.2" "@types/markdown-it": "npm:^14.1.2" "@types/mini-css-extract-plugin": "npm:~1.4.3" "@types/webpack-env": "npm:~1.18.5" @@ -9087,9 +8943,9 @@ __metadata: desvg-loader: "npm:^0.1.0" emoji-mart: "npm:^3.0.1" eslint: "npm:~8.45.0" - eslint-plugin-import: "npm:~2.26.0" - eslint-plugin-react: "npm:~7.32.2" - eslint-plugin-react-hooks: "npm:~4.6.2" + eslint-plugin-import: "npm:~2.31.0" + eslint-plugin-react: "npm:~7.37.2" + eslint-plugin-react-hooks: "npm:~5.0.0" file-loader: "npm:^6.2.0" history: "npm:~5.3.0" html-webpack-plugin: "npm:^5.6.3" @@ -9102,16 +8958,16 @@ __metadata: mini-css-extract-plugin: "npm:~1.6.2" npm-run-all: "npm:^4.1.5" path-to-regexp: "npm:^6.3.0" - postcss-css-variables: "npm:^0.17.0" - postcss-dir-pseudo-class: "npm:^5.0.0" - postcss-flexbugs-fixes: "npm:^4.2.1" + postcss-css-variables: "npm:^0.19.0" + postcss-dir-pseudo-class: "npm:^9.0.1" + postcss-flexbugs-fixes: "npm:^5.0.2" postcss-ie11-supports: "npm:^0.1.3" postcss-loader: "npm:^8.1.1" - postcss-logical: "npm:^4.0.2" + postcss-logical: "npm:^8.0.0" postcss-scss: "npm:^4.0.9" - postcss-selector-not: "npm:^4.0.1" + postcss-selector-not: "npm:^8.0.1" preact: "npm:~10.24.3" - preact-router: "npm:^3.2.1" + preact-router: "npm:^4.1.2" query-string: "npm:^7.1.3" react-dom: "npm:~17.0.2" react-hook-form: "npm:~7.45.4" @@ -9120,7 +8976,7 @@ __metadata: rimraf: "npm:^6.0.1" sass: "npm:~1.80.6" sass-loader: "npm:~16.0.3" - storybook: "npm:^8.4.1" + storybook: "npm:^8.4.2" storybook-dark-mode: "npm:^4.0.2" style-loader: "npm:^1.3.0" stylelint: "npm:^14.16.1" @@ -9206,7 +9062,7 @@ __metadata: prettier-plugin-pegjs: "npm:~0.5.4" rimraf: "npm:^6.0.1" tldts: "npm:~6.1.58" - ts-loader: "npm:~9.4.4" + ts-loader: "npm:~9.5.1" typedoc: "npm:~0.24.8" typescript: "npm:~5.6.3" webpack: "npm:~5.95.0" @@ -9228,13 +9084,13 @@ __metadata: "@bugsnag/js": "npm:~7.20.2" "@bugsnag/plugin-react": "npm:~7.19.0" "@faker-js/faker": "npm:~8.0.2" - "@google-cloud/storage": "npm:^6.11.0" + "@google-cloud/storage": "npm:^6.12.0" "@kaciras/deasync": "npm:^1.1.0" - "@nivo/bar": "npm:0.84.0" - "@nivo/core": "npm:0.84.0" - "@nivo/heatmap": "npm:0.84.0" - "@nivo/line": "npm:0.84.0" - "@nivo/pie": "npm:0.84.0" + "@nivo/bar": "npm:0.87.0" + "@nivo/core": "npm:0.87.0" + "@nivo/heatmap": "npm:0.87.0" + "@nivo/line": "npm:0.87.0" + "@nivo/pie": "npm:0.87.0" "@opentelemetry/api": "npm:^1.9.0" "@opentelemetry/exporter-trace-otlp-grpc": "npm:^0.54.0" "@opentelemetry/sdk-node": "npm:^0.54.0" @@ -9306,15 +9162,15 @@ __metadata: "@rocket.chat/ui-video-conf": "workspace:^" "@rocket.chat/ui-voip": "workspace:^" "@rocket.chat/web-ui-registration": "workspace:^" - "@slack/bolt": "npm:^3.22.0" - "@slack/rtm-api": "npm:^6.2.1" - "@storybook/addon-a11y": "npm:^8.4.1" - "@storybook/addon-essentials": "npm:^8.4.1" - "@storybook/addon-interactions": "npm:^8.4.1" + "@slack/bolt": "npm:^4.1.0" + "@slack/rtm-api": "npm:^7.0.1" + "@storybook/addon-a11y": "npm:^8.4.2" + "@storybook/addon-essentials": "npm:^8.4.2" + "@storybook/addon-interactions": "npm:^8.4.2" "@storybook/addon-styling-webpack": "npm:^1.0.1" "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3" - "@storybook/react": "npm:^8.4.1" - "@storybook/react-webpack5": "npm:^8.4.1" + "@storybook/react": "npm:^8.4.2" + "@storybook/react-webpack5": "npm:^8.4.2" "@tanstack/react-query": "npm:^4.36.1" "@testing-library/react": "npm:~16.0.1" "@testing-library/user-event": "npm:~14.5.2" @@ -9348,7 +9204,7 @@ __metadata: "@types/jsdom": "npm:^16.2.15" "@types/jsdom-global": "npm:^3.0.7" "@types/jsrsasign": "npm:^10.5.14" - "@types/katex": "npm:^0.14.0" + "@types/katex": "npm:^0.16.7" "@types/later": "npm:^1.2.9" "@types/ldapjs": "npm:^2.2.5" "@types/less": "npm:~3.0.6" @@ -9367,8 +9223,8 @@ __metadata: "@types/node": "npm:~20.16.15" "@types/node-gcm": "npm:^1.0.5" "@types/node-rsa": "npm:^1.1.4" - "@types/nodemailer": "npm:^6.4.15" - "@types/oauth2-server": "npm:^3.0.17" + "@types/nodemailer": "npm:^6.4.16" + "@types/oauth2-server": "npm:^3.0.18" "@types/object-path": "npm:^0.11.4" "@types/parseurl": "npm:^1.3.3" "@types/prometheus-gc-stats": "npm:^0.6.4" @@ -9436,7 +9292,7 @@ __metadata: csv-parse: "npm:^5.5.6" date-fns: "npm:^2.30.0" date.js: "npm:~0.3.3" - debug: "npm:~4.1.1" + debug: "npm:~4.3.7" docker-compose: "npm:^0.24.8" dompurify: "npm:^3.1.7" ejson: "npm:^2.2.3" @@ -9446,16 +9302,16 @@ __metadata: emojione-assets: "npm:^4.5.0" esl: "npm:^11.2.1" eslint: "npm:~8.45.0" - eslint-config-prettier: "npm:~8.8.0" + eslint-config-prettier: "npm:~9.1.0" eslint-plugin-anti-trojan-source: "npm:~1.1.1" - eslint-plugin-import: "npm:~2.26.0" - eslint-plugin-no-floating-promise: "npm:~1.0.2" - eslint-plugin-playwright: "npm:~0.15.3" + eslint-plugin-import: "npm:~2.31.0" + eslint-plugin-no-floating-promise: "npm:~2.0.0" + eslint-plugin-playwright: "npm:~2.0.0" eslint-plugin-prettier: "npm:~5.2.1" - eslint-plugin-react: "npm:~7.32.2" - eslint-plugin-react-hooks: "npm:~4.6.2" - eslint-plugin-testing-library: "npm:~6.2.2" - eslint-plugin-you-dont-need-lodash-underscore: "npm:~6.12.0" + eslint-plugin-react: "npm:~7.37.2" + eslint-plugin-react-hooks: "npm:~5.0.0" + eslint-plugin-testing-library: "npm:~6.4.0" + eslint-plugin-you-dont-need-lodash-underscore: "npm:~6.14.0" eventemitter3: "npm:^5.0.1" exif-be-gone: "npm:^1.5.1" expiry-map: "npm:^2.0.0" @@ -9463,7 +9319,7 @@ __metadata: express-rate-limit: "npm:^5.5.1" fast-glob: "npm:^3.3.2" fastq: "npm:^1.17.1" - fflate: "npm:^0.7.4" + fflate: "npm:^0.8.2" file-type: "npm:^16.5.4" filenamify: "npm:^4.3.0" filesize: "npm:9.0.11" @@ -9531,11 +9387,11 @@ __metadata: pino-pretty: "npm:^7.6.1" playwright-qase-reporter: "npm:^1.2.2" postcss: "npm:~8.4.47" - postcss-custom-properties: "npm:^11.0.0" + postcss-custom-properties: "npm:^14.0.4" postcss-easy-import: "npm:^4.0.0" - postcss-load-config: "npm:^3.1.4" + postcss-load-config: "npm:^6.0.1" postcss-media-minmax: "npm:^5.0.0" - postcss-nested: "npm:^5.0.6" + postcss-nested: "npm:^7.0.2" postcss-url: "npm:^10.1.3" postis: "npm:^2.2.0" prettier: "npm:~3.3.3" @@ -9562,12 +9418,12 @@ __metadata: semver: "npm:^7.6.3" sharp: "npm:^0.33.5" sinon: "npm:^19.0.2" - sip.js: "npm:^0.20.1" + sip.js: "npm:^0.21.2" sodium-native: "npm:^3.4.1" sodium-plus: "npm:^0.9.0" source-map: "npm:^0.7.4" speakeasy: "npm:^2.0.0" - storybook: "npm:^8.4.1" + storybook: "npm:^8.4.2" stream-buffers: "npm:^3.0.3" strict-uri-encode: "npm:^2.0.0" string-strip-html: "npm:^7.0.3" @@ -9607,7 +9463,7 @@ __metadata: "@rocket.chat/emitter": "npm:~0.31.25" "@rocket.chat/i18n": "workspace:~" "@rocket.chat/ui-contexts": "workspace:*" - "@storybook/react": "npm:^8.4.1" + "@storybook/react": "npm:^8.4.2" "@tanstack/react-query": "npm:^4.36.1" "@types/use-sync-external-store": "npm:^0.0.6" eslint: "npm:~8.45.0" @@ -9802,10 +9658,10 @@ __metadata: "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/fuselage-tokens": "npm:^0.33.2" "@rocket.chat/jest-presets": "workspace:~" - "@storybook/addon-essentials": "npm:^8.4.1" + "@storybook/addon-essentials": "npm:^8.4.2" "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3" - "@storybook/react": "npm:^8.4.1" - "@storybook/react-webpack5": "npm:^8.4.1" + "@storybook/react": "npm:^8.4.2" + "@storybook/react-webpack5": "npm:^8.4.2" "@testing-library/react": "npm:~16.0.1" "@types/emojione": "npm:^2.2.9" "@types/jest": "npm:~29.5.14" @@ -9820,7 +9676,7 @@ __metadata: moment-timezone: "npm:^0.5.46" react: "npm:~18.3.1" react-dom: "npm:~18.3.1" - storybook: "npm:^8.4.1" + storybook: "npm:^8.4.2" typescript: "npm:~5.6.3" languageName: unknown linkType: soft @@ -10164,10 +10020,10 @@ __metadata: "@types/react": "npm:~17.0.80" "@types/react-dom": "npm:~17.0.25" eslint: "npm:~8.45.0" - eslint-plugin-react: "npm:~7.32.2" - eslint-plugin-react-hooks: "npm:~4.6.2" - eslint-plugin-storybook: "npm:~0.10.2" - eslint-plugin-testing-library: "npm:~5.11.1" + eslint-plugin-react: "npm:~7.37.2" + eslint-plugin-react-hooks: "npm:~5.0.0" + eslint-plugin-storybook: "npm:~0.11.0" + eslint-plugin-testing-library: "npm:~6.4.0" react: "npm:^17.0.2" typescript: "npm:~5.6.3" peerDependencies: @@ -10191,30 +10047,30 @@ __metadata: "@rocket.chat/mock-providers": "workspace:^" "@rocket.chat/ui-avatar": "workspace:~" "@rocket.chat/ui-contexts": "workspace:~" - "@storybook/addon-actions": "npm:^8.4.1" - "@storybook/addon-docs": "npm:^8.4.1" - "@storybook/addon-essentials": "npm:^8.4.1" - "@storybook/addon-interactions": "npm:^8.4.1" - "@storybook/addon-links": "npm:^8.4.1" + "@storybook/addon-actions": "npm:^8.4.2" + "@storybook/addon-docs": "npm:^8.4.2" + "@storybook/addon-essentials": "npm:^8.4.2" + "@storybook/addon-interactions": "npm:^8.4.2" + "@storybook/addon-links": "npm:^8.4.2" "@storybook/addon-styling-webpack": "npm:^1.0.1" "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3" - "@storybook/react": "npm:^8.4.1" - "@storybook/react-webpack5": "npm:^8.4.1" + "@storybook/react": "npm:^8.4.2" + "@storybook/react-webpack5": "npm:^8.4.2" "@testing-library/react": "npm:~16.0.1" "@types/jest": "npm:~29.5.14" "@types/react": "npm:~17.0.80" "@types/react-dom": "npm:~17.0.25" eslint: "npm:~8.45.0" eslint-plugin-anti-trojan-source: "npm:~1.1.1" - eslint-plugin-react: "npm:~7.32.2" - eslint-plugin-react-hooks: "npm:~4.6.2" - eslint-plugin-storybook: "npm:~0.10.2" - eslint-plugin-testing-library: "npm:~5.11.1" + eslint-plugin-react: "npm:~7.37.2" + eslint-plugin-react-hooks: "npm:~5.0.0" + eslint-plugin-storybook: "npm:~0.11.0" + eslint-plugin-testing-library: "npm:~6.4.0" jest: "npm:~29.7.0" react: "npm:^17.0.2" react-dom: "npm:^17.0.2" react-hook-form: "npm:~7.45.4" - storybook: "npm:^8.4.1" + storybook: "npm:^8.4.2" typescript: "npm:~5.6.3" peerDependencies: "@react-aria/toolbar": "*" @@ -10238,22 +10094,22 @@ __metadata: "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/fuselage": "npm:^0.59.4" "@rocket.chat/icons": "npm:~0.39.0" - "@storybook/addon-actions": "npm:^8.4.1" - "@storybook/addon-docs": "npm:^8.4.1" - "@storybook/addon-essentials": "npm:^8.4.1" + "@storybook/addon-actions": "npm:^8.4.2" + "@storybook/addon-docs": "npm:^8.4.2" + "@storybook/addon-essentials": "npm:^8.4.2" "@storybook/addon-styling-webpack": "npm:^1.0.1" "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3" - "@storybook/react": "npm:^8.4.1" - "@storybook/react-webpack5": "npm:^8.4.1" + "@storybook/react": "npm:^8.4.2" + "@storybook/react-webpack5": "npm:^8.4.2" "@types/react": "npm:~17.0.80" "@types/react-dom": "npm:~17.0.25" eslint: "npm:~8.45.0" - eslint-plugin-react: "npm:~7.32.2" - eslint-plugin-react-hooks: "npm:~4.6.2" - eslint-plugin-storybook: "npm:^0.10.2" + eslint-plugin-react: "npm:~7.37.2" + eslint-plugin-react-hooks: "npm:~5.0.0" + eslint-plugin-storybook: "npm:^0.11.0" react: "npm:~17.0.2" react-dom: "npm:~17.0.2" - storybook: "npm:^8.4.1" + storybook: "npm:^8.4.2" typescript: "npm:~5.6.3" peerDependencies: "@react-aria/toolbar": "*" @@ -10279,7 +10135,7 @@ __metadata: "@types/react-dom": "npm:~17.0.25" "@types/use-sync-external-store": "npm:^0.0.6" eslint: "npm:~8.45.0" - eslint-plugin-react-hooks: "npm:^4.6.2" + eslint-plugin-react-hooks: "npm:^5.0.0" mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch" react: "npm:~17.0.2" typescript: "npm:~5.6.3" @@ -10315,7 +10171,7 @@ __metadata: prettier: "npm:~3.3.3" rimraf: "npm:~6.0.1" ts-jest: "npm:~29.2.5" - ts-loader: "npm:~9.4.4" + ts-loader: "npm:~9.5.1" ts-node: "npm:~10.9.2" ts-patch: "npm:~3.2.1" typescript: "npm:~5.6.3" @@ -10337,9 +10193,9 @@ __metadata: "@types/react": "npm:~17.0.80" eslint: "npm:~8.45.0" eslint-plugin-anti-trojan-source: "npm:~1.1.1" - eslint-plugin-react: "npm:~7.32.2" - eslint-plugin-react-hooks: "npm:~4.6.2" - eslint-plugin-testing-library: "npm:^5.11.1" + eslint-plugin-react: "npm:~7.37.2" + eslint-plugin-react-hooks: "npm:~5.0.0" + eslint-plugin-testing-library: "npm:^6.4.0" react: "npm:~17.0.2" react-docgen-typescript-plugin: "npm:~1.0.8" typescript: "npm:~5.6.3" @@ -10367,25 +10223,25 @@ __metadata: "@rocket.chat/styled": "npm:~0.31.25" "@rocket.chat/ui-avatar": "workspace:^" "@rocket.chat/ui-contexts": "workspace:^" - "@storybook/addon-a11y": "npm:^8.4.1" - "@storybook/addon-actions": "npm:^8.4.1" - "@storybook/addon-docs": "npm:^8.4.1" - "@storybook/addon-essentials": "npm:^8.4.1" + "@storybook/addon-a11y": "npm:^8.4.2" + "@storybook/addon-actions": "npm:^8.4.2" + "@storybook/addon-docs": "npm:^8.4.2" + "@storybook/addon-essentials": "npm:^8.4.2" "@storybook/addon-styling-webpack": "npm:^1.0.1" "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3" - "@storybook/react": "npm:^8.4.1" - "@storybook/react-webpack5": "npm:^8.4.1" + "@storybook/react": "npm:^8.4.2" + "@storybook/react-webpack5": "npm:^8.4.2" "@types/jest": "npm:~29.5.14" "@types/jest-axe": "npm:~3.5.9" "@types/react": "npm:~17.0.80" eslint: "npm:~8.45.0" - eslint-plugin-react: "npm:~7.32.2" - eslint-plugin-react-hooks: "npm:~4.6.2" - eslint-plugin-storybook: "npm:~0.10.2" + eslint-plugin-react: "npm:~7.37.2" + eslint-plugin-react-hooks: "npm:~5.0.0" + eslint-plugin-storybook: "npm:~0.11.0" jest: "npm:~29.7.0" jest-axe: "npm:~9.0.0" react: "npm:~17.0.2" - storybook: "npm:^8.4.1" + storybook: "npm:^8.4.2" typescript: "npm:~5.6.3" peerDependencies: "@rocket.chat/css-in-js": "*" @@ -10419,13 +10275,13 @@ __metadata: "@rocket.chat/ui-avatar": "workspace:^" "@rocket.chat/ui-client": "workspace:^" "@rocket.chat/ui-contexts": "workspace:^" - "@storybook/addon-a11y": "npm:^8.4.1" - "@storybook/addon-actions": "npm:^8.4.1" - "@storybook/addon-docs": "npm:^8.4.1" - "@storybook/addon-essentials": "npm:^8.4.1" + "@storybook/addon-a11y": "npm:^8.4.2" + "@storybook/addon-actions": "npm:^8.4.2" + "@storybook/addon-docs": "npm:^8.4.2" + "@storybook/addon-essentials": "npm:^8.4.2" "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3" - "@storybook/react": "npm:^8.4.1" - "@storybook/react-webpack5": "npm:^8.4.1" + "@storybook/react": "npm:^8.4.2" + "@storybook/react-webpack5": "npm:^8.4.2" "@tanstack/react-query": "npm:^4.36.1" "@testing-library/react": "npm:~16.0.1" "@testing-library/user-event": "npm:~14.5.2" @@ -10434,15 +10290,15 @@ __metadata: "@types/react": "npm:~17.0.80" "@types/react-dom": "npm:~17.0.25" eslint: "npm:~8.45.0" - eslint-plugin-react: "npm:~7.32.2" - eslint-plugin-react-hooks: "npm:~4.6.2" - eslint-plugin-storybook: "npm:^0.10.2" + eslint-plugin-react: "npm:~7.37.2" + eslint-plugin-react-hooks: "npm:~5.0.0" + eslint-plugin-storybook: "npm:^0.11.0" jest: "npm:~29.7.0" jest-axe: "npm:~9.0.0" react: "npm:~17.0.2" react-i18next: "npm:~13.2.2" - sip.js: "npm:^0.20.1" - storybook: "npm:^8.4.1" + sip.js: "npm:^0.21.2" + storybook: "npm:^8.4.2" typescript: "npm:~5.6.3" peerDependencies: "@rocket.chat/css-in-js": "*" @@ -10488,7 +10344,7 @@ __metadata: "@vitejs/plugin-react": "npm:^4.3.3" codemirror: "npm:^6.0.1" eslint: "npm:~8.45.0" - eslint-plugin-react-hooks: "npm:^4.6.2" + eslint-plugin-react-hooks: "npm:^5.0.0" eslint-plugin-react-refresh: "npm:^0.4.14" eslint4b-prebuilt: "npm:^6.7.2" moment: "npm:^2.29.4" @@ -10519,13 +10375,13 @@ __metadata: "@rocket.chat/tools": "workspace:~" "@rocket.chat/ui-client": "workspace:^" "@rocket.chat/ui-contexts": "workspace:^" - "@storybook/addon-actions": "npm:^8.4.1" - "@storybook/addon-docs": "npm:^8.4.1" - "@storybook/addon-essentials": "npm:^8.4.1" + "@storybook/addon-actions": "npm:^8.4.2" + "@storybook/addon-docs": "npm:^8.4.2" + "@storybook/addon-essentials": "npm:^8.4.2" "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3" - "@storybook/react": "npm:^8.4.1" - "@storybook/react-webpack5": "npm:^8.4.1" - "@storybook/theming": "npm:^8.4.1" + "@storybook/react": "npm:^8.4.2" + "@storybook/react-webpack5": "npm:^8.4.2" + "@storybook/theming": "npm:^8.4.2" "@tanstack/react-query": "npm:^4.36.1" "@testing-library/react": "npm:~16.0.1" "@types/react": "npm:~17.0.80" @@ -10534,7 +10390,7 @@ __metadata: react: "npm:~17.0.2" react-hook-form: "npm:~7.45.4" react-i18next: "npm:~13.2.2" - storybook: "npm:^8.4.1" + storybook: "npm:^8.4.2" storybook-dark-mode: "npm:^4.0.2" typescript: "npm:~5.6.3" peerDependencies: @@ -10674,6 +10530,13 @@ __metadata: languageName: node linkType: hard +"@rtsao/scc@npm:^1.1.0": + version: 1.1.0 + resolution: "@rtsao/scc@npm:1.1.0" + checksum: 10/17d04adf404e04c1e61391ed97bca5117d4c2767a76ae3e879390d6dec7b317fcae68afbf9e98badee075d0b64fa60f287729c4942021b4d19cd01db77385c01 + languageName: node + linkType: hard + "@samchon/openapi@npm:^1.1.1": version: 1.1.2 resolution: "@samchon/openapi@npm:1.1.2" @@ -10759,47 +10622,26 @@ __metadata: languageName: node linkType: hard -"@slack/bolt@npm:^3.22.0": - version: 3.22.0 - resolution: "@slack/bolt@npm:3.22.0" +"@slack/bolt@npm:^4.1.0": + version: 4.1.0 + resolution: "@slack/bolt@npm:4.1.0" dependencies: "@slack/logger": "npm:^4.0.0" - "@slack/oauth": "npm:^2.6.3" - "@slack/socket-mode": "npm:^1.3.6" + "@slack/oauth": "npm:^3" + "@slack/socket-mode": "npm:^2.0.2" "@slack/types": "npm:^2.13.0" - "@slack/web-api": "npm:^6.13.0" - "@types/express": "npm:^4.16.1" - "@types/promise.allsettled": "npm:^1.0.3" - "@types/tsscmp": "npm:^1.0.0" + "@slack/web-api": "npm:^7" + "@types/express": "npm:^4.17.21" axios: "npm:^1.7.4" - express: "npm:^4.21.0" + express: "npm:^5.0.0" path-to-regexp: "npm:^8.1.0" - promise.allsettled: "npm:^1.0.2" - raw-body: "npm:^2.3.3" + raw-body: "npm:^3" tsscmp: "npm:^1.0.6" - checksum: 10/d461ff25bce9171cd08a76c2c2d8094b7bf05f492b446198de87baa45270f1824293558e08964b5d3216b793a8e493d0af59f374976534c785f86083c3de72c0 + checksum: 10/725f7a3a6557bba835860a8f24e70b54f6e66015798917f64ed319cbe5992988a9fea1dff45684635a28cb7d8d447eb36c386a1f964db9e6684a7231c6822e5e languageName: node linkType: hard -"@slack/logger@npm:>=1.0.0 <3.0.0": - version: 2.0.0 - resolution: "@slack/logger@npm:2.0.0" - dependencies: - "@types/node": "npm:>=8.9.0" - checksum: 10/15badf5c1d8a828ba5019b4294178ce7ee666a9c081fa6dc44bdb971d63fc2d2c34020b146465b93fbaa6e6d312470b3341ab6b5b4b981ddd0a54d2c466b3d96 - languageName: node - linkType: hard - -"@slack/logger@npm:^3.0.0": - version: 3.0.0 - resolution: "@slack/logger@npm:3.0.0" - dependencies: - "@types/node": "npm:>=12.0.0" - checksum: 10/6512d0e9e4be47ea465705ab9b6e6901f36fa981da0d4a657fde649d452b567b351002049b5ee0a22569b5119bf6c2f61befd5b8022d878addb7a99c91b03389 - languageName: node - linkType: hard - -"@slack/logger@npm:^4.0.0": +"@slack/logger@npm:^4, @slack/logger@npm:^4.0.0": version: 4.0.0 resolution: "@slack/logger@npm:4.0.0" dependencies: @@ -10808,94 +10650,92 @@ __metadata: languageName: node linkType: hard -"@slack/oauth@npm:^2.6.3": - version: 2.6.3 - resolution: "@slack/oauth@npm:2.6.3" +"@slack/oauth@npm:^3": + version: 3.0.1 + resolution: "@slack/oauth@npm:3.0.1" dependencies: - "@slack/logger": "npm:^3.0.0" - "@slack/web-api": "npm:^6.12.1" - "@types/jsonwebtoken": "npm:^8.3.7" - "@types/node": "npm:>=12" - jsonwebtoken: "npm:^9.0.0" - lodash.isstring: "npm:^4.0.1" - checksum: 10/162668312f63ef146db100bd7e21df38160f2a25878d9b447713316e8d128ab83ff1f1cd6b5130d123460cae85faa9d6de2b07caa4d2a3facaee02ee3f53570e + "@slack/logger": "npm:^4" + "@slack/web-api": "npm:^7.3.4" + "@types/jsonwebtoken": "npm:^9" + "@types/node": "npm:>=18" + jsonwebtoken: "npm:^9" + lodash.isstring: "npm:^4" + checksum: 10/03317e8179b66adc1557180e5d6356f601fd6633b474a7edbbc0265d93dad78636ccc76c4d09cd400e7acd1e33536a0774297a9018e1e127304e65e24c446c05 languageName: node linkType: hard -"@slack/rtm-api@npm:^6.2.1": - version: 6.2.1 - resolution: "@slack/rtm-api@npm:6.2.1" - dependencies: - "@slack/logger": "npm:>=1.0.0 <3.0.0" - "@slack/web-api": "npm:^6.11.2" - "@types/node": "npm:>=12.0.0" - "@types/p-queue": "npm:^2.3.2" - "@types/ws": "npm:^7.4.7" - eventemitter3: "npm:^3.1.0" +"@slack/rtm-api@npm:^7.0.1": + version: 7.0.1 + resolution: "@slack/rtm-api@npm:7.0.1" + dependencies: + "@slack/logger": "npm:^4" + "@slack/web-api": "npm:^7.3.4" + "@types/node": "npm:>=18" + eventemitter3: "npm:^5" finity: "npm:^0.5.4" - p-cancelable: "npm:^1.1.0" - p-queue: "npm:^2.4.2" - ws: "npm:^7.5.3" - checksum: 10/83ff54662050e29b841d04dfd9d799aa53ab179dfa6d8c31b27c0dd7b94f094e4af5302e76d755e009399ace6fcee4073337d37b22057cc779f08d006542271c + p-cancelable: "npm:^2" + p-queue: "npm:^6" + ws: "npm:^8" + checksum: 10/2b34ef1560ac74ad8cc1545bef1b81ef2cf1fa07cb20e60e0fa9f9e10fbc84547c0d7d9a8abef5771da2c1b5ff03cbf3e9968e36649f46c18aec56f137adc98d languageName: node linkType: hard -"@slack/socket-mode@npm:^1.3.6": - version: 1.3.6 - resolution: "@slack/socket-mode@npm:1.3.6" +"@slack/socket-mode@npm:^2.0.2": + version: 2.0.2 + resolution: "@slack/socket-mode@npm:2.0.2" dependencies: - "@slack/logger": "npm:^3.0.0" - "@slack/web-api": "npm:^6.12.1" - "@types/node": "npm:>=12.0.0" - "@types/ws": "npm:^7.4.7" + "@slack/logger": "npm:^4" + "@slack/web-api": "npm:^7.3.4" + "@types/node": "npm:>=18" + "@types/ws": "npm:^8" eventemitter3: "npm:^5" - finity: "npm:^0.5.4" - ws: "npm:^7.5.3" - checksum: 10/3f3178a3f0f70926d819046db97d3a2eac039a9770a8d3c349306070702e669c3df5e63818561e3df28f48d5d51a3224bf6139c46517d8028108ea6158405437 + ws: "npm:^8" + checksum: 10/3403d8d7e91b9ed27216588cb7bd45415d54051a23f88d510196febad8fd592a41b6c5bddf9075fd26a0a513300569ebb077c2cda487eb350b38af6da55d395c languageName: node linkType: hard -"@slack/types@npm:^2.11.0, @slack/types@npm:^2.13.0": +"@slack/types@npm:^2.13.0, @slack/types@npm:^2.9.0": version: 2.14.0 resolution: "@slack/types@npm:2.14.0" checksum: 10/fa24a113b88e087f899078504c2ba50ab9795f7c2dd1a2d95b28217a3af20e554494f9cc3b8c8ce173120990d98e19400c95369f9067cecfcc46c08b59d2a46f languageName: node linkType: hard -"@slack/web-api@npm:^6.11.2, @slack/web-api@npm:^6.12.1, @slack/web-api@npm:^6.13.0": - version: 6.13.0 - resolution: "@slack/web-api@npm:6.13.0" +"@slack/web-api@npm:^7, @slack/web-api@npm:^7.3.4": + version: 7.7.0 + resolution: "@slack/web-api@npm:7.7.0" dependencies: - "@slack/logger": "npm:^3.0.0" - "@slack/types": "npm:^2.11.0" - "@types/is-stream": "npm:^1.1.0" - "@types/node": "npm:>=12.0.0" + "@slack/logger": "npm:^4.0.0" + "@slack/types": "npm:^2.9.0" + "@types/node": "npm:>=18.0.0" + "@types/retry": "npm:0.12.0" axios: "npm:^1.7.4" - eventemitter3: "npm:^3.1.0" - form-data: "npm:^2.5.0" + eventemitter3: "npm:^5.0.1" + form-data: "npm:^4.0.0" is-electron: "npm:2.2.2" - is-stream: "npm:^1.1.0" - p-queue: "npm:^6.6.1" - p-retry: "npm:^4.0.0" - checksum: 10/f98ccfcab1e82473f14bfbbcd886d52d93c20cc01871bb4a77e49712e1d2e2e686a93bd96a853f7e99d9a6dc6bd8b408ee922b57b1954a49490364c8697357ed + is-stream: "npm:^2" + p-queue: "npm:^6" + p-retry: "npm:^4" + retry: "npm:^0.13.1" + checksum: 10/465031984036532eb7291df9b686ea143795ecfc3b235e2b759ea8790965abbee9da349c6184a49ec0425d76251d9e35237ee0b1c8cf20dcac1df82db8f95b93 languageName: node linkType: hard -"@storybook/addon-a11y@npm:^8.4.1": - version: 8.4.1 - resolution: "@storybook/addon-a11y@npm:8.4.1" +"@storybook/addon-a11y@npm:^8.4.2": + version: 8.4.2 + resolution: "@storybook/addon-a11y@npm:8.4.2" dependencies: - "@storybook/addon-highlight": "npm:8.4.1" + "@storybook/addon-highlight": "npm:8.4.2" axe-core: "npm:^4.2.0" peerDependencies: - storybook: ^8.4.1 - checksum: 10/ec20a6257b402d4a4ab5831fc9383c23b22f87523c23ed543e9e2e702240462b5875c645db98903c091f446130ff61311fd49203a6daf6189a0c21e0c65b6e58 + storybook: ^8.4.2 + checksum: 10/df093c431e579cec6f353f300ccfc9ae33535508b9b4340a0f5a0bbf2449dd1a4483b5214b3904b71e996ebde0c8e9b73e17d5fd692ced49b285b5e749a3f61a languageName: node linkType: hard -"@storybook/addon-actions@npm:8.4.1, @storybook/addon-actions@npm:^8.4.1": - version: 8.4.1 - resolution: "@storybook/addon-actions@npm:8.4.1" +"@storybook/addon-actions@npm:8.4.2, @storybook/addon-actions@npm:^8.4.2": + version: 8.4.2 + resolution: "@storybook/addon-actions@npm:8.4.2" dependencies: "@storybook/global": "npm:^5.0.0" "@types/uuid": "npm:^9.0.1" @@ -10903,138 +10743,138 @@ __metadata: polished: "npm:^4.2.2" uuid: "npm:^9.0.0" peerDependencies: - storybook: ^8.4.1 - checksum: 10/a743b616ceace8f80c847bbb24d78114c89457198b5b56ea350434fa93751777a9a578b4ba89a293b8d0bbf419f669004f701f0763edc95b7a6d5120a1bac083 + storybook: ^8.4.2 + checksum: 10/c00b213e42ea085a19162448b5c35d2439be7aa18425fc4c535e50b2cb187c3c93d6603e7c7727258e1b8abdb04d20d60eacf3bd0e2bec86a1a5df2c043bf3d7 languageName: node linkType: hard -"@storybook/addon-backgrounds@npm:8.4.1": - version: 8.4.1 - resolution: "@storybook/addon-backgrounds@npm:8.4.1" +"@storybook/addon-backgrounds@npm:8.4.2": + version: 8.4.2 + resolution: "@storybook/addon-backgrounds@npm:8.4.2" dependencies: "@storybook/global": "npm:^5.0.0" memoizerific: "npm:^1.11.3" ts-dedent: "npm:^2.0.0" peerDependencies: - storybook: ^8.4.1 - checksum: 10/ce875438db893557408cd3dcecc1a0bf62c809c6cfe2816e5291c5f4afa5f263bde86ecb2391b5d81c7015c4748ecdc8d232a7060fe0f1fddee17708a62d361e + storybook: ^8.4.2 + checksum: 10/56f2c8bcd5c32fd071baf14764b1f78dacfc25d12549686451043c8864c3e8ef56dc064ff91308dc4f37c842feb7a2993f0e29185e19194b6063bbadaafbd044 languageName: node linkType: hard -"@storybook/addon-controls@npm:8.4.1": - version: 8.4.1 - resolution: "@storybook/addon-controls@npm:8.4.1" +"@storybook/addon-controls@npm:8.4.2": + version: 8.4.2 + resolution: "@storybook/addon-controls@npm:8.4.2" dependencies: "@storybook/global": "npm:^5.0.0" dequal: "npm:^2.0.2" ts-dedent: "npm:^2.0.0" peerDependencies: - storybook: ^8.4.1 - checksum: 10/49173820b0f4aeeb16b6d1f0207070903d94c2b6f890dd192ba99f23f4f9f7f4f55e10a3f2e4c10d28180d8b5aacaede4fc2e1149fd1fe9fe953b93d9c2b742b + storybook: ^8.4.2 + checksum: 10/ee23a051be689ac6d7b4d4a5e2cc5429dadfe556a4daa9d347f55bef0a6110dce4a5d68f7afe18c04817d4960f048b041eeb6cc9555031f620d78a52a19e4229 languageName: node linkType: hard -"@storybook/addon-docs@npm:8.4.1, @storybook/addon-docs@npm:^8.4.1": - version: 8.4.1 - resolution: "@storybook/addon-docs@npm:8.4.1" +"@storybook/addon-docs@npm:8.4.2, @storybook/addon-docs@npm:^8.4.2": + version: 8.4.2 + resolution: "@storybook/addon-docs@npm:8.4.2" dependencies: "@mdx-js/react": "npm:^3.0.0" - "@storybook/blocks": "npm:8.4.1" - "@storybook/csf-plugin": "npm:8.4.1" - "@storybook/react-dom-shim": "npm:8.4.1" + "@storybook/blocks": "npm:8.4.2" + "@storybook/csf-plugin": "npm:8.4.2" + "@storybook/react-dom-shim": "npm:8.4.2" react: "npm:^16.8.0 || ^17.0.0 || ^18.0.0" react-dom: "npm:^16.8.0 || ^17.0.0 || ^18.0.0" ts-dedent: "npm:^2.0.0" peerDependencies: - storybook: ^8.4.1 - checksum: 10/4cdca83555c2003565c996163eb1cd4c64a21d84db337b683b1f07ff70e96939381430dc50d45522ebf4276793190d9d9969c8526464d661487f0f3c839f99e9 + storybook: ^8.4.2 + checksum: 10/06510b9894ac6b4d9324dec037e22b1fd882be8962fce4213a10746a2d23660a231373d70aa56f8763a5b65f2eb1a3e7e64f3228a687e36818768665e5f8e01e languageName: node linkType: hard -"@storybook/addon-essentials@npm:^8.4.1": - version: 8.4.1 - resolution: "@storybook/addon-essentials@npm:8.4.1" - dependencies: - "@storybook/addon-actions": "npm:8.4.1" - "@storybook/addon-backgrounds": "npm:8.4.1" - "@storybook/addon-controls": "npm:8.4.1" - "@storybook/addon-docs": "npm:8.4.1" - "@storybook/addon-highlight": "npm:8.4.1" - "@storybook/addon-measure": "npm:8.4.1" - "@storybook/addon-outline": "npm:8.4.1" - "@storybook/addon-toolbars": "npm:8.4.1" - "@storybook/addon-viewport": "npm:8.4.1" +"@storybook/addon-essentials@npm:^8.4.2": + version: 8.4.2 + resolution: "@storybook/addon-essentials@npm:8.4.2" + dependencies: + "@storybook/addon-actions": "npm:8.4.2" + "@storybook/addon-backgrounds": "npm:8.4.2" + "@storybook/addon-controls": "npm:8.4.2" + "@storybook/addon-docs": "npm:8.4.2" + "@storybook/addon-highlight": "npm:8.4.2" + "@storybook/addon-measure": "npm:8.4.2" + "@storybook/addon-outline": "npm:8.4.2" + "@storybook/addon-toolbars": "npm:8.4.2" + "@storybook/addon-viewport": "npm:8.4.2" ts-dedent: "npm:^2.0.0" peerDependencies: - storybook: ^8.4.1 - checksum: 10/7f3d5766f181f98f14e5ad1a8acc15474bdcc96296f15f354adad978406a4c3c622f479242b653083a905196db1fe60cb00cbcb21e59e6975866d714ea9149e7 + storybook: ^8.4.2 + checksum: 10/951da2192a63d985e9af2e1e803bbe8bd6d64a87f50644034a55eb8bdc2ad0844e87836437d5c494eff3e94c8eae894d5f28bbef4b9cb99ef7e5fad573e1980d languageName: node linkType: hard -"@storybook/addon-highlight@npm:8.4.1": - version: 8.4.1 - resolution: "@storybook/addon-highlight@npm:8.4.1" +"@storybook/addon-highlight@npm:8.4.2": + version: 8.4.2 + resolution: "@storybook/addon-highlight@npm:8.4.2" dependencies: "@storybook/global": "npm:^5.0.0" peerDependencies: - storybook: ^8.4.1 - checksum: 10/e58a86f25a9ffc05ff0726c4bd8b328bfb2e6b29539c84cc8f4725e07edd3187463d622783f84e1a46fcff2a709f655147ee09260c87616f5ced92d3fee51695 + storybook: ^8.4.2 + checksum: 10/81bdd9d758aa2b2faaa19ae6e27b6367e8522db3e8f6f2c72a452079ab35abf220472ff7ee6f7ed105dcfa7c23a2300df4753f8b5b5850a706a4c60492567735 languageName: node linkType: hard -"@storybook/addon-interactions@npm:^8.4.1": - version: 8.4.1 - resolution: "@storybook/addon-interactions@npm:8.4.1" +"@storybook/addon-interactions@npm:^8.4.2": + version: 8.4.2 + resolution: "@storybook/addon-interactions@npm:8.4.2" dependencies: "@storybook/global": "npm:^5.0.0" - "@storybook/instrumenter": "npm:8.4.1" - "@storybook/test": "npm:8.4.1" + "@storybook/instrumenter": "npm:8.4.2" + "@storybook/test": "npm:8.4.2" polished: "npm:^4.2.2" ts-dedent: "npm:^2.2.0" peerDependencies: - storybook: ^8.4.1 - checksum: 10/ffedd0b87e0093418005f6b29b58ac64319f7cc90a1fae09eafb8e330a939e0fd330ed2880f9f2e23edffaf4c42bb8ca916b000c2da2535c7c33e18cca75378a + storybook: ^8.4.2 + checksum: 10/a0ac4c473d5ce8a0cc2c56897faf3845ab3fa51c0d6ff217d009de9850033549ffe9653d7821284c7e1947efb9a38beb34bd4cf4788d009f3edc027a6f5b37eb languageName: node linkType: hard -"@storybook/addon-links@npm:^8.4.1": - version: 8.4.1 - resolution: "@storybook/addon-links@npm:8.4.1" +"@storybook/addon-links@npm:^8.4.2": + version: 8.4.2 + resolution: "@storybook/addon-links@npm:8.4.2" dependencies: "@storybook/csf": "npm:^0.1.11" "@storybook/global": "npm:^5.0.0" ts-dedent: "npm:^2.0.0" peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta - storybook: ^8.4.1 + storybook: ^8.4.2 peerDependenciesMeta: react: optional: true - checksum: 10/a57c029dacbdf105e42297ff814efd942b2e9c1189efac70940f933c0f82bd8ccc09b1248083bd8b66f93fb4b7599147f2e75a801963e97f3da5a6e947b70184 + checksum: 10/f23a29ffe9c7d8eb16032c4abba6b325dfea010840f9f3aa8cf27ea6699631a64aa065a796bd685bd35c39dcfdee9a3db51a38bc0bed452ce2c5818b523820b5 languageName: node linkType: hard -"@storybook/addon-measure@npm:8.4.1": - version: 8.4.1 - resolution: "@storybook/addon-measure@npm:8.4.1" +"@storybook/addon-measure@npm:8.4.2": + version: 8.4.2 + resolution: "@storybook/addon-measure@npm:8.4.2" dependencies: "@storybook/global": "npm:^5.0.0" tiny-invariant: "npm:^1.3.1" peerDependencies: - storybook: ^8.4.1 - checksum: 10/361f8008a70bc14bfcad580f8dec46db5918722f751dde58c2ab5fda5cdfe28f31c6bcfd0a13548764cd081c4318bc63d080d5b0c28857af9ee15a79f980a711 + storybook: ^8.4.2 + checksum: 10/48a2f3eccee2504777ac9c0fe267d3f91785674bb9a106c2610fa57912f65b2c2d32de76d3c62fe88a9d95985099283f0e55ac17b7593dece6ab3fb1657085c1 languageName: node linkType: hard -"@storybook/addon-outline@npm:8.4.1": - version: 8.4.1 - resolution: "@storybook/addon-outline@npm:8.4.1" +"@storybook/addon-outline@npm:8.4.2": + version: 8.4.2 + resolution: "@storybook/addon-outline@npm:8.4.2" dependencies: "@storybook/global": "npm:^5.0.0" ts-dedent: "npm:^2.0.0" peerDependencies: - storybook: ^8.4.1 - checksum: 10/9f7cdd81103194faa0ebbc7d20c02687f257bd4d4aaf4c1b4198908c5f36fb96bc0342d196041728084ec137be91c55468f95ba26ffa1c5755ae9dce7fafeb98 + storybook: ^8.4.2 + checksum: 10/b43804fbbca21ee8790c82cd32559de551e14bd010507d9c6d8eac2afe0849372a44701d91d2c4baba524bef9519193ee9cf87b1e9cfaa4d868bcce82b7d57b3 languageName: node linkType: hard @@ -11049,23 +10889,23 @@ __metadata: languageName: node linkType: hard -"@storybook/addon-toolbars@npm:8.4.1": - version: 8.4.1 - resolution: "@storybook/addon-toolbars@npm:8.4.1" +"@storybook/addon-toolbars@npm:8.4.2": + version: 8.4.2 + resolution: "@storybook/addon-toolbars@npm:8.4.2" peerDependencies: - storybook: ^8.4.1 - checksum: 10/44542a99986b9d0d8a44bbdb34bc3fb63c3a3199d29a25f5e7e3b84a4d0379737e7539547ee75690bf3b2a7463a55429a540b8540973b1a22434d9f8b5376841 + storybook: ^8.4.2 + checksum: 10/294019d0081874ff15fc846768f3743e11278f6a1d211f413bfcdbc5ca9415a80ac478523cae51fcfe1c77277a32bad9745362c8a0a1bd053570e07df615af95 languageName: node linkType: hard -"@storybook/addon-viewport@npm:8.4.1": - version: 8.4.1 - resolution: "@storybook/addon-viewport@npm:8.4.1" +"@storybook/addon-viewport@npm:8.4.2": + version: 8.4.2 + resolution: "@storybook/addon-viewport@npm:8.4.2" dependencies: memoizerific: "npm:^1.11.3" peerDependencies: - storybook: ^8.4.1 - checksum: 10/3513f5d7c35cee33e2577d4cddcb1d9847cb2ec8dfbd9ad8b176fcebb4678d8fe13589d860e17e5552f5cf910e479d78bc97438681ff651a1e25daddc8ea4772 + storybook: ^8.4.2 + checksum: 10/7d2c0fa6ed73030cf718a306dd0c327006f54747801e13a7037416ca746ff92f3d341820744de08e651ed746e0f5bb50104a2c57b17b6f4de3ef0f8987861020 languageName: node linkType: hard @@ -11079,9 +10919,9 @@ __metadata: languageName: node linkType: hard -"@storybook/blocks@npm:8.4.1, @storybook/blocks@npm:^8.4.1": - version: 8.4.1 - resolution: "@storybook/blocks@npm:8.4.1" +"@storybook/blocks@npm:8.4.2, @storybook/blocks@npm:^8.4.2": + version: 8.4.2 + resolution: "@storybook/blocks@npm:8.4.2" dependencies: "@storybook/csf": "npm:^0.1.11" "@storybook/icons": "npm:^1.2.12" @@ -11089,21 +10929,21 @@ __metadata: peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta - storybook: ^8.4.1 + storybook: ^8.4.2 peerDependenciesMeta: react: optional: true react-dom: optional: true - checksum: 10/f150697386107c5014b2b38bc8b13a24a82f6777f10c721843f8fcb227a6f02dafb82657613e5a766177732d59ef3df0989f578a4a6477bd2b8d923b4c87612a + checksum: 10/88880e7c13752fe1323cd8eeb93005ab4493c4f024ef3119462dc160e57a985979756a64e0d6e9f374c0f510adcd0e7141d5b7f52bbe255e1c3fbf4ce0cbb896 languageName: node linkType: hard -"@storybook/builder-webpack5@npm:8.4.1": - version: 8.4.1 - resolution: "@storybook/builder-webpack5@npm:8.4.1" +"@storybook/builder-webpack5@npm:8.4.2": + version: 8.4.2 + resolution: "@storybook/builder-webpack5@npm:8.4.2" dependencies: - "@storybook/core-webpack": "npm:8.4.1" + "@storybook/core-webpack": "npm:8.4.2" "@types/node": "npm:^22.0.0" "@types/semver": "npm:^7.3.4" browser-assert: "npm:^1.2.1" @@ -11129,20 +10969,20 @@ __metadata: webpack-hot-middleware: "npm:^2.25.1" webpack-virtual-modules: "npm:^0.6.0" peerDependencies: - storybook: ^8.4.1 + storybook: ^8.4.2 peerDependenciesMeta: typescript: optional: true - checksum: 10/7e5fb86f58b86e943303ce8105701b86e00910d51d160074fca656b5c027025d0fb46f4761f82e0a8849469a7ddb9a8d0dbea7173d509c4bdd174186b00e2032 + checksum: 10/d67458e1337c8e403f6b4914d5f00d99d3dbd0ec2d1e3bdd7f2eb7a9f0c5acc4d78db45e30c6be1fea48b502d37bda46be41508ed258152f97e7008249c95aed languageName: node linkType: hard -"@storybook/components@npm:8.4.1": - version: 8.4.1 - resolution: "@storybook/components@npm:8.4.1" +"@storybook/components@npm:8.4.2": + version: 8.4.2 + resolution: "@storybook/components@npm:8.4.2" peerDependencies: storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 - checksum: 10/fad61e37228974d179ae0ea552089ddf9f60bf2686e70feb900a1682922e5102db6a43c452e1cd4bdad4619b70e2239afbd3944c0edd4b7ab76c96a316886ec6 + checksum: 10/52c7885763f3154215b8f9fda57fe4af62e5194722bca90f35769a74aee411bf552d96455d1c2101404e30b2b0a4ed2c57c21a365ecbf18124a252538e15e83e languageName: node linkType: hard @@ -11164,21 +11004,21 @@ __metadata: languageName: node linkType: hard -"@storybook/core-webpack@npm:8.4.1": - version: 8.4.1 - resolution: "@storybook/core-webpack@npm:8.4.1" +"@storybook/core-webpack@npm:8.4.2": + version: 8.4.2 + resolution: "@storybook/core-webpack@npm:8.4.2" dependencies: "@types/node": "npm:^22.0.0" ts-dedent: "npm:^2.0.0" peerDependencies: - storybook: ^8.4.1 - checksum: 10/58a1916ca5fdc7578207edabca91e4949ddc40e95218d324328acb0ca851b026e73e4591d7f943cb9d2ccaaa7e84fad41cb876d318cc114d929b741cbc586491 + storybook: ^8.4.2 + checksum: 10/8e6d75e70720743bd299855277cbd5a7bb00c286e715050fa8c1c7369d2e4fce7b69cee1a2cd56475760ad3ea3931e4a76c4eb61d8d70a447310414057a6bfb9 languageName: node linkType: hard -"@storybook/core@npm:8.4.1": - version: 8.4.1 - resolution: "@storybook/core@npm:8.4.1" +"@storybook/core@npm:8.4.2": + version: 8.4.2 + resolution: "@storybook/core@npm:8.4.2" dependencies: "@storybook/csf": "npm:^0.1.11" better-opn: "npm:^3.0.2" @@ -11196,18 +11036,18 @@ __metadata: peerDependenciesMeta: prettier: optional: true - checksum: 10/9782c8991e37771a67b5615ee0bac478fdcc4ee323d229a4bb29822783b8d8c7a52ec50926213c88688775a24f12786173fa49453cece5aaabf8796f67bd49a2 + checksum: 10/f7e1b1b50fbe038c5553695086775eca34de4ebee3dabc28b9163f37e348565a50a937231d0eed45291f9d52478c63bdf2065a99ad4826816fcd81e1652c3382 languageName: node linkType: hard -"@storybook/csf-plugin@npm:8.4.1": - version: 8.4.1 - resolution: "@storybook/csf-plugin@npm:8.4.1" +"@storybook/csf-plugin@npm:8.4.2": + version: 8.4.2 + resolution: "@storybook/csf-plugin@npm:8.4.2" dependencies: unplugin: "npm:^1.3.1" peerDependencies: - storybook: ^8.4.1 - checksum: 10/00a37310545e22d06c868ad8740a9757c7a21ac5e5ea0f2251241a284661cac1198974d722f64e5c7ff53e6c674c565f8e2ea3c055adec1ad57cab514be47aba + storybook: ^8.4.2 + checksum: 10/ec787be0a4fe2928a2675fe6bca5799f0bff8c66e50cea7bed198a188b19ee57257266b0255c5226a7da97928758b86c978afecc3ee0e2bb1f21fe0e7fdaf0c5 languageName: node linkType: hard @@ -11237,24 +11077,24 @@ __metadata: languageName: node linkType: hard -"@storybook/instrumenter@npm:8.4.1": - version: 8.4.1 - resolution: "@storybook/instrumenter@npm:8.4.1" +"@storybook/instrumenter@npm:8.4.2": + version: 8.4.2 + resolution: "@storybook/instrumenter@npm:8.4.2" dependencies: "@storybook/global": "npm:^5.0.0" "@vitest/utils": "npm:^2.1.1" peerDependencies: - storybook: ^8.4.1 - checksum: 10/326448124df49418bcca85cb09a0df33d61c328ce237eb1a541b2c70973d3df38a3f70d27ff41442a4c80a8a42be0911354f14970075442eed53b24a11dcd096 + storybook: ^8.4.2 + checksum: 10/b6d48ffe6a1ad1fca0d296438e2114df6631667ccda803595d54c71732d0bb7dad086d5465254ba914f4666363018bf1df48cdc8304ad6b6c7a24b87164f7d95 languageName: node linkType: hard -"@storybook/manager-api@npm:8.4.1": - version: 8.4.1 - resolution: "@storybook/manager-api@npm:8.4.1" +"@storybook/manager-api@npm:8.4.2": + version: 8.4.2 + resolution: "@storybook/manager-api@npm:8.4.2" peerDependencies: storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 - checksum: 10/1df041bc3c51331b769be412fb14dcdb2f5785effee2becd0bf803382f64fbfe13eb9c7ecdade81de7cff624e145e092f3e0309cf7219fb09cbf12ca503c13a1 + checksum: 10/61b8f845f3271c2dd84597a94c2905a785949a2467582663165e476f455f1942b9c3be77a08f5101848d8a75ca23aa9f7db620d81f202d19093af7695d6ca8a0 languageName: node linkType: hard @@ -11276,57 +11116,57 @@ __metadata: languageName: node linkType: hard -"@storybook/preact-webpack5@npm:^8.4.1": - version: 8.4.1 - resolution: "@storybook/preact-webpack5@npm:8.4.1" +"@storybook/preact-webpack5@npm:^8.4.2": + version: 8.4.2 + resolution: "@storybook/preact-webpack5@npm:8.4.2" dependencies: - "@storybook/builder-webpack5": "npm:8.4.1" - "@storybook/preact": "npm:8.4.1" - "@storybook/preset-preact-webpack": "npm:8.4.1" + "@storybook/builder-webpack5": "npm:8.4.2" + "@storybook/preact": "npm:8.4.2" + "@storybook/preset-preact-webpack": "npm:8.4.2" "@types/node": "npm:^22.0.0" peerDependencies: preact: ">=10.0.0" - storybook: ^8.4.1 - checksum: 10/7de49ba02e70b447251a7fca5688c7a020adefe42785ec0da67f5d501f2ed1dac91791a4c42b873b3ecbea785d9a41c1a062d8c34475435dc7492e9325c48337 + storybook: ^8.4.2 + checksum: 10/d44ae4a0afba3cedcb429ad7ea156f68dbf888c035de01b0302e22901ac2a4acc929eebe6e5d846ee5f7a42387cfde6aee24e05925093293e6fa1735849adbfc languageName: node linkType: hard -"@storybook/preact@npm:8.4.1, @storybook/preact@npm:^8.4.1": - version: 8.4.1 - resolution: "@storybook/preact@npm:8.4.1" +"@storybook/preact@npm:8.4.2, @storybook/preact@npm:^8.4.2": + version: 8.4.2 + resolution: "@storybook/preact@npm:8.4.2" dependencies: - "@storybook/components": "npm:8.4.1" + "@storybook/components": "npm:8.4.2" "@storybook/global": "npm:^5.0.0" - "@storybook/manager-api": "npm:8.4.1" - "@storybook/preview-api": "npm:8.4.1" - "@storybook/theming": "npm:8.4.1" + "@storybook/manager-api": "npm:8.4.2" + "@storybook/preview-api": "npm:8.4.2" + "@storybook/theming": "npm:8.4.2" ts-dedent: "npm:^2.0.0" peerDependencies: preact: ^8.0.0||^10.0.0 - storybook: ^8.4.1 - checksum: 10/7bfd378b0d29bbfe3f250101b871b5f30a71b8a6abaa9d741df2de051d3ad515f65f2ed455c2e57e98155019af8a50a0ae48f4045a8a95389e0ab9ae8331f504 + storybook: ^8.4.2 + checksum: 10/6f4f03cee0a1f78eb0be8baba97b60527a31ccbb4b4808115fdeecab91550b6b87d2a54f81937e114292b1c3b447173445e5ef80423970060d882fd0ce5f6fa2 languageName: node linkType: hard -"@storybook/preset-preact-webpack@npm:8.4.1": - version: 8.4.1 - resolution: "@storybook/preset-preact-webpack@npm:8.4.1" +"@storybook/preset-preact-webpack@npm:8.4.2": + version: 8.4.2 + resolution: "@storybook/preset-preact-webpack@npm:8.4.2" dependencies: - "@storybook/core-webpack": "npm:8.4.1" + "@storybook/core-webpack": "npm:8.4.2" "@types/node": "npm:^22.0.0" peerDependencies: preact: ^8.0.0||^10.0.0 - storybook: ^8.4.1 - checksum: 10/a5014d2ad4ef0fb5c0f93c11f0bd9f73776db920ded03e62cf8c6c1cca681c3423b95d77de6f475f4e4d073fe8dfa0f3e1a10b802ed8807d0f2fe80a2e4189b7 + storybook: ^8.4.2 + checksum: 10/0721f6bf4b96ea9b592dbf7e63402696ee689df21bc0e541f65e3e4f2c9a51c6ee43b8b73d18e85cb921847518250ecd0fc777a0ecd85f489cb0c4d736ab72c9 languageName: node linkType: hard -"@storybook/preset-react-webpack@npm:8.4.1": - version: 8.4.1 - resolution: "@storybook/preset-react-webpack@npm:8.4.1" +"@storybook/preset-react-webpack@npm:8.4.2": + version: 8.4.2 + resolution: "@storybook/preset-react-webpack@npm:8.4.2" dependencies: - "@storybook/core-webpack": "npm:8.4.1" - "@storybook/react": "npm:8.4.1" + "@storybook/core-webpack": "npm:8.4.2" + "@storybook/react": "npm:8.4.2" "@storybook/react-docgen-typescript-plugin": "npm:1.0.6--canary.9.0c3f3b7.0" "@types/node": "npm:^22.0.0" "@types/semver": "npm:^7.3.4" @@ -11340,20 +11180,20 @@ __metadata: peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta - storybook: ^8.4.1 + storybook: ^8.4.2 peerDependenciesMeta: typescript: optional: true - checksum: 10/584c6730e3dd5af2787c4da4f4cf1e3e31b916b1d47a9bfb2b0f4c747a07fe6172c5a99b94c82fdd6623b1e7f0eee93e23aa4b116533cb8f66bb6aae9e43c13d + checksum: 10/5c08b8c8d59262fa390ad35214179f17b3ddddd7b0956efd0d73542b6c82771b8e6814ab45c57b7099bd4026b49594106222cd620b34a2871427d59050a13e0b languageName: node linkType: hard -"@storybook/preview-api@npm:8.4.1": - version: 8.4.1 - resolution: "@storybook/preview-api@npm:8.4.1" +"@storybook/preview-api@npm:8.4.2": + version: 8.4.2 + resolution: "@storybook/preview-api@npm:8.4.2" peerDependencies: storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 - checksum: 10/36dee1deb1c6c905fc73854315b5f5d8f4d144e409433fef8885f10e506e2663a528458d88a854968e7de1bebc6bfb1091d7a7e00506344f9dd11b024a63d66f + checksum: 10/5e57c276bc30afd106dbe89b88dd8b4265d538bc4c55d011b6277d24d0210a7b1b9921f7f2403f06ad824fc50b5846d9037803c613a6f437239a667a52841eea languageName: node linkType: hard @@ -11375,86 +11215,86 @@ __metadata: languageName: node linkType: hard -"@storybook/react-dom-shim@npm:8.4.1": - version: 8.4.1 - resolution: "@storybook/react-dom-shim@npm:8.4.1" +"@storybook/react-dom-shim@npm:8.4.2": + version: 8.4.2 + resolution: "@storybook/react-dom-shim@npm:8.4.2" peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta - storybook: ^8.4.1 - checksum: 10/388a1944abc088c01f382323215db50c2a84922101817aa3e303b0b8f4891f554605be07d8ecc72e297e5ba2049ba391ef00077f54d477ef32b1be1205d25869 + storybook: ^8.4.2 + checksum: 10/76c058e1a2397dfc4fcd5a5fe74bc3e389754b1d7149c0ecc53afb5f706926d1ca2a76e7da04990cd500b378e3e09ffaead827808c12d1da73ea73a1973b630f languageName: node linkType: hard -"@storybook/react-webpack5@npm:^8.4.1": - version: 8.4.1 - resolution: "@storybook/react-webpack5@npm:8.4.1" +"@storybook/react-webpack5@npm:^8.4.2": + version: 8.4.2 + resolution: "@storybook/react-webpack5@npm:8.4.2" dependencies: - "@storybook/builder-webpack5": "npm:8.4.1" - "@storybook/preset-react-webpack": "npm:8.4.1" - "@storybook/react": "npm:8.4.1" + "@storybook/builder-webpack5": "npm:8.4.2" + "@storybook/preset-react-webpack": "npm:8.4.2" + "@storybook/react": "npm:8.4.2" "@types/node": "npm:^22.0.0" peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta - storybook: ^8.4.1 + storybook: ^8.4.2 typescript: ">= 4.2.x" peerDependenciesMeta: typescript: optional: true - checksum: 10/ac49f885e256ffce841a621fbcee5d819308015953f219f4e51a1e36199d3568d7d2a9dba164d494f85b5c68fff26e5a3ca036e8120a04fac57d30d69093b417 + checksum: 10/a4f98edcc918e1f0e0f03baf3846fe6f8dcb744873218a9f4ed9c0f4fb813e659b1782060f823c12da4ab66ff7b717be5f51d056650d144d243532f849a7742a languageName: node linkType: hard -"@storybook/react@npm:8.4.1, @storybook/react@npm:^8.4.1": - version: 8.4.1 - resolution: "@storybook/react@npm:8.4.1" +"@storybook/react@npm:8.4.2, @storybook/react@npm:^8.4.2": + version: 8.4.2 + resolution: "@storybook/react@npm:8.4.2" dependencies: - "@storybook/components": "npm:8.4.1" + "@storybook/components": "npm:8.4.2" "@storybook/global": "npm:^5.0.0" - "@storybook/manager-api": "npm:8.4.1" - "@storybook/preview-api": "npm:8.4.1" - "@storybook/react-dom-shim": "npm:8.4.1" - "@storybook/theming": "npm:8.4.1" + "@storybook/manager-api": "npm:8.4.2" + "@storybook/preview-api": "npm:8.4.2" + "@storybook/react-dom-shim": "npm:8.4.2" + "@storybook/theming": "npm:8.4.2" peerDependencies: - "@storybook/test": 8.4.1 + "@storybook/test": 8.4.2 react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta - storybook: ^8.4.1 + storybook: ^8.4.2 typescript: ">= 4.2.x" peerDependenciesMeta: "@storybook/test": optional: true typescript: optional: true - checksum: 10/3734c9b9d2efa2f1c3eda3f38a88ed1207d47c048b5cf330e342c642485c434ea276ce41b32eef6105de062d0d12f83c388c4b50f5b35b879beb352a8ff8dcb6 + checksum: 10/df7dd512d2e4604b7af859f594c058be959495dc0c25467f571f1e6b4e5058c2ee0d3caaed47742e3a602eef871143b1d48aa164646d61923885ebc7eec87b56 languageName: node linkType: hard -"@storybook/test@npm:8.4.1": - version: 8.4.1 - resolution: "@storybook/test@npm:8.4.1" +"@storybook/test@npm:8.4.2": + version: 8.4.2 + resolution: "@storybook/test@npm:8.4.2" dependencies: "@storybook/csf": "npm:^0.1.11" "@storybook/global": "npm:^5.0.0" - "@storybook/instrumenter": "npm:8.4.1" + "@storybook/instrumenter": "npm:8.4.2" "@testing-library/dom": "npm:10.4.0" "@testing-library/jest-dom": "npm:6.5.0" "@testing-library/user-event": "npm:14.5.2" "@vitest/expect": "npm:2.0.5" "@vitest/spy": "npm:2.0.5" peerDependencies: - storybook: ^8.4.1 - checksum: 10/7ab75c8e8d9f25a5fd69a7ac744861c0d37b8b3ba6237a4fecdda3b4fece832b50f30a9220736754677335bf583a58bfeb3fb14a373daba6b237430c24139476 + storybook: ^8.4.2 + checksum: 10/934518e629d2798df10bb892184e18dca0f3ea7b426636cef3f29a12302a3c471b59d808024ea90c58b9e183ce1b3477a0c8827824f7e74111ceaf4518f0212e languageName: node linkType: hard -"@storybook/theming@npm:8.4.1, @storybook/theming@npm:^8.4.1": - version: 8.4.1 - resolution: "@storybook/theming@npm:8.4.1" +"@storybook/theming@npm:8.4.2, @storybook/theming@npm:^8.4.2": + version: 8.4.2 + resolution: "@storybook/theming@npm:8.4.2" peerDependencies: storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 - checksum: 10/a88c8d0e9bebecca73296e0415334f0724682ac14939b854891548ad2195902a42e8af0e3aefbae62bb7775c8ef90037d95586436c8922a461b827004d8fe1b7 + checksum: 10/8d0a6d20d3589815dea0bcdae9255216b8fc5459225871881a52e0fbc94a136a9972bef02c2ec6167ffd8eea24afab68962e01e83a8d4f60d12b4b787b9b23f3 languageName: node linkType: hard @@ -11467,92 +11307,92 @@ __metadata: languageName: node linkType: hard -"@swc/core-darwin-arm64@npm:1.7.42": - version: 1.7.42 - resolution: "@swc/core-darwin-arm64@npm:1.7.42" +"@swc/core-darwin-arm64@npm:1.8.0": + version: 1.8.0 + resolution: "@swc/core-darwin-arm64@npm:1.8.0" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@swc/core-darwin-x64@npm:1.7.42": - version: 1.7.42 - resolution: "@swc/core-darwin-x64@npm:1.7.42" +"@swc/core-darwin-x64@npm:1.8.0": + version: 1.8.0 + resolution: "@swc/core-darwin-x64@npm:1.8.0" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@swc/core-linux-arm-gnueabihf@npm:1.7.42": - version: 1.7.42 - resolution: "@swc/core-linux-arm-gnueabihf@npm:1.7.42" +"@swc/core-linux-arm-gnueabihf@npm:1.8.0": + version: 1.8.0 + resolution: "@swc/core-linux-arm-gnueabihf@npm:1.8.0" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@swc/core-linux-arm64-gnu@npm:1.7.42": - version: 1.7.42 - resolution: "@swc/core-linux-arm64-gnu@npm:1.7.42" +"@swc/core-linux-arm64-gnu@npm:1.8.0": + version: 1.8.0 + resolution: "@swc/core-linux-arm64-gnu@npm:1.8.0" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@swc/core-linux-arm64-musl@npm:1.7.42": - version: 1.7.42 - resolution: "@swc/core-linux-arm64-musl@npm:1.7.42" +"@swc/core-linux-arm64-musl@npm:1.8.0": + version: 1.8.0 + resolution: "@swc/core-linux-arm64-musl@npm:1.8.0" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@swc/core-linux-x64-gnu@npm:1.7.42": - version: 1.7.42 - resolution: "@swc/core-linux-x64-gnu@npm:1.7.42" +"@swc/core-linux-x64-gnu@npm:1.8.0": + version: 1.8.0 + resolution: "@swc/core-linux-x64-gnu@npm:1.8.0" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@swc/core-linux-x64-musl@npm:1.7.42": - version: 1.7.42 - resolution: "@swc/core-linux-x64-musl@npm:1.7.42" +"@swc/core-linux-x64-musl@npm:1.8.0": + version: 1.8.0 + resolution: "@swc/core-linux-x64-musl@npm:1.8.0" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@swc/core-win32-arm64-msvc@npm:1.7.42": - version: 1.7.42 - resolution: "@swc/core-win32-arm64-msvc@npm:1.7.42" +"@swc/core-win32-arm64-msvc@npm:1.8.0": + version: 1.8.0 + resolution: "@swc/core-win32-arm64-msvc@npm:1.8.0" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@swc/core-win32-ia32-msvc@npm:1.7.42": - version: 1.7.42 - resolution: "@swc/core-win32-ia32-msvc@npm:1.7.42" +"@swc/core-win32-ia32-msvc@npm:1.8.0": + version: 1.8.0 + resolution: "@swc/core-win32-ia32-msvc@npm:1.8.0" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@swc/core-win32-x64-msvc@npm:1.7.42": - version: 1.7.42 - resolution: "@swc/core-win32-x64-msvc@npm:1.7.42" +"@swc/core-win32-x64-msvc@npm:1.8.0": + version: 1.8.0 + resolution: "@swc/core-win32-x64-msvc@npm:1.8.0" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"@swc/core@npm:~1.7.42": - version: 1.7.42 - resolution: "@swc/core@npm:1.7.42" - dependencies: - "@swc/core-darwin-arm64": "npm:1.7.42" - "@swc/core-darwin-x64": "npm:1.7.42" - "@swc/core-linux-arm-gnueabihf": "npm:1.7.42" - "@swc/core-linux-arm64-gnu": "npm:1.7.42" - "@swc/core-linux-arm64-musl": "npm:1.7.42" - "@swc/core-linux-x64-gnu": "npm:1.7.42" - "@swc/core-linux-x64-musl": "npm:1.7.42" - "@swc/core-win32-arm64-msvc": "npm:1.7.42" - "@swc/core-win32-ia32-msvc": "npm:1.7.42" - "@swc/core-win32-x64-msvc": "npm:1.7.42" +"@swc/core@npm:~1.8.0": + version: 1.8.0 + resolution: "@swc/core@npm:1.8.0" + dependencies: + "@swc/core-darwin-arm64": "npm:1.8.0" + "@swc/core-darwin-x64": "npm:1.8.0" + "@swc/core-linux-arm-gnueabihf": "npm:1.8.0" + "@swc/core-linux-arm64-gnu": "npm:1.8.0" + "@swc/core-linux-arm64-musl": "npm:1.8.0" + "@swc/core-linux-x64-gnu": "npm:1.8.0" + "@swc/core-linux-x64-musl": "npm:1.8.0" + "@swc/core-win32-arm64-msvc": "npm:1.8.0" + "@swc/core-win32-ia32-msvc": "npm:1.8.0" + "@swc/core-win32-x64-msvc": "npm:1.8.0" "@swc/counter": "npm:^0.1.3" - "@swc/types": "npm:^0.1.13" + "@swc/types": "npm:^0.1.14" peerDependencies: "@swc/helpers": "*" dependenciesMeta: @@ -11579,7 +11419,7 @@ __metadata: peerDependenciesMeta: "@swc/helpers": optional: true - checksum: 10/d8b2782a18a602e33b38c236aaba66a4dd95e5b851ddf3713bfab896c1f5e9cc756ee680c6d25f04b558ebdbb6b87977a145fb788618e5ffc5b30a24f8abb03b + checksum: 10/2e7fb49286545b2b712b8220dbaf0d342636bd4c31763f760dc9822975d8e538e0080f1eb8ae7e74bf9b2eed8200a9525fd210ead573843dabd6f3e388bfb336 languageName: node linkType: hard @@ -11621,12 +11461,12 @@ __metadata: languageName: node linkType: hard -"@swc/types@npm:^0.1.13": - version: 0.1.13 - resolution: "@swc/types@npm:0.1.13" +"@swc/types@npm:^0.1.14": + version: 0.1.14 + resolution: "@swc/types@npm:0.1.14" dependencies: "@swc/counter": "npm:^0.1.3" - checksum: 10/d0a50432917048cc69e30c82d1266e052a8e8d05ab202c5d74a5666be3748da4d2f99aaff46d91c0e3d285cf8f55270f8391cd578066fdecc3865733f8d5e14a + checksum: 10/1ee6cd759f7dd52ea64cbcacc912e2111624a8db0dcfae443604bd9d42b671d9b9570f1eca945dfc21b8850a15d2c0db2aa0e0b85f4bb9782f4acd1eb66dccd1 languageName: node linkType: hard @@ -11687,19 +11527,18 @@ __metadata: languageName: node linkType: hard -"@testing-library/jest-dom@npm:~6.4.8": - version: 6.4.8 - resolution: "@testing-library/jest-dom@npm:6.4.8" +"@testing-library/jest-dom@npm:~6.6.3": + version: 6.6.3 + resolution: "@testing-library/jest-dom@npm:6.6.3" dependencies: "@adobe/css-tools": "npm:^4.4.0" - "@babel/runtime": "npm:^7.9.2" aria-query: "npm:^5.0.0" chalk: "npm:^3.0.0" css.escape: "npm:^1.5.1" dom-accessibility-api: "npm:^0.6.3" lodash: "npm:^4.17.21" redent: "npm:^3.0.0" - checksum: 10/011e5a309e2cfc0c5cee6454427030d9a5d690df212bedcc78c15ee8d23218c3e51be32617ca879f060445ba0ba38e1b8d224b5ab11444ee076c37ed8c1c123a + checksum: 10/1f3427e45870eab9dcc59d6504b780d4a595062fe1687762ae6e67d06a70bf439b40ab64cf58cbace6293a99e3764d4647fdc8300a633b721764f5ce39dade18 languageName: node linkType: hard @@ -12036,10 +11875,10 @@ __metadata: languageName: node linkType: hard -"@types/crypto-js@npm:~4.1.3": - version: 4.1.3 - resolution: "@types/crypto-js@npm:4.1.3" - checksum: 10/66d2153d109ae3b353ad9bd77726323f56d7c252f22f8b36edb9fef5bc80f4765c024fd8102cf6a5c6415fd847565687e7a97eb840979e38030d8c41358fa344 +"@types/crypto-js@npm:~4.2.2": + version: 4.2.2 + resolution: "@types/crypto-js@npm:4.2.2" + checksum: 10/a40fc5a9219fd33f54ba3e094c5e5ab2904d3106681a76f1029bb038976591e9c8959099963bf4474fde21c2d8d00c1f896445206a3a58f85588f9cb1bd96a9a languageName: node linkType: hard @@ -12089,10 +11928,10 @@ __metadata: languageName: node linkType: hard -"@types/d3-color@npm:^2.0.0": - version: 2.0.6 - resolution: "@types/d3-color@npm:2.0.6" - checksum: 10/dd4cdb61577a57f49b464a02e5d65c3f856d922f40092569b6752f624d94571d14489e9d32816e93d96fc71494f4b575b2afcf461d247ec348ce5cde64d62a1b +"@types/d3-color@npm:^3.0.0": + version: 3.1.3 + resolution: "@types/d3-color@npm:3.1.3" + checksum: 10/1cf0f512c09357b25d644ab01b54200be7c9b15c808333b0ccacf767fff36f17520b2fcde9dad45e1bd7ce84befad39b43da42b4fded57680fa2127006ca3ece languageName: node linkType: hard @@ -12113,10 +11952,10 @@ __metadata: languageName: node linkType: hard -"@types/d3-delaunay@npm:^5.3.0": - version: 5.3.4 - resolution: "@types/d3-delaunay@npm:5.3.4" - checksum: 10/b43a26ed2eab890258a6a890a47ec7165e65dd03ec72782376fb19656e75e33ae5cf3ce1496bd566e4ee3dead2dd2f13dedb5f82fc8068b819d7d8c7abd64b20 +"@types/d3-delaunay@npm:^6.0.4": + version: 6.0.4 + resolution: "@types/d3-delaunay@npm:6.0.4" + checksum: 10/cb8d2c9ed0b39ade3107b9792544a745b2de3811a6bd054813e9dc708b1132fbacd796e54c0602c11b3a14458d14487c5276c1affb7c2b9f25fe55fff88d6d25 languageName: node linkType: hard @@ -12212,13 +12051,6 @@ __metadata: languageName: node linkType: hard -"@types/d3-path@npm:^2": - version: 2.0.4 - resolution: "@types/d3-path@npm:2.0.4" - checksum: 10/aa5e429dfb69e1a051530b77cf6383d062645ed313d09848485c30c0518a464aef1db0a1ea5769d31e644a16fc521f4ee2a1ebdb0a445ae0856e3c05e2d8a9f1 - languageName: node - linkType: hard - "@types/d3-polygon@npm:*": version: 3.0.0 resolution: "@types/d3-polygon@npm:3.0.0" @@ -12247,10 +12079,10 @@ __metadata: languageName: node linkType: hard -"@types/d3-scale-chromatic@npm:^2.0.0": - version: 2.0.4 - resolution: "@types/d3-scale-chromatic@npm:2.0.4" - checksum: 10/a038225314ba634f48d3534e7a6f33802a424753d1c1fd8d9531a925b8b26b049f1bca87884577daf5fb6fc05ccc18dc6848b7e47d4e01fe390997481814e560 +"@types/d3-scale-chromatic@npm:^3.0.0": + version: 3.0.3 + resolution: "@types/d3-scale-chromatic@npm:3.0.3" + checksum: 10/cc5488af1136c3f9e28aa3c3ee2dc3e5e843c666f64360fb3870f0b8679cd2ee844edaa5a93504a9665deb98cb3c2ae2257d610c338fa8caa4a31ab6fdeb2f15 languageName: node linkType: hard @@ -12263,12 +12095,12 @@ __metadata: languageName: node linkType: hard -"@types/d3-scale@npm:^3.2.3": - version: 3.3.5 - resolution: "@types/d3-scale@npm:3.3.5" +"@types/d3-scale@npm:^4.0.8": + version: 4.0.8 + resolution: "@types/d3-scale@npm:4.0.8" dependencies: - "@types/d3-time": "npm:^2" - checksum: 10/5e0d95ca15297b05301a329ddf36a90ee6ea6187f4bd8db175647773514d7adedbe05b790ffdf0a88c4fbae2c817300610fe694ad554e8981f434596c123ac26 + "@types/d3-time": "npm:*" + checksum: 10/376e4f2199ee6db70906651587a4521976920fa5eaa847a976c434e7a8171cbfeeab515cc510c5130b1f64fcf95b9750a7fd21dfc0a40fc3398641aa7dd4e7e2 languageName: node linkType: hard @@ -12288,12 +12120,12 @@ __metadata: languageName: node linkType: hard -"@types/d3-shape@npm:^2.0.0": - version: 2.1.7 - resolution: "@types/d3-shape@npm:2.1.7" +"@types/d3-shape@npm:^3.1.6": + version: 3.1.6 + resolution: "@types/d3-shape@npm:3.1.6" dependencies: - "@types/d3-path": "npm:^2" - checksum: 10/28847bb0ebbf044f4ca31bf2042f0bd4d60e2e0b6892ebd35110739816bc08640433cb8b6abbefcfb130d5cf789a0c151cd7375097b169850c603c1fffa44fe5 + "@types/d3-path": "npm:*" + checksum: 10/75abf403ec5b8c11e761256aa6b3546533d61e2e12f15c82bed6b606e963dcdfb9868a2038c46099173c8830423b35ddaf14d1162f96ad9da18a2e90b0fa7d25 languageName: node linkType: hard @@ -12332,13 +12164,6 @@ __metadata: languageName: node linkType: hard -"@types/d3-time@npm:^2": - version: 2.1.4 - resolution: "@types/d3-time@npm:2.1.4" - checksum: 10/a99d4b9cc23882a6197054932db1e26d93a9d4811fdd6a97339b7781c0afa2863db01a3631ce509077502d65cdc24c282a8d8649a2dc74ef2753faf5a7eeba92 - languageName: node - linkType: hard - "@types/d3-timer@npm:*": version: 3.0.0 resolution: "@types/d3-timer@npm:3.0.0" @@ -12516,7 +12341,7 @@ __metadata: languageName: node linkType: hard -"@types/express@npm:*, @types/express@npm:^4.16.1": +"@types/express@npm:*": version: 4.17.20 resolution: "@types/express@npm:4.17.20" dependencies: @@ -12661,15 +12486,6 @@ __metadata: languageName: node linkType: hard -"@types/is-stream@npm:^1.1.0": - version: 1.1.0 - resolution: "@types/is-stream@npm:1.1.0" - dependencies: - "@types/node": "npm:*" - checksum: 10/03ca9635bdea282da17135d297085c325e965af09fecaa0678bb9c5302b9ffa61d089a5056ad4980b6b1871dfd9e6420f0d35da9729fcffeee6bd6348e7c9010 - languageName: node - linkType: hard - "@types/istanbul-lib-coverage@npm:*, @types/istanbul-lib-coverage@npm:^2.0.0, @types/istanbul-lib-coverage@npm:^2.0.1": version: 2.0.4 resolution: "@types/istanbul-lib-coverage@npm:2.0.4" @@ -12786,12 +12602,12 @@ __metadata: languageName: node linkType: hard -"@types/jsonwebtoken@npm:^8.3.7": - version: 8.5.9 - resolution: "@types/jsonwebtoken@npm:8.5.9" +"@types/jsonwebtoken@npm:^9": + version: 9.0.7 + resolution: "@types/jsonwebtoken@npm:9.0.7" dependencies: "@types/node": "npm:*" - checksum: 10/4654f8429e943eeb0fa968f15137adc1be35930e33b641cce39e8876dca6ddd0c4c7308384d042963caaf2e15efe74303269bc46c0a7a07ec4a9a2242a4bbe9e + checksum: 10/4c0cffc488ba200765b50004de5e046c55360121a91ad9520d904e303cdd217b3f77b51b6ba8b9cbdd03d73876d546cbd0d9992d6e205d97decba918aee5b395 languageName: node linkType: hard @@ -12802,14 +12618,7 @@ __metadata: languageName: node linkType: hard -"@types/katex@npm:^0.14.0": - version: 0.14.0 - resolution: "@types/katex@npm:0.14.0" - checksum: 10/f7a617fca68f91e17dcebdc5beff2998c807c1a84b55d29e3317ef389b1058b85750cb5df2e98eb9a220ee8fbdabf5aba4d5abf48206826ee2ad2648f4a79aa7 - languageName: node - linkType: hard - -"@types/katex@npm:~0.16.7": +"@types/katex@npm:^0.16.7, @types/katex@npm:~0.16.7": version: 0.16.7 resolution: "@types/katex@npm:0.16.7" checksum: 10/4fd15d93553be97c02c064e16be18d7ccbabf66ec72a9dc7fd5bfa47f0c7581da2f942f693c7cb59499de4c843c2189796e49c9647d336cbd52b777b6722a95a @@ -13108,7 +12917,7 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:>=12, @types/node@npm:>=12.0.0, @types/node@npm:>=18.0.0, @types/node@npm:>=8.9.0": +"@types/node@npm:*, @types/node@npm:>=18.0.0": version: 20.8.4 resolution: "@types/node@npm:20.8.4" dependencies: @@ -13135,6 +12944,15 @@ __metadata: languageName: node linkType: hard +"@types/node@npm:>=18": + version: 22.9.0 + resolution: "@types/node@npm:22.9.0" + dependencies: + undici-types: "npm:~6.19.8" + checksum: 10/a7df3426891868b0f5fb03e46aeddd8446178233521c624a44531c92a040cf08a82d8235f7e1e02af731fd16984665d4d71f3418caf9c2788313b10f040d615d + languageName: node + linkType: hard + "@types/node@npm:^12.7.1": version: 12.20.55 resolution: "@types/node@npm:12.20.55" @@ -13158,7 +12976,7 @@ __metadata: languageName: node linkType: hard -"@types/nodemailer@npm:*, @types/nodemailer@npm:^6.4.15": +"@types/nodemailer@npm:*": version: 6.4.15 resolution: "@types/nodemailer@npm:6.4.15" dependencies: @@ -13167,6 +12985,15 @@ __metadata: languageName: node linkType: hard +"@types/nodemailer@npm:^6.4.16": + version: 6.4.16 + resolution: "@types/nodemailer@npm:6.4.16" + dependencies: + "@types/node": "npm:*" + checksum: 10/38e612fef3963c7ae7563f039a8b26d8d4371a7feeedaf38a534f889094f6727fb0d52f565902b01099cfe0b4be7956125ebdae312b9ab3905929df5c815bd95 + languageName: node + linkType: hard + "@types/normalize-package-data@npm:^2.4.0": version: 2.4.1 resolution: "@types/normalize-package-data@npm:2.4.1" @@ -13174,12 +13001,12 @@ __metadata: languageName: node linkType: hard -"@types/oauth2-server@npm:^3.0.17": - version: 3.0.17 - resolution: "@types/oauth2-server@npm:3.0.17" +"@types/oauth2-server@npm:^3.0.18": + version: 3.0.18 + resolution: "@types/oauth2-server@npm:3.0.18" dependencies: "@types/express": "npm:*" - checksum: 10/469f40fe38006d8de142f25536a083f234f8ba2801062604b97402f7890b6262aaf9914e76447dbab54c097ea9f29e1253dfe844d6b612059150c423dccc0888 + checksum: 10/885cd132cddd49e13461feba1dbb6f7725172d06ae5e93b9c07d9db8e6a2e36e5e6f3eb4c245bba8a0e697894f6e899e2abc8982200e697fa3d8fa69327b939c languageName: node linkType: hard @@ -13190,13 +13017,6 @@ __metadata: languageName: node linkType: hard -"@types/p-queue@npm:^2.3.2": - version: 2.3.2 - resolution: "@types/p-queue@npm:2.3.2" - checksum: 10/5eb36eafdf2e0522565ec8de704a02a12cdb948cace2556a59e2e394858d121952aa6ef1e8036e883509797f28cd90112cd3691d8bacbec9015ee2e9c28052bb - languageName: node - linkType: hard - "@types/parse-json@npm:^4.0.0": version: 4.0.0 resolution: "@types/parse-json@npm:4.0.0" @@ -13246,13 +13066,6 @@ __metadata: languageName: node linkType: hard -"@types/promise.allsettled@npm:^1.0.3": - version: 1.0.4 - resolution: "@types/promise.allsettled@npm:1.0.4" - checksum: 10/239fd638f8d96153759c68af486cbe643f1025f05a32a6a3f66471090b8aaf04c4e88bc345f6170d3870f9d47ee262967640cdf9f776ae4a3e53b26c98e90523 - languageName: node - linkType: hard - "@types/prop-types@npm:*, @types/prop-types@npm:^15.7.2": version: 15.7.11 resolution: "@types/prop-types@npm:15.7.11" @@ -13322,15 +13135,6 @@ __metadata: languageName: node linkType: hard -"@types/react-lifecycles-compat@npm:^3.0.1": - version: 3.0.4 - resolution: "@types/react-lifecycles-compat@npm:3.0.4" - dependencies: - "@types/react": "npm:*" - checksum: 10/504665a1a83be43ab43cbd3d19fd94d0de6634543f06351cce80c844628048650f2cf063048e5dc39effdf0053565ae60a04427e79d094714d6aeb84d5c9643e - languageName: node - linkType: hard - "@types/react-redux@npm:^7.1.20": version: 7.1.25 resolution: "@types/react-redux@npm:7.1.25" @@ -13520,10 +13324,10 @@ __metadata: languageName: node linkType: hard -"@types/stack-trace@npm:0.0.29": - version: 0.0.29 - resolution: "@types/stack-trace@npm:0.0.29" - checksum: 10/7316911982deb29fe89bebd87f2e00493915af8271834c098c0ae7fdebb01613db92b567d087a8fef4d1fd7afd945f3bad30ed411a614efa119e6ae2183ae977 +"@types/stack-trace@npm:0.0.33": + version: 0.0.33 + resolution: "@types/stack-trace@npm:0.0.33" + checksum: 10/cec5fbbe3bdcdef82763f917e99ca35a1b92ac96aa7982d09548072c5eff219d8216cf75f1ccfeec9686c91a035cc0d55dda6a76a222022616de275dc5d3a8c1 languageName: node linkType: hard @@ -13632,13 +13436,6 @@ __metadata: languageName: node linkType: hard -"@types/tsscmp@npm:^1.0.0": - version: 1.0.0 - resolution: "@types/tsscmp@npm:1.0.0" - checksum: 10/64855ef7282ee4cdd0d9066924b358c8d41e7771699d30b1cc0a32dd516431893f2da7bdc55fdbb023c66effcb3aad9406ec2a90922d58a1152965ca7412356b - languageName: node - linkType: hard - "@types/ua-parser-js@npm:^0.7.39": version: 0.7.39 resolution: "@types/ua-parser-js@npm:0.7.39" @@ -13721,12 +13518,12 @@ __metadata: languageName: node linkType: hard -"@types/ws@npm:^7.4.7": - version: 7.4.7 - resolution: "@types/ws@npm:7.4.7" +"@types/ws@npm:^8, @types/ws@npm:^8.5.13": + version: 8.5.13 + resolution: "@types/ws@npm:8.5.13" dependencies: "@types/node": "npm:*" - checksum: 10/5236b6c54817bdf17674337db5776bb34a876b77a90d885d0f70084c9d453cc2f21703207cc1147d33a9e49a4306773830fbade4729b01ffe33ef0c82cd4c701 + checksum: 10/21369beafa75c91ae3b00d3a2671c7408fceae1d492ca2abd5ac7c8c8bf4596d513c1599ebbddeae82c27c4a2d248976d0d714c4b3d34362b2ae35b964e2e637 languageName: node linkType: hard @@ -13739,15 +13536,6 @@ __metadata: languageName: node linkType: hard -"@types/ws@npm:^8.5.13": - version: 8.5.13 - resolution: "@types/ws@npm:8.5.13" - dependencies: - "@types/node": "npm:*" - checksum: 10/21369beafa75c91ae3b00d3a2671c7408fceae1d492ca2abd5ac7c8c8bf4596d513c1599ebbddeae82c27c4a2d248976d0d714c4b3d34362b2ae35b964e2e637 - languageName: node - linkType: hard - "@types/xml-crypto@npm:~1.4.6": version: 1.4.6 resolution: "@types/xml-crypto@npm:1.4.6" @@ -13861,6 +13649,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/scope-manager@npm:5.62.0": + version: 5.62.0 + resolution: "@typescript-eslint/scope-manager@npm:5.62.0" + dependencies: + "@typescript-eslint/types": "npm:5.62.0" + "@typescript-eslint/visitor-keys": "npm:5.62.0" + checksum: 10/e827770baa202223bc0387e2fd24f630690809e460435b7dc9af336c77322290a770d62bd5284260fa881c86074d6a9fd6c97b07382520b115f6786b8ed499da + languageName: node + linkType: hard + "@typescript-eslint/scope-manager@npm:8.11.0": version: 8.11.0 resolution: "@typescript-eslint/scope-manager@npm:8.11.0" @@ -13871,6 +13669,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/scope-manager@npm:8.12.2": + version: 8.12.2 + resolution: "@typescript-eslint/scope-manager@npm:8.12.2" + dependencies: + "@typescript-eslint/types": "npm:8.12.2" + "@typescript-eslint/visitor-keys": "npm:8.12.2" + checksum: 10/a2cd6ad4b31f4d0ca6f94c4df8a94bdee762abd556686817ab4143d80a27506f43fbf96769b44e698d573784a464bfd78e0cbc17ac61c36a868e02311c754ce1 + languageName: node + linkType: hard + "@typescript-eslint/type-utils@npm:5.60.1": version: 5.60.1 resolution: "@typescript-eslint/type-utils@npm:5.60.1" @@ -13902,6 +13710,13 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/types@npm:5.62.0": + version: 5.62.0 + resolution: "@typescript-eslint/types@npm:5.62.0" + checksum: 10/24e8443177be84823242d6729d56af2c4b47bfc664dd411a1d730506abf2150d6c31bdefbbc6d97c8f91043e3a50e0c698239dcb145b79bb6b0c34469aaf6c45 + languageName: node + linkType: hard + "@typescript-eslint/types@npm:8.11.0": version: 8.11.0 resolution: "@typescript-eslint/types@npm:8.11.0" @@ -13909,6 +13724,13 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/types@npm:8.12.2": + version: 8.12.2 + resolution: "@typescript-eslint/types@npm:8.12.2" + checksum: 10/57981e5fa45b03a0398ffb82418fdb716f476aa0b9c17d96edeb7fd3e3f4a720466868af7c2a02ddca65c27e70bfaff50c523b2a570582c4645a2702e17dc94a + languageName: node + linkType: hard + "@typescript-eslint/typescript-estree@npm:5.58.0": version: 5.58.0 resolution: "@typescript-eslint/typescript-estree@npm:5.58.0" @@ -13945,6 +13767,24 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/typescript-estree@npm:5.62.0": + version: 5.62.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.62.0" + dependencies: + "@typescript-eslint/types": "npm:5.62.0" + "@typescript-eslint/visitor-keys": "npm:5.62.0" + debug: "npm:^4.3.4" + globby: "npm:^11.1.0" + is-glob: "npm:^4.0.3" + semver: "npm:^7.3.7" + tsutils: "npm:^3.21.0" + peerDependenciesMeta: + typescript: + optional: true + checksum: 10/06c975eb5f44b43bd19fadc2e1023c50cf87038fe4c0dd989d4331c67b3ff509b17fa60a3251896668ab4d7322bdc56162a9926971218d2e1a1874d2bef9a52e + languageName: node + linkType: hard + "@typescript-eslint/typescript-estree@npm:8.11.0": version: 8.11.0 resolution: "@typescript-eslint/typescript-estree@npm:8.11.0" @@ -13964,7 +13804,26 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.60.1, @typescript-eslint/utils@npm:^5.10.0, @typescript-eslint/utils@npm:^5.58.0": +"@typescript-eslint/typescript-estree@npm:8.12.2": + version: 8.12.2 + resolution: "@typescript-eslint/typescript-estree@npm:8.12.2" + dependencies: + "@typescript-eslint/types": "npm:8.12.2" + "@typescript-eslint/visitor-keys": "npm:8.12.2" + debug: "npm:^4.3.4" + fast-glob: "npm:^3.3.2" + is-glob: "npm:^4.0.3" + minimatch: "npm:^9.0.4" + semver: "npm:^7.6.0" + ts-api-utils: "npm:^1.3.0" + peerDependenciesMeta: + typescript: + optional: true + checksum: 10/9995929ec4b66afa53d52c16f5cecd7c9aa45994f943c41e9ec91fe178593e83d9049ff056fe2638c3cf7da01476861eff0dc3cb76c314cc130458d3f828930d + languageName: node + linkType: hard + +"@typescript-eslint/utils@npm:5.60.1": version: 5.60.1 resolution: "@typescript-eslint/utils@npm:5.60.1" dependencies: @@ -13982,6 +13841,38 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/utils@npm:^5.62.0": + version: 5.62.0 + resolution: "@typescript-eslint/utils@npm:5.62.0" + dependencies: + "@eslint-community/eslint-utils": "npm:^4.2.0" + "@types/json-schema": "npm:^7.0.9" + "@types/semver": "npm:^7.3.12" + "@typescript-eslint/scope-manager": "npm:5.62.0" + "@typescript-eslint/types": "npm:5.62.0" + "@typescript-eslint/typescript-estree": "npm:5.62.0" + eslint-scope: "npm:^5.1.1" + semver: "npm:^7.3.7" + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + checksum: 10/15ef13e43998a082b15f85db979f8d3ceb1f9ce4467b8016c267b1738d5e7cdb12aa90faf4b4e6dd6486c236cf9d33c463200465cf25ff997dbc0f12358550a1 + languageName: node + linkType: hard + +"@typescript-eslint/utils@npm:^6.0.0 || ^7.0.0 || ^8.0.0": + version: 8.12.2 + resolution: "@typescript-eslint/utils@npm:8.12.2" + dependencies: + "@eslint-community/eslint-utils": "npm:^4.4.0" + "@typescript-eslint/scope-manager": "npm:8.12.2" + "@typescript-eslint/types": "npm:8.12.2" + "@typescript-eslint/typescript-estree": "npm:8.12.2" + peerDependencies: + eslint: ^8.57.0 || ^9.0.0 + checksum: 10/4588866ca43314692a0e685d8936c470dca4e6d119a4a1adefbc2fd54682ff081bc21d60bf4e8077d3668aa680bada851b88566264d09c92a840fe2e4feb331b + languageName: node + linkType: hard + "@typescript-eslint/utils@npm:^8.8.1": version: 8.11.0 resolution: "@typescript-eslint/utils@npm:8.11.0" @@ -14016,6 +13907,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/visitor-keys@npm:5.62.0": + version: 5.62.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.62.0" + dependencies: + "@typescript-eslint/types": "npm:5.62.0" + eslint-visitor-keys: "npm:^3.3.0" + checksum: 10/dc613ab7569df9bbe0b2ca677635eb91839dfb2ca2c6fa47870a5da4f160db0b436f7ec0764362e756d4164e9445d49d5eb1ff0b87f4c058946ae9d8c92eb388 + languageName: node + linkType: hard + "@typescript-eslint/visitor-keys@npm:8.11.0": version: 8.11.0 resolution: "@typescript-eslint/visitor-keys@npm:8.11.0" @@ -14026,6 +13927,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/visitor-keys@npm:8.12.2": + version: 8.12.2 + resolution: "@typescript-eslint/visitor-keys@npm:8.12.2" + dependencies: + "@typescript-eslint/types": "npm:8.12.2" + eslint-visitor-keys: "npm:^3.4.3" + checksum: 10/42795ad1c71520a367e2b53c3511b6cf922dcee05d61f6b0ec56b71c0b89a58889e0c3282b1bb13befc69df07204d0e4e053436d0c2b808460ce310b58a2a92e + languageName: node + linkType: hard + "@ungap/promise-all-settled@npm:1.1.2": version: 1.1.2 resolution: "@ungap/promise-all-settled@npm:1.1.2" @@ -14498,6 +14409,16 @@ __metadata: languageName: node linkType: hard +"accepts@npm:^2.0.0": + version: 2.0.0 + resolution: "accepts@npm:2.0.0" + dependencies: + mime-types: "npm:^3.0.0" + negotiator: "npm:^1.0.0" + checksum: 10/ea1343992b40b2bfb3a3113fa9c3c2f918ba0f9197ae565c48d3f84d44b174f6b1d5cd9989decd7655963eb03a272abc36968cc439c2907f999bd5ef8653d5a7 + languageName: node + linkType: hard + "accepts@npm:~1.3.4, accepts@npm:~1.3.5, accepts@npm:~1.3.8": version: 1.3.8 resolution: "accepts@npm:1.3.8" @@ -15098,7 +15019,14 @@ __metadata: languageName: node linkType: hard -"array-includes@npm:^3.1.4, array-includes@npm:^3.1.6, array-includes@npm:^3.1.8": +"array-flatten@npm:3.0.0": + version: 3.0.0 + resolution: "array-flatten@npm:3.0.0" + checksum: 10/e1b11b51c0e0f0b1315ddab1d8e1760bbc76b4387290f73232d71195aa93e3f55179c434cac48f2c1446c614758b073b059bb0b2b545b8f0ec4af0cae9dc4371 + languageName: node + linkType: hard + +"array-includes@npm:^3.1.6, array-includes@npm:^3.1.8": version: 3.1.8 resolution: "array-includes@npm:3.1.8" dependencies: @@ -15149,7 +15077,35 @@ __metadata: languageName: node linkType: hard -"array.prototype.flat@npm:^1.2.5, array.prototype.flat@npm:^1.3.1": +"array.prototype.findlast@npm:^1.2.5": + version: 1.2.5 + resolution: "array.prototype.findlast@npm:1.2.5" + dependencies: + call-bind: "npm:^1.0.7" + define-properties: "npm:^1.2.1" + es-abstract: "npm:^1.23.2" + es-errors: "npm:^1.3.0" + es-object-atoms: "npm:^1.0.0" + es-shim-unscopables: "npm:^1.0.2" + checksum: 10/7dffcc665aa965718ad6de7e17ac50df0c5e38798c0a5bf9340cf24feb8594df6ec6f3fcbe714c1577728a1b18b5704b15669474b27bceeca91ef06ce2a23c31 + languageName: node + linkType: hard + +"array.prototype.findlastindex@npm:^1.2.5": + version: 1.2.5 + resolution: "array.prototype.findlastindex@npm:1.2.5" + dependencies: + call-bind: "npm:^1.0.7" + define-properties: "npm:^1.2.1" + es-abstract: "npm:^1.23.2" + es-errors: "npm:^1.3.0" + es-object-atoms: "npm:^1.0.0" + es-shim-unscopables: "npm:^1.0.2" + checksum: 10/7c5c821f357cd53ab6cc305de8086430dd8d7a2485db87b13f843e868055e9582b1fd338f02338f67fc3a1603ceaf9610dd2a470b0b506f9d18934780f95b246 + languageName: node + linkType: hard + +"array.prototype.flat@npm:^1.3.1, array.prototype.flat@npm:^1.3.2": version: 1.3.2 resolution: "array.prototype.flat@npm:1.3.2" dependencies: @@ -15161,7 +15117,7 @@ __metadata: languageName: node linkType: hard -"array.prototype.flatmap@npm:^1.3.1, array.prototype.flatmap@npm:^1.3.2": +"array.prototype.flatmap@npm:^1.3.2": version: 1.3.2 resolution: "array.prototype.flatmap@npm:1.3.2" dependencies: @@ -15173,20 +15129,7 @@ __metadata: languageName: node linkType: hard -"array.prototype.map@npm:^1.0.5": - version: 1.0.6 - resolution: "array.prototype.map@npm:1.0.6" - dependencies: - call-bind: "npm:^1.0.2" - define-properties: "npm:^1.2.0" - es-abstract: "npm:^1.22.1" - es-array-method-boxes-properly: "npm:^1.0.0" - is-string: "npm:^1.0.7" - checksum: 10/9af3eea249848fc092b8aa8f2e8d62108ebe67cb4b969f3faf7cb4729124a11d215399dfc0330fc9102b942015355004d834da8116ba4a0edce33699cbaccbc8 - languageName: node - linkType: hard - -"array.prototype.tosorted@npm:^1.1.1": +"array.prototype.tosorted@npm:^1.1.4": version: 1.1.4 resolution: "array.prototype.tosorted@npm:1.1.4" dependencies: @@ -16084,6 +16027,24 @@ __metadata: languageName: node linkType: hard +"body-parser@npm:^2.0.1": + version: 2.0.2 + resolution: "body-parser@npm:2.0.2" + dependencies: + bytes: "npm:3.1.2" + content-type: "npm:~1.0.5" + debug: "npm:3.1.0" + destroy: "npm:1.2.0" + http-errors: "npm:2.0.0" + iconv-lite: "npm:0.5.2" + on-finished: "npm:2.4.1" + qs: "npm:6.13.0" + raw-body: "npm:^3.0.0" + type-is: "npm:~1.6.18" + checksum: 10/3b381210daa9bbe90b6dc21fa9d4580b6842f7620437ec89c2522461150ceea11701ed6d7b23876d61056e9d64ee66a29ce00c0ef252a810edf4d7d45aa94455 + languageName: node + linkType: hard + "bonjour-service@npm:^1.2.1": version: 1.2.1 resolution: "bonjour-service@npm:1.2.1" @@ -17471,7 +17432,7 @@ __metadata: languageName: node linkType: hard -"color-name@npm:^1.0.0, color-name@npm:^1.1.4, color-name@npm:~1.1.4": +"color-name@npm:^1.0.0, color-name@npm:~1.1.4": version: 1.1.4 resolution: "color-name@npm:1.1.4" checksum: 10/b0445859521eb4021cd0fb0cc1a75cecf67fceecae89b63f62b201cca8d345baf8b952c966862a9d9a2632987d4f6581f0ec8d957dfacece86f0a7919316f610 @@ -17792,7 +17753,16 @@ __metadata: languageName: node linkType: hard -"content-type@npm:~1.0.4, content-type@npm:~1.0.5": +"content-disposition@npm:^1.0.0": + version: 1.0.0 + resolution: "content-disposition@npm:1.0.0" + dependencies: + safe-buffer: "npm:5.2.1" + checksum: 10/0dcc1a2d7874526b0072df3011b134857b49d97a3bc135bb464a299525d4972de6f5f464fd64da6c4d8406d26a1ffb976f62afaffef7723b1021a44498d10e08 + languageName: node + linkType: hard + +"content-type@npm:^1.0.5, content-type@npm:~1.0.4, content-type@npm:~1.0.5": version: 1.0.5 resolution: "content-type@npm:1.0.5" checksum: 10/585847d98dc7fb8035c02ae2cb76c7a9bd7b25f84c447e5ed55c45c2175e83617c8813871b4ee22f368126af6b2b167df655829007b21aa10302873ea9c62662 @@ -17839,6 +17809,13 @@ __metadata: languageName: node linkType: hard +"cookie-signature@npm:^1.2.1": + version: 1.2.2 + resolution: "cookie-signature@npm:1.2.2" + checksum: 10/be44a3c9a56f3771aea3a8bd8ad8f0a8e2679bcb967478267f41a510b4eb5ec55085386ba79c706c4ac21605ca76f4251973444b90283e0eb3eeafe8a92c7708 + languageName: node + linkType: hard + "cookie@npm:0.7.1": version: 0.7.1 resolution: "cookie@npm:0.7.1" @@ -18354,15 +18331,6 @@ __metadata: languageName: node linkType: hard -"cssesc@npm:^2.0.0": - version: 2.0.0 - resolution: "cssesc@npm:2.0.0" - bin: - cssesc: bin/cssesc - checksum: 10/330239463b5e2963382ffc8ebd5664bc962672f3dae8459837e0f1dfbd1ac60179326878c0403ec41e1e5d8e23cf3d35462213c89987bf5be9d34b39b86c9636 - languageName: node - linkType: hard - "cssesc@npm:^3.0.0": version: 3.0.0 resolution: "cssesc@npm:3.0.0" @@ -18524,7 +18492,7 @@ __metadata: languageName: node linkType: hard -"d3-array@npm:2, d3-array@npm:^2.3.0": +"d3-array@npm:2": version: 2.12.1 resolution: "d3-array@npm:2.12.1" dependencies: @@ -18533,10 +18501,12 @@ __metadata: languageName: node linkType: hard -"d3-color@npm:1 - 2": - version: 2.0.0 - resolution: "d3-color@npm:2.0.0" - checksum: 10/f8902fa788320e7fc6ff49254e22b4d1b22d2eef5d7c2df36d180e202bdc7fc1a2a3daefbc0cb69b3e0cf6cd331704e044568e3ded70037f39a5a50f6164238d +"d3-array@npm:2 - 3, d3-array@npm:2.10.0 - 3": + version: 3.2.4 + resolution: "d3-array@npm:3.2.4" + dependencies: + internmap: "npm:1 - 2" + checksum: 10/5800c467f89634776a5977f6dae3f4e127d91be80f1d07e3e6e35303f9de93e6636d014b234838eea620f7469688d191b3f41207a30040aab750a63c97ec1d7c languageName: node linkType: hard @@ -18547,12 +18517,12 @@ __metadata: languageName: node linkType: hard -"d3-delaunay@npm:^5.3.0": - version: 5.3.0 - resolution: "d3-delaunay@npm:5.3.0" +"d3-delaunay@npm:^6.0.4": + version: 6.0.4 + resolution: "d3-delaunay@npm:6.0.4" dependencies: - delaunator: "npm:4" - checksum: 10/27515c9d7f8b065edcc49e596177461cf3bb521eb06b14e051b02ba07d2cadd0a1586e1289fa63da41d82574f3410b13fdd64d2f45d8cbe964d29c46cfc24ce1 + delaunator: "npm:5" + checksum: 10/4588e2872d4154daaf2c3f34fefe74e43b909cc460238a7b02823907ca6dd109f2c488c57c8551f1a2607fe4b44fdf24e3a190cea29bca70ef5606678dd9e2de languageName: node linkType: hard @@ -18580,10 +18550,10 @@ __metadata: languageName: node linkType: hard -"d3-format@npm:1 - 2": - version: 2.0.0 - resolution: "d3-format@npm:2.0.0" - checksum: 10/7f87226c4c649889d5d3a19fd404b4c74d4468a2a80d91c31fd149bb8b1091ed315bc2b0233f9c3346fe2d6cdc083fb1c3b4053b02d286c695edbf9bd4819019 +"d3-format@npm:1 - 3": + version: 3.1.0 + resolution: "d3-format@npm:3.1.0" + checksum: 10/a0fe23d2575f738027a3db0ce57160e5a473ccf24808c1ed46d45ef4f3211076b34a18b585547d34e365e78dcc26dd4ab15c069731fc4b1c07a26bfced09ea31 languageName: node linkType: hard @@ -18594,16 +18564,7 @@ __metadata: languageName: node linkType: hard -"d3-interpolate@npm:1 - 2, d3-interpolate@npm:1.2.0 - 2": - version: 2.0.1 - resolution: "d3-interpolate@npm:2.0.1" - dependencies: - d3-color: "npm:1 - 2" - checksum: 10/2f59f311ea1bff8b8a5e2834752b7b7515ac2428b15ea2b8af49bdb0f13489332e6068c7f1e663ef3f01743552be15686ddc7ba51b8d13e4f9d94c860b1163a4 - languageName: node - linkType: hard - -"d3-interpolate@npm:1 - 3, d3-interpolate@npm:^3.0.1": +"d3-interpolate@npm:1 - 3, d3-interpolate@npm:1.2.0 - 3, d3-interpolate@npm:^3.0.1": version: 3.0.1 resolution: "d3-interpolate@npm:3.0.1" dependencies: @@ -18612,20 +18573,10 @@ __metadata: languageName: node linkType: hard -"d3-path@npm:1": - version: 1.0.9 - resolution: "d3-path@npm:1.0.9" - checksum: 10/6ce1747837ea2a449d9ea32e169a382978ab09a4805eb408feb6bbc12cb5f5f6ce29aefc252dd9a815d420f4813d672f75578b78b3bbaf7811f54d8c7f93fd11 - languageName: node - linkType: hard - -"d3-scale-chromatic@npm:^2.0.0": - version: 2.0.0 - resolution: "d3-scale-chromatic@npm:2.0.0" - dependencies: - d3-color: "npm:1 - 2" - d3-interpolate: "npm:1 - 2" - checksum: 10/f31c339c000e0cfd4149a564ee555b2a3d1f3e5bed533de866ce20b150b2bcfb0237ee89044af9068b9c6eed83114eca5b34718c6873470980fde9ec5bb8011e +"d3-path@npm:^3.1.0": + version: 3.1.0 + resolution: "d3-path@npm:3.1.0" + checksum: 10/8e97a9ab4930a05b18adda64cf4929219bac913a5506cf8585631020253b39309549632a5cbeac778c0077994442ddaaee8316ee3f380e7baf7566321b84e76a languageName: node linkType: hard @@ -18639,16 +18590,16 @@ __metadata: languageName: node linkType: hard -"d3-scale@npm:^3.2.3": - version: 3.3.0 - resolution: "d3-scale@npm:3.3.0" +"d3-scale@npm:^4.0.2": + version: 4.0.2 + resolution: "d3-scale@npm:4.0.2" dependencies: - d3-array: "npm:^2.3.0" - d3-format: "npm:1 - 2" - d3-interpolate: "npm:1.2.0 - 2" - d3-time: "npm:^2.1.1" - d3-time-format: "npm:2 - 3" - checksum: 10/54eea262b5aada3b23983e2ee299df7f4afee693c564174ef3755510c5c9c505b431e5f63a51e1080827002a17477c28e8a39326300a9f68360834125fffdf37 + d3-array: "npm:2.10.0 - 3" + d3-format: "npm:1 - 3" + d3-interpolate: "npm:1.2.0 - 3" + d3-time: "npm:2.1.1 - 3" + d3-time-format: "npm:2 - 4" + checksum: 10/e2dc4243586eae2a0fdf91de1df1a90d51dfacb295933f0ca7e9184c31203b01436bef69906ad40f1100173a5e6197ae753cb7b8a1a8fcfda43194ea9cad6493 languageName: node linkType: hard @@ -18659,16 +18610,25 @@ __metadata: languageName: node linkType: hard -"d3-shape@npm:^1.3.5": - version: 1.3.7 - resolution: "d3-shape@npm:1.3.7" +"d3-shape@npm:^3.2.0": + version: 3.2.0 + resolution: "d3-shape@npm:3.2.0" + dependencies: + d3-path: "npm:^3.1.0" + checksum: 10/2e861f4d4781ee8abd85d2b435f848d667479dcf01a4e0db3a06600a5bdeddedb240f88229ec7b3bf7fa300c2b3526faeaf7e75f9a24dbf4396d3cc5358ff39d + languageName: node + linkType: hard + +"d3-time-format@npm:2 - 4": + version: 4.1.0 + resolution: "d3-time-format@npm:4.1.0" dependencies: - d3-path: "npm:1" - checksum: 10/1e40fdcfdc8edc9c53a77a6aaea2dbf31bf06df12ebd66cc8d91f76bbde753049ad21dfee0577f7dc5d0a4468554ede4783f6df7d809e291745334dba977c09e + d3-time: "npm:1 - 3" + checksum: 10/ffc0959258fbb90e3890bfb31b43b764f51502b575e87d0af2c85b85ac379120d246914d07fca9f533d1bcedc27b2841d308a00fd64848c3e2cad9eff5c9a0aa languageName: node linkType: hard -"d3-time-format@npm:2 - 3, d3-time-format@npm:^3.0.0": +"d3-time-format@npm:^3.0.0": version: 3.0.0 resolution: "d3-time-format@npm:3.0.0" dependencies: @@ -18677,7 +18637,7 @@ __metadata: languageName: node linkType: hard -"d3-time@npm:1 - 2, d3-time@npm:^2.1.1": +"d3-time@npm:1 - 2": version: 2.1.1 resolution: "d3-time@npm:2.1.1" dependencies: @@ -18686,6 +18646,15 @@ __metadata: languageName: node linkType: hard +"d3-time@npm:1 - 3, d3-time@npm:2.1.1 - 3": + version: 3.1.0 + resolution: "d3-time@npm:3.1.0" + dependencies: + d3-array: "npm:2 - 3" + checksum: 10/c110bed295ce63e8180e45b82a9b0ba114d5f33ff315871878f209c1a6d821caa505739a2b07f38d1396637155b8e7372632dacc018e11fbe8ceef58f6af806d + languageName: node + linkType: hard + "d3-time@npm:^1.0.11": version: 1.1.0 resolution: "d3-time@npm:1.1.0" @@ -18854,7 +18823,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:2.6.9, debug@npm:^2.6.9": +"debug@npm:2.6.9": version: 2.6.9 resolution: "debug@npm:2.6.9" dependencies: @@ -18863,7 +18832,16 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.3.7": +"debug@npm:3.1.0, debug@npm:~3.1.0": + version: 3.1.0 + resolution: "debug@npm:3.1.0" + dependencies: + ms: "npm:2.0.0" + checksum: 10/f5fd4b1390dd3b03a78aa30133a4b4db62acc3e6cd86af49f114bf7f7bd57c41a5c5c2eced2ad2c8190d70c60309f2dd5782feeaa0704dbaa5697890e3c5ad07 + languageName: node + linkType: hard + +"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.3.7, debug@npm:~4.3.7": version: 4.3.7 resolution: "debug@npm:4.3.7" dependencies: @@ -18887,30 +18865,24 @@ __metadata: languageName: node linkType: hard -"debug@npm:^3.1.0, debug@npm:^3.2.7": - version: 3.2.7 - resolution: "debug@npm:3.2.7" +"debug@npm:4.3.6": + version: 4.3.6 + resolution: "debug@npm:4.3.6" dependencies: - ms: "npm:^2.1.1" - checksum: 10/d86fd7be2b85462297ea16f1934dc219335e802f629ca9a69b63ed8ed041dda492389bb2ee039217c02e5b54792b1c51aa96ae954cf28634d363a2360c7a1639 - languageName: node - linkType: hard - -"debug@npm:~3.1.0": - version: 3.1.0 - resolution: "debug@npm:3.1.0" - dependencies: - ms: "npm:2.0.0" - checksum: 10/f5fd4b1390dd3b03a78aa30133a4b4db62acc3e6cd86af49f114bf7f7bd57c41a5c5c2eced2ad2c8190d70c60309f2dd5782feeaa0704dbaa5697890e3c5ad07 + ms: "npm:2.1.2" + peerDependenciesMeta: + supports-color: + optional: true + checksum: 10/d3adb9af7d57a9e809a68f404490cf776122acca16e6359a2702c0f462e510e91f9765c07f707b8ab0d91e03bad57328f3256f5082631cefb5393d0394d50fb7 languageName: node linkType: hard -"debug@npm:~4.1.1": - version: 4.1.1 - resolution: "debug@npm:4.1.1" +"debug@npm:^3.1.0, debug@npm:^3.2.7": + version: 3.2.7 + resolution: "debug@npm:3.2.7" dependencies: ms: "npm:^2.1.1" - checksum: 10/19bd01e5b1e5869eacfb8e1ee9873dc90e1f90edfd9c460e388326b163e662189af291fcb67e3614dcfbeae29c1c7780a9a7b4bcea39b201316abdc058be89be + checksum: 10/d86fd7be2b85462297ea16f1934dc219335e802f629ca9a69b63ed8ed041dda492389bb2ee039217c02e5b54792b1c51aa96ae954cf28634d363a2360c7a1639 languageName: node linkType: hard @@ -19190,10 +19162,12 @@ __metadata: languageName: node linkType: hard -"delaunator@npm:4": - version: 4.0.1 - resolution: "delaunator@npm:4.0.1" - checksum: 10/b4c1f65a4f0c4e58428725a34edee9089cd72cc3ee998c8b2fa1bc9e8f654ca1afe2fad42607085b15a7dd4dbe71ba2ce75a8c3c867a49fab6e4769b0854189d +"delaunator@npm:5": + version: 5.0.1 + resolution: "delaunator@npm:5.0.1" + dependencies: + robust-predicates: "npm:^3.0.2" + checksum: 10/c378a55138d81d471a7214635b1a2c5e74f8ee06582f558df72f0c7c82c25868599ce9a18fb25a245c6c03cab886d17fb574681c78371b539dd069818703f53a languageName: node linkType: hard @@ -19263,7 +19237,7 @@ __metadata: languageName: node linkType: hard -"destroy@npm:1.2.0": +"destroy@npm:1.2.0, destroy@npm:^1.2.0": version: 1.2.0 resolution: "destroy@npm:1.2.0" checksum: 10/0acb300b7478a08b92d810ab229d5afe0d2f4399272045ab22affa0d99dbaf12637659411530a6fcd597a9bdac718fc94373a61a95b4651bbc7b83684a565e38 @@ -19919,6 +19893,13 @@ __metadata: languageName: node linkType: hard +"encodeurl@npm:^2.0.0, encodeurl@npm:~2.0.0": + version: 2.0.0 + resolution: "encodeurl@npm:2.0.0" + checksum: 10/abf5cd51b78082cf8af7be6785813c33b6df2068ce5191a40ca8b1afe6a86f9230af9a9ce694a5ce4665955e5c1120871826df9c128a642e09c58d592e2807fe + languageName: node + linkType: hard + "encodeurl@npm:~1.0.2": version: 1.0.2 resolution: "encodeurl@npm:1.0.2" @@ -19926,13 +19907,6 @@ __metadata: languageName: node linkType: hard -"encodeurl@npm:~2.0.0": - version: 2.0.0 - resolution: "encodeurl@npm:2.0.0" - checksum: 10/abf5cd51b78082cf8af7be6785813c33b6df2068ce5191a40ca8b1afe6a86f9230af9a9ce694a5ce4665955e5c1120871826df9c128a642e09c58d592e2807fe - languageName: node - linkType: hard - "encoding-japanese@npm:2.0.0": version: 2.0.0 resolution: "encoding-japanese@npm:2.0.0" @@ -20096,7 +20070,7 @@ __metadata: languageName: node linkType: hard -"es-abstract@npm:^1.17.2, es-abstract@npm:^1.19.1, es-abstract@npm:^1.20.4, es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.23.0, es-abstract@npm:^1.23.2, es-abstract@npm:^1.23.3": +"es-abstract@npm:^1.17.2, es-abstract@npm:^1.17.5, es-abstract@npm:^1.19.1, es-abstract@npm:^1.20.4, es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.23.0, es-abstract@npm:^1.23.1, es-abstract@npm:^1.23.2, es-abstract@npm:^1.23.3": version: 1.23.3 resolution: "es-abstract@npm:1.23.3" dependencies: @@ -20150,13 +20124,6 @@ __metadata: languageName: node linkType: hard -"es-array-method-boxes-properly@npm:^1.0.0": - version: 1.0.0 - resolution: "es-array-method-boxes-properly@npm:1.0.0" - checksum: 10/27a8a21acf20f3f51f69dce8e643f151e380bffe569e95dc933b9ded9fcd89a765ee21b5229c93f9206c93f87395c6b75f80be8ac8c08a7ceb8771e1822ff1fb - languageName: node - linkType: hard - "es-define-property@npm:^1.0.0": version: 1.0.0 resolution: "es-define-property@npm:1.0.0" @@ -20173,20 +20140,26 @@ __metadata: languageName: node linkType: hard -"es-get-iterator@npm:^1.0.2": - version: 1.1.3 - resolution: "es-get-iterator@npm:1.1.3" +"es-iterator-helpers@npm:^1.1.0": + version: 1.2.0 + resolution: "es-iterator-helpers@npm:1.2.0" dependencies: - call-bind: "npm:^1.0.2" - get-intrinsic: "npm:^1.1.3" + call-bind: "npm:^1.0.7" + define-properties: "npm:^1.2.1" + es-abstract: "npm:^1.23.3" + es-errors: "npm:^1.3.0" + es-set-tostringtag: "npm:^2.0.3" + function-bind: "npm:^1.1.2" + get-intrinsic: "npm:^1.2.4" + globalthis: "npm:^1.0.4" + gopd: "npm:^1.0.1" + has-property-descriptors: "npm:^1.0.2" + has-proto: "npm:^1.0.3" has-symbols: "npm:^1.0.3" - is-arguments: "npm:^1.1.1" - is-map: "npm:^2.0.2" - is-set: "npm:^2.0.2" - is-string: "npm:^1.0.7" - isarray: "npm:^2.0.5" - stop-iteration-iterator: "npm:^1.0.0" - checksum: 10/bc2194befbe55725f9489098626479deee3c801eda7e83ce0dff2eb266a28dc808edb9b623ff01d31ebc1328f09d661333d86b601036692c2e3c1a6942319433 + internal-slot: "npm:^1.0.7" + iterator.prototype: "npm:^1.1.3" + safe-array-concat: "npm:^1.1.2" + checksum: 10/a4159e36c6bae03d4b636894fff2ff1acfcedc16c622939298b00adf4d2da6356ad92f682cc75c037a012a4b06adb903f67dfdfd05bac61847e9b763de2acbcb languageName: node linkType: hard @@ -20264,7 +20237,7 @@ __metadata: languageName: node linkType: hard -"esbuild@npm:^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0": +"esbuild@npm:^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0, esbuild@npm:^0.24.0": version: 0.24.0 resolution: "esbuild@npm:0.24.0" dependencies: @@ -20347,86 +20320,6 @@ __metadata: languageName: node linkType: hard -"esbuild@npm:^0.20.2": - version: 0.20.2 - resolution: "esbuild@npm:0.20.2" - dependencies: - "@esbuild/aix-ppc64": "npm:0.20.2" - "@esbuild/android-arm": "npm:0.20.2" - "@esbuild/android-arm64": "npm:0.20.2" - "@esbuild/android-x64": "npm:0.20.2" - "@esbuild/darwin-arm64": "npm:0.20.2" - "@esbuild/darwin-x64": "npm:0.20.2" - "@esbuild/freebsd-arm64": "npm:0.20.2" - "@esbuild/freebsd-x64": "npm:0.20.2" - "@esbuild/linux-arm": "npm:0.20.2" - "@esbuild/linux-arm64": "npm:0.20.2" - "@esbuild/linux-ia32": "npm:0.20.2" - "@esbuild/linux-loong64": "npm:0.20.2" - "@esbuild/linux-mips64el": "npm:0.20.2" - "@esbuild/linux-ppc64": "npm:0.20.2" - "@esbuild/linux-riscv64": "npm:0.20.2" - "@esbuild/linux-s390x": "npm:0.20.2" - "@esbuild/linux-x64": "npm:0.20.2" - "@esbuild/netbsd-x64": "npm:0.20.2" - "@esbuild/openbsd-x64": "npm:0.20.2" - "@esbuild/sunos-x64": "npm:0.20.2" - "@esbuild/win32-arm64": "npm:0.20.2" - "@esbuild/win32-ia32": "npm:0.20.2" - "@esbuild/win32-x64": "npm:0.20.2" - dependenciesMeta: - "@esbuild/aix-ppc64": - optional: true - "@esbuild/android-arm": - optional: true - "@esbuild/android-arm64": - optional: true - "@esbuild/android-x64": - optional: true - "@esbuild/darwin-arm64": - optional: true - "@esbuild/darwin-x64": - optional: true - "@esbuild/freebsd-arm64": - optional: true - "@esbuild/freebsd-x64": - optional: true - "@esbuild/linux-arm": - optional: true - "@esbuild/linux-arm64": - optional: true - "@esbuild/linux-ia32": - optional: true - "@esbuild/linux-loong64": - optional: true - "@esbuild/linux-mips64el": - optional: true - "@esbuild/linux-ppc64": - optional: true - "@esbuild/linux-riscv64": - optional: true - "@esbuild/linux-s390x": - optional: true - "@esbuild/linux-x64": - optional: true - "@esbuild/netbsd-x64": - optional: true - "@esbuild/openbsd-x64": - optional: true - "@esbuild/sunos-x64": - optional: true - "@esbuild/win32-arm64": - optional: true - "@esbuild/win32-ia32": - optional: true - "@esbuild/win32-x64": - optional: true - bin: - esbuild: bin/esbuild - checksum: 10/663215ab7e599651e00d61b528a63136e1f1d397db8b9c3712540af928c9476d61da95aefa81b7a8dfc7a9fdd7616fcf08395c27be68be8c99953fb461863ce4 - languageName: node - linkType: hard - "esbuild@npm:^0.21.3": version: 0.21.5 resolution: "esbuild@npm:0.21.5" @@ -20581,37 +20474,37 @@ __metadata: languageName: node linkType: hard -"eslint-config-prettier@npm:~8.8.0": - version: 8.8.0 - resolution: "eslint-config-prettier@npm:8.8.0" +"eslint-config-prettier@npm:~9.1.0": + version: 9.1.0 + resolution: "eslint-config-prettier@npm:9.1.0" peerDependencies: eslint: ">=7.0.0" bin: eslint-config-prettier: bin/cli.js - checksum: 10/3638144cecada897105ff9442bc85aba71c4f44d7d25b576cb34d50a207f6655f7cc55e729aad1a934a9f15e55c88e7adcbd1067d6582325fc89864c879b52f1 + checksum: 10/411e3b3b1c7aa04e3e0f20d561271b3b909014956c4dba51c878bf1a23dbb8c800a3be235c46c4732c70827276e540b6eed4636d9b09b444fd0a8e07f0fcd830 languageName: node linkType: hard -"eslint-import-resolver-node@npm:^0.3.6": - version: 0.3.7 - resolution: "eslint-import-resolver-node@npm:0.3.7" +"eslint-import-resolver-node@npm:^0.3.9": + version: 0.3.9 + resolution: "eslint-import-resolver-node@npm:0.3.9" dependencies: debug: "npm:^3.2.7" - is-core-module: "npm:^2.11.0" - resolve: "npm:^1.22.1" - checksum: 10/31c6dfbd3457d1e6170ac2326b7ba9c323ff1ea68e3fcc5309f234bd1cefed050ee9b35e458b5eaed91323ab0d29bb2eddb41a1720ba7ca09bbacb00a0339d64 + is-core-module: "npm:^2.13.0" + resolve: "npm:^1.22.4" + checksum: 10/d52e08e1d96cf630957272e4f2644dcfb531e49dcfd1edd2e07e43369eb2ec7a7d4423d417beee613201206ff2efa4eb9a582b5825ee28802fc7c71fcd53ca83 languageName: node linkType: hard -"eslint-module-utils@npm:^2.7.3": - version: 2.7.4 - resolution: "eslint-module-utils@npm:2.7.4" +"eslint-module-utils@npm:^2.12.0": + version: 2.12.0 + resolution: "eslint-module-utils@npm:2.12.0" dependencies: debug: "npm:^3.2.7" peerDependenciesMeta: eslint: optional: true - checksum: 10/25527e03d4245d1d0b2ff1f752aaa02a34520c2a56403fd316e7ea54dcbbdd68089d490c6db2b79bfd4de57287535ade9fef6e024caa6310fc664289899a672d + checksum: 10/dd27791147eca17366afcb83f47d6825b6ce164abb256681e5de4ec1d7e87d8605641eb869298a0dbc70665e2446dbcc2f40d3e1631a9475dd64dd23d4ca5dee languageName: node linkType: hard @@ -20624,48 +20517,54 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-import@npm:~2.26.0": - version: 2.26.0 - resolution: "eslint-plugin-import@npm:2.26.0" +"eslint-plugin-import@npm:~2.31.0": + version: 2.31.0 + resolution: "eslint-plugin-import@npm:2.31.0" dependencies: - array-includes: "npm:^3.1.4" - array.prototype.flat: "npm:^1.2.5" - debug: "npm:^2.6.9" + "@rtsao/scc": "npm:^1.1.0" + array-includes: "npm:^3.1.8" + array.prototype.findlastindex: "npm:^1.2.5" + array.prototype.flat: "npm:^1.3.2" + array.prototype.flatmap: "npm:^1.3.2" + debug: "npm:^3.2.7" doctrine: "npm:^2.1.0" - eslint-import-resolver-node: "npm:^0.3.6" - eslint-module-utils: "npm:^2.7.3" - has: "npm:^1.0.3" - is-core-module: "npm:^2.8.1" + eslint-import-resolver-node: "npm:^0.3.9" + eslint-module-utils: "npm:^2.12.0" + hasown: "npm:^2.0.2" + is-core-module: "npm:^2.15.1" is-glob: "npm:^4.0.3" minimatch: "npm:^3.1.2" - object.values: "npm:^1.1.5" - resolve: "npm:^1.22.0" - tsconfig-paths: "npm:^3.14.1" + object.fromentries: "npm:^2.0.8" + object.groupby: "npm:^1.0.3" + object.values: "npm:^1.2.0" + semver: "npm:^6.3.1" + string.prototype.trimend: "npm:^1.0.8" + tsconfig-paths: "npm:^3.15.0" peerDependencies: - eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 - checksum: 10/80322d0414c6d6b6f8ddb77a87ede733d7af8536461cbc977e0da9a9e7bd976aa588488a5f310383b914111f496c0a259d2752f402e5880b16ecc48aca89b29e + eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9 + checksum: 10/6b76bd009ac2db0615d9019699d18e2a51a86cb8c1d0855a35fb1b418be23b40239e6debdc6e8c92c59f1468ed0ea8d7b85c817117a113d5cc225be8a02ad31c languageName: node linkType: hard -"eslint-plugin-jest@npm:~27.2.3": - version: 27.2.3 - resolution: "eslint-plugin-jest@npm:27.2.3" +"eslint-plugin-jest@npm:~28.8.3": + version: 28.8.3 + resolution: "eslint-plugin-jest@npm:28.8.3" dependencies: - "@typescript-eslint/utils": "npm:^5.10.0" + "@typescript-eslint/utils": "npm:^6.0.0 || ^7.0.0 || ^8.0.0" peerDependencies: - "@typescript-eslint/eslint-plugin": ^5.0.0 || ^6.0.0 - eslint: ^7.0.0 || ^8.0.0 + "@typescript-eslint/eslint-plugin": ^6.0.0 || ^7.0.0 || ^8.0.0 + eslint: ^7.0.0 || ^8.0.0 || ^9.0.0 jest: "*" peerDependenciesMeta: "@typescript-eslint/eslint-plugin": optional: true jest: optional: true - checksum: 10/1fdbced06d2683fb8c769b00f9cc905305ead6e086644c2e94736c5904da3ad321747b124e2afecdef55c366938c0586b70900123bcb2d7d9ee1a299a18cfa86 + checksum: 10/3f1798c61e143981eefcfb2fbc4b2e5b329378ebaafdec6485f443c79ee0d3304e9409e8ea8ce089ac15abb4e700d8d838e0a1da29feb528d77a2b3cce6989ec languageName: node linkType: hard -"eslint-plugin-jsx-a11y@npm:^6.8.0": +"eslint-plugin-jsx-a11y@npm:^6.10.2": version: 6.10.2 resolution: "eslint-plugin-jsx-a11y@npm:6.10.2" dependencies: @@ -20690,25 +20589,23 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-no-floating-promise@npm:~1.0.2": - version: 1.0.2 - resolution: "eslint-plugin-no-floating-promise@npm:1.0.2" +"eslint-plugin-no-floating-promise@npm:~2.0.0": + version: 2.0.0 + resolution: "eslint-plugin-no-floating-promise@npm:2.0.0" dependencies: requireindex: "npm:1.2.0" - checksum: 10/8ce9b38f6c1d0275d8b211e564038f60988be26fbf5f5866967f4e618e084d666b1365ea5ab7eb75c8364fd97cb766a99cc70a8ced5a53e403e4b5f4b276c931 + checksum: 10/4f56c5acfc7ba3189b6a5428cdc97aa1004f7ba69784949d193a9a88ef9766e2b2070463eedbb26f17e3852ea7362c4205eaa026ea2e0af5471a9daa1469096e languageName: node linkType: hard -"eslint-plugin-playwright@npm:~0.15.3": - version: 0.15.3 - resolution: "eslint-plugin-playwright@npm:0.15.3" +"eslint-plugin-playwright@npm:~2.0.0": + version: 2.0.0 + resolution: "eslint-plugin-playwright@npm:2.0.0" + dependencies: + globals: "npm:^13.23.0" peerDependencies: - eslint: ">=7" - eslint-plugin-jest: ">=25" - peerDependenciesMeta: - eslint-plugin-jest: - optional: true - checksum: 10/222012ee1bf331631d8eee4e04132255f27a0654f919d40b3e9152026f6c971dbb31ca347846675d0a7499931744d67b17173b991198efbbba8f5c49ef937cc0 + eslint: ">=8.40.0" + checksum: 10/53b847553e656597dc76d885f3d165b11f88773f5bdabb4481a69ad00157dc815e39d28c5a94dd3cd145b1140a332f43dde8c4dea57e71f6db9bb550cb81982e languageName: node linkType: hard @@ -20732,12 +20629,12 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-react-hooks@npm:^4.6.2, eslint-plugin-react-hooks@npm:~4.6.2": - version: 4.6.2 - resolution: "eslint-plugin-react-hooks@npm:4.6.2" +"eslint-plugin-react-hooks@npm:^5.0.0, eslint-plugin-react-hooks@npm:~5.0.0": + version: 5.0.0 + resolution: "eslint-plugin-react-hooks@npm:5.0.0" peerDependencies: - eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 - checksum: 10/5a0680941f34e70cf505bcb6082df31a3e445d193ee95a88ff3483041eb944f4cefdaf7e81b0eb1feb4eeceee8c7c6ddb8a2a6e8c4c0388514a42e16ac7b7a69 + eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0 + checksum: 10/b762789832806b6981e2d910994e72aa7a85136fe0880572334b26cf1274ba37bd3b1365e77d2c2f92465337c4a65c84ef647bc499d33b86fc1110f2df7ef1bb languageName: node linkType: hard @@ -20750,72 +20647,64 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-react@npm:~7.32.2": - version: 7.32.2 - resolution: "eslint-plugin-react@npm:7.32.2" +"eslint-plugin-react@npm:~7.37.2": + version: 7.37.2 + resolution: "eslint-plugin-react@npm:7.37.2" dependencies: - array-includes: "npm:^3.1.6" - array.prototype.flatmap: "npm:^1.3.1" - array.prototype.tosorted: "npm:^1.1.1" + array-includes: "npm:^3.1.8" + array.prototype.findlast: "npm:^1.2.5" + array.prototype.flatmap: "npm:^1.3.2" + array.prototype.tosorted: "npm:^1.1.4" doctrine: "npm:^2.1.0" + es-iterator-helpers: "npm:^1.1.0" estraverse: "npm:^5.3.0" + hasown: "npm:^2.0.2" jsx-ast-utils: "npm:^2.4.1 || ^3.0.0" minimatch: "npm:^3.1.2" - object.entries: "npm:^1.1.6" - object.fromentries: "npm:^2.0.6" - object.hasown: "npm:^1.1.2" - object.values: "npm:^1.1.6" + object.entries: "npm:^1.1.8" + object.fromentries: "npm:^2.0.8" + object.values: "npm:^1.2.0" prop-types: "npm:^15.8.1" - resolve: "npm:^2.0.0-next.4" - semver: "npm:^6.3.0" - string.prototype.matchall: "npm:^4.0.8" + resolve: "npm:^2.0.0-next.5" + semver: "npm:^6.3.1" + string.prototype.matchall: "npm:^4.0.11" + string.prototype.repeat: "npm:^1.0.0" peerDependencies: - eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 - checksum: 10/5ca7959c85fa557bcd25c4b9b3f81fbfae974e8fb16172e31a275712cc71da8ecbb9436da2d3130a8b24dd7a4bbe69d37d4392944aecc4821618717ba156caf4 + eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7 + checksum: 10/df2f7ab198018d3378f305a8a5ceceebc9bd31f019fc7567a2ef9c77789dc8a6a2c3c3957f8b0805f26c11c02f9f86c972e02cd0eda12f4d0370526c11f8a9a3 languageName: node linkType: hard -"eslint-plugin-storybook@npm:^0.10.2, eslint-plugin-storybook@npm:~0.10.2": - version: 0.10.2 - resolution: "eslint-plugin-storybook@npm:0.10.2" +"eslint-plugin-storybook@npm:^0.11.0, eslint-plugin-storybook@npm:~0.11.0": + version: 0.11.0 + resolution: "eslint-plugin-storybook@npm:0.11.0" dependencies: "@storybook/csf": "npm:^0.1.11" "@typescript-eslint/utils": "npm:^8.8.1" ts-dedent: "npm:^2.2.0" peerDependencies: eslint: ">=6" - checksum: 10/b32de04ebe653ac6a3afb3f1b4d2aa78a204a4a6871e6fd916d2538925993fc307b7dfd83921eed7e35627d9dff350f05f2b51b79b03122ab6d41e3dee0735a3 - languageName: node - linkType: hard - -"eslint-plugin-testing-library@npm:^5.11.1, eslint-plugin-testing-library@npm:~5.11.1": - version: 5.11.1 - resolution: "eslint-plugin-testing-library@npm:5.11.1" - dependencies: - "@typescript-eslint/utils": "npm:^5.58.0" - peerDependencies: - eslint: ^7.5.0 || ^8.0.0 - checksum: 10/3b2f010b13fbffd9a2018815cdca7edfce64523d9263ed376b33bdc43fca297100dab755a40f5b8be0f8e76b44bc7883590acfa9016fbff20888d9ee67f964d0 + checksum: 10/fb9b2a23add084d8184c20571ca4cfd099eda22ba465e3ecfc2c109317235209eabdd6b30a19cb5f352f70ddd8083e10cf82a38233dfe4d02b3b0f753f86a18b languageName: node linkType: hard -"eslint-plugin-testing-library@npm:~6.2.2": - version: 6.2.2 - resolution: "eslint-plugin-testing-library@npm:6.2.2" +"eslint-plugin-testing-library@npm:^6.4.0, eslint-plugin-testing-library@npm:~6.4.0": + version: 6.4.0 + resolution: "eslint-plugin-testing-library@npm:6.4.0" dependencies: - "@typescript-eslint/utils": "npm:^5.58.0" + "@typescript-eslint/utils": "npm:^5.62.0" peerDependencies: - eslint: ^7.5.0 || ^8.0.0 - checksum: 10/61947d0b81de1565c8627ec2d1e6636a8b6613cfe554a4671d011b3e88dfd77b498ce83b15bcf0a2df5570c44ad1d46d54058ed488f4e515d764196cbc6d65cf + eslint: ^7.5.0 || ^8.0.0 || ^9.0.0 + checksum: 10/b9461e6662542fbfb3c0b768e6038bbaa56e345cb0600c7f07e26ff8154166abb9f7dcdc08d565c314cd9ccf0416eca8c3ce3c235b375c5fbf3f152a81142969 languageName: node linkType: hard -"eslint-plugin-you-dont-need-lodash-underscore@npm:~6.12.0": - version: 6.12.0 - resolution: "eslint-plugin-you-dont-need-lodash-underscore@npm:6.12.0" +"eslint-plugin-you-dont-need-lodash-underscore@npm:~6.14.0": + version: 6.14.0 + resolution: "eslint-plugin-you-dont-need-lodash-underscore@npm:6.14.0" dependencies: kebab-case: "npm:^1.0.0" - checksum: 10/0c42cd57682a3b8210bcb85cfc6dfe6c6b9e50db74c23d1d0993fb3d44c558881aa7da305aa75d697aac0bc0d57a5b98c54c8069aefa04d106ba5662b3ac974d + checksum: 10/b92739fb4870b0e17c83d5977fcc3e6fb7f721db04aa0984b4a1a873dd29ca5138e1c2ac0f769b355786c3d4f91deb812cca91189cb547e539685e2d2c3d97b1 languageName: node linkType: hard @@ -20983,7 +20872,7 @@ __metadata: languageName: node linkType: hard -"etag@npm:~1.8.1": +"etag@npm:^1.8.1, etag@npm:~1.8.1": version: 1.8.1 resolution: "etag@npm:1.8.1" checksum: 10/571aeb3dbe0f2bbd4e4fadbdb44f325fc75335cd5f6f6b6a091e6a06a9f25ed5392f0863c5442acb0646787446e816f13cbfc6edce5b07658541dff573cab1ff @@ -21029,13 +20918,6 @@ __metadata: languageName: node linkType: hard -"eventemitter3@npm:^3.1.0": - version: 3.1.2 - resolution: "eventemitter3@npm:3.1.2" - checksum: 10/e2886001beb52cd2fe47d2470fd6266b7c70bd3ac356c0041a7e64336ed57bb1fc9b07bc9043d34b39913488a8d81bfcde62d3af597974980aa01b50844d869b - languageName: node - linkType: hard - "eventemitter3@npm:^4.0.0, eventemitter3@npm:^4.0.4": version: 4.0.7 resolution: "eventemitter3@npm:4.0.7" @@ -21243,7 +21125,7 @@ __metadata: languageName: node linkType: hard -"express@npm:^4.18.1, express@npm:^4.18.2, express@npm:^4.19.2, express@npm:^4.21.0, express@npm:^4.21.1": +"express@npm:^4.18.1, express@npm:^4.18.2, express@npm:^4.19.2, express@npm:^4.21.1": version: 4.21.1 resolution: "express@npm:4.21.1" dependencies: @@ -21282,6 +21164,46 @@ __metadata: languageName: node linkType: hard +"express@npm:^5.0.0": + version: 5.0.1 + resolution: "express@npm:5.0.1" + dependencies: + accepts: "npm:^2.0.0" + body-parser: "npm:^2.0.1" + content-disposition: "npm:^1.0.0" + content-type: "npm:~1.0.4" + cookie: "npm:0.7.1" + cookie-signature: "npm:^1.2.1" + debug: "npm:4.3.6" + depd: "npm:2.0.0" + encodeurl: "npm:~2.0.0" + escape-html: "npm:~1.0.3" + etag: "npm:~1.8.1" + finalhandler: "npm:^2.0.0" + fresh: "npm:2.0.0" + http-errors: "npm:2.0.0" + merge-descriptors: "npm:^2.0.0" + methods: "npm:~1.1.2" + mime-types: "npm:^3.0.0" + on-finished: "npm:2.4.1" + once: "npm:1.4.0" + parseurl: "npm:~1.3.3" + proxy-addr: "npm:~2.0.7" + qs: "npm:6.13.0" + range-parser: "npm:~1.2.1" + router: "npm:^2.0.0" + safe-buffer: "npm:5.2.1" + send: "npm:^1.1.0" + serve-static: "npm:^2.1.0" + setprototypeof: "npm:1.2.0" + statuses: "npm:2.0.1" + type-is: "npm:^2.0.0" + utils-merge: "npm:1.0.1" + vary: "npm:~1.1.2" + checksum: 10/b6afed019b6c22cb697a658d4dd70966e34f117ad6c83a2d32080c3ec4541443b15be770b4f7ac58bc6c07451a9bd0788121c5c4583c930beea48d8a17ee5c60 + languageName: node + linkType: hard + "ext-list@npm:^2.0.0": version: 2.2.2 resolution: "ext-list@npm:2.2.2" @@ -21465,7 +21387,7 @@ __metadata: languageName: node linkType: hard -"fast-xml-parser@npm:^4.1.3": +"fast-xml-parser@npm:^4.1.3, fast-xml-parser@npm:^4.2.2": version: 4.5.0 resolution: "fast-xml-parser@npm:4.5.0" dependencies: @@ -21560,10 +21482,10 @@ __metadata: languageName: node linkType: hard -"fflate@npm:^0.7.4": - version: 0.7.4 - resolution: "fflate@npm:0.7.4" - checksum: 10/27f61b3536c3a23b0ccdab4b616103be0e8e7241924cda063486822c50ae11930eb1ce6e34dedbfccb2705d04a66380d04e28c67387e1dd48159d41ea14bfda5 +"fflate@npm:^0.8.2": + version: 0.8.2 + resolution: "fflate@npm:0.8.2" + checksum: 10/2bd26ba6d235d428de793c6a0cd1aaa96a06269ebd4e21b46c8fd1bd136abc631acf27e188d47c3936db090bf3e1ede11d15ce9eae9bffdc4bfe1b9dc66ca9cb languageName: node linkType: hard @@ -21774,6 +21696,21 @@ __metadata: languageName: node linkType: hard +"finalhandler@npm:^2.0.0": + version: 2.0.0 + resolution: "finalhandler@npm:2.0.0" + dependencies: + debug: "npm:2.6.9" + encodeurl: "npm:~1.0.2" + escape-html: "npm:~1.0.3" + on-finished: "npm:2.4.1" + parseurl: "npm:~1.3.3" + statuses: "npm:2.0.1" + unpipe: "npm:~1.0.0" + checksum: 10/59b941fd40fcd2e173c858a47cccd493abf9709df54d5e06ef51be910957b6de7518af79110851f721e826dc246ce4456290d8dfe24a58b13488264690f76ed8 + languageName: node + linkType: hard + "find-cache-dir@npm:^2.0.0, find-cache-dir@npm:^2.1.0": version: 2.1.0 resolution: "find-cache-dir@npm:2.1.0" @@ -22004,17 +21941,6 @@ __metadata: languageName: node linkType: hard -"form-data@npm:^2.5.0": - version: 2.5.1 - resolution: "form-data@npm:2.5.1" - dependencies: - asynckit: "npm:^0.4.0" - combined-stream: "npm:^1.0.6" - mime-types: "npm:^2.1.12" - checksum: 10/2e2e5e927979ba3623f9b4c4bcc939275fae3f2dea9dafc8db3ca656a3d75476605de2c80f0e6f1487987398e056f0b4c738972d6e1edd83392d5686d0952eed - languageName: node - linkType: hard - "form-data@npm:^3.0.0": version: 3.0.1 resolution: "form-data@npm:3.0.1" @@ -22066,13 +21992,20 @@ __metadata: languageName: node linkType: hard -"fresh@npm:0.5.2": +"fresh@npm:0.5.2, fresh@npm:^0.5.2": version: 0.5.2 resolution: "fresh@npm:0.5.2" checksum: 10/64c88e489b5d08e2f29664eb3c79c705ff9a8eb15d3e597198ef76546d4ade295897a44abb0abd2700e7ef784b2e3cbf1161e4fbf16f59129193fd1030d16da1 languageName: node linkType: hard +"fresh@npm:2.0.0": + version: 2.0.0 + resolution: "fresh@npm:2.0.0" + checksum: 10/44e1468488363074641991c1340d2a10c5a6f6d7c353d89fd161c49d120c58ebf9890720f7584f509058385836e3ce50ddb60e9f017315a4ba8c6c3461813bfc + languageName: node + linkType: hard + "from2@npm:^2.1.1": version: 2.3.0 resolution: "from2@npm:2.3.0" @@ -22591,6 +22524,15 @@ __metadata: languageName: node linkType: hard +"globals@npm:^13.23.0": + version: 13.24.0 + resolution: "globals@npm:13.24.0" + dependencies: + type-fest: "npm:^0.20.2" + checksum: 10/62c5b1997d06674fc7191d3e01e324d3eda4d65ac9cc4e78329fa3b5c4fd42a0e1c8722822497a6964eee075255ce21ccf1eec2d83f92ef3f06653af4d0ee28e + languageName: node + linkType: hard + "globalthis@npm:^1.0.3": version: 1.0.3 resolution: "globalthis@npm:1.0.3" @@ -22600,6 +22542,16 @@ __metadata: languageName: node linkType: hard +"globalthis@npm:^1.0.4": + version: 1.0.4 + resolution: "globalthis@npm:1.0.4" + dependencies: + define-properties: "npm:^1.2.1" + gopd: "npm:^1.0.1" + checksum: 10/1f1fd078fb2f7296306ef9dd51019491044ccf17a59ed49d375b576ca108ff37e47f3d29aead7add40763574a992f16a5367dd1e2173b8634ef18556ab719ac4 + languageName: node + linkType: hard + "globby@npm:^10.0.0": version: 10.0.2 resolution: "globby@npm:10.0.2" @@ -23387,7 +23339,7 @@ __metadata: languageName: node linkType: hard -"http-errors@npm:2.0.0": +"http-errors@npm:2.0.0, http-errors@npm:^2.0.0": version: 2.0.0 resolution: "http-errors@npm:2.0.0" dependencies: @@ -23630,6 +23582,15 @@ __metadata: languageName: node linkType: hard +"iconv-lite@npm:0.5.2": + version: 0.5.2 + resolution: "iconv-lite@npm:0.5.2" + dependencies: + safer-buffer: "npm:>= 2.1.2 < 3" + checksum: 10/b48a1c8a173b638cb3d9a21674acbfed1c1fd8e81f6dc52e63cf44d3b56f37fd48f8ff81d93a71c8b60b4dfb464d3e87f606df5f8a0f0247c21737665059565c + languageName: node + linkType: hard + "iconv-lite@npm:0.6.3, iconv-lite@npm:^0.6.2, iconv-lite@npm:^0.6.3": version: 0.6.3 resolution: "iconv-lite@npm:0.6.3" @@ -24036,7 +23997,7 @@ __metadata: languageName: node linkType: hard -"internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.7": +"internal-slot@npm:^1.0.7": version: 1.0.7 resolution: "internal-slot@npm:1.0.7" dependencies: @@ -24047,6 +24008,13 @@ __metadata: languageName: node linkType: hard +"internmap@npm:1 - 2": + version: 2.0.3 + resolution: "internmap@npm:2.0.3" + checksum: 10/873e0e7fcfe32f999aa0997a0b648b1244508e56e3ea6b8259b5245b50b5eeb3853fba221f96692bd6d1def501da76c32d64a5cb22a0b26cdd9b445664f805e0 + languageName: node + linkType: hard + "internmap@npm:^1.0.0": version: 1.0.1 resolution: "internmap@npm:1.0.1" @@ -24176,7 +24144,7 @@ __metadata: languageName: node linkType: hard -"is-arguments@npm:^1.0.4, is-arguments@npm:^1.1.1": +"is-arguments@npm:^1.0.4": version: 1.1.1 resolution: "is-arguments@npm:1.1.1" dependencies: @@ -24210,6 +24178,15 @@ __metadata: languageName: node linkType: hard +"is-async-function@npm:^2.0.0": + version: 2.0.0 + resolution: "is-async-function@npm:2.0.0" + dependencies: + has-tostringtag: "npm:^1.0.0" + checksum: 10/2cf336fbf8cba3badcf526aa3d10384c30bab32615ac4831b74492eb4e843ccb7d8439a119c27f84bcf217d72024e611b1373f870f433b48f3fa57d3d1b863f1 + languageName: node + linkType: hard + "is-bigint@npm:^1.0.1": version: 1.0.4 resolution: "is-bigint@npm:1.0.4" @@ -24273,7 +24250,7 @@ __metadata: languageName: node linkType: hard -"is-core-module@npm:^2.11.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.5.0, is-core-module@npm:^2.8.1": +"is-core-module@npm:^2.13.0, is-core-module@npm:^2.5.0": version: 2.13.1 resolution: "is-core-module@npm:2.13.1" dependencies: @@ -24282,6 +24259,15 @@ __metadata: languageName: node linkType: hard +"is-core-module@npm:^2.15.1": + version: 2.15.1 + resolution: "is-core-module@npm:2.15.1" + dependencies: + hasown: "npm:^2.0.2" + checksum: 10/77316d5891d5743854bcef2cd2f24c5458fb69fbc9705c12ca17d54a2017a67d0693bbf1ba8c77af376c0eef6bf6d1b27a4ab08e4db4e69914c3789bdf2ceec5 + languageName: node + linkType: hard + "is-cwebp-readable@npm:^3.0.0": version: 3.0.0 resolution: "is-cwebp-readable@npm:3.0.0" @@ -24300,7 +24286,7 @@ __metadata: languageName: node linkType: hard -"is-date-object@npm:^1.0.1": +"is-date-object@npm:^1.0.1, is-date-object@npm:^1.0.5": version: 1.0.5 resolution: "is-date-object@npm:1.0.5" dependencies: @@ -24355,6 +24341,15 @@ __metadata: languageName: node linkType: hard +"is-finalizationregistry@npm:^1.0.2": + version: 1.0.2 + resolution: "is-finalizationregistry@npm:1.0.2" + dependencies: + call-bind: "npm:^1.0.2" + checksum: 10/1b8e9e1bf2075e862315ef9d38ce6d39c43ca9d81d46f73b34473506992f4b0fbaadb47ec9b420a5e76afe3f564d9f1f0d9b552ef272cc2395e0f21d743c9c29 + languageName: node + linkType: hard + "is-fullwidth-code-point@npm:^2.0.0": version: 2.0.0 resolution: "is-fullwidth-code-point@npm:2.0.0" @@ -24376,7 +24371,7 @@ __metadata: languageName: node linkType: hard -"is-generator-function@npm:^1.0.7": +"is-generator-function@npm:^1.0.10, is-generator-function@npm:^1.0.7": version: 1.0.10 resolution: "is-generator-function@npm:1.0.10" dependencies: @@ -24449,10 +24444,10 @@ __metadata: languageName: node linkType: hard -"is-map@npm:^2.0.2": - version: 2.0.2 - resolution: "is-map@npm:2.0.2" - checksum: 10/60ba910f835f2eacb1fdf5b5a6c60fe1c702d012a7673e6546992bcc0c873f62ada6e13d327f9e48f1720d49c152d6cdecae1fa47a261ef3d247c3ce6f0e1d39 +"is-map@npm:^2.0.3": + version: 2.0.3 + resolution: "is-map@npm:2.0.3" + checksum: 10/8de7b41715b08bcb0e5edb0fb9384b80d2d5bcd10e142188f33247d19ff078abaf8e9b6f858e2302d8d05376a26a55cd23a3c9f8ab93292b02fcd2cc9e4e92bb languageName: node linkType: hard @@ -24595,6 +24590,13 @@ __metadata: languageName: node linkType: hard +"is-promise@npm:4.0.0": + version: 4.0.0 + resolution: "is-promise@npm:4.0.0" + checksum: 10/0b46517ad47b00b6358fd6553c83ec1f6ba9acd7ffb3d30a0bf519c5c69e7147c132430452351b8a9fc198f8dd6c4f76f8e6f5a7f100f8c77d57d9e0f4261a8a + languageName: node + linkType: hard + "is-promise@npm:^2.1.0": version: 2.2.2 resolution: "is-promise@npm:2.2.2" @@ -24633,10 +24635,10 @@ __metadata: languageName: node linkType: hard -"is-set@npm:^2.0.2": - version: 2.0.2 - resolution: "is-set@npm:2.0.2" - checksum: 10/d89e82acdc7760993474f529e043f9c4a1d63ed4774d21cc2e331d0e401e5c91c27743cd7c889137028f6a742234759a4bd602368fbdbf0b0321994aefd5603f +"is-set@npm:^2.0.3": + version: 2.0.3 + resolution: "is-set@npm:2.0.3" + checksum: 10/5685df33f0a4a6098a98c72d94d67cad81b2bc72f1fb2091f3d9283c4a1c582123cd709145b02a9745f0ce6b41e3e43f1c944496d1d74d4ea43358be61308669 languageName: node linkType: hard @@ -24656,7 +24658,7 @@ __metadata: languageName: node linkType: hard -"is-stream@npm:^2.0.0, is-stream@npm:^2.0.1": +"is-stream@npm:^2, is-stream@npm:^2.0.0, is-stream@npm:^2.0.1": version: 2.0.1 resolution: "is-stream@npm:2.0.1" checksum: 10/b8e05ccdf96ac330ea83c12450304d4a591f9958c11fd17bed240af8d5ffe08aedafa4c0f4cfccd4d28dc9d4d129daca1023633d5c11601a6cbc77521f6fae66 @@ -24731,13 +24733,6 @@ __metadata: languageName: node linkType: hard -"is-url-superb@npm:^4.0.0": - version: 4.0.0 - resolution: "is-url-superb@npm:4.0.0" - checksum: 10/fd55e91c96349acb0d688f95fcb1ac67450e5db934976e3a8ff13ef446841e779a6f4d18b15f02331f05a3429c8fdaba2382ac1ab444059e86e9ffcde1ec8db0 - languageName: node - linkType: hard - "is-url@npm:^1.2.4": version: 1.2.4 resolution: "is-url@npm:1.2.4" @@ -24745,6 +24740,13 @@ __metadata: languageName: node linkType: hard +"is-weakmap@npm:^2.0.2": + version: 2.0.2 + resolution: "is-weakmap@npm:2.0.2" + checksum: 10/a7b7e23206c542dcf2fa0abc483142731788771527e90e7e24f658c0833a0d91948a4f7b30d78f7a65255a48512e41a0288b778ba7fc396137515c12e201fd11 + languageName: node + linkType: hard + "is-weakref@npm:^1.0.2": version: 1.0.2 resolution: "is-weakref@npm:1.0.2" @@ -24754,6 +24756,16 @@ __metadata: languageName: node linkType: hard +"is-weakset@npm:^2.0.3": + version: 2.0.3 + resolution: "is-weakset@npm:2.0.3" + dependencies: + call-bind: "npm:^1.0.7" + get-intrinsic: "npm:^1.2.4" + checksum: 10/40159582ff1b44fc40085f631baf19f56479b05af2faede65b4e6a0b6acab745c13fd070e35b475aafd8a1ee50879ba5a3f1265125b46bebdb446b6be1f62165 + languageName: node + linkType: hard + "is-windows@npm:^1.0.0, is-windows@npm:^1.0.2": version: 1.0.2 resolution: "is-windows@npm:1.0.2" @@ -25019,20 +25031,16 @@ __metadata: languageName: node linkType: hard -"iterate-iterator@npm:^1.0.1": - version: 1.0.2 - resolution: "iterate-iterator@npm:1.0.2" - checksum: 10/3528a3668eb9c146bcda4f616166cfa8e49e01e8302ffcfc7b4c923f9862a20d9dc4e3336c8517695bea22036686fde98a43718718ce188d1fead4dc1603a94f - languageName: node - linkType: hard - -"iterate-value@npm:^1.0.2": - version: 1.0.2 - resolution: "iterate-value@npm:1.0.2" +"iterator.prototype@npm:^1.1.3": + version: 1.1.3 + resolution: "iterator.prototype@npm:1.1.3" dependencies: - es-get-iterator: "npm:^1.0.2" - iterate-iterator: "npm:^1.0.1" - checksum: 10/fc426ba672e8ef9bec471fb1990a0914c9c3640d64bfc365068ea17ec537388058942b896adc29c9151d8c99e745dcfe2c5e3161475c040d5228dd2c6856a24d + define-properties: "npm:^1.2.1" + get-intrinsic: "npm:^1.2.1" + has-symbols: "npm:^1.0.3" + reflect.getprototypeof: "npm:^1.0.4" + set-function-name: "npm:^2.0.1" + checksum: 10/1a2a508d3baac121b76c834404ff552d1bb96a173b1d74ff947b2c5763840c0b1e5be01be7e2183a19b08e99e38729812668ff1f23b35f6655a366017bc32519 languageName: node linkType: hard @@ -25911,14 +25919,14 @@ __metadata: languageName: node linkType: hard -"json5@npm:^1.0.1": - version: 1.0.1 - resolution: "json5@npm:1.0.1" +"json5@npm:^1.0.2": + version: 1.0.2 + resolution: "json5@npm:1.0.2" dependencies: minimist: "npm:^1.2.0" bin: json5: lib/cli.js - checksum: 10/ecb5ab4e233322169b0c4b29e698c116277c45654d3b70a707d00802042b536be54345ce664523bba83e5afedfeaf643539a7667144f99d6da1dcaaa02336d80 + checksum: 10/a78d812dbbd5642c4f637dd130954acfd231b074965871c3e28a5bbd571f099d623ecf9161f1960c4ddf68e0cc98dee8bebfdb94a71ad4551f85a1afc94b63f6 languageName: node linkType: hard @@ -26025,7 +26033,7 @@ __metadata: languageName: node linkType: hard -"jsonwebtoken@npm:^9.0.0": +"jsonwebtoken@npm:^9": version: 9.0.2 resolution: "jsonwebtoken@npm:9.0.2" dependencies: @@ -26408,10 +26416,10 @@ __metadata: languageName: node linkType: hard -"lilconfig@npm:^2.0.5": - version: 2.0.5 - resolution: "lilconfig@npm:2.0.5" - checksum: 10/a6e201bcb5b2f876cdd8b1cb7d20b126156aff976e29a184b62e6408e1c7da127603390543441fda8656a34d710113d74bb1551317e0cdc9dcb6e96dfbf6c525 +"lilconfig@npm:^3.1.1": + version: 3.1.2 + resolution: "lilconfig@npm:3.1.2" + checksum: 10/8058403850cfad76d6041b23db23f730e52b6c17a8c28d87b90766639ca0ee40c748a3e85c2d7bd133d572efabff166c4b015e5d25e01fd666cb4b13cfada7f0 languageName: node linkType: hard @@ -26602,7 +26610,7 @@ __metadata: languageName: node linkType: hard -"lodash.isstring@npm:^4.0.1": +"lodash.isstring@npm:^4, lodash.isstring@npm:^4.0.1": version: 4.0.1 resolution: "lodash.isstring@npm:4.0.1" checksum: 10/eaac87ae9636848af08021083d796e2eea3d02e80082ab8a9955309569cb3a463ce97fd281d7dc119e402b2e7d8c54a23914b15d2fc7fff56461511dc8937ba0 @@ -27227,6 +27235,13 @@ __metadata: languageName: node linkType: hard +"media-typer@npm:^1.1.0": + version: 1.1.0 + resolution: "media-typer@npm:1.1.0" + checksum: 10/a58dd60804df73c672942a7253ccc06815612326dc1c0827984b1a21704466d7cde351394f47649e56cf7415e6ee2e26e000e81b51b3eebb5a93540e8bf93cbd + languageName: node + linkType: hard + "mem@npm:^8.1.1": version: 8.1.1 resolution: "mem@npm:8.1.1" @@ -27342,6 +27357,13 @@ __metadata: languageName: node linkType: hard +"merge-descriptors@npm:^2.0.0": + version: 2.0.0 + resolution: "merge-descriptors@npm:2.0.0" + checksum: 10/e383332e700a94682d0125a36c8be761142a1320fc9feeb18e6e36647c9edf064271645f5669b2c21cf352116e561914fd8aa831b651f34db15ef4038c86696a + languageName: node + linkType: hard + "merge-source-map@npm:^1.1.0": version: 1.1.0 resolution: "merge-source-map@npm:1.1.0" @@ -27457,6 +27479,13 @@ __metadata: languageName: node linkType: hard +"mime-db@npm:^1.53.0": + version: 1.53.0 + resolution: "mime-db@npm:1.53.0" + checksum: 10/82409c568a20254cc67a763a25e581d2213e1ef5d070a0af805239634f8a655f5d8a15138200f5f81c5b06fc6623d27f6168c612d447642d59e37eb7f20f7412 + languageName: node + linkType: hard + "mime-type@npm:^4.0.0": version: 4.0.0 resolution: "mime-type@npm:4.0.0" @@ -27468,7 +27497,7 @@ __metadata: languageName: node linkType: hard -"mime-types@npm:^2.0.8, mime-types@npm:^2.1.12, mime-types@npm:^2.1.27, mime-types@npm:^2.1.31, mime-types@npm:~2.1.17, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34": +"mime-types@npm:^2.0.8, mime-types@npm:^2.1.12, mime-types@npm:^2.1.27, mime-types@npm:^2.1.31, mime-types@npm:^2.1.35, mime-types@npm:~2.1.17, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34": version: 2.1.35 resolution: "mime-types@npm:2.1.35" dependencies: @@ -27477,6 +27506,15 @@ __metadata: languageName: node linkType: hard +"mime-types@npm:^3.0.0": + version: 3.0.0 + resolution: "mime-types@npm:3.0.0" + dependencies: + mime-db: "npm:^1.53.0" + checksum: 10/819584a951124b1cdee21e0c5515d174e1df018407b837297cef0da0620e4c0551336909fc3704166fca3a3fc141d19976bcc34e94eb720af04bbf4b50b43545 + languageName: node + linkType: hard + "mime@npm:1.6.0, mime@npm:^1.3.4": version: 1.6.0 resolution: "mime@npm:1.6.0" @@ -28306,6 +28344,13 @@ __metadata: languageName: node linkType: hard +"negotiator@npm:^1.0.0": + version: 1.0.0 + resolution: "negotiator@npm:1.0.0" + checksum: 10/b5734e87295324fabf868e36fb97c84b7d7f3156ec5f4ee5bf6e488079c11054f818290fc33804cef7b1ee21f55eeb14caea83e7dafae6492a409b3e573153e5 + languageName: node + linkType: hard + "neo-async@npm:^2.6.2": version: 2.6.2 resolution: "neo-async@npm:2.6.2" @@ -28951,7 +28996,7 @@ __metadata: languageName: node linkType: hard -"object.entries@npm:^1.1.6": +"object.entries@npm:^1.1.8": version: 1.1.8 resolution: "object.entries@npm:1.1.8" dependencies: @@ -28962,7 +29007,7 @@ __metadata: languageName: node linkType: hard -"object.fromentries@npm:^2.0.6, object.fromentries@npm:^2.0.8": +"object.fromentries@npm:^2.0.8": version: 2.0.8 resolution: "object.fromentries@npm:2.0.8" dependencies: @@ -28985,18 +29030,18 @@ __metadata: languageName: node linkType: hard -"object.hasown@npm:^1.1.2": - version: 1.1.4 - resolution: "object.hasown@npm:1.1.4" +"object.groupby@npm:^1.0.3": + version: 1.0.3 + resolution: "object.groupby@npm:1.0.3" dependencies: + call-bind: "npm:^1.0.7" define-properties: "npm:^1.2.1" es-abstract: "npm:^1.23.2" - es-object-atoms: "npm:^1.0.0" - checksum: 10/797385577b3ef3c0d19333e03ed34bc7987978ae1ee1245069c9922e17d1128265187f729dc610260d03f8d418af26fcd7919b423793bf0af9099d9f08367d69 + checksum: 10/44cb86dd2c660434be65f7585c54b62f0425b0c96b5c948d2756be253ef06737da7e68d7106e35506ce4a44d16aa85a413d11c5034eb7ce5579ec28752eb42d0 languageName: node linkType: hard -"object.values@npm:^1.1.0, object.values@npm:^1.1.5, object.values@npm:^1.1.6": +"object.values@npm:^1.1.0, object.values@npm:^1.1.6": version: 1.1.6 resolution: "object.values@npm:1.1.6" dependencies: @@ -29007,6 +29052,17 @@ __metadata: languageName: node linkType: hard +"object.values@npm:^1.2.0": + version: 1.2.0 + resolution: "object.values@npm:1.2.0" + dependencies: + call-bind: "npm:^1.0.7" + define-properties: "npm:^1.2.1" + es-object-atoms: "npm:^1.0.0" + checksum: 10/db2e498019c354428c5dd30d02980d920ac365b155fce4dcf63eb9433f98ccf0f72624309e182ce7cc227c95e45d474e1d483418e60de2293dd23fa3ebe34903 + languageName: node + linkType: hard + "objectorarray@npm:^1.0.5": version: 1.0.5 resolution: "objectorarray@npm:1.0.5" @@ -29060,7 +29116,7 @@ __metadata: languageName: node linkType: hard -"once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0": +"once@npm:1.4.0, once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0": version: 1.4.0 resolution: "once@npm:1.4.0" dependencies: @@ -29234,10 +29290,10 @@ __metadata: languageName: node linkType: hard -"p-cancelable@npm:^1.1.0": - version: 1.1.0 - resolution: "p-cancelable@npm:1.1.0" - checksum: 10/2db3814fef6d9025787f30afaee4496a8857a28be3c5706432cbad76c688a6db1874308f48e364a42f5317f5e41e8e7b4f2ff5c8ff2256dbb6264bc361704ece +"p-cancelable@npm:^2": + version: 2.1.1 + resolution: "p-cancelable@npm:2.1.1" + checksum: 10/7f1b64db17fc54acf359167d62898115dcf2a64bf6b3b038e4faf36fc059e5ed762fb9624df8ed04b25bee8de3ab8d72dea9879a2a960cd12e23c420a4aca6ed languageName: node linkType: hard @@ -29393,14 +29449,7 @@ __metadata: languageName: node linkType: hard -"p-queue@npm:^2.4.2": - version: 2.4.2 - resolution: "p-queue@npm:2.4.2" - checksum: 10/0da957f9abd8d0c5b2479376a0da60441413df99d8094c65a97c6dbef9cf6ebc0b97599522df04f34c46db071b780072c9826691c1ebd196329e32ade6e4ddc0 - languageName: node - linkType: hard - -"p-queue@npm:^6.6.1, p-queue@npm:^6.6.2": +"p-queue@npm:^6, p-queue@npm:^6.6.2": version: 6.6.2 resolution: "p-queue@npm:6.6.2" dependencies: @@ -29417,7 +29466,7 @@ __metadata: languageName: node linkType: hard -"p-retry@npm:^4.0.0": +"p-retry@npm:^4": version: 4.6.2 resolution: "p-retry@npm:4.6.2" dependencies: @@ -29679,7 +29728,7 @@ __metadata: languageName: node linkType: hard -"parseurl@npm:~1.3.2, parseurl@npm:~1.3.3": +"parseurl@npm:^1.3.3, parseurl@npm:~1.3.2, parseurl@npm:~1.3.3": version: 1.3.3 resolution: "parseurl@npm:1.3.3" checksum: 10/407cee8e0a3a4c5cd472559bca8b6a45b82c124e9a4703302326e9ab60fc1081442ada4e02628efef1eb16197ddc7f8822f5a91fd7d7c86b51f530aedb17dfa2 @@ -29817,7 +29866,7 @@ __metadata: languageName: node linkType: hard -"path-to-regexp@npm:^8.1.0": +"path-to-regexp@npm:^8.0.0, path-to-regexp@npm:^8.1.0": version: 8.2.0 resolution: "path-to-regexp@npm:8.2.0" checksum: 10/23378276a172b8ba5f5fb824475d1818ca5ccee7bbdb4674701616470f23a14e536c1db11da9c9e6d82b82c556a817bbf4eee6e41b9ed20090ef9427cbb38e13 @@ -30270,36 +30319,42 @@ __metadata: languageName: node linkType: hard -"postcss-css-variables@npm:^0.17.0": - version: 0.17.0 - resolution: "postcss-css-variables@npm:0.17.0" +"postcss-css-variables@npm:^0.19.0": + version: 0.19.0 + resolution: "postcss-css-variables@npm:0.19.0" dependencies: balanced-match: "npm:^1.0.0" escape-string-regexp: "npm:^1.0.3" extend: "npm:^3.0.1" - postcss: "npm:^6.0.8" - checksum: 10/dc313f52ada736541c311e865506eefb2cc0574dde9e3731a4cbf46c0c98c75fe8ac813c5d0828a699916c47f84a42599c2355699842180441dc63564e9c108b + peerDependencies: + postcss: ^8.2.6 + checksum: 10/4f72d74ee9708c9343fe91f8a0f135aad5c88ce56061d8c5f2b9b957c0467b68a246e9f24726b23c338d1ef0244abab4eac56f0cae1618c47a81dcd66f14f53d languageName: node linkType: hard -"postcss-custom-properties@npm:^11.0.0": - version: 11.0.0 - resolution: "postcss-custom-properties@npm:11.0.0" +"postcss-custom-properties@npm:^14.0.4": + version: 14.0.4 + resolution: "postcss-custom-properties@npm:14.0.4" dependencies: - postcss-values-parser: "npm:^4.0.0" + "@csstools/cascade-layer-name-parser": "npm:^2.0.4" + "@csstools/css-parser-algorithms": "npm:^3.0.4" + "@csstools/css-tokenizer": "npm:^3.0.3" + "@csstools/utilities": "npm:^2.0.0" + postcss-value-parser: "npm:^4.2.0" peerDependencies: - postcss: ^8.1.0 - checksum: 10/883c5dd8b393daa5dd1bb57e6bbea1e42bdae8dec44eb692c4d4d4855898c6d43c23a87e3e4393dcfb7e333cc85ce4929ede8b7f413418dc76ea11f0fd5e6555 + postcss: ^8.4 + checksum: 10/69271500e2530a736c888cc34c2c3fa92d5bd95f261ba43073807dacba91df41cb1eeb2d137f4038662f5ff921b45bc1d05f66d6f2a79a9b468de0cb91571c19 languageName: node linkType: hard -"postcss-dir-pseudo-class@npm:^5.0.0": - version: 5.0.0 - resolution: "postcss-dir-pseudo-class@npm:5.0.0" +"postcss-dir-pseudo-class@npm:^9.0.1": + version: 9.0.1 + resolution: "postcss-dir-pseudo-class@npm:9.0.1" dependencies: - postcss: "npm:^7.0.2" - postcss-selector-parser: "npm:^5.0.0-rc.3" - checksum: 10/e6634eadb0ef7003fcd025217b4f140194740d419521e3856873e9c6ea9c70f984243eac51af3aa24d378d188216a4d9148f133ce74ab88d7ac8752396dc2d7b + postcss-selector-parser: "npm:^7.0.0" + peerDependencies: + postcss: ^8.4 + checksum: 10/7f6212fe7f2a83e95d85df14208df3edb75b6b8f89ad865fdfbd1abf5765b6649ff46bb7ff56f7788ff8cfe60546ff305cc2fd2f9b1f9e1647a4386507714070 languageName: node linkType: hard @@ -30356,12 +30411,12 @@ __metadata: languageName: node linkType: hard -"postcss-flexbugs-fixes@npm:^4.2.1": - version: 4.2.1 - resolution: "postcss-flexbugs-fixes@npm:4.2.1" - dependencies: - postcss: "npm:^7.0.26" - checksum: 10/51a626bc80dbe42fcc8b0895b4f23a558bb809ec52cdc05aa27fb24cdffd4c9dc53f25218085ddf407c53d76573bc6d7568219c912161609f02532a8f5f59b43 +"postcss-flexbugs-fixes@npm:^5.0.2": + version: 5.0.2 + resolution: "postcss-flexbugs-fixes@npm:5.0.2" + peerDependencies: + postcss: ^8.1.4 + checksum: 10/022ddbcca8987303b9be75ff259e9de81b98643adac87a5fc6b52a0fcbbf95e1ac9fd508c4ed67cad76ac5d039b7123de8a0832329481b3c626f5d63f7a28f47 languageName: node linkType: hard @@ -30387,21 +30442,26 @@ __metadata: languageName: node linkType: hard -"postcss-load-config@npm:^3.1.4": - version: 3.1.4 - resolution: "postcss-load-config@npm:3.1.4" +"postcss-load-config@npm:^6.0.1": + version: 6.0.1 + resolution: "postcss-load-config@npm:6.0.1" dependencies: - lilconfig: "npm:^2.0.5" - yaml: "npm:^1.10.2" + lilconfig: "npm:^3.1.1" peerDependencies: + jiti: ">=1.21.0" postcss: ">=8.0.9" - ts-node: ">=9.0.0" + tsx: ^4.8.1 + yaml: ^2.4.2 peerDependenciesMeta: + jiti: + optional: true postcss: optional: true - ts-node: + tsx: + optional: true + yaml: optional: true - checksum: 10/75fa409d77b96e6f53e99f680c550f25ca8922c1150d3d368ded1f6bd8e0d4d67a615fe1f1c5d409aefb6e66fb4b5e48e86856d581329913de84578def078b19 + checksum: 10/1691cfc94948a9373d4f7b3b7a8500cfaf8cb2dcc2107c14f90f2a711a9892a362b0866894ac5bb723455fa685a15116d9ed3252188689c4502b137c19d6bdc4 languageName: node linkType: hard @@ -30425,12 +30485,14 @@ __metadata: languageName: node linkType: hard -"postcss-logical@npm:^4.0.2": - version: 4.0.2 - resolution: "postcss-logical@npm:4.0.2" +"postcss-logical@npm:^8.0.0": + version: 8.0.0 + resolution: "postcss-logical@npm:8.0.0" dependencies: - postcss: "npm:^7.0.17" - checksum: 10/0378d99635bb739a6932e592c605b43e2cd4773962e3078936d18a6f88dc4a5832a61bc67bbd77d648ee9ea50978fa1920409d381a0d3acf601822b6da601918 + postcss-value-parser: "npm:^4.2.0" + peerDependencies: + postcss: ^8.4 + checksum: 10/bdaceacdc80b9b03e2af9e8eb5c195a96cd0a525836a362db357574293189c5ec0f581c71d1ec97856cfbb9ebd4239c24a0593e1f4e32b59aa878a98b5a6ae27 languageName: node linkType: hard @@ -30609,14 +30671,14 @@ __metadata: languageName: node linkType: hard -"postcss-nested@npm:^5.0.6": - version: 5.0.6 - resolution: "postcss-nested@npm:5.0.6" +"postcss-nested@npm:^7.0.2": + version: 7.0.2 + resolution: "postcss-nested@npm:7.0.2" dependencies: - postcss-selector-parser: "npm:^6.0.6" + postcss-selector-parser: "npm:^7.0.0" peerDependencies: postcss: ^8.2.14 - checksum: 10/713ec75c156e9a428c37767ea24c676e06e24a9a9bf9300372b61f038cc564d2af0bc7f5b8076c313cf583c62902a08de4e52ba0094e3a35554a2541942ee66a + checksum: 10/adcb74bb94869f7313f2677bcdf5dd9e368602ca6d3e1c1e3da514ee00ccf5c2bdd414fdb9141de65b0b7aee83d8f2b149c0d3723bc4af5ee8b8062dc6e09c3d languageName: node linkType: hard @@ -30779,13 +30841,14 @@ __metadata: languageName: node linkType: hard -"postcss-selector-not@npm:^4.0.1": - version: 4.0.1 - resolution: "postcss-selector-not@npm:4.0.1" +"postcss-selector-not@npm:^8.0.1": + version: 8.0.1 + resolution: "postcss-selector-not@npm:8.0.1" dependencies: - balanced-match: "npm:^1.0.0" - postcss: "npm:^7.0.2" - checksum: 10/08fbd3e5ca273f3b767bd35d6bd033647a68f59b596d8aec19a9089b750539bdf85121ed7fd00a7763174a55c75c22a309d75d306127e23dc396069781efbaa4 + postcss-selector-parser: "npm:^7.0.0" + peerDependencies: + postcss: ^8.4 + checksum: 10/28c1f7863ac85016ecd695304ee1eb21b1128eacba333d6d4540fd93691c58ff6329ac323b6a640f2da918e95c7b58e8f534c8b6e2ed016f6e31cdfdc743edbc languageName: node linkType: hard @@ -30800,18 +30863,7 @@ __metadata: languageName: node linkType: hard -"postcss-selector-parser@npm:^5.0.0-rc.3": - version: 5.0.0 - resolution: "postcss-selector-parser@npm:5.0.0" - dependencies: - cssesc: "npm:^2.0.0" - indexes-of: "npm:^1.0.1" - uniq: "npm:^1.0.1" - checksum: 10/0bfba73eb4e0a192052f008a03b15bd47539b28627b622f3cfe592c1bdc691501db28c9f703748e5ab0b015af8edb937370c8dca58ab85cb8c5e597865ef43be - languageName: node - linkType: hard - -"postcss-selector-parser@npm:^6.0.0, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.6": +"postcss-selector-parser@npm:^6.0.0, postcss-selector-parser@npm:^6.0.2": version: 6.0.13 resolution: "postcss-selector-parser@npm:6.0.13" dependencies: @@ -30831,6 +30883,16 @@ __metadata: languageName: node linkType: hard +"postcss-selector-parser@npm:^7.0.0": + version: 7.0.0 + resolution: "postcss-selector-parser@npm:7.0.0" + dependencies: + cssesc: "npm:^3.0.0" + util-deprecate: "npm:^1.0.2" + checksum: 10/0e92be7281e2b440a8be8cf207de40a24ca7bc765577916499614d5a47827a3e658206728cc559db96803e554270516104aad919a04f91bfa8914ccef1ba14ca + languageName: node + linkType: hard + "postcss-sorting@npm:^7.0.1": version: 7.0.1 resolution: "postcss-sorting@npm:7.0.1" @@ -30890,18 +30952,7 @@ __metadata: languageName: node linkType: hard -"postcss-values-parser@npm:^4.0.0": - version: 4.0.0 - resolution: "postcss-values-parser@npm:4.0.0" - dependencies: - color-name: "npm:^1.1.4" - is-url-superb: "npm:^4.0.0" - postcss: "npm:^7.0.5" - checksum: 10/6d7433835ff24de0b759feaeae76277858a4da6446e73183de4fa200a743eb290d7021936c49c7676d625876fbb89985364b8f64a35b2b0705554f620e95d863 - languageName: node - linkType: hard - -"postcss@npm:^6.0.21, postcss@npm:^6.0.8": +"postcss@npm:^6.0.21": version: 6.0.23 resolution: "postcss@npm:6.0.23" dependencies: @@ -30912,7 +30963,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^7.0.0, postcss@npm:^7.0.1, postcss@npm:^7.0.14, postcss@npm:^7.0.17, postcss@npm:^7.0.2, postcss@npm:^7.0.26, postcss@npm:^7.0.27, postcss@npm:^7.0.32, postcss@npm:^7.0.5, postcss@npm:^7.0.6": +"postcss@npm:^7.0.0, postcss@npm:^7.0.1, postcss@npm:^7.0.14, postcss@npm:^7.0.27, postcss@npm:^7.0.32, postcss@npm:^7.0.5, postcss@npm:^7.0.6": version: 7.0.39 resolution: "postcss@npm:7.0.39" dependencies: @@ -30958,12 +31009,12 @@ __metadata: languageName: node linkType: hard -"preact-router@npm:^3.2.1": - version: 3.2.1 - resolution: "preact-router@npm:3.2.1" +"preact-router@npm:^4.1.2": + version: 4.1.2 + resolution: "preact-router@npm:4.1.2" peerDependencies: preact: ">=10" - checksum: 10/0c1f7759372d11cd45baa690991fb87d4da42e437493eb3dd1884aed74c868346c9e16ea66792ac38ef4e9127f1afe36c9f4e1fc4a30d803436eda8bdb61025b + checksum: 10/f743a01fc49e3930c74c4328425847c103d93d830779cd5d764ff27878b643c14e1ba150f19334811498c73cd00d8af7adf0a8fbf105d24457fe219605b1cb85 languageName: node linkType: hard @@ -31201,20 +31252,6 @@ __metadata: languageName: node linkType: hard -"promise.allsettled@npm:^1.0.2": - version: 1.0.7 - resolution: "promise.allsettled@npm:1.0.7" - dependencies: - array.prototype.map: "npm:^1.0.5" - call-bind: "npm:^1.0.2" - define-properties: "npm:^1.2.0" - es-abstract: "npm:^1.22.1" - get-intrinsic: "npm:^1.2.1" - iterate-value: "npm:^1.0.2" - checksum: 10/8d2ddf495543e4d184db3842a7251a812e4e1907688475c9a545ae9ae922b59c0dc83d97af9a084d99cc2ab20ee3254ee0b37803e0c39bca681fb633133d6bd8 - languageName: node - linkType: hard - "promisify-any@npm:2.0.1": version: 2.0.1 resolution: "promisify-any@npm:2.0.1" @@ -31675,7 +31712,7 @@ __metadata: languageName: node linkType: hard -"raw-body@npm:2.5.2, raw-body@npm:^2.3.3": +"raw-body@npm:2.5.2": version: 2.5.2 resolution: "raw-body@npm:2.5.2" dependencies: @@ -31687,6 +31724,18 @@ __metadata: languageName: node linkType: hard +"raw-body@npm:^3, raw-body@npm:^3.0.0": + version: 3.0.0 + resolution: "raw-body@npm:3.0.0" + dependencies: + bytes: "npm:3.1.2" + http-errors: "npm:2.0.0" + iconv-lite: "npm:0.6.3" + unpipe: "npm:1.0.0" + checksum: 10/2443429bbb2f9ae5c50d3d2a6c342533dfbde6b3173740b70fa0302b30914ff400c6d31a46b3ceacbe7d0925dc07d4413928278b494b04a65736fc17ca33e30c + languageName: node + linkType: hard + "raw-loader@npm:~4.0.2": version: 4.0.2 resolution: "raw-loader@npm:4.0.2" @@ -32415,6 +32464,21 @@ __metadata: languageName: node linkType: hard +"reflect.getprototypeof@npm:^1.0.4": + version: 1.0.6 + resolution: "reflect.getprototypeof@npm:1.0.6" + dependencies: + call-bind: "npm:^1.0.7" + define-properties: "npm:^1.2.1" + es-abstract: "npm:^1.23.1" + es-errors: "npm:^1.3.0" + get-intrinsic: "npm:^1.2.4" + globalthis: "npm:^1.0.3" + which-builtin-type: "npm:^1.1.3" + checksum: 10/518f6457e4bb470c9b317d239c62d4b4a05678b7eae4f1c3f4332fad379b3ea6d2d8999bfad448547fdba8fb77e4725cfe8c6440d0168ff387f16b4f19f759ad + languageName: node + linkType: hard + "regenerate-unicode-properties@npm:^10.1.0": version: 10.1.0 resolution: "regenerate-unicode-properties@npm:10.1.0" @@ -32756,7 +32820,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.1.4, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.11.1, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.20.0, resolve@npm:^1.22.0, resolve@npm:^1.22.1, resolve@npm:^1.22.2, resolve@npm:^1.22.8, resolve@npm:^1.4.0": +"resolve@npm:^1.1.4, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.11.1, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.20.0, resolve@npm:^1.22.1, resolve@npm:^1.22.2, resolve@npm:^1.22.4, resolve@npm:^1.22.8, resolve@npm:^1.4.0": version: 1.22.8 resolution: "resolve@npm:1.22.8" dependencies: @@ -32769,7 +32833,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^2.0.0-next.4": +"resolve@npm:^2.0.0-next.5": version: 2.0.0-next.5 resolution: "resolve@npm:2.0.0-next.5" dependencies: @@ -32782,7 +32846,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@npm%3A^1.1.4#optional!builtin, resolve@patch:resolve@npm%3A^1.1.7#optional!builtin, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin, resolve@patch:resolve@npm%3A^1.11.1#optional!builtin, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin, resolve@patch:resolve@npm%3A^1.17.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin, resolve@patch:resolve@npm%3A^1.22.2#optional!builtin, resolve@patch:resolve@npm%3A^1.22.8#optional!builtin, resolve@patch:resolve@npm%3A^1.4.0#optional!builtin": +"resolve@patch:resolve@npm%3A^1.1.4#optional!builtin, resolve@patch:resolve@npm%3A^1.1.7#optional!builtin, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin, resolve@patch:resolve@npm%3A^1.11.1#optional!builtin, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin, resolve@patch:resolve@npm%3A^1.17.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin, resolve@patch:resolve@npm%3A^1.22.2#optional!builtin, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin, resolve@patch:resolve@npm%3A^1.22.8#optional!builtin, resolve@patch:resolve@npm%3A^1.4.0#optional!builtin": version: 1.22.8 resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin::version=1.22.8&hash=c3c19d" dependencies: @@ -32795,7 +32859,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@npm%3A^2.0.0-next.4#optional!builtin": +"resolve@patch:resolve@npm%3A^2.0.0-next.5#optional!builtin": version: 2.0.0-next.5 resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#optional!builtin::version=2.0.0-next.5&hash=c3c19d" dependencies: @@ -32937,6 +33001,13 @@ __metadata: languageName: node linkType: hard +"robust-predicates@npm:^3.0.2": + version: 3.0.2 + resolution: "robust-predicates@npm:3.0.2" + checksum: 10/88bd7d45a6b89e88da2631d4c111aaaf0443de4d7078e9ab7f732245790a3645cf79bf91882a9740dbc959cf56ba75d5dced5bf2259410f8b6de19fd240cd08c + languageName: node + linkType: hard + "rocket.chat@workspace:.": version: 0.0.0-use.local resolution: "rocket.chat@workspace:." @@ -33076,6 +33147,21 @@ __metadata: languageName: node linkType: hard +"router@npm:^2.0.0": + version: 2.0.0 + resolution: "router@npm:2.0.0" + dependencies: + array-flatten: "npm:3.0.0" + is-promise: "npm:4.0.0" + methods: "npm:~1.1.2" + parseurl: "npm:~1.3.3" + path-to-regexp: "npm:^8.0.0" + setprototypeof: "npm:1.2.0" + utils-merge: "npm:1.0.1" + checksum: 10/cb0b044f0672eca104239680ac16d2629809df41a886a07a5ec319c683ef3c09c4ac0c88a91de2cea3da7d314ea6054d9c35840851ab55a3c2230e9ba690a885 + languageName: node + linkType: hard + "run-applescript@npm:^7.0.0": version: 7.0.0 resolution: "run-applescript@npm:7.0.0" @@ -33448,6 +33534,26 @@ __metadata: languageName: node linkType: hard +"send@npm:^1.0.0, send@npm:^1.1.0": + version: 1.1.0 + resolution: "send@npm:1.1.0" + dependencies: + debug: "npm:^4.3.5" + destroy: "npm:^1.2.0" + encodeurl: "npm:^2.0.0" + escape-html: "npm:^1.0.3" + etag: "npm:^1.8.1" + fresh: "npm:^0.5.2" + http-errors: "npm:^2.0.0" + mime-types: "npm:^2.1.35" + ms: "npm:^2.1.3" + on-finished: "npm:^2.4.1" + range-parser: "npm:^1.2.1" + statuses: "npm:^2.0.1" + checksum: 10/5040d4d1e52a2a4634a3381a0c21be8115543be3ac0345b99c16d2510af2391968e1c4031ac3e1620cca6948f5ff888f39fa6515c4b6005c6c792c56300ea997 + languageName: node + linkType: hard + "sentence-case@npm:^3.0.4": version: 3.0.4 resolution: "sentence-case@npm:3.0.4" @@ -33513,6 +33619,18 @@ __metadata: languageName: node linkType: hard +"serve-static@npm:^2.1.0": + version: 2.1.0 + resolution: "serve-static@npm:2.1.0" + dependencies: + encodeurl: "npm:^2.0.0" + escape-html: "npm:^1.0.3" + parseurl: "npm:^1.3.3" + send: "npm:^1.0.0" + checksum: 10/ecb5969b66520e6546721454e72ee3fbe827fee16224a563d258d71ab68d9316991c81910b94bd2a7b75112669ef887068ab0ef66a4bf524ed8ed9c919a01de0 + languageName: node + linkType: hard + "set-blocking@npm:^2.0.0": version: 2.0.0 resolution: "set-blocking@npm:2.0.0" @@ -33801,10 +33919,10 @@ __metadata: languageName: node linkType: hard -"sip.js@npm:^0.20.1": - version: 0.20.1 - resolution: "sip.js@npm:0.20.1" - checksum: 10/26cfac162682c3e90e8cd768d084b41e34fd1dd5e5501c870e2847e542e6b29cd442035758af1ad87e57c5a07dc09969062d05869807a7395ccd7ee8bf5aa0c6 +"sip.js@npm:^0.21.2": + version: 0.21.2 + resolution: "sip.js@npm:0.21.2" + checksum: 10/ccddbf7e297b8f0517a6c59fa3e6e56b1fed84f10c518fdda3e84d99178295f1710448d0e6bd0c964c4f23bbf6288795cfcf3fa1224cfb2d75e9341f34ec077a languageName: node linkType: hard @@ -34332,7 +34450,7 @@ __metadata: languageName: node linkType: hard -"statuses@npm:2.0.1": +"statuses@npm:2.0.1, statuses@npm:^2.0.1": version: 2.0.1 resolution: "statuses@npm:2.0.1" checksum: 10/18c7623fdb8f646fb213ca4051be4df7efb3484d4ab662937ca6fbef7ced9b9e12842709872eb3020cc3504b93bde88935c9f6417489627a7786f24f8031cbcb @@ -34355,15 +34473,6 @@ __metadata: languageName: node linkType: hard -"stop-iteration-iterator@npm:^1.0.0": - version: 1.0.0 - resolution: "stop-iteration-iterator@npm:1.0.0" - dependencies: - internal-slot: "npm:^1.0.4" - checksum: 10/2a23a36f4f6bfa63f46ae2d53a3f80fe8276110b95a55345d8ed3d92125413494033bc8697eb774e8f7aeb5725f70e3d69753caa2ecacdac6258c16fa8aa8b0f - languageName: node - linkType: hard - "storybook-dark-mode@npm:^4.0.2": version: 4.0.2 resolution: "storybook-dark-mode@npm:4.0.2" @@ -34380,11 +34489,11 @@ __metadata: languageName: node linkType: hard -"storybook@npm:^8.4.1": - version: 8.4.1 - resolution: "storybook@npm:8.4.1" +"storybook@npm:^8.4.2": + version: 8.4.2 + resolution: "storybook@npm:8.4.2" dependencies: - "@storybook/core": "npm:8.4.1" + "@storybook/core": "npm:8.4.2" peerDependencies: prettier: ^2 || ^3 peerDependenciesMeta: @@ -34394,7 +34503,7 @@ __metadata: getstorybook: ./bin/index.cjs sb: ./bin/index.cjs storybook: ./bin/index.cjs - checksum: 10/10072ec75e3876916555bcb1c6e14fc987e25ade4579783a2f0eb2780cc45b6f04bbed115e01a97d549d819867113ec04b4ac2515545fee4d245bb309c8d8d61 + checksum: 10/e3f1e32371a6f70639fa4fbc24e703aeb99bdb417b7c4acca6d331bf777b7c9343195175c6c088e162b8feb50f267ea70db9dd23f3ab07f110e1a76e3c7618ca languageName: node linkType: hard @@ -34657,7 +34766,7 @@ __metadata: languageName: node linkType: hard -"string.prototype.matchall@npm:^4.0.8": +"string.prototype.matchall@npm:^4.0.11": version: 4.0.11 resolution: "string.prototype.matchall@npm:4.0.11" dependencies: @@ -34688,6 +34797,16 @@ __metadata: languageName: node linkType: hard +"string.prototype.repeat@npm:^1.0.0": + version: 1.0.0 + resolution: "string.prototype.repeat@npm:1.0.0" + dependencies: + define-properties: "npm:^1.1.3" + es-abstract: "npm:^1.17.5" + checksum: 10/4b1bd91b75fa8fdf0541625184ebe80e445a465ce4253c19c3bccd633898005dadae0f74b85ae72662a53aafb8035bf48f8f5c0755aec09bc106a7f13959d05e + languageName: node + linkType: hard + "string.prototype.trim@npm:^1.2.9": version: 1.2.9 resolution: "string.prototype.trim@npm:1.2.9" @@ -35922,18 +36041,19 @@ __metadata: languageName: node linkType: hard -"ts-loader@npm:~9.4.4": - version: 9.4.4 - resolution: "ts-loader@npm:9.4.4" +"ts-loader@npm:~9.5.1": + version: 9.5.1 + resolution: "ts-loader@npm:9.5.1" dependencies: chalk: "npm:^4.1.0" enhanced-resolve: "npm:^5.0.0" micromatch: "npm:^4.0.0" semver: "npm:^7.3.4" + source-map: "npm:^0.7.4" peerDependencies: typescript: "*" webpack: ^5.0.0 - checksum: 10/52302f3540962d779fc346281d8d4f7310f73e129debc4fb55c1fb3f097519009b32f7e2806299904e98961c785784fccb70ceca9076c4bae33f064ad11dd982 + checksum: 10/a85d43bb6f72858d613290ac02d1d24e81c38ba2dcb98b90465dc97eb6c2036bf9a389542c1a7865548643e7ed39f063fdff2dbb3e5aafbc511de6a3eb275adf languageName: node linkType: hard @@ -36028,15 +36148,15 @@ __metadata: languageName: node linkType: hard -"tsconfig-paths@npm:^3.14.1": - version: 3.14.1 - resolution: "tsconfig-paths@npm:3.14.1" +"tsconfig-paths@npm:^3.15.0": + version: 3.15.0 + resolution: "tsconfig-paths@npm:3.15.0" dependencies: "@types/json5": "npm:^0.0.29" - json5: "npm:^1.0.1" + json5: "npm:^1.0.2" minimist: "npm:^1.2.6" strip-bom: "npm:^3.0.0" - checksum: 10/51be8bd8f90e49d2f8b3f61f544557e631dd5cee35e247dd316be27d723c9e99de9ce59eb39395ca20f1e43aedfc1fef0272ba25acb0a0e0e9a38cffd692256d + checksum: 10/2041beaedc6c271fc3bedd12e0da0cc553e65d030d4ff26044b771fac5752d0460944c0b5e680f670c2868c95c664a256cec960ae528888db6ded83524e33a14 languageName: node linkType: hard @@ -36324,6 +36444,17 @@ __metadata: languageName: node linkType: hard +"type-is@npm:^2.0.0": + version: 2.0.0 + resolution: "type-is@npm:2.0.0" + dependencies: + content-type: "npm:^1.0.5" + media-typer: "npm:^1.1.0" + mime-types: "npm:^3.0.0" + checksum: 10/056ae0e94fc7e01209f001d2b4506e39908d95e454aef6eefec7f8f252a00b15c6c0a9707fa3d4d6a83be8ea3ea95fe1d6cfd5bfe7ef90831b61875f5512f441 + languageName: node + linkType: hard + "typed-array-buffer@npm:^1.0.2": version: 1.0.2 resolution: "typed-array-buffer@npm:1.0.2" @@ -36534,7 +36665,7 @@ __metadata: languageName: node linkType: hard -"undici-types@npm:~6.19.2": +"undici-types@npm:~6.19.2, undici-types@npm:~6.19.8": version: 6.19.8 resolution: "undici-types@npm:6.19.8" checksum: 10/cf0b48ed4fc99baf56584afa91aaffa5010c268b8842f62e02f752df209e3dea138b372a60a963b3b2576ed932f32329ce7ddb9cb5f27a6c83040d8cd74b7a70 @@ -37731,6 +37862,38 @@ __metadata: languageName: node linkType: hard +"which-builtin-type@npm:^1.1.3": + version: 1.1.4 + resolution: "which-builtin-type@npm:1.1.4" + dependencies: + function.prototype.name: "npm:^1.1.6" + has-tostringtag: "npm:^1.0.2" + is-async-function: "npm:^2.0.0" + is-date-object: "npm:^1.0.5" + is-finalizationregistry: "npm:^1.0.2" + is-generator-function: "npm:^1.0.10" + is-regex: "npm:^1.1.4" + is-weakref: "npm:^1.0.2" + isarray: "npm:^2.0.5" + which-boxed-primitive: "npm:^1.0.2" + which-collection: "npm:^1.0.2" + which-typed-array: "npm:^1.1.15" + checksum: 10/c0cdb9b004e7a326f4ce54c75b19658a3bec73601a71dd7e2d9538accb3e781b546b589c3f306caf5e7429ac1c8019028d5e662e2860f03603354105b8247c83 + languageName: node + linkType: hard + +"which-collection@npm:^1.0.2": + version: 1.0.2 + resolution: "which-collection@npm:1.0.2" + dependencies: + is-map: "npm:^2.0.3" + is-set: "npm:^2.0.3" + is-weakmap: "npm:^2.0.2" + is-weakset: "npm:^2.0.3" + checksum: 10/674bf659b9bcfe4055f08634b48a8588e879161b9fefed57e9ec4ff5601e4d50a05ccd76cf10f698ef5873784e5df3223336d56c7ce88e13bcf52ebe582fc8d7 + languageName: node + linkType: hard + "which-module@npm:^2.0.0": version: 2.0.0 resolution: "which-module@npm:2.0.0" @@ -37946,7 +38109,7 @@ __metadata: languageName: node linkType: hard -"ws@npm:^7.4.6, ws@npm:^7.5.3": +"ws@npm:^7.4.6": version: 7.5.9 resolution: "ws@npm:7.5.9" peerDependencies: @@ -37961,9 +38124,9 @@ __metadata: languageName: node linkType: hard -"ws@npm:^8.11.0, ws@npm:^8.2.3": - version: 8.17.0 - resolution: "ws@npm:8.17.0" +"ws@npm:^8, ws@npm:^8.18.0": + version: 8.18.0 + resolution: "ws@npm:8.18.0" peerDependencies: bufferutil: ^4.0.1 utf-8-validate: ">=5.0.2" @@ -37972,13 +38135,13 @@ __metadata: optional: true utf-8-validate: optional: true - checksum: 10/5e1dcb0ae70c6e2f158f5b446e0a72a2cd335b07aba73ee1872e9bae1285382286a10e53ed479db21bdd690a5dfd05641a768611ebb236253c62fefa43ef58b4 + checksum: 10/70dfe53f23ff4368d46e4c0b1d4ca734db2c4149c6f68bc62cb16fc21f753c47b35fcc6e582f3bdfba0eaeb1c488cddab3c2255755a5c3eecb251431e42b3ff6 languageName: node linkType: hard -"ws@npm:^8.18.0": - version: 8.18.0 - resolution: "ws@npm:8.18.0" +"ws@npm:^8.11.0, ws@npm:^8.2.3": + version: 8.17.0 + resolution: "ws@npm:8.17.0" peerDependencies: bufferutil: ^4.0.1 utf-8-validate: ">=5.0.2" @@ -37987,7 +38150,7 @@ __metadata: optional: true utf-8-validate: optional: true - checksum: 10/70dfe53f23ff4368d46e4c0b1d4ca734db2c4149c6f68bc62cb16fc21f753c47b35fcc6e582f3bdfba0eaeb1c488cddab3c2255755a5c3eecb251431e42b3ff6 + checksum: 10/5e1dcb0ae70c6e2f158f5b446e0a72a2cd335b07aba73ee1872e9bae1285382286a10e53ed479db21bdd690a5dfd05641a768611ebb236253c62fefa43ef58b4 languageName: node linkType: hard @@ -38136,7 +38299,7 @@ __metadata: languageName: node linkType: hard -"yaml@npm:^1.10.0, yaml@npm:^1.10.2": +"yaml@npm:^1.10.0": version: 1.10.2 resolution: "yaml@npm:1.10.2" checksum: 10/e088b37b4d4885b70b50c9fa1b7e54bd2e27f5c87205f9deaffd1fb293ab263d9c964feadb9817a7b129a5bf30a06582cb08750f810568ecc14f3cdbabb79cb3