Skip to content

revert end conv #22

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

Merged
merged 1 commit into from
Jan 23, 2024
Merged

revert end conv #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 4 additions & 21 deletions src/routes/chat/[agentId]/[conversationId]/chat-box.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
DropdownMenu,
DropdownItem,
} from '@sveltestrap/sveltestrap';

import 'overlayscrollbars/overlayscrollbars.css';
import { OverlayScrollbars } from 'overlayscrollbars';
import { page } from '$app/stores';
Expand All @@ -19,8 +18,6 @@
import RcQuickReply from './rc-quick-reply.svelte';
import { PUBLIC_LIVECHAT_ENTRY_ICON } from '$env/static/public';
import ContentLog from './content-log.svelte';
import Swal from 'sweetalert2/dist/sweetalert2.js';
import "sweetalert2/src/sweetalert2.scss";
import { replaceNewLine } from '$lib/helpers/http';
import _ from "lodash";

Expand Down Expand Up @@ -105,7 +102,7 @@
/** @param {import('$types').ContentLogModel} log */
function onContentLogGenerated(log) {
contentLogs.push(log);
contentLogs = contentLogs.map(log => { return { ...log }; });
contentLogs = contentLogs.map(x => { return { ...x }; });
}

function viewFullLogHandler() {
Expand Down Expand Up @@ -143,22 +140,8 @@
await sendMessageToHub(params.agentId, params.conversationId, text);
}

function endChat() {
// @ts-ignore
Swal.fire({
title: 'Are you sure?',
text: "You will exit this conversation.",
icon: 'warning',
customClass: 'conv-delete-modal',
showCancelButton: true,
confirmButtonText: 'Yes',
cancelButtonText: 'No'
// @ts-ignore
}).then((result) => {
if (result.value) {
window.close();
}
});
function close() {
window.parent.postMessage({ action: "close" }, "*");
}

function closeLog() {
Expand Down Expand Up @@ -194,7 +177,7 @@
{/if}
<li class="list-inline-item d-sm-inline-block">
<button type="submit" class="btn btn-primary btn-rounded chat-send waves-effect waves-light"
on:click={() => endChat()}
on:click={close}
>
<span class="d-none d-sm-inline-block me-2" >End Conversation</span> <i class="mdi mdi-window-close"></i>
</button>
Expand Down
22 changes: 11 additions & 11 deletions src/routes/page/agent/evaluator/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,34 @@
import { Col, Row } from '@sveltestrap/sveltestrap';
import Breadcrumb from '$lib/common/Breadcrumb.svelte';
import HeadTitle from '$lib/common/HeadTitle.svelte';
import { getAgents } from '$lib/services/agent-service.js';
import { onMount } from 'svelte';
import { getAgents } from '$lib/services/agent-service.js';
import { onMount } from 'svelte';
import PlainPagination from '$lib/common/PlainPagination.svelte';

const firstPage = 1;
const firstPage = 1;
const pageSize = 12;

/** @type {import('$types').PagedItems<import('$types').AgentModel>} */
let agents = { items: [], count: 0 };
let agents = { items: [], count: 0 };

/** @type {import('$types').AgentFilter} */
const initFilter = {
pager: { page: firstPage, size: pageSize, count: 0 },
isEvaluator: true
};

/** @type {import('$types').AgentFilter} */
let filter = { ... initFilter };
/** @type {import('$types').AgentFilter} */
let filter = { ... initFilter };

/** @type {import('$types').Pagination} */
let pager = filter.pager;

onMount(async () => {
await getPagedAgents();
});
onMount(async () => {
await getPagedAgents();
});

async function getPagedAgents() {
agents = await getAgents(filter);
async function getPagedAgents() {
agents = await getAgents(filter);
refresh();
}

Expand Down
4 changes: 2 additions & 2 deletions src/routes/page/agent/router/routing-flow.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import { getAgents } from '$lib/services/agent-service.js';
import { onMount, createEventDispatcher } from 'svelte';

/** @type any[]} */
/** @type {any[]} */
let agents = [];

/** @type {import('$types').AgentFilter} */
Expand All @@ -14,7 +14,7 @@
isRouter: false,
isEvaluator: false,
disabled: false,
allowRouting: false
allowRouting: true
};

/** @type {import('$types').AgentModel} */
Expand Down