Skip to content

Commit

Permalink
fix(ActivitiesSdkAdapter): fix some problems related to post an activ…
Browse files Browse the repository at this point in the history
…ity using coversation API
  • Loading branch information
karinasigartau0798 authored and cipak committed Mar 14, 2022
1 parent b67d408 commit f3c32ff
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 5 deletions.
17 changes: 14 additions & 3 deletions src/ActivitiesSDKAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,22 @@ export default class ActivitiesSDKAdapter extends ActivitiesAdapter {
* @returns {Observable.<Activity>} Observable that emits the posted activity (including id)
*/
postActivity(activity) {
logger.debug('ACTIVITY', undefined, 'postActivity()', ['called with', {activity}]);
const card = this.getAdaptiveCard(activity);

const object = card && {
cards: [JSON.stringify(card)],
displayName: activity.text,
};

const {id, cluster = 'us'} = deconstructHydraId(activity.roomID);

const activity$ = from(this.datasource.internal.conversation.post(
{
id: deconstructHydraId('room', activity.roomID).id,
id,
cluster,
},
activity.text,
object || activity.text,
)).pipe(
map(fromSDKActivity),
catchError((err) => {
Expand Down Expand Up @@ -223,7 +234,7 @@ export default class ActivitiesSDKAdapter extends ActivitiesAdapter {
const mutableActivity = activity;

mutableActivity.attachments = [{
contenType: 'application/vnd.microsoft.card.adaptive',
contentType: 'application/vnd.microsoft.card.adaptive',
content: card,
}];
}
Expand Down
4 changes: 2 additions & 2 deletions src/ActivitiesSDKAdapter.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ describe('Activities SDK Adapter', () => {
() => Promise.reject(sdkError),
);

activitiesSDKAdapter.postActivity({}).subscribe(
activitiesSDKAdapter.postActivity({roomID: ''}).subscribe(
() => {
done.fail('Posted an activity instead of returning error');
},
Expand Down Expand Up @@ -269,7 +269,7 @@ describe('Activities SDK Adapter', () => {
roomID: 'roomID3',
text: 'text3',
attachments: [{
contenType: 'application/vnd.microsoft.card.adaptive',
contentType: 'application/vnd.microsoft.card.adaptive',
content: {
$schema: 'http://adaptivecards.io/schemas/adaptive-card.json',
type: 'AdaptiveCard',
Expand Down

0 comments on commit f3c32ff

Please sign in to comment.