Skip to content
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

Jump to bottom

Isara UI fixes #1064

Merged
merged 21 commits into from
Oct 19, 2023
Merged

Isara UI fixes #1064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f83d9a5
reset filter in samplew view mode change
meguiraun Jul 11, 2023
9ba4d69
hacking our sample list view
meguiraun Jul 11, 2023
45ceda1
initisalize to false
meguiraun Jul 11, 2023
7a048f3
fix isara view to show pucks above 16
meguiraun Sep 20, 2023
72a3111
Fixes for isara like view
meguiraun Sep 25, 2023
140b742
do not render if no sample to display
meguiraun Sep 26, 2023
9853bc2
do not break the page, just alert
meguiraun Sep 26, 2023
dc48606
bit of linting cleanup
meguiraun Sep 27, 2023
7683abc
no console
meguiraun Sep 27, 2023
6da4083
undo changes in getSampleTable
meguiraun Sep 27, 2023
9d0eb69
fixing filtering
meguiraun Sep 28, 2023
e8ff057
We should not log/print queue json this make request slow
jbflo Oct 3, 2023
8a6c113
FIx unique key warning
jbflo Oct 3, 2023
dd7bea2
adjust css for sample list view
jbflo Oct 3, 2023
1417497
Update sample list view
jbflo Oct 3, 2023
1755277
LINT / Run Format
jbflo Oct 3, 2023
5740c17
function returns JSX, named should be prefixed with render
jbflo Oct 3, 2023
7582599
Rebase to Develop
jbflo Oct 12, 2023
f0a84ae
Small adjust for small screen
jbflo Oct 17, 2023
459ee48
Remove commented line
jbflo Oct 17, 2023
0b6240e
Eslint / lint
jbflo Oct 17, 2023
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
6 changes: 3 additions & 3 deletions mxcube3/core/components/queue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,9 @@ def delete_entry(self, entry):
parent_entry.dequeue(entry)
model = entry.get_data_model()
HWR.beamline.queue_model.del_child(model.get_parent(), model)
logging.getLogger("MX3.HWR").info("[QUEUE] is:\n%s " % self.queue_to_json())
logging.getLogger("MX3.HWR").info(
"[DELETE QUEUE] FROM:\n%s " % model.get_parent().get_name()
)

def delete_entry_at(self, item_pos_list):
current_queue = self.queue_to_dict()
Expand Down Expand Up @@ -2241,8 +2243,6 @@ def queue_enable_item(self, qid_list, enabled):
for qid in qid_list:
self.set_enabled_entry(qid, enabled)

logging.getLogger("MX3.HWR").info("[QUEUE] is:\n%s " % self.queue_to_json())

def update_sample(self, sid, params):
sample_node = HWR.beamline.queue_model.get_node(sid)

Expand Down
4 changes: 2 additions & 2 deletions mxcube3/core/components/user/usermanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,9 @@ def login_info(self):
"user": {
"username": "",
"email": "",
"isstaff": "",
"isstaff": False,
"nickname": "",
"inControl": "",
"inControl": False,
"ip": "",
},
}
Expand Down
1 change: 0 additions & 1 deletion ui/src/actions/sampleChanger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@ export function sendCommand(cmdparts, args) {
}).then((response) => {
if (response.status >= 400) {
dispatch(showErrorPanel(true, response.headers.get('message')));
throw new Error(`Error while sending command @ ${cmdparts}`);
}
});
};
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/Equipment/GenericEquipmentControl.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export default class GenericEquipmentControl extends React.Component {
);

result = (
<span>
<span key={key}>
<OverlayTrigger
trigger={['click']}
placement="right"
Expand Down
6 changes: 5 additions & 1 deletion ui/src/components/SampleGrid/SampleGridTable.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
}

.samples-grid-table-li {
min-width: 285px;
min-width: 283px;
margin: auto auto 6px 0px;
z-index: 2 !important;
list-style-type: none;
Expand All @@ -84,6 +84,10 @@
cursor: context-menu;
}

.samples-grid-table-li-manual {
margin-right: 5px;
}

.samples-grid-table-item {
list-style-type: none !important;
padding: 0px;
Expand Down
2 changes: 1 addition & 1 deletion ui/src/containers/SampleFlexView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class NewSampleFlexView extends React.Component {
// for any number of cell
const scContent = [1, 2, 3, 4, 5, 6, 7, 8];
return (
<Col sm>
<Col sm={3}>
<div className="div-svg-flex">
<svg
className="svg-flex"
Expand Down
Loading