fix prompt test

Author: Veikkosuhonen

e2e/prompts.spec.ts

@@ -3,11 +3,6 @@ import { expect } from '@playwright/test'
 import { acceptDisclaimer } from './utils/test-helpers'
 
 test.describe('Prompt creation', () => {
-  test.beforeEach(async ({ page }) => {
-    await page.goto('/v2')
-    await acceptDisclaimer(page)
-  })
-
   test('test', async ({ page }) => {
     await page.goto('/courses/test-course/prompts')
 
@@ -16,13 +11,10 @@ test.describe('Prompt creation', () => {
     await page.getByRole('textbox', { name: 'Prompt name' }).fill(newPromptName)
     await page.getByRole('textbox', { name: 'e.g. You are a helpful' }).fill('sanot aina "testi onnistui"')
     await page.getByRole('button', { name: 'Save' }).click()
-    expect(page.getByText(newPromptName)).toBeVisible()
-    await page.getByText('Link to chat with this prompt active').last().click()
-
+    await page.getByText(`Link to chat with the prompt '${newPromptName}' active`).click()
+    await acceptDisclaimer(page)
     await page.getByRole('button', { name: 'Chat settings' }).click()
 
-    await page.locator('#prompt-selector-button').click()
-
     expect(page.getByText(newPromptName)).toBeVisible()
   })
 })

src/client/components/ChatV2/SettingsModal.tsx

@@ -13,7 +13,6 @@ import { useSearchParams } from 'react-router-dom'
 import { BlueButton, OutlineButtonBlack } from './general/Buttons'
 import { useAnalyticsDispatch } from '../../stores/analytics'
 import useLocalStorageState from '../../hooks/useLocalStorageState'
-import { IframeCopy } from '../common/IframeCopy'
 
 const useUrlPromptId = () => {
   const [searchParams] = useSearchParams()

src/client/components/Courses/Course/Prompt.tsx

@@ -79,9 +79,9 @@ const Prompt = ({ prompt, handleDelete, mandatoryPromptId }: { prompt: PromptTyp
                 </Typography>
                 <Box sx={{ display: 'flex', alignItems: 'center' }}>
                   <Link component={RouterLink} to={chatPath} variant="caption">
-                    {t('course:directPromptLink')}
+                    {t('course:directPromptLink', { name: prompt.name })}
                   </Link>
-                  <Tooltip title={t('course:copyDirectPromptLinkInfo')}>
+                  <Tooltip title={t('course:copyDirectPromptLinkInfo', { name: prompt.name })}>
                     <IconButton size="small" onClick={() => navigator.clipboard.writeText(directLink)}>
                       <ContentCopyOutlined fontSize="small" />
                     </IconButton>

src/client/hooks/usePrompts.ts

@@ -14,7 +14,7 @@ const usePrompts = (chatInstanceId: string) => {
     return data
   }
 
-  const { data: prompts, ...rest } = useQuery({ queryKey, queryFn })
+  const { data: prompts, ...rest } = useQuery({ queryKey, queryFn, select: (data) => data.sort((a, b) => Date.parse(a.createdAt) - Date.parse(b.createdAt)) })
 
   return { prompts: prompts || [], ...rest }
 }

src/client/locales/en.json

@@ -278,8 +278,8 @@
     "isSavedOptOut": "The course discussions will be saved anonymously, if you grant permission to save. Saved discussions can be used for research purposes.",
     "isSavedNotOptOut": "The course discussions will be saved anonymously.\n\nSaved discussions can be used for research purposes",
     "isSavedForTeacherOptOut": "The course discussions will be saved anonymously, if user grants the permission to save. Saved discussions can be used for research purposes",
-    "directPromptLink": "Link to chat with this prompt active",
-    "copyDirectPromptLinkInfo": "Copy a link to chat with this prompt active",
+    "directPromptLink": "Link to chat with the prompt '{{name}}' active",
+    "copyDirectPromptLinkInfo": "Copy a link to chat with the prompt '{{name}}' active",
     "stats": "Statistics",
     "discussions": "Discussions",
     "prompts": "Prompts",
@@ -308,4 +308,4 @@
     "titleV1": "This is the old chat view. You've selected the new view as default but can restore the old default here:",
     "buttonV1": "Select as default"
   }
-}
+}

src/client/locales/fi.json

@@ -278,8 +278,8 @@
     "isSavedOptOut": "Kurssilla käymäsi keskustelut tallennetaan anonyymisti, jos annat tallennusluvan.\nTallennettuja keskusteluja voidaan käyttää tutkimuksessa.",
     "isSavedNotOptOut": "Kurssilla käymäsi keskustelut tallennetaan anonyymisti.\n\nTallennettuja keskusteluja voidaan käyttää tutkimuksessa",
     "isSavedForTeacherOptOut": "Kurssin keskustelut tallennetaan anonyymisti, jos käyttäjä antaa luvan.",
-    "directPromptLink": "Linkki kurssichattiin käyttäen tätä alustusta",
-    "copyDirectPromptLinkInfo": "Kopioi linkki tämän alustuksen kurssichattiin",
+    "directPromptLink": "Linkki kurssichattiin alustuksella '{{name}}'",
+    "copyDirectPromptLinkInfo": "Kopioi linkki kurssichattiin alustuksella '{{name}}'",
     "stats": "Statistiikka",
     "discussions": "Keskustelut",
     "prompts": "Alustukset",
@@ -308,4 +308,4 @@
     "titleV1": "Tämä on vanha chattinäkymä. Olet valinnut oletukseksi uuden näkymän mutta voit palauttaa vanhan tästä:",
     "buttonV1": "Valitse oletusarvoksi"
   }
-}
+}

src/client/types.ts

@@ -67,6 +67,7 @@ export type Prompt = {
   hidden: boolean
   mandatory: boolean
   type: 'CHAT_INSTANCE' | 'PERSONAL' | 'RAG_INDEX'
+  createdAt: string
 }
 
 export interface ChatInstance {

src/server/routes/prompt.ts

@@ -34,7 +34,8 @@ promptRouter.get('/:courseId', async (req, res) => {
     include: {
       model: Prompt,
       as: 'prompts',
-      order: [['name', 'ASC']],
+      separate: true,
+      order: [['createdAt', 'ASC']],
     },
   })