Feature my annotation #435

alexhuang091 · 2021-04-09T06:05:47Z

for issue AtlasOfLivingAustralia/DataQuality#182

…o flag an issue

…upport to user assertion UI

…ate record assertion

… action

… duplicate record

* initial commit * updated API calls to get/add/delete alerts * updated API calls to get/add/delete alerts * use logged in user id when get/add/delete alerts * removed useless config * update subscribe/un-subscribe my annotations * parameterise the alert name we want to subscribe for my annotation * code style per code review * init myannotations before every call Co-authored-by: Simon Bear <[email protected]>

… into feature/data-quality

removed 'myannotation.name' which is never used.

when disableAllQualityFilters == true, requestParams.qualityProfile won't be populated so it could be null. When it's null, lots existing calls to dq-service failed since dq-service expects not-null profileName

DQ#217 formatting duplicate record preview

Old code displayed 'undefined' when comment is empty.

…lity

nickdos · 2021-04-09T06:45:51Z

grails-app/controllers/au/org/ala/biocache/hubs/OccurrenceController.groovy

+        }
+    }
+
+    def deleteMyAnnotationAlert() {


I'm not sure I understand why this is a delete operation. I thought "my annotations" was a permanent alert type that is either on or off. It seems strange to delete it...

Hi Nick, yes we can turn it on/off.

On alerts side, it's like a custom query since different user has different query_url (...assertion_user_id=xxx).

So

when you turn it on (call addMyAnnotaionAlert) a query is created in alerts.

when you turn it off(call deleteMyAnnotationAlert) that query in alerts is deleted (actually query + notification + queryresult all deleted. Delete notification is enough for stopping getting notification though)

OK can leave it as is... I'd argue the public interface for the service should just be on/off, as the client doesn't need to know that records are being added and then deleted.... it makes it seem more complex and potentially confusing for clients to implement - "Why is it deleting the annotation? Will the user never be able to turn it on again in the future if its deleted?" I had these questions when I read the code...

nickdos

I'm not suer about the naming convention "add" delete" for setting the alerts on and off, as per my inline comment.

alexhuang091 · 2021-04-09T07:00:36Z

I'm not suer about the naming convention "add" delete" for setting the alerts on and off, as per my inline comment.

renaming them may be a good idea. add/delete are actually internal implementation. from user's perspective they are just subscribe/unsubscribe, turn on/off ?

* updated version to 3.0.3-SNAPSHOT for next iteration * Feature/duplicate record (#429) Add duplicate assertion type to flag an issue * enhanced duplicate record flag (#431) * release 3.0.3 (#432) * version to 3.0.4-SNAPSHOT * #434 fix duplicate record facet labels Code formatting * Feature my annotation (#435) * allow user to subscribe to 'my annotation' alert when flagging an issue * Fix jquery.i18n load errors * $.param() doesn't format object correctly (#438) * release 3.0.4 Co-authored-by: Nick dos Remedios <[email protected]> Co-authored-by: vjrj <[email protected]>

* #379 Records from DigiVol don't show "Flag an issue" button * updated version to 3.0.3-SNAPSHOT for next iteration * Feature/duplicate record (#429) Add duplicate assertion type to flag an issue * enhanced duplicate record flag (#431) * release 3.0.3 (#432) * version to 3.0.4-SNAPSHOT * #434 fix duplicate record facet labels Code formatting * Feature my annotation (#435) * allow user to subscribe to 'my annotation' alert when flagging an issue * Fix jquery.i18n load errors * $.param() doesn't format object correctly (#438) * Release/3.0.4 (#442) * 3.0.5-SNAPSHOT * #443 fixes for flash.message exposing apiKey * Revert "Fix jquery.i18n load errors" * Translation of Map legend button and pagination next and previous button * release 3.0.5 (#449) * 3.0.6-SNAPSHOT * AtlasOfLivingAustralia/la-pipelines#372 hide passed assertions by default * i18n en differentiate between duplicate_status and duplicate_type * Bugfix/la pipelines 445 dq profile category dialog display (#456) * AtlasOfLivingAustralia/la-pipelines#445 process array of filters rather then combined filter * AtlasOfLivingAustralia/la-pipelines#445 increase width of DQ profile modal * AtlasOfLivingAustralia/la-pipelines#372 removed test for data quality assertion code `1` * Fix for AtlasOfLivingAustralia/la-pipelines/issues/467 Fix for incorrect sort param for subsequent (paginated) calls for the species list column in EYA. * update biocache-hubs since backend now returns 404 when no record found. * Update README.md * fixed an issue in reading local json files * border-radius for active filters (#462) * wrap taxon name with "" * removed log code * clean log * AtlasOfLivingAustralia/la-pipelines#419 (#465) pass filters and descriptions as JSON array standardise display of filters for DQ profile and category * Release/3.0.6 (#468) * 3.0.7-SNAPSHOT * no strip . in taxon (#469) * handle the case where taxa query returns empty JSON object (404) (#472) * make 'disableAll' and 'expand' configurable (#473) * make 'disableAll' and 'expand' configurable * when 'quality profile' is changed, update drop-down immediately (#474) * use 'fa' for font-awesome 4.x * Issue 470 refine state selection (#476) advanced search UI refine: state list be populated per country selected * style changes to admin page for dq admin link (#477) * fixed a type in flag an issue error message (#478) * added sound file metadata and sound file link to record detail page. (#479) * explicitly set 'user_facets' as String in cookie (#480) * updated css style for #occurrenceSounds * updated message.properties * location display logic updated (#485) * Avh issue120 avh styling (#487) * remove some inline styles * updated left side panel dq filters display * fix the 'view excluded records' on left side panel doesn't work issue. * fix the 'filter details' not shown on left side panel issue * style change, left side panel dq spin * Issue 334 update ehcache (#488) updated to ehcache 3.0 * updated getJsonElements to handle JSON error better (#490) * removed persistence settings * release 3.0.7 Co-authored-by: Rita Chen <[email protected]> Co-authored-by: Nick dos Remedios <[email protected]> Co-authored-by: vjrj <[email protected]> Co-authored-by: alice.ainsa <[email protected]> Co-authored-by: Dave Martin <[email protected]> Co-authored-by: Bruce Hyslop <[email protected]> Co-authored-by: adam-collins <[email protected]>

* #379 Records from DigiVol don't show "Flag an issue" button * updated version to 3.0.3-SNAPSHOT for next iteration * Feature/duplicate record (#429) Add duplicate assertion type to flag an issue * enhanced duplicate record flag (#431) * release 3.0.3 (#432) * version to 3.0.4-SNAPSHOT * #434 fix duplicate record facet labels Code formatting * Feature my annotation (#435) * allow user to subscribe to 'my annotation' alert when flagging an issue * Fix jquery.i18n load errors * $.param() doesn't format object correctly (#438) * Release/3.0.4 (#442) * 3.0.5-SNAPSHOT * #443 fixes for flash.message exposing apiKey * Revert "Fix jquery.i18n load errors" * Translation of Map legend button and pagination next and previous button * release 3.0.5 (#449) * 3.0.6-SNAPSHOT * AtlasOfLivingAustralia/la-pipelines#372 hide passed assertions by default * i18n en differentiate between duplicate_status and duplicate_type * Bugfix/la pipelines 445 dq profile category dialog display (#456) * AtlasOfLivingAustralia/la-pipelines#445 process array of filters rather then combined filter * AtlasOfLivingAustralia/la-pipelines#445 increase width of DQ profile modal * AtlasOfLivingAustralia/la-pipelines#372 removed test for data quality assertion code `1` * Fix for AtlasOfLivingAustralia/la-pipelines/issues/467 Fix for incorrect sort param for subsequent (paginated) calls for the species list column in EYA. * update biocache-hubs since backend now returns 404 when no record found. * Update README.md * fixed an issue in reading local json files * border-radius for active filters (#462) * wrap taxon name with "" * removed log code * clean log * AtlasOfLivingAustralia/la-pipelines#419 (#465) pass filters and descriptions as JSON array standardise display of filters for DQ profile and category * Release/3.0.6 (#468) * 3.0.7-SNAPSHOT * no strip . in taxon (#469) * handle the case where taxa query returns empty JSON object (404) (#472) * make 'disableAll' and 'expand' configurable (#473) * make 'disableAll' and 'expand' configurable * when 'quality profile' is changed, update drop-down immediately (#474) * use 'fa' for font-awesome 4.x * Issue 470 refine state selection (#476) advanced search UI refine: state list be populated per country selected * style changes to admin page for dq admin link (#477) * fixed a type in flag an issue error message (#478) * added sound file metadata and sound file link to record detail page. (#479) * explicitly set 'user_facets' as String in cookie (#480) * updated css style for #occurrenceSounds * updated message.properties * location display logic updated (#485) * Avh issue120 avh styling (#487) * remove some inline styles * updated left side panel dq filters display * fix the 'view excluded records' on left side panel doesn't work issue. * fix the 'filter details' not shown on left side panel issue * style change, left side panel dq spin * Issue 334 update ehcache (#488) updated to ehcache 3.0 * updated getJsonElements to handle JSON error better (#490) * removed persistence settings * release 3.0.7 (#493) * 3.0.8-SNAPSHOT * the converted value should be put back to map to be used somewhere else * updated 'exclude count' font style * release 3.0.8 Co-authored-by: Rita Chen <[email protected]> Co-authored-by: Nick dos Remedios <[email protected]> Co-authored-by: vjrj <[email protected]> Co-authored-by: alice.ainsa <[email protected]> Co-authored-by: Dave Martin <[email protected]> Co-authored-by: Bruce Hyslop <[email protected]> Co-authored-by: adam-collins <[email protected]>

* allow user to subscribe to 'my annotation' alert when flagging an issue

* develop: (51 commits) Revert "Merge branch 'develop' into epic/develop-branch-fix" cherry pick of commit brucehyslop@646c31f Translation of Map legend button and pagination next and previous button 3.0.6-SNAPSHOT release 3.0.5 (#449) #379 Records from DigiVol don't show "Flag an issue" button #443 fixes for flash.message exposing apiKey 3.0.5-SNAPSHOT Release/3.0.4 (#442) Fix jquery.i18n load errors Feature my annotation (#435) #434 fix duplicate record facet labels version to 3.0.4-SNAPSHOT release 3.0.3 (#432) enhanced duplicate record flag (#431) Feature/duplicate record (#429) updated version to 3.0.3-SNAPSHOT for next iteration Issue 245 - enhancement to batch taxon search tab (#523) added biosecurity user assertion biocache-hubs change due to backend changes (#521) ... # Conflicts: # grails-app/controllers/au/org/ala/biocache/hubs/ProxyController.groovy

sbearcsiro and others added 25 commits November 16, 2020 18:01

Increment version number for next development iteration

792aae6

AtlasOfLivingAustralia/DataQuality#182 Add duplicate assertion type t…

d287374

…o flag an issue

AtlasOfLivingAustralia/DataQuality#208 Add duplicate user assertion s…

419e470

…upport to user assertion UI

AtlasOfLivingAustralia/DataQuality#187 Add duplicate reason to duplic…

3af21a1

…ate record assertion

AtlasOfLivingAustralia/DataQuality#208 Add duplicate reason display

1e4bd59

AtlasOfLivingAustralia/DataQuality#187 Lower logging level for exists…

34c49b7

… action

AtlasOfLivingAustralia/DataQuality#214 preview record when flagging a…

cf43901

… duplicate record

AtlasOfLivingAustralia/DataQuality#187 Review feedback

b313e76

removed unused param from processUserFQInteraction

e4c4e1d

updated biocache-hubs to use dq-client 1.1.0 with user profile feature

1feef6f

changes needed for my annotation changes on alerts side

a787499

Merge remote-tracking branch 'remotes/origin/dq_feature_user_profile'…

45c3c1b

… into feature/data-quality

to use dq-service-client 1.2.0-SNAPSHOT for user-specific profile

1157eae

Refined the way apiKey is set in ApiClient

a037da3

removed 'myannotation.name' which is never used.

72bc136

Merge pull request #401 from alexhuang091/feature/data-quality

693320f

removed 'myannotation.name' which is never used.

fixed an issue when disableAllQualityFilters = true

b9fad6d

when disableAllQualityFilters == true, requestParams.qualityProfile won't be populated so it could be null. When it's null, lots existing calls to dq-service failed since dq-service expects not-null profileName

UI update for flag a duplicate record & DQ#217

bebd021

DQ#217 formatting duplicate record preview

DQ#217, handle 'user input id retrieves more than 1 record'

12e7113

fixed an issue in displaying comment.

3db615c

Old code displayed 'undefined' when comment is empty.

Merge remote-tracking branch 'upstream/develop' into feature/data-qua…

5ced833

…lity

Merge branch 'feature/data-quality' into feature_my_annotation

cd1bdd2

do alerts related url mappings conditionally

fed9e31

fixed typo

9e24459

alexhuang091 requested review from sbearcsiro and nickdos April 9, 2021 06:07

nickdos reviewed Apr 9, 2021

View reviewed changes

nickdos self-requested a review April 9, 2021 07:07

nickdos approved these changes Apr 9, 2021

View reviewed changes

alexhuang091 mentioned this pull request Apr 12, 2021

rename 'My Annotation' related APIs AtlasOfLivingAustralia/alerts#110

Closed

alerts API names changed so we need to update accordingly

5bb0a83

alexhuang091 merged commit b938ced into AtlasOfLivingAustralia:develop Apr 13, 2021

alexhuang091 deleted the feature_my_annotation branch April 13, 2021 23:04

djtfmartin pushed a commit that referenced this pull request Dec 9, 2021

Feature my annotation (#435)

a1a4574

* allow user to subscribe to 'my annotation' alert when flagging an issue

djtfmartin pushed a commit that referenced this pull request Dec 9, 2021

Feature my annotation (#435)

3284e1d

* allow user to subscribe to 'my annotation' alert when flagging an issue

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature my annotation #435

Feature my annotation #435

alexhuang091 commented Apr 9, 2021 •

edited

Loading

nickdos Apr 9, 2021

alexhuang091 Apr 9, 2021

nickdos Apr 9, 2021

nickdos left a comment

alexhuang091 commented Apr 9, 2021

Feature my annotation #435

Feature my annotation #435

Conversation

alexhuang091 commented Apr 9, 2021 • edited Loading

nickdos Apr 9, 2021

Choose a reason for hiding this comment

alexhuang091 Apr 9, 2021

Choose a reason for hiding this comment

nickdos Apr 9, 2021

Choose a reason for hiding this comment

nickdos left a comment

Choose a reason for hiding this comment

alexhuang091 commented Apr 9, 2021

alexhuang091 commented Apr 9, 2021 •

edited

Loading