Merge pull request #106 from OpenSIST/dev

fix bug that when adding or modifying programs of TU/e, the redirecting will crush

Author: cuttle-fish-my

src/Components/Favorites/ProgramCard.jsx

@@ -62,7 +62,7 @@ const ProgramCard = ({ program }) => {
                 }}
                 onClick={() =>
                     navigate(
-                        `/favorites/${program.ProgramID}${window.location.search}`
+                        `/favorites/${encodeURIComponent(program.ProgramID)}${window.location.search}`
                     )
                 }
             >

src/Components/Modify/Program/AddModifyProgram.jsx

@@ -47,7 +47,7 @@ export async function action({request}) {
         }
     };
     await addModifyProgram(requestBody);
-    return redirect(`/programs/${ProgramID}`)
+    return redirect(`/programs/${encodeURIComponent(ProgramID)}`)
 }
 
 export default function AddModifyProgram({type}) {
@@ -60,7 +60,7 @@ export default function AddModifyProgram({type}) {
     const [univ, setUniv] = useState(univOptions.find((univ) => univ.value === programContent?.University) ?? null);
     const [major, setMajor] = useState(majorOptions.filter((m) => programContent?.TargetApplicantMajor.includes(m.value)) ?? []);
     const [programName, setProgramName] = useState(programContent?.Program ?? '');
-    const programNameInvalid = ['@', '|', '/', '$', '\\', '?', '!'].some(char => programName.includes(char));
+    // const programNameInvalid = ['@', '|', '/', '$', '\\', '?', '!'].some(char => programName.includes(char));
     return (
         <Form method="post"
               style={{display: 'flex', flexDirection: 'column', height: "100%"}}
@@ -105,8 +105,8 @@ export default function AddModifyProgram({type}) {
                     label={"项目名称" + (AddMode ? "" : " (不可修改)")}
                     value={programName}
                     onChange={(event) => setProgramName(event.target.value)}
-                    error={programNameInvalid}
-                    helperText={programNameInvalid ? "项目名称中不可包含@, |, /, \\, ?, !, $，如果必须要使用'/'字符，请用'&'代替" : ""}
+                    // error={programNameInvalid}
+                    // helperText={programNameInvalid ? "项目名称中不可包含@, |, /, \\, ?, !, $，如果必须要使用'/'字符，请用'&'代替" : ""}
                     placeholder="硕士写简称 (e.g. MSCS)，博士要加院系 (e.g. EECS PhD)"
                     sx={AddMode ? {} : {color: 'gray', cursor: 'not-allowed', pointerEvents: 'none'}}
                     fullWidth
@@ -194,7 +194,8 @@ export default function AddModifyProgram({type}) {
             <MarkDownEditor Description={Description} setDescription={setDescription}/>
             <textarea id='Description' name='Description' hidden={true} value={Description} readOnly/>
             <ButtonGroup sx={{mt: '1vh'}}>
-                <Button type="submit" disabled={programNameInvalid}> 提交 </Button>
+                {/*<Button type="submit" disabled={programNameInvalid}> 提交 </Button>*/}
+                <Button type="submit"> 提交 </Button>
                 <Button onClick={() => navigate("..")}> 取消 </Button>
             </ButtonGroup>
         </Form>