Skip to content

Commit a9692d0

Browse files
authored
Merge pull request #485 from KxSystems/ee-label
Fixed issue with labels using space
2 parents e28a293 + 93aff5a commit a9692d0

File tree

1 file changed

+22
-15
lines changed

1 file changed

+22
-15
lines changed

src/webview/components/kdbNewConnectionView.ts

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ export class KdbNewConnectionView extends LitElement {
124124
}
125125

126126
updateLabelValue(pos: number, event: Event) {
127-
this.labels[pos] = (event.target as HTMLSelectElement).value;
127+
const value = (event.target as HTMLSelectElement).value;
128+
this.labels[pos] = decodeURIComponent(value);
128129
this.requestUpdate();
129130
}
130131

@@ -367,24 +368,30 @@ export class KdbNewConnectionView extends LitElement {
367368
<sl-select
368369
id="selectLabel"
369370
class="dropdown larger"
370-
value="${live(this.labels[pos])}"
371+
value="${live(
372+
this.labels[pos] === undefined
373+
? ""
374+
: encodeURIComponent(this.labels[pos]),
375+
)}"
371376
@sl-change="${(event: Event) => {
372377
this.updateLabelValue(pos, event);
373378
}}">
374379
${this.renderLblDropdownOptions(pos)}
375380
</sl-select>
376-
<sl-button
377-
aria-label="Remove Label"
378-
variant="neutral"
379-
@click="${() => this.removeLabel(pos)}"
380-
>-</sl-button
381-
>
382-
<sl-button
383-
aria-label="Add Label"
384-
variant="neutral"
385-
@click="${this.addLabel}"
386-
>+</sl-button
387-
>
381+
<sl-button-group>
382+
<sl-button
383+
aria-label="Remove Label"
384+
variant="neutral"
385+
@click="${() => this.removeLabel(pos)}"
386+
>-</sl-button
387+
>
388+
<sl-button
389+
aria-label="Add Label"
390+
variant="neutral"
391+
@click="${this.addLabel}"
392+
>+</sl-button
393+
>
394+
</sl-button-group>
388395
</div>
389396
`;
390397
}
@@ -400,7 +407,7 @@ export class KdbNewConnectionView extends LitElement {
400407
console.log(lbl.name);
401408
console.log(lbl.name === this.labels[pos]);
402409
return html`
403-
<sl-option .value="${lbl.name}">
410+
<sl-option .value="${encodeURIComponent(lbl.name)}">
404411
<span>
405412
<div
406413
style="width: 10px; height: 10px; background: ${lbl.color

0 commit comments

Comments
 (0)