From 6d4a015e5f8e4b83cfc1f1293eb1bbd927ed7e0c Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Wed, 15 May 2024 15:53:29 -0500 Subject: [PATCH 1/7] add user role limit --- src/lib/helpers/types.js | 1 + .../[conversationId]/chat-box.svelte | 38 ++++++++++++++----- src/routes/page/agent/[agentId]/+page.svelte | 2 +- .../[conversationId]/+page.svelte | 2 +- 4 files changed, 32 insertions(+), 11 deletions(-) diff --git a/src/lib/helpers/types.js b/src/lib/helpers/types.js index 926f27b..d7c7522 100644 --- a/src/lib/helpers/types.js +++ b/src/lib/helpers/types.js @@ -129,6 +129,7 @@ * @property {Object[]} responses * @property {RoutingRule[]} routing_rules * @property {AgentWelcomeInfo} welcome_info - Welcome information. + * @property {boolean} editable */ /** diff --git a/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte b/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte index 654949c..d1c3e2a 100644 --- a/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte +++ b/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte @@ -126,6 +126,7 @@ let loadTextEditor = false; let loadFileEditor = false; let autoScrollLog = false; + let disableAction = false; $: { const editor = lastBotMsg?.rich_content?.editor || ''; @@ -134,6 +135,10 @@ loadEditor = !isSendingMsg && !isThinking && (loadTextEditor || loadFileEditor); } + $: { + disableAction = currentUser?.role !== UserRole.Admin && currentUser?.id !== conversationUser?.id; + } + setContext('chat-window-context', { autoScrollToBottom: autoScrollToBottom }); @@ -913,12 +918,26 @@ {#if !isLoadStateLog} - toggleStateLog()}>View States + toggleStateLog()} + > + View States + {/if} {#if !isOpenUserAddStateModal} - toggleUserAddStateModal()}>Add States + toggleUserAddStateModal()} + > + Add States + {/if} - clearUserAddStates()}>Clear States + clearUserAddStates()} + > + Clear States + @@ -931,6 +950,7 @@
  • + diff --git a/src/routes/page/conversation/[conversationId]/+page.svelte b/src/routes/page/conversation/[conversationId]/+page.svelte index 380edb7..4c8f72c 100644 --- a/src/routes/page/conversation/[conversationId]/+page.svelte +++ b/src/routes/page/conversation/[conversationId]/+page.svelte @@ -54,9 +54,9 @@ -{/if}
    +{/if} From 5ec313e336b01513cf17095b14be21195d1e71ef Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Wed, 15 May 2024 18:21:33 -0500 Subject: [PATCH 2/7] minor change on conv title --- src/routes/page/conversation/[conversationId]/+page.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/page/conversation/[conversationId]/+page.svelte b/src/routes/page/conversation/[conversationId]/+page.svelte index 4c8f72c..036a98e 100644 --- a/src/routes/page/conversation/[conversationId]/+page.svelte +++ b/src/routes/page/conversation/[conversationId]/+page.svelte @@ -41,7 +41,7 @@ - + {#if conversation} From 4b7938d71811fe04b30e029a9d02b3ee1a73f480 Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Tue, 21 May 2024 15:39:16 -0500 Subject: [PATCH 3/7] add delete agent --- src/lib/common/Breadcrumb.svelte | 2 +- src/lib/helpers/http.js | 3 +- src/lib/services/agent-service.js | 9 ++++ src/routes/page/agent/+page.svelte | 34 ++++++++++-- src/routes/page/agent/[agentId]/+page.svelte | 57 +++++++++++++++++--- src/routes/page/agent/card-agent.svelte | 12 ++--- 6 files changed, 100 insertions(+), 17 deletions(-) diff --git a/src/lib/common/Breadcrumb.svelte b/src/lib/common/Breadcrumb.svelte index bb59018..438bcc7 100644 --- a/src/lib/common/Breadcrumb.svelte +++ b/src/lib/common/Breadcrumb.svelte @@ -13,7 +13,7 @@
      - {title} + {title} {pagetitle} diff --git a/src/lib/helpers/http.js b/src/lib/helpers/http.js index 2ff5076..5cf8a7a 100644 --- a/src/lib/helpers/http.js +++ b/src/lib/helpers/http.js @@ -55,7 +55,8 @@ axios.interceptors.response.use( /** @param {import('axios').InternalAxiosRequestConfig} config */ function skipLoader(config) { const postRegexes = [ - new RegExp('http(s*)://(.*?)/conversation/(.*?)/(.*?)', 'g') + new RegExp('http(s*)://(.*?)/conversation/(.*?)/(.*?)', 'g'), + new RegExp('http(s*)://(.*?)/agent', 'g') ]; const getRegexes = [ diff --git a/src/lib/services/agent-service.js b/src/lib/services/agent-service.js index dd1cc70..5d5d52b 100644 --- a/src/lib/services/agent-service.js +++ b/src/lib/services/agent-service.js @@ -48,6 +48,15 @@ export async function saveAgent(agent) { await axios.put(url, agent); } +/** + * Delete agent detail + * @param {string} agentId + */ +export async function deleteAgent(agentId) { + let url = endpoints.agentDetailUrl.replace("{id}", agentId); + await axios.delete(url); +} + /** * Refresh agent data */ diff --git a/src/routes/page/agent/+page.svelte b/src/routes/page/agent/+page.svelte index f1b08b8..a461b35 100644 --- a/src/routes/page/agent/+page.svelte +++ b/src/routes/page/agent/+page.svelte @@ -6,9 +6,13 @@ import { createAgent, getAgents } from '$lib/services/agent-service.js'; import { onMount } from 'svelte'; import PlainPagination from '$lib/common/PlainPagination.svelte'; + import { UserRole } from '$lib/helpers/enums'; import { _ } from 'svelte-i18n' import { goto } from '$app/navigation'; - + import { myInfo } from '$lib/services/auth-service'; + import Swal from 'sweetalert2/dist/sweetalert2.js'; + import "sweetalert2/src/sweetalert2.scss"; + const firstPage = 1; const pageSize = 12; @@ -26,8 +30,12 @@ /** @type {import('$types').Pagination} */ let pager = filter.pager; + /** @type {import('$types').UserModel} */ + let user; + onMount(async () => { await getPagedAgents(); + user = await myInfo(); }); async function getPagedAgents() { @@ -35,7 +43,24 @@ refresh(); } - async function createAndEditAgent() { + function createNewAgent() { + // @ts-ignore + Swal.fire({ + title: 'Are you sure?', + text: "Are you sure you want to create a new agent?", + icon: 'warning', + showCancelButton: true, + cancelButtonText: 'No', + confirmButtonText: 'Yes' + // @ts-ignore + }).then(async (result) => { + if (result.value) { + await handleCreateNewAgent(); + } + }); + } + + async function handleCreateNewAgent() { const newAgent = { name: 'New Agent', description: 'New Agent Description', @@ -87,9 +112,12 @@ - +{/if} diff --git a/src/routes/page/agent/[agentId]/+page.svelte b/src/routes/page/agent/[agentId]/+page.svelte index e030940..c7778e8 100644 --- a/src/routes/page/agent/[agentId]/+page.svelte +++ b/src/routes/page/agent/[agentId]/+page.svelte @@ -13,10 +13,12 @@ import AgentFunction from './agent-function.svelte'; import AgentLlmConfig from './agent-llm-config.svelte'; import { page } from '$app/stores'; - import { getAgent, saveAgent } from '$lib/services/agent-service.js'; + import { deleteAgent, getAgent, saveAgent } from '$lib/services/agent-service.js'; import { onMount } from 'svelte'; - const params = $page.params; import { _ } from 'svelte-i18n' + import Swal from 'sweetalert2/dist/sweetalert2.js'; + import "sweetalert2/src/sweetalert2.scss"; + import { goto } from '$app/navigation'; /** @type {import('$types').AgentModel} */ @@ -28,13 +30,32 @@ let isLoading = false; let isComplete = false; let isError = false; + const duration = 3000; + const params = $page.params; onMount(async () => { agent = await getAgent(params.agentId); }); - async function handleAgentUpdate() { + function updateCurrentAgent() { + // @ts-ignore + Swal.fire({ + title: 'Are you sure?', + text: "Are you sure you want to update these changes?", + icon: 'warning', + showCancelButton: true, + cancelButtonText: 'No', + confirmButtonText: 'Yes' + // @ts-ignore + }).then(async (result) => { + if (result.value) { + handleAgentUpdate(); + } + }); + } + + function handleAgentUpdate() { fetchJsonContent(); isLoading = true; saveAgent(agent).then(res => { @@ -64,14 +85,37 @@ agent.templates = textContent?.templates?.length > 0 ? textContent.templates : (jsonContent?.templates?.length > 0 ? jsonContent?.templates : []); } + + function deleteCurrentAgent() { + // @ts-ignore + Swal.fire({ + title: 'Are you sure?', + text: "Are you sure you want to delete this agent?", + icon: 'warning', + showCancelButton: true, + cancelButtonText: 'No', + confirmButtonText: 'Yes' + // @ts-ignore + }).then(async (result) => { + if (result.value) { + handleAgentDelete(); + } + }); + } + + function handleAgentDelete() { + deleteAgent(agent?.id).then(res => { + goto(`page/agent`); + }); + } +{#if agent} - {#if agent} @@ -85,10 +129,11 @@ - {/if}
      - + +
      +{/if} \ No newline at end of file diff --git a/src/routes/page/agent/card-agent.svelte b/src/routes/page/agent/card-agent.svelte index dde3619..794c7b3 100644 --- a/src/routes/page/agent/card-agent.svelte +++ b/src/routes/page/agent/card-agent.svelte @@ -66,20 +66,20 @@ {format(agent.updated_datetime, 'short-date')}
    1. - + {$_('Build')} - +
      2. {#if agent.is_public }
    2. - + {$_('Train')} - +
    3. - + {$_('Test')} - +
      4. {/if} From 841cc5d74b85ef751c8e208c5968ca746c0a29a0 Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Tue, 21 May 2024 15:41:11 -0500 Subject: [PATCH 4/7] minor change --- src/routes/page/agent/[agentId]/+page.svelte | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/routes/page/agent/[agentId]/+page.svelte b/src/routes/page/agent/[agentId]/+page.svelte index c7778e8..37d2057 100644 --- a/src/routes/page/agent/[agentId]/+page.svelte +++ b/src/routes/page/agent/[agentId]/+page.svelte @@ -130,10 +130,12 @@       - -
      - - -
      -       + {#if !!agent?.editable} + +
      + + +
      +       + {/if} {/if} \ No newline at end of file From ec42dd262e28f801c133dc8d182dd7060b991c87 Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Tue, 21 May 2024 15:53:06 -0500 Subject: [PATCH 5/7] reset local storeage --- src/lib/common/NotificationDropdown.svelte | 4 ++-- src/lib/common/ProfileDropdown.svelte | 15 ++++++++------- src/lib/helpers/store.js | 12 +++++++++++- src/routes/(authentication)/login/+page.svelte | 16 ++-------------- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/lib/common/NotificationDropdown.svelte b/src/lib/common/NotificationDropdown.svelte index 2af6bcc..b8bd863 100644 --- a/src/lib/common/NotificationDropdown.svelte +++ b/src/lib/common/NotificationDropdown.svelte @@ -37,12 +37,12 @@
      {$_('Notifications')}
    - {$_('View All')} + {$_('View All')}
    - +
    diff --git a/src/lib/common/ProfileDropdown.svelte b/src/lib/common/ProfileDropdown.svelte index 0ae88a3..629d081 100644 --- a/src/lib/common/ProfileDropdown.svelte +++ b/src/lib/common/ProfileDropdown.svelte @@ -1,5 +1,6 @@ From e35ce10e348a4957b21f40e22a025df21157990e Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Tue, 21 May 2024 15:57:24 -0500 Subject: [PATCH 6/7] resolve conflict --- src/routes/(authentication)/login/+page.svelte | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/routes/(authentication)/login/+page.svelte b/src/routes/(authentication)/login/+page.svelte index 4c61d39..c268bcf 100644 --- a/src/routes/(authentication)/login/+page.svelte +++ b/src/routes/(authentication)/login/+page.svelte @@ -66,7 +66,7 @@ status = 'success'; const redirectUrl = $page.url.searchParams.get('redirect'); isSubmitting = false; - resetStorage(); + resetLocalStorage(); if (redirectUrl) { window.location.href = decodeURIComponent(redirectUrl); } else { @@ -82,7 +82,6 @@ status = ''; msg = ''; }, 3000); - resetLocalStorage(); }); isSubmitting = false; } From 6ba810b81a38d14c7048bfdb86d52b465a4fae06 Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Tue, 21 May 2024 16:01:18 -0500 Subject: [PATCH 7/7] minor change --- src/lib/common/ProfileDropdown.svelte | 2 +- src/lib/helpers/store.js | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/lib/common/ProfileDropdown.svelte b/src/lib/common/ProfileDropdown.svelte index 629d081..3dd7953 100644 --- a/src/lib/common/ProfileDropdown.svelte +++ b/src/lib/common/ProfileDropdown.svelte @@ -11,7 +11,7 @@ export let user; function logout() { if (browser){ - resetLocalStorage(); + resetLocalStorage(true); } goto('login'); }; diff --git a/src/lib/helpers/store.js b/src/lib/helpers/store.js index 98b167b..6180869 100644 --- a/src/lib/helpers/store.js +++ b/src/lib/helpers/store.js @@ -155,11 +155,14 @@ const createConversationUserAttachmentStore = () => { export const conversationUserAttachmentStore = createConversationUserAttachmentStore(); -export function resetLocalStorage() { +export function resetLocalStorage(resetUser = false) { conversationUserStateStore.reset(); conversationSearchOptionStore.reset(); conversationUserMessageStore.reset(); conversationUserAttachmentStore.reset(); - localStorage.removeItem('user'); localStorage.removeItem('conversation'); + + if (resetUser) { + localStorage.removeItem('user'); + } } \ No newline at end of file