Skip to content

Commit

Permalink
chat: mark if shared (fixes #7488) (#7489)
Browse files Browse the repository at this point in the history
Co-authored-by: dogi <[email protected]>
  • Loading branch information
Mutugiii and dogi committed Jun 13, 2024
1 parent 0d638af commit 5265321
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 9 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "planet",
"license": "AGPL-3.0",
"version": "0.14.43",
"version": "0.14.44",
"myplanet": {
"latest": "v0.15.80",
"latest": "v0.15.86",
"min": "v0.15.78"
},
"scripts": {
Expand Down
19 changes: 14 additions & 5 deletions src/app/chat/chat-sidebar/chat-sidebar.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
<mat-form-field class="font-size-1 margin-lr-3">
<input matInput i18n-placeholder placeholder="Search" [(ngModel)]="titleSearch" (input)="onSearchChange($event.target.value)">
</mat-form-field>
<button mat-icon-button color="primary" (click)="resetFilter()" [disabled]="!titleSearch && !searchType"><mat-icon>delete</mat-icon></button><br>
<button mat-icon-button color="primary" (click)="resetFilter()" [disabled]="!titleSearch && !searchType" matTooltip="Clear search" i18n-matTooltip [matTooltipDisabled]="!titleSearch && !searchType">
<mat-icon>delete</mat-icon>
</button><br>
<div>
<span style="font-size: small; font-style: italic;" i18n>Full Conversation Search </span>
<mat-checkbox [checked]="fullTextSearch" (change)="toggleSearchType()"></mat-checkbox>
Expand Down Expand Up @@ -40,19 +42,26 @@
<planet-form-error-messages [formControl]="titleForm[conversation?._id].controls.title"></planet-form-error-messages>
</mat-error>
</mat-form-field>
<button mat-icon-button class="sidebar-icon"><mat-icon>check</mat-icon></button>
<button mat-icon-button class="sidebar-icon" (click)="toggleEditTitle()"><mat-icon>close</mat-icon></button>
<button mat-icon-button class="sidebar-icon" matTooltip="Submit" i18n-matTooltip>
<mat-icon>check</mat-icon>
</button>
<button mat-icon-button class="sidebar-icon" (click)="toggleEditTitle()" matTooltip="Close" i18n-matTooltip>
<mat-icon>close</mat-icon>
</button>
</form>
</ng-container>
</ng-container>
<ng-template #notEditing>
<ng-container *ngTemplateOutlet="conversationTitle"></ng-container>
<button mat-icon-button class="sidebar-icon" *ngIf="selectedConversation?._id === conversation?._id" (click)="toggleEditTitle()">
<button mat-icon-button class="sidebar-icon" *ngIf="selectedConversation?._id === conversation?._id" (click)="toggleEditTitle()" matTooltip="Edit title">
<mat-icon>edit</mat-icon>
</button>
<button mat-icon-button class="sidebar-icon" *ngIf="selectedConversation?._id === conversation?._id" (click)="openShareDialog(conversation)">
<button mat-icon-button class="sidebar-icon" *ngIf="selectedConversation?._id === conversation?._id" (click)="openShareDialog(conversation)" matTooltip="Share conversation">
<mat-icon>share</mat-icon>
</button>
<button mat-icon-button class="sidebar-icon" matTooltip="Conversation shared" i18n-matTooltip>
<mat-icon *ngIf="conversation.shared">done_all</mat-icon>
</button>
</ng-template>
<ng-template #conversationTitle>
{{ conversation?.title?.slice(0, 25) || conversation.conversations[0].query.slice(0, 25) }}
Expand Down
10 changes: 8 additions & 2 deletions src/app/chat/chat-sidebar/chat-sidebar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,14 @@ export class ChatSidebarComponent implements OnInit, OnDestroy {
this.overlayOpen = !this.overlayOpen;
}

updateConversation(conversation: Conversation, title) {
updateConversation(conversation: Conversation, title?: string, shared?: boolean) {
this.couchService.updateDocument(
this.dbName, { ...conversation, title: title, updatedDate: this.couchService.datePlaceholder }
this.dbName, {
...conversation,
title: title !== undefined && title !== null ? title : conversation.title,
shared: shared,
updatedDate: this.couchService.datePlaceholder
}
).subscribe((data) => {
this.getChatHistory();
return data;
Expand Down Expand Up @@ -210,6 +215,7 @@ export class ChatSidebarComponent implements OnInit, OnDestroy {
news: conversation,
}
});
this.updateConversation(conversation, null, true);
}

}

0 comments on commit 5265321

Please sign in to comment.