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.

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

fix(web): avoid redundant queries for unchanged reviewers #1318

Merged
merged 4 commits into from
Nov 25, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
1 change: 0 additions & 1 deletion web/e2e/project/request.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ test("Request creating, searching, updating reviewer, and approving has succeede
await page.locator(".ant-select-selection-overflow").click();
await page.locator(".ant-select-item").click();
await page.getByRole("heading", { name: "Reviewer" }).click();
await closeNotification(page);
await page.getByRole("button", { name: "Approve" }).click();
await closeNotification(page);
await expect(page.locator("tbody").getByText(requestTitle, { exact: true })).toBeHidden();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ const RequestSidebarWrapper: React.FC<Props> = ({

const handleSubmit: FocusEventHandler<HTMLElement> | undefined = useCallback(async () => {
const requestId = currentRequest?.id;
if (!requestId || selectedReviewers.length === 0) {
const isEqual =
JSON.stringify([...defaultValue].sort()) === JSON.stringify([...selectedReviewers].sort());
if (!requestId || selectedReviewers.length === 0 || isEqual) {
hideViewReviewers();
return;
}
Expand All @@ -77,6 +79,7 @@ const RequestSidebarWrapper: React.FC<Props> = ({
currentRequest?.id,
currentRequest?.state,
currentRequest?.title,
defaultValue,
hideViewReviewers,
onRequestUpdate,
selectedReviewers,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@ import {
ItemField,
} from "@reearth-cms/components/molecules/Content/types";
import { Model } from "@reearth-cms/components/molecules/Model/types";
import {
RequestUpdatePayload,
RequestState,
RequestItem,
} from "@reearth-cms/components/molecules/Request/types";
import { RequestState, RequestItem } from "@reearth-cms/components/molecules/Request/types";
import { Group, Field } from "@reearth-cms/components/molecules/Schema/types";
import { UserMember } from "@reearth-cms/components/molecules/Workspace/types";
import { fromGraphQLItem } from "@reearth-cms/components/organisms/DataConverters/content";
Expand All @@ -32,7 +28,6 @@ import {
useGetModelLazyQuery,
useGetMeQuery,
useUpdateItemMutation,
useUpdateRequestMutation,
useSearchItemQuery,
useGetGroupLazyQuery,
FieldType as GQLFieldType,
Expand Down Expand Up @@ -532,32 +527,6 @@ export default () => {
[createRequestMutation, currentProject?.id, t],
);

const [updateRequestMutation, { loading: updateRequestLoading }] = useUpdateRequestMutation({
refetchQueries: ["GetRequests"],
});

const handleRequestUpdate = useCallback(
async (data: RequestUpdatePayload) => {
if (!data.requestId) return;
const request = await updateRequestMutation({
variables: {
requestId: data.requestId,
title: data.title,
description: data.description,
state: data.state as GQLRequestState,
reviewersId: data.reviewersId,
items: data.items,
},
});
if (request.errors || !request.data?.updateRequest) {
Notification.error({ message: t("Failed to update request.") });
return;
}
Notification.success({ message: t("Successfully updated request!") });
setRequestModalShown(false);
},
[updateRequestMutation, t],
);
const handleModalClose = useCallback(() => setRequestModalShown(false), []);

const handleModalOpen = useCallback(() => setRequestModalShown(true), []);
Expand Down Expand Up @@ -649,8 +618,6 @@ export default () => {
handleNavigateToRequest,
handleBack,
handleRequestCreate,
updateRequestLoading,
handleRequestUpdate,
handleModalClose,
handleModalOpen,
handleAddItemToRequestModalClose,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ import { useNavigate, useParams, useLocation } from "react-router-dom";

import Notification from "@reearth-cms/components/atoms/Notification";
import { User } from "@reearth-cms/components/molecules/AccountSettings/types";
import { Request } from "@reearth-cms/components/molecules/Request/types";
import { Request, RequestUpdatePayload } from "@reearth-cms/components/molecules/Request/types";
import { fromGraphQLRequest } from "@reearth-cms/components/organisms/DataConverters/content";
import {
useUpdateRequestMutation,
useDeleteRequestMutation,
useApproveRequestMutation,
useAddCommentMutation,
Expand All @@ -14,6 +15,7 @@ import {
useDeleteCommentMutation,
useGetRequestQuery,
Request as GQLRequest,
RequestState as GQLRequestState,
} from "@reearth-cms/gql/graphql-client-api";
import { useT } from "@reearth-cms/i18n";
import { useProject, useWorkspace, useUserRights } from "@reearth-cms/state";
Expand Down Expand Up @@ -96,6 +98,30 @@ export default () => {
[currentRequest?.createdBy?.id, currentRequest?.state, me?.id, userRights?.request.update],
);

const [updateRequestMutation, { loading: updateRequestLoading }] = useUpdateRequestMutation();

const handleRequestUpdate = useCallback(
async (data: RequestUpdatePayload) => {
if (!data.requestId) return;
const request = await updateRequestMutation({
variables: {
requestId: data.requestId,
title: data.title,
description: data.description,
state: data.state as GQLRequestState,
reviewersId: data.reviewersId,
items: data.items,
},
});
if (request.errors || !request.data?.updateRequest) {
Notification.error({ message: t("Failed to update request.") });
return;
}
Notification.success({ message: t("Successfully updated request!") });
},
[updateRequestMutation, t],
);
caichi-t marked this conversation as resolved.
Show resolved Hide resolved

const [deleteRequestMutation, { loading: deleteLoading }] = useDeleteRequestMutation();
const handleRequestDelete = useCallback(
(requestsId: string[]) =>
Expand Down Expand Up @@ -227,9 +253,11 @@ export default () => {
isApproveActionEnabled,
isAssignActionEnabled,
loading,
updateRequestLoading,
deleteLoading,
approveLoading,
currentRequest,
handleRequestUpdate,
handleRequestDelete,
handleRequestApprove,
handleCommentCreate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ const RequestDetails: React.FC = () => {
isAssignActionEnabled,
currentRequest,
loading,
updateRequestLoading,
deleteLoading,
approveLoading,
handleRequestUpdate,
handleRequestApprove,
handleRequestDelete,
handleCommentCreate,
Expand All @@ -29,8 +31,7 @@ const RequestDetails: React.FC = () => {

const { handleGetAsset } = useAssetHooks(false);

const { workspaceUserMembers, updateRequestLoading, handleRequestUpdate, handleGroupGet } =
useContentHooks();
const { workspaceUserMembers, handleGroupGet } = useContentHooks();

return (
<RequestDetailsMolecule
Expand Down