Skip to content

Commit 3cedad2

Browse files
author
Romaric Mourgues
authored
🛠 Medium fixes part 2 (#1838)
* Improve message options * UI fixes * Update Twake version * Fix ephemeral message reception * Ephemeral removal
1 parent 419f090 commit 3cedad2

File tree

30 files changed

+255
-122
lines changed

30 files changed

+255
-122
lines changed

‎.github/workflows/saas-update-backend.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
deploy-php:
1414
runs-on: ubuntu-20.04
1515
steps:
16-
- run: 'echo "DOCKERTAGVERSION=2021.Q3.735" >> $GITHUB_ENV'
16+
- run: 'echo "DOCKERTAGVERSION=2021.Q4.846" >> $GITHUB_ENV'
1717
- name: Set env to develop
1818
if: endsWith(github.ref, '/develop')
19-
run: 'echo "DOCKERTAG=develop" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=develop" >> $GITHUB_ENV'
19+
run: 'echo "DOCKERTAG=develop" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=2021.Q4.846" >> $GITHUB_ENV'
2020
- name: Set env to develop
2121
if: endsWith(github.ref, '/qa')
22-
run: 'echo "DOCKERTAG=qa" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=qa" >> $GITHUB_ENV'
22+
run: 'echo "DOCKERTAG=qa" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=2021.Q4.846" >> $GITHUB_ENV'
2323
- name: Set env to develop
2424
if: endsWith(github.ref, '/canary')
2525
run: 'echo "DOCKERTAG=canary" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=${{ env.DOCKERTAGVERSION }}-canary" >> $GITHUB_ENV'
@@ -40,13 +40,13 @@ jobs:
4040
deploy-node:
4141
runs-on: ubuntu-20.04
4242
steps:
43-
- run: 'echo "DOCKERTAGVERSION=2021.Q3.735" >> $GITHUB_ENV'
43+
- run: 'echo "DOCKERTAGVERSION=2021.Q4.846" >> $GITHUB_ENV'
4444
- name: Set env to develop
4545
if: endsWith(github.ref, '/develop')
46-
run: 'echo "DOCKERTAG=develop" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=develop" >> $GITHUB_ENV'
46+
run: 'echo "DOCKERTAG=develop" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=2021.Q4.846" >> $GITHUB_ENV'
4747
- name: Set env to develop
4848
if: endsWith(github.ref, '/qa')
49-
run: 'echo "DOCKERTAG=qa" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=qa" >> $GITHUB_ENV'
49+
run: 'echo "DOCKERTAG=qa" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=2021.Q4.846" >> $GITHUB_ENV'
5050
- name: Set env to develop
5151
if: endsWith(github.ref, '/canary')
5252
run: 'echo "DOCKERTAG=canary" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=${{ env.DOCKERTAGVERSION }}-canary" >> $GITHUB_ENV'

‎.github/workflows/saas-update-front.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ jobs:
4848
runs-on: ubuntu-20.04
4949
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/qa' || github.ref == 'refs/heads/canary'
5050
steps:
51-
- run: 'echo "DOCKERTAGVERSION=2021.Q3.735" >> $GITHUB_ENV'
51+
- run: 'echo "DOCKERTAGVERSION=2021.Q4.846" >> $GITHUB_ENV'
5252
- name: Set env to develop
5353
if: endsWith(github.ref, '/develop')
54-
run: 'echo "DOCKERTAG=develop" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=develop" >> $GITHUB_ENV'
54+
run: 'echo "DOCKERTAG=develop" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=2021.Q4.846" >> $GITHUB_ENV'
5555
- name: Set env to develop
5656
if: endsWith(github.ref, '/qa')
57-
run: 'echo "DOCKERTAG=qa" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=qa" >> $GITHUB_ENV'
57+
run: 'echo "DOCKERTAG=qa" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=2021.Q4.846" >> $GITHUB_ENV'
5858
- name: Set env to develop
5959
if: endsWith(github.ref, '/canary')
6060
run: 'echo "DOCKERTAG=canary" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=${{ env.DOCKERTAGVERSION }}-canary" >> $GITHUB_ENV'

‎twake/backend/core/src/DevelopersApiV1/Messages/Controller/Message.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ public function removeMessage(Request $request)
2121

2222
$capabilities = [];
2323

24+
$group_id = $request->request->get("group_id", null);
25+
$workspace_id = $request->request->get("workspace_id", null);
26+
2427
$application = $this->get("app.applications_api")->getAppFromRequest($request, $capabilities);
2528
if (is_array($application) && $application["error"]) {
2629
return new Response($application);
@@ -33,6 +36,8 @@ public function removeMessage(Request $request)
3336
$object = $request->request->get("message", null);
3437
$chan_id = $object["channel_id"];
3538

39+
$object["company_id"] = $group_id;
40+
$object["worskpace_id"] = $workspace_id;
3641
$result = $this->get("app.messages")->remove($object, $options);
3742
$front_id = $result["front_id"];
3843

‎twake/backend/core/src/Twake/Core/Controller/Version.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ function getVersion(Request $request)
4949
"auth_mode" => array_keys($auth),
5050
"auth" => $auth,
5151
"version" => [
52-
"current" => /* @VERSION_DETAIL */ "2021.Q3.735",
52+
"current" => /* @VERSION_DETAIL */ "2021.Q4.846",
5353
"minimal" => [
54-
"web" => /* @MIN_VERSION_WEB */ "2021.Q3.735",
55-
"mobile" => /* @MIN_VERSION_MOBILE */ "2021.Q3.735",
54+
"web" => /* @MIN_VERSION_WEB */ "2021.Q4.846",
55+
"mobile" => /* @MIN_VERSION_MOBILE */ "2021.Q4.846",
5656
]
5757
],
5858
"elastic_search_available" => !!$this->container->getParameter("es.host"),

‎twake/backend/core/src/Twake/Core/Services/AccessManager.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,8 @@ public function getChannelCache($companyId, $workspaceId, $channelId){
243243

244244
$name = html_entity_decode($this->emojione_client->shortnameToUnicode($name), ENT_NOQUOTES, 'UTF-8');
245245

246+
$workspaceId = $workspaceId ?: $resChannel["workspace_id"];
247+
246248
$workspace = $this->doctrine->getRepository("Twake\Workspaces:Workspace")->findOneBy(Array("id" => $workspaceId));
247249
$group = $this->doctrine->getRepository("Twake\Workspaces:Group")->findOneBy(Array("id" => $companyId));
248250
$workspaceName = $workspace ? $workspace->getName() : "";

‎twake/backend/core/src/Twake/Discussion/Services/MessageSystem.php‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,10 @@ public function get($options, $current_user)
8585

8686
public function remove($object, $options, $current_user = null)
8787
{
88-
$channel = $this->getInfosFromChannel($object["company_id"], $object["workspace_id"], $object["channel_id"]);
88+
$channel = $this->getInfosFromChannel($object["company_id"], $object["workspace_id"], $object["channel_id"]);
89+
$channel["company_id"] = $channel["company_id"] ?? $object["company_id"];
90+
$channel["workspace_id"] = $channel["workspace_id"] ?? $object["workspace_id"];
91+
8992
if(!$channel){
9093
return;
9194
}
@@ -290,9 +293,9 @@ public function convertFromNode($message, $channel){
290293
return $array;
291294
}
292295

293-
private function getInfosFromChannel($channelId){
296+
private function getInfosFromChannel($companyId, $workspaceId, $channelId){
294297

295-
$this->access_manager->getChannelCache($channelId);
298+
$this->access_manager->getChannelCache($companyId, $workspaceId, $channelId);
296299

297300
$channelDetails = $this->doctrine->getRepository("Twake\Core:CachedFromNode")->findOneBy(Array("company_id" => "unused", "type" => "channel", "key"=>$channelId));
298301
if($channelDetails){

‎twake/backend/core/src/Twake/Market/Services/ApplicationApi.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,11 @@ public function notifyApp($app_id, $type, $event, $data)
287287
"data" => $data
288288
);
289289

290+
if(isset($event["data"]["message"])){
291+
$event["data"]["message"]["channel_id"] = $event["data"]["message"]["cache"]["channel_id"];
292+
$event["data"]["message"]["workspace_id"] = $event["data"]["message"]["cache"]["workspace_id"];
293+
}
294+
290295
if (!$this->curl_rcx) {
291296
$this->curl_rcx = new RollingCurlX(10);
292297
$this->curl_rcx->setOptions([

‎twake/backend/node/src/services/messages/services/engine/processors/message-to-notifications/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export class MessageToNotificationsProcessor {
9494
sender: messageResource.user_id,
9595
creation_date: messageResource.created_at,
9696

97-
mentions: mentions,
97+
mentions,
9898

9999
sender_name: senderName,
100100
channel_name: channel.name,

‎twake/backend/node/src/services/messages/services/messages/service.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,13 @@ export class ThreadMessagesService implements MessageThreadMessagesServiceAPI {
315315
...pk,
316316
});
317317

318+
msg.ephemeral = pk.ephemeral || {
319+
id: pk.id,
320+
version: "",
321+
recipient: "",
322+
recipient_context_id: "",
323+
};
324+
318325
await this.onSaved(msg, { created: false }, context);
319326

320327
return new DeleteResult<Message>("message", msg, true);

‎twake/backend/node/src/version.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export default {
2-
current: /* @VERSION_DETAIL */ "2021.Q3.735",
2+
current: /* @VERSION_DETAIL */ "2021.Q4.846",
33
minimal: {
4-
web: /* @MIN_VERSION_WEB */ "2021.Q3.735",
5-
mobile: /* @MIN_VERSION_MOBILE */ "2021.Q3.735",
4+
web: /* @MIN_VERSION_WEB */ "2021.Q4.846",
5+
mobile: /* @MIN_VERSION_MOBILE */ "2021.Q4.846",
66
},
77
};

0 commit comments

Comments
 (0)