Remove everything related to mandatory prompts

Author: Veikkosuhonen

src/client/components/ChatV2/PromptSelector.tsx

@@ -1,13 +1,13 @@
-import { DeleteOutline, KeyboardArrowDown, Lock, AutoAwesome } from '@mui/icons-material'
+import { DeleteOutline, KeyboardArrowDown, AutoAwesome } from '@mui/icons-material'
 import { Box, Divider, IconButton, ListSubheader, Menu, MenuItem } from '@mui/material'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import type { Prompt } from '../../types'
 import { OutlineButtonBlack } from './general/Buttons'
 import { usePromptState } from './PromptState'
 
-const PromptSelector = ({ sx = {}, handleDeletePrompt }: { sx?: object; handleDeletePrompt?: (prompt: Prompt) => void }) => {
-  const { activePrompt, handleChangePrompt, mandatoryPrompt, coursePrompts, myPrompts } = usePromptState()
+const PromptSelector = ({ handleDeletePrompt }: { sx?: object; handleDeletePrompt?: (prompt: Prompt) => void }) => {
+  const { activePrompt, handleChangePrompt, coursePrompts, myPrompts } = usePromptState()
 
   const { t } = useTranslation()
 
@@ -29,11 +29,10 @@ const PromptSelector = ({ sx = {}, handleDeletePrompt }: { sx?: object; handleDe
         sx={{ width: '100%' }}
         startIcon={<AutoAwesome />}
         data-testid={`prompt-selector-button`}
-        disabled={!!mandatoryPrompt}
         onClick={(event) => {
           setAnchorEl(event.currentTarget)
         }}
-        endIcon={mandatoryPrompt ? <Lock /> : <KeyboardArrowDown />}
+        endIcon={<KeyboardArrowDown />}
       >
         <Box sx={{
           overflow: 'hidden',

src/client/components/ChatV2/PromptState.tsx

@@ -23,7 +23,6 @@ interface PromptSelectorStateType {
   handleChangePrompt: (newPrompt: Prompt | undefined) => void
   coursePrompts: Prompt[]
   myPrompts: Prompt[]
-  mandatoryPrompt: Prompt | undefined
   urlPrompt: Prompt | undefined
   isPromptHidden: boolean
   isPromptEditable: boolean
@@ -62,7 +61,6 @@ export const PromptStateProvider: React.FC<{
   const [customSystemMessage, setCustomSystemMessage] = useLocalStorageState<string>(`${localStoragePrefix}-chat-instructions`, '')
   const [activePrompt, setActivePrompt] = useLocalStorageState<Prompt | undefined>(`${localStoragePrefix}-active-prompt`, undefined)
 
-  const mandatoryPrompt = course?.prompts.find((p) => p.mandatory)
   const urlPrompt = course?.prompts.find((p) => p.id === urlPromptId)
   const isPromptHidden = activePrompt?.hidden ?? false
   const isPromptEditable = activePrompt === undefined || activePrompt?.type === 'PERSONAL'
@@ -116,15 +114,6 @@ export const PromptStateProvider: React.FC<{
     })
   }, [activePrompt?.id])
 
-  // If there is a mandatory prompt, change to that.
-  useEffect(() => {
-    if (mandatoryPrompt) {
-      handleChangePrompt(mandatoryPrompt)
-    } else if (urlPrompt) {
-      handleChangePrompt(urlPrompt)
-    }
-  }, [mandatoryPrompt, urlPrompt])
-
   const ownPromptSaveMutation = useMutation({
     mutationFn: async ({ name, promptToSave, systemMessage }: { name: string; promptToSave?: Prompt; systemMessage: string }) => {
       if (promptToSave && promptToSave.type !== 'PERSONAL') return // Only do this for personal prompts
@@ -173,7 +162,6 @@ export const PromptStateProvider: React.FC<{
     handleChangePrompt,
     coursePrompts: course?.prompts || [],
     myPrompts,
-    mandatoryPrompt,
     urlPrompt,
     promptInfo,
     isPromptHidden,

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

@@ -1,5 +1,5 @@
-import { Box, Paper, Typography, Button, Tooltip, IconButton, Link } from '@mui/material'
-import { Visibility, VisibilityOff, PriorityHigh, ContentCopyOutlined, Delete, DeleteOutline, Book, BookOutlined, MenuBookOutlined } from '@mui/icons-material'
+import { Box, Paper, Typography, Tooltip, IconButton, Link } from '@mui/material'
+import { Visibility, VisibilityOff, ContentCopyOutlined, DeleteOutline, MenuBookOutlined } from '@mui/icons-material'
 import { useTranslation } from 'react-i18next'
 
 import { enqueueSnackbar } from 'notistack'
@@ -14,7 +14,7 @@ const Prompt = ({ prompt, handleEdit }: { prompt: PromptType; handleEdit: () =>
   const { t } = useTranslation()
   const { id: courseId } = useParams()
 
-  const { id, name, hidden, mandatory, ragIndexId } = prompt
+  const { id, name, hidden, ragIndexId } = prompt
 
   const chatPath = `/${courseId}?promptId=${id}`
   const directLink = `${window.location.origin}${PUBLIC_URL}/${chatPath}`
@@ -48,13 +48,6 @@ const Prompt = ({ prompt, handleEdit }: { prompt: PromptType; handleEdit: () =>
                 </Tooltip>
               )}
             </Box>
-            {mandatory && (
-              <Box display="inline" mr={2}>
-                <Tooltip title="Alustus on pakollinen opiskelijoille">
-                  <PriorityHigh />
-                </Tooltip>
-              </Box>
-            )}
             {ragIndexId && (
               <Box display="inline" mr={2}>
                 <Tooltip title={t('rag:sourceMaterials')}>

src/client/components/Prompt/PromptEditor.tsx

@@ -44,7 +44,6 @@ export const PromptEditor = ({ prompt, ragIndices, type, chatInstanceId, setEdit
     prompt ? prompt.messages?.find((m) => m.role === 'system')?.content || '' : t('prompt:defaultRagMessage'),
   )
   const [hidden, setHidden] = useState<boolean>(prompt?.hidden ?? false)
-  const [mandatory, setMandatory] = useState<boolean>(prompt?.mandatory ?? false)
   const [ragIndexId, setRagIndexId] = useState<number | undefined | null>(prompt?.ragIndexId)
 
   const [selectedModel, setModel] = useState<ValidModelName | 'none'>(prompt?.model ?? 'none')
@@ -78,7 +77,6 @@ export const PromptEditor = ({ prompt, ragIndices, type, chatInstanceId, setEdit
           systemMessage,
           messages,
           hidden,
-          mandatory,
           ragIndexId,
           model,
           temperature,
@@ -93,7 +91,6 @@ export const PromptEditor = ({ prompt, ragIndices, type, chatInstanceId, setEdit
           systemMessage,
           messages,
           hidden,
-          mandatory,
           ragIndexId,
           model,
           temperature,
@@ -134,10 +131,6 @@ export const PromptEditor = ({ prompt, ragIndices, type, chatInstanceId, setEdit
             margin="normal"
           />
           <FormControlLabel control={<Checkbox checked={hidden} onChange={(e) => setHidden(e.target.checked)} />} label={t('prompt:hidePrompt')} />
-          <FormControlLabel
-            control={<Checkbox checked={mandatory} onChange={(e) => setMandatory(e.target.checked)} />}
-            label={t('prompt:editMandatoryPrompt')}
-          />
           <FormControl fullWidth margin="normal">
             <InputLabel>{t('common:model')}</InputLabel>
             <Select value={selectedModel || ''} onChange={(e) => setModel(e.target.value as ValidModelName | 'none')}>

src/client/locales/en.json

@@ -291,7 +291,6 @@
     "totalUsageToolTip": "Total tokens consumed over the lifetime of the course. This value never resets.",
     "usageChartTitle": "Student token usages as percentages",
     "noData": "No data",
-    "oneMandatoryPrompt": "Course can have only one mandatory prompt",
     "noCourses": "No courses",
     "showActiveCourses": "Show active courses",
     "isSavedOptOut": "The course discussions will be saved anonymously, if you grant permission to save. Saved discussions can be used for research purposes.",
@@ -317,7 +316,6 @@
     "modelFreeToChoose": "Model free to choose",
     "systemMessage": "Instructions for the language model",
     "hidePrompt": "Hide prompt text from students",
-    "editMandatoryPrompt": "Make prompt mandatory",
     "noSourceMaterials": "No source materials",
     "ragSystemMessage": "Source material instructions",
     "basicInformation": "Basic information",

src/client/locales/fi.json

@@ -292,8 +292,6 @@
     "totalUsageToolTip": "Tokenien kokonaismäärä koko kurssin ajalta. Tämä arvo ei koskaan nollaudu.",
     "usageChartTitle": "Opiskelijoiden käytetyt tokenit prosenttiosuutena käyttörajasta",
     "noData": "Ei dataa",
-    "editMandatoryPrompt": "Tee alustuksesta pakollinen opiskelijoille",
-    "oneMandatoryPrompt": "Kurssilla voi olla vain yksi pakollinen alustus",
     "noCourses": "Ei näytettäviä kursseja",
     "showActiveCourses": "Näytä aktiiviset kurssit",
     "isSavedOptOut": "Kurssilla käymäsi keskustelut tallennetaan anonyymisti, jos annat tallennusluvan.\nTallennettuja keskusteluja voidaan käyttää tutkimuksessa.",
@@ -319,7 +317,6 @@
     "modelFreeToChoose": "Malli vapaasti valittavissa",
     "systemMessage": "Kielimallin ohjeistus",
     "hidePrompt": "Piilota alustuksen sisältö opiskelijoilta",
-    "editMandatoryPrompt": "Tee alustuksesta pakollinen",
     "noSourceMaterials": "Ei lähdemateriaaleja",
     "ragSystemMessage": "Lähdemateriaaliohjeistus",
     "basicInformation": "Perustiedot",

src/client/locales/sv.json

@@ -257,8 +257,6 @@
     "totalUsageToolTip": "Totalt antal tokens som använts under hela kursen. Detta värde nollställs aldrig.",
     "usageChartTitle": "Studenttokenanvändning i procent",
     "noData": "Inga data",
-    "editMandatoryPrompt": "Gör en uppmaning obligatorisk",
-    "oneMandatoryPrompt": "Kursen kan endast ha en obligatorisk uppmaning",
     "noCourses": "Inga kurser att visa",
     "percentageUsed": "Andel använda polletter",
     "howToActive": "Välj de kurser jag undervisar om du vill aktivera kurschatten",
@@ -296,7 +294,6 @@
     "modelFreeToChoose": "Modell fri att välja",
     "systemMessage": "Instruktioner för språkmodellen",
     "hidePrompt": "Dölj prompttext för studenter",
-    "editMandatoryPrompt": "Gör prompt obligatorisk",
     "noSourceMaterials": "Inga källmaterial",
     "ragSystemMessage": "Instruktioner för källmaterial",
     "basicInformation": "Grundläggande information",

src/client/types.ts

@@ -47,7 +47,6 @@ export type Prompt = {
   systemMessage: string
   messages: ChatMessage[]
   hidden: boolean
-  mandatory: boolean
   type: 'CHAT_INSTANCE' | 'PERSONAL'
   createdAt: string
   ragIndexId?: number

src/server/db/migrations/20250930_00_remove_mandatory_from_prompts.ts

@@ -0,0 +1,20 @@
+import { DataTypes } from 'sequelize'
+
+import { Migration } from '../connection'
+
+export const up: Migration = async ({ context: queryInterface }) => {
+  await queryInterface.removeColumn('prompts', 'mandatory')
+  await queryInterface.addColumn('prompts', 'mandatory', {
+    type: DataTypes.BOOLEAN,
+    allowNull: false,
+    defaultValue: false,
+  })
+}
+
+export const down: Migration = async ({ context: queryInterface }) => {
+  await queryInterface.addColumn('prompts', 'mandatory', {
+    type: DataTypes.BOOLEAN,
+    allowNull: false,
+    defaultValue: false,
+  })
+}

src/server/db/models/prompt.ts

@@ -27,8 +27,6 @@ class Prompt extends Model<InferAttributes<Prompt>, InferCreationAttributes<Prom
 
   declare hidden: CreationOptional<boolean>
 
-  declare mandatory: CreationOptional<boolean>
-
   declare model?: CreationOptional<ValidModelName>
 
   declare temperature?: CreationOptional<number>
@@ -82,11 +80,6 @@ Prompt.init(
       allowNull: false,
       defaultValue: false,
     },
-    mandatory: {
-      type: DataTypes.BOOLEAN,
-      allowNull: false,
-      defaultValue: false,
-    },
     model: {
       type: DataTypes.STRING,
       allowNull: true,