diff --git a/build/publish.ts b/build/publish.ts index 8b14ed889..69afc3821 100644 --- a/build/publish.ts +++ b/build/publish.ts @@ -73,7 +73,7 @@ if (CI && (!tag || GITHUB_EVENT_NAME !== 'push')) { } } await spawnAsync( - `yarn npm publish --access public --tag ${tag} ${CI ? '--provenance' : ''}`, + `yarn npm publish --access public --tag ${tag}${CI ? ' --provenance' : ''}`, path.resolve(name), ); } diff --git a/package.json b/package.json index 253c1362b..8fa3b320a 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "cross-spawn": "^7.0.6", "esbuild": "0.25.2", "eslint": "^9.25.0", - "eslint-import-resolver-typescript": "^4.3.2", + "eslint-import-resolver-typescript": "^4.3.3", "eslint-import-resolver-webpack": "^0.13.10", "fs-extra": "^11.3.0", "globals": "^16.0.0", @@ -61,5 +61,6 @@ "supports-hyperlinks": "^3.2.0", "typescript": "5.8.3", "wtfnode": "^0.10.0" - } + }, + "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" } diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index 9992456e8..5006b51dc 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -27,7 +27,7 @@ "@zip.js/zip.js": "^2.7.60", "adm-zip": "0.5.16", "cac": "^6.7.14", - "cordis": "4.0.0-beta.1", + "cordis": "4.0.0-beta.2", "csv-stringify": "^6.5.2", "emoji-regex": "^10.4.0", "emojis-list": "2.1.0", diff --git a/packages/hydrooj/src/service/server.ts b/packages/hydrooj/src/service/server.ts index 28668324a..88e29e765 100644 --- a/packages/hydrooj/src/service/server.ts +++ b/packages/hydrooj/src/service/server.ts @@ -194,7 +194,7 @@ export async function apply(ctx: Context) { await opcount.inc(op, id, periodSecs, maxOperations); }, renderTitle(str: string) { - const name = this.ctx.setting.get('server.name'); + const name = this.ctx.get('setting')?.get('server.name') || system.get('server.name'); if (this.UiContext.extraTitleContent) return `${this.UiContext.extraTitleContent} - ${this.translate(str)} - ${name}`; return `${this.translate(str)} - ${name}`; }, diff --git a/packages/ui-default/components/autocomplete/components/FileSelectAutoComplete.tsx b/packages/ui-default/components/autocomplete/components/FileSelectAutoComplete.tsx index 9ea0a9f5d..a47a6d17e 100644 --- a/packages/ui-default/components/autocomplete/components/FileSelectAutoComplete.tsx +++ b/packages/ui-default/components/autocomplete/components/FileSelectAutoComplete.tsx @@ -19,7 +19,16 @@ const FileSelectAutoComplete = React.forwardRef((props, ref) => ( itemKey={(item) => `${item._id?.toString() || item.name || item}`} renderItem={(item) => item.name || item._id || item} // TODO icon allowEmptyQuery - {...props} + {...{ + width: '100%', + height: 'auto', + listStyle: {}, + multi: false, + selectedKeys: [], + freeSolo: false, + freeSoloConverter: (input) => input, + ...props, + }} /> )); @@ -38,14 +47,4 @@ FileSelectAutoComplete.propTypes = { FileSelectAutoComplete.displayName = 'FileSelectAutoComplete'; -FileSelectAutoComplete.defaultProps = { - width: '100%', - height: 'auto', - listStyle: {}, - multi: false, - selectedKeys: [], - freeSolo: false, - freeSoloConverter: (input) => input, -}; - export default FileSelectAutoComplete; diff --git a/packages/ui-default/components/problemconfig/ProblemConfigForm.tsx b/packages/ui-default/components/problemconfig/ProblemConfigForm.tsx index 1d6062de2..4ce6c65f9 100644 --- a/packages/ui-default/components/problemconfig/ProblemConfigForm.tsx +++ b/packages/ui-default/components/problemconfig/ProblemConfigForm.tsx @@ -39,15 +39,12 @@ function ExtraFilesConfig() { const userExtraFiles = useSelector((state: RootState) => state.config.user_extra_files || [], isEqual); const judgeExtraFiles = useSelector((state: RootState) => state.config.judge_extra_files || [], isEqual); const dispatch = useDispatch(); - const userRef = React.useRef(); - const judgeRef = React.useRef(); return (
dispatch({ type: 'CONFIG_FORM_UPDATE', key: 'user_extra_files', value: val.split(',') })} @@ -56,7 +53,6 @@ function ExtraFilesConfig() { dispatch({ type: 'CONFIG_FORM_UPDATE', key: 'judge_extra_files', value: val.split(',') })} @@ -75,7 +71,6 @@ function LangConfig() { const data = Object.keys(window.LANGS).filter((i) => !prefixes.has(i)) .map((i) => ({ name: `${i.includes('.') ? `${window.LANGS[i.split('.')[0]].display || ''}/` : ''}${window.LANGS[i].display}`, _id: i })); const dispatch = useDispatch(); - const ref = React.useRef(); const selectedKeys = langs.filter((i) => !prefixes.has(i)); return ( @@ -83,7 +78,6 @@ function LangConfig() {