apitech
/
Rocket.Chat
mirror of https://github.com/RocketChat/Rocket.Chat
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat: add closedBy on apps-engine (#33048)

Browse Source
pull/33131/head
Guilherme Gazzo 1 year ago committed by GitHub
parent 10baefd345
commit d9dd2c4dab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 39 additions and 25 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 20
      apps/meteor/app/apps/server/converters/rooms.js
  2. 2
      apps/meteor/ee/server/services/package.json
  3. 2
      apps/meteor/package.json
  4. 2
      ee/apps/ddp-streamer/package.json
  5. 2
      ee/packages/presence/package.json
  6. 2
      packages/apps/package.json
  7. 2
      packages/core-services/package.json
  8. 2
      packages/core-typings/package.json
  9. 2
      packages/fuselage-ui-kit/package.json
  10. 2
      packages/rest-typings/package.json
  11. 26
      yarn.lock

20
apps/meteor/app/apps/server/converters/rooms.js
Unescape View File

@ -111,8 +111,8 @@ export class AppRoomsConverter {
return Object.assign(newRoom, room._unmappedProperties_);
}
async convertRoom(room) {
if (!room) {
async convertRoom(originalRoom) {
if (!originalRoom) {
return undefined;
}
@ -134,6 +134,7 @@ export class AppRoomsConverter {
_USERNAMES: '_USERNAMES',
description: 'description',
source: 'source',
closer: 'closer',
isDefault: (room) => {
const result = !!room.default;
delete room.default;
@ -210,6 +211,19 @@ export class AppRoomsConverter {
return this.orch.getConverters().get('departments').convertById(departmentId);
},
closedBy: async (room) => {
const { closedBy } = room;
if (!closedBy) {
return undefined;
}
delete room.closedBy;
if (originalRoom.closer === 'user') {
return this.orch.getConverters().get('users').convertById(closedBy._id);
}
return this.orch.getConverters().get('visitors').convertById(closedBy._id);
},
servedBy: async (room) => {
const { servedBy } = room;
@ -245,7 +259,7 @@ export class AppRoomsConverter {
},
};
return transformMappedData(room, map);
return transformMappedData(originalRoom, map);
}
_convertTypeToApp(typeChar) {

2
apps/meteor/ee/server/services/package.json
Unescape View File

@ -18,7 +18,7 @@
"author": "Rocket.Chat",
"license": "MIT",
"dependencies": {
"@rocket.chat/apps-engine": "1.45.0-alpha.864",
"@rocket.chat/apps-engine": "1.45.0-alpha.866",
"@rocket.chat/core-services": "workspace:^",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "~0.31.25",

2
apps/meteor/package.json
Unescape View File

@ -230,7 +230,7 @@
"@rocket.chat/agenda": "workspace:^",
"@rocket.chat/api-client": "workspace:^",
"@rocket.chat/apps": "workspace:^",
"@rocket.chat/apps-engine": "1.45.0-alpha.864",
"@rocket.chat/apps-engine": "1.45.0-alpha.866",
"@rocket.chat/base64": "workspace:^",
"@rocket.chat/cas-validate": "workspace:^",
"@rocket.chat/core-services": "workspace:^",

2
ee/apps/ddp-streamer/package.json
Unescape View File

@ -15,7 +15,7 @@
],
"author": "Rocket.Chat",
"dependencies": {
"@rocket.chat/apps-engine": "1.45.0-alpha.864",
"@rocket.chat/apps-engine": "1.45.0-alpha.866",
"@rocket.chat/core-services": "workspace:^",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "~0.31.25",

2
ee/packages/presence/package.json
Unescape View File

@ -6,7 +6,7 @@
"@babel/core": "~7.22.20",
"@babel/preset-env": "~7.22.20",
"@babel/preset-typescript": "~7.22.15",
"@rocket.chat/apps-engine": "1.45.0-alpha.864",
"@rocket.chat/apps-engine": "1.45.0-alpha.866",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/rest-typings": "workspace:^",
"@types/node": "^14.18.63",

2
packages/apps/package.json
Unescape View File

@ -18,7 +18,7 @@
"/dist"
],
"dependencies": {
"@rocket.chat/apps-engine": "1.45.0-alpha.864",
"@rocket.chat/apps-engine": "1.45.0-alpha.866",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/model-typings": "workspace:^"
}

2
packages/core-services/package.json
Unescape View File

@ -34,7 +34,7 @@
"extends": "../../package.json"
},
"dependencies": {
"@rocket.chat/apps-engine": "1.45.0-alpha.864",
"@rocket.chat/apps-engine": "1.45.0-alpha.866",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/icons": "~0.38.0",
"@rocket.chat/message-parser": "workspace:^",

2
packages/core-typings/package.json
Unescape View File

@ -22,7 +22,7 @@
"/dist"
],
"dependencies": {
"@rocket.chat/apps-engine": "1.45.0-alpha.864",
"@rocket.chat/apps-engine": "1.45.0-alpha.866",
"@rocket.chat/icons": "~0.38.0",
"@rocket.chat/message-parser": "workspace:^",
"@rocket.chat/ui-kit": "workspace:~"

2
packages/fuselage-ui-kit/package.json
Unescape View File

@ -63,7 +63,7 @@
"@babel/preset-env": "~7.22.20",
"@babel/preset-react": "~7.22.15",
"@babel/preset-typescript": "~7.22.15",
"@rocket.chat/apps-engine": "1.45.0-alpha.864",
"@rocket.chat/apps-engine": "1.45.0-alpha.866",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/fuselage": "^0.57.0",

2
packages/rest-typings/package.json
Unescape View File

@ -23,7 +23,7 @@
"/dist"
],
"dependencies": {
"@rocket.chat/apps-engine": "1.45.0-alpha.864",
"@rocket.chat/apps-engine": "1.45.0-alpha.866",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/message-parser": "workspace:^",
"@rocket.chat/ui-kit": "workspace:~",

26
yarn.lock
Unescape View File

@ -8483,9 +8483,9 @@ __metadata:
languageName: unknown
linkType: soft
"@rocket.chat/apps-engine@npm:1.45.0-alpha.864":
version: 1.45.0-alpha.864
resolution: "@rocket.chat/apps-engine@npm:1.45.0-alpha.864"
"@rocket.chat/apps-engine@npm:1.45.0-alpha.866":
version: 1.45.0-alpha.866
resolution: "@rocket.chat/apps-engine@npm:1.45.0-alpha.866"
dependencies:
"@msgpack/msgpack": 3.0.0-beta2
adm-zip: ^0.5.9
@ -8501,7 +8501,7 @@ __metadata:
uuid: ~8.3.2
peerDependencies:
"@rocket.chat/ui-kit": "*"
checksum: 4f223dd0671d920e4eaafa465fe87584473f3295061252d1020c0d0e1c076c3b74ee98af1ee5aedfeb72b042e38c3f381d10a151b3a2abcf33a7de8ac6146fa1
checksum: 04abb4f712fcca206c6791322b52e2a3d97f3db06f606cd1f58fdda4e63d2123d7004bb445ad7582c52808c3ec4433d465d8855e24f3ab2f8457dafa6b017c5b
languageName: node
linkType: hard
@ -8509,7 +8509,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@rocket.chat/apps@workspace:packages/apps"
dependencies:
"@rocket.chat/apps-engine": 1.45.0-alpha.864
"@rocket.chat/apps-engine": 1.45.0-alpha.866
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/model-typings": "workspace:^"
eslint: ~8.45.0
@ -8582,7 +8582,7 @@ __metadata:
"@babel/core": ~7.22.20
"@babel/preset-env": ~7.22.20
"@babel/preset-typescript": ~7.22.15
"@rocket.chat/apps-engine": 1.45.0-alpha.864
"@rocket.chat/apps-engine": 1.45.0-alpha.866
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/eslint-config": "workspace:^"
"@rocket.chat/icons": ~0.38.0
@ -8609,7 +8609,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@rocket.chat/core-typings@workspace:packages/core-typings"
dependencies:
"@rocket.chat/apps-engine": 1.45.0-alpha.864
"@rocket.chat/apps-engine": 1.45.0-alpha.866
"@rocket.chat/eslint-config": "workspace:^"
"@rocket.chat/icons": ~0.38.0
"@rocket.chat/message-parser": "workspace:^"
@ -8681,7 +8681,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer"
dependencies:
"@rocket.chat/apps-engine": 1.45.0-alpha.864
"@rocket.chat/apps-engine": 1.45.0-alpha.866
"@rocket.chat/core-services": "workspace:^"
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/ddp-client": "workspace:~"
@ -8879,7 +8879,7 @@ __metadata:
"@babel/preset-env": ~7.22.20
"@babel/preset-react": ~7.22.15
"@babel/preset-typescript": ~7.22.15
"@rocket.chat/apps-engine": 1.45.0-alpha.864
"@rocket.chat/apps-engine": 1.45.0-alpha.866
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/eslint-config": "workspace:^"
"@rocket.chat/fuselage": ^0.57.0
@ -9329,7 +9329,7 @@ __metadata:
"@rocket.chat/agenda": "workspace:^"
"@rocket.chat/api-client": "workspace:^"
"@rocket.chat/apps": "workspace:^"
"@rocket.chat/apps-engine": 1.45.0-alpha.864
"@rocket.chat/apps-engine": 1.45.0-alpha.866
"@rocket.chat/base64": "workspace:^"
"@rocket.chat/cas-validate": "workspace:^"
"@rocket.chat/core-services": "workspace:^"
@ -9952,7 +9952,7 @@ __metadata:
"@babel/core": ~7.22.20
"@babel/preset-env": ~7.22.20
"@babel/preset-typescript": ~7.22.15
"@rocket.chat/apps-engine": 1.45.0-alpha.864
"@rocket.chat/apps-engine": 1.45.0-alpha.866
"@rocket.chat/core-services": "workspace:^"
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/eslint-config": "workspace:^"
@ -10066,7 +10066,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@rocket.chat/rest-typings@workspace:packages/rest-typings"
dependencies:
"@rocket.chat/apps-engine": 1.45.0-alpha.864
"@rocket.chat/apps-engine": 1.45.0-alpha.866
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/eslint-config": "workspace:~"
"@rocket.chat/message-parser": "workspace:^"
@ -36694,7 +36694,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "rocketchat-services@workspace:apps/meteor/ee/server/services"
dependencies:
"@rocket.chat/apps-engine": 1.45.0-alpha.864
"@rocket.chat/apps-engine": 1.45.0-alpha.866
"@rocket.chat/core-services": "workspace:^"
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/emitter": ~0.31.25

Write Preview
Loading…
Cancel
Save