Skip to content
Snippets Groups Projects
Unverified Commit cd326100 authored by Paul Rosenzweig's avatar Paul Rosenzweig Committed by GitHub
Browse files

Fix dashboard filter reordering/renaming (#10323)

parent 8f26985f
No related branches found
No related tags found
No related merge requests found
......@@ -382,6 +382,9 @@ export function setParameterName(
parameter: Parameter,
name: string,
): Parameter {
if (!name) {
name = "unnamed";
}
const slug = slugify(name);
return {
...parameter,
......
......@@ -15,6 +15,7 @@ import { KEYCODE_ENTER, KEYCODE_ESCAPE } from "metabase/lib/keyboard";
export default class ParameterWidget extends Component {
state = {
isEditingName: false,
editingNameValue: undefined,
isFocused: false,
};
......@@ -111,9 +112,15 @@ export default class ParameterWidget extends Component {
p => p.name === parameter.name && p.id !== parameter.id,
),
})}
value={parameter.name}
onChange={e => setName(e.target.value)}
onBlur={() => this.setState({ isEditingName: false })}
value={this.state.editingNameValue}
onChange={e => this.setState({ editingNameValue: e.target.value })}
onBlur={() => {
setName(this.state.editingNameValue);
this.setState({
isEditingName: false,
editingNameValue: undefined,
});
}}
onKeyUp={e => {
if (e.keyCode === KEYCODE_ESCAPE || e.keyCode === KEYCODE_ENTER) {
e.target.blur();
......@@ -133,7 +140,12 @@ export default class ParameterWidget extends Component {
name="pencil"
size={12}
className="text-brand cursor-pointer"
onClick={() => this.setState({ isEditingName: true })}
onClick={() => {
this.setState({
isEditingName: true,
editingNameValue: parameter.name,
});
}}
/>
</span>
);
......
......@@ -175,6 +175,7 @@ export default class Parameters extends Component {
parameters={parameters}
editingParameter={editingParameter}
setEditingParameter={setEditingParameter}
index={index}
setName={
setParameterName &&
(name => setParameterName(parameter.id, name))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment