From 906d075772baee511ab54e7a1c16c9bc73f4ca84 Mon Sep 17 00:00:00 2001 From: boriskovar-m2ms Date: Tue, 19 Dec 2023 12:43:29 +0100 Subject: [PATCH] Hot fix for Target not Recognized (#391) * #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 10925d2c914673bfaa4e8b0205904e3e393d731d Author: RobertMatuska 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 d4895261f303ae61a359579c485adf702cdff64e Merge: 1c45038a 411921f8 Author: Boris Kovar Date: Mon Oct 16 08:24:05 2023 +0200 Merge branch '#1173' of https://github.com/m2ms/fragalysis-frontend into #1173 commit 1c45038a42430f90f68430037027296021fe1974 Author: Boris Kovar Date: Fri Oct 13 11:03:49 2023 +0200 - implemented #1173 also with save/restore and undo/redo functionality commit 411921f8a4906c54dfcd31c8bc079f9bd3008baf Author: Boris Kovar 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 7883c1584fc80b0be8dae624c18e86ddbe3c906b Merge: 5e2b937d 19b9f243 Author: Boris Kovar Date: Mon Oct 16 11:19:36 2023 +0200 Merge branch '#1172' of https://github.com/m2ms/fragalysis-frontend into #1172 commit 5e2b937da95963afab366fac18912b4c596ccd78 Author: Boris Kovar Date: Mon Oct 16 11:16:15 2023 +0200 - added compound_set to csv export - #1172 commit 19b9f243cc996f8d3e28f6fd8a44c167894b358a Author: Boris Kovar Date: Mon Oct 16 11:16:15 2023 +0200 - added compound_set to csv export - #1172 commit 75ac125b5cae9d669d337410db9a184d6d31a456 Merge: f50666ce 574c7b5e Author: Boris Kovar Date: Mon Oct 16 08:26:08 2023 +0200 Merge branch '#1172' of https://github.com/m2ms/fragalysis-frontend into #1172 commit f50666cef87e491309347fbcb8514286fcb72adc Author: Boris Kovar Date: Fri Oct 13 13:45:34 2023 +0200 - implemented #1172 commit 574c7b5e65181e35865571ce7d9b6d01a40ce562 Author: Boris Kovar 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 Co-authored-by: matej --- docker-compose.dev.vector.yml | 2 +- js/components/target/handleUnrecognisedTarget.js | 12 ++++++------ js/components/target/targetList.js | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/docker-compose.dev.vector.yml b/docker-compose.dev.vector.yml index 58be512ea..ce54b086a 100644 --- a/docker-compose.dev.vector.yml +++ b/docker-compose.dev.vector.yml @@ -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: diff --git a/js/components/target/handleUnrecognisedTarget.js b/js/components/target/handleUnrecognisedTarget.js index 8fced319d..da10ba257 100644 --- a/js/components/target/handleUnrecognisedTarget.js +++ b/js/components/target/handleUnrecognisedTarget.js @@ -39,15 +39,15 @@ const HandleUnrecognisedTarget = memo(({ targetUnrecognised, setTargetUnrecognis if (targetUnrecognised === true) { if (target_id_list && target_id_list.length === 0) { - modalBody =

The target was not recognised and there are no other available targets.

; + modalBody =

Targets are loading. Please wait.

; } else { modalBody = (

- Target was not recognised or you do not have authentication to access target.
+ Targets are loading. Please wait.

{request} - + {/* + */} ); } @@ -66,10 +66,10 @@ const HandleUnrecognisedTarget = memo(({ targetUnrecognised, setTargetUnrecognis {modalBody} - - + */} ); diff --git a/js/components/target/targetList.js b/js/components/target/targetList.js index 48d0ab243..fa3d03352 100644 --- a/js/components/target/targetList.js +++ b/js/components/target/targetList.js @@ -265,6 +265,7 @@ export const TargetList = memo(() => { const isActiveFilter = !!(filter || {}).active; let listOfAllTarget = [...listOfAllTargetsDefault].sort(compareTargetAsc); + const initialize = useCallback(() => { let initObject = { active: false, @@ -1064,6 +1065,7 @@ export const TargetList = memo(() => { } }, [isResizingInitDate]); // END RESIZER FOR INIT DATE COLUMN + // START RESIZER FOR SGC COLUMN const handleMouseDownResizerSGC = () => { setIsResizingSGC(true);