feat: hide unconfirmed uploads from room's file list (RocketChat#38077)

Author: pierre-lehnen-rc

.changeset/ninety-pans-search.md

@@ -0,0 +1,6 @@
+---
+'@rocket.chat/rest-typings': minor
+'@rocket.chat/meteor': minor
+---
+
+Changes list of Room Files to only show files that have been successfully attached to a message

apps/meteor/app/api/server/v1/channels.ts

@@ -807,7 +807,7 @@ API.v1.addRoute(
 	{ authRequired: true, validateParams: isChannelsFilesListProps },
 	{
 		async get() {
-			const { typeGroup, name, roomId, roomName } = this.queryParams;
+			const { typeGroup, name, roomId, roomName, onlyConfirmed } = this.queryParams;
 
 			const findResult = await findChannelByIdOrName({
 				params: {
@@ -829,6 +829,7 @@ API.v1.addRoute(
 				...query,
 				...(name ? { name: { $regex: name || '', $options: 'i' } } : {}),
 				...(typeGroup ? { typeGroup } : {}),
+				...(onlyConfirmed && { expiresAt: { $exists: false } }),
 			};
 
 			const { cursor, totalCount } = await Uploads.findPaginatedWithoutThumbs(filter, {

apps/meteor/app/api/server/v1/groups.ts

@@ -392,7 +392,7 @@ API.v1.addRoute(
 	{ authRequired: true, validateParams: isGroupsFilesProps },
 	{
 		async get() {
-			const { typeGroup, name, roomId, roomName } = this.queryParams;
+			const { typeGroup, name, roomId, roomName, onlyConfirmed } = this.queryParams;
 
 			const findResult = await findPrivateGroupByIdOrName({
 				params: roomId ? { roomId } : { roomName },
@@ -408,6 +408,7 @@ API.v1.addRoute(
 				rid: findResult.rid,
 				...(name ? { name: { $regex: name || '', $options: 'i' } } : {}),
 				...(typeGroup ? { typeGroup } : {}),
+				...(onlyConfirmed && { expiresAt: { $exists: false } }),
 			};
 
 			const { cursor, totalCount } = await Uploads.findPaginatedWithoutThumbs(filter, {

apps/meteor/app/api/server/v1/im.ts

@@ -279,7 +279,7 @@ API.v1.addRoute(
 	},
 	{
 		async get() {
-			const { typeGroup, name, roomId, username } = this.queryParams;
+			const { typeGroup, name, roomId, username, onlyConfirmed } = this.queryParams;
 
 			const { offset, count } = await getPaginationItems(this.queryParams);
 			const { sort, fields, query } = await this.parseJsonQuery();
@@ -296,6 +296,7 @@ API.v1.addRoute(
 				rid: room._id,
 				...(name ? { name: { $regex: name || '', $options: 'i' } } : {}),
 				...(typeGroup ? { typeGroup } : {}),
+				...(onlyConfirmed && { expiresAt: { $exists: false } }),
 			};
 
 			const { cursor, totalCount } = Uploads.findPaginatedWithoutThumbs(filter, {

apps/meteor/client/views/room/contextualBar/RoomFiles/hooks/useFilesList.ts

@@ -54,6 +54,7 @@ export const useFilesList = (
 				...(options.type !== 'all' && {
 					typeGroup: options.type,
 				}),
+				onlyConfirmed: true,
 			});
 
 			const items = files.map((file) => ({

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

@@ -11,6 +11,7 @@ export type ChannelsFilesListProps = PaginatedRequest<
 		name?: string;
 		typeGroup?: string;
 		query?: string;
+		onlyConfirmed?: boolean;
 	}
 >;
 
@@ -49,6 +50,9 @@ const channelsFilesListPropsSchema = {
 			type: 'string',
 			nullable: true,
 		},
+		onlyConfirmed: {
+			type: 'boolean',
+		},
 	},
 	oneOf: [{ required: ['roomId'] }, { required: ['roomName'] }],
 	required: [],

packages/rest-typings/src/v1/dm/DmFileProps.ts

@@ -5,7 +5,12 @@ import type { PaginatedRequest } from '../../helpers/PaginatedRequest';
 const ajv = new Ajv({ coerceTypes: true });
 
 export type DmFileProps = PaginatedRequest<
-	({ roomId: string; username?: string } | { roomId?: string; username: string }) & { name?: string; typeGroup?: string; query?: string }
+	({ roomId: string; username?: string } | { roomId?: string; username: string }) & {
+		name?: string;
+		typeGroup?: string;
+		query?: string;
+		onlyConfirmed?: boolean;
+	}
 >;
 
 const dmFilesListPropsSchema = {
@@ -43,6 +48,9 @@ const dmFilesListPropsSchema = {
 			type: 'string',
 			nullable: true,
 		},
+		onlyConfirmed: {
+			type: 'boolean',
+		},
 	},
 	oneOf: [{ required: ['roomId'] }, { required: ['username'] }],
 	required: [],

packages/rest-typings/src/v1/groups/GroupsFilesProps.ts

@@ -10,6 +10,7 @@ const ajv = new Ajv({
 export type GroupsFilesProps = PaginatedRequest<GroupsBaseProps> & {
 	name?: string;
 	typeGroup?: string;
+	onlyConfirmed?: boolean;
 };
 
 const GroupsFilesPropsSchema = {
@@ -47,6 +48,9 @@ const GroupsFilesPropsSchema = {
 			type: 'string',
 			nullable: true,
 		},
+		onlyConfirmed: {
+			type: 'boolean',
+		},
 	},
 	oneOf: [{ required: ['roomId'] }, { required: ['roomName'] }],
 	required: [],