Skip to content

Commit

Permalink
Fixed tagging (#429)
Browse files Browse the repository at this point in the history 
* #1403 fixed timer when services are not available

* #1389 applied tag.hidden logic, reduced autohide time for tags toasts to 5 seconds

* Squashed commit of the following:

commit 7511b57
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Apr 23 08:27:24 2024 +0200

    - finished #1348

commit 6074d79
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Apr 17 09:50:06 2024 +0200

    - #1348 - fixed cases when all pdbs are missing

commit 49f0ae8
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Apr 10 13:41:50 2024 +0200

    - checkpoint

commit 13a315e
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Apr 3 12:30:06 2024 +0200

    - checkpoint

commit a5b8cca
Merge: 34b75f7 756a25b
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Mar 25 12:24:01 2024 +0100

    Merge branch '#1348' of https://github.com/m2ms/fragalysis-frontend into #1348

commit 34b75f7
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 12 12:35:21 2024 +0100

    - latest backend

commit 1308cb2
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 1ee15e7
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit a033b68
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 7149081
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 623de4f
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 12 09:48:51 2024 +0100

    - using official backend version

commit eec204c
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 12:16:45 2024 +0100

    - checkpoint

commit dbc93a7
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 10:27:08 2024 +0100

    - checkpoint

commit b933243
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 4a0e171
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 634ed03
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 6e65fae
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 1bff7bf
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 07f21b6
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 021366e
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 36f87b4
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 87e765a
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 12 12:35:21 2024 +0100

    - latest backend

commit 72c94f0
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 224ca23
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 36f03f8
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 8072920
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit e319056
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 12 09:48:51 2024 +0100

    - using official backend version

commit 187e7f3
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 12:16:45 2024 +0100

    - checkpoint

commit b6aa0a4
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 10:27:08 2024 +0100

    - checkpoint

commit fccf976
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 965be5e
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit b01cdbf
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit e04fbf2
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 5d64c26
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit dbb155c
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit b1c0f3c
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Feb 29 10:32:27 2024 +0100

    - checkpoint

commit abc8cc9
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 2ef004a
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 756a25b
Merge: f686ef4 f474ff6
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Mar 14 10:00:02 2024 +0100

    Merge branch '#1348' of https://github.com/m2ms/fragalysis-frontend into #1348

commit f686ef4
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 12 12:35:21 2024 +0100

    - latest backend

commit df6209c
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit f5a842f
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 83ffccc
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 0ecff35
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit d3a90c7
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 12 09:48:51 2024 +0100

    - using official backend version

commit 50800b9
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 12:16:45 2024 +0100

    - checkpoint

commit 2af18fd
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 10:27:08 2024 +0100

    - checkpoint

commit cd75a27
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit c485389
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 96296e9
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 760152b
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 8a30204
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 6235e9c
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit e2e46cb
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Feb 29 10:32:27 2024 +0100

    - checkpoint

commit 8176514
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 6aa5108
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit f474ff6
Merge: 56c0b85 e728f49
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Mar 14 08:30:00 2024 +0100

    Merge branch '#1348' of https://github.com/m2ms/fragalysis-frontend into #1348

    # Conflicts:
    #	js/components/preview/tags/details/tagDetails.js

commit 56c0b85
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit a185933
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 09c97b5
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit c6d0738
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 72f36b0
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Feb 29 10:32:27 2024 +0100

    - checkpoint

commit 971799d
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 1bb5326
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit e728f49
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 12 12:35:21 2024 +0100

    - latest backend

commit 125b8d4
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 0e41551
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 8cf43e0
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit d336352
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 2fb59dc
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 12 09:48:51 2024 +0100

    - using official backend version

commit 9439f5d
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Mar 7 13:59:03 2024 +0100

    - partial fix for purple release for #1370

commit 4ff5f94
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Mar 7 10:10:41 2024 +0100

    - implemented #1376
    - also fixed bug in download structures dialog where only first download got added to the dropdown menu

commit 66a98f3
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Mar 6 09:47:12 2024 +0100

    - implemented #1361
    - improvements for #1354

commit 8a193a5
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 5 13:24:11 2024 +0100

    - cleanup for #1354

commit bb3bf3b
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 5 13:21:32 2024 +0100

    - updated message for #1354

commit a3dc819
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 5 13:05:12 2024 +0100

    - first implementation of #1354

commit 4121519
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 5 08:17:49 2024 +0100

    - implemented #1357

commit 4d96ff4
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Mar 4 10:07:06 2024 +0100

    - implemented changes requested in #1326

commit 03158be
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Mar 4 08:45:22 2024 +0100

    - fixed problem with tags not visually updating on observations

commit 8765a3c
Author: matej <matej.vavrek@m2ms.sk>
Date:   Mon Feb 26 21:36:12 2024 +0100

    #1341 "pin" edit tag row outside of tag list

commit 6db8b22
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Feb 29 10:32:27 2024 +0100

    - checkpoint

commit 027eaf0
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 12:16:45 2024 +0100

    - checkpoint

commit 7407dbd
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 10:27:08 2024 +0100

    - checkpoint

commit c13628b
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit e39721c
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

* - using official backend now

* Squashed commit of the following:

commit 8fe886a
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed May 15 09:00:04 2024 +0200

    Squashed commit of the following:

    commit 6813219
    Author: matej <matej.vavrek@m2ms.sk>
    Date:   Mon Apr 29 07:38:30 2024 +0200

        #1261 added icon for "Manage grouping" button

    commit a665ed5
    Author: matej <matej.vavrek@m2ms.sk>
    Date:   Sun Apr 28 23:23:25 2024 +0200

        #1261 added buttons into observation dialog for later poses handling

commit 70a5e70
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Apr 29 09:20:46 2024 +0200

    - #1261 - initial implementation

* - now FE point to local dev env

* - pointing to correct backend

* - #1440 implemented fix

* fixed tag reset in edit modal

---------

Co-authored-by: matej <matej.vavrek@m2ms.sk>
  • Loading branch information
@boriskovar-m2ms @matej-vavrek
boriskovar-m2ms and matej-vavrek authored May 28, 2024
1 parent e7e5c95 commit 070cf46
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions js/components/preview/tags/modal/editTagsModal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export const EditTagsModal = ({ open, anchorEl, setOpenDialog }) => {
});
setTags([NEW_TAG, ...newTagList].sort(compareTagsAsc));
return () => {
setTag(NEW_TAG);
setTag(null);
setTags([NEW_TAG]);
};
}, [preTagList, tagCategories]);
Expand Down Expand Up @@ -123,7 +123,7 @@ export const EditTagsModal = ({ open, anchorEl, setOpenDialog }) => {
}, [allMolList, tag]);

const resetTagToEditState = () => {
setNewTagCategory(1);
setNewTagCategory(DEFAULT_CATEGORY);
setNewTagColor(DEFAULT_TAG_COLOR);
setNewTagName('');
setNewTagLink('');
Expand Down

0 comments on commit 070cf46

Please sign in to comment.