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

Fixes for various export related issues #377

Merged
merged 6 commits into from
Feb 26, 2024
Merged

Conversation

twinkarma
Copy link
Collaborator

@twinkarma twinkarma commented May 25, 2023

@github-actions
Copy link

github-actions bot commented May 25, 2023

Jest Coverage

File % Stmts % Branch % Funcs % Lines Uncovered Line #s
All files 83.8 83.96 64 83.8
File % Stmts % Branch % Funcs % Lines Uncovered Line #s
All files 83.8 83.96 64 83.8
_jrpc 94.11 91.66 83.33 94.11
_ index.js 94.11 91.66 83.33 94.11 29-30,38-40
_utils 81.97 82.97 57.89 81.97
_ annotations.js 97.72 73.91 100 97.72 35-36
_ dict.js 88.88 83.33 100 88.88 3-4
_ expressions.js 80.08 82.35 80 80.08 ...,188-190,201-218
_ index.js 73.6 100 14.28 73.6 ...4-65,76-82,93-94

@twinkarma twinkarma marked this pull request as ready for review May 26, 2023 16:21
@twinkarma
Copy link
Collaborator Author

@ianroberts @davidwilby can either one of you have a look at this before we merge it in?

Copy link
Member

@ianroberts ianroberts left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All LGTM now - I've rebased on latest dev, combining your changes with mine from #399, and I'm happy to merge this now.

@@ -1047,7 +1052,7 @@ def get_doc_annotation_dict(self, json_format="raw", anonymize=True):
("aborted", Annotation.ABORTED),
]:
teamware_status[key] = [
annotation.user.id if anonymize else annotation.user.username
f"{settings.ANONYMIZATION_PREFIX}{annotation.user.id}" if anonymize else annotation.user.username
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated the teamware_status to use the same anonymized names as everything else.

@ianroberts ianroberts merged commit 6993266 into dev Feb 26, 2024
6 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.

2 participants