Skip to content
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

refactor(flat-pages): add stop class command in room list #2052

Merged
merged 1 commit into from
Oct 23, 2023
Merged

refactor(flat-pages): add stop class command in room list #2052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 42 additions & 2 deletions packages/flat-pages/src/HomePage/MainRoomListPanel/MainRoomList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ import {
RoomListItemPrimaryAction,
RoomListSkeletons,
RoomStatusType,
StopClassConfirmModal,
errorTips,
} from "flat-components";
import { ListRoomsType, RoomStatus, RoomType } from "@netless/flat-server-api";
import { ListRoomsType, RoomStatus, RoomType, listPmi, stopClass } from "@netless/flat-server-api";
import { GlobalStoreContext, RoomStoreContext } from "../../components/StoreProvider";
import { RoomItem } from "@netless/flat-stores";
import { useSafePromise } from "../../utils/hooks/lifecycle";
Expand All @@ -37,6 +38,7 @@ export const MainRoomList = observer<MainRoomListProps>(function MainRoomList({
const [skeletonsVisible, setSkeletonsVisible] = useState(false);
const [roomUUIDs, setRoomUUIDs] = useState<string[]>();
const [cancelModalVisible, setCancelModalVisible] = useState(false);
const [stopModalVisible, setStopModalVisible] = useState(false);
const [inviteModalVisible, setInviteModalVisible] = useState(false);
const [removeHistoryVisible, setRemoveHistoryVisible] = useState(false);
const [removeHistoryLoading, setRemoveHistoryLoading] = useState(false);
Expand Down Expand Up @@ -188,6 +190,11 @@ export const MainRoomList = observer<MainRoomListProps>(function MainRoomList({
setCancelModalVisible(true);
break;
}
case "stop": {
setCurrentRoom(room);
setStopModalVisible(true);
break;
}
case "invite": {
setCurrentRoom(room);
setInviteModalVisible(true);
Expand Down Expand Up @@ -238,6 +245,14 @@ export const MainRoomList = observer<MainRoomListProps>(function MainRoomList({
onCancelRoom={removeRoomHandler}
/>
)}
{currentRoom && (
<StopClassConfirmModal
loading={false}
visible={stopModalVisible}
onCancel={hideStopModal}
onStop={stopRoomHandler}
/>
)}
{currentRoom && (
<InviteModal
baseUrl={FLAT_WEB_BASE_URL}
Expand Down Expand Up @@ -281,6 +296,10 @@ export const MainRoomList = observer<MainRoomListProps>(function MainRoomList({
setCancelModalVisible(false);
}

function hideStopModal(): void {
setStopModalVisible(false);
}

function hideInviteModal(): void {
setInviteModalVisible(false);
}
Expand Down Expand Up @@ -343,6 +362,27 @@ export const MainRoomList = observer<MainRoomListProps>(function MainRoomList({
}
}

async function stopRoomHandler(): Promise<void> {
const { ownerUUID, roomUUID, roomStatus } = currentRoom!;
const isCreator = ownerUUID === globalStore.userUUID;
const isStarted = roomStatus === RoomStatus.Started || roomStatus === RoomStatus.Paused;
try {
if (isCreator && isStarted) {
await stopClass(roomUUID);

if (globalStore.pmiRoomUUID === roomUUID) {
// remove pmi room id list
globalStore.updatePmiRoomList(await listPmi());
}
void refreshRooms();
}
setStopModalVisible(false);
} catch (e) {
console.error(e);
errorTips(e);
}
}

async function removeConfirm(): Promise<void> {
setRemoveHistoryLoading(true);
try {
Expand All @@ -364,7 +404,7 @@ export const MainRoomList = observer<MainRoomListProps>(function MainRoomList({

type SubActions =
| Array<{ key: "details" | "share" | "delete-history"; text: string }>
| Array<{ key: "details" | "modify" | "cancel" | "invite"; text: string }>;
| Array<{ key: "details" | "modify" | "cancel" | "stop" | "invite"; text: string }>;

function getSubActions(room: RoomItem): SubActions {
const result = [{ key: "details", text: t("room-detail") }];
Expand Down
2 changes: 1 addition & 1 deletion packages/flat-pages/src/HomePage/MainRoomMenu/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export const MainRoomMenu: FC = () => {

if (pmi) {
// update pmi room list
globalStore.updatePmiRoomList((await listPmi()) || []);
globalStore.updatePmiRoomList(await listPmi());
}

await onJoinRoom(roomUUID);
Expand Down
2 changes: 1 addition & 1 deletion packages/flat-pages/src/LoginPage/utils/state.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export function useLoginState(): LoginState {
async (authData: LoginProcessResult | null, account?: Account) => {
globalStore.updateUserInfo(authData);
globalStore.updatePmi((await createOrGetPmi({ create: true }))?.pmi || null);
globalStore.updatePmiRoomList((await listPmi()) || []);
globalStore.updatePmiRoomList(await listPmi());

if (!authData) {
setLoginResult(null);
Expand Down
2 changes: 1 addition & 1 deletion packages/flat-stores/src/classroom-store/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1373,7 +1373,7 @@ export class ClassroomStore {

if (globalStore.pmiRoomUUID === this.roomUUID) {
// remove pmi room id list
globalStore.updatePmiRoomList((await listPmi()) || []);
globalStore.updatePmiRoomList(await listPmi());
}
break;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/flat-stores/src/global-store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ export class GlobalStore {
this.pmi = pmi;
};

public updatePmiRoomList = (pmiRoomList: PmiRoom[]): void => {
this.pmiRoomList = pmiRoomList;
public updatePmiRoomList = (pmiRoomList?: PmiRoom[]): void => {
this.pmiRoomList = pmiRoomList || [];
};

public updateUserInfo = (userInfo: UserInfo | null): void => {
Expand Down