lint fix

Author: mluukkai

src/client/components/Chat/SendMessage.tsx

@@ -1,5 +1,12 @@
 import React from 'react'
-import { Box, TextField, Button, Typography } from '@mui/material'
+import {
+  Box,
+  TextField,
+  Button,
+  Typography,
+  Switch,
+  FormControlLabel,
+} from '@mui/material'
 import UploadFileIcon from '@mui/icons-material/UploadFile'
 import { useTranslation } from 'react-i18next'
 import AttachmentButton from './AttachmentButton'
@@ -18,10 +25,13 @@ const SendMessage = ({
   setFileName,
   setDisallowedFileType,
   setAlertOpen,
+  saveChat,
+  saveConsent,
+  setSaveConsent,
 }: {
   message: string
   setMessage: SetState<string>
-  handleSend: (userConsent: boolean) => void
+  handleSend: (userConsent: boolean, saveConsent: boolean) => void
   handleReset: () => void
   disabled: boolean
   resetDisabled: boolean
@@ -30,6 +40,9 @@ const SendMessage = ({
   setFileName: (name: string) => void
   setDisallowedFileType: React.Dispatch<string>
   setAlertOpen: React.Dispatch<boolean>
+  saveConsent: boolean
+  setSaveConsent: React.Dispatch<boolean>
+  saveChat: boolean
 }) => {
   const { t } = useTranslation()
 
@@ -59,7 +72,7 @@ const SendMessage = ({
     }
   }
   const handleOnClick = () => {
-    handleSend(false)
+    handleSend(false, saveConsent)
   }
   return (
     <Box mb={2}>
@@ -108,6 +121,17 @@ const SendMessage = ({
         <Button onClick={() => handleReset()} disabled={resetDisabled}>
           {t('reset')}
         </Button>
+        {saveChat && (
+          <FormControlLabel
+            control={
+              <Switch
+                onChange={() => setSaveConsent(!saveConsent)}
+                checked={saveConsent}
+              />
+            }
+            label="keskustelun saa tallentaa"
+          />
+        )}
       </Box>
     </Box>
   )

src/client/components/Chat/index.tsx

@@ -80,6 +80,14 @@ const CourseInfo = ({ course }: { course: Course }) => {
       </div>
 
       <div style={{ marginTop: 10 }}>{formatDate(course.activityPeriod)}</div>
+
+      {course.saveDiscussions && (
+        <Alert severity="warning" style={{ marginTop: 20 }}>
+          <Typography variant="h6">
+            Kurssin keskustelut talletetaan anonyymisti jos annat tallennusluvan
+          </Typography>
+        </Alert>
+      )}
     </Box>
   )
 }
@@ -114,6 +122,7 @@ const Chat = () => {
   const [tokenWarningVisible, setTokenWarningVisible] = useState(false)
   const [modelTemperature, setModelTemperature] = useState(0.5)
   const [setRetryTimeout, clearRetryTimeout] = useRetryTimeout()
+  const [saveConsent, setSaveConsent] = useState(true)
 
   const { t, i18n } = useTranslation()
   const { language } = i18n
@@ -281,7 +290,7 @@ const Chat = () => {
     }
   }
 
-  const handleSend = async (userConsent: boolean) => {
+  const handleSend = async (userConsent: boolean, saveConsent: boolean) => {
     const formData = new FormData()
     let file = inputFileRef.current.files[0] as File
     if (file) {
@@ -326,7 +335,11 @@ const Chat = () => {
       modelTemperature,
       courseId,
       abortController,
+      saveConsent,
     }
+
+    console.log('getCompletionsArgs', getCompletionsArgs)
+
     // Retry the request if the server is stuck for WAIT_FOR_STREAM_TIMEOUT seconds
     setRetryTimeout(
       () => handleRetry(getCompletionsArgs, abortController),
@@ -351,7 +364,7 @@ const Chat = () => {
   }
 
   const handleContinue = () => {
-    handleSend(true)
+    handleSend(true, saveConsent)
     setTokenWarningVisible(false)
   }
 
@@ -419,6 +432,9 @@ const Chat = () => {
         setFileName={setFileName}
         setDisallowedFileType={setDisallowedFileType}
         setAlertOpen={setAlertOpen}
+        saveConsent={saveConsent}
+        setSaveConsent={setSaveConsent}
+        saveChat={course && course.saveDiscussions}
       />
       <Email
         system={system}

src/client/components/Chat/util.ts

@@ -10,6 +10,7 @@ interface GetCompletoinStreamProps {
   modelTemperature: number
   courseId?: string
   abortController?: AbortController
+  saveConsent: boolean
 }
 export const getCompletionStream = async ({
   system,
@@ -20,6 +21,7 @@ export const getCompletionStream = async ({
   modelTemperature,
   courseId,
   abortController,
+  saveConsent,
 }: GetCompletoinStreamProps) => {
   const data = {
     courseId,
@@ -34,6 +36,7 @@ export const getCompletionStream = async ({
       model,
       userConsent,
       modelTemperature,
+      saveConsent,
     },
   }
 

src/client/types.ts

@@ -120,6 +120,7 @@ export interface Course extends ChatInstance {
   enrolments: Enrolment[]
   responsibilities: Responsebility[]
   courseUnits: CourseUnit[]
+  saveDiscussions: boolean
 }
 
 export type ChatInstanceUsage = {

src/server/routes/openai.ts

@@ -166,14 +166,15 @@ openaiRouter.post('/stream', upload.single('file'), async (r, res) => {
     where: { courseId },
   })
 
-  console.log('-->', course.saveDiscussions)
-
-  const consentToSave =
-    course.saveDiscussions &&
-    ['testUser', 'mluukkai', 'admini2'].includes(user.username)
+  const consentToSave = course.saveDiscussions && options.saveConsent
 
   // eslint-disable-next-line no-console
-  console.log('consentToSave', consentToSave, user.username)
+  console.log(
+    'consentToSave',
+    consentToSave,
+    options.saveConsent,
+    user.username
+  )
 
   if (consentToSave) {
     const discussion = {