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

fix: mutation of states #256

Merged
merged 4 commits into from
Feb 8, 2023
Merged

fix: mutation of states #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
015695a
feat: label grouping, fix: new states response
aaryan610 Feb 8, 2023
32f4adc
Merge branch 'develop' of https://github.com/makeplane/plane into fea…
aaryan610 Feb 8, 2023
8b80b51
Merge branch 'develop' of https://github.com/makeplane/plane into fea…
aaryan610 Feb 8, 2023
808d42a
fix: mutation of states
aaryan610 Feb 8, 2023
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
4 changes: 2 additions & 2 deletions apps/app/components/states/create-update-state-inline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import useToast from "hooks/use-toast";
// ui
import { Button, CustomSelect, Input } from "components/ui";
// types
import type { IState } from "types";
import type { IState, StateResponse } from "types";
// fetch-keys
import { STATE_LIST } from "constants/fetch-keys";
// constants
Expand Down Expand Up @@ -85,7 +85,7 @@ export const CreateUpdateStateInline: React.FC<Props> = ({
await stateService
.createState(workspaceSlug, projectId, { ...payload })
.then((res) => {
mutate<IState[]>(STATE_LIST(projectId), (prevData) => [...(prevData ?? []), res]);
mutate(STATE_LIST(projectId));
handleClose();

setToastAlert({
Expand Down
16 changes: 2 additions & 14 deletions apps/app/components/states/create-update-state-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export const CreateUpdateStateModal: React.FC<Props> = ({
await stateService
.createState(workspaceSlug as string, projectId, payload)
.then((res) => {
mutate<IState[]>(STATE_LIST(projectId), (prevData) => [...(prevData ?? []), res], false);
mutate(STATE_LIST(projectId));
onClose();
})
.catch((err) => {
Expand All @@ -95,19 +95,7 @@ export const CreateUpdateStateModal: React.FC<Props> = ({
await stateService
.updateState(workspaceSlug as string, projectId, data.id, payload)
.then((res) => {
mutate<IState[]>(
STATE_LIST(projectId),
(prevData) => {
const newData = prevData?.map((item) => {
if (item.id === res.id) {
return res;
}
return item;
});
return newData;
},
false
);
mutate(STATE_LIST(projectId));
onClose();
})
.catch((err) => {
Expand Down
6 changes: 1 addition & 5 deletions apps/app/components/states/delete-state-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,7 @@ export const DeleteStateModal: React.FC<Props> = ({ isOpen, onClose, data }) =>
await stateServices
.deleteState(workspaceSlug as string, data.project, data.id)
.then(() => {
mutate<IState[]>(
STATE_LIST(data.project),
(prevData) => prevData?.filter((state) => state.id !== data?.id),
false
);
mutate(STATE_LIST(data.project));
handleClose();

setToastAlert({
Expand Down
5 changes: 1 addition & 4 deletions apps/app/helpers/state.helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ export const orderStateGroups = (unorderedStateGroups: StateResponse) =>

export const getStatesList = (stateGroups: any): IState[] => {
// order the unordered state groups first
const orderedStateGroups = Object.assign(
{ backlog: [], unstarted: [], started: [], completed: [], cancelled: [] },
stateGroups
);
const orderedStateGroups = orderStateGroups(stateGroups);

// extract states from the groups and return them
return Object.keys(orderedStateGroups)
Expand Down
7 changes: 3 additions & 4 deletions apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/states.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,13 @@ const StatesSettings: NextPage<UserAuth> = (props) => {
: null
);
const orderedStateGroups = orderStateGroups(states ?? {});

const statesList = getStatesList(orderStateGroups ?? {});
const statesList = getStatesList(orderedStateGroups ?? {});

return (
<>
<DeleteStateModal
isOpen={!!selectDeleteState}
data={statesList?.find((state) => state.id === selectDeleteState) ?? null}
data={statesList?.find((s) => s.id === selectDeleteState) ?? null}
onClose={() => setSelectDeleteState(null)}
/>
<AppLayout
Expand Down Expand Up @@ -115,7 +114,7 @@ const StatesSettings: NextPage<UserAuth> = (props) => {
<div
key={state.id}
className={`flex items-center justify-between gap-2 border-b bg-gray-50 p-3 ${
Boolean(activeGroup !== key) ? "last:border-0" : ""
activeGroup !== key ? "last:border-0" : ""
}`}
>
<div className="flex items-center gap-2">
Expand Down