Skip to content

#1889 expand observation column if no extra columns #522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boriskovar-m2ms merged 2 commits into from
Oct 29, 2025
Merged

#1889 expand observation column if no extra columns #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5658b92
- fixes for #1821 and #1908
boriskovar-m2ms Oct 28, 2025
51c69cc
#1889 set observation column width to fill hit navigator space better…
matej-vavrek Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions docker-compose.dev.vector.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,15 @@ services:
ISPYB_PASSWORD: ${ISPYB_PASSWORD}
SECURITY_CONNECTOR: ssh_ispyb
LOGGING_FRAMEWORK_ROOT_LEVEL: DEBUG
AUTHENTICATE_UPLOAD: 'False'
CELERY_TASK_ALWAYS_EAGER: 'False'
DEBUG_FRAGALYSIS: 'True'
PROXY_FORWARDED_PROTO_HEADER: 'http'
LEGACY_URL: 'https://fragalysis.diamond.ac.uk'
DEPLOYMENT_MODE: 'development'
DISABLE_RESTRICT_PROPOSALS_TO_MEMBERSHIP: 'True'
PUBLIC_TAS: 'lb18145-1,lb32633-1'
RESTRICTED_TAS_USERS: 'spf57946:lb32627-261'
AUTHENTICATE_UPLOAD: "False"
CELERY_TASK_ALWAYS_EAGER: "False"
DEBUG_FRAGALYSIS: "True"
PROXY_FORWARDED_PROTO_HEADER: "http"
LEGACY_URL: "https://fragalysis.diamond.ac.uk"
DEPLOYMENT_MODE: "development"
DISABLE_RESTRICT_PROPOSALS_TO_MEMBERSHIP: "True"
PUBLIC_TAS: "lb18145-1,lb32633-1"
RESTRICTED_TAS_USERS: "spf57946:lb32627-261"
WEB_DJANGO_SUPERUSER_PASSWORD: ${WEB_DJANGO_SUPERUSER_PASSWORD}
SQUONK2_REFRESH_SHOULD_RETRIEVE_RESULTS: "Yes"
# INFECTIONS: 'structure-download'
Expand Down
5 changes: 4 additions & 1 deletion js/components/nglView/nglView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,10 @@ const NglView = memo(

useEffect(() => {
if (!ready) return;
if (sphereCoordinates && isCoordinateFilterPermitted && !sphereRendered) {
if (sphereCoordinates && isCoordinateFilterPermitted /* && !sphereRendered*/) {
if (sphereCompRef.current) {
stage.removeComponent(sphereCompRef.current);
}
dispatch(selectionActions.setSphereRendered(true));
ensureSphereAt(sphereCoordinates, parseRadius(coordinateRadius));
} else {
Expand Down
10 changes: 9 additions & 1 deletion js/components/preview/molecule/observationUnifiedView/hooks/useColumns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,15 @@ export const useColumns = (defaultWidth) => {
});
setColumns(newColumns);
} else {
setColumns(COLUMNS);
// set observation column width to fill hit navigator space better if there are no extra columns
const columns = COLUMNS;
columns.map(column => {
if (column.name === 'detail') {
column.width = 230;
}
return column;
});
setColumns(columns);
}
}, [extraColumns, getColumnType]);

Expand Down
7 changes: 0 additions & 7 deletions js/components/snapshot/modals/downloadStructuresDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,13 +417,6 @@ export const DownloadStructureDialog = memo(({}) => {
toastError(errorMessage);
console.error(e);
}
} catch (e) {
setZipPreparing(false);
setBackendError(true);
const errorMessage = `Download failed, with backend error. Please contact administrator. Error details: ${e?.message}`;
setErrorMessage(errorMessage);
toastError(errorMessage);
console.error(e);
}
};

Expand Down