Skip to content

Commit

Permalink
Implements #1474 (#437)
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

* added better default values handling in tag edit modal

* Squashed commit of the following:

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

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

* #1393 - small bug fix for csv name

* - implementation of #1441

* Squashed commit of the following:

commit e68fab1
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Jun 10 13:56:06 2024 +0200

    - optimized snapshot creation
    - optimized snapshot restoration
    - fixed bugs when switching between snapshots in one project

* #1322 main redesign of hits and observations views

* #1322 changed min width of lhs

* #1322 count also tags without curator tags as untagged

* #1322 remove selected tag if was set as hidden

* #1465 updated companies in credits and logic behind for better manageability

* #1465 changed some logos for bigger ones, added tooltip also for header logos, removed duplicate of openDiscourseLink

* increased font size of mui tooltip

* #1322 updated tooltip of tag info boxes with tag upload name

* #1465 changed naming IMAGE_SIZE to MAX_IMAGE_HEIGHT to be more descriptive

* Squashed commit of the following:

commit 1ec9788
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Jul 23 08:47:00 2024 +0200

    - ported csv generation functionality from backend to frontend

---------

Co-authored-by: matej <matej.vavrek@m2ms.sk>
  • Loading branch information
@boriskovar-m2ms @matej-vavrek
boriskovar-m2ms and matej-vavrek authored Jul 23, 2024
1 parent 77c376a commit 3c60628
Show file tree
Hide file tree
Showing 3 changed files with 93 additions and 26 deletions.
26 changes: 14 additions & 12 deletions js/components/datasets/compoundSetList.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import SearchField from '../common/Components/SearchField';
import { base_url } from '../routes/constants';
import { METHOD, api } from '../../utils/api';
import { compoundsColors } from '../preview/compounds/redux/constants';
import { downloadRHSCSVExport } from '../../utils/csv';

const useStyles = makeStyles(theme => ({
table: {
Expand Down Expand Up @@ -197,19 +198,20 @@ export const CompoundSetList = () => {

const fileName = `${datasetID}.csv`;
const reqObj = { title: datasetID, filename: fileName, dict: listOfMols };
const jsonString = JSON.stringify(reqObj);
downloadRHSCSVExport(reqObj);
// const jsonString = JSON.stringify(reqObj);

api({
url: `${base_url}/api/dicttocsv/`,
method: METHOD.POST,
data: jsonString
}).then(resp => {
var anchor = document.createElement('a');
anchor.href = `${base_url}/api/dicttocsv/?file_url=${resp.data['file_url']}`;
anchor.target = '_blank';
anchor.download = `${fileName}`; //'download';
anchor.click();
});
// api({
// url: `${base_url}/api/dicttocsv/`,
// method: METHOD.POST,
// data: jsonString
// }).then(resp => {
// var anchor = document.createElement('a');
// anchor.href = `${base_url}/api/dicttocsv/?file_url=${resp.data['file_url']}`;
// anchor.target = '_blank';
// anchor.download = `${fileName}`; //'download';
// anchor.click();
// });
};

useEffect(() => {
Expand Down
29 changes: 15 additions & 14 deletions js/components/datasets/selectedCompoundsList.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ import { ARROW_TYPE, VIEWS } from '../../constants/constants';
import { useScrollToCompound } from './useScrollToCompound';
import useDisableNglControlButtons from '../preview/molecule/useDisableNglControlButtons';
import useDisableDatasetNglControlButtons from './useDisableDatasetNglControlButtons';
import { downloadRHSCSVExport } from '../../utils/csv';

const useStyles = makeStyles(theme => ({
container: {
Expand Down Expand Up @@ -572,20 +573,20 @@ export const SelectedCompoundList = memo(() => {
const fileName = `${targetName}-RHS-selection.csv`;
// console.log(`href - ${fileName}`);
const reqObj = { title: sharedSnapshot.url, filename: fileName, dict: listOfMols };
const jsonString = JSON.stringify(reqObj);

api({
url: `${base_url}/api/dicttocsv/`,
method: METHOD.POST,
data: jsonString
}).then(resp => {
var anchor = document.createElement('a');
anchor.href = `${base_url}/api/dicttocsv/?file_url=${resp.data['file_url']}`;
// console.log(`href - ${base_url}/api/dicttocsv/?file_url=${resp.data['file_url']}`);
anchor.target = '_blank';
anchor.download = `${fileName}`; //'download';
anchor.click();
});
downloadRHSCSVExport(reqObj);
// const jsonString = JSON.stringify(reqObj);

// api({
// url: `${base_url}/api/dicttocsv/`,
// method: METHOD.POST,
// data: jsonString
// }).then(resp => {
// var anchor = document.createElement('a');
// anchor.href = `${base_url}/api/dicttocsv/?file_url=${resp.data['file_url']}`;
// anchor.target = '_blank';
// anchor.download = `${fileName}`; //'download';
// anchor.click();
// });
});
};

Expand Down
64 changes: 64 additions & 0 deletions js/utils/csv.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
export const downloadRHSCSVExport = data => {
const csvContent = generateCSVExportFromObject(data);
const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' });
const url = URL.createObjectURL(blob);
const link = document.createElement('a');
link.setAttribute('href', url);
link.setAttribute('download', data.filename);
document.body.appendChild(link);
link.click();
document.body.removeChild(link);
};

export const generateCSVExportFromObject = data => {
let csvContent = '';
const filename = data.filename;

let newLine = '\r\n';

csvContent += data.title + newLine;

if (data?.dict?.length < 1) {
return '';
}

const headerKeys = getReferenceDataForHeader(data.dict[0]);
csvContent += generateCSVHeaderFromKeys(headerKeys) + newLine;

for (let i = 0; i < data.dict.length; i++) {
const row = data.dict[i];
csvContent += generateCSVRowFromObject(row, headerKeys) + newLine;
}

return csvContent;
};

const generateCSVRowFromObject = (row, keys) => {
let csvRow = '';

for (let i = 0; i < keys.length; i++) {
csvRow += row[keys[i]] ? row[keys[i]] : '';
if (i < keys.length - 1) {
csvRow += ',';
}
}

return csvRow;
};

const generateCSVHeaderFromKeys = keys => {
let csvHeader = '';

for (let i = 0; i < keys.length; i++) {
csvHeader += keys[i];
if (i < keys.length - 1) {
csvHeader += ',';
}
}

return csvHeader;
};

const getReferenceDataForHeader = data => {
return Object.keys(data);
};

0 comments on commit 3c60628

Please sign in to comment.