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

Desktop: Fixes #9304: Fix HTML resource links lost when editing notes in the rich text editor (Backport #9435) #9647

Conversation

personalizedrefrigerator
Copy link
Collaborator

Summary

Backports #9435 into release-2.13.

Rationale

@laurent22
Copy link
Owner

There's a linter failure on one of the file, although you haven't modified that file. But could you check what might be the issue? I thought it was due to my own change but I see the extra space it's complaining about is not one my own file or even on dev branch, so this is strange

@personalizedrefrigerator
Copy link
Collaborator Author

personalizedrefrigerator commented Jan 4, 2024

is not one my own file or even on dev branch

It seems that the relevant file was last changed in this commit: 229b9a5

There do seem to be trailing spaces tabs in that commit (as highlighted below):
screenshot: Shows highlighted trailing spaces

Relevant content as text
	// Disabled for now because the ENEX parser has become so error-tolerant
	// that it's no longer possible to generate a note that would generate a
	// failure.
	
	// it('should keep importing notes when one of them is corrupted', async () => {
	// 	const filePath = `${enexSampleBaseDir}/ImportTestCorrupt.enex`;
	// 	const errors: any[] = [];
	// 	const consoleSpy = jest.spyOn(console, 'warn').mockImplementation(jest.fn());
	// 	await importEnex('', filePath, {
	// 		onError: (error: any) => errors.push(error),
	// 	});
	// 	consoleSpy.mockRestore();
	// 	const notes:NoteEntity[] = await Note.all();
	// 	expect(notes.length).toBe(2);
	// 	expect(notes.find(n => n.title === 'Note 1')).toBeTruthy();
	// 	expect(notes.find(n => n.title === 'Note 3')).toBeTruthy();

I don't see test output in CI for that commit, so perhaps the linter didn't run in CI either?

@laurent22
Copy link
Owner

It seems that the relevant file was last changed in this commit: 229b9a5

There do seem to be trailing spaces tabs in that commit (as highlighted below):

For some reason, I'm not seeing it in my environment and running yarn linter ./ also doesn't result in any change. If you have this extra tab in your env, would you mind removing it and adding the fix to this pull request please?

@laurent22
Copy link
Owner

There's just one conflict to fix and we're good to go

@laurent22 laurent22 merged commit af88261 into laurent22:release-2.13 Jan 6, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants