{datasetContainer.dataset && datasetContainer.dataset.klass_ols !== absOlsTermId(kind)
@@ -100,7 +100,7 @@ ContainerDatasetField.propTypes = {
id: PropTypes.number,
}).isRequired,
handleUndo: PropTypes.func.isRequired,
- kind: PropTypes.string.isRequired,
+ kind: PropTypes.string,
handleModalOpen: PropTypes.func.isRequired,
};
diff --git a/app/packs/src/components/contextActions/SplitElementButton.js b/app/packs/src/components/contextActions/SplitElementButton.js
index 93a22f855c..21578b12fa 100644
--- a/app/packs/src/components/contextActions/SplitElementButton.js
+++ b/app/packs/src/components/contextActions/SplitElementButton.js
@@ -9,26 +9,71 @@ import MatrixCheck from 'src/components/common/MatrixCheck';
export default class SplitElementButton extends React.Component {
constructor(props) {
super(props);
+
+ const uiState = UIStore.getState();
+ const userState = UserStore.getState();
this.state = {
- layout: UserStore.getState().profile?.data?.layout || {},
+ currentCollection: uiState.currentCollection,
+ currentUser: {},
+ genericEls: [],
+ showGenericEls: MatrixCheck(userState.currentUser?.matrix, 'genericEl'),
+ layout: {},
+ selectedElements: {},
};
- this.onChange = this.onChange.bind(this);
+ this.onUserStoreChange = this.onUserStoreChange.bind(this);
+ this.onUIStoreChange = this.onUIStoreChange.bind(this);
}
componentDidMount() {
- UserStore.listen(this.onChange);
+ UserStore.listen(this.onUserStoreChange);
+ UIStore.listen(this.onUIStoreChange);
+ this.onUserStoreChange(UserStore.getState());
+ this.onUIStoreChange(UIStore.getState());
}
componentWillUnmount() {
- UserStore.unlisten(this.onChange);
+ UserStore.unlisten(this.onUserStoreChange);
+ UIStore.unlisten(this.onUIStoreChange);
+ }
+
+ onUserStoreChange(state) {
+ const { layout, showGenericEls, genericEls } = this.state;
+ const newLayout = state.profile?.data?.layout;
+ const newCurrentUser = state.currentUser;
+ const newGenericEls = state.genericEls;
+
+ if (typeof newLayout !== 'undefined' && newLayout !== null && newLayout !== layout) {
+ this.setState({ layout: newLayout });
+ }
+
+ const newShowGenericEls = MatrixCheck(newCurrentUser?.matrix, 'genericEl');
+ if (newShowGenericEls !== showGenericEls) {
+ this.setState({ currentUser: newCurrentUser });
+ }
+
+ if (newGenericEls !== genericEls) {
+ this.setState({ genericEls: newGenericEls });
+ }
}
- onChange(state) {
- const layout = state.profile?.data?.layout;
- // eslint-disable-next-line react/destructuring-assignment
- if (typeof layout !== 'undefined' && layout !== null && layout !== this.state.layout) {
- this.setState({ layout });
+ onUIStoreChange(state) {
+ const { currentCollection, genericEls, selectedElements } = this.state;
+ const { currentCollection: newCurrentCollection } = state;
+ if (newCurrentCollection !== currentCollection) {
+ this.setState({ currentCollection: newCurrentCollection });
+ }
+
+ const newSelectedElements = ['sample', 'wellplate', ...genericEls.map((el) => el.name)].reduce(
+ (acc, el) => {
+ const { checkedIds, checkedAll } = state[el] || {};
+ const hasSelected = checkedIds?.size > 0 || checkedAll === true;
+ return { ...acc, [el]: hasSelected };
+ },
+ {}
+ );
+ if (JSON.stringify(newSelectedElements) !== JSON.stringify(selectedElements)) {
+ this.setState({ selectedElements: newSelectedElements });
}
}
@@ -41,12 +86,12 @@ export default class SplitElementButton extends React.Component {
}
noSelected(name) {
- const state = UIStore.getState() || {};
- return state[name]?.checkedIds?.size === 0 && state[name]?.checkedAll === false;
+ const { selectedElements } = this.state;
+ return !selectedElements[name];
}
isAllCollection() {
- const { currentCollection } = UIStore.getState();
+ const { currentCollection } = this.state;
return currentCollection && currentCollection.label === 'All';
}
@@ -55,39 +100,41 @@ export default class SplitElementButton extends React.Component {
}
render() {
- const { layout } = this.state;
- let genericEls = [];
- const currentUser = (UserStore.getState() && UserStore.getState().currentUser) || {};
- if (MatrixCheck(currentUser.matrix, 'genericElement')) {
- genericEls = UserStore.getState().genericEls || [];
- }
+ const { layout, genericEls, showGenericEls, selectedElements } = this.state;
+
const sortedLayout = Object.entries(layout)
.filter((o) => o[1] && o[1] > 0)
.sort((a, b) => a[1] - b[1]);
const sortedGenericEls = [];
- sortedLayout.forEach(([k]) => {
- const el = genericEls.find((ael) => ael.name === k);
- if (typeof el !== 'undefined') {
- sortedGenericEls.push(el);
- }
- });
+ if (showGenericEls) {
+ sortedLayout.forEach(([k]) => {
+ const el = genericEls.find((ael) => ael.name === k);
+ if (typeof el !== 'undefined') {
+ sortedGenericEls.push(el);
+ }
+ });
+ }
+
+ const isDisabled = this.isAllCollection()
+ || Object.values(selectedElements).every((v) => !v);
return (
}
+ disabled={isDisabled}
>
this.splitSelectionAsSubsamples()}
- disabled={this.noSelected('sample') || this.isAllCollection()}
+ disabled={!selectedElements['sample']}
>
Split Sample
this.splitSelectionAsSubwellplates()}
- disabled={this.noSelected('wellplate') || this.isAllCollection()}
+ disabled={!selectedElements['wellplate']}
>
Split Wellplate
@@ -96,9 +143,10 @@ export default class SplitElementButton extends React.Component {
id={`split-${el.name}-button`}
key={el.name}
onClick={() => this.splitElements(`${el.name}`)}
- disabled={this.noSelected(el.name) || this.isAllCollection()}
+ disabled={!selectedElements[el.name]}
>
Split
+ {' '}
{el.label}
))}
diff --git a/app/packs/src/components/navigation/NavHead.js b/app/packs/src/components/navigation/NavHead.js
index f8488ae71a..67db070266 100644
--- a/app/packs/src/components/navigation/NavHead.js
+++ b/app/packs/src/components/navigation/NavHead.js
@@ -1,41 +1,49 @@
import React from 'react';
-import { NavDropdown, Dropdown } from 'react-bootstrap';
-
-function ExternalLinkItem({ text, href }) {
- return (
-
- {text}
-
-
- );
-}
+import { NavDropdown, Navbar, Dropdown } from 'react-bootstrap';
function NavHead() {
const isOnMydb = window.location.href.match(/\/mydb/);
return (
-
-
-
-
-
-
-
-
-
-
-
- {isOnMydb ? 'Home' : 'ELN'}
-
-
- About
-
-
+
+
+
+ Documentation
+
+
+
+ Search documentation
+
+
+
+ Helpdesk - Contact Us
+
+
+
+ Report an issue on Github
+
+
+
+
+ Chemotion.net
+
+
+
+ Chemotion-Repository.net
+ {' '}
+
+
+
+
+ {isOnMydb ? 'Home' : 'ELN'}
+
+
+ About
+
+
+
);
}
+NavHead.propTypes = {};
+
export default NavHead;
diff --git a/app/packs/src/components/navigation/SupportMenuButton.js b/app/packs/src/components/navigation/SupportMenuButton.js
new file mode 100644
index 0000000000..01e665fae7
--- /dev/null
+++ b/app/packs/src/components/navigation/SupportMenuButton.js
@@ -0,0 +1,54 @@
+import React, { useState, useEffect } from 'react';
+import { Dropdown, DropdownButton } from 'react-bootstrap';
+
+import UIStore from 'src/stores/alt/stores/UIStore';
+
+function ExternalItem({ title, href }) {
+ return (
+
+ {title}
+
+
+ );
+}
+
+export default function SupportMenuButton() {
+ const [version, setVersion] = useState({});
+ const onUiStoreChange = ({ version }) => setVersion(version);
+ useEffect(() => {
+ UIStore.listen(onUiStoreChange);
+ onUiStoreChange(UIStore.getState());
+ return () => UIStore.unlisten(onUiStoreChange);
+ }, []);
+ const hasVersions = version && Object.keys(version).length > 1;
+
+ return (
+
+
+
+
+
+
+
+ {hasVersions && (
+ <>
+
+
+ {Object.entries(version).map(([k, v]) => (
+
+ {k}:
+
+ {k == 'version' ? v : v.substring(0, 8)}
+
+
+ ))}
+
+
+ )}
+
+ );
+}
diff --git a/app/packs/src/components/navigation/UserAuth.js b/app/packs/src/components/navigation/UserAuth.js
index 668fb7690d..d6ae084b0c 100644
--- a/app/packs/src/components/navigation/UserAuth.js
+++ b/app/packs/src/components/navigation/UserAuth.js
@@ -2,7 +2,6 @@ import React, { Component } from 'react';
import 'whatwg-fetch';
import {
Card,
- Nav,
NavDropdown,
Modal,
Button,
@@ -609,45 +608,45 @@ export default class UserAuth extends Component {
return (
<>
-
+ )}
+
+ Converter Profile
+
+
Generic Designer
+
+
UserActions.logout()}>
+
+ Log out
+
+
+
{this.renderModal()}
{this.renderAffiliations()}
diff --git a/app/packs/src/components/textTemplateToolbar/ToolbarTemplateCreator.js b/app/packs/src/components/textTemplateToolbar/ToolbarTemplateCreator.js
index 5a5c033fc3..bd9f8b0007 100644
--- a/app/packs/src/components/textTemplateToolbar/ToolbarTemplateCreator.js
+++ b/app/packs/src/components/textTemplateToolbar/ToolbarTemplateCreator.js
@@ -116,7 +116,7 @@ export default class ToolbarTemplateCreator extends React.Component {
const { updateTextTemplates } = this.props;
if (!updateTextTemplates) return;
- const iconTemplates = this.toolbarSelectRef.current.state.value;
+ const iconTemplates = this.toolbarSelectRef.current.state.selectValue;
const userTemplate = { _toolbar: iconTemplates.map(n => n.value) };
const { dropdownTemplates } = this.state;
@@ -126,7 +126,7 @@ export default class ToolbarTemplateCreator extends React.Component {
if (selectRefs.length === 0 || titleRefs.length === 0) return;
const selectRef = selectRefs[0].ref;
- const selectedValue = selectRef.current.state.value;
+ const selectedValue = selectRef.current.state.selectValue;
const tempName = template.name;
userTemplate[tempName] = selectedValue.map(v => v.value);
@@ -156,10 +156,9 @@ export default class ToolbarTemplateCreator extends React.Component {
const removeDropdown = () => this.removeDropdownTemplate(template);
return (
- <>
+
@@ -188,7 +187,7 @@ export default class ToolbarTemplateCreator extends React.Component {
-
+
);
});
@@ -219,8 +218,8 @@ export default class ToolbarTemplateCreator extends React.Component {
defaultValue="Toolbar"
/>