Skip to content

Commit 3b250ac

Browse files
mkimberlinmkimberlin
authored
Merge branch 'develop' into dependabot/npm_and_yarn/web-ui/koa-2.16.1
2 parents 02fde13 + 4c8c31f commit 3b250ac

File tree

8 files changed

+314
-79
lines changed

8 files changed

+314
-79
lines changed

‎server/src/main/java/com/objectcomputing/checkins/notifications/social_media/SlackSender.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ public boolean send(String channelId, String slackBlocks) {
6969
.blocksAsString(slackBlocks)
7070
.build();
7171

72+
LOG.info("Slack Blocks: {}", slackBlocks);
73+
LOG.info("Chat Post Request: {}", request.toString());
74+
7275
// Send it to Slack
7376
ChatPostMessageResponse response = client.chatPostMessage(request);
7477

‎server/src/main/java/com/objectcomputing/checkins/services/kudos/KudosConverter.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import com.google.gson.Gson;
1616

1717
import jakarta.inject.Singleton;
18+
import org.slf4j.Logger;
19+
import org.slf4j.LoggerFactory;
1820

1921
import java.util.UUID;
2022
import java.util.List;
@@ -26,6 +28,8 @@ public class KudosConverter {
2628
private final KudosRecipientServices kudosRecipientServices;
2729
private final SlackSearch slackSearch;
2830

31+
private static final Logger LOG = LoggerFactory.getLogger(KudosConverter.class);
32+
2933
public KudosConverter(MemberProfileServices memberProfileServices,
3034
KudosRecipientServices kudosRecipientServices,
3135
SlackSearch slackSearch) {
@@ -35,6 +39,7 @@ public KudosConverter(MemberProfileServices memberProfileServices,
3539
}
3640

3741
public String toSlackBlock(Kudos kudos) {
42+
LOG.info("Kudos message: {}", kudos.getMessage());
3843
// Build the message text out of the Kudos data.
3944
List<RichTextElement> content = new ArrayList<>();
4045
content.add(
@@ -57,6 +62,7 @@ public String toSlackBlock(Kudos kudos) {
5762
.elements(content).build();
5863
RichTextBlock richTextBlock = RichTextBlock.builder()
5964
.elements(List.of(element)).build();
65+
LOG.info("RichTextBlock: {}", richTextBlock.toString());
6066
Gson mapper = GsonFactory.createSnakeCase();
6167
return mapper.toJson(List.of(richTextBlock));
6268
}

‎server/src/main/resources/META-INF/native-image/com.objectcomputing/checkins/reflect-config.json‎

Lines changed: 220 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,224 @@
11
[
2+
{
3+
"name": "java.lang.reflect.RecordComponent",
4+
"allPublicMethods": true
5+
},
6+
{
7+
"name": "com.slack.api.model.block.LayoutBlock",
8+
"allDeclaredFields": true,
9+
"allDeclaredConstructors" : true,
10+
"allPublicConstructors" : true,
11+
"allPublicMethods": true,
12+
"queryAllDeclaredConstructors": true,
13+
"queryAllDeclaredMethods": true
14+
},
15+
{
16+
"name": "com.slack.api.model.block.RichTextBlock",
17+
"allDeclaredFields": true,
18+
"allDeclaredConstructors" : true,
19+
"allPublicConstructors" : true,
20+
"allPublicMethods": true,
21+
"queryAllDeclaredConstructors": true,
22+
"queryAllDeclaredMethods": true
23+
},
24+
{
25+
"name": "com.slack.api.model.block.element.RichTextElement",
26+
"allDeclaredFields": true,
27+
"allDeclaredConstructors" : true,
28+
"allPublicConstructors" : true,
29+
"allPublicMethods": true,
30+
"queryAllDeclaredConstructors": true,
31+
"queryAllDeclaredMethods": true
32+
},
33+
{
34+
"name": "com.slack.api.model.block.element.RichTextSectionElement",
35+
"allDeclaredFields": true,
36+
"allDeclaredConstructors" : true,
37+
"allPublicConstructors" : true,
38+
"allPublicMethods": true,
39+
"queryAllDeclaredConstructors": true,
40+
"queryAllDeclaredMethods": true
41+
},
42+
{
43+
"name": "com.slack.api.model.block.element.RichTextSectionElement.LimitedTextStyle",
44+
"allDeclaredFields": true,
45+
"allDeclaredConstructors" : true,
46+
"allPublicConstructors" : true,
47+
"allPublicMethods": true,
48+
"queryAllDeclaredConstructors": true,
49+
"queryAllDeclaredMethods": true
50+
},
51+
{
52+
"name": "com.slack.api.model.block.element.RichTextSectionElement.TextStyle",
53+
"allDeclaredFields": true,
54+
"allDeclaredConstructors" : true,
55+
"allPublicConstructors" : true,
56+
"allPublicMethods": true,
57+
"queryAllDeclaredConstructors": true,
58+
"queryAllDeclaredMethods": true
59+
},
60+
{
61+
"name": "com.slack.api.model.block.element.RichTextSectionElement.Color",
62+
"allDeclaredFields": true,
63+
"allDeclaredConstructors" : true,
64+
"allPublicConstructors" : true,
65+
"allPublicMethods": true,
66+
"queryAllDeclaredConstructors": true,
67+
"queryAllDeclaredMethods": true
68+
},
69+
{
70+
"name": "com.slack.api.model.block.element.RichTextSectionElement.Broadcast",
71+
"allDeclaredFields": true,
72+
"allDeclaredConstructors" : true,
73+
"allPublicConstructors" : true,
74+
"allPublicMethods": true,
75+
"queryAllDeclaredConstructors": true,
76+
"queryAllDeclaredMethods": true
77+
},
78+
{
79+
"name": "com.slack.api.model.block.element.RichTextSectionElement.UserGroup",
80+
"allDeclaredFields": true,
81+
"allDeclaredConstructors" : true,
82+
"allPublicConstructors" : true,
83+
"allPublicMethods": true,
84+
"queryAllDeclaredConstructors": true,
85+
"queryAllDeclaredMethods": true
86+
},
87+
{
88+
"name": "com.slack.api.model.block.element.RichTextSectionElement.Team",
89+
"allDeclaredFields": true,
90+
"allDeclaredConstructors" : true,
91+
"allPublicConstructors" : true,
92+
"allPublicMethods": true,
93+
"queryAllDeclaredConstructors": true,
94+
"queryAllDeclaredMethods": true
95+
},
96+
{
97+
"name": "com.slack.api.model.block.element.RichTextSectionElement.Emoji",
98+
"allDeclaredFields": true,
99+
"allDeclaredConstructors" : true,
100+
"allPublicConstructors" : true,
101+
"allPublicMethods": true,
102+
"queryAllDeclaredConstructors": true,
103+
"queryAllDeclaredMethods": true
104+
},
105+
{
106+
"name": "com.slack.api.model.block.element.RichTextSectionElement.User",
107+
"allDeclaredFields": true,
108+
"allDeclaredConstructors" : true,
109+
"allPublicConstructors" : true,
110+
"allPublicMethods": true,
111+
"queryAllDeclaredConstructors": true,
112+
"queryAllDeclaredMethods": true
113+
},
114+
{
115+
"name": "com.slack.api.model.block.element.RichTextSectionElement.Channel",
116+
"allDeclaredFields": true,
117+
"allDeclaredConstructors" : true,
118+
"allPublicConstructors" : true,
119+
"allPublicMethods": true,
120+
"queryAllDeclaredConstructors": true,
121+
"queryAllDeclaredMethods": true
122+
},
123+
{
124+
"name": "com.slack.api.model.block.element.RichTextSectionElement.Date",
125+
"allDeclaredFields": true,
126+
"allDeclaredConstructors" : true,
127+
"allPublicConstructors" : true,
128+
"allPublicMethods": true,
129+
"queryAllDeclaredConstructors": true,
130+
"queryAllDeclaredMethods": true
131+
},
132+
{
133+
"name": "com.slack.api.model.block.element.RichTextSectionElement.Link",
134+
"allDeclaredFields": true,
135+
"allDeclaredConstructors" : true,
136+
"allPublicConstructors" : true,
137+
"allPublicMethods": true,
138+
"queryAllDeclaredConstructors": true,
139+
"queryAllDeclaredMethods": true
140+
},
141+
{
142+
"name": "com.slack.api.model.block.element.RichTextSectionElement.Text",
143+
"allDeclaredFields": true,
144+
"allDeclaredConstructors" : true,
145+
"allPublicConstructors" : true,
146+
"allPublicMethods": true,
147+
"queryAllDeclaredConstructors": true,
148+
"queryAllDeclaredMethods": true
149+
},
150+
{
151+
"name": "com.slack.api.model.ErrorResponseMetadata",
152+
"allDeclaredFields": true,
153+
"allDeclaredConstructors" : true,
154+
"allPublicConstructors" : true,
155+
"allPublicMethods": true,
156+
"queryAllDeclaredConstructors": true,
157+
"queryAllDeclaredMethods": true
158+
},
159+
{
160+
"name": "com.slack.api.methods.response.auth.AuthTestResponse",
161+
"allDeclaredFields": true,
162+
"allDeclaredConstructors" : true,
163+
"allPublicConstructors" : true,
164+
"allPublicMethods": true,
165+
"queryAllDeclaredConstructors": true,
166+
"queryAllDeclaredMethods": true
167+
},
168+
{
169+
"name": "com.slack.api.methods.response.chat.ChatPostMessageResponse",
170+
"allDeclaredFields": true,
171+
"allDeclaredConstructors" : true,
172+
"allPublicConstructors" : true,
173+
"allPublicMethods": true,
174+
"queryAllDeclaredConstructors": true,
175+
"queryAllDeclaredMethods": true
176+
},
177+
{
178+
"name": "com.slack.api.methods.response.conversations.ConversationsInfoResponse",
179+
"allDeclaredFields": true,
180+
"allDeclaredConstructors" : true,
181+
"allPublicConstructors" : true,
182+
"allPublicMethods": true,
183+
"queryAllDeclaredConstructors": true,
184+
"queryAllDeclaredMethods": true
185+
},
186+
{
187+
"name": "com.slack.api.methods.response.emoji.EmojiListResponse",
188+
"allDeclaredFields": true,
189+
"allDeclaredConstructors" : true,
190+
"allPublicConstructors" : true,
191+
"allPublicMethods": true,
192+
"queryAllDeclaredConstructors": true,
193+
"queryAllDeclaredMethods": true
194+
},
195+
{
196+
"name": "com.slack.api.methods.response.conversations.ConversationsListResponse",
197+
"allDeclaredFields": true,
198+
"allDeclaredConstructors" : true,
199+
"allPublicConstructors" : true,
200+
"allPublicMethods": true,
201+
"queryAllDeclaredConstructors": true,
202+
"queryAllDeclaredMethods": true
203+
},
204+
{
205+
"name": "com.slack.api.methods.response.users.UsersLookupByEmailResponse",
206+
"allDeclaredFields": true,
207+
"allDeclaredConstructors" : true,
208+
"allPublicConstructors" : true,
209+
"allPublicMethods": true,
210+
"queryAllDeclaredConstructors": true,
211+
"queryAllDeclaredMethods": true
212+
},
213+
{
214+
"name": "com.slack.api.methods.response.users.UsersInfoResponse",
215+
"allDeclaredFields": true,
216+
"allDeclaredConstructors" : true,
217+
"allPublicConstructors" : true,
218+
"allPublicMethods": true,
219+
"queryAllDeclaredConstructors": true,
220+
"queryAllDeclaredMethods": true
221+
},
2222
{
3223
"name": "com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer",
4224
"allDeclaredConstructors" : true,

‎web-ui/src/api/emoji.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { resolve } from './api.js';
22

33
const emojiUrl = '/services/slack/emoji';
44

5-
export const getCustomEmoji = async (cookie) => {
5+
export const getCustomEmoji = async cookie => {
66
return resolve({
77
url: emojiUrl,
88
responseType: 'json',

0 commit comments

Comments
 (0)