Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: edited flag for message #563

Merged
merged 1 commit into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
"@ngx-translate/core": "^13.0.0",
"@ngx-translate/http-loader": "^6.0.0",
"@popperjs/core": "^2.11.5",
"@stream-io/stream-chat-css": "4.7.4",
"@stream-io/stream-chat-css": "4.8.0",
"@stream-io/transliterate": "^1.5.2",
"angular-mentions": "^1.4.0",
"dayjs": "^1.10.7",
Expand All @@ -126,7 +126,7 @@
"ngx-popperjs": "^12.2.2",
"pretty-bytes": "^5.6.0",
"rxjs": "^7.1.0",
"stream-chat": "^8.15.0",
"stream-chat": "^8.20.0",
"ts-node": "^10.2.1",
"tslib": "^2.3.0",
"uuidv4": "^6.2.12",
Expand Down
2 changes: 1 addition & 1 deletion projects/stream-chat-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@angular/common": "^12.2.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0",
"@angular/core": "^12.2.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0",
"@ngx-translate/core": "^13.0.0 || ^14.0.0 || ^15.0.0",
"stream-chat": "^8.15.0"
"stream-chat": "^8.20.0"
},
"dependencies": {
"angular-mentions": "^1.4.0",
Expand Down
1 change: 1 addition & 0 deletions projects/stream-chat-angular/src/assets/i18n/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,5 +117,6 @@ export const en = {
'This message did not meet our content guidelines':
'This message did not meet our content guidelines',
'Send Anyway': 'Send Anyway',
Edited: 'Edited',
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,14 @@ describe('getGroupStyles', () => {
)
).toBe('top');
});

it('should end group if the message id edited', () => {
messages[1].message_text_updated_at = new Date().toISOString();

expect(getGroupStyles(messages[1], messages[0], messages[2])).toBe(
'bottom'
);

expect(getGroupStyles(messages[2], messages[1], messages[3])).toBe('top');
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export const getGroupStyles = (
previousMessage.type === 'error' ||
previousMessage.deleted_at ||
previousMessage.id === lastReadMessageId ||
previousMessage.message_text_updated_at ||
(message.reaction_counts &&
Object.keys(message.reaction_counts).length > 0);

Expand All @@ -37,6 +38,7 @@ export const getGroupStyles = (
nextMessage.type === 'error' ||
nextMessage.deleted_at ||
message.id === lastReadMessageId ||
message.message_text_updated_at ||
(nextMessage.reaction_counts &&
Object.keys(nextMessage.reaction_counts).length > 0);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,15 @@
class="str-chat__message-text"
tabindex="0"
*ngIf="message?.text || (message?.quoted_message && hasAttachment)"
[class.str-chat__message-text--pointer-cursor]="
(message?.status === 'failed' &&
message?.errorStatusCode !== 403) ||
(this.message?.type === 'error' &&
this.message?.moderation_details) ||
message?.message_text_updated_at
"
(click)="messageClicked()"
(keyup.enter)="messageClicked()"
>
<div
data-testid="inner-message"
Expand All @@ -184,8 +193,6 @@
[class.str-chat__message-light-text-inner--has-attachment]="
hasAttachment
"
(click)="unsentMessageClicked()"
(keyup.enter)="unsentMessageClicked()"
>
<ng-container *ngTemplateOutlet="quotedMessage"></ng-container>
<ng-container *ngIf="hasAttachment && message?.quoted_message">
Expand Down Expand Up @@ -459,9 +466,36 @@
>
{{ message?.user?.name ? message?.user?.name : message?.user?.id }}
</span>
<span data-testid="date" class="str-chat__message-simple-timestamp">
<span
data-testid="date"
class="str-chat__message-simple-timestamp str-chat__message-simple-time"
>
{{ parsedDate }}
</span>
<ng-container *ngIf="message?.message_text_updated_at">
<span
data-testid="edited-flag"
class="str-chat__mesage-simple-edited"
translate
>streamChat.Edited</span
>
<div
data-testid="edited-timestamp"
class="str-chat__message-edited-timestamp"
[ngClass]="{
'str-chat__message-edited-timestamp--open': isEditedFlagOpened,
'str-chat__message-edited-timestamp--collapsed': !isEditedFlagOpened
}"
>
<span translate>streamChat.Edited</span>
<time
dateTime="{{ message?.message_text_updated_at }}"
title="{{ message?.message_text_updated_at }}"
>
{{ pasedEditedDate }}
</time>
</div>
</ng-container>
</div>
</ng-container>
</ng-template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1347,4 +1347,37 @@ describe('MessageComponent', () => {
' <a href="https://getstream.io/" class="my-special-class">https://getstream.io/</a>'
);
});

it(`shouldn't display edited flag if message wasn't edited`, () => {
expect(
nativeElement.querySelector('[data-testid="edited-flag"]')
).toBeNull();
});

it(`should display edited flag if message was edited, edited info should be collapsed`, () => {
component.message!.message_text_updated_at = new Date().toISOString();
component.ngOnChanges({ message: {} as SimpleChange });
fixture.detectChanges();

expect(
nativeElement.querySelector('[data-testid="edited-flag"]')
).not.toBeNull();

expect(
nativeElement.querySelector('[data-testid="edited-timestamp"]')
).not.toBeNull();
});

it(`should display edited flag if message was edited, display timestamp if clicked`, () => {
component.message!.message_text_updated_at = new Date().toISOString();
component.ngOnChanges({ message: {} as SimpleChange });
fixture.detectChanges();
queryMessageInner()?.click();
fixture.detectChanges();
const timestamp = nativeElement.querySelector(
'[data-testid="edited-timestamp"]'
);

expect(timestamp?.innerHTML).toContain(component.pasedEditedDate);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ export class MessageComponent
canReceiveReadEvents: boolean | undefined;
canReactToMessage: boolean | undefined;
isActionBoxOpen = false;
isEditedFlagOpened = false;
isReactionSelectorOpen = false;
visibleMessageActionsCount = 0;
messageTextParts: MessagePart[] | undefined = [];
Expand All @@ -110,6 +111,7 @@ export class MessageComponent
isReadByMultipleUsers = false;
isMessageDeliveredAndRead = false;
parsedDate = '';
pasedEditedDate = '';
areOptionsVisible = false;
hasAttachment = false;
hasReactions = false;
Expand Down Expand Up @@ -194,6 +196,13 @@ export class MessageComponent
this.message.created_at &&
this.dateParser.parseDateTime(this.message.created_at)) ||
'';
this.pasedEditedDate =
(this.message &&
this.message.message_text_updated_at &&
this.dateParser.parseDateTime(
new Date(this.message.message_text_updated_at)
)) ||
'';
this.hasAttachment =
!!this.message?.attachments && !!this.message.attachments.length;
this.hasReactions =
Expand Down Expand Up @@ -314,7 +323,7 @@ export class MessageComponent
};
}

unsentMessageClicked() {
messageClicked() {
if (
this.message?.status === 'failed' &&
this.message?.errorStatusCode !== 403
Expand All @@ -325,6 +334,8 @@ export class MessageComponent
this.message?.moderation_details
) {
this.openMessageBouncePrompt();
} else {
this.isEditedFlagOpened = !this.isEditedFlagOpened;
}
}

Expand Down
Loading