Skip to content

fix: grade can not set zero #2171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 24, 2025
Merged

fix: grade can not set zero #2171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1fdb83
fix: set grade can not 0
hqer927 Feb 24, 2025
8191489
chore(version): upgrade pnpm-lock.yaml
Feb 24, 2025
6feafdd
chore(version): remove patchedDependencies
Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,6 @@
"overrides": {
"@types/eslint": "^8",
"@types/react": "^17"
},
"patchedDependencies": {
"[email protected]": "patches/[email protected]"
}
}
}
51 changes: 6 additions & 45 deletions packages/flat-components/src/components/ClassroomPage/ExitRoomConfirmModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import React, { FC, useEffect } from "react";
import { Button, Modal } from "antd";
import { useTranslate } from "@netless/flat-i18n";
import { SVGGood } from "../../FlatIcons/icons/SVGGood";

export interface StopClassConfirmModalProps {
visible: boolean;
Expand Down Expand Up @@ -41,6 +40,8 @@ export interface CloseRoomConfirmModalProps {
hangLoading: boolean;
stopLoading: boolean;
rateModal?: React.ReactNode;
showRateModal?: boolean;
setShowRateModal?: (show: boolean) => void;
onHang: () => void;
onStop: () => void;
onCancel: () => void;
Expand All @@ -56,35 +57,14 @@ export const CloseRoomConfirmModal: FC<CloseRoomConfirmModalProps> = ({
hangLoading,
stopLoading,
rateModal,
showRateModal,
setShowRateModal,
onHang,
onStop,
onCancel,
setGrade,
}) => {
const t = useTranslate();
const [loading, setLoading] = React.useState(false);
const [showRateModal, setShowRateModal] = React.useState(false);
const [open, setOpen] = React.useState(visible);
const handleOk = async () => {
setLoading(true);
try {
if (setGrade) {
await setGrade();
}
setLoading(false);
setShowRateModal(false);
onStop();
} catch (error) {
console.error(error);
setLoading(false);
setShowRateModal(false);
onCancel();
}
};
const handCancel = async () => {
setShowRateModal(false);
onStop();
};
useEffect(() => {
setOpen(visible);
}, [visible]);
Expand All @@ -103,7 +83,7 @@ export const CloseRoomConfirmModal: FC<CloseRoomConfirmModalProps> = ({
loading={stopLoading}
type="primary"
onClick={() => {
if (rateModal) {
if (setShowRateModal) {
setShowRateModal(true);
setOpen(false);
} else {
Expand All @@ -121,26 +101,7 @@ export const CloseRoomConfirmModal: FC<CloseRoomConfirmModalProps> = ({
>
<p>{t("exit-room-tips")}</p>
</Modal>
{showRateModal && (
<Modal
footer={[
<Button key="submit" loading={loading} type="primary" onClick={handleOk}>
{t("home-page-AI-teacher-modal.rate.submit")}
</Button>,
]}
open={true}
title={
<div style={{ display: "flex", alignItems: "stretch" }}>
<span>{t("home-page-AI-teacher-modal.rate.title")} </span>
<SVGGood />
</div>
}
onCancel={handCancel}
onOk={handleOk}
>
{rateModal}
</Modal>
)}
{(showRateModal && rateModal) || null}
</>
);
};
Expand Down
83 changes: 63 additions & 20 deletions packages/flat-pages/src/AIPage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import "./AIPage.less";
import React, { useContext, useEffect, useMemo, useState } from "react";
import { useTranslate } from "@netless/flat-i18n";
import { observer } from "mobx-react-lite";
import { message, Popover } from "antd";
import { Button, message, Modal, Popover } from "antd";
import {
NetworkStatus,
TopBar,
Expand All @@ -17,6 +17,7 @@ import {
SVGWhiteBoardOff,
SVGRate,
SVGAIChatMsgCC,
SVGGood,
} from "flat-components";

import { RealtimePanel } from "../components/RealtimePanel";
Expand Down Expand Up @@ -55,9 +56,11 @@ export const AIPage = withClassroomStore<AIPageProps>(
const { confirm, ...exitConfirmModalProps } = useExitRoomConfirmModal(classroomStore);

const isRealtimeSideOpen = !whiteboardStore.isRightSideClose;
const [value, setValue] = useState(0);
const [grade, setGrade] = useState(0);
const [isFirst, setIsFirst] = useState(false);
const [show, setShow] = useState(true);
const [showRateModal, setShowRateModal] = React.useState(false);
const [loading, setLoading] = React.useState(false);

useEffect(() => {
if (classroomStore.userWindowsMode === "normal") {
Expand Down Expand Up @@ -107,6 +110,25 @@ export const AIPage = withClassroomStore<AIPageProps>(
}
return null;
}, [classroomStore.isHasAIUser]);
const handleOk: () => Promise<void> = async () => {
setLoading(true);
try {
await setGradeRoom({
roomUUID: classroomStore.roomUUID,
userUUID: classroomStore.userUUID,
grade,
});
setLoading(false);
setShowRateModal(false);
exitConfirmModalProps.onStopClass();
} catch (error) {
console.error(error);
setLoading(false);
setShowRateModal(false);
exitConfirmModalProps.onCancel();
}
};

return (
(aiUser && (
<div className="ai-page-class-page-container">
Expand Down Expand Up @@ -135,25 +157,46 @@ export const AIPage = withClassroomStore<AIPageProps>(
<ExitRoomConfirm
isCreator={classroomStore.isCreator}
rateModal={
<Rate
character={<SVGRate active={value > 3} />}
className="ai-page-rate-ui"
style={{ color: value > 3 ? "#FE4D00" : "#007AFF" }}
value={value}
onHoverChange={(value: number) => {
if (value) {
setValue(value);
}
}}
/>
<Modal
closable={false}
footer={[
<Button
key="submit"
disabled={grade <= 0}
loading={loading}
type="primary"
onClick={handleOk}
>
{t("home-page-AI-teacher-modal.rate.submit")}
</Button>,
]}
maskClosable={false}
open={true}
title={
<div style={{ display: "flex", alignItems: "stretch" }}>
<span>
{t("home-page-AI-teacher-modal.rate.title")}{" "}
</span>
<SVGGood />
</div>
}
onOk={handleOk}
>
<Rate
character={<SVGRate active={grade > 3} />}
className="ai-page-rate-ui"
style={{ color: grade > 3 ? "#FE4D00" : "#007AFF" }}
value={grade}
onHoverChange={(grade: number) => {
if (grade) {
setGrade(grade);
}
}}
/>
</Modal>
}
setGrade={() => {
return setGradeRoom({
roomUUID: classroomStore.roomUUID,
userUUID: classroomStore.userUUID,
grade: value,
});
}}
setShowRateModal={setShowRateModal}
showRateModal={showRateModal}
{...exitConfirmModalProps}
/>
<RoomStatusStoppedModal
Expand Down
6 changes: 6 additions & 0 deletions packages/flat-pages/src/components/ExitRoomConfirm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ export interface ExitRoomConfirmProps {
isReturnLoading: boolean;
isStopLoading: boolean;
rateModal?: React.ReactNode;
showRateModal?: boolean;
setShowRateModal?: (showRateModal: boolean) => void;
onReturnMain: () => Promise<void>;
onStopClass: () => Promise<void>;
onCancel: () => void;
Expand Down Expand Up @@ -120,6 +122,8 @@ export const ExitRoomConfirm = observer<Omit<ExitRoomConfirmProps, "confirm">>(
isReturnLoading,
isStopLoading,
rateModal,
showRateModal,
setShowRateModal,
onReturnMain,
onStopClass,
...restProps
Expand All @@ -130,6 +134,8 @@ export const ExitRoomConfirm = observer<Omit<ExitRoomConfirmProps, "confirm">>(
{...restProps}
hangLoading={isReturnLoading}
rateModal={rateModal}
setShowRateModal={setShowRateModal}
showRateModal={showRateModal}
stopLoading={isStopLoading}
onHang={onReturnMain}
onStop={onStopClass}
Expand Down
Loading
Loading