Skip to content

Commit

Permalink
feat: up judge queue info and use lodash-es
Browse files Browse the repository at this point in the history
  • Loading branch information
dreamerblue committed Mar 4, 2024
1 parent 6c0fc72 commit 1825a6d
Show file tree
Hide file tree
Showing 35 changed files with 46 additions and 37 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"js-cookie": "^2.2.0",
"jscookie": "^1.1.0",
"katex": "^0.16.9",
"lodash": "^4.17.11",
"lodash-es": "^4.17.21",
"lodash.throttle": "^4.1.1",
"markdown-it": "^13.0.2",
"math-precision": "^1.0.5",
Expand Down
2 changes: 1 addition & 1 deletion src/common
2 changes: 1 addition & 1 deletion src/components/ContestUserList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { checkPerms } from '@/utils/permission';
import GeneralFormModal from '@/components/GeneralFormModal';
import msg from '@/utils/msg';
import { matchPath, withRouter } from 'react-router';
import { get as safeGet } from 'lodash';
import { get as safeGet } from 'lodash-es';
import tracker from '@/utils/tracker';
import contestUserStatus, { ContestUserStatus } from '@/configs/contestUserStatus';
import ImportContestUserModal from './ImportContestUserModal';
Expand Down
2 changes: 1 addition & 1 deletion src/components/ImportCompetitionUserModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import staticUrls from '@/configs/staticUrls';
import constants from '@/configs/constants';
import { withRouter } from 'react-router';
import { ICompetitionUser } from '@/common/interfaces/competition';
import { set as safeSet } from 'lodash';
import { set as safeSet } from 'lodash-es';
import { ECompetitionUserRole, ECompetitionUserStatus } from '@/common/enums';

const MAX_MEMBER_NUM = 3;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Ranklist.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import limits from '@/configs/limits';
import router from 'umi/router';
import { withRouter } from 'react-router';
import { RouteProps } from '@/@types/props';
import { get as safeGet } from 'lodash';
import { get as safeGet } from 'lodash-es';
import { getRatingLevel } from '@/utils/rating';
import tracker from '@/utils/tracker';
import moment from 'moment';
Expand Down
2 changes: 1 addition & 1 deletion src/components/StatsRanklist.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { workbook2Excel } from '@/utils/misc';
import XLSX from 'xlsx';
import { memoize } from '@/utils/decorators';
import tracker from '@/utils/tracker';
import { isEqual, pick } from 'lodash';
import { isEqual, pick } from 'lodash-es';

export interface Props extends RouteProps {
id: number;
Expand Down
2 changes: 1 addition & 1 deletion src/components/UserSelect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { connect } from 'dva';
import { Spin } from 'antd';
import { ReduxProps } from '@/@types/props';
import Select, { SelectProps } from 'antd/lib/select';
import { debounce } from 'lodash';
import { debounce } from 'lodash-es';
import UserBar from './UserBar';

export interface Props extends ReduxProps, SelectProps {
Expand Down
2 changes: 1 addition & 1 deletion src/models/favorites.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as service from '../services/favorites';
import { genTimeFlag, isStateExpired } from '@/utils/misc';
import { formatListQuery } from '@/utils/format';
import { isEqual } from 'lodash';
import { isEqual } from 'lodash-es';
import pages from '@/configs/pages';
import { requestEffect } from '@/utils/effectInterceptor';
import { Codes } from '@/common/codes';
Expand Down
2 changes: 1 addition & 1 deletion src/models/messages.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as service from '../services/messages';
import { genTimeFlag, isStateExpired } from '@/utils/misc';
import { formatListQuery } from '@/utils/format';
import { isEqual } from 'lodash';
import { isEqual } from 'lodash-es';
import limits from '@/configs/limits';
import pages from '@/configs/pages';
import { requestEffect } from '@/utils/effectInterceptor';
Expand Down
2 changes: 1 addition & 1 deletion src/models/notes.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as service from '../services/notes';
import { genTimeFlag, isStateExpired } from '@/utils/misc';
import { formatListQuery } from '@/utils/format';
import { isEqual } from 'lodash';
import { isEqual } from 'lodash-es';
import limits from '@/configs/limits';
import pages from '@/configs/pages';
import { requestEffect } from '@/utils/effectInterceptor';
Expand Down
2 changes: 1 addition & 1 deletion src/models/notices.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import localStorage from '@/utils/localStorage';
import { merge } from 'lodash';
import { merge } from 'lodash-es';

const initialState = {
read: {},
Expand Down
2 changes: 1 addition & 1 deletion src/models/settings.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import localStorage from '@/utils/localStorage';
import { merge, omit } from 'lodash';
import { merge, omit } from 'lodash-es';

const initialState = {
theme: 'auto',
Expand Down
2 changes: 1 addition & 1 deletion src/models/stats.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as service from '../services/stats';
import { genTimeFlag, isStateExpired } from '@/utils/misc';
import pages from '@/configs/pages';
import { requestEffect } from '@/utils/effectInterceptor';
import { isEqual } from 'lodash';
import { isEqual } from 'lodash-es';

function genInitialState() {
return {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/admin/contests/$id/problems.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import PageAnimation from '@/components/PageAnimation';
import { getPathParamId } from '@/utils/getPathParams';
import { Row, Col, Card, Table, Input, Icon, Button } from 'antd';
import { numberToAlphabet } from '@/utils/format';
import { isEqual, noop } from 'lodash';
import { isEqual, noop } from 'lodash-es';
import classNames from 'classnames';
import AddItemByIdCard from '@/components/AddItemByIdCard';
import msg from '@/utils/msg';
Expand Down
2 changes: 1 addition & 1 deletion src/pages/admin/fields/$id/settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import NotFound from '@/pages/404';
import PageTitle from '@/components/PageTitle';
import FieldSeatInput from '@/components/FieldSeatInput';
import { memoize } from '@/utils/decorators';
import { padStart } from 'lodash';
import { padStart } from 'lodash-es';
import msg from '@/utils/msg';
import tracker from '@/utils/tracker';

Expand Down
2 changes: 1 addition & 1 deletion src/pages/competitions/$id/problemSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { getPathParamId } from '@/utils/getPathParams';
import { Button, Form, Row, Col, Card, Table, Input, Icon, Tag } from 'antd';
import msg from '@/utils/msg';
import PageLoading from '@/components/PageLoading';
import { isEqual, noop } from 'lodash';
import { isEqual, noop } from 'lodash-es';
import { numberToAlphabet } from '@/utils/format';
import AddItemByIdCard from '@/components/AddItemByIdCard';
import classNames from 'classnames';
Expand Down
2 changes: 1 addition & 1 deletion src/pages/competitions/$id/solutions/$sid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { connect } from 'dva';
import { ReduxProps, RouteProps } from '@/@types/props';
import { getPathParamId } from '@/utils/getPathParams';
import pages from '@/configs/pages';
import { isEqual } from 'lodash';
import { isEqual } from 'lodash-es';
import SolutionDetailPage from '@/components/SolutionDetailPage';
import PageLoading from '@/components/PageLoading';
import { ICompetition } from '@/common/interfaces/competition';
Expand Down
2 changes: 1 addition & 1 deletion src/pages/competitions/$id/solutions/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import FilterCard from '@/components/FilterCard';
import results, { Results } from '@/configs/results';
import constants from '@/configs/constants';
import gStyles from '@/general.less';
import { isEqual } from 'lodash';
import { isEqual } from 'lodash-es';
import router from 'umi/router';
import PageLoading from '@/components/PageLoading';
import PageTitle from '@/components/PageTitle';
Expand Down
2 changes: 1 addition & 1 deletion src/pages/competitions/$id/userManagement.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import tracker from '@/utils/tracker';
import msg from '@/utils/msg';
import { aoa2Excel } from '@/utils/misc';
import moment from 'moment';
import { get as safeGet } from 'lodash';
import { get as safeGet } from 'lodash-es';
import ImportCompetitionUserModal from '@/components/ImportCompetitionUserModal';

const contestUserRoleOptions = [
Expand Down
2 changes: 1 addition & 1 deletion src/pages/competitions/models/competitions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as service from '../services/competitions';
import pages from '@/configs/pages';
import { matchPath } from 'react-router';
import { clearExpiredStateProperties, genTimeFlag, isStateExpired } from '@/utils/misc';
import { isEqual } from 'lodash';
import { isEqual } from 'lodash-es';
import { formatListQuery } from '@/utils/format';
import { requestEffect } from '@/utils/effectInterceptor';
import {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/contests/$id/solutions/$sid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { connect } from 'dva';
import { ReduxProps, RouteProps } from '@/@types/props';
import { getPathParamId } from '@/utils/getPathParams';
import pages from '@/configs/pages';
import { isEqual } from 'lodash';
import { isEqual } from 'lodash-es';
import SolutionDetailPage from '@/components/SolutionDetailPage';
import PageLoading from '@/components/PageLoading';
import { ContestModes } from '@/configs/contestModes';
Expand Down
2 changes: 1 addition & 1 deletion src/pages/contests/$id/solutions/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import FilterCard from '@/components/FilterCard';
import results, { Results } from '@/configs/results';
import constants from '@/configs/constants';
import gStyles from '@/general.less';
import { isEqual } from 'lodash';
import { isEqual } from 'lodash-es';
import router from 'umi/router';
import PageLoading from '@/components/PageLoading';
import PageTitle from '@/components/PageTitle';
Expand Down
2 changes: 1 addition & 1 deletion src/pages/contests/models/contests.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as service from '../services/contests';
import pages from '@/configs/pages';
import { clearExpiredStateProperties, genTimeFlag, isStateExpired } from '@/utils/misc';
import { isEqual } from 'lodash';
import { isEqual } from 'lodash-es';
import { formatListQuery } from '@/utils/format';
import { requestEffect } from '@/utils/effectInterceptor';
import { matchPath } from 'react-router';
Expand Down
2 changes: 1 addition & 1 deletion src/pages/groups/$id.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import TimeBar from '@/components/TimeBar';
import UserBar from '@/components/UserBar';
import msg from '@/utils/msg';
import constants from '@/configs/constants';
import { isEqual } from 'lodash';
import { isEqual } from 'lodash-es';
import AddGroupMemberModal from '@/components/AddGroupMemberModal';
import AddFavorite from '@/components/AddFavorite';
import DeleteFavorite from '@/components/DeleteFavorite';
Expand Down
2 changes: 1 addition & 1 deletion src/pages/groups/models/groups.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as service from '../services/groups';
import { clearExpiredStateProperties, genTimeFlag, isStateExpired } from '@/utils/misc';
import { formatListQuery } from '@/utils/format';
import { isEqual } from 'lodash';
import { isEqual } from 'lodash-es';
import pages from '@/configs/pages';
import { requestEffect } from '@/utils/effectInterceptor';
import { matchPath } from 'react-router';
Expand Down
2 changes: 1 addition & 1 deletion src/pages/posts/models/posts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as service from '../services/posts';
import pages from '@/configs/pages';
import { matchPath } from 'react-router';
import { clearExpiredStateProperties, genTimeFlag, isStateExpired } from '@/utils/misc';
import { isEqual } from 'lodash';
import { isEqual } from 'lodash-es';
import { formatListQuery } from '@/utils/format';
import { requestEffect } from '@/utils/effectInterceptor';

Expand Down
2 changes: 1 addition & 1 deletion src/pages/problems/models/problems.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as service from '../services/problems';
import pages from '@/configs/pages';
import { matchPath } from 'react-router';
import { clearExpiredStateProperties, genTimeFlag, isStateExpired } from '@/utils/misc';
import { isEqual } from 'lodash';
import { isEqual } from 'lodash-es';
import { formatListQuery } from '@/utils/format';
import { requestEffect } from '@/utils/effectInterceptor';

Expand Down
2 changes: 1 addition & 1 deletion src/pages/sets/$id/stats.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import msg from '@/utils/msg';
import tracker from '@/utils/tracker';
import router from 'umi/router';
import PromiseQueue from 'promise-queue';
import { uniqBy } from 'lodash';
import { uniqBy } from 'lodash-es';
import { TreeSelectProps } from 'antd/lib/tree-select';
import { memoize } from '@/utils/decorators';
import Explanation from '@/components/Explanation';
Expand Down
2 changes: 1 addition & 1 deletion src/pages/sets/models/sets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as service from '../services/sets';
import pages from '@/configs/pages';
import { matchPath } from 'react-router';
import { clearExpiredStateProperties, genTimeFlag, isStateExpired } from '@/utils/misc';
import { isEqual } from 'lodash';
import { isEqual } from 'lodash-es';
import { formatListQuery } from '@/utils/format';
import { requestEffect } from '@/utils/effectInterceptor';

Expand Down
2 changes: 1 addition & 1 deletion src/pages/solutions/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import SolutionTable from '@/components/SolutionTable';
import results, { Results } from '@/configs/results';
import pages from '@/configs/pages';
import gStyles from '@/general.less';
import { isEqual } from 'lodash';
import { isEqual } from 'lodash-es';
import router from 'umi/router';
import constants from '@/configs/constants';
import PageAnimation from '@/components/PageAnimation';
Expand Down
2 changes: 1 addition & 1 deletion src/pages/solutions/models/solutions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as service from '../services/solutions';
import pages from '@/configs/pages';
import { matchPath } from 'react-router';
import { clearExpiredStateProperties, genTimeFlag, isStateExpired } from '@/utils/misc';
import { isEqual } from 'lodash';
import { isEqual } from 'lodash-es';
import { formatListQuery } from '@/utils/format';
import { requestEffect } from '@/utils/effectInterceptor';

Expand Down
11 changes: 10 additions & 1 deletion src/pages/stats/judge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import React from 'react';
import { connect } from 'dva';
import { Progress, Tag, Popover } from 'antd';
import classNames from 'classnames';
import { capitalize } from 'lodash-es';
import { ReduxProps, RouteProps } from '@/@types/props';
import PageAnimation from '@/components/PageAnimation';
import { IGetJudgeQueueStatsResp } from '@/common/contracts/stat';
Expand Down Expand Up @@ -174,7 +175,15 @@ class Judge extends React.Component<Props, State> {
<div className="judge-queue-stats-node-container">
{workers.map((worker) => (
<Popover
content={`Status: ${this.getNodeStatus(worker.status)}`}
content={
<div>
<p className="mb-sm">Status: {this.getNodeStatus(worker.status)}</p>
<p className="mb-sm">
Platform Arch: {capitalize(worker.platform)} {worker.arch}
</p>
<p className="mb-none">CPU: {worker.cpuModel}</p>
</div>
}
title={`Node ID: ${worker.id}`}
key={worker.id}
>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/topics/models/topics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as service from '../services/topics';
import pages from '@/configs/pages';
import { matchPath } from 'react-router';
import { clearExpiredStateProperties, genTimeFlag, isStateExpired } from '@/utils/misc';
import { isEqual } from 'lodash';
import { isEqual } from 'lodash-es';
import { formatListQuery } from '@/utils/format';
import { requestEffect } from '@/utils/effectInterceptor';

Expand Down
2 changes: 1 addition & 1 deletion src/pages/users/models/users.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as service from '../services/users';
import { matchPath } from 'react-router';
import pages from '@/configs/pages';
import { clearExpiredStateProperties, genTimeFlag, isStateExpired } from '@/utils/misc';
import { isEqual } from 'lodash';
import { isEqual } from 'lodash-es';
import { formatListQuery } from '@/utils/format';
import { requestEffect } from '@/utils/effectInterceptor';
import { Results } from '@/configs/results';
Expand Down

0 comments on commit 1825a6d

Please sign in to comment.