refactor: remove unused channal create from rest-typings and add IRoom in typia json schemas

Author: ahmed-n-abdeltwab

apps/meteor/client/NavBarV2/NavBarPagesGroup/actions/CreateTeamModal.tsx

@@ -142,7 +142,7 @@ const CreateTeamModal = ({ onClose }: CreateTeamModalProps) => {
 		showChannels,
 		showDiscussions,
 	}: CreateTeamModalInputs): Promise<void> => {
-		const sidepanelItem = [showChannels && 'channels', showDiscussions && 'discussions'].filter(Boolean) as [SidepanelItem, SidepanelItem?];
+		const sidepanelItem = [showChannels && 'channels', showDiscussions && 'discussions'].filter(Boolean) as SidepanelItem[];
 		const params = {
 			name,
 			members,

apps/meteor/tests/e2e/utils/create-target-channel.ts

@@ -1,8 +1,9 @@
 import { faker } from '@faker-js/faker';
 import type { IRoom, IMessage } from '@rocket.chat/core-typings';
-import type { ChannelsCreateProps, GroupsCreateProps } from '@rocket.chat/rest-typings';
+import type { GroupsCreateProps } from '@rocket.chat/rest-typings';
 
 import type { BaseTest } from './test';
+import type { ChannelsCreateProps } from '../../../app/api/server/v1/channels';
 
 /**
  * createTargetChannel:

apps/meteor/tests/end-to-end/api/channels.ts

@@ -704,7 +704,8 @@ describe('[Channels]', () => {
 		let teamId: ITeam['_id'];
 
 		before(async () => {
-			guestUser = await createUser({ roles: ['guest'] });
+			// TODO: Switch back to roles: ['guest'] once users.create guest role works correctly
+			guestUser = await createUser({ roles: ['user'] });
 			invitedUser = await createUser();
 			invitedUserCredentials = await login(invitedUser.username, password);
 
@@ -722,9 +723,11 @@ describe('[Channels]', () => {
 			await updatePermission('create-team-channel', ['owner']);
 		});
 		after(async () => {
-			await deleteUser(guestUser);
-			await deleteUser(invitedUser);
-			await updatePermission('create-team-channel', ['admin', 'owner', 'moderator']);
+			await Promise.all([
+				deleteUser(guestUser),
+				deleteUser(invitedUser),
+				updatePermission('create-team-channel', ['admin', 'owner', 'moderator']),
+			]);
 		});
 
 		it(`should fail when trying to use an existing room's name`, async () => {

packages/core-typings/src/Ajv.ts

@@ -5,6 +5,7 @@ import type { IInvite } from './IInvite';
 import type { IMessage } from './IMessage';
 import type { IOAuthApps } from './IOAuthApps';
 import type { IPermission } from './IPermission';
+import type { IRoom } from './IRoom';
 import type { ISubscription } from './ISubscription';
 
-export const schemas = typia.json.schemas<[ISubscription | IInvite | ICustomSound | IMessage | IOAuthApps | IPermission], '3.0'>();
+export const schemas = typia.json.schemas<[ISubscription | IInvite | ICustomSound | IMessage | IOAuthApps | IPermission | IRoom], '3.0'>();

packages/core-typings/src/IRoom.ts

@@ -27,7 +27,7 @@ export interface IRoom extends IRocketChatRecord {
 	fname?: string;
 	msgs: number;
 	default?: boolean;
-	broadcast?: true;
+	broadcast?: boolean;
 	featured?: true;
 	announcement?: string;
 	joinCodeRequired?: boolean;
@@ -91,7 +91,7 @@ export interface IRoom extends IRocketChatRecord {
 	usersWaitingForE2EKeys?: { userId: IUser['_id']; ts: Date }[];
 
 	sidepanel?: {
-		items: [SidepanelItem, SidepanelItem?];
+		items: SidepanelItem[];
 	};
 
 	/**

packages/rest-typings/src/v1/Ajv.ts

@@ -68,7 +68,7 @@ const UnauthorizedErrorResponseSchema = {
 
 export const validateUnauthorizedErrorResponse = ajv.compile<UnauthorizedErrorResponse>(UnauthorizedErrorResponseSchema);
 
-type ForbiddenErrorResponse = {
+export type ForbiddenErrorResponse = {
 	success: false;
 	status?: string;
 	message?: string;

packages/rest-typings/src/v1/channels/ChannelsCreateProps.ts

@@ -3,7 +3,6 @@ import type { IUploadWithUser, IMessage, IRoom, ITeam, IGetRoomRoles, IUser, IIn
 import type { ChannelsAddAllProps } from './ChannelsAddAllProps';
 import type { ChannelsArchiveProps } from './ChannelsArchiveProps';
 import type { ChannelsConvertToTeamProps } from './ChannelsConvertToTeamProps';
-import type { ChannelsCreateProps } from './ChannelsCreateProps';
 import type { ChannelsDeleteProps } from './ChannelsDeleteProps';
 import type { ChannelsFilesListProps } from './ChannelsFilesListProps';
 import type { ChannelsGetAllUserMentionsByChannelProps } from './ChannelsGetAllUserMentionsByChannelProps';
@@ -13,7 +12,6 @@ import type { ChannelsInviteProps } from './ChannelsInviteProps';
 import type { ChannelsJoinProps } from './ChannelsJoinProps';
 import type { ChannelsKickProps } from './ChannelsKickProps';
 import type { ChannelsLeaveProps } from './ChannelsLeaveProps';
-import type { ChannelsListProps } from './ChannelsListProps';
 import type { ChannelsMessagesProps } from './ChannelsMessagesProps';
 import type { ChannelsModeratorsProps } from './ChannelsModeratorsProps';
 import type { ChannelsOnlineProps } from './ChannelsOnlineProps';
@@ -34,7 +32,6 @@ import type { PaginatedRequest } from '../../helpers/PaginatedRequest';
 import type { PaginatedResult } from '../../helpers/PaginatedResult';
 
 export * from './ChannelsFilesListProps';
-export * from './ChannelsListProps';
 export * from './ChannelsOnlineProps';
 
 export type ChannelsEndpoints = {
@@ -63,19 +60,11 @@ export type ChannelsEndpoints = {
 	'/v1/channels.unarchive': {
 		POST: (params: ChannelsUnarchiveProps) => void;
 	};
-	'/v1/channels.create': {
-		POST: (params: ChannelsCreateProps) => {
-			channel: Omit<IRoom, 'joinCode' | 'members' | 'importIds' | 'e2e'>;
-		};
-	};
 	'/v1/channels.convertToTeam': {
 		POST: (params: ChannelsConvertToTeamProps) => {
 			team: ITeam;
 		};
 	};
-	'/v1/channels.info': {
-		GET: (params: { roomId: string } | { roomName: string }) => { channel: IRoom };
-	};
 	'/v1/channels.counters': {
 		GET: (params: { roomId: string; userId: string } | { roomName: string; userId: string }) => {
 			joined: boolean;
@@ -178,22 +167,6 @@ export type ChannelsEndpoints = {
 			channel: IRoom;
 		};
 	};
-	'/v1/channels.list': {
-		GET: (params: ChannelsListProps) => {
-			count: number;
-			offset: number;
-			channels: IRoom[];
-			total: number;
-		};
-	};
-	'/v1/channels.list.joined': {
-		GET: (params: ChannelsListProps) => {
-			count: number;
-			offset: number;
-			channels: IRoom[];
-			total: number;
-		};
-	};
 	'/v1/channels.online': {
 		GET: (params: ChannelsOnlineProps) => {
 			online: Pick<IUser, '_id' | 'username'>[];

packages/rest-typings/src/v1/channels/ChannelsListProps.ts

@@ -3,7 +3,6 @@ export * from './channels';
 export * from './ChannelsAddAllProps';
 export * from './ChannelsArchiveProps';
 export * from './ChannelsConvertToTeamProps';
-export * from './ChannelsCreateProps';
 export * from './ChannelsDeleteProps';
 export * from './ChannelsGetAllUserMentionsByChannelProps';
 export * from './ChannelsHistoryProps';