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.

Sign up for GitHub

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

Jump to bottom

chat: mark if shared (fixes #7488) #7489

Merged
merged 2 commits into from
Jun 13, 2024
Merged

chat: mark if shared (fixes #7488) #7489

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d7df4e
Add marked shared chat
Mutugiii Jun 13, 2024
bec1da5
Update package.json
dogi Jun 13, 2024
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
19 changes: 14 additions & 5 deletions src/app/chat/chat-sidebar/chat-sidebar.component.html
View file
Open in desktop
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
View file
Open in desktop
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);
}

}
Loading