Merge branch 'dev' into feature-10188-savedview-count

This commit is contained in:
shamoon 2025-06-27 15:16:52 -07:00
commit af7cd8fadf
No known key found for this signature in database
3 changed files with 441 additions and 439 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1216,6 +1216,7 @@ export class FilterEditorComponent
resetSelected() {
this.textFilterTarget = TEXT_FILTER_TARGET_TITLE_CONTENT
this.documentService.searchQuery = ''
this.filterRules = this._unmodifiedFilterRules
this.updateRules()
}

View File

@ -158,13 +158,14 @@ describe('MailComponent', () => {
it('should show errors on load if load mailAccounts failure', () => {
const toastErrorSpy = jest.spyOn(toastService, 'showError')
jest.spyOn(mailAccountService, 'getCached').mockReturnValue(of(null))
jest
.spyOn(mailAccountService, 'listAll')
.mockImplementation(() =>
throwError(() => new Error('failed to load mail accounts'))
)
completeSetup(mailAccountService)
expect(toastErrorSpy).toBeCalled()
expect(toastErrorSpy).toHaveBeenCalled()
})
it('should show errors on load if load mailRules failure', () => {
@ -175,7 +176,7 @@ describe('MailComponent', () => {
throwError(() => new Error('failed to load mail rules'))
)
completeSetup(mailRuleService)
expect(toastErrorSpy).toBeCalled()
expect(toastErrorSpy).toHaveBeenCalled()
})
it('should support edit / create mail account, show error if needed', () => {