Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
211 changes: 149 additions & 62 deletions src/lib/common/MultiSelect.svelte → src/lib/common/Select.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script>
import { onMount, createEventDispatcher, tick, afterUpdate } from "svelte";
import { onMount, createEventDispatcher, tick } from "svelte";
import { Input } from "@sveltestrap/sveltestrap";
import { clickoutsideDirective } from "$lib/helpers/directives";

Expand All @@ -11,9 +11,15 @@
/** @type {import('$commonTypes').LabelValuePair[]} */
export let options = [];

/** @type {boolean} */
export let multiSelect = false;

/** @type {boolean} */
export let selectAll = true;

/** @type {boolean} */
export let disabled = false;

/** @type {string} */
export let searchPlaceholder = '';

Expand All @@ -24,7 +30,7 @@
export let selectedText = '';

/** @type {string[]} */
export let selectedLabels;
export let selectedValues = [];

/** @type {string} */
export let containerClasses = "";
Expand All @@ -38,6 +44,9 @@
/** @type {boolean} */
export let searchMode = false;

/** @type {boolean} */
export let loadMore = false;

/** @type {null | undefined | (() => Promise<any>)} */
export let onScrollMoreOptions = null;

Expand All @@ -64,6 +73,48 @@
let loading = false;

onMount(() => {
initOptions();
});

$: {
innerOptions = verifySelectedOptions(innerOptions, selectedValues);
refOptions = verifySelectedOptions(innerOptions, selectedValues);
changeDisplayText();
}

$: {
if (loadMore) {
if (options.length > refOptions.length) {
const curKeys = refOptions.map(x => x.value);
const newOptions = options.filter(x => !curKeys.includes(x.value)).map(x => {
return {
label: x.label,
value: x.value,
checked: false
};
});

innerOptions = [
...innerOptions,
...newOptions
];

refOptions = [
...refOptions,
...newOptions
];

changeDisplayText();
}
} else {
innerOptions = verifySelectedOptions(options, selectedValues);
refOptions = verifySelectedOptions(options, selectedValues);
changeDisplayText();
}
}


function initOptions() {
innerOptions = options.map(x => {
return {
label: x.label,
Expand All @@ -79,47 +130,27 @@
checked: false
}
});
});

$: {
innerOptions = innerOptions.map(x => {
x.checked = !!selectedLabels?.includes(x.label);
return {...x};
});
refOptions = refOptions.map(x => {
x.checked = !!selectedLabels?.includes(x.label);
return {...x};
});
changeDisplayText();
}

$: {
if (options.length > refOptions.length) {
const curKeys = refOptions.map(x => x.label);
const newOptions = options.filter(x => !curKeys.includes(x.label)).map(x => {
return {
label: x.label,
value: x.value,
checked: false
};
});

innerOptions = [
...innerOptions,
...newOptions
];

refOptions = [
...refOptions,
...newOptions
];

changeDisplayText();
}
/**
* @param {any[]} list
* @param {string[]} selecteds
*/
function verifySelectedOptions(list, selecteds) {
return list?.map(x => {
const item = { ...x, checked: false };
if (multiSelect) {
item.checked = !!selecteds?.includes(item.value);
} else {
item.checked = selecteds.length > 0 && selecteds[0] === item.value;
}
return item;
}) || [];
}


async function toggleOptionList() {
if (disabled) return;

showOptionList = !showOptionList;
if (showOptionList) {
await tick();
Expand All @@ -131,8 +162,10 @@
/** @param {any} e */
function changeSearchValue(e) {
searchValue = e.target.value || '';
const innerValue = searchValue.toLowerCase();

if (searchValue) {
innerOptions = [...refOptions.filter(x => x.value.includes(searchValue))];
innerOptions = [...refOptions.filter(x => x.label.toLowerCase().includes(innerValue))];
} else {
innerOptions = [...refOptions];
}
Expand All @@ -147,21 +180,28 @@
*/
function checkOption(e, option) {
innerOptions = innerOptions.map(x => {
if (x.label == option.label) {
x.checked = e == null ? !x.checked : e.target.checked;
const item = { ...x };
if (item.value == option.value) {
item.checked = e == null ? !item.checked : e.target.checked;
} else if (!multiSelect) {
item.checked = false;
}
return { ...x };
return item;
});

refOptions = refOptions.map(x => {
if (x.label == option.label) {
x.checked = e == null ? !x.checked : e.target.checked;
const item = { ...x };
if (item.value == option.value) {
item.checked = e == null ? !item.checked : e.target.checked;
} else if (!multiSelect) {
item.checked = false;
}
return { ...x };
return item;
});

changeDisplayText();
sendEvent();
hideOptionList();
}

/** @param {any} e */
Expand All @@ -178,9 +218,9 @@

/** @param {boolean} checked */
function syncChangesToRef(checked) {
const keys = innerOptions.map(x => x.label);
const keys = innerOptions.map(x => x.value);
refOptions = refOptions.map(x => {
if (keys.includes(x.label)) {
if (keys.includes(x.value)) {
return {
...x,
checked: checked
Expand All @@ -192,20 +232,25 @@
}

function changeDisplayText() {
const count = refOptions.filter(x => x.checked).length;
if (count === 0) {
displayText = '';
} else if (count === options.length) {
displayText = `All selected ${selectedText} (${count})`;
if (multiSelect) {
const count = refOptions.filter(x => x.checked).length;
if (count === 0) {
displayText = '';
} else if (count === options.length) {
displayText = `All selected ${selectedText} (${count})`;
} else {
displayText = `Selected ${selectedText} (${count})`;
}
} else {
displayText = `Selected ${selectedText} (${count})`;
const selected = refOptions.find(x => x.checked);
displayText = selected?.label || '';
}

verifySelectAll();
}

function verifySelectAll() {
if (!selectAll) return;
if (!selectAll || !multiSelect) return;

const innerCount = innerOptions.filter(x => x.checked).length;
if (innerCount < innerOptions.length) {
Expand Down Expand Up @@ -266,6 +311,26 @@
}
}
}

function clearSelection() {
innerOptions = innerOptions.map(x => {
return { ...x, checked: false }
});

refOptions = refOptions.map(x => {
return { ...x, checked: false }
});

changeDisplayText();
sendEvent();
hideOptionList();
}

function hideOptionList() {
if (!multiSelect) {
showOptionList = false;
}
}
</script>


Expand All @@ -277,22 +342,24 @@
>
<!-- svelte-ignore a11y-click-events-have-key-events -->
<!-- svelte-ignore a11y-no-noninteractive-element-interactions -->
<ul
<!-- svelte-ignore a11y-no-static-element-interactions -->
<div
class="display-container"
id={`multiselect-btn-${tag}`}
on:click={() => toggleOptionList()}
>
<Input
type="text"
class='clickable'
class={`clickable ${disabled ? 'disabled' : ''}`}
value={displayText}
placeholder={placeholder}
disabled={disabled}
readonly
/>
<div class={`display-suffix ${showOptionList ? 'show-list' : ''}`}>
<i class="bx bx-chevron-down" />
</div>
</ul>
</div>
{#if showOptionList}
<ul class="option-list" id={`multiselect-list-${tag}`} on:scroll={() => innerScroll()}>
{#if searchMode}
Expand All @@ -309,37 +376,57 @@
</div>
{/if}
{#if innerOptions.length > 0}
{#if selectAll}
{#if selectAll && multiSelect}
<!-- svelte-ignore a11y-click-events-have-key-events -->
<!-- svelte-ignore a11y-no-noninteractive-element-interactions -->
<li
class="option-item clickable"
on:click={() => checkSelectAll(null)}
on:click|preventDefault|stopPropagation={() => {
checkSelectAll(null);
}}
>
<div class="line-align-center select-box">
<Input
type="checkbox"
style="pointer-events: none;"
checked={selectAllChecked}
on:change={e => checkSelectAll(e)}
readonly
/>
</div>
<div class="line-align-center select-name fw-bold">
{'Select all'}
</div>
</li>
{/if}
{#if !multiSelect}
<!-- svelte-ignore a11y-click-events-have-key-events -->
<!-- svelte-ignore a11y-no-noninteractive-element-interactions -->
<li
class="option-item clickable"
on:click|preventDefault|stopPropagation={() => {
clearSelection();
}}
>
<div class="line-align-center text-secondary">
{`Clear selection`}
</div>
</li>
{/if}
{#each innerOptions as option, idx (idx)}
<!-- svelte-ignore a11y-click-events-have-key-events -->
<!-- svelte-ignore a11y-no-noninteractive-element-interactions -->
<li
class="option-item clickable"
on:click={() => checkOption(null, option)}
on:click|preventDefault|stopPropagation={() => {
checkOption(null, option);
}}
>
<div class="line-align-center select-box">
<Input
type="checkbox"
style="pointer-events: none;"
checked={option.checked}
on:change={e => checkOption(e, option)}
readonly
/>
</div>
<div class="line-align-center select-name">
Expand Down
2 changes: 2 additions & 0 deletions src/lib/helpers/types/conversationTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* @typedef {Object} ConversationFilter
* @property {import('$commonTypes').Pagination} pager - Pagination
* @property {string?} [agentId] - The agent id.
* @property {string[]?} [agentIds] - The agent ids.
* @property {string?} [channel] - The conversation channel.
* @property {string?} [status] - The conversation status.
* @property {string?} [taskId] - The task id.
Expand Down Expand Up @@ -288,6 +289,7 @@ IRichContent.prototype.quick_replies;
/**
* @typedef {Object} ConversationSearchOption
* @property {string?} [agentId]
* @property {string[]} [agentIds]
* @property {string?} [channel]
* @property {string?} [taskId]
* @property {string?} [status]
Expand Down
2 changes: 1 addition & 1 deletion src/lib/scss/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ File: Main Css File
@import "custom/components/file";
@import "custom/components/audio";
@import "custom/components/text";
@import "custom/components/multiselect";
@import "custom/components/select";
@import "custom/components/markdown";
@import "custom/components/state";

Expand Down
Loading