From dbf50fc7576e4c570f1aa250c186d3a838ddb3f3 Mon Sep 17 00:00:00 2001 From: Luis Mauro Date: Tue, 17 Oct 2023 10:44:50 -0600 Subject: [PATCH 1/8] fix: FED-116 allow to invite RocketChat users to fed channels --- .../AddUsers/AddMatrixUsers/useAddMatrixUsers.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddMatrixUsers/useAddMatrixUsers.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddMatrixUsers/useAddMatrixUsers.tsx index 8e2ba65e02cb4..023695633feda 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddMatrixUsers/useAddMatrixUsers.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddMatrixUsers/useAddMatrixUsers.tsx @@ -20,9 +20,11 @@ export const useAddMatrixUsers = () => { try { let matrixIdVerificationMap = new Map(); const matrixIds = users.filter((user) => user.startsWith('@')); - const matrixIdsVerificationResponse = await dispatchVerifyEndpoint({ matrixIds }); - const { results: matrixIdsVerificationResults } = matrixIdsVerificationResponse; - matrixIdVerificationMap = new Map(Object.entries(matrixIdsVerificationResults)); + if (matrixIds.length > 0) { + const matrixIdsVerificationResponse = await dispatchVerifyEndpoint({ matrixIds }); + const { results: matrixIdsVerificationResults } = matrixIdsVerificationResponse; + matrixIdVerificationMap = new Map(Object.entries(matrixIdsVerificationResults)); + } setModal( Date: Fri, 20 Oct 2023 12:17:35 -0600 Subject: [PATCH 2/8] fix: add owner role for fed room creation --- apps/meteor/app/lib/server/functions/createRoom.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/meteor/app/lib/server/functions/createRoom.ts b/apps/meteor/app/lib/server/functions/createRoom.ts index 312451f54845e..3004dcd445cae 100644 --- a/apps/meteor/app/lib/server/functions/createRoom.ts +++ b/apps/meteor/app/lib/server/functions/createRoom.ts @@ -39,6 +39,7 @@ async function createUsersSubscriptions({ const extra: Partial = options?.subscriptionExtra || {}; extra.open = true; extra.ls = now; + extra.roles = ['owner']; if (room.prid) { extra.prid = room.prid; From 6db9d64489d114f5a8d4f0e8c5db2cd4608eb5c8 Mon Sep 17 00:00:00 2001 From: Luis Mauro Date: Fri, 20 Oct 2023 12:49:12 -0600 Subject: [PATCH 3/8] improve add user modal for fed channels --- .../AddUsers/AddMatrixUsers/AddMatrixUsersModal.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddMatrixUsers/AddMatrixUsersModal.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddMatrixUsers/AddMatrixUsersModal.tsx index 6703b14f2507a..49bccf9e53f74 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddMatrixUsers/AddMatrixUsersModal.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddMatrixUsers/AddMatrixUsersModal.tsx @@ -34,6 +34,7 @@ const AddMatrixUsersModal = ({ onClose, matrixIdVerifiedStatus, onSave, complete const usersToInvite = completeUserList.filter( (user) => !(matrixIdVerifiedStatus.has(user) && matrixIdVerifiedStatus.get(user) === 'UNVERIFIED'), ); + const rocketChatUsers = usersToInvite.filter((user) => !matrixIdVerifiedStatus.has(user)); const { handleSubmit } = useForm({ defaultValues: { @@ -53,7 +54,7 @@ const AddMatrixUsersModal = ({ onClose, matrixIdVerifiedStatus, onSave, complete - Sending Invitations + Continue Adding? @@ -65,6 +66,9 @@ const AddMatrixUsersModal = ({ onClose, matrixIdVerifiedStatus, onSave, complete {_matrixId}: ['name']} size='x20' /> ))} + {rocketChatUsers.map((_user) => ( +
  • {_user}
    • + ))} From 2c5990377f8c0ede41c9012b37a67da61dabe8bd Mon Sep 17 00:00:00 2001 From: Luis Mauro Date: Wed, 25 Oct 2023 15:15:33 -0600 Subject: [PATCH 4/8] create FederationServiceEE correctly --- apps/meteor/ee/server/startup/services.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/meteor/ee/server/startup/services.ts b/apps/meteor/ee/server/startup/services.ts index 37aec21bfe565..8bd8a714dc9d6 100644 --- a/apps/meteor/ee/server/startup/services.ts +++ b/apps/meteor/ee/server/startup/services.ts @@ -33,7 +33,7 @@ void (async () => { })(); await License.onLicense('federation', async () => { - const federationServiceEE = new FederationServiceEE(); + const federationServiceEE = await FederationServiceEE.createFederationService(); if (federationService) { api.destroyService(federationService); } From 73952428ab6a33b5fb554dd922fb5e6bdfe5682b Mon Sep 17 00:00:00 2001 From: Luis Mauro Date: Thu, 26 Oct 2023 13:15:33 -0600 Subject: [PATCH 5/8] use translation on Modal --- .../RoomMembers/AddUsers/AddMatrixUsers/AddMatrixUsersModal.tsx | 2 +- apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddMatrixUsers/AddMatrixUsersModal.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddMatrixUsers/AddMatrixUsersModal.tsx index 49bccf9e53f74..4ae17296a53e9 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddMatrixUsers/AddMatrixUsersModal.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddMatrixUsers/AddMatrixUsersModal.tsx @@ -54,7 +54,7 @@ const AddMatrixUsersModal = ({ onClose, matrixIdVerifiedStatus, onSave, complete - Continue Adding? + {t('Continue_Adding')} diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json index 001cdf080f7b5..5addea3195f30 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json @@ -1145,6 +1145,7 @@ "Contact_Info": "Contact Information", "Content": "Content", "Continue": "Continue", + "Continue_Adding": "Continue Adding?", "Continuous_sound_notifications_for_new_livechat_room": "Continuous sound notifications for new omnichannel room", "convert-team": "Convert Team", "convert-team_description": "Permission to convert team to channel", From 47c73fe654685ec092c3af87d82fcc21a4d9d2dc Mon Sep 17 00:00:00 2001 From: Luis Mauro Date: Wed, 16 Aug 2023 13:12:44 -0600 Subject: [PATCH 6/8] fix warning message --- .../src/v1/federation/FederationVerifyMatrixIdProps.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/rest-typings/src/v1/federation/FederationVerifyMatrixIdProps.ts b/packages/rest-typings/src/v1/federation/FederationVerifyMatrixIdProps.ts index a6009fe20d854..5196b8a7692bf 100644 --- a/packages/rest-typings/src/v1/federation/FederationVerifyMatrixIdProps.ts +++ b/packages/rest-typings/src/v1/federation/FederationVerifyMatrixIdProps.ts @@ -13,6 +13,9 @@ const FederationVerifyMatrixIdPropsSchema = { type: 'array', items: { type: 'string' }, uniqueItems: true, + additionalItems: false, + minItems: 1, + maxItems: 15, }, }, additionalProperties: false, From 5bed88651f30ac7ce96cd7f3fdbebb3e9667b589 Mon Sep 17 00:00:00 2001 From: Luis Mauro Date: Mon, 30 Oct 2023 10:57:40 -0600 Subject: [PATCH 7/8] fix error with ajv additionalItems --- .../src/v1/federation/FederationVerifyMatrixIdProps.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/rest-typings/src/v1/federation/FederationVerifyMatrixIdProps.ts b/packages/rest-typings/src/v1/federation/FederationVerifyMatrixIdProps.ts index 5196b8a7692bf..df145849d9dab 100644 --- a/packages/rest-typings/src/v1/federation/FederationVerifyMatrixIdProps.ts +++ b/packages/rest-typings/src/v1/federation/FederationVerifyMatrixIdProps.ts @@ -13,7 +13,6 @@ const FederationVerifyMatrixIdPropsSchema = { type: 'array', items: { type: 'string' }, uniqueItems: true, - additionalItems: false, minItems: 1, maxItems: 15, }, From a732a04ac4032f093d53cd43ccdd52d36c92999b Mon Sep 17 00:00:00 2001 From: Luis Mauro Date: Thu, 9 Nov 2023 13:38:49 -0600 Subject: [PATCH 8/8] add changeset --- .changeset/nasty-islands-trade.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/nasty-islands-trade.md diff --git a/.changeset/nasty-islands-trade.md b/.changeset/nasty-islands-trade.md new file mode 100644 index 0000000000000..b6df94282dd51 --- /dev/null +++ b/.changeset/nasty-islands-trade.md @@ -0,0 +1,6 @@ +--- +'@rocket.chat/rest-typings': minor +'@rocket.chat/meteor': minor +--- + +fix Federation Regression, builds service correctly