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

Make OLE components field to persist set values #595

Merged
merged 2 commits into from
Jan 15, 2024
Merged

Make OLE components field to persist set values #595

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
ea2853c
Make `components` field to persist set values
sebastian-aranda Jan 11, 2024
b665406
Update CHANGELOG
sebastian-aranda Jan 11, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ v5.27.11

* Bump follow-redirects from 1.15.2 to 1.15.5 in /love `<https://github.com/lsst-ts/LOVE-frontend/pull/597>`_
* Increase OLE tables contrast even more `<https://github.com/lsst-ts/LOVE-frontend/pull/596>`_
* Make OLE components field to persist set values `<https://github.com/lsst-ts/LOVE-frontend/pull/595>`_
* Add button to send showSchema command `<https://github.com/lsst-ts/LOVE-frontend/pull/594>`_
* Adjust LOVE M2 force gradient coloring `<https://github.com/lsst-ts/LOVE-frontend/pull/592>`_
* Fix GIS signals typo `<https://github.com/lsst-ts/LOVE-frontend/pull/591>`_
Expand Down
8 changes: 8 additions & 0 deletions love/src/components/OLE/NonExposure/NonExposure.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,3 +600,11 @@ table.table tr {
.wikiMarkupText:has(+ .expandBtn:checked) {
max-height: none;
}

.inputGroup {
display: flex;
}

.inputGroup > :first-child {
flex-grow: 1;
}
42 changes: 29 additions & 13 deletions love/src/components/OLE/NonExposure/NonExposureEdit.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,24 @@ export default class NonExposureEdit extends Component {
}

cleanForm() {
// Reset MultiSelect component value
this.multiselectComponentsRef.current?.resetSelectedValues();
// Reset RichTextEditor component value
this.richTextEditorRef.current?.cleanContent();
this.setState({ logEdit: NonExposureEdit.defaultProps.logEdit });

// Reset logEdit values
// Keep previously saved components for persistence
this.setState((prevState) => ({
logEdit: {
...NonExposureEdit.defaultProps.logEdit,
components: prevState.logEdit.components,
},
}));
}

clearComponentsInput() {
this.setState((prevState) => ({
logEdit: { ...prevState.logEdit, components: [] },
}));
this.multiselectComponentsRef.current?.resetSelectedValues();
}

updateDates() {
Expand Down Expand Up @@ -326,16 +339,19 @@ export default class NonExposureEdit extends Component {
<>
<span className={styles.label}>Components</span>
<span className={styles.value}>
<Multiselect
innerRef={this.multiselectComponentsRef}
className={styles.select}
options={componentOptions}
selectedValues={logEdit?.components}
onSelect={setLogEditComponents}
onRemove={setLogEditComponents}
placeholder="Select zero or several components"
selectedValueDecorator={(v) => (v.length > 10 ? `${v.slice(0, 10)}...` : v)}
/>
<div className={styles.inputGroup}>
<Multiselect
innerRef={this.multiselectComponentsRef}
className={styles.select}
options={componentOptions}
selectedValues={logEdit?.components}
onSelect={setLogEditComponents}
onRemove={setLogEditComponents}
placeholder="Select zero or several components"
selectedValueDecorator={(v) => (v.length > 10 ? `${v.slice(0, 10)}...` : v)}
/>
<Button onClick={() => this.clearComponentsInput()}>Clear</Button>
</div>
</span>
<span className={styles.label}>Primary Software Component</span>
<span className={styles.value}>
Expand Down
39 changes: 27 additions & 12 deletions love/src/components/OLE/Tekniker/TeknikerAdd.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,21 @@ export default class TeknikerAdd extends Component {
}

cleanForm() {
// Reset multiselects values
// Reset logEdit values
// Keep previously saved components for persistence
this.setState((prevState) => ({
logEdit: {
...TeknikerAdd.defaultProps.logEdit,
components: prevState.logEdit.components,
},
}));
}

clearComponentsInput() {
this.setState((prevState) => ({
logEdit: { ...prevState.logEdit, components: [] },
}));
this.multiselectComponentsRef.current?.resetSelectedValues();
this.setState({ logEdit: TeknikerAdd.defaultProps.logEdit });
}

updateDates() {
Expand Down Expand Up @@ -314,16 +326,19 @@ export default class TeknikerAdd extends Component {
<>
<span className={styles.label}>Components</span>
<span className={styles.value}>
<Multiselect
innerRef={this.multiselectComponentsRef}
className={styles.select}
options={componentOptions}
selectedValues={logEdit?.components}
onSelect={setLogEditComponents}
onRemove={setLogEditComponents}
placeholder="Select zero or several components"
selectedValueDecorator={(v) => (v.length > 10 ? `${v.slice(0, 10)}...` : v)}
/>
<div className={styles.inputGroup}>
<Multiselect
innerRef={this.multiselectComponentsRef}
className={styles.select}
options={componentOptions}
selectedValues={logEdit?.components}
onSelect={setLogEditComponents}
onRemove={setLogEditComponents}
placeholder="Select zero or several components"
selectedValueDecorator={(v) => (v.length > 10 ? `${v.slice(0, 10)}...` : v)}
/>
<Button onClick={() => this.clearComponentsInput()}>Clear</Button>
</div>
</span>
<span className={styles.label}>Primary Software Component</span>
<span className={styles.value}>
Expand Down
Loading