From 8ade81bd200e08eb69ed21c1848cdf1d8e364fed Mon Sep 17 00:00:00 2001 From: Tasso Evangelista Date: Mon, 25 Nov 2024 18:03:10 -0300 Subject: [PATCH] chore: Drop unused type declarations and type exports (#34055) --- apps/meteor/app/api/server/definition.ts | 15 +++------------ .../server/classes/converters/UserConverter.ts | 7 ------- .../meteor/app/livechat/server/lib/localTypes.ts | 2 +- apps/meteor/app/push/server/push.ts | 2 +- .../statistics/server/lib/getAppsStatistics.ts | 2 +- apps/meteor/client/apps/@types/IOrchestrator.ts | 16 ---------------- .../client/contexts/ImageGalleryContext.ts | 2 +- .../lib/cachedCollections/CachedCollection.ts | 2 -- apps/meteor/client/lib/minimongo/types.ts | 2 +- .../client/views/admin/mailer/MailerPage.tsx | 2 +- .../components/InfoTextIconModal.tsx | 2 +- .../subscription/components/UsagePieGraph.tsx | 2 +- .../counter/CounterContainer.tsx | 2 +- .../SidepanelItem/RoomSidepanelItem.tsx | 2 +- .../views/room/contexts/UserCardContext.ts | 2 +- .../NotificationPreferencesWithData.tsx | 11 ----------- 16 files changed, 14 insertions(+), 59 deletions(-) diff --git a/apps/meteor/app/api/server/definition.ts b/apps/meteor/app/api/server/definition.ts index c15e0bc10d9..84083ec8014 100644 --- a/apps/meteor/app/api/server/definition.ts +++ b/apps/meteor/app/api/server/definition.ts @@ -112,16 +112,7 @@ export type PartialThis = { readonly logger: Logger; }; -export type UserInfo = IUser & { - email?: string; - settings: { - profile: object; - preferences: unknown; - }; - avatarUrl: string; -}; - -export type ActionThis = { +type ActionThis = { readonly requestIp: string; urlParams: UrlParams; readonly response: Response; @@ -186,11 +177,11 @@ export type ResultFor body: unknown; }; -export type Action = +type Action = | ((this: ActionThis) => Promise>) | ((this: ActionThis) => ResultFor); -export type Operation = +type Operation = | Action | ({ action: Action; diff --git a/apps/meteor/app/importer/server/classes/converters/UserConverter.ts b/apps/meteor/app/importer/server/classes/converters/UserConverter.ts index 421af3cb611..1b411100e13 100644 --- a/apps/meteor/app/importer/server/classes/converters/UserConverter.ts +++ b/apps/meteor/app/importer/server/classes/converters/UserConverter.ts @@ -26,13 +26,6 @@ export type UserConverterOptions = { enableEmail2fa?: boolean; }; -export type ConvertUsersResult = { - inserted: string[]; - updated: string[]; - skipped: number; - failed: number; -}; - export class UserConverter extends RecordConverter { private insertedIds = new Set(); diff --git a/apps/meteor/app/livechat/server/lib/localTypes.ts b/apps/meteor/app/livechat/server/lib/localTypes.ts index d58cad8f50b..93ac3dbb71d 100644 --- a/apps/meteor/app/livechat/server/lib/localTypes.ts +++ b/apps/meteor/app/livechat/server/lib/localTypes.ts @@ -1,6 +1,6 @@ import type { IOmnichannelRoom, IUser, ILivechatVisitor, IMessage, MessageAttachment, IMessageInbox } from '@rocket.chat/core-typings'; -export type GenericCloseRoomParams = { +type GenericCloseRoomParams = { room: IOmnichannelRoom; comment?: string; options?: { diff --git a/apps/meteor/app/push/server/push.ts b/apps/meteor/app/push/server/push.ts index 77092051eee..5c664aa9662 100644 --- a/apps/meteor/app/push/server/push.ts +++ b/apps/meteor/app/push/server/push.ts @@ -20,7 +20,7 @@ const ajv = new Ajv({ coerceTypes: true, }); -export type FCMCredentials = { +type FCMCredentials = { type: string; project_id: string; private_key_id: string; diff --git a/apps/meteor/app/statistics/server/lib/getAppsStatistics.ts b/apps/meteor/app/statistics/server/lib/getAppsStatistics.ts index 628fdccf0c2..40c8e1946e3 100644 --- a/apps/meteor/app/statistics/server/lib/getAppsStatistics.ts +++ b/apps/meteor/app/statistics/server/lib/getAppsStatistics.ts @@ -6,7 +6,7 @@ import mem from 'mem'; import { SystemLogger } from '../../../../server/lib/logger/system'; import { Info } from '../../../utils/rocketchat.info'; -export type AppsStatistics = { +type AppsStatistics = { engineVersion: string; totalInstalled: number | false; totalActive: number | false; diff --git a/apps/meteor/client/apps/@types/IOrchestrator.ts b/apps/meteor/client/apps/@types/IOrchestrator.ts index ac2642161c2..7d73f6afb71 100644 --- a/apps/meteor/client/apps/@types/IOrchestrator.ts +++ b/apps/meteor/client/apps/@types/IOrchestrator.ts @@ -1,21 +1,5 @@ import type { ISetting } from '@rocket.chat/apps-engine/definition/settings/ISetting'; -interface ILanguageInfo { - Params: string; - Description: string; - Setting_Name: string; - Setting_Description: string; -} - -interface ILanguages { - [key: string]: ILanguageInfo; -} - -export interface IAppLanguage { - id: string; - languages: ILanguages; -} - export interface IAppExternalURL { url: string; } diff --git a/apps/meteor/client/contexts/ImageGalleryContext.ts b/apps/meteor/client/contexts/ImageGalleryContext.ts index 2fea5e46a40..e843db53220 100644 --- a/apps/meteor/client/contexts/ImageGalleryContext.ts +++ b/apps/meteor/client/contexts/ImageGalleryContext.ts @@ -1,6 +1,6 @@ import { createContext } from 'react'; -export type ImageGalleryContextValue = { +type ImageGalleryContextValue = { imageId: string; isOpen: boolean; onClose: () => void; diff --git a/apps/meteor/client/lib/cachedCollections/CachedCollection.ts b/apps/meteor/client/lib/cachedCollections/CachedCollection.ts index 8a12e3ed677..8439afe648c 100644 --- a/apps/meteor/client/lib/cachedCollections/CachedCollection.ts +++ b/apps/meteor/client/lib/cachedCollections/CachedCollection.ts @@ -15,8 +15,6 @@ 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'; - type Name = 'rooms' | 'subscriptions' | 'permissions' | 'public-settings' | 'private-settings'; const hasId = (record: T): record is T & { _id: string } => typeof record === 'object' && record !== null && '_id' in record; diff --git a/apps/meteor/client/lib/minimongo/types.ts b/apps/meteor/client/lib/minimongo/types.ts index be63aca3726..f09f5f88ecd 100644 --- a/apps/meteor/client/lib/minimongo/types.ts +++ b/apps/meteor/client/lib/minimongo/types.ts @@ -63,7 +63,7 @@ export type FieldExpression = { $comment?: string; }; -export type Flatten = T extends unknown[] ? T[0] : T; +type Flatten = T extends unknown[] ? T[0] : T; export type Query = { [P in keyof T]?: Flatten | RegExp | FieldExpression>; diff --git a/apps/meteor/client/views/admin/mailer/MailerPage.tsx b/apps/meteor/client/views/admin/mailer/MailerPage.tsx index 1563f31efdb..bffbd434929 100644 --- a/apps/meteor/client/views/admin/mailer/MailerPage.tsx +++ b/apps/meteor/client/views/admin/mailer/MailerPage.tsx @@ -23,7 +23,7 @@ import { validateEmail } from '../../../../lib/emailValidator'; import { isJSON } from '../../../../lib/utils/isJSON'; import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page'; -export type SendEmailFormValue = { +type SendEmailFormValue = { fromEmail: string; subject: string; emailBody: string; diff --git a/apps/meteor/client/views/admin/subscription/components/InfoTextIconModal.tsx b/apps/meteor/client/views/admin/subscription/components/InfoTextIconModal.tsx index 1f6fb6db190..d55f1cec8f0 100644 --- a/apps/meteor/client/views/admin/subscription/components/InfoTextIconModal.tsx +++ b/apps/meteor/client/views/admin/subscription/components/InfoTextIconModal.tsx @@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next'; import GenericModal from '../../../../components/GenericModal'; -export type InfoTextIconModalProps = { +type InfoTextIconModalProps = { title: string; infoText: ReactNode; }; diff --git a/apps/meteor/client/views/admin/subscription/components/UsagePieGraph.tsx b/apps/meteor/client/views/admin/subscription/components/UsagePieGraph.tsx index 3e07122adaf..dc9ed074be5 100644 --- a/apps/meteor/client/views/admin/subscription/components/UsagePieGraph.tsx +++ b/apps/meteor/client/views/admin/subscription/components/UsagePieGraph.tsx @@ -14,7 +14,7 @@ const graphColors = (color: CSSProperties['color']): GraphColorsReturn => ({ free: Palette.stroke['stroke-extra-light'].toString(), }); -export type UsagePieGraphProps = { +type UsagePieGraphProps = { used: number; total: number; label?: ReactNode; diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx index cc3b82c2548..73203ff4ff0 100644 --- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx +++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx @@ -9,7 +9,7 @@ import CounterItem from './CounterItem'; import CounterRow from './CounterRow'; import { AsyncStatePhase } from '../../../../hooks/useAsyncState'; -export type DataType = { +type DataType = { title: string; value: number | string; }[]; diff --git a/apps/meteor/client/views/room/Sidepanel/SidepanelItem/RoomSidepanelItem.tsx b/apps/meteor/client/views/room/Sidepanel/SidepanelItem/RoomSidepanelItem.tsx index 8bb4d84eaeb..4181b13765d 100644 --- a/apps/meteor/client/views/room/Sidepanel/SidepanelItem/RoomSidepanelItem.tsx +++ b/apps/meteor/client/views/room/Sidepanel/SidepanelItem/RoomSidepanelItem.tsx @@ -6,7 +6,7 @@ import { goToRoomById } from '../../../../lib/utils/goToRoomById'; import { useTemplateByViewMode } from '../../../../sidebarv2/hooks/useTemplateByViewMode'; import { useItemData } from '../hooks/useItemData'; -export type RoomSidepanelItemProps = { +type RoomSidepanelItemProps = { openedRoom?: string; room: IRoom; parentRid: string; diff --git a/apps/meteor/client/views/room/contexts/UserCardContext.ts b/apps/meteor/client/views/room/contexts/UserCardContext.ts index 9bf163f8ca8..bbd101a8f20 100644 --- a/apps/meteor/client/views/room/contexts/UserCardContext.ts +++ b/apps/meteor/client/views/room/contexts/UserCardContext.ts @@ -3,7 +3,7 @@ import { createContext, useContext } from 'react'; import type { AriaButtonProps } from 'react-aria'; import type { OverlayTriggerState } from 'react-stately'; -export type UserCardContextValue = { +type UserCardContextValue = { openUserCard: (e: UIEvent, username: string) => void; closeUserCard: () => void; triggerProps: AriaButtonProps<'button'>; diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesWithData.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesWithData.tsx index c893a6efc29..7e6a8bf6e75 100644 --- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesWithData.tsx +++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesWithData.tsx @@ -9,17 +9,6 @@ import { useEndpointAction } from '../../../../hooks/useEndpointAction'; import { useRoom, useRoomSubscription } from '../../contexts/RoomContext'; import { useRoomToolbox } from '../../contexts/RoomToolboxContext'; -export type NotificationFormValues = { - turnOn: boolean; - muteGroupMentions: boolean; - showCounter: boolean; - showMentions: boolean; - desktopAlert: string; - desktopSound: string; - mobileAlert: string; - emailAlert: string; -}; - const NotificationPreferencesWithData = (): ReactElement => { const t = useTranslation(); const room = useRoom();