Skip to content

Commit

Permalink
Hot fix for Target not Recognized (#391)
Browse files Browse the repository at this point in the history
* #1063 added header and search

* #1063 fixed body table, page count and search

* #1063 fixed minor bugs and set clear filter

* Squashed commit of the following:

commit 10925d2
Author: RobertMatuska <robert.matuska@m2ms.sk>
Date:   Thu Sep 28 10:27:36 2023 +0200

    #1114 edited text and style

* #1161 setted search and filter for old target list

* #1161 fixed discourse icon padding

* #1161 fixed filtered list sort

* #1161 fixed target access sort and filter

* #1161 fixed change page

* #1145 preserve state of molecule rendering, save also actions of representation changes to snapshot

* do not wrap display controls buttons

* #1167 resize target list colmuns

* #1161 fixed sorting

* #1161 fixed sorting

* #1161 edit sort functionality for filter table

* #1161 fixed search, filter, sort by target access

* #1161 created init date column

* #1161 # filtering and sorting init date

* #1161 fixed clear and sort init date

* #1161 fixed target sorting

* Squashed commit of the following:

commit d489526
Merge: 1c45038 411921f
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Oct 16 08:24:05 2023 +0200

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

commit 1c45038
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Oct 13 11:03:49 2023 +0200

    - implemented #1173 also with save/restore and undo/redo functionality

commit 411921f
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Oct 13 11:03:49 2023 +0200

    - implemented #1173 also with save/restore and undo/redo functionality

* merge

* Squashed commit of the following:

commit 7883c15
Merge: 5e2b937 19b9f24
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Oct 16 11:19:36 2023 +0200

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

commit 5e2b937
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Oct 16 11:16:15 2023 +0200

    - added compound_set to csv export - #1172

commit 19b9f24
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Oct 16 11:16:15 2023 +0200

    - added compound_set to csv export - #1172

commit 75ac125
Merge: f50666c 574c7b5
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Oct 16 08:26:08 2023 +0200

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

commit f50666c
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Oct 13 13:45:34 2023 +0200

    - implemented #1172

commit 574c7b5
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Oct 13 13:45:34 2023 +0200

    - implemented #1172

* #1167 fixed issues

* #1167 reworked resizer

* #1161 fixed merge bugs

* #1161 removed console

* #1167 target and project list resizer

* #1167 fixed project list width

* #1161 changed width

* - fixed #1186

* - hotfix for target not recognized error message

---------

Co-authored-by: RobertMatuska <robert.matuska@m2ms.sk>
Co-authored-by: matej <matej.vavrek@m2ms.sk>
  • Loading branch information
3 people authored Dec 19, 2023
1 parent 05d774f commit 906d075
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion docker-compose.dev.vector.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ services:
NEO4J_dbms_memory_pagecache_size: 4G
web:
container_name: web_dock
image: xchem/fragalysis-stack:latest
image: xchem/fragalysis-stack:2023.11.1
# image: alanbchristie/fragalysis-backend:1069.4
command: /bin/bash /code/launch-stack.sh
volumes:
Expand Down
12 changes: 6 additions & 6 deletions js/components/target/handleUnrecognisedTarget.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ const HandleUnrecognisedTarget = memo(({ targetUnrecognised, setTargetUnrecognis

if (targetUnrecognised === true) {
if (target_id_list && target_id_list.length === 0) {
modalBody = <h3>The target was not recognised and there are no other available targets.</h3>;
modalBody = <h3>Targets are loading. Please wait.</h3>;
} else {
modalBody = (
<Modal open={targetUnrecognised}>
<h3>
Target was not recognised or you do not have authentication to access target. <br />
Targets are loading. Please wait. <br />
</h3>
{request}
<TargetList key="TARGLIST" />
{/* <TargetList key="TARGLIST" />
<Button
color="primary"
onClick={() => {
Expand All @@ -56,7 +56,7 @@ const HandleUnrecognisedTarget = memo(({ targetUnrecognised, setTargetUnrecognis
style={{position: 'fixed', right: '25px'}}
>
Close
</Button>
</Button> */}
</Modal>
);
}
Expand All @@ -66,10 +66,10 @@ const HandleUnrecognisedTarget = memo(({ targetUnrecognised, setTargetUnrecognis
<Fragment>
<Modal open={targetUnrecognised !== undefined ? targetUnrecognised : false}>
{modalBody}
<Button color="primary" onClick={closeModal}>
{/* <Button color="primary" onClick={closeModal}>
Close
</Button>
<ErrorReport />
<ErrorReport /> */}
</Modal>
</Fragment>
);
Expand Down
2 changes: 2 additions & 0 deletions js/components/target/targetList.js
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ export const TargetList = memo(() => {

const isActiveFilter = !!(filter || {}).active;
let listOfAllTarget = [...listOfAllTargetsDefault].sort(compareTargetAsc);

const initialize = useCallback(() => {
let initObject = {
active: false,
Expand Down Expand Up @@ -1064,6 +1065,7 @@ export const TargetList = memo(() => {
}
}, [isResizingInitDate]);
// END RESIZER FOR INIT DATE COLUMN

// START RESIZER FOR SGC COLUMN
const handleMouseDownResizerSGC = () => {
setIsResizingSGC(true);
Expand Down

0 comments on commit 906d075

Please sign in to comment.